Don't override ref property when not configured to.

Author: PSpSynedra

src/components/connect.tsx

@@ -747,11 +747,14 @@ function connect<
       // Now that all that's done, we can finally try to actually render the child component.
       // We memoize the elements for the rendered child component as an optimization.
       const renderedWrappedComponent = React.useMemo(() => {
+        const effectiveProps = {...actualChildProps};
+        if (forwardRef) {
+          effectiveProps.ref = reactReduxForwardedRef
+        }
         return (
           // @ts-ignore
           <WrappedComponent
-            {...actualChildProps}
-            ref={reactReduxForwardedRef}
+            {...effectiveProps}
           />
         )
       }, [reactReduxForwardedRef, WrappedComponent, actualChildProps])

test/components/connect.spec.tsx

@@ -2588,6 +2588,25 @@ describe('React', () => {
 
         expect(tester.getByTestId('a')).toHaveTextContent('42')
       })
+
+      it('should not override ref property when not asked to.', async () => {
+        const store = createStore(() => ({}))
+        interface RefReceiverProps {
+          ref: React.Ref<HTMLSpanElement | null>
+        }
+        function RefReceiver(props: RefReceiverProps) {
+          const {ref} = props
+          return <span ref={ref} />
+        }
+        const DecoratedRefReceiver = connect()(RefReceiver)
+        const testRef = React.createRef<HTMLSpanElement>()
+        rtl.render(
+          <ProviderMock store={store}>
+            <DecoratedRefReceiver ref={testRef} />
+          </ProviderMock>
+        )
+        expect(testRef.current).toBeInstanceOf(HTMLSpanElement);
+      })
     })
 
     describe('Factory functions for mapState/mapDispatch', () => {