Return the correct type

Shopify · Apr 18, 2022 · 64427ba · 64427ba
1 parent 3d60ee3
commit 64427ba
Showing 1 changed file with 22 additions and 9 deletions.
diff --git a/src/createText.ts b/src/createText.ts
@@ -1,4 +1,9 @@
-import {ComponentType, ForwardRefExoticComponent} from 'react';
+import {
+  ComponentType,
+  ForwardRefExoticComponent,
+  PropsWithoutRef,
+  RefAttributes,
+} from 'react';
 import {StyleProp, Text, TextProps as RNTextProps} from 'react-native';
 
 import createRestyleComponent from './createRestyleComponent';
@@ -49,31 +54,39 @@ export const textRestyleFunctions = [
 
 function createText<
   Theme extends BaseTheme,
-  Props extends Record<string, any> & {style: StyleProp<RNTextProps>},
+  Props extends Record<string, any> & {style?: StyleProp<RNTextProps>},
   EnableShorthand extends boolean = true,
   OptionalStyleProp extends boolean = true
 >(
   BaseComponent: ComponentType<Props>,
 ): ForwardRefExoticComponent<
-  Optional<Props, 'style', OptionalStyleProp> &
-    TextProps<Theme, EnableShorthand>
+  PropsWithoutRef<
+    Optional<Props, 'style', OptionalStyleProp> &
+      TextProps<Theme, EnableShorthand>
+  > &
+    RefAttributes<{}>
 >;
 
 function createText<
   Theme extends BaseTheme,
-  Props extends RNTextProps = RNTextProps,
   EnableShorthand extends boolean = true
->(): ForwardRefExoticComponent<Props & TextProps<Theme, EnableShorthand>>;
+>(): ForwardRefExoticComponent<
+  PropsWithoutRef<RNTextProps & TextProps<Theme, EnableShorthand>> &
+    RefAttributes<{}>
+>;
 
 function createText<
   Theme extends BaseTheme,
   Props extends Record<string, any>,
   EnableShorthand extends boolean = true
->(...args: [] | [ComponentType<Props>]) {
+>(
+  ...args: [] | [ComponentType<Props>]
+): ForwardRefExoticComponent<
+  PropsWithoutRef<Props & TextProps<Theme, EnableShorthand>> & RefAttributes<{}>
+> {
   const BaseComponent = args[0] || Text;
   return createRestyleComponent<
-    TextProps<Theme, EnableShorthand> &
-      Omit<Props, keyof TextProps<Theme, EnableShorthand>>,
+    Props & TextProps<Theme, EnableShorthand>,
     Theme
   >(
     textRestyleFunctions as RestyleFunctionContainer<