refactor: avoid spreading in Text styles

callstack · Feb 7, 2023 · ef368b7 · ef368b7
1 parent c02070b
commit ef368b7
Show file tree

Hide file tree

Showing 19 changed files with 117 additions and 120 deletions.
diff --git a/src/components/Typography/AnimatedText.tsx b/src/components/Typography/AnimatedText.tsx
@@ -56,9 +56,9 @@ function AnimatedText({
       <Animated.Text
         {...rest}
         style={[
-          { ...font, color: theme.colors.onSurface },
+          font,
           styles.text,
-          { writingDirection },
+          { writingDirection, color: theme.colors.onSurface },
           style,
         ]}
       />

diff --git a/src/components/Typography/Text.tsx b/src/components/Typography/Text.tsx
@@ -109,12 +109,9 @@ const Text = (
       <NativeText
         ref={root}
         style={[
-          {
-            ...font,
-            color: theme.colors.onSurface,
-          },
+          font,
           styles.text,
-          { writingDirection },
+          { writingDirection, color: theme.colors.onSurface },
           style,
         ]}
         {...rest}

diff --git a/src/components/__tests__/Appbar/__snapshots__/Appbar.test.tsx.snap b/src/components/__tests__/Appbar/__snapshots__/Appbar.test.tsx.snap
@@ -741,7 +741,6 @@ exports[`Appbar passes additional props to AppbarBackAction, AppbarContent and A
           style={
             Array [
               Object {
-                "color": "rgba(28, 27, 31, 1)",
                 "fontFamily": "System",
                 "fontSize": 22,
                 "fontWeight": "400",
@@ -752,6 +751,7 @@ exports[`Appbar passes additional props to AppbarBackAction, AppbarContent and A
                 "textAlign": "left",
               },
               Object {
+                "color": "rgba(28, 27, 31, 1)",
                 "writingDirection": "ltr",
               },
               Array [

diff --git a/src/components/__tests__/Checkbox/__snapshots__/CheckboxItem.test.js.snap b/src/components/__tests__/Checkbox/__snapshots__/CheckboxItem.test.js.snap
@@ -129,7 +129,6 @@ exports[`can render leading checkbox control 1`] = `
       style={
         Array [
           Object {
-            "color": "rgba(28, 27, 31, 1)",
             "fontFamily": "System",
             "fontSize": 16,
             "fontWeight": "400",
@@ -140,6 +139,7 @@ exports[`can render leading checkbox control 1`] = `
             "textAlign": "left",
           },
           Object {
+            "color": "rgba(28, 27, 31, 1)",
             "writingDirection": "ltr",
           },
           Array [
@@ -213,7 +213,6 @@ exports[`can render the Android checkbox on different platforms 1`] = `
       style={
         Array [
           Object {
-            "color": "rgba(28, 27, 31, 1)",
             "fontFamily": "System",
             "fontSize": 16,
             "fontWeight": "400",
@@ -224,6 +223,7 @@ exports[`can render the Android checkbox on different platforms 1`] = `
             "textAlign": "left",
           },
           Object {
+            "color": "rgba(28, 27, 31, 1)",
             "writingDirection": "ltr",
           },
           Array [
@@ -412,7 +412,6 @@ exports[`can render the iOS checkbox on different platforms 1`] = `
       style={
         Array [
           Object {
-            "color": "rgba(28, 27, 31, 1)",
             "fontFamily": "System",
             "fontSize": 16,
             "fontWeight": "400",
@@ -423,6 +422,7 @@ exports[`can render the iOS checkbox on different platforms 1`] = `
             "textAlign": "left",
           },
           Object {
+            "color": "rgba(28, 27, 31, 1)",
             "writingDirection": "ltr",
           },
           Array [
@@ -575,7 +575,6 @@ exports[`renders unchecked 1`] = `
       style={
         Array [
           Object {
-            "color": "rgba(28, 27, 31, 1)",
             "fontFamily": "System",
             "fontSize": 16,
             "fontWeight": "400",
@@ -586,6 +585,7 @@ exports[`renders unchecked 1`] = `
             "textAlign": "left",
           },
           Object {
+            "color": "rgba(28, 27, 31, 1)",
             "writingDirection": "ltr",
           },
           Array [

diff --git a/src/components/__tests__/RadioButton/__snapshots__/RadioButtonItem.test.js.snap b/src/components/__tests__/RadioButton/__snapshots__/RadioButtonItem.test.js.snap
@@ -128,7 +128,6 @@ exports[`can render leading radio button control 1`] = `
       style={
         Array [
           Object {
-            "color": "rgba(28, 27, 31, 1)",
             "fontFamily": "System",
             "fontSize": 16,
             "fontWeight": "400",
@@ -139,6 +138,7 @@ exports[`can render leading radio button control 1`] = `
             "textAlign": "left",
           },
           Object {
+            "color": "rgba(28, 27, 31, 1)",
             "writingDirection": "ltr",
           },
           Array [
@@ -211,7 +211,6 @@ exports[`can render the Android radio button on different platforms 1`] = `
       style={
         Array [
           Object {
-            "color": "rgba(28, 27, 31, 1)",
             "fontFamily": "System",
             "fontSize": 16,
             "fontWeight": "400",
@@ -222,6 +221,7 @@ exports[`can render the Android radio button on different platforms 1`] = `
             "textAlign": "left",
           },
           Object {
+            "color": "rgba(28, 27, 31, 1)",
             "writingDirection": "ltr",
           },
           Array [
@@ -341,7 +341,6 @@ exports[`can render the iOS radio button on different platforms 1`] = `
       style={
         Array [
           Object {
-            "color": "rgba(28, 27, 31, 1)",
             "fontFamily": "System",
             "fontSize": 16,
             "fontWeight": "400",
@@ -352,6 +351,7 @@ exports[`can render the iOS radio button on different platforms 1`] = `
             "textAlign": "left",
           },
           Object {
+            "color": "rgba(28, 27, 31, 1)",
             "writingDirection": "ltr",
           },
           Array [
@@ -503,7 +503,6 @@ exports[`renders unchecked 1`] = `
       style={
         Array [
           Object {
-            "color": "rgba(28, 27, 31, 1)",
             "fontFamily": "System",
             "fontSize": 16,
             "fontWeight": "400",
@@ -514,6 +513,7 @@ exports[`renders unchecked 1`] = `
             "textAlign": "left",
           },
           Object {
+            "color": "rgba(28, 27, 31, 1)",
             "writingDirection": "ltr",
           },
           Array [