fix(withTheme): refs on functional components wrapped (react-native-elements#3708)

marcshilling · Marc Shilling · web-flow · commit a8e532789533 · 2023-03-21T18:43:03.000+05:30
Co-authored-by: Marc Shilling &lt;marc.shilling@stadiumgoods.com&gt;
diff --git a/packages/themed/src/config/withTheme.tsx b/packages/themed/src/config/withTheme.tsx
@@ -41,11 +41,7 @@ const ThemedComponent = (
                 children,
               };
 
-              return isClassComponent(WrappedComponent) ? (
-                <WrappedComponent ref={forwardedRef} {...newProps} />
-              ) : (
-                <WrappedComponent {...newProps} />
-              );
+              return <WrappedComponent ref={forwardedRef} {...newProps} />;
             }
             const { components, ...restTheme } = theme;
             const themedProps =
@@ -64,10 +60,7 @@ const ThemedComponent = (
               children,
             };
 
-            if (isClassComponent(WrappedComponent)) {
-              return <WrappedComponent ref={forwardedRef} {...newProps} />;
-            }
-            return <WrappedComponent {...newProps} />;
+            return <WrappedComponent ref={forwardedRef} {...newProps} />;
           }}
         </ThemeConsumer>
       );
@@ -102,7 +95,7 @@ function withTheme<P = {}, T = {}>(
     return hoistNonReactStatics(React.forwardRef(Component), WrappedComponent);
   }
 
-  return Component;
+  return React.forwardRef(Component);
 }
 
 export default withTheme;
