@terreno/ui 57.16.1 → 57.16.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/Button.d.ts.map +1 -1
- package/dist/Button.js +2 -7
- package/dist/Button.js.map +1 -1
- package/package.json +2 -2
- package/src/Button.test.tsx +13 -2
- package/src/Button.tsx +2 -9
- package/src/__snapshots__/Button.test.tsx.snap +14 -14
- package/src/__snapshots__/DecimalRangeActionSheet.test.tsx.snap +2 -2
- package/src/__snapshots__/DropdownPanel.test.tsx.snap +2 -2
- package/src/__snapshots__/ErrorPage.test.tsx.snap +1 -1
- package/src/__snapshots__/HeightActionSheet.test.tsx.snap +2 -2
- package/src/__snapshots__/HeightField.test.tsx.snap +5 -5
- package/src/__snapshots__/InfoModalIcon.test.tsx.snap +1 -1
- package/src/__snapshots__/Modal.test.tsx.snap +2 -2
- package/src/__snapshots__/NumberPickerActionSheet.test.tsx.snap +2 -2
- package/src/login/__snapshots__/LoginScreen.test.tsx.snap +2 -2
- package/src/signUp/__snapshots__/SignUpScreen.test.tsx.snap +2 -2
package/dist/Button.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Button.d.ts","sourceRoot":"","sources":["../src/Button.tsx"],"names":[],"mappings":"AAQA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAa/B,OAAO,KAAK,EAAuB,WAAW,EAAC,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"Button.d.ts","sourceRoot":"","sources":["../src/Button.tsx"],"names":[],"mappings":"AAQA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAa/B,OAAO,KAAK,EAAuB,WAAW,EAAC,MAAM,UAAU,CAAC;AAwVhE,eAAO,MAAM,MAAM,EAAE,KAAK,CAAC,EAAE,CAAC,WAAW,CAAkB,CAAC"}
|
package/dist/Button.js
CHANGED
|
@@ -5,7 +5,6 @@ import { PressableOpacity, PressableScale, PressableWithoutFeedback, } from "pre
|
|
|
5
5
|
import { lazy, memo, Suspense, useCallback, useEffect, useMemo, useRef, useState } from "react";
|
|
6
6
|
import { ActivityIndicator, Pressable, Text, View, } from "react-native";
|
|
7
7
|
import { Box } from "./Box";
|
|
8
|
-
import { contrastRatio, WCAG_NORMAL_TEXT_CONTRAST } from "./colorContrast";
|
|
9
8
|
import { useCustomIcon } from "./IconRegistry";
|
|
10
9
|
import { isNarrowViewport } from "./MediaQuery";
|
|
11
10
|
import { useTheme } from "./Theme";
|
|
@@ -53,13 +52,9 @@ const ButtonVisual = ({ accessibilityLabel, children, disabled = false, fullWidt
|
|
|
53
52
|
let bgColor = theme.surface.primary;
|
|
54
53
|
let bColor;
|
|
55
54
|
let bWidth;
|
|
56
|
-
//
|
|
57
|
-
//
|
|
55
|
+
// Primary labels and icons stay inverted (white in light mode), including
|
|
56
|
+
// when the button is disabled. The disabled fill is a separate token.
|
|
58
57
|
let textColor = theme.text.inverted;
|
|
59
|
-
if (variant === "primary" &&
|
|
60
|
-
contrastRatio(theme.text.secondaryDark, theme.surface.primary) >= WCAG_NORMAL_TEXT_CONTRAST) {
|
|
61
|
-
textColor = theme.text.secondaryDark;
|
|
62
|
-
}
|
|
63
58
|
if (disabled) {
|
|
64
59
|
bgColor = theme.surface.disabled;
|
|
65
60
|
}
|
package/dist/Button.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Button.js","sourceRoot":"","sources":["../src/Button.tsx"],"names":[],"mappings":";AAAA,OAAO,YAAY,MAAM,iCAAiC,CAAC;AAC3D,OAAO,QAAQ,MAAM,iBAAiB,CAAC;AACvC,OAAO,EAEL,gBAAgB,EAChB,cAAc,EACd,wBAAwB,GACzB,MAAM,SAAS,CAAC;AAEjB,OAAO,EAAC,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,WAAW,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAC,MAAM,OAAO,CAAC;AAC9F,OAAO,EACL,iBAAiB,EACjB,SAAS,EAET,IAAI,EAEJ,IAAI,GAEL,MAAM,cAAc,CAAC;AAEtB,OAAO,EAAC,GAAG,EAAC,MAAM,OAAO,CAAC;AAE1B,OAAO,EAAC,aAAa,
|
|
1
|
+
{"version":3,"file":"Button.js","sourceRoot":"","sources":["../src/Button.tsx"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -26,7 +26,7 @@
|
|
|
26
26
|
"@react-native-picker/picker": "2.11.4",
|
|
27
27
|
"@react-navigation/native": "^7.1.8",
|
|
28
28
|
"@shopify/react-native-skia": "2.6.5",
|
|
29
|
-
"@terreno/blocks": "57.16.
|
|
29
|
+
"@terreno/blocks": "57.16.2",
|
|
30
30
|
"d3-scale": "^4.0.2",
|
|
31
31
|
"d3-shape": "^3.2.0",
|
|
32
32
|
"emoji-datasource": "^16.0.0",
|
|
@@ -163,7 +163,7 @@
|
|
|
163
163
|
"test:coverage": "TZ=America/New_York bun run ../scripts/check-coverage.ts",
|
|
164
164
|
"types": "bun typedoc"
|
|
165
165
|
},
|
|
166
|
-
"version": "57.16.
|
|
166
|
+
"version": "57.16.2",
|
|
167
167
|
"bugs": {
|
|
168
168
|
"url": "https://github.com/TerrenoLabs/terreno/issues"
|
|
169
169
|
},
|
package/src/Button.test.tsx
CHANGED
|
@@ -137,17 +137,28 @@ describe("Button", () => {
|
|
|
137
137
|
expect(toJSON()).toMatchSnapshot();
|
|
138
138
|
});
|
|
139
139
|
|
|
140
|
-
it("uses
|
|
140
|
+
it("uses inverted labels for primary buttons in both modes", () => {
|
|
141
141
|
const light = renderWithTheme(
|
|
142
142
|
<Button onClick={() => {}} text="Light primary" variant="primary" />
|
|
143
143
|
);
|
|
144
|
+
const disabled = renderWithTheme(
|
|
145
|
+
<Button
|
|
146
|
+
disabled
|
|
147
|
+
onClick={() => {}}
|
|
148
|
+
testID="disabled-primary"
|
|
149
|
+
text="Disabled primary"
|
|
150
|
+
variant="primary"
|
|
151
|
+
/>
|
|
152
|
+
);
|
|
144
153
|
const dark = render(
|
|
145
154
|
<ThemeModule.ThemeProvider colorScheme="dark">
|
|
146
155
|
<Button onClick={() => {}} text="Dark primary" variant="primary" />
|
|
147
156
|
</ThemeModule.ThemeProvider>
|
|
148
157
|
);
|
|
149
158
|
|
|
150
|
-
assert.equal(light.getByText("Light primary").props.style.color, "#
|
|
159
|
+
assert.equal(light.getByText("Light primary").props.style.color, "#FFFFFF");
|
|
160
|
+
assert.equal(disabled.getByText("Disabled primary").props.style.color, "#FFFFFF");
|
|
161
|
+
assert.equal(disabled.getByTestId("disabled-primary").props.style.backgroundColor, "#949494");
|
|
151
162
|
assert.equal(dark.getByText("Dark primary").props.style.color, "#353535");
|
|
152
163
|
});
|
|
153
164
|
|
package/src/Button.tsx
CHANGED
|
@@ -20,7 +20,6 @@ import {
|
|
|
20
20
|
|
|
21
21
|
import {Box} from "./Box";
|
|
22
22
|
import type {ButtonPressAnimation, ButtonProps} from "./Common";
|
|
23
|
-
import {contrastRatio, WCAG_NORMAL_TEXT_CONTRAST} from "./colorContrast";
|
|
24
23
|
import {useCustomIcon} from "./IconRegistry";
|
|
25
24
|
import {isNarrowViewport} from "./MediaQuery";
|
|
26
25
|
import {useTheme} from "./Theme";
|
|
@@ -116,15 +115,9 @@ const ButtonVisual: React.FC<ButtonVisualProps> = ({
|
|
|
116
115
|
let bgColor = theme.surface.primary;
|
|
117
116
|
let bColor: string | undefined;
|
|
118
117
|
let bWidth: number | undefined;
|
|
119
|
-
//
|
|
120
|
-
//
|
|
118
|
+
// Primary labels and icons stay inverted (white in light mode), including
|
|
119
|
+
// when the button is disabled. The disabled fill is a separate token.
|
|
121
120
|
let textColor = theme.text.inverted;
|
|
122
|
-
if (
|
|
123
|
-
variant === "primary" &&
|
|
124
|
-
contrastRatio(theme.text.secondaryDark, theme.surface.primary) >= WCAG_NORMAL_TEXT_CONTRAST
|
|
125
|
-
) {
|
|
126
|
-
textColor = theme.text.secondaryDark;
|
|
127
|
-
}
|
|
128
121
|
|
|
129
122
|
if (disabled) {
|
|
130
123
|
bgColor = theme.surface.disabled;
|
|
@@ -17,7 +17,7 @@ exports[`Button renders correctly with default props 1`] = `
|
|
|
17
17
|
],
|
|
18
18
|
"props": {
|
|
19
19
|
"style": {
|
|
20
|
-
"color": "#
|
|
20
|
+
"color": "#FFFFFF",
|
|
21
21
|
"fontSize": 16,
|
|
22
22
|
"fontWeight": "700",
|
|
23
23
|
},
|
|
@@ -89,7 +89,7 @@ exports[`Button renders primary variant 1`] = `
|
|
|
89
89
|
],
|
|
90
90
|
"props": {
|
|
91
91
|
"style": {
|
|
92
|
-
"color": "#
|
|
92
|
+
"color": "#FFFFFF",
|
|
93
93
|
"fontSize": 16,
|
|
94
94
|
"fontWeight": "700",
|
|
95
95
|
},
|
|
@@ -449,7 +449,7 @@ exports[`Button renders disabled state 1`] = `
|
|
|
449
449
|
],
|
|
450
450
|
"props": {
|
|
451
451
|
"style": {
|
|
452
|
-
"color": "#
|
|
452
|
+
"color": "#FFFFFF",
|
|
453
453
|
"fontSize": 16,
|
|
454
454
|
"fontWeight": "700",
|
|
455
455
|
},
|
|
@@ -521,7 +521,7 @@ exports[`Button applies disabled styles when disabled 1`] = `
|
|
|
521
521
|
],
|
|
522
522
|
"props": {
|
|
523
523
|
"style": {
|
|
524
|
-
"color": "#
|
|
524
|
+
"color": "#FFFFFF",
|
|
525
525
|
"fontSize": 16,
|
|
526
526
|
"fontWeight": "700",
|
|
527
527
|
},
|
|
@@ -593,7 +593,7 @@ exports[`Button renders loading state 1`] = `
|
|
|
593
593
|
],
|
|
594
594
|
"props": {
|
|
595
595
|
"style": {
|
|
596
|
-
"color": "#
|
|
596
|
+
"color": "#FFFFFF",
|
|
597
597
|
"fontSize": 16,
|
|
598
598
|
"fontWeight": "700",
|
|
599
599
|
},
|
|
@@ -616,7 +616,7 @@ exports[`Button renders loading state 1`] = `
|
|
|
616
616
|
"$$typeof": Symbol(react.test.json),
|
|
617
617
|
"children": null,
|
|
618
618
|
"props": {
|
|
619
|
-
"color": "#
|
|
619
|
+
"color": "#FFFFFF",
|
|
620
620
|
"size": "small",
|
|
621
621
|
},
|
|
622
622
|
"type": "ActivityIndicator",
|
|
@@ -688,7 +688,7 @@ exports[`Button renders fullWidth button 1`] = `
|
|
|
688
688
|
],
|
|
689
689
|
"props": {
|
|
690
690
|
"style": {
|
|
691
|
-
"color": "#
|
|
691
|
+
"color": "#FFFFFF",
|
|
692
692
|
"fontSize": 16,
|
|
693
693
|
"fontWeight": "700",
|
|
694
694
|
},
|
|
@@ -773,7 +773,7 @@ exports[`Button renders with icon on left 1`] = `
|
|
|
773
773
|
],
|
|
774
774
|
"props": {
|
|
775
775
|
"style": {
|
|
776
|
-
"color": "#
|
|
776
|
+
"color": "#FFFFFF",
|
|
777
777
|
"fontSize": 16,
|
|
778
778
|
"fontWeight": "700",
|
|
779
779
|
},
|
|
@@ -858,7 +858,7 @@ exports[`Button renders with icon on right 1`] = `
|
|
|
858
858
|
],
|
|
859
859
|
"props": {
|
|
860
860
|
"style": {
|
|
861
|
-
"color": "#
|
|
861
|
+
"color": "#FFFFFF",
|
|
862
862
|
"fontSize": 16,
|
|
863
863
|
"fontWeight": "700",
|
|
864
864
|
},
|
|
@@ -930,7 +930,7 @@ exports[`Button renders with confirmation modal props 1`] = `
|
|
|
930
930
|
],
|
|
931
931
|
"props": {
|
|
932
932
|
"style": {
|
|
933
|
-
"color": "#
|
|
933
|
+
"color": "#FFFFFF",
|
|
934
934
|
"fontSize": 16,
|
|
935
935
|
"fontWeight": "700",
|
|
936
936
|
},
|
|
@@ -1002,7 +1002,7 @@ exports[`Button renders with tooltip on desktop (wrapped in Tooltip) 1`] = `
|
|
|
1002
1002
|
],
|
|
1003
1003
|
"props": {
|
|
1004
1004
|
"style": {
|
|
1005
|
-
"color": "#
|
|
1005
|
+
"color": "#FFFFFF",
|
|
1006
1006
|
"fontSize": 16,
|
|
1007
1007
|
"fontWeight": "700",
|
|
1008
1008
|
},
|
|
@@ -1074,7 +1074,7 @@ exports[`Button renders with custom confirmationText and modalSubTitle 1`] = `
|
|
|
1074
1074
|
],
|
|
1075
1075
|
"props": {
|
|
1076
1076
|
"style": {
|
|
1077
|
-
"color": "#
|
|
1077
|
+
"color": "#FFFFFF",
|
|
1078
1078
|
"fontSize": 16,
|
|
1079
1079
|
"fontWeight": "700",
|
|
1080
1080
|
},
|
|
@@ -1146,7 +1146,7 @@ exports[`Button shows loading indicator when loading prop is true 1`] = `
|
|
|
1146
1146
|
],
|
|
1147
1147
|
"props": {
|
|
1148
1148
|
"style": {
|
|
1149
|
-
"color": "#
|
|
1149
|
+
"color": "#FFFFFF",
|
|
1150
1150
|
"fontSize": 16,
|
|
1151
1151
|
"fontWeight": "700",
|
|
1152
1152
|
},
|
|
@@ -1169,7 +1169,7 @@ exports[`Button shows loading indicator when loading prop is true 1`] = `
|
|
|
1169
1169
|
"$$typeof": Symbol(react.test.json),
|
|
1170
1170
|
"children": null,
|
|
1171
1171
|
"props": {
|
|
1172
|
-
"color": "#
|
|
1172
|
+
"color": "#FFFFFF",
|
|
1173
1173
|
"size": "small",
|
|
1174
1174
|
},
|
|
1175
1175
|
"type": "ActivityIndicator",
|
|
@@ -140,7 +140,7 @@ exports[`DecimalRangeActionSheet renders correctly 1`] = `
|
|
|
140
140
|
],
|
|
141
141
|
"props": {
|
|
142
142
|
"style": {
|
|
143
|
-
"color": "#
|
|
143
|
+
"color": "#FFFFFF",
|
|
144
144
|
"fontSize": 16,
|
|
145
145
|
"fontWeight": "700",
|
|
146
146
|
},
|
|
@@ -819,7 +819,7 @@ exports[`DecimalRangeActionSheet renders with different min/max range 1`] = `
|
|
|
819
819
|
],
|
|
820
820
|
"props": {
|
|
821
821
|
"style": {
|
|
822
|
-
"color": "#
|
|
822
|
+
"color": "#FFFFFF",
|
|
823
823
|
"fontSize": 16,
|
|
824
824
|
"fontWeight": "700",
|
|
825
825
|
},
|
|
@@ -60,7 +60,7 @@ exports[`DropdownPanel renders correctly with default props 1`] = `
|
|
|
60
60
|
},
|
|
61
61
|
],
|
|
62
62
|
"props": {
|
|
63
|
-
"fill": "#
|
|
63
|
+
"fill": "#FFFFFF",
|
|
64
64
|
"height": 16,
|
|
65
65
|
"testID": undefined,
|
|
66
66
|
"viewBox": "0 0 512 512",
|
|
@@ -86,7 +86,7 @@ exports[`DropdownPanel renders correctly with default props 1`] = `
|
|
|
86
86
|
],
|
|
87
87
|
"props": {
|
|
88
88
|
"style": {
|
|
89
|
-
"color": "#
|
|
89
|
+
"color": "#FFFFFF",
|
|
90
90
|
"fontSize": 16,
|
|
91
91
|
"fontWeight": "700",
|
|
92
92
|
},
|
|
@@ -155,7 +155,7 @@ exports[`HeightActionSheet renders correctly 1`] = `
|
|
|
155
155
|
],
|
|
156
156
|
"props": {
|
|
157
157
|
"style": {
|
|
158
|
-
"color": "#
|
|
158
|
+
"color": "#FFFFFF",
|
|
159
159
|
"fontSize": 16,
|
|
160
160
|
"fontWeight": "700",
|
|
161
161
|
},
|
|
@@ -846,7 +846,7 @@ exports[`HeightActionSheet renders with different height value 1`] = `
|
|
|
846
846
|
],
|
|
847
847
|
"props": {
|
|
848
848
|
"style": {
|
|
849
|
-
"color": "#
|
|
849
|
+
"color": "#FFFFFF",
|
|
850
850
|
"fontSize": 16,
|
|
851
851
|
"fontWeight": "700",
|
|
852
852
|
},
|
|
@@ -216,7 +216,7 @@ exports[`HeightField snapshots should match snapshot with default props 1`] = `
|
|
|
216
216
|
],
|
|
217
217
|
"props": {
|
|
218
218
|
"style": {
|
|
219
|
-
"color": "#
|
|
219
|
+
"color": "#FFFFFF",
|
|
220
220
|
"fontSize": 16,
|
|
221
221
|
"fontWeight": "700",
|
|
222
222
|
},
|
|
@@ -978,7 +978,7 @@ exports[`HeightField snapshots should match snapshot with value 1`] = `
|
|
|
978
978
|
],
|
|
979
979
|
"props": {
|
|
980
980
|
"style": {
|
|
981
|
-
"color": "#
|
|
981
|
+
"color": "#FFFFFF",
|
|
982
982
|
"fontSize": 16,
|
|
983
983
|
"fontWeight": "700",
|
|
984
984
|
},
|
|
@@ -1840,7 +1840,7 @@ exports[`HeightField snapshots should match snapshot with all props 1`] = `
|
|
|
1840
1840
|
],
|
|
1841
1841
|
"props": {
|
|
1842
1842
|
"style": {
|
|
1843
|
-
"color": "#
|
|
1843
|
+
"color": "#FFFFFF",
|
|
1844
1844
|
"fontSize": 16,
|
|
1845
1845
|
"fontWeight": "700",
|
|
1846
1846
|
},
|
|
@@ -2634,7 +2634,7 @@ exports[`HeightField snapshots should match snapshot when disabled 1`] = `
|
|
|
2634
2634
|
],
|
|
2635
2635
|
"props": {
|
|
2636
2636
|
"style": {
|
|
2637
|
-
"color": "#
|
|
2637
|
+
"color": "#FFFFFF",
|
|
2638
2638
|
"fontSize": 16,
|
|
2639
2639
|
"fontWeight": "700",
|
|
2640
2640
|
},
|
|
@@ -3467,7 +3467,7 @@ exports[`HeightField snapshots should match snapshot with error state 1`] = `
|
|
|
3467
3467
|
],
|
|
3468
3468
|
"props": {
|
|
3469
3469
|
"style": {
|
|
3470
|
-
"color": "#
|
|
3470
|
+
"color": "#FFFFFF",
|
|
3471
3471
|
"fontSize": 16,
|
|
3472
3472
|
"fontWeight": "700",
|
|
3473
3473
|
},
|
|
@@ -428,7 +428,7 @@ exports[`Modal renders with both buttons 1`] = `
|
|
|
428
428
|
],
|
|
429
429
|
"props": {
|
|
430
430
|
"style": {
|
|
431
|
-
"color": "#
|
|
431
|
+
"color": "#FFFFFF",
|
|
432
432
|
"fontSize": 16,
|
|
433
433
|
"fontWeight": "700",
|
|
434
434
|
},
|
|
@@ -682,7 +682,7 @@ exports[`Modal renders with disabled primary button 1`] = `
|
|
|
682
682
|
],
|
|
683
683
|
"props": {
|
|
684
684
|
"style": {
|
|
685
|
-
"color": "#
|
|
685
|
+
"color": "#FFFFFF",
|
|
686
686
|
"fontSize": 16,
|
|
687
687
|
"fontWeight": "700",
|
|
688
688
|
},
|
|
@@ -140,7 +140,7 @@ exports[`NumberPickerActionSheet renders correctly 1`] = `
|
|
|
140
140
|
],
|
|
141
141
|
"props": {
|
|
142
142
|
"style": {
|
|
143
|
-
"color": "#
|
|
143
|
+
"color": "#FFFFFF",
|
|
144
144
|
"fontSize": 16,
|
|
145
145
|
"fontWeight": "700",
|
|
146
146
|
},
|
|
@@ -1469,7 +1469,7 @@ exports[`NumberPickerActionSheet renders with different range 1`] = `
|
|
|
1469
1469
|
],
|
|
1470
1470
|
"props": {
|
|
1471
1471
|
"style": {
|
|
1472
|
-
"color": "#
|
|
1472
|
+
"color": "#FFFFFF",
|
|
1473
1473
|
"fontSize": 16,
|
|
1474
1474
|
"fontWeight": "700",
|
|
1475
1475
|
},
|
|
@@ -327,7 +327,7 @@ exports[`LoginScreen renders correctly with all props 1`] = `
|
|
|
327
327
|
],
|
|
328
328
|
"props": {
|
|
329
329
|
"style": {
|
|
330
|
-
"color": "#
|
|
330
|
+
"color": "#FFFFFF",
|
|
331
331
|
"fontSize": 16,
|
|
332
332
|
"fontWeight": "700",
|
|
333
333
|
},
|
|
@@ -350,7 +350,7 @@ exports[`LoginScreen renders correctly with all props 1`] = `
|
|
|
350
350
|
"$$typeof": Symbol(react.test.json),
|
|
351
351
|
"children": null,
|
|
352
352
|
"props": {
|
|
353
|
-
"color": "#
|
|
353
|
+
"color": "#FFFFFF",
|
|
354
354
|
"size": "small",
|
|
355
355
|
},
|
|
356
356
|
"type": "ActivityIndicator",
|
|
@@ -660,7 +660,7 @@ exports[`SignUpScreen renders correctly with all props 1`] = `
|
|
|
660
660
|
],
|
|
661
661
|
"props": {
|
|
662
662
|
"style": {
|
|
663
|
-
"color": "#
|
|
663
|
+
"color": "#FFFFFF",
|
|
664
664
|
"fontSize": 16,
|
|
665
665
|
"fontWeight": "700",
|
|
666
666
|
},
|
|
@@ -683,7 +683,7 @@ exports[`SignUpScreen renders correctly with all props 1`] = `
|
|
|
683
683
|
"$$typeof": Symbol(react.test.json),
|
|
684
684
|
"children": null,
|
|
685
685
|
"props": {
|
|
686
|
-
"color": "#
|
|
686
|
+
"color": "#FFFFFF",
|
|
687
687
|
"size": "small",
|
|
688
688
|
},
|
|
689
689
|
"type": "ActivityIndicator",
|