[Fix] isReactComponent on native arrow functions

akxcv · Jun 22, 2018 · 22567e7 · 22567e7
1 parent 30ab626
commit 22567e7
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 3 deletions.
diff --git a/dist/vuera.cjs.js b/dist/vuera.cjs.js
@@ -407,7 +407,7 @@ var ReactWrapper = {
 function isReactComponent(component) {
   if ((typeof component === 'undefined' ? 'undefined' : _typeof(component)) === 'object') {
     return false;
-  } else if (typeof component === 'function' && component.prototype.constructor.super && component.prototype.constructor.super.name.startsWith('Vue')) {
+  } else if (typeof component === 'function' && component.prototype && component.prototype.constructor.super && component.prototype.constructor.super.name.startsWith('Vue')) {
     return false;
   } else {
     return true;

diff --git a/dist/vuera.es.js b/dist/vuera.es.js
@@ -401,7 +401,7 @@ var ReactWrapper = {
 function isReactComponent(component) {
   if ((typeof component === 'undefined' ? 'undefined' : _typeof(component)) === 'object') {
     return false;
-  } else if (typeof component === 'function' && component.prototype.constructor.super && component.prototype.constructor.super.name.startsWith('Vue')) {
+  } else if (typeof component === 'function' && component.prototype && component.prototype.constructor.super && component.prototype.constructor.super.name.startsWith('Vue')) {
     return false;
   } else {
     return true;

diff --git a/dist/vuera.iife.js b/dist/vuera.iife.js
@@ -404,7 +404,7 @@ var ReactWrapper = {
 function isReactComponent(component) {
   if ((typeof component === 'undefined' ? 'undefined' : _typeof(component)) === 'object') {
     return false;
-  } else if (typeof component === 'function' && component.prototype.constructor.super && component.prototype.constructor.super.name.startsWith('Vue')) {
+  } else if (typeof component === 'function' && component.prototype && component.prototype.constructor.super && component.prototype.constructor.super.name.startsWith('Vue')) {
     return false;
   } else {
     return true;

diff --git a/src/utils/isReactComponent.js b/src/utils/isReactComponent.js
@@ -3,6 +3,7 @@ export default function isReactComponent (component) {
     return false
   } else if (
     typeof component === 'function' &&
+    component.prototype &&
     component.prototype.constructor.super &&
     component.prototype.constructor.super.name.startsWith('Vue')
   ) {

diff --git a/tests/fixtures/ReactFunctionalComponent.js b/tests/fixtures/ReactFunctionalComponent.js
@@ -0,0 +1,10 @@
+import React from 'react'
+
+export default props => {
+  return (
+    <div>
+      <span>{props.message}</span>
+      <button onClick={props.reset} />
+    </div>
+  )
+}
diff --git a/tests/utils/isReactComponent-test.js b/tests/utils/isReactComponent-test.js
@@ -1,6 +1,7 @@
 import isReactComponent from '../../src/utils/isReactComponent'
 import ReactComponent from '../fixtures/ReactComponent'
 import ReactPureFunctionalComponent from '../fixtures/ReactPureFunctionalComponent'
+import ReactFunctionalComponent from '../fixtures/ReactFunctionalComponent'
 import VueComponent from '../fixtures/VueComponent'
 import VueRegisteredComponent from '../fixtures/VueRegisteredComponent'
 import VueSingleFileComponent from '../fixtures/VueSingleFileComponent.vue'
@@ -9,6 +10,7 @@ describe('isReactComponent', () => {
   it('returns true for React components', () => {
     expect(isReactComponent(ReactComponent)).toBe(true)
     expect(isReactComponent(ReactPureFunctionalComponent)).toBe(true)
+    expect(isReactComponent(ReactFunctionalComponent)).toBe(true)
   })
 
   it('returns false for Vue components', () => {