fix: RN 0.65 compatibility

kylerjensen · Apr 17, 2023 · 984a32f · 984a32f
1 parent 871ff0d
commit 984a32f
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 12 deletions.
diff --git a/src/utilities/overrideTextInputRenderFn.ts b/src/utilities/overrideTextInputRenderFn.ts
@@ -12,12 +12,15 @@ export function overrideTextInputRenderFn() {
     }
 
     overrideRenderFn(...args: any[]) {
-      const element = originalRenderFn.call(this, ...args);
-      const fontFaces = Object.values(globalFontFaces);
-      const originalStyle: TextStyle = StyleSheet.flatten([element.props.style]);
-      const overrideStyle: TextStyle = generateOverrideStyle(fontFaces, originalStyle);
-      const flattenedStyle: TextStyle = StyleSheet.flatten([originalStyle, overrideStyle]);
-      return React.cloneElement(element, { style: flattenedStyle });
+      if (args.length && args[0].style) {
+        const fontFaces = Object.values(globalFontFaces);
+        const originalStyle: TextStyle = StyleSheet.flatten([args[0].style]);
+        const overrideStyle: TextStyle = generateOverrideStyle(fontFaces, originalStyle);
+        const flattenedStyle: TextStyle = StyleSheet.flatten([originalStyle, overrideStyle]);
+        args.splice(0, 1, { ...args[0], style: flattenedStyle });
+      }
+
+      return originalRenderFn.call(this, ...args);
     }
   }
 

diff --git a/src/utilities/overrideTextRenderFn.ts b/src/utilities/overrideTextRenderFn.ts
@@ -12,12 +12,15 @@ export function overrideTextRenderFn() {
     }
 
     overrideRenderFn(...args: any[]) {
-      const element = originalRenderFn.call(this, ...args);
-      const fontFaces = Object.values(globalFontFaces);
-      const originalStyle: TextStyle = StyleSheet.flatten([element.props.style]);
-      const overrideStyle: TextStyle = generateOverrideStyle(fontFaces, originalStyle);
-      const flattenedStyle: TextStyle = StyleSheet.flatten([originalStyle, overrideStyle]);
-      return React.cloneElement(element, { style: flattenedStyle });
+      if (args.length && args[0].style) {
+        const fontFaces = Object.values(globalFontFaces);
+        const originalStyle: TextStyle = StyleSheet.flatten([args[0].style]);
+        const overrideStyle: TextStyle = generateOverrideStyle(fontFaces, originalStyle);
+        const flattenedStyle: TextStyle = StyleSheet.flatten([originalStyle, overrideStyle]);
+        args.splice(0, 1, { ...args[0], style: flattenedStyle });
+      }
+
+      return originalRenderFn.call(this, ...args);
     }
   }