react-native-system-ui 1.0.0 → 1.0.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/dist/cjs/components/action-sheet/ActionSheet.js +45 -51
- package/dist/cjs/components/area/Area.js +22 -22
- package/dist/cjs/components/avatar/Avatar.js +23 -23
- package/dist/cjs/components/badge/Badge.js +56 -61
- package/dist/cjs/components/button/Button.js +87 -92
- package/dist/cjs/components/button/ButtonGroup.js +4 -4
- package/dist/cjs/components/calendar/Calendar.js +28 -28
- package/dist/cjs/components/cascader/Cascader.js +205 -212
- package/dist/cjs/components/cell/Cell.js +54 -51
- package/dist/cjs/components/cell/CellGroup.js +26 -25
- package/dist/cjs/components/checkbox/Checkbox.js +1 -0
- package/dist/cjs/components/checkbox/CheckboxGroup.js +20 -19
- package/dist/cjs/components/circle/Circle.js +66 -54
- package/dist/cjs/components/collapse/Collapse.js +18 -18
- package/dist/cjs/components/config-provider/ConfigProvider.js +5 -5
- package/dist/cjs/components/count-down/CountDown.js +17 -17
- package/dist/cjs/components/datetime-picker/DatetimePicker.js +34 -35
- package/dist/cjs/components/dialog/Dialog.js +16 -10
- package/dist/cjs/components/dialog/imperative.js +8 -14
- package/dist/cjs/components/dialog/tokens.js +1 -0
- package/dist/cjs/components/divider/Divider.js +48 -51
- package/dist/cjs/components/empty/Empty.js +30 -25
- package/dist/cjs/components/error-boundary/ErrorBoundary.js +3 -2
- package/dist/cjs/components/flex/Flex.js +27 -27
- package/dist/cjs/components/flex/FlexItem.js +1 -0
- package/dist/cjs/components/form/Form.js +93 -92
- package/dist/cjs/components/form/FormItem.js +60 -54
- package/dist/cjs/components/form/FormList.js +35 -35
- package/dist/cjs/components/grid/Grid.js +48 -48
- package/dist/cjs/components/grid/GridItem.js +9 -2
- package/dist/cjs/components/image/Image.js +25 -24
- package/dist/cjs/components/image/tokens.js +3 -1
- package/dist/cjs/components/image-preview/ImagePreview.js +19 -19
- package/dist/cjs/components/image-preview/tokens.js +3 -1
- package/dist/cjs/components/input/Input.js +16 -19
- package/dist/cjs/components/loading/Loading.js +27 -27
- package/dist/cjs/components/nav-bar/NavBar.js +21 -18
- package/dist/cjs/components/nav-bar/tokens.js +3 -1
- package/dist/cjs/components/notice-bar/NoticeBar.js +7 -3
- package/dist/cjs/components/notice-bar/tokens.js +3 -1
- package/dist/cjs/components/notify/Notify.js +2 -1
- package/dist/cjs/components/notify/imperative.js +17 -17
- package/dist/cjs/components/notify/tokens.js +1 -0
- package/dist/cjs/components/number-keyboard/NumberKeyboard.js +217 -201
- package/dist/cjs/components/number-keyboard/tokens.js +7 -1
- package/dist/cjs/components/overlay/Overlay.js +15 -15
- package/dist/cjs/components/password-input/PasswordInput.js +49 -49
- package/dist/cjs/components/picker/Picker.js +50 -58
- package/dist/cjs/components/popup/Popup.js +10 -10
- package/dist/cjs/components/popup/tokens.js +1 -0
- package/dist/cjs/components/portal/Portal.js +3 -4
- package/dist/cjs/components/progress/Progress.js +94 -95
- package/dist/cjs/components/progress/tokens.js +1 -0
- package/dist/cjs/components/radio/Radio.js +67 -63
- package/dist/cjs/components/radio/RadioGroup.js +6 -6
- package/dist/cjs/components/safe-area-view/SafeAreaView.js +7 -7
- package/dist/cjs/components/search/Search.js +28 -28
- package/dist/cjs/components/selector/Selector.js +19 -26
- package/dist/cjs/components/share-sheet/ShareSheet.js +6 -1
- package/dist/cjs/components/share-sheet/tokens.js +3 -1
- package/dist/cjs/components/sidebar/Sidebar.js +22 -16
- package/dist/cjs/components/sidebar/SidebarItem.js +9 -8
- package/dist/cjs/components/sidebar/tokens.js +3 -1
- package/dist/cjs/components/skeleton/Skeleton.js +43 -42
- package/dist/cjs/components/space/Space.js +45 -41
- package/dist/cjs/components/space/tokens.js +7 -1
- package/dist/cjs/components/stepper/Stepper.js +17 -15
- package/dist/cjs/components/stepper/tokens.js +1 -0
- package/dist/cjs/components/swiper/Swiper.js +10 -7
- package/dist/cjs/components/swiper/SwiperPagIndicator.js +3 -2
- package/dist/cjs/components/switch/Switch.js +23 -23
- package/dist/cjs/components/tabbar/Tabbar.js +26 -26
- package/dist/cjs/components/tabs/Tabs.js +143 -153
- package/dist/cjs/components/tabs/tokens.js +3 -1
- package/dist/cjs/components/tag/Tag.js +38 -38
- package/dist/cjs/components/toast/Toast.js +3 -2
- package/dist/cjs/components/toast/tokens.js +1 -0
- package/dist/cjs/components/typography/Typography.js +23 -21
- package/dist/cjs/components/water-mark/WaterMark.js +65 -65
- package/dist/cjs/design-system/Text.js +38 -0
- package/dist/cjs/design-system/createComponentTokensHook.js +2 -2
- package/dist/cjs/design-system/index.js +7 -0
- package/dist/cjs/design-system/mergeTokensOverride.js +1 -4
- package/dist/cjs/hooks/useControllableValue.js +11 -11
- package/dist/cjs/hooks/useCountDown.js +18 -18
- package/dist/cjs/platform/measure.js +4 -2
- package/dist/cjs/utils/color.js +2 -7
- package/dist/cjs/utils/compare.js +3 -3
- package/dist/cjs/utils/date.js +2 -2
- package/dist/cjs/utils/deepMerge.js +5 -5
- package/dist/cjs/utils/hairline.js +1 -0
- package/dist/cjs/utils/render.js +2 -8
- package/dist/cjs/utils/validate.js +2 -4
- package/dist/es/components/action-sheet/ActionSheet.js +45 -51
- package/dist/es/components/area/Area.js +22 -22
- package/dist/es/components/avatar/Avatar.js +23 -23
- package/dist/es/components/badge/Badge.js +56 -61
- package/dist/es/components/button/Button.js +87 -92
- package/dist/es/components/button/ButtonGroup.js +4 -4
- package/dist/es/components/calendar/Calendar.js +28 -28
- package/dist/es/components/cascader/Cascader.js +205 -212
- package/dist/es/components/cell/Cell.js +55 -52
- package/dist/es/components/cell/CellGroup.js +26 -25
- package/dist/es/components/checkbox/Checkbox.js +1 -0
- package/dist/es/components/checkbox/CheckboxGroup.js +20 -19
- package/dist/es/components/circle/Circle.js +66 -54
- package/dist/es/components/collapse/Collapse.js +18 -18
- package/dist/es/components/config-provider/ConfigProvider.js +5 -5
- package/dist/es/components/count-down/CountDown.js +17 -17
- package/dist/es/components/datetime-picker/DatetimePicker.js +34 -35
- package/dist/es/components/dialog/Dialog.js +16 -10
- package/dist/es/components/dialog/imperative.js +8 -14
- package/dist/es/components/dialog/tokens.js +1 -0
- package/dist/es/components/divider/Divider.js +48 -51
- package/dist/es/components/empty/Empty.js +30 -25
- package/dist/es/components/error-boundary/ErrorBoundary.js +3 -2
- package/dist/es/components/flex/Flex.js +27 -27
- package/dist/es/components/flex/FlexItem.js +1 -0
- package/dist/es/components/form/Form.js +93 -92
- package/dist/es/components/form/FormItem.js +60 -54
- package/dist/es/components/form/FormList.js +35 -35
- package/dist/es/components/grid/Grid.js +48 -48
- package/dist/es/components/grid/GridItem.js +10 -3
- package/dist/es/components/image/Image.js +25 -24
- package/dist/es/components/image/tokens.js +3 -1
- package/dist/es/components/image-preview/ImagePreview.js +19 -19
- package/dist/es/components/image-preview/tokens.js +3 -1
- package/dist/es/components/input/Input.js +16 -19
- package/dist/es/components/loading/Loading.js +27 -27
- package/dist/es/components/nav-bar/NavBar.js +21 -18
- package/dist/es/components/nav-bar/tokens.js +3 -1
- package/dist/es/components/notice-bar/NoticeBar.js +7 -3
- package/dist/es/components/notice-bar/tokens.js +3 -1
- package/dist/es/components/notify/Notify.js +2 -1
- package/dist/es/components/notify/imperative.js +17 -17
- package/dist/es/components/notify/tokens.js +1 -0
- package/dist/es/components/number-keyboard/NumberKeyboard.js +217 -201
- package/dist/es/components/number-keyboard/tokens.js +7 -1
- package/dist/es/components/overlay/Overlay.js +15 -15
- package/dist/es/components/password-input/PasswordInput.js +49 -49
- package/dist/es/components/picker/Picker.js +50 -58
- package/dist/es/components/popup/Popup.js +10 -10
- package/dist/es/components/popup/tokens.js +1 -0
- package/dist/es/components/portal/Portal.js +3 -4
- package/dist/es/components/progress/Progress.js +94 -95
- package/dist/es/components/progress/tokens.js +1 -0
- package/dist/es/components/radio/Radio.js +67 -63
- package/dist/es/components/radio/RadioGroup.js +6 -6
- package/dist/es/components/safe-area-view/SafeAreaView.js +7 -7
- package/dist/es/components/search/Search.js +28 -28
- package/dist/es/components/selector/Selector.js +19 -26
- package/dist/es/components/share-sheet/ShareSheet.js +6 -1
- package/dist/es/components/share-sheet/tokens.js +3 -1
- package/dist/es/components/sidebar/Sidebar.js +22 -16
- package/dist/es/components/sidebar/SidebarItem.js +9 -8
- package/dist/es/components/sidebar/tokens.js +3 -1
- package/dist/es/components/skeleton/Skeleton.js +43 -42
- package/dist/es/components/space/Space.js +45 -41
- package/dist/es/components/space/tokens.js +7 -1
- package/dist/es/components/stepper/Stepper.js +17 -15
- package/dist/es/components/stepper/tokens.js +1 -0
- package/dist/es/components/swiper/Swiper.js +11 -8
- package/dist/es/components/swiper/SwiperPagIndicator.js +3 -2
- package/dist/es/components/switch/Switch.js +23 -23
- package/dist/es/components/tabbar/Tabbar.js +26 -26
- package/dist/es/components/tabs/Tabs.js +144 -154
- package/dist/es/components/tabs/tokens.js +3 -1
- package/dist/es/components/tag/Tag.js +38 -38
- package/dist/es/components/toast/Toast.js +3 -2
- package/dist/es/components/toast/tokens.js +1 -0
- package/dist/es/components/typography/Typography.js +23 -21
- package/dist/es/components/water-mark/WaterMark.js +65 -65
- package/dist/es/design-system/Text.js +19 -0
- package/dist/es/design-system/createComponentTokensHook.js +2 -2
- package/dist/es/design-system/index.js +1 -0
- package/dist/es/design-system/mergeTokensOverride.js +1 -4
- package/dist/es/hooks/useControllableValue.js +11 -11
- package/dist/es/hooks/useCountDown.js +18 -18
- package/dist/es/platform/measure.js +4 -2
- package/dist/es/utils/color.js +1 -4
- package/dist/es/utils/compare.js +3 -3
- package/dist/es/utils/date.js +2 -2
- package/dist/es/utils/deepMerge.js +5 -5
- package/dist/es/utils/hairline.js +1 -0
- package/dist/es/utils/render.js +1 -1
- package/dist/es/utils/validate.js +1 -2
- package/dist/types/components/dialog/tokens.d.ts +1 -0
- package/dist/types/components/image-preview/tokens.d.ts +1 -0
- package/dist/types/components/nav-bar/tokens.d.ts +1 -1
- package/dist/types/components/notice-bar/tokens.d.ts +1 -0
- package/dist/types/components/number-keyboard/tokens.d.ts +5 -0
- package/dist/types/components/picker/Picker.d.ts +1 -1
- package/dist/types/components/popup/tokens.d.ts +1 -0
- package/dist/types/components/share-sheet/tokens.d.ts +1 -0
- package/dist/types/components/stepper/tokens.d.ts +1 -0
- package/dist/types/components/tabs/tokens.d.ts +1 -0
- package/dist/types/components/toast/tokens.d.ts +1 -0
- package/dist/types/design-system/Text.d.ts +3 -0
- package/dist/types/design-system/index.d.ts +1 -0
- package/dist/types/hooks/useCountDown.d.ts +1 -1
- package/dist/types/utils/color.d.ts +0 -2
- package/dist/types/utils/date.d.ts +1 -1
- package/dist/types/utils/render.d.ts +1 -1
- package/dist/types/utils/validate.d.ts +0 -1
- package/package.json +17 -3
|
@@ -14,66 +14,63 @@ const ROUND_CORNER_STYLE = {
|
|
|
14
14
|
overflow: 'hidden'
|
|
15
15
|
};
|
|
16
16
|
const ButtonImpl = (props, forwardedRef) => {
|
|
17
|
-
const
|
|
17
|
+
const grp = useContext(ButtonGroupContext);
|
|
18
18
|
const {
|
|
19
19
|
text,
|
|
20
20
|
children,
|
|
21
21
|
icon,
|
|
22
|
-
iconPosition:
|
|
23
|
-
type:
|
|
24
|
-
size:
|
|
22
|
+
iconPosition: iconPosP,
|
|
23
|
+
type: typeP,
|
|
24
|
+
size: sizeP,
|
|
25
25
|
color,
|
|
26
|
-
textColor:
|
|
27
|
-
plain:
|
|
28
|
-
block:
|
|
29
|
-
round:
|
|
30
|
-
square:
|
|
31
|
-
hairline:
|
|
32
|
-
shadow:
|
|
33
|
-
loading:
|
|
26
|
+
textColor: txtClrP,
|
|
27
|
+
plain: plainP,
|
|
28
|
+
block: blockP,
|
|
29
|
+
round: roundP,
|
|
30
|
+
square: sqP,
|
|
31
|
+
hairline: hlP,
|
|
32
|
+
shadow: shP,
|
|
33
|
+
loading: loadP,
|
|
34
34
|
loadingText,
|
|
35
35
|
loadingIndicator,
|
|
36
|
-
loadingSize:
|
|
37
|
-
disabled:
|
|
38
|
-
allowFontScaling:
|
|
36
|
+
loadingSize: loadSzP,
|
|
37
|
+
disabled: disP,
|
|
38
|
+
allowFontScaling: fontScaleP,
|
|
39
39
|
maxFontSizeMultiplier,
|
|
40
|
-
rippleColor:
|
|
40
|
+
rippleColor: rippleP,
|
|
41
41
|
contentStyle,
|
|
42
42
|
textStyle,
|
|
43
43
|
tokensOverride,
|
|
44
44
|
style,
|
|
45
|
-
...
|
|
45
|
+
...pressProps
|
|
46
46
|
} = props;
|
|
47
47
|
const tokens = useButtonTokens(tokensOverride);
|
|
48
|
-
const type =
|
|
49
|
-
const size =
|
|
50
|
-
const plain =
|
|
51
|
-
const block =
|
|
52
|
-
const round =
|
|
53
|
-
const square =
|
|
54
|
-
const hairline =
|
|
55
|
-
const
|
|
56
|
-
const disabled =
|
|
57
|
-
const loading =
|
|
58
|
-
const
|
|
59
|
-
const allowFontScaling =
|
|
60
|
-
const
|
|
61
|
-
const
|
|
48
|
+
const type = typeP ?? grp?.type ?? tokens.defaults.type;
|
|
49
|
+
const size = sizeP ?? grp?.size ?? tokens.defaults.size;
|
|
50
|
+
const plain = plainP ?? grp?.plain ?? tokens.defaults.plain;
|
|
51
|
+
const block = blockP ?? grp?.block ?? tokens.defaults.block;
|
|
52
|
+
const round = roundP ?? grp?.round ?? tokens.defaults.round;
|
|
53
|
+
const square = sqP ?? grp?.square ?? tokens.defaults.square;
|
|
54
|
+
const hairline = hlP ?? grp?.hairline ?? tokens.defaults.hairline;
|
|
55
|
+
const iconPos = iconPosP ?? grp?.iconPosition ?? tokens.defaults.iconPosition;
|
|
56
|
+
const disabled = disP ?? grp?.disabled ?? tokens.defaults.disabled;
|
|
57
|
+
const loading = loadP ?? tokens.defaults.loading;
|
|
58
|
+
const loadSz = loadSzP ?? tokens.defaults.loadingSize;
|
|
59
|
+
const allowFontScaling = fontScaleP ?? tokens.defaults.allowFontScaling;
|
|
60
|
+
const shVal = shP ?? grp?.shadow;
|
|
61
|
+
const isDis = disabled || loading;
|
|
62
62
|
const tone = tokens.colors.tones[type] ?? tokens.colors.tones.default;
|
|
63
|
-
const
|
|
64
|
-
const [
|
|
65
|
-
if (plain) return [tokens.colors.backgroundPlain, color ?? tone.border, textColorProp ?? (type === 'default' && !color ? tone.text : color ?? tone.border)];
|
|
66
|
-
return [color ?? tone.background, color ?? tone.border, textColorProp ?? (color ? '#ffffff' : tone.text)];
|
|
67
|
-
}, [color, textColorProp, plain, type, tone, tokens.colors.backgroundPlain]);
|
|
63
|
+
const szTok = tokens.sizing.sizes[size];
|
|
64
|
+
const [bgClr, borderClr, txtClr] = useMemo(() => plain ? [tokens.colors.backgroundPlain, color ?? tone.border, txtClrP ?? (type === 'default' && !color ? tone.text : color ?? tone.border)] : [color ?? tone.background, color ?? tone.border, txtClrP ?? (color ? '#ffffff' : tone.text)], [color, txtClrP, plain, type, tone, tokens.colors.backgroundPlain]);
|
|
68
65
|
const hasBorder = plain || type === 'default';
|
|
69
|
-
const
|
|
70
|
-
const
|
|
71
|
-
const
|
|
72
|
-
const
|
|
66
|
+
const useHl = hasBorder && hairline;
|
|
67
|
+
const borderW = hasBorder && !hairline ? tokens.borders.width : 0;
|
|
68
|
+
const radius = square ? 0 : round ? szTok.height / 2 : szTok.radius;
|
|
69
|
+
const shStyle = useMemo(() => {
|
|
73
70
|
if (plain) return undefined;
|
|
74
|
-
const
|
|
75
|
-
return
|
|
76
|
-
}, [
|
|
71
|
+
const lvl = isFiniteNumber(shVal) ? clampShadowLevel(shVal) : shVal === true ? 2 : undefined;
|
|
72
|
+
return lvl ? createPlatformShadow(tokens.shadows[lvl]) : undefined;
|
|
73
|
+
}, [shVal, plain, tokens.shadows]);
|
|
77
74
|
const {
|
|
78
75
|
onPress,
|
|
79
76
|
onPressIn,
|
|
@@ -82,105 +79,103 @@ const ButtonImpl = (props, forwardedRef) => {
|
|
|
82
79
|
accessibilityHint,
|
|
83
80
|
accessibilityRole,
|
|
84
81
|
accessibilityState,
|
|
85
|
-
android_ripple:
|
|
82
|
+
android_ripple: andRippleP,
|
|
86
83
|
...viewProps
|
|
87
|
-
} =
|
|
84
|
+
} = pressProps;
|
|
88
85
|
const {
|
|
89
86
|
interactionProps,
|
|
90
87
|
states
|
|
91
88
|
} = useAriaPress({
|
|
92
|
-
disabled:
|
|
89
|
+
disabled: isDis,
|
|
93
90
|
onPress: onPress || undefined,
|
|
94
91
|
onPressStart: onPressIn || undefined,
|
|
95
92
|
onPressEnd: onPressOut || undefined
|
|
96
93
|
});
|
|
97
94
|
const opacity = disabled ? tokens.states.disabledOpacity : loading ? tokens.states.loadingOpacity : states.pressed ? tokens.states.pressedOpacity : 1;
|
|
98
|
-
const
|
|
95
|
+
const txtStyle = useMemo(() => ({
|
|
99
96
|
fontFamily: tokens.typography.fontFamily,
|
|
100
97
|
fontWeight: tokens.typography.fontWeight,
|
|
101
|
-
fontSize:
|
|
102
|
-
lineHeight:
|
|
103
|
-
color:
|
|
104
|
-
}), [tokens.typography,
|
|
98
|
+
fontSize: szTok.fontSize,
|
|
99
|
+
lineHeight: szTok.fontSize * tokens.typography.lineHeightMultiplier,
|
|
100
|
+
color: txtClr
|
|
101
|
+
}), [tokens.typography, szTok.fontSize, txtClr]);
|
|
105
102
|
const iconGap = tokens.spacing.iconGap;
|
|
106
|
-
const
|
|
103
|
+
const rIcon = () => {
|
|
107
104
|
if (!icon) return null;
|
|
108
105
|
try {
|
|
109
|
-
const
|
|
110
|
-
const margin =
|
|
106
|
+
const el = isFunction(icon) ? icon(txtClr, szTok.iconSize) : icon;
|
|
107
|
+
const margin = iconPos === 'left' ? {
|
|
111
108
|
marginRight: iconGap
|
|
112
109
|
} : {
|
|
113
110
|
marginLeft: iconGap
|
|
114
111
|
};
|
|
115
112
|
return /*#__PURE__*/React.createElement(View, {
|
|
116
113
|
style: [tokens.layout.iconWrapper, margin]
|
|
117
|
-
},
|
|
114
|
+
}, el);
|
|
118
115
|
} catch (err) {
|
|
119
116
|
if (__DEV__) console.warn('[Button] Failed to render icon:', err);
|
|
120
117
|
return null;
|
|
121
118
|
}
|
|
122
119
|
};
|
|
123
|
-
const
|
|
120
|
+
const rLoad = () => /*#__PURE__*/React.createElement(View, {
|
|
124
121
|
style: [tokens.layout.iconWrapper, {
|
|
125
122
|
marginRight: iconGap
|
|
126
123
|
}]
|
|
127
124
|
}, loadingIndicator ?? /*#__PURE__*/React.createElement(ActivityIndicator, {
|
|
128
|
-
size:
|
|
129
|
-
color:
|
|
125
|
+
size: loadSz,
|
|
126
|
+
color: txtClr
|
|
130
127
|
}));
|
|
131
128
|
const label = loading && loadingText !== undefined ? loadingText : text !== undefined ? text : children;
|
|
132
|
-
const
|
|
129
|
+
const rLabel = () => {
|
|
133
130
|
if (label == null) return null;
|
|
134
|
-
if (typeof label === 'string' || typeof label === 'number') {
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
}, isString(label) ? ensureSpace(label, true) : String(label));
|
|
141
|
-
}
|
|
131
|
+
if (typeof label === 'string' || typeof label === 'number') return /*#__PURE__*/React.createElement(Text, {
|
|
132
|
+
style: [tokens.layout.text, txtStyle, textStyle],
|
|
133
|
+
numberOfLines: 1,
|
|
134
|
+
allowFontScaling: allowFontScaling,
|
|
135
|
+
maxFontSizeMultiplier: maxFontSizeMultiplier
|
|
136
|
+
}, isString(label) ? ensureSpace(label, true) : String(label));
|
|
142
137
|
return label;
|
|
143
138
|
};
|
|
144
|
-
const
|
|
145
|
-
const
|
|
139
|
+
const accLabel = accessibilityLabel ?? (typeof label === 'string' || typeof label === 'number' ? String(label) : undefined);
|
|
140
|
+
const accState = useMemo(() => ({
|
|
146
141
|
...accessibilityState,
|
|
147
|
-
disabled:
|
|
142
|
+
disabled: isDis,
|
|
148
143
|
busy: loading
|
|
149
|
-
}), [accessibilityState,
|
|
150
|
-
const
|
|
151
|
-
if (Platform.OS !== 'android') return
|
|
152
|
-
if (
|
|
153
|
-
const
|
|
144
|
+
}), [accessibilityState, isDis, loading]);
|
|
145
|
+
const andRipple = useMemo(() => {
|
|
146
|
+
if (Platform.OS !== 'android') return andRippleP;
|
|
147
|
+
if (andRippleP) return andRippleP;
|
|
148
|
+
const rc = rippleP ?? (plain ? txtClr : type === 'default' && !color ? withAlpha(txtClr, 0.15) : tokens.colors.ripple);
|
|
154
149
|
return {
|
|
155
|
-
color:
|
|
150
|
+
color: rc,
|
|
156
151
|
borderless: false
|
|
157
152
|
};
|
|
158
|
-
}, [
|
|
153
|
+
}, [andRippleP, rippleP, plain, txtClr, type, color, tokens.colors.ripple]);
|
|
159
154
|
return /*#__PURE__*/React.createElement(Pressable, _extends({
|
|
160
155
|
ref: forwardedRef,
|
|
161
|
-
disabled:
|
|
156
|
+
disabled: isDis,
|
|
162
157
|
style: [tokens.layout.base, {
|
|
163
|
-
minHeight:
|
|
164
|
-
paddingHorizontal:
|
|
165
|
-
borderRadius:
|
|
166
|
-
backgroundColor:
|
|
167
|
-
borderColor:
|
|
168
|
-
borderWidth:
|
|
169
|
-
opacity
|
|
170
|
-
}, Platform.OS === 'android' &&
|
|
171
|
-
android_ripple:
|
|
158
|
+
minHeight: szTok.height,
|
|
159
|
+
paddingHorizontal: szTok.paddingHorizontal,
|
|
160
|
+
borderRadius: radius,
|
|
161
|
+
backgroundColor: bgClr,
|
|
162
|
+
borderColor: useHl ? 'transparent' : borderClr,
|
|
163
|
+
borderWidth: borderW,
|
|
164
|
+
opacity
|
|
165
|
+
}, Platform.OS === 'android' && radius > 0 && !shStyle ? ROUND_CORNER_STYLE : null, block ? tokens.layout.block : null, shStyle, style],
|
|
166
|
+
android_ripple: andRipple
|
|
172
167
|
}, interactionProps, {
|
|
173
|
-
accessibilityState:
|
|
168
|
+
accessibilityState: accState,
|
|
174
169
|
accessibilityRole: accessibilityRole ?? 'button',
|
|
175
|
-
accessibilityLabel:
|
|
170
|
+
accessibilityLabel: accLabel,
|
|
176
171
|
accessibilityHint: accessibilityHint
|
|
177
172
|
}, viewProps), /*#__PURE__*/React.createElement(View, {
|
|
178
173
|
style: [tokens.layout.content, contentStyle]
|
|
179
|
-
}, loading ? /*#__PURE__*/React.createElement(React.Fragment, null,
|
|
174
|
+
}, loading ? /*#__PURE__*/React.createElement(React.Fragment, null, rLoad(), rLabel()) : /*#__PURE__*/React.createElement(React.Fragment, null, icon && iconPos === 'left' && rIcon(), rLabel(), icon && iconPos === 'right' && rIcon())), useHl && /*#__PURE__*/React.createElement(View, {
|
|
180
175
|
style: createHairlineView({
|
|
181
176
|
position: 'all',
|
|
182
|
-
color:
|
|
183
|
-
borderRadius
|
|
177
|
+
color: borderClr,
|
|
178
|
+
borderRadius: radius
|
|
184
179
|
})
|
|
185
180
|
}));
|
|
186
181
|
};
|
|
@@ -20,7 +20,7 @@ export const ButtonGroup = /*#__PURE__*/React.memo(({
|
|
|
20
20
|
}) => {
|
|
21
21
|
const tokens = useButtonTokens();
|
|
22
22
|
const gap = spacing ?? tokens.spacing.groupGap;
|
|
23
|
-
const
|
|
23
|
+
const grpVal = useMemo(() => ({
|
|
24
24
|
type,
|
|
25
25
|
size,
|
|
26
26
|
plain,
|
|
@@ -32,15 +32,15 @@ export const ButtonGroup = /*#__PURE__*/React.memo(({
|
|
|
32
32
|
iconPosition,
|
|
33
33
|
hairline
|
|
34
34
|
}), [block, disabled, hairline, iconPosition, plain, round, shadow, size, square, type]);
|
|
35
|
-
const
|
|
35
|
+
const ctrStyle = useMemo(() => [{
|
|
36
36
|
flexDirection: direction === 'horizontal' ? 'row' : 'column',
|
|
37
37
|
alignItems: 'center',
|
|
38
38
|
gap,
|
|
39
39
|
width: block ? '100%' : undefined
|
|
40
40
|
}, style], [block, direction, gap, style]);
|
|
41
41
|
return /*#__PURE__*/React.createElement(ButtonGroupContext.Provider, {
|
|
42
|
-
value:
|
|
42
|
+
value: grpVal
|
|
43
43
|
}, /*#__PURE__*/React.createElement(View, {
|
|
44
|
-
style:
|
|
44
|
+
style: ctrStyle
|
|
45
45
|
}, children));
|
|
46
46
|
});
|
|
@@ -57,12 +57,12 @@ const CalendarImpl = props => {
|
|
|
57
57
|
...rest
|
|
58
58
|
} = props;
|
|
59
59
|
const locale = useLocale();
|
|
60
|
-
const
|
|
60
|
+
const calLoc = locale?.vanCalendar;
|
|
61
61
|
const tokens = useCalendarTokens(tokensOverride);
|
|
62
|
-
const resolvedTitle = title ??
|
|
62
|
+
const resolvedTitle = title ?? calLoc?.title ?? tokens.defaults.title;
|
|
63
63
|
const resolvedShowSubtitle = showSubtitle ?? tokens.defaults.showSubtitle;
|
|
64
64
|
const resolvedShowHeader = showHeader ?? tokens.defaults.showHeader;
|
|
65
|
-
const resolvedConfirmText = confirmText ??
|
|
65
|
+
const resolvedConfirmText = confirmText ?? calLoc?.confirm ?? tokens.defaults.confirmText;
|
|
66
66
|
const resolvedWeekStartsOn = weekStartsOn ?? tokens.defaults.weekStartsOn;
|
|
67
67
|
const resolvedAllowSameDay = allowSameDay ?? tokens.defaults.allowSameDay;
|
|
68
68
|
const resolvedPoppable = poppable ?? tokens.defaults.poppable;
|
|
@@ -87,7 +87,7 @@ const CalendarImpl = props => {
|
|
|
87
87
|
overlay: popupOverlay,
|
|
88
88
|
...popupRestProps
|
|
89
89
|
} = popupProps ?? {};
|
|
90
|
-
const
|
|
90
|
+
const cbRef = useRef({
|
|
91
91
|
onConfirm,
|
|
92
92
|
onOverRange,
|
|
93
93
|
popupOnOpen,
|
|
@@ -99,36 +99,36 @@ const CalendarImpl = props => {
|
|
|
99
99
|
popupOnClosed,
|
|
100
100
|
onClosed
|
|
101
101
|
});
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
102
|
+
cbRef.current.onConfirm = onConfirm;
|
|
103
|
+
cbRef.current.onOverRange = onOverRange;
|
|
104
|
+
cbRef.current.popupOnOpen = popupOnOpen;
|
|
105
|
+
cbRef.current.onOpen = onOpen;
|
|
106
|
+
cbRef.current.popupOnOpened = popupOnOpened;
|
|
107
|
+
cbRef.current.onOpened = onOpened;
|
|
108
|
+
cbRef.current.popupOnClose = popupOnClose;
|
|
109
|
+
cbRef.current.onClose = onClose;
|
|
110
|
+
cbRef.current.popupOnClosed = popupOnClosed;
|
|
111
|
+
cbRef.current.onClosed = onClosed;
|
|
112
112
|
const closePopup = useCallback(() => {
|
|
113
113
|
if (!resolvedPoppable) return;
|
|
114
114
|
setPopupVisible(false);
|
|
115
115
|
}, [resolvedPoppable, setPopupVisible]);
|
|
116
116
|
const handlePopupOpen = useCallback(() => {
|
|
117
|
-
|
|
118
|
-
|
|
117
|
+
cbRef.current.popupOnOpen?.();
|
|
118
|
+
cbRef.current.onOpen?.();
|
|
119
119
|
}, []);
|
|
120
120
|
const handlePopupOpened = useCallback(() => {
|
|
121
|
-
|
|
122
|
-
|
|
121
|
+
cbRef.current.popupOnOpened?.();
|
|
122
|
+
cbRef.current.onOpened?.();
|
|
123
123
|
}, []);
|
|
124
124
|
const handlePopupClose = useCallback(() => {
|
|
125
125
|
closePopup();
|
|
126
|
-
|
|
127
|
-
|
|
126
|
+
cbRef.current.popupOnClose?.();
|
|
127
|
+
cbRef.current.onClose?.();
|
|
128
128
|
}, [closePopup]);
|
|
129
129
|
const handlePopupClosed = useCallback(() => {
|
|
130
|
-
|
|
131
|
-
|
|
130
|
+
cbRef.current.popupOnClosed?.();
|
|
131
|
+
cbRef.current.onClosed?.();
|
|
132
132
|
}, []);
|
|
133
133
|
const overlayCloseOnPressResolved = overlayCloseOnPress ?? resolvedCloseOnClickOverlay;
|
|
134
134
|
const overlayResolved = popupOverlay ?? true;
|
|
@@ -157,9 +157,9 @@ const CalendarImpl = props => {
|
|
|
157
157
|
} : null), [monthDays]);
|
|
158
158
|
const minDayTime = startOfDay(minDate).getTime();
|
|
159
159
|
const maxDayTime = startOfDay(maxDate).getTime();
|
|
160
|
-
const resolvedWeekdays = weekdays ??
|
|
160
|
+
const resolvedWeekdays = weekdays ?? calLoc?.weekdays ?? tokens.defaults.weekdays;
|
|
161
161
|
const weekLabels = useMemo(() => reorderWeekdays(resolvedWeekdays, resolvedWeekStartsOn, tokens.defaults.weekdays), [resolvedWeekdays, tokens.defaults.weekdays, resolvedWeekStartsOn]);
|
|
162
|
-
const monthLabel = useMemo(() => formatMonthTitle ? formatMonthTitle(currentMonth) :
|
|
162
|
+
const monthLabel = useMemo(() => formatMonthTitle ? formatMonthTitle(currentMonth) : calLoc?.monthTitle ? calLoc.monthTitle(currentMonth.getFullYear(), currentMonth.getMonth() + 1) : formatMonth(currentMonth), [currentMonth, formatMonthTitle, calLoc]);
|
|
163
163
|
const minMonthStart = startOfMonth(minDate);
|
|
164
164
|
const maxMonthStart = startOfMonth(maxDate);
|
|
165
165
|
const canGoPrev = currentMonth.getTime() > minMonthStart.getTime();
|
|
@@ -174,12 +174,12 @@ const CalendarImpl = props => {
|
|
|
174
174
|
if (resolvedType === 'range' && next.length < 2) return;
|
|
175
175
|
if (resolvedType === 'multiple' && next.length === 0) return;
|
|
176
176
|
if (!next.length) return;
|
|
177
|
-
|
|
177
|
+
cbRef.current.onConfirm?.(mapValue(next, resolvedType));
|
|
178
178
|
if (resolvedPoppable && resolvedCloseOnConfirm) closePopup();
|
|
179
179
|
}, [resolvedShowConfirm, resolvedType, resolvedPoppable, resolvedCloseOnConfirm, closePopup]);
|
|
180
180
|
const handleConfirm = useCallback(() => {
|
|
181
181
|
if (resolvedShowConfirm && confirmDisabled) return;
|
|
182
|
-
|
|
182
|
+
cbRef.current.onConfirm?.(mapValue(value, resolvedType));
|
|
183
183
|
if (resolvedPoppable && resolvedCloseOnConfirm) closePopup();
|
|
184
184
|
}, [resolvedShowConfirm, confirmDisabled, value, resolvedType, resolvedPoppable, resolvedCloseOnConfirm, closePopup]);
|
|
185
185
|
const isSelectionAllowed = useCallback(next => {
|
|
@@ -187,12 +187,12 @@ const CalendarImpl = props => {
|
|
|
187
187
|
const [start, end] = next;
|
|
188
188
|
if (!resolvedAllowSameDay && isSameDay(start, end)) return false;
|
|
189
189
|
if (maxRange && daysBetween(start, end) + 1 > maxRange) {
|
|
190
|
-
|
|
190
|
+
cbRef.current.onOverRange?.(maxRange);
|
|
191
191
|
return false;
|
|
192
192
|
}
|
|
193
193
|
}
|
|
194
194
|
if (resolvedType === 'multiple' && maxRange && next.length > maxRange) {
|
|
195
|
-
|
|
195
|
+
cbRef.current.onOverRange?.(maxRange);
|
|
196
196
|
return false;
|
|
197
197
|
}
|
|
198
198
|
;
|