Merge pull request cerebral#122 from cerebral/reactWrapperFix

fix(overmind-react): allow connected components to operate as normal

Author: christianalfoni

packages/node_modules/overmind-react/src/__snapshots__/index.test.tsx.snap

@@ -1,5 +1,17 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
+exports[`React should allow using component as normal, event when connected 1`] = `
+<h1>
+  bar
+</h1>
+`;
+
+exports[`React should allow using component as normal, event when connected 2`] = `
+<h1>
+  nada
+</h1>
+`;
+
 exports[`React should connect actions and state to class components 1`] = `
 <h1>
   bar

packages/node_modules/overmind-react/src/index.test.tsx

@@ -96,6 +96,39 @@ describe('React', () => {
     expect(tree).toMatchSnapshot()
   })
 
+  test('should allow using component as normal, event when connected', () => {
+    expect.assertions(2)
+    const config = {
+      state: {
+        foo: 'bar',
+      },
+    }
+
+    type IApp = TApp<{
+      state: {
+        foo: typeof config.state.foo
+      }
+    }>
+
+    const app = new Overmind(config)
+
+    const connect = createConnect(app)
+
+    class Component extends React.Component<TConnect<typeof app>> {
+      render() {
+        const { app } = this.props
+
+        return <h1>{app ? app.state.foo : 'nada'}</h1>
+      }
+    }
+    const ConnectedComponent = connect(Component)
+    const tree = renderer.create(<ConnectedComponent />).toJSON()
+    const tree2 = renderer.create(<Component app={null} />).toJSON()
+
+    expect(tree).toMatchSnapshot()
+    expect(tree2).toMatchSnapshot()
+  })
+
   test('should connect reactions to components', () => {
     expect.assertions(2)
     let reactionCount = 0

packages/node_modules/overmind-react/src/index.ts

@@ -40,6 +40,10 @@ export const createConnect = <App extends Overmind<any>>(app: App) => {
       const originalWillUnmount = Component.prototype.componentWillUnmount
 
       Component.prototype.componentWillUnmount = function() {
+        if (!this.props.app) {
+          return originalWillUnmount && originalWillUnmount.call(this)
+        }
+
         this.__isUnmounting = true
         if (this.__mutationListener) {
           app.eventHub.emitAsync(EventType.COMPONENT_REMOVE, {
@@ -53,6 +57,10 @@ export const createConnect = <App extends Overmind<any>>(app: App) => {
         originalWillUnmount && originalWillUnmount.call(this)
       }
       Component.prototype.render = function() {
+        if (!this.props.app) {
+          return originalRender.call(this)
+        }
+
         if (typeof this.__componentId === 'undefined') {
           this.__componentId = nextComponentId++
         }