npm - @expo/ui - Versions diffs - 56.0.2 → 56.0.4 - Mend

@@ -1,8 +1,15 @@
-import { Text as RNText, useColorScheme, type TextStyle } from 'react-native';
+import { Text as RNText, StyleSheet, useColorScheme } from 'react-native';
 import type { TextProps } from './types';
 import { useUniversalLifecycle } from '../hooks';
+const styles = StyleSheet.create({
+  light: { color: '#000000' },
+  dark: { color: '#FFFFFF' },
+  hidden: { display: 'none' },
+  disabled: { opacity: 0.5 },
+});
 /**
  * A component for displaying styled text content.
  */
@@ -14,56 +21,30 @@ export function Text({
   onPress,
   onAppear,
   onDisappear,
-  disabled,
-  hidden,
+  disabled = false,
+  hidden = false,
   testID,
 }: TextProps) {
   useUniversalLifecycle(onAppear, onDisappear);
   const isDarkScheme = useColorScheme() === 'dark';
-  const textStyleOverrides: TextStyle = {
-    ...(textStyle?.fontSize != null ? { fontSize: textStyle.fontSize } : undefined),
-    ...(textStyle?.fontWeight != null ? { fontWeight: textStyle.fontWeight } : undefined),
-    ...(textStyle?.fontFamily != null ? { fontFamily: textStyle.fontFamily } : undefined),
-    ...(textStyle?.color != null ? { color: textStyle.color } : undefined),
-    ...(textStyle?.lineHeight != null ? { lineHeight: textStyle.lineHeight } : undefined),
-    ...(textStyle?.letterSpacing != null ? { letterSpacing: textStyle.letterSpacing } : undefined),
-    ...(textStyle?.textAlign != null ? { textAlign: textStyle.textAlign } : undefined),
-  };
   return (
     <RNText
-      style={[
-        isDarkScheme ? textDarkStyle : textLightStyle,
-        style,
-        textStyleOverrides,
-        hidden ? hiddenStyle : null,
-        disabled ? disabledStyle : null,
-      ]}
       numberOfLines={numberOfLines}
       onPress={onPress}
       disabled={disabled}
-      testID={testID}>
+      testID={testID}
+      style={[
+        isDarkScheme ? styles.dark : styles.light,
+        style,
+        textStyle,
+        hidden && styles.hidden,
+        disabled && styles.disabled,
+      ]}>
       {children}
     </RNText>
   );
 }
-const textLightStyle: TextStyle = {
-  color: '#000000',
-};
-const textDarkStyle: TextStyle = {
-  color: '#FFFFFF',
-};
-const hiddenStyle: TextStyle = {
-  display: 'none',
-};
-const disabledStyle: TextStyle = {
-  opacity: 0.5,
-};
 export * from './types';

	@@ -1 +0,0 @@
1	- 30e043f7f04143f7b44a22ed5db105d71be86f4aa49f21d082d3c9acd84ea32a

	@@ -1 +0,0 @@
1	- 69bc561d70dc77219abb25903821b7f0f170b1a06c4cd40714ece8709b85404ad09bcd4fc9cbe67faf9a04e413a625e4880be8a5c78fd6426ed8f78f4b7ce4f6

	@@ -1 +0,0 @@
1	- 7c0946b01b4c9e3cc7c3790f36779a0d5ff3bb832562de233badb2168d613e45

	@@ -1 +0,0 @@
1	- 222495b3d9e3c00846f79962ed79cdd46c2a2a2df76077b8752576200bfd728c3cc885cc0e0762869c57b24391882b9ee65ffa3f02a2c2490faa44e983640dd4

	@@ -1 +0,0 @@
1	- ee0321724e44b775e5f24bf1712946ac3d8e8d71fffb8f567cfd13a631a3fd49

	@@ -1 +0,0 @@
1	- 30a3a47f5c5c292e336d0eaf7363d8e4efabd422856c4012f90ae524197559a099c8bb06597ab67b976bd35f9dcd6db468520ab1c0460a6a057a1c117cb1ad8d

	@@ -1 +0,0 @@
1	- 94e0b9c22f4243dd3fae58fdff830551be50f8d9ee42e83c55c1dcb3dd50f6bb

	@@ -1 +0,0 @@
1	- e716bb9fb13a6f3a41154d67632da322143d58a8313021c86a7725304a9b6159fb13672249e717876b6750f16d205dde1fd8291903c19e23835a3c626532ecfa

	@@ -1 +0,0 @@
1	- 25616b6077449f887cfccb76c53298bf

	@@ -1 +0,0 @@
1	- fcc61a62df8eb780a822914cee4b167b6e70519d

	@@ -1 +0,0 @@
1	- c9daa8165fdcd9ceb61785e0c560a949

	@@ -1 +0,0 @@
1	- a60331ab720130c5c2ab6c627a68c5c8f15aa917

@expo/ui 56.0.2 → 56.0.4