@terreno/ui 57.20.0 → 58.0.0-beta.1
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/.ai/guidelines/core.md +1 -1
- package/CHANGELOG.md +93 -0
- package/dist/ActionSheet.d.ts +9 -9
- package/dist/ActionSheet.d.ts.map +1 -1
- package/dist/ActionSheet.js +11 -4
- package/dist/ActionSheet.js.map +1 -1
- package/dist/AnnouncementNavigator.d.ts +7 -1
- package/dist/AnnouncementNavigator.d.ts.map +1 -1
- package/dist/AnnouncementNavigator.js +15 -16
- package/dist/AnnouncementNavigator.js.map +1 -1
- package/dist/Avatar.d.ts.map +1 -1
- package/dist/Avatar.js +1 -1
- package/dist/Avatar.js.map +1 -1
- package/dist/Box.d.ts.map +1 -1
- package/dist/Box.js +3 -1
- package/dist/Box.js.map +1 -1
- package/dist/Common.d.ts +71 -39
- package/dist/Common.d.ts.map +1 -1
- package/dist/Common.js.map +1 -1
- package/dist/ConsentFormScreen.d.ts.map +1 -1
- package/dist/ConsentFormScreen.js.map +1 -1
- package/dist/ConsentNavigator.d.ts +5 -3
- package/dist/ConsentNavigator.d.ts.map +1 -1
- package/dist/ConsentNavigator.js +4 -4
- package/dist/ConsentNavigator.js.map +1 -1
- package/dist/CustomSelectField.js.map +1 -1
- package/dist/DataTable.d.ts.map +1 -1
- package/dist/DataTable.js +37 -12
- package/dist/DataTable.js.map +1 -1
- package/dist/DateTimeField.js +6 -6
- package/dist/DateTimeField.js.map +1 -1
- package/dist/DropdownPanel.d.ts +0 -5
- package/dist/DropdownPanel.d.ts.map +1 -1
- package/dist/DropdownPanel.js +0 -5
- package/dist/DropdownPanel.js.map +1 -1
- package/dist/FilterAccordion.d.ts.map +1 -1
- package/dist/FilterAccordion.js.map +1 -1
- package/dist/FilterBoolean.d.ts.map +1 -1
- package/dist/FilterBoolean.js.map +1 -1
- package/dist/FilterSelectMenu.js +1 -1
- package/dist/FilterSelectMenu.js.map +1 -1
- package/dist/GPTChat.d.ts.map +1 -1
- package/dist/GPTChat.js.map +1 -1
- package/dist/Heading.d.ts.map +1 -1
- package/dist/Heading.js +6 -12
- package/dist/Heading.js.map +1 -1
- package/dist/HeightField.d.ts.map +1 -1
- package/dist/HeightField.js +9 -9
- package/dist/HeightField.js.map +1 -1
- package/dist/Hyperlink.d.ts.map +1 -1
- package/dist/Hyperlink.js +6 -1
- package/dist/Hyperlink.js.map +1 -1
- package/dist/Image.d.ts +1 -1
- package/dist/MarkdownEditorField.d.ts.map +1 -1
- package/dist/MarkdownEditorField.js +1 -1
- package/dist/MarkdownEditorField.js.map +1 -1
- package/dist/OfflineBanner.d.ts +3 -2
- package/dist/OfflineBanner.d.ts.map +1 -1
- package/dist/OfflineBanner.js +3 -2
- package/dist/OfflineBanner.js.map +1 -1
- package/dist/OtpField.d.ts.map +1 -1
- package/dist/OtpField.js +4 -4
- package/dist/OtpField.js.map +1 -1
- package/dist/PickerSelect.d.ts +4 -4
- package/dist/PickerSelect.d.ts.map +1 -1
- package/dist/PickerSelect.js +9 -9
- package/dist/PickerSelect.js.map +1 -1
- package/dist/ProvisionalConsentSigner.d.ts +3 -2
- package/dist/ProvisionalConsentSigner.d.ts.map +1 -1
- package/dist/ProvisionalConsentSigner.js +2 -2
- package/dist/ProvisionalConsentSigner.js.map +1 -1
- package/dist/SidebarNavigation.js +2 -2
- package/dist/SidebarNavigation.js.map +1 -1
- package/dist/SidebarNavigation.native.js +2 -2
- package/dist/SidebarNavigation.native.js.map +1 -1
- package/dist/Skeleton.js.map +1 -1
- package/dist/TapToEdit.d.ts +1 -1
- package/dist/TapToEdit.d.ts.map +1 -1
- package/dist/TapToEdit.js.map +1 -1
- package/dist/Text.d.ts.map +1 -1
- package/dist/Text.js +27 -50
- package/dist/Text.js.map +1 -1
- package/dist/TextField.d.ts.map +1 -1
- package/dist/TextField.js +4 -4
- package/dist/TextField.js.map +1 -1
- package/dist/Theme.d.ts.map +1 -1
- package/dist/Theme.js +16 -0
- package/dist/Theme.js.map +1 -1
- package/dist/ThumbsUpDownFeedback.d.ts.map +1 -1
- package/dist/ThumbsUpDownFeedback.js.map +1 -1
- package/dist/ToastNotifications.d.ts.map +1 -1
- package/dist/ToastNotifications.js.map +1 -1
- package/dist/Tooltip.d.ts.map +1 -1
- package/dist/Tooltip.js.map +1 -1
- package/dist/Unifier.d.ts +1 -1
- package/dist/WebAddressAutocomplete.js.map +1 -1
- package/dist/WebDropdownMenu.d.ts +3 -3
- package/dist/WebDropdownMenu.d.ts.map +1 -1
- package/dist/WebDropdownMenu.js +1 -1
- package/dist/WebDropdownMenu.js.map +1 -1
- package/dist/announcementPlatform.d.ts +5 -0
- package/dist/announcementPlatform.d.ts.map +1 -1
- package/dist/announcementPlatform.js +9 -0
- package/dist/announcementPlatform.js.map +1 -1
- package/dist/asks/AskCard.d.ts +2 -2
- package/dist/asks/AskCard.d.ts.map +1 -1
- package/dist/dataTableColumnWidths.d.ts +76 -0
- package/dist/dataTableColumnWidths.d.ts.map +1 -0
- package/dist/dataTableColumnWidths.js +181 -0
- package/dist/dataTableColumnWidths.js.map +1 -0
- package/dist/index.d.ts +2 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js.map +1 -1
- package/dist/login/LoginScreen.js.map +1 -1
- package/dist/requestClient.d.ts +71 -0
- package/dist/requestClient.d.ts.map +1 -0
- package/dist/requestClient.js +139 -0
- package/dist/requestClient.js.map +1 -0
- package/dist/security/PasswordCard.d.ts.map +1 -1
- package/dist/security/PasswordCard.js.map +1 -1
- package/dist/security/TwoFactorSettingsCard.d.ts.map +1 -1
- package/dist/security/TwoFactorSettingsCard.js +1 -1
- package/dist/security/TwoFactorSettingsCard.js.map +1 -1
- package/dist/signUp/SignUpScreen.js.map +1 -1
- package/dist/table/Table.d.ts.map +1 -1
- package/dist/table/Table.js.map +1 -1
- package/dist/table/TableTitle.d.ts.map +1 -1
- package/dist/table/TableTitle.js +2 -1
- package/dist/table/TableTitle.js.map +1 -1
- package/dist/textFontSizes.d.ts +12 -0
- package/dist/textFontSizes.d.ts.map +1 -0
- package/dist/textFontSizes.js +21 -0
- package/dist/textFontSizes.js.map +1 -0
- package/dist/useAcknowledgeAnnouncement.d.ts +8 -63
- package/dist/useAcknowledgeAnnouncement.d.ts.map +1 -1
- package/dist/useAcknowledgeAnnouncement.js +31 -80
- package/dist/useAcknowledgeAnnouncement.js.map +1 -1
- package/dist/useAnnouncements.d.ts +14 -47
- package/dist/useAnnouncements.d.ts.map +1 -1
- package/dist/useAnnouncements.js +30 -57
- package/dist/useAnnouncements.js.map +1 -1
- package/dist/useConsentForms.d.ts +6 -38
- package/dist/useConsentForms.d.ts.map +1 -1
- package/dist/useConsentForms.js +25 -48
- package/dist/useConsentForms.js.map +1 -1
- package/dist/useProvisionalConsent.d.ts +7 -58
- package/dist/useProvisionalConsent.d.ts.map +1 -1
- package/dist/useProvisionalConsent.js +57 -67
- package/dist/useProvisionalConsent.js.map +1 -1
- package/dist/useSubmitConsent.d.ts +9 -39
- package/dist/useSubmitConsent.d.ts.map +1 -1
- package/dist/useSubmitConsent.js +10 -39
- package/dist/useSubmitConsent.js.map +1 -1
- package/package.json +40 -38
- package/src/ActionSheet.test.tsx +13 -13
- package/src/ActionSheet.tsx +18 -5
- package/src/AddressField.test.tsx +9 -3
- package/src/AnnouncementNavigator.test.tsx +219 -319
- package/src/AnnouncementNavigator.tsx +25 -20
- package/src/Avatar.tsx +2 -9
- package/src/Badge.test.tsx +1 -1
- package/src/Banner.test.tsx +0 -1
- package/src/Box.test.tsx +85 -77
- package/src/Box.tsx +4 -2
- package/src/Button.test.tsx +11 -6
- package/src/Card.test.tsx +2 -2
- package/src/Common.ts +79 -44
- package/src/ConflictSheet.test.tsx +5 -5
- package/src/ConsentFormScreen.test.tsx +3 -1
- package/src/ConsentFormScreen.tsx +2 -1
- package/src/ConsentNavigator.test.tsx +166 -243
- package/src/ConsentNavigator.tsx +9 -13
- package/src/CustomSelectField.test.tsx +16 -4
- package/src/CustomSelectField.tsx +3 -3
- package/src/DataTable.test.tsx +73 -5
- package/src/DataTable.tsx +72 -19
- package/src/DataTableVirtualizationRegression.test.tsx +1 -0
- package/src/DateTimeActionSheet.test.tsx +2 -0
- package/src/DateTimeField.test.tsx +3 -12
- package/src/DateTimeField.tsx +10 -10
- package/src/DismissButton.test.tsx +22 -4
- package/src/DropdownPanel.tsx +0 -6
- package/src/EmailField.test.tsx +13 -22
- package/src/EmojiSelector.test.tsx +2 -2
- package/src/ErrorBoundary.test.tsx +5 -3
- package/src/Field.test.tsx +20 -44
- package/src/FilterAccordion.tsx +3 -3
- package/src/FilterBoolean.tsx +3 -3
- package/src/FilterSelectMenu.tsx +1 -1
- package/src/GPTChat.test.tsx +24 -16
- package/src/GPTChat.tsx +10 -9
- package/src/Heading.test.tsx +1 -1
- package/src/Heading.tsx +7 -14
- package/src/HeightField.tsx +17 -10
- package/src/Hyperlink.tsx +6 -3
- package/src/Icon.test.tsx +2 -2
- package/src/Image.test.tsx +1 -1
- package/src/Link.test.tsx +13 -6
- package/src/MarkdownEditorField.tsx +10 -2
- package/src/MarkdownView.test.tsx +10 -6
- package/src/MobileAddressAutoComplete.test.tsx +2 -1
- package/src/Modal.test.tsx +10 -3
- package/src/ModalSheet.test.tsx +11 -10
- package/src/MultiselectField.test.tsx +17 -3
- package/src/NumberField.test.tsx +14 -14
- package/src/NumberPickerActionSheet.test.tsx +1 -1
- package/src/OfflineBanner.tsx +3 -2
- package/src/OpenAPIContext.test.tsx +4 -4
- package/src/OpenAPIRenderRegression.test.tsx +1 -1
- package/src/OtpField.tsx +6 -5
- package/src/P0RenderRegression.test.tsx +7 -1
- package/src/P1RenderRegression.test.tsx +1 -0
- package/src/P2ButtonRenderRegression.test.tsx +1 -0
- package/src/Page.test.tsx +1 -1
- package/src/PhoneNumberField.test.tsx +14 -38
- package/src/PickerSelect.tsx +12 -11
- package/src/Popover.test.tsx +2 -2
- package/src/ProvisionalConsentSigner.test.tsx +140 -113
- package/src/ProvisionalConsentSigner.tsx +5 -4
- package/src/RadioField.test.tsx +7 -2
- package/src/SegmentedControl.test.tsx +21 -12
- package/src/SidebarNavigation.native.tsx +2 -2
- package/src/SidebarNavigation.test.tsx +18 -6
- package/src/SidebarNavigation.tsx +2 -2
- package/src/Signature.test.tsx +20 -23
- package/src/Skeleton.tsx +1 -1
- package/src/Slider.test.tsx +1 -1
- package/src/SplitPage.test.tsx +15 -5
- package/src/TapToEdit.test.tsx +40 -17
- package/src/TapToEdit.tsx +1 -1
- package/src/TerrenoFontProvider.test.tsx +1 -1
- package/src/Text.test.tsx +4 -4
- package/src/Text.tsx +25 -51
- package/src/TextField.test.tsx +82 -9
- package/src/TextField.tsx +6 -5
- package/src/Theme.test.tsx +49 -0
- package/src/Theme.tsx +16 -0
- package/src/ThumbsUpDownFeedback.tsx +3 -3
- package/src/Toast.test.tsx +5 -5
- package/src/ToastNotifications.test.tsx +73 -70
- package/src/ToastNotifications.tsx +3 -2
- package/src/ToastNotifications.webModal.test.tsx +6 -3
- package/src/Tooltip.test.tsx +3 -3
- package/src/Tooltip.tsx +2 -1
- package/src/UnifiedAddressAutoComplete.test.tsx +1 -1
- package/src/UserInactivity.test.tsx +1 -0
- package/src/WebAddressAutocomplete.test.tsx +12 -12
- package/src/WebAddressAutocomplete.tsx +3 -3
- package/src/WebDropdownMenu.test.tsx +16 -15
- package/src/WebDropdownMenu.tsx +16 -5
- package/src/__snapshots__/Card.test.tsx.snap +1 -1
- package/src/__snapshots__/DataTable.test.tsx.snap +13 -0
- package/src/__snapshots__/DismissButton.test.tsx.snap +3 -3
- package/src/__snapshots__/Field.test.tsx.snap +4 -2
- package/src/__snapshots__/Heading.test.tsx.snap +1 -1
- package/src/__snapshots__/Image.test.tsx.snap +1 -1
- package/src/__snapshots__/Page.test.tsx.snap +2 -2
- package/src/__snapshots__/Text.test.tsx.snap +1 -1
- package/src/announcementPlatform.ts +10 -0
- package/src/asks/AskCard.test.tsx +20 -15
- package/src/asks/AskCard.tsx +2 -2
- package/src/asks/AskFiles.test.tsx +5 -1
- package/src/asks/askFileRefs.test.ts +1 -1
- package/src/asks/askSummary.test.ts +2 -2
- package/src/benchmarks/importTiming.ts +1 -1
- package/src/blocks/BlocksView.test.tsx +20 -11
- package/src/bunSetup.ts +43 -1
- package/src/dataTableColumnWidths.test.ts +266 -0
- package/src/dataTableColumnWidths.ts +272 -0
- package/src/dataTableFilters.test.tsx +1 -1
- package/src/index.tsx +9 -2
- package/src/isolated/ListDetailLayout.isolated.tsx +2 -4
- package/src/login/LoginScreen.test.tsx +6 -6
- package/src/login/LoginScreen.tsx +2 -2
- package/src/requestClient.test.ts +288 -0
- package/src/requestClient.ts +228 -0
- package/src/security/PasswordCard.test.tsx +3 -3
- package/src/security/PasswordCard.tsx +7 -5
- package/src/security/TwoFactorSettingsCard.tsx +10 -3
- package/src/signUp/SignUpScreen.test.tsx +4 -4
- package/src/signUp/SignUpScreen.tsx +2 -2
- package/src/table/Table.tsx +1 -2
- package/src/table/TableTitle.tsx +2 -1
- package/src/table/tableContext.test.tsx +5 -5
- package/src/test-utils.tsx +132 -1
- package/src/testing/reactDomServer.d.ts +7 -0
- package/src/textFontSizes.ts +31 -0
- package/src/useAcknowledgeAnnouncement.test.ts +101 -193
- package/src/useAcknowledgeAnnouncement.ts +69 -147
- package/src/useAnnouncements.test.ts +122 -186
- package/src/useAnnouncements.ts +49 -105
- package/src/useConsentForms.test.ts +59 -112
- package/src/useConsentForms.ts +37 -87
- package/src/useProvisionalConsent.test.ts +74 -150
- package/src/useProvisionalConsent.ts +79 -125
- package/src/useSubmitConsent.test.ts +59 -85
- package/src/useSubmitConsent.ts +22 -77
package/src/Text.tsx
CHANGED
|
@@ -1,31 +1,14 @@
|
|
|
1
1
|
import React from "react";
|
|
2
|
-
import {Text as NativeText,
|
|
2
|
+
import {Text as NativeText, type TextStyle} from "react-native";
|
|
3
3
|
|
|
4
4
|
import type {TextProps, TextSize} from "./Common";
|
|
5
5
|
import {Hyperlink} from "./Hyperlink";
|
|
6
6
|
import {useTerrenoFontsLoaded} from "./TerrenoFontProvider";
|
|
7
7
|
import {useTheme} from "./Theme";
|
|
8
|
-
|
|
9
|
-
const fontSizeAndWeightWeb = {
|
|
10
|
-
"2xl": {size: 48, weight: "medium"},
|
|
11
|
-
lg: {size: 18, weight: "medium"},
|
|
12
|
-
md: {size: 16, weight: "regular"},
|
|
13
|
-
sm: {size: 12, weight: "regular"},
|
|
14
|
-
xl: {size: 20, weight: "medium"},
|
|
15
|
-
};
|
|
16
|
-
|
|
17
|
-
const fontSizeAndWeighMobile = {
|
|
18
|
-
"2xl": {size: 40, weight: "medium"},
|
|
19
|
-
lg: {size: 16, weight: "medium"},
|
|
20
|
-
md: {size: 14, weight: "regular"},
|
|
21
|
-
sm: {size: 10, weight: "regular"},
|
|
22
|
-
xl: {size: 18, weight: "medium"},
|
|
23
|
-
};
|
|
24
|
-
|
|
25
|
-
const fontSizes = Platform.OS === "web" ? fontSizeAndWeightWeb : fontSizeAndWeighMobile;
|
|
8
|
+
import {textFontSizes} from "./textFontSizes";
|
|
26
9
|
|
|
27
10
|
/** Font size in pixels that `Text` renders at `size` on the current platform. */
|
|
28
|
-
export const getTextFontSize = (size: TextSize): number =>
|
|
11
|
+
export const getTextFontSize = (size: TextSize): number => textFontSizes[size].size;
|
|
29
12
|
|
|
30
13
|
const TextComponent = ({
|
|
31
14
|
accessibilityRole,
|
|
@@ -45,49 +28,40 @@ const TextComponent = ({
|
|
|
45
28
|
const {theme} = useTheme();
|
|
46
29
|
useTerrenoFontsLoaded();
|
|
47
30
|
|
|
48
|
-
const
|
|
49
|
-
|
|
50
|
-
if (
|
|
31
|
+
const isSmallOrMedium = size === "sm" || size === "md";
|
|
32
|
+
let fontFamily: string;
|
|
33
|
+
if (isSmallOrMedium) {
|
|
51
34
|
if (bold && italic) {
|
|
52
|
-
|
|
35
|
+
fontFamily = "text-bold-italic";
|
|
53
36
|
} else if (italic) {
|
|
54
|
-
|
|
37
|
+
fontFamily = "text-regular-italic";
|
|
55
38
|
} else if (bold) {
|
|
56
|
-
|
|
39
|
+
fontFamily = "text-bold";
|
|
57
40
|
} else {
|
|
58
|
-
|
|
41
|
+
fontFamily = "text-regular";
|
|
59
42
|
}
|
|
43
|
+
} else if (bold && italic) {
|
|
44
|
+
fontFamily = "text-bold-italic";
|
|
45
|
+
} else if (italic) {
|
|
46
|
+
fontFamily = "text-medium-italic";
|
|
47
|
+
} else if (bold) {
|
|
48
|
+
fontFamily = "text-bold";
|
|
60
49
|
} else {
|
|
61
|
-
|
|
62
|
-
style.fontFamily = "text-bold-italic";
|
|
63
|
-
} else if (italic) {
|
|
64
|
-
style.fontFamily = "text-medium-italic";
|
|
65
|
-
} else if (bold) {
|
|
66
|
-
style.fontFamily = "text-bold";
|
|
67
|
-
} else {
|
|
68
|
-
style.fontFamily = "text-medium";
|
|
69
|
-
}
|
|
50
|
+
fontFamily = "text-medium";
|
|
70
51
|
}
|
|
71
52
|
|
|
72
|
-
style.fontSize = fontSizes[size].size;
|
|
73
|
-
if (align) {
|
|
74
|
-
style.textAlign = align;
|
|
75
|
-
}
|
|
76
53
|
if (!theme?.text) {
|
|
77
54
|
throw new Error("Text component must be used within TerrenoProvider");
|
|
78
55
|
}
|
|
79
|
-
if (color) {
|
|
80
|
-
style.color = theme.text[color];
|
|
81
|
-
} else {
|
|
82
|
-
style.color = theme.text.primary;
|
|
83
|
-
}
|
|
84
56
|
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
57
|
+
const style: TextStyle = {
|
|
58
|
+
color: color ? theme.text[color] : theme.text.primary,
|
|
59
|
+
fontFamily,
|
|
60
|
+
fontSize: textFontSizes[size].size,
|
|
61
|
+
...(align ? {textAlign: align} : {}),
|
|
62
|
+
...(italic ? {fontStyle: "italic" as const} : {}),
|
|
63
|
+
...(underline ? {textDecorationLine: "underline" as const} : {}),
|
|
64
|
+
};
|
|
91
65
|
let lines = 0;
|
|
92
66
|
if (numberOfLines && truncate && numberOfLines > 1) {
|
|
93
67
|
console.error(`Cannot truncate Text and have ${numberOfLines} lines`);
|
package/src/TextField.test.tsx
CHANGED
|
@@ -5,6 +5,7 @@ import type {ReactElement} from "react";
|
|
|
5
5
|
import type {TextInput} from "react-native";
|
|
6
6
|
import type {TextFieldProps} from "./Common";
|
|
7
7
|
import {TextField} from "./TextField";
|
|
8
|
+
import {defaultThemePrimitives, useTheme} from "./Theme";
|
|
8
9
|
import {renderWithTheme} from "./test-utils";
|
|
9
10
|
|
|
10
11
|
describe("TextField", () => {
|
|
@@ -399,21 +400,25 @@ describe("TextField", () => {
|
|
|
399
400
|
const originalRequestAnimationFrame = globalThis.requestAnimationFrame;
|
|
400
401
|
const originalSetTimeout = globalThis.setTimeout;
|
|
401
402
|
let scheduledRefocus: (() => void) | undefined;
|
|
402
|
-
const setTimeoutSpy = spyOn(globalThis, "setTimeout").mockImplementation(
|
|
403
|
-
|
|
404
|
-
|
|
405
|
-
|
|
406
|
-
|
|
407
|
-
|
|
403
|
+
const setTimeoutSpy = spyOn(globalThis, "setTimeout").mockImplementation(((
|
|
404
|
+
handler: () => void,
|
|
405
|
+
timeout?: number,
|
|
406
|
+
...args: unknown[]
|
|
407
|
+
) => {
|
|
408
|
+
scheduledRefocus = handler;
|
|
409
|
+
return originalSetTimeout(() => {}, timeout, ...args);
|
|
410
|
+
}) as unknown as typeof setTimeout);
|
|
408
411
|
reactNative.Platform.OS = "web";
|
|
409
|
-
|
|
412
|
+
(
|
|
413
|
+
globalThis as {requestAnimationFrame?: typeof requestAnimationFrame}
|
|
414
|
+
).requestAnimationFrame = undefined;
|
|
410
415
|
|
|
411
416
|
try {
|
|
412
417
|
const {getByDisplayValue, getByTestId} = renderWithTheme(
|
|
413
418
|
<TextField onChange={mockOnChange} testID="pw" type="password" value="hunter2" />
|
|
414
419
|
);
|
|
415
420
|
const input = getByDisplayValue("hunter2");
|
|
416
|
-
const webInput = {focus: () =>
|
|
421
|
+
const webInput = {focus: (): void => {}};
|
|
417
422
|
const ref = (input.props as unknown as {ref?: (value: TextInput | null) => void}).ref;
|
|
418
423
|
assert.isFunction(ref);
|
|
419
424
|
const focusSpy = mock(() => {});
|
|
@@ -770,8 +775,10 @@ describe("TextField", () => {
|
|
|
770
775
|
|
|
771
776
|
it("warns for not-yet-supported field types", () => {
|
|
772
777
|
const warnSpy = spyOn(console, "warn").mockImplementation(() => {});
|
|
778
|
+
// TextFieldProps excludes numberRange; untyped callers can still pass it.
|
|
779
|
+
const unsupportedType = "numberRange" as unknown as TextFieldProps["type"];
|
|
773
780
|
try {
|
|
774
|
-
renderWithTheme(<TextField onChange={mockOnChange} type=
|
|
781
|
+
renderWithTheme(<TextField onChange={mockOnChange} type={unsupportedType} value="" />);
|
|
775
782
|
expect(warnSpy).toHaveBeenCalledWith("numberRange is not yet supported");
|
|
776
783
|
} finally {
|
|
777
784
|
warnSpy.mockRestore();
|
|
@@ -1167,4 +1174,70 @@ describe("TextField", () => {
|
|
|
1167
1174
|
}
|
|
1168
1175
|
});
|
|
1169
1176
|
});
|
|
1177
|
+
|
|
1178
|
+
describe("field theming", () => {
|
|
1179
|
+
type ThemeContextValue = ReturnType<typeof useTheme>;
|
|
1180
|
+
|
|
1181
|
+
const renderWithFieldTheme = (
|
|
1182
|
+
props: Partial<TextFieldProps> = {}
|
|
1183
|
+
): {captured: () => ThemeContextValue | undefined; findBox: (color: string) => unknown[]} => {
|
|
1184
|
+
let captured: ThemeContextValue | undefined;
|
|
1185
|
+
const Capture = (): null => {
|
|
1186
|
+
captured = useTheme();
|
|
1187
|
+
return null;
|
|
1188
|
+
};
|
|
1189
|
+
const view = renderWithTheme(
|
|
1190
|
+
<>
|
|
1191
|
+
<Capture />
|
|
1192
|
+
<TextField onChange={() => {}} testID="themed-field" value="" {...props} />
|
|
1193
|
+
</>
|
|
1194
|
+
);
|
|
1195
|
+
const findBox = (color: string): unknown[] =>
|
|
1196
|
+
view.UNSAFE_root.findAll(
|
|
1197
|
+
(node) =>
|
|
1198
|
+
typeof node.type === "string" &&
|
|
1199
|
+
node.props.style?.backgroundColor === color &&
|
|
1200
|
+
node.props.style?.borderRadius === 4
|
|
1201
|
+
);
|
|
1202
|
+
return {captured: () => captured, findBox};
|
|
1203
|
+
};
|
|
1204
|
+
|
|
1205
|
+
it("paints the input box from field.background and field.border", () => {
|
|
1206
|
+
const {captured, findBox} = renderWithFieldTheme();
|
|
1207
|
+
act(() => {
|
|
1208
|
+
captured()?.setTheme({field: {background: "primary000", border: "primary500"}});
|
|
1209
|
+
});
|
|
1210
|
+
const boxes = findBox(defaultThemePrimitives.primary000) as {
|
|
1211
|
+
props: {style: {borderColor: string}};
|
|
1212
|
+
}[];
|
|
1213
|
+
assert.isAbove(boxes.length, 0);
|
|
1214
|
+
assert.equal(boxes[0].props.style.borderColor, defaultThemePrimitives.primary500);
|
|
1215
|
+
});
|
|
1216
|
+
|
|
1217
|
+
it("paints a disabled input from field.backgroundDisabled and field.borderDisabled", () => {
|
|
1218
|
+
const {captured, findBox} = renderWithFieldTheme({disabled: true});
|
|
1219
|
+
act(() => {
|
|
1220
|
+
captured()?.setTheme({
|
|
1221
|
+
field: {backgroundDisabled: "accent050", borderDisabled: "accent700"},
|
|
1222
|
+
});
|
|
1223
|
+
});
|
|
1224
|
+
const boxes = findBox(defaultThemePrimitives.accent050) as {
|
|
1225
|
+
props: {style: {borderColor: string}};
|
|
1226
|
+
}[];
|
|
1227
|
+
assert.isAbove(boxes.length, 0);
|
|
1228
|
+
assert.equal(boxes[0].props.style.borderColor, defaultThemePrimitives.accent700);
|
|
1229
|
+
});
|
|
1230
|
+
|
|
1231
|
+
it("paints an error border from field.borderError", () => {
|
|
1232
|
+
const {captured, findBox} = renderWithFieldTheme({errorText: "Required"});
|
|
1233
|
+
act(() => {
|
|
1234
|
+
captured()?.setTheme({field: {borderError: "warning200"}});
|
|
1235
|
+
});
|
|
1236
|
+
const boxes = findBox(defaultThemePrimitives.neutral000) as {
|
|
1237
|
+
props: {style: {borderColor: string}};
|
|
1238
|
+
}[];
|
|
1239
|
+
assert.isAbove(boxes.length, 0);
|
|
1240
|
+
assert.equal(boxes[0].props.style.borderColor, defaultThemePrimitives.warning200);
|
|
1241
|
+
});
|
|
1242
|
+
});
|
|
1170
1243
|
});
|
package/src/TextField.tsx
CHANGED
|
@@ -8,6 +8,7 @@ import {
|
|
|
8
8
|
type StyleProp,
|
|
9
9
|
TextInput,
|
|
10
10
|
type TextInputChangeEvent,
|
|
11
|
+
type TextInputInstance,
|
|
11
12
|
type TextInputProps,
|
|
12
13
|
View,
|
|
13
14
|
} from "react-native";
|
|
@@ -162,7 +163,7 @@ export const TextField: FC<TextFieldProps> = ({
|
|
|
162
163
|
const [focused, setFocused] = useState(false);
|
|
163
164
|
const [height, setHeight] = useState(rows * 40);
|
|
164
165
|
const [isValueRevealed, setIsValueRevealed] = useState(false);
|
|
165
|
-
const textInputRef = useRef<
|
|
166
|
+
const textInputRef = useRef<TextInputInstance | null>(null);
|
|
166
167
|
|
|
167
168
|
// Clear stale measured height so the next typed character starts at the default row height.
|
|
168
169
|
useEffect(() => {
|
|
@@ -213,11 +214,11 @@ export const TextField: FC<TextFieldProps> = ({
|
|
|
213
214
|
const visibilityToggleWebProps =
|
|
214
215
|
Platform.OS === "web" ? {onMouseDown: preventVisibilityToggleBlur} : {};
|
|
215
216
|
|
|
216
|
-
let borderColor = focused ? theme.
|
|
217
|
+
let borderColor = focused ? theme.field.borderFocus : theme.field.border;
|
|
217
218
|
if (disabled) {
|
|
218
|
-
borderColor = theme.
|
|
219
|
+
borderColor = theme.field.borderDisabled;
|
|
219
220
|
} else if (errorText && !focused) {
|
|
220
|
-
borderColor = theme.
|
|
221
|
+
borderColor = theme.field.borderError;
|
|
221
222
|
}
|
|
222
223
|
const borderWidth = focused ? 3 : errorText ? 2 : 1;
|
|
223
224
|
|
|
@@ -327,7 +328,7 @@ export const TextField: FC<TextFieldProps> = ({
|
|
|
327
328
|
)}
|
|
328
329
|
<View
|
|
329
330
|
style={{
|
|
330
|
-
backgroundColor: disabled ? theme.
|
|
331
|
+
backgroundColor: disabled ? theme.field.backgroundDisabled : theme.field.background,
|
|
331
332
|
borderColor,
|
|
332
333
|
borderRadius: 4,
|
|
333
334
|
borderWidth,
|
package/src/Theme.test.tsx
CHANGED
|
@@ -352,6 +352,55 @@ describe("Theme", () => {
|
|
|
352
352
|
expect(theme?.border?.default).toBeDefined();
|
|
353
353
|
});
|
|
354
354
|
|
|
355
|
+
it("maps field tokens to the colors fields used before field theming", () => {
|
|
356
|
+
const captureTheme = (colorScheme: ThemeColorScheme): ThemeValue | undefined => {
|
|
357
|
+
let theme: ThemeValue | undefined;
|
|
358
|
+
const Capture = () => {
|
|
359
|
+
theme = useTheme().theme;
|
|
360
|
+
return null;
|
|
361
|
+
};
|
|
362
|
+
render(
|
|
363
|
+
<ThemeProvider colorScheme={colorScheme}>
|
|
364
|
+
<Capture />
|
|
365
|
+
</ThemeProvider>
|
|
366
|
+
);
|
|
367
|
+
return theme;
|
|
368
|
+
};
|
|
369
|
+
|
|
370
|
+
for (const colorScheme of ["light", "dark"] as const) {
|
|
371
|
+
const theme = captureTheme(colorScheme);
|
|
372
|
+
assert.deepEqual(theme?.field, {
|
|
373
|
+
background: theme?.surface.base,
|
|
374
|
+
backgroundDisabled: theme?.surface.neutralLight,
|
|
375
|
+
border: theme?.border.dark,
|
|
376
|
+
borderDisabled: theme?.border.activeNeutral,
|
|
377
|
+
borderError: theme?.border.error,
|
|
378
|
+
borderFocus: theme?.border.focus,
|
|
379
|
+
});
|
|
380
|
+
}
|
|
381
|
+
});
|
|
382
|
+
|
|
383
|
+
it("overrides field tokens without changing surface or border tokens", () => {
|
|
384
|
+
let captured: ThemeContextValue | undefined;
|
|
385
|
+
const Capture = () => {
|
|
386
|
+
captured = useTheme();
|
|
387
|
+
return null;
|
|
388
|
+
};
|
|
389
|
+
render(
|
|
390
|
+
<ThemeProvider>
|
|
391
|
+
<Capture />
|
|
392
|
+
</ThemeProvider>
|
|
393
|
+
);
|
|
394
|
+
act(() => {
|
|
395
|
+
captured?.setTheme({field: {background: "primary000", border: "primary500"}});
|
|
396
|
+
});
|
|
397
|
+
assert.equal(captured?.theme.field.background, defaultThemePrimitives.primary000);
|
|
398
|
+
assert.equal(captured?.theme.field.border, defaultThemePrimitives.primary500);
|
|
399
|
+
assert.equal(captured?.theme.field.borderFocus, defaultThemePrimitives.primary200);
|
|
400
|
+
assert.equal(captured?.theme.surface.base, defaultThemePrimitives.neutral000);
|
|
401
|
+
assert.equal(captured?.theme.border.dark, defaultThemePrimitives.neutral500);
|
|
402
|
+
});
|
|
403
|
+
|
|
355
404
|
it("provides spacing values", () => {
|
|
356
405
|
let theme: ThemeValue | undefined;
|
|
357
406
|
const Capture = () => {
|
package/src/Theme.tsx
CHANGED
|
@@ -103,6 +103,14 @@ export const lightThemeConfig: TerrenoThemeConfig = {
|
|
|
103
103
|
warning: "warning100",
|
|
104
104
|
},
|
|
105
105
|
|
|
106
|
+
field: {
|
|
107
|
+
background: "neutral000",
|
|
108
|
+
backgroundDisabled: "neutral300",
|
|
109
|
+
border: "neutral500",
|
|
110
|
+
borderDisabled: "neutral700",
|
|
111
|
+
borderError: "error100",
|
|
112
|
+
borderFocus: "primary200",
|
|
113
|
+
},
|
|
106
114
|
// These will continue to throw errors until we have a proper font system in place.
|
|
107
115
|
// TODO: currently to use these, you need to set fontFamily to "text" or "heading",
|
|
108
116
|
// not theme.font.primary or theme.font.title.
|
|
@@ -184,6 +192,14 @@ export const darkThemeConfig: TerrenoThemeConfig = {
|
|
|
184
192
|
success: "success050",
|
|
185
193
|
warning: "warning050",
|
|
186
194
|
},
|
|
195
|
+
field: {
|
|
196
|
+
background: "neutral800",
|
|
197
|
+
backgroundDisabled: "neutral600",
|
|
198
|
+
border: "neutral300",
|
|
199
|
+
borderDisabled: "neutral100",
|
|
200
|
+
borderError: "error050",
|
|
201
|
+
borderFocus: "primary200",
|
|
202
|
+
},
|
|
187
203
|
status: {
|
|
188
204
|
active: "success050",
|
|
189
205
|
away: "neutral300",
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import MaterialIcons from "@expo/vector-icons/MaterialIcons";
|
|
2
|
-
import {type FC, useCallback} from "react";
|
|
2
|
+
import {type ComponentProps, type FC, useCallback} from "react";
|
|
3
3
|
import {Pressable} from "react-native";
|
|
4
4
|
|
|
5
5
|
import {Box} from "./Box";
|
|
@@ -25,7 +25,7 @@ const TAP_TARGET_SIZE = 32;
|
|
|
25
25
|
* activation key for a checkbox). Not typed by react-native, so it is spread in separately.
|
|
26
26
|
*/
|
|
27
27
|
interface WebKeyDownEvent {
|
|
28
|
-
key
|
|
28
|
+
key?: string;
|
|
29
29
|
preventDefault: () => void;
|
|
30
30
|
repeat?: boolean;
|
|
31
31
|
}
|
|
@@ -86,7 +86,7 @@ export const ThumbsUpDownFeedback: FC<ThumbsUpDownFeedbackProps> = ({
|
|
|
86
86
|
|
|
87
87
|
return (
|
|
88
88
|
<Pressable
|
|
89
|
-
{...webKeyDownProps}
|
|
89
|
+
{...(webKeyDownProps as Pick<ComponentProps<typeof Pressable>, "onKeyDown">)}
|
|
90
90
|
accessibilityLabel={isPositive ? positiveAccessibilityLabel : negativeAccessibilityLabel}
|
|
91
91
|
accessibilityRole="checkbox"
|
|
92
92
|
accessibilityState={{checked: isSelected, disabled, selected: isSelected}}
|
package/src/Toast.test.tsx
CHANGED
|
@@ -4,7 +4,7 @@ import {Text as RNText} from "react-native";
|
|
|
4
4
|
|
|
5
5
|
import {Toast, useToast} from "./Toast";
|
|
6
6
|
import {ToastProvider} from "./ToastNotifications";
|
|
7
|
-
import {renderWithTheme} from "./test-utils";
|
|
7
|
+
import {renderWithTheme, rootJSONNode} from "./test-utils";
|
|
8
8
|
|
|
9
9
|
interface RafGlobal {
|
|
10
10
|
requestAnimationFrame: (callback: FrameRequestCallback) => number;
|
|
@@ -16,16 +16,16 @@ beforeAll(() => {
|
|
|
16
16
|
g.requestAnimationFrame = (callback: FrameRequestCallback) => {
|
|
17
17
|
return setTimeout(() => callback(Date.now()), 0) as unknown as number;
|
|
18
18
|
};
|
|
19
|
-
g.cancelAnimationFrame = (id: number) => {
|
|
20
|
-
clearTimeout(id);
|
|
19
|
+
g.cancelAnimationFrame = (id: number | null | undefined) => {
|
|
20
|
+
clearTimeout(id ?? undefined);
|
|
21
21
|
};
|
|
22
22
|
});
|
|
23
23
|
|
|
24
24
|
describe("Toast", () => {
|
|
25
25
|
it("lets clicks pass through the layout wrapper beside the toast", () => {
|
|
26
26
|
const {toJSON} = renderWithTheme(<Toast title="Pass through" />);
|
|
27
|
-
const wrapper = toJSON()
|
|
28
|
-
const style = Object.assign({}, ...[wrapper
|
|
27
|
+
const wrapper = rootJSONNode(toJSON());
|
|
28
|
+
const style = Object.assign({}, ...[wrapper?.props.style].flat()) as {pointerEvents?: string};
|
|
29
29
|
expect(style.pointerEvents).toBe("box-none");
|
|
30
30
|
});
|
|
31
31
|
|