Use hoist-non-react-statics for hoisting static methods

BinaryMuse · kuychaco · commit bec83bd6566b · 2017-03-30T15:11:11.000-07:00
diff --git a/lib/decorators/observe-model.js b/lib/decorators/observe-model.js
@@ -1,4 +1,5 @@
 import React from 'react';
+import hoistNonReactStatic from 'hoist-non-react-statics';
 
 import ModelObserver from '../models/model-observer';
 
@@ -86,17 +87,7 @@ export default function ObserveModelDecorator(spec) {
       }
     }
 
-    Object.getOwnPropertyNames(Target).forEach(key => {
-      if (typeof Target[key] === 'function') {
-        Object.defineProperty(Wrapper, key, {
-          value(...args) {
-            return Target[key](...args);
-          },
-          enumerable: false,
-          configurable: true,
-        });
-      }
-    });
+    hoistNonReactStatic(Wrapper, Target);
 
     return Wrapper;
   };
diff --git a/package.json b/package.json
@@ -50,6 +50,7 @@
     "etch": "0.8.0",
     "git-kitchen-sink": "1.17.0",
     "graphql": "^0.8.2",
+    "hoist-non-react-statics": "^1.2.0",
     "keytar": "^3.0.2",
     "lodash.memoize": "^4.1.2",
     "moment": "^2.17.1",
diff --git a/test/decorators/observe-model.test.js b/test/decorators/observe-model.test.js
@@ -34,6 +34,10 @@ class TestModel {
   fetchData: model => model.getData(),
 })
 class TestComponent extends React.Component {
+  static testMethod() {
+    return 'Hi!';
+  }
+
   render() {
     return null;
   }
@@ -67,4 +71,8 @@ describe('ObserveModelDecorator', function() {
     await assert.async.equal(wrapper.find('TestComponent').prop('two'), 2);
     await assert.async.equal(wrapper.find('TestComponent').prop('testModel'), model2);
   });
+
+  it('hosts static methods', function() {
+    assert.equal(TestComponent.testMethod(), 'Hi!');
+  });
 });
