feat: 增加高阶组件ref透传

NSFI · Dec 29, 2020 · 63e19ce · 63e19ce
1 parent 8b7197a
commit 63e19ce
Showing 1 changed file with 12 additions and 4 deletions.
diff --git a/source/components/Config/Locale/WithLocale.tsx b/source/components/Config/Locale/WithLocale.tsx
@@ -11,14 +11,16 @@ function getDisplayName(WrappedComponent) {
 const withLocale = ({ componentName }) =>
   <WrappedProps extends {}>(WrappedComponent: React.ComponentType<WrappedProps>): any => {
 
-    type WithLocaleProps = WrappedProps;
+    type WithLocaleProps = WrappedProps & {
+      forwardRef: any,
+    };
     type WithLocaleState = {
       Locale?: object
     };
 
     class WithLocale extends Component<WithLocaleProps, WithLocaleState> {
       static displayName: string;
-      constructor (props) {
+      constructor(props) {
         super(props);
 
         this.state = {
@@ -27,21 +29,27 @@ const withLocale = ({ componentName }) =>
       }
 
       render() {
+        const { forwardRef, ...otherProps } = this.props;
         return (
           <Consumer componentName={componentName}>
             {
               (Locale) =>
                 <WrappedComponent
-                  {...this.props as WrappedProps}
+                  ref={forwardRef}
+                  {...otherProps as WrappedProps}
                   Locale={Locale}
                 />
             }
           </Consumer>
         );
       }
     }
+
     WithLocale.displayName = `WithLocale(${getDisplayName(WrappedComponent)})`;
-    return hoistNonReactStatic(WithLocale, WrappedComponent);
+    return React.forwardRef(function WithLocaleRef(props, ref) {
+      const WithLocaleRef = hoistNonReactStatic(WithLocale, WrappedComponent)
+      return <WithLocaleRef {...props as WrappedProps} forwardedRef={ref} />;
+    });
   };
 
 export default withLocale;