Make sure withLocalize forwards its ref

Expensify · May 11, 2021 · 99c89e9 · 99c89e9
1 parent cd915cd
commit 99c89e9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/src/components/withLocalize.js b/src/components/withLocalize.js
@@ -47,6 +47,7 @@ function withLocalizeHOC(WrappedComponent) {
             <WrappedComponent
                 // eslint-disable-next-line react/jsx-props-no-spreading
                 {...props}
+                ref={props.forwardedRef}
                 translate={translations.translate}
                 numberFormat={translations.numberFormat}
                 timestampToRelative={translations.timestampToRelative}
@@ -59,9 +60,11 @@ function withLocalizeHOC(WrappedComponent) {
     WithLocalize.displayName = `WithLocalize(${getComponentDisplayName(WrappedComponent)})`;
     WithLocalize.propTypes = {
         preferredLocale: PropTypes.string,
+        forwardedRef: PropTypes.func,
     };
     WithLocalize.defaultProps = {
         preferredLocale: 'en',
+        forwardedRef: null,
     };
     return React.forwardRef((props, ref) => (
         // eslint-disable-next-line react/jsx-props-no-spreading

diff --git a/src/pages/home/report/ReportActionCompose.js b/src/pages/home/report/ReportActionCompose.js
@@ -181,7 +181,7 @@ class ReportActionCompose extends React.Component {
      * Focus the composer text input
      */
     focus() {
-        if (this.textInput && this.textInput.focus) {
+        if (this.textInput) {
             // There could be other animations running while we trigger manual focus.
             // This prevents focus from making those animations janky.
             InteractionManager.runAfterInteractions(() => {