Merge pull request #1221 from eps1lon/fix/lazy-ref

fix: Allow refs on lazy components
gaearon · Apr 5, 2019 · cd9a760 · cd9a760
2 parents df8eb13 + 1351f2d
commit cd9a760
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 4 deletions.
diff --git a/src/reconciler/fiberUpdater.js b/src/reconciler/fiberUpdater.js
@@ -18,12 +18,21 @@ export const updateLazy = (target, type) => {
         const C = resolveType(m.default)
         // chunks has been updated - new hot loader process is taking a place
         enterHotUpdate()
+        if (!React.forwardRef) {
+          return {
+            default: props => (
+              <AppContainer>
+                <C {...props} />
+              </AppContainer>
+            ),
+          }
+        }
         return {
-          default: props => (
+          default: React.forwardRef((props, ref) => (
             <AppContainer>
-              <C {...props} />
+              <C {...props} ref={ref} />
             </AppContainer>
-          ),
+          )),
         }
       })
     target[lazyConstructor].isPatchedByReactHotLoader = true

diff --git a/test/AppContainer.dev.test.js b/test/AppContainer.dev.test.js
@@ -910,9 +910,10 @@ describe(`AppContainer (dev)`, () => {
       RHL.register(MountSpy, 'Pure', 'test.js')
       RHL.register(Lazy, 'Lazy', 'test.js')
 
+      const ref = jest.fn()
       class App extends Component {
         render() {
-          return <Lazy />
+          return <Lazy ref={ref} />
         }
       }
 
@@ -927,6 +928,7 @@ describe(`AppContainer (dev)`, () => {
       await Promise.resolve(1)
 
       expect(spy).not.toHaveBeenCalled()
+      expect(ref).toHaveBeenCalledTimes(1)
 
       expect(wrapper.root.findByProps({ children: 'I am old' })).toBeDefined()