Moves state rehydrating deleting to componentWillMount to avoid issue…

…s with interop with other libs using react-async-bootstrapper.
ctrlplusb · Apr 5, 2017 · 3e5a346 · 3e5a346
1 parent fb69a7b
commit 3e5a346
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/src/JobProvider.js b/src/JobProvider.js
@@ -29,6 +29,7 @@ class JobProvider extends Component {
       register: PropTypes.func.isRequired,
       get: PropTypes.func.isRequired,
       getRehydrate: React.PropTypes.func.isRequired,
+      removeRehydrate: React.PropTypes.func.isRequired,
     }).isRequired,
   };
 
@@ -48,6 +49,9 @@ class JobProvider extends Component {
           delete this.rehydrateState.jobs[id]
           return rehydration
         },
+        removeRehydrate: (id) => {
+          delete this.rehydrateState.jobs[id]
+        },
       },
     }
   }

diff --git a/src/withJob.js b/src/withJob.js
@@ -39,8 +39,9 @@ export default function withJob(config) {
           register: PropTypes.func.isRequired,
           get: PropTypes.func.isRequired,
           getRehydrate: React.PropTypes.func.isRequired,
+          removeRehydrate: React.PropTypes.func.isRequired,
         }),
-      }
+      };
 
       constructor(props, context) {
         super(props, context)
@@ -58,9 +59,7 @@ export default function withJob(config) {
         }
 
         // node
-        return serverMode === 'defer'
-          ? false
-          : this.resolveWork(this.props)
+        return serverMode === 'defer' ? false : this.resolveWork(this.props)
       }
 
       componentWillMount() {
@@ -83,6 +82,10 @@ export default function withJob(config) {
         if (!this.state.completed) {
           this.resolveWork(this.props)
         }
+
+        if (this.context.jobs && env === 'browser') {
+          this.context.jobs.removeRehydrate(id)
+        }
       }
 
       componentWillUnmount() {