@fluentui-react-native/radio-group 0.22.1 → 0.22.3
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/CHANGELOG.md +38 -0
- package/lib/Radio/useRadio.d.ts.map +1 -1
- package/lib/Radio/useRadio.js +13 -11
- package/lib/Radio/useRadio.js.map +1 -1
- package/lib/Radio/useRadio.win32.d.ts.map +1 -1
- package/lib/Radio/useRadio.win32.js +31 -26
- package/lib/Radio/useRadio.win32.js.map +1 -1
- package/lib/legacy/RadioButton.d.ts.map +1 -1
- package/lib/legacy/RadioButton.js +13 -11
- package/lib/legacy/RadioButton.js.map +1 -1
- package/lib/legacy/RadioButton.macos.d.ts.map +1 -1
- package/lib/legacy/RadioButton.macos.js +10 -8
- package/lib/legacy/RadioButton.macos.js.map +1 -1
- package/lib/legacy/RadioButton.win32.d.ts.map +1 -1
- package/lib/legacy/RadioButton.win32.js +34 -30
- package/lib/legacy/RadioButton.win32.js.map +1 -1
- package/lib/legacy/RadioGroup.d.ts.map +1 -1
- package/lib/legacy/RadioGroup.js +4 -8
- package/lib/legacy/RadioGroup.js.map +1 -1
- package/lib-commonjs/Radio/useRadio.d.ts.map +1 -1
- package/lib-commonjs/Radio/useRadio.js +13 -11
- package/lib-commonjs/Radio/useRadio.js.map +1 -1
- package/lib-commonjs/Radio/useRadio.win32.d.ts.map +1 -1
- package/lib-commonjs/Radio/useRadio.win32.js +31 -26
- package/lib-commonjs/Radio/useRadio.win32.js.map +1 -1
- package/lib-commonjs/legacy/RadioButton.d.ts.map +1 -1
- package/lib-commonjs/legacy/RadioButton.js +13 -11
- package/lib-commonjs/legacy/RadioButton.js.map +1 -1
- package/lib-commonjs/legacy/RadioButton.macos.d.ts.map +1 -1
- package/lib-commonjs/legacy/RadioButton.macos.js +10 -8
- package/lib-commonjs/legacy/RadioButton.macos.js.map +1 -1
- package/lib-commonjs/legacy/RadioButton.win32.d.ts.map +1 -1
- package/lib-commonjs/legacy/RadioButton.win32.js +34 -30
- package/lib-commonjs/legacy/RadioButton.win32.js.map +1 -1
- package/lib-commonjs/legacy/RadioGroup.d.ts.map +1 -1
- package/lib-commonjs/legacy/RadioGroup.js +4 -8
- package/lib-commonjs/legacy/RadioGroup.js.map +1 -1
- package/package.json +24 -24
- package/src/Radio/useRadio.ts +13 -11
- package/src/Radio/useRadio.win32.ts +45 -26
- package/src/legacy/RadioButton.macos.tsx +10 -8
- package/src/legacy/RadioButton.tsx +13 -11
- package/src/legacy/RadioButton.win32.tsx +46 -30
- package/src/legacy/RadioGroup.tsx +4 -8
- package/eslint.config.js +0 -3
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,43 @@
|
|
|
1
1
|
# Change Log - @fluentui-react-native/radio-group
|
|
2
2
|
|
|
3
|
+
## 0.22.3
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- 9cf4444: Migrate from ESLint to oxlint
|
|
8
|
+
- Updated dependencies [9cf4444]
|
|
9
|
+
- @uifabricshared/foundation-composable@0.14.3
|
|
10
|
+
- @uifabricshared/foundation-settings@0.16.3
|
|
11
|
+
- @uifabricshared/foundation-compose@1.16.3
|
|
12
|
+
- @fluentui-react-native/interactive-hooks@0.28.3
|
|
13
|
+
- @fluentui-react-native/use-styling@0.14.3
|
|
14
|
+
- @fluentui-react-native/focus-zone@0.22.3
|
|
15
|
+
- @fluentui-react-native/pressable@0.13.3
|
|
16
|
+
- @fluentui-react-native/theme-tokens@0.28.3
|
|
17
|
+
- @fluentui-react-native/framework@0.15.3
|
|
18
|
+
- @fluentui-react-native/text@0.25.3
|
|
19
|
+
- @fluentui-react-native/adapters@0.14.3
|
|
20
|
+
- @fluentui-react-native/tokens@0.24.3
|
|
21
|
+
|
|
22
|
+
## 0.22.2
|
|
23
|
+
|
|
24
|
+
### Patch Changes
|
|
25
|
+
|
|
26
|
+
- 8a7b549: Update to the latest rnx-kit versions, fix some typing issues, and correct the vscode settings
|
|
27
|
+
- Updated dependencies [8a7b549]
|
|
28
|
+
- @uifabricshared/foundation-composable@0.14.2
|
|
29
|
+
- @uifabricshared/foundation-settings@0.16.2
|
|
30
|
+
- @uifabricshared/foundation-compose@1.16.2
|
|
31
|
+
- @fluentui-react-native/interactive-hooks@0.28.2
|
|
32
|
+
- @fluentui-react-native/use-styling@0.14.2
|
|
33
|
+
- @fluentui-react-native/focus-zone@0.22.2
|
|
34
|
+
- @fluentui-react-native/pressable@0.13.2
|
|
35
|
+
- @fluentui-react-native/theme-tokens@0.28.2
|
|
36
|
+
- @fluentui-react-native/framework@0.15.2
|
|
37
|
+
- @fluentui-react-native/text@0.25.2
|
|
38
|
+
- @fluentui-react-native/adapters@0.14.2
|
|
39
|
+
- @fluentui-react-native/tokens@0.24.2
|
|
40
|
+
|
|
3
41
|
## 0.22.1
|
|
4
42
|
|
|
5
43
|
### Patch Changes
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useRadio.d.ts","sourceRoot":"","sources":["../../src/Radio/useRadio.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAK3D,eAAO,MAAM,QAAQ,
|
|
1
|
+
{"version":3,"file":"useRadio.d.ts","sourceRoot":"","sources":["../../src/Radio/useRadio.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAK3D,eAAO,MAAM,QAAQ,kCAuGpB,CAAC"}
|
package/lib/Radio/useRadio.js
CHANGED
|
@@ -7,23 +7,25 @@ export const useRadio = (props) => {
|
|
|
7
7
|
const defaultComponentRef = React.useRef(null);
|
|
8
8
|
// Grabs the context information from RadioGroup (currently selected button and client's onChange callback)
|
|
9
9
|
const radioGroupContext = useRadioGroupContext();
|
|
10
|
-
const {
|
|
11
|
-
const
|
|
10
|
+
const { disabled: groupDisabled, layout, onChange, updateSelectedButtonRef, value: selectedValue, values } = radioGroupContext;
|
|
11
|
+
const { label, subtext, value, disabled, labelPosition = layout === 'horizontal-stacked' ? 'below' : 'after', accessibilityActions, accessibilityLabel, accessibilityHint, accessibilityState, componentRef = defaultComponentRef, accessibilityPosInSet, accessibilitySetSize, enableFocusRing, ...rest } = props;
|
|
12
|
+
const isDisabled = groupDisabled || disabled;
|
|
12
13
|
const buttonRef = useViewCommandFocus(componentRef);
|
|
13
14
|
/* We don't want to call the user's onChange multiple times on the same selection. */
|
|
14
15
|
const changeSelection = React.useCallback(() => {
|
|
15
|
-
if (value !==
|
|
16
|
-
|
|
17
|
-
|
|
16
|
+
if (value !== selectedValue) {
|
|
17
|
+
onChange && onChange(value);
|
|
18
|
+
updateSelectedButtonRef && componentRef && updateSelectedButtonRef(componentRef);
|
|
18
19
|
}
|
|
19
|
-
}, [
|
|
20
|
+
}, [componentRef, onChange, selectedValue, updateSelectedButtonRef, value]);
|
|
20
21
|
/* We use the componentRef of the currently selected button to maintain the default tabbable
|
|
21
22
|
element in a RadioGroup. Since the componentRef isn't generated until after initial render,
|
|
22
23
|
we must update it once here. */
|
|
23
24
|
React.useEffect(() => {
|
|
24
|
-
if (value ===
|
|
25
|
-
|
|
25
|
+
if (value === selectedValue && !isDisabled) {
|
|
26
|
+
updateSelectedButtonRef && componentRef && updateSelectedButtonRef(componentRef);
|
|
26
27
|
}
|
|
28
|
+
// eslint-disable-next-line react-hooks/exhaustive-deps -- intentionally run only on mount/unmount
|
|
27
29
|
}, []);
|
|
28
30
|
// Ensure focus is placed on button after click
|
|
29
31
|
const changeSelectionWithFocus = useOnPressWithFocus(componentRef, changeSelection);
|
|
@@ -44,7 +46,7 @@ export const useRadio = (props) => {
|
|
|
44
46
|
}, [changeSelection]);
|
|
45
47
|
const state = {
|
|
46
48
|
...pressable.state,
|
|
47
|
-
selected:
|
|
49
|
+
selected: selectedValue === props.value && !isDisabled,
|
|
48
50
|
disabled: isDisabled || false,
|
|
49
51
|
labelPositionBelow: labelPosition === 'below',
|
|
50
52
|
};
|
|
@@ -62,8 +64,8 @@ export const useRadio = (props) => {
|
|
|
62
64
|
accessibilityHint: accessibilityHint ?? subtext,
|
|
63
65
|
accessibilityState: getAccessibilityState(state.disabled, state.selected, accessibilityState),
|
|
64
66
|
accessibilityActions: accessibilityActionsProp,
|
|
65
|
-
accessibilityPosInSet: accessibilityPosInSet ??
|
|
66
|
-
accessibilitySetSize: accessibilitySetSize ??
|
|
67
|
+
accessibilityPosInSet: accessibilityPosInSet ?? values.findIndex((x) => x == value) + 1,
|
|
68
|
+
accessibilitySetSize: accessibilitySetSize ?? values.length,
|
|
67
69
|
focusable: !state.disabled,
|
|
68
70
|
disabled: isDisabled,
|
|
69
71
|
enableFocusRing: enableFocusRing ?? true,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useRadio.js","sourceRoot":"","sources":["../../src/Radio/useRadio.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAG/B,OAAO,EAAE,OAAO,EAAE,MAAM,kCAAkC,CAAC;AAC3D,OAAO,EAAE,iBAAiB,EAAE,mBAAmB,EAAE,mBAAmB,EAAE,MAAM,0CAA0C,CAAC;AAGvH,OAAO,EAAE,oBAAoB,EAAE,MAAM,iCAAiC,CAAC;AAEvE,MAAM,2BAA2B,GAAG,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC,CAAC;AAEzD,MAAM,CAAC,MAAM,QAAQ,GAAG,CAAC,KAAiB,EAAa,EAAE,CAAC;IACxD,MAAM,mBAAmB,GAAG,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IAE/C,2GAA2G;IAC3G,MAAM,iBAAiB,GAAG,oBAAoB,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"useRadio.js","sourceRoot":"","sources":["../../src/Radio/useRadio.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useRadio.win32.d.ts","sourceRoot":"","sources":["../../src/Radio/useRadio.win32.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAY3D,eAAO,MAAM,QAAQ,
|
|
1
|
+
{"version":3,"file":"useRadio.win32.d.ts","sourceRoot":"","sources":["../../src/Radio/useRadio.win32.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAY3D,eAAO,MAAM,QAAQ,kCAkLpB,CAAC"}
|
|
@@ -15,70 +15,75 @@ export const useRadio = (props) => {
|
|
|
15
15
|
const defaultComponentRef = React.useRef(null);
|
|
16
16
|
// Grabs the context information from RadioGroup (currently selected button and client's onChange callback)
|
|
17
17
|
const radioGroupContext = useRadioGroupContext();
|
|
18
|
+
const { addRadioEnabledValue, addRadioValue, disabled: groupDisabled, enabledValues, invoked, layout, onChange, removeRadioEnabledValue, removeRadioValue, updateInvoked, updateSelectedButtonRef, value: selectedValue, values, } = radioGroupContext;
|
|
18
19
|
const { label, subtext, value, disabled, accessibilityActions, accessibilityLabel, accessibilityHint, accessibilityState, componentRef = defaultComponentRef, accessibilityPosInSet, accessibilitySetSize, ...rest } = props;
|
|
19
|
-
const labelPosition =
|
|
20
|
-
const isDisabled =
|
|
20
|
+
const labelPosition = layout === 'horizontal-stacked' ? 'below' : 'after';
|
|
21
|
+
const isDisabled = groupDisabled || disabled;
|
|
21
22
|
const buttonRef = useViewCommandFocus(componentRef);
|
|
22
23
|
/* We don't want to call the user's onChange multiple times on the same selection. */
|
|
23
24
|
const changeSelection = React.useCallback(() => {
|
|
24
|
-
if (value !==
|
|
25
|
-
|
|
26
|
-
|
|
25
|
+
if (value !== selectedValue) {
|
|
26
|
+
onChange && onChange(value);
|
|
27
|
+
updateSelectedButtonRef && componentRef && updateSelectedButtonRef(componentRef);
|
|
27
28
|
}
|
|
28
|
-
}, [
|
|
29
|
+
}, [componentRef, onChange, selectedValue, updateSelectedButtonRef, value]);
|
|
29
30
|
/* We use the componentRef of the currently selected button to maintain the default tabbable
|
|
30
31
|
element in a RadioGroup. Since the componentRef isn't generated until after initial render,
|
|
31
32
|
we must update it once here. */
|
|
32
33
|
React.useEffect(() => {
|
|
33
|
-
if (value ===
|
|
34
|
-
|
|
34
|
+
if (value === selectedValue && !isDisabled) {
|
|
35
|
+
updateSelectedButtonRef && componentRef && updateSelectedButtonRef(componentRef);
|
|
35
36
|
}
|
|
37
|
+
// eslint-disable-next-line react-hooks/exhaustive-deps -- intentionally run only on mount/unmount
|
|
36
38
|
}, []);
|
|
37
39
|
// Explicitly only run on mount and unmount
|
|
38
40
|
React.useEffect(() => {
|
|
39
|
-
|
|
41
|
+
addRadioValue(value);
|
|
40
42
|
return () => {
|
|
41
|
-
|
|
43
|
+
removeRadioValue(value);
|
|
42
44
|
};
|
|
45
|
+
// eslint-disable-next-line react-hooks/exhaustive-deps -- intentionally run only on mount/unmount
|
|
43
46
|
}, []);
|
|
44
47
|
React.useEffect(() => {
|
|
45
48
|
if (isDisabled) {
|
|
46
|
-
|
|
49
|
+
removeRadioEnabledValue(value);
|
|
47
50
|
}
|
|
48
51
|
else {
|
|
49
|
-
|
|
52
|
+
addRadioEnabledValue(value);
|
|
50
53
|
}
|
|
54
|
+
// eslint-disable-next-line react-hooks/exhaustive-deps -- only re-run when isDisabled changes
|
|
51
55
|
}, [isDisabled]);
|
|
52
56
|
const isRTL = I18nManager.isRTL;
|
|
53
57
|
const onInvoke = React.useCallback((e) => {
|
|
54
58
|
if (e.nativeEvent.key in DirectionalArrowKeys) {
|
|
55
|
-
const length =
|
|
59
|
+
const length = enabledValues.length;
|
|
56
60
|
const previous = e.nativeEvent.key === DirectionalArrowKeys.ArrowUp ||
|
|
57
61
|
(isRTL ? e.nativeEvent.key === DirectionalArrowKeys.ArrowRight : e.nativeEvent.key === DirectionalArrowKeys.ArrowLeft);
|
|
58
62
|
const next = e.nativeEvent.key === DirectionalArrowKeys.ArrowDown ||
|
|
59
63
|
(isRTL ? e.nativeEvent.key === DirectionalArrowKeys.ArrowLeft : e.nativeEvent.key === DirectionalArrowKeys.ArrowRight);
|
|
60
|
-
const currRadioIndex =
|
|
64
|
+
const currRadioIndex = enabledValues.indexOf(selectedValue);
|
|
61
65
|
let newCurrRadioIndex;
|
|
62
66
|
if (next) {
|
|
63
67
|
newCurrRadioIndex = (currRadioIndex + 1) % length;
|
|
64
|
-
|
|
65
|
-
|
|
68
|
+
onChange && onChange(enabledValues[newCurrRadioIndex]);
|
|
69
|
+
updateInvoked && updateInvoked(true);
|
|
66
70
|
}
|
|
67
71
|
else if (previous) {
|
|
68
72
|
newCurrRadioIndex = (currRadioIndex - 1 + length) % length;
|
|
69
|
-
|
|
70
|
-
|
|
73
|
+
onChange && onChange(enabledValues[newCurrRadioIndex]);
|
|
74
|
+
updateInvoked && updateInvoked(true);
|
|
71
75
|
}
|
|
72
76
|
}
|
|
73
|
-
}, [
|
|
77
|
+
}, [enabledValues, isRTL, onChange, selectedValue, updateInvoked]);
|
|
74
78
|
// Sets the updated selected button ref and focus if this Radio is selected via arrow key.
|
|
75
79
|
React.useEffect(() => {
|
|
76
|
-
if (
|
|
77
|
-
|
|
80
|
+
if (invoked && value === selectedValue && !isDisabled) {
|
|
81
|
+
updateSelectedButtonRef && componentRef && updateSelectedButtonRef(componentRef);
|
|
78
82
|
componentRef?.current?.focus();
|
|
79
|
-
|
|
83
|
+
updateInvoked && updateInvoked(false);
|
|
80
84
|
}
|
|
81
|
-
|
|
85
|
+
// eslint-disable-next-line react-hooks/exhaustive-deps -- only re-run when invoked changes
|
|
86
|
+
}, [invoked]);
|
|
82
87
|
const keys = ['ArrowDown', 'ArrowRight', 'ArrowUp', 'ArrowLeft'];
|
|
83
88
|
// Explicitly override onKeyDown to override the native behavior of moving focus with arrow keys.
|
|
84
89
|
const onKeyDownProps = useKeyDownProps(onInvoke, ...keys);
|
|
@@ -101,7 +106,7 @@ export const useRadio = (props) => {
|
|
|
101
106
|
}, [changeSelection]);
|
|
102
107
|
const state = {
|
|
103
108
|
...pressable.state,
|
|
104
|
-
selected:
|
|
109
|
+
selected: selectedValue === props.value && !isDisabled,
|
|
105
110
|
disabled: isDisabled || false,
|
|
106
111
|
};
|
|
107
112
|
return {
|
|
@@ -118,8 +123,8 @@ export const useRadio = (props) => {
|
|
|
118
123
|
accessibilityHint: accessibilityHint ?? subtext,
|
|
119
124
|
accessibilityState: getAccessibilityState(state.disabled, state.selected, accessibilityState),
|
|
120
125
|
accessibilityActions: accessibilityActionsProp,
|
|
121
|
-
accessibilityPosInSet: accessibilityPosInSet ??
|
|
122
|
-
accessibilitySetSize: accessibilitySetSize ??
|
|
126
|
+
accessibilityPosInSet: accessibilityPosInSet ?? values.findIndex((x) => x == value) + 1,
|
|
127
|
+
accessibilitySetSize: accessibilitySetSize ?? values.length,
|
|
123
128
|
focusable: !state.disabled,
|
|
124
129
|
disabled: isDisabled,
|
|
125
130
|
onAccessibilityAction: onAccessibilityAction,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useRadio.win32.js","sourceRoot":"","sources":["../../src/Radio/useRadio.win32.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAE/B,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAE3C,OAAO,EAAE,OAAO,EAAE,MAAM,kCAAkC,CAAC;AAE3D,OAAO,EAAE,iBAAiB,EAAE,mBAAmB,EAAE,mBAAmB,EAAE,eAAe,EAAE,MAAM,0CAA0C,CAAC;AAGxI,OAAO,EAAE,oBAAoB,EAAE,MAAM,iCAAiC,CAAC;AAEvE,MAAM,2BAA2B,GAAG,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC,CAAC;AAEzD,IAAK,oBAKJ;AALD,WAAK,oBAAoB;IACvB,2CAAmB,CAAA;IACnB,+CAAuB,CAAA;IACvB,iDAAyB,CAAA;IACzB,+CAAuB,CAAA;AAAC,CAC1B,EALK,oBAAoB,KAApB,oBAAoB,QAKxB;AAED,MAAM,CAAC,MAAM,QAAQ,GAAG,CAAC,KAAiB,EAAa,EAAE,CAAC;IACxD,MAAM,mBAAmB,GAAG,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IAE/C,2GAA2G;IAC3G,MAAM,iBAAiB,GAAG,oBAAoB,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"useRadio.win32.js","sourceRoot":"","sources":["../../src/Radio/useRadio.win32.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RadioButton.d.ts","sourceRoot":"","sources":["../../src/legacy/RadioButton.tsx"],"names":[],"mappings":"AAeA,OAAO,KAAK,EAAoB,iBAAiB,EAAE,qBAAqB,EAA0B,MAAM,qBAAqB,CAAC;AAI9H,eAAO,MAAM,WAAW,
|
|
1
|
+
{"version":3,"file":"RadioButton.d.ts","sourceRoot":"","sources":["../../src/legacy/RadioButton.tsx"],"names":[],"mappings":"AAeA,OAAO,KAAK,EAAoB,iBAAiB,EAAE,qBAAqB,EAA0B,MAAM,qBAAqB,CAAC;AAI9H,eAAO,MAAM,WAAW,6KAuHtB,CAAC;AAEH,eAAe,WAAW,CAAC"}
|
|
@@ -19,21 +19,23 @@ export const RadioButton = compose({
|
|
|
19
19
|
const { content, buttonKey, disabled, accessibilityLabel, ariaLabel, componentRef = defaultComponentRef, accessibilityPosInSet, ariaPosInSet, accessibilitySetSize, ariaSetSize, ...rest } = userProps;
|
|
20
20
|
// Grabs the context information from RadioGroup (currently selected button and client's onChange callback)
|
|
21
21
|
const info = React.useContext(RadioGroupContext);
|
|
22
|
+
const { selectedKey, onChange, updateSelectedButtonRef, buttonKeys } = info;
|
|
22
23
|
const buttonRef = useViewCommandFocus(componentRef);
|
|
23
24
|
/* We don't want to call the user's onChange multiple times on the same selection. */
|
|
24
|
-
const changeSelection = () => {
|
|
25
|
-
if (buttonKey !=
|
|
26
|
-
|
|
27
|
-
|
|
25
|
+
const changeSelection = React.useCallback(() => {
|
|
26
|
+
if (buttonKey != selectedKey) {
|
|
27
|
+
onChange && onChange(buttonKey);
|
|
28
|
+
updateSelectedButtonRef && componentRef && updateSelectedButtonRef(componentRef);
|
|
28
29
|
}
|
|
29
|
-
};
|
|
30
|
+
}, [buttonKey, componentRef, onChange, selectedKey, updateSelectedButtonRef]);
|
|
30
31
|
/* We use the componentRef of the currently selected button to maintain the default tabbable
|
|
31
32
|
element in a RadioGroup. Since the componentRef isn't generated until after initial render,
|
|
32
33
|
we must update it once here. */
|
|
33
34
|
React.useEffect(() => {
|
|
34
|
-
if (buttonKey ==
|
|
35
|
-
|
|
35
|
+
if (buttonKey == selectedKey) {
|
|
36
|
+
updateSelectedButtonRef && componentRef && updateSelectedButtonRef(componentRef);
|
|
36
37
|
}
|
|
38
|
+
// eslint-disable-next-line react-hooks/exhaustive-deps -- intentionally run only on mount/unmount
|
|
37
39
|
}, []);
|
|
38
40
|
// Ensure focus is placed on button after click
|
|
39
41
|
const changeSelectionWithFocus = useOnPressWithFocus(componentRef, changeSelection);
|
|
@@ -50,10 +52,10 @@ export const RadioButton = compose({
|
|
|
50
52
|
changeSelection();
|
|
51
53
|
break;
|
|
52
54
|
}
|
|
53
|
-
}, [
|
|
55
|
+
}, [changeSelection]);
|
|
54
56
|
const state = {
|
|
55
57
|
...pressable.state,
|
|
56
|
-
selected:
|
|
58
|
+
selected: selectedKey === userProps.buttonKey,
|
|
57
59
|
disabled: disabled || false,
|
|
58
60
|
};
|
|
59
61
|
// Grab the styling information from the userProps, referencing the state as well as the props.
|
|
@@ -67,8 +69,8 @@ export const RadioButton = compose({
|
|
|
67
69
|
accessibilityLabel: accessibilityLabel ?? ariaLabel ?? content,
|
|
68
70
|
accessibilityState: { disabled: state.disabled, selected: state.selected },
|
|
69
71
|
accessibilityActions: [{ name: 'Select', label: radioButtonSelectActionLabel }],
|
|
70
|
-
accessibilityPosInSet: accessibilityPosInSet ?? ariaPosInSet ??
|
|
71
|
-
accessibilitySetSize: accessibilitySetSize ?? ariaSetSize ??
|
|
72
|
+
accessibilityPosInSet: accessibilityPosInSet ?? ariaPosInSet ?? buttonKeys.findIndex((x) => x == buttonKey) + 1,
|
|
73
|
+
accessibilitySetSize: accessibilitySetSize ?? ariaSetSize ?? buttonKeys.length,
|
|
72
74
|
focusable: !state.disabled,
|
|
73
75
|
onAccessibilityAction: onAccessibilityAction,
|
|
74
76
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RadioButton.js","sourceRoot":"","sources":["../../src/legacy/RadioButton.tsx"],"names":[],"mappings":"AAAA,6DAA6D;AAC7D,YAAY,CAAC;;AACb,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAAE,IAAI,EAAE,MAAM,cAAc,CAAC;AAEpC,OAAO,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC;AAClE,OAAO,EAAE,cAAc,EAAE,mBAAmB,EAAE,mBAAmB,EAAE,MAAM,0CAA0C,CAAC;AACpH,OAAO,EAAE,IAAI,EAAE,MAAM,6BAA6B,CAAC;AACnD,OAAO,EAAE,qBAAqB,EAAE,UAAU,EAAE,YAAY,EAAE,qBAAqB,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAC;AAG5I,OAAO,EAAE,OAAO,EAAE,MAAM,oCAAoC,CAAC;AAC7D,OAAO,EAAE,aAAa,EAAE,MAAM,qCAAqC,CAAC;AAEpE,OAAO,EAAE,QAAQ,EAAE,4BAA4B,EAAE,MAAM,wBAAwB,CAAC;AAEhF,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AACtD,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAEjD,MAAM,CAAC,MAAM,WAAW,GAAG,OAAO,CAAmB;IACnD,WAAW,EAAE,eAAe;IAE5B,eAAe,EAAE,CAAC,SAA4B,EAAE,UAAgD,EAAE,EAAE,CAAC;QACnG,MAAM,mBAAmB,GAAG,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAC/C,MAAM,EACJ,OAAO,EACP,SAAS,EACT,QAAQ,EACR,kBAAkB,EAClB,SAAS,EACT,YAAY,GAAG,mBAAmB,EAClC,qBAAqB,EACrB,YAAY,EACZ,oBAAoB,EACpB,WAAW,EACX,GAAG,IAAI,EACR,GAAG,SAAS,CAAC;QAEd,2GAA2G;QAC3G,MAAM,IAAI,GAAG,KAAK,CAAC,UAAU,CAAC,iBAAiB,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"RadioButton.js","sourceRoot":"","sources":["../../src/legacy/RadioButton.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RadioButton.macos.d.ts","sourceRoot":"","sources":["../../src/legacy/RadioButton.macos.tsx"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,iBAAiB,EAAE,qBAAqB,EAAoB,MAAM,qBAAqB,CAAC;AAItG,eAAO,MAAM,WAAW,
|
|
1
|
+
{"version":3,"file":"RadioButton.macos.d.ts","sourceRoot":"","sources":["../../src/legacy/RadioButton.macos.tsx"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,iBAAiB,EAAE,qBAAqB,EAAoB,MAAM,qBAAqB,CAAC;AAItG,eAAO,MAAM,WAAW,6KAuDtB,CAAC;AAEH,eAAe,WAAW,CAAC"}
|
|
@@ -17,24 +17,26 @@ export const RadioButton = compose({
|
|
|
17
17
|
const defaultComponentRef = React.useRef(null);
|
|
18
18
|
const { content, buttonKey, disabled, componentRef = defaultComponentRef } = userProps;
|
|
19
19
|
const info = React.useContext(RadioGroupContext);
|
|
20
|
+
const { onChange, selectedKey, updateSelectedButtonRef } = info;
|
|
20
21
|
// Reroute the native component's onPress event to RadioGroup's onChange
|
|
21
|
-
const onPressRerouted = () => {
|
|
22
|
+
const onPressRerouted = React.useCallback(() => {
|
|
22
23
|
// Prevent calls to RadioGroup's onChange on the currently selected button
|
|
23
|
-
if (buttonKey !=
|
|
24
|
-
|
|
25
|
-
|
|
24
|
+
if (buttonKey != selectedKey) {
|
|
25
|
+
onChange && onChange(buttonKey);
|
|
26
|
+
updateSelectedButtonRef && componentRef && updateSelectedButtonRef(componentRef);
|
|
26
27
|
}
|
|
27
|
-
};
|
|
28
|
+
}, [buttonKey, componentRef, onChange, selectedKey, updateSelectedButtonRef]);
|
|
28
29
|
/* We use the componentRef of the currently selected button to maintain the default tabbable
|
|
29
30
|
element in a RadioGroup. Since the componentRef isn't generated until after initial render,
|
|
30
31
|
we must update it once here. */
|
|
31
32
|
React.useEffect(() => {
|
|
32
|
-
if (buttonKey ===
|
|
33
|
-
|
|
33
|
+
if (buttonKey === selectedKey) {
|
|
34
|
+
updateSelectedButtonRef && componentRef && updateSelectedButtonRef(componentRef);
|
|
34
35
|
}
|
|
36
|
+
// eslint-disable-next-line react-hooks/exhaustive-deps -- intentionally run only on mount/unmount
|
|
35
37
|
}, []);
|
|
36
38
|
const styleProps = useStyling(userProps);
|
|
37
|
-
const isSelected =
|
|
39
|
+
const isSelected = selectedKey === buttonKey;
|
|
38
40
|
const slotProps = mergeSettings(styleProps, {
|
|
39
41
|
root: {
|
|
40
42
|
ref: componentRef,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RadioButton.macos.js","sourceRoot":"","sources":["../../src/legacy/RadioButton.macos.tsx"],"names":[],"mappings":";AAAA;;;;GAIG;AACH,6DAA6D;AAC7D,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAG/B,OAAO,EAAE,OAAO,EAAE,MAAM,oCAAoC,CAAC;AAE7D,OAAO,EAAE,aAAa,EAAE,MAAM,qCAAqC,CAAC;AAEpE,OAAO,qBAAqB,MAAM,mCAAmC,CAAC;AAEtE,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AACtD,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAEjD,MAAM,CAAC,MAAM,WAAW,GAAG,OAAO,CAAmB;IACnD,WAAW,EAAE,eAAe;IAC5B,eAAe,EAAE,CAAC,SAA4B,EAAE,UAAgD,EAAE,EAAE,CAAC;QACnG,MAAM,mBAAmB,GAAG,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAC/C,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,YAAY,GAAG,mBAAmB,EAAE,GAAG,SAAS,CAAC;QACvF,MAAM,IAAI,GAAG,KAAK,CAAC,UAAU,CAAC,iBAAiB,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"RadioButton.macos.js","sourceRoot":"","sources":["../../src/legacy/RadioButton.macos.tsx"],"names":[],"mappings":";AAAA;;;;GAIG;AACH,6DAA6D;AAC7D,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAG/B,OAAO,EAAE,OAAO,EAAE,MAAM,oCAAoC,CAAC;AAE7D,OAAO,EAAE,aAAa,EAAE,MAAM,qCAAqC,CAAC;AAEpE,OAAO,qBAAqB,MAAM,mCAAmC,CAAC;AAEtE,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AACtD,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAEjD,MAAM,CAAC,MAAM,WAAW,GAAG,OAAO,CAAmB;IACnD,WAAW,EAAE,eAAe;IAC5B,eAAe,EAAE,CAAC,SAA4B,EAAE,UAAgD,EAAE,EAAE,CAAC;QACnG,MAAM,mBAAmB,GAAG,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAC/C,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,YAAY,GAAG,mBAAmB,EAAE,GAAG,SAAS,CAAC;QACvF,MAAM,IAAI,GAAG,KAAK,CAAC,UAAU,CAAC,iBAAiB,CAAC,CAAC;QACjD,MAAM,EAAE,QAAQ,EAAE,WAAW,EAAE,uBAAuB,EAAE,GAAG,IAAI,CAAC;QAEhE,wEAAwE;QACxE,MAAM,eAAe,GAAG,KAAK,CAAC,WAAW,CAAC,GAAG,EAAE,CAAC;YAC9C,0EAA0E;YAC1E,IAAI,SAAS,IAAI,WAAW,EAAE,CAAC;gBAC7B,QAAQ,IAAI,QAAQ,CAAC,SAAS,CAAC,CAAC;gBAChC,uBAAuB,IAAI,YAAY,IAAI,uBAAuB,CAAC,YAAY,CAAC,CAAC;YACnF,CAAC;QAAA,CACF,EAAE,CAAC,SAAS,EAAE,YAAY,EAAE,QAAQ,EAAE,WAAW,EAAE,uBAAuB,CAAC,CAAC,CAAC;QAE9E;;uCAE+B;QAC/B,KAAK,CAAC,SAAS,CAAC,GAAG,EAAE,CAAC;YACpB,IAAI,SAAS,KAAK,WAAW,EAAE,CAAC;gBAC9B,uBAAuB,IAAI,YAAY,IAAI,uBAAuB,CAAC,YAAY,CAAC,CAAC;YACnF,CAAC;YACD,kGAAkG;QADjG,CAEF,EAAE,EAAE,CAAC,CAAC;QAEP,MAAM,UAAU,GAAG,UAAU,CAAC,SAAS,CAAC,CAAC;QACzC,MAAM,UAAU,GAAG,WAAW,KAAK,SAAS,CAAC;QAC7C,MAAM,SAAS,GAAG,aAAa,CAAwB,UAAU,EAAE;YACjE,IAAI,EAAE;gBACJ,GAAG,EAAE,YAAY;gBACjB,SAAS,EAAE,SAAS;gBACpB,OAAO,EAAE,OAAO;gBAChB,QAAQ,EAAE,QAAQ;gBAClB,OAAO,EAAE,eAAe;gBACxB,QAAQ,EAAE,UAAU;gBACpB,KAAK,EAAE;oBACL,QAAQ,EAAE,MAAM;oBAChB,SAAS,EAAE,EAAE;iBACd;aACF;SACF,CAAC,CAAC;QAEH,OAAO,EAAE,SAAS,EAAE,CAAC;IAAA,CACtB;IACD,KAAK,EAAE;QACL,IAAI,EAAE,qBAAqB;KAC5B;IACD,MAAM,EAAE;QACN,IAAI,EAAE,EAAE;KACT;IACD,MAAM,EAAE,CAAC,KAAoC,EAAE,EAAE,CAAC;QAChD,OAAO,KAAC,KAAK,CAAC,IAAI,KAAG,CAAC;IAAA,CACvB;CACF,CAAC,CAAC;AAEH,eAAe,WAAW,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RadioButton.win32.d.ts","sourceRoot":"","sources":["../../src/legacy/RadioButton.win32.tsx"],"names":[],"mappings":"AAgBA,OAAO,KAAK,EAAoB,iBAAiB,EAAE,qBAAqB,EAA0B,MAAM,qBAAqB,CAAC;AAW9H,eAAO,MAAM,WAAW,
|
|
1
|
+
{"version":3,"file":"RadioButton.win32.d.ts","sourceRoot":"","sources":["../../src/legacy/RadioButton.win32.tsx"],"names":[],"mappings":"AAgBA,OAAO,KAAK,EAAoB,iBAAiB,EAAE,qBAAqB,EAA0B,MAAM,qBAAqB,CAAC;AAW9H,eAAO,MAAM,WAAW,6KAgMtB,CAAC;AAEH,eAAe,WAAW,CAAC"}
|
|
@@ -26,40 +26,43 @@ export const RadioButton = compose({
|
|
|
26
26
|
const { content, buttonKey, disabled, accessibilityLabel, ariaLabel, componentRef = defaultComponentRef, accessibilityPosInSet, ariaPosInSet, accessibilitySetSize, ariaSetSize, ...rest } = userProps;
|
|
27
27
|
// Grabs the context information from RadioGroup (currently selected button and client's onChange callback)
|
|
28
28
|
const info = React.useContext(RadioGroupContext);
|
|
29
|
+
const { addRadioButtonEnabledKey, addRadioButtonKey, buttonKeys, enabledButtonKeys, invoked, onChange, removeRadioButtonEnabledKey, removeRadioButtonKey, selectedKey, updateInvoked, updateSelectedButtonRef, } = info;
|
|
29
30
|
const buttonRef = useViewCommandFocus(componentRef);
|
|
30
31
|
/* We don't want to call the user's onChange multiple times on the same selection. */
|
|
31
|
-
const changeSelection = () => {
|
|
32
|
-
if (buttonKey !=
|
|
33
|
-
|
|
34
|
-
|
|
32
|
+
const changeSelection = React.useCallback(() => {
|
|
33
|
+
if (buttonKey != selectedKey) {
|
|
34
|
+
onChange && onChange(buttonKey);
|
|
35
|
+
updateSelectedButtonRef && componentRef && updateSelectedButtonRef(componentRef);
|
|
35
36
|
}
|
|
36
|
-
};
|
|
37
|
+
}, [buttonKey, componentRef, onChange, selectedKey, updateSelectedButtonRef]);
|
|
37
38
|
/* We use the componentRef of the currently selected button to maintain the default tabbable
|
|
38
39
|
element in a RadioGroup. Since the componentRef isn't generated until after initial render,
|
|
39
40
|
we must update it once here. */
|
|
40
41
|
React.useEffect(() => {
|
|
41
|
-
if (buttonKey ==
|
|
42
|
-
|
|
42
|
+
if (buttonKey == selectedKey) {
|
|
43
|
+
updateSelectedButtonRef && componentRef && updateSelectedButtonRef(componentRef);
|
|
43
44
|
}
|
|
45
|
+
// eslint-disable-next-line react-hooks/exhaustive-deps -- intentionally run only on mount/unmount
|
|
44
46
|
}, []);
|
|
45
47
|
// Explicitly only run on mount and unmount
|
|
46
48
|
React.useEffect(() => {
|
|
47
|
-
|
|
49
|
+
addRadioButtonKey(buttonKey);
|
|
48
50
|
if (!disabled) {
|
|
49
|
-
|
|
51
|
+
addRadioButtonEnabledKey(buttonKey);
|
|
50
52
|
}
|
|
51
53
|
return () => {
|
|
52
|
-
|
|
53
|
-
|
|
54
|
+
removeRadioButtonKey(buttonKey);
|
|
55
|
+
removeRadioButtonEnabledKey(buttonKey);
|
|
54
56
|
};
|
|
57
|
+
// eslint-disable-next-line react-hooks/exhaustive-deps -- intentionally run only on mount/unmount
|
|
55
58
|
}, []);
|
|
56
59
|
const isRTL = I18nManager.isRTL;
|
|
57
60
|
const onInvoke = React.useCallback((e) => {
|
|
58
61
|
if (e.nativeEvent.key in DirectionalArrowKeys) {
|
|
59
|
-
const length =
|
|
62
|
+
const length = enabledButtonKeys.length;
|
|
60
63
|
const next = e.nativeEvent.key === DirectionalArrowKeys.ArrowDown ||
|
|
61
64
|
(isRTL ? e.nativeEvent.key === DirectionalArrowKeys.ArrowLeft : e.nativeEvent.key === DirectionalArrowKeys.ArrowRight);
|
|
62
|
-
const currRadioButtonIndex =
|
|
65
|
+
const currRadioButtonIndex = enabledButtonKeys.indexOf(selectedKey);
|
|
63
66
|
let newCurrRadioButtonIndex;
|
|
64
67
|
if (next) {
|
|
65
68
|
newCurrRadioButtonIndex = (currRadioButtonIndex + 1) % length;
|
|
@@ -68,29 +71,30 @@ export const RadioButton = compose({
|
|
|
68
71
|
// previous
|
|
69
72
|
newCurrRadioButtonIndex = (currRadioButtonIndex - 1 + length) % length;
|
|
70
73
|
}
|
|
71
|
-
|
|
72
|
-
|
|
74
|
+
onChange && onChange(enabledButtonKeys[newCurrRadioButtonIndex]);
|
|
75
|
+
updateInvoked && updateInvoked(true);
|
|
73
76
|
}
|
|
74
|
-
}, [
|
|
77
|
+
}, [enabledButtonKeys, isRTL, onChange, selectedKey, updateInvoked]);
|
|
75
78
|
// Sets the updated selected button ref and focus if this Radio is selected via arrow key.
|
|
76
79
|
React.useEffect(() => {
|
|
77
|
-
if (
|
|
78
|
-
|
|
80
|
+
if (invoked && buttonKey === selectedKey && !disabled) {
|
|
81
|
+
updateSelectedButtonRef && componentRef && updateSelectedButtonRef(componentRef);
|
|
79
82
|
componentRef?.current?.focus();
|
|
80
|
-
|
|
83
|
+
updateInvoked && updateInvoked(false);
|
|
81
84
|
}
|
|
82
|
-
|
|
85
|
+
// eslint-disable-next-line react-hooks/exhaustive-deps -- only re-run when invoked changes
|
|
86
|
+
}, [invoked]);
|
|
83
87
|
const keys = ['ArrowDown', 'ArrowRight', 'ArrowUp', 'ArrowLeft'];
|
|
84
88
|
// Explicitly override onKeyDown to override the native behavior of moving focus with arrow keys.
|
|
85
89
|
const onKeyDownProps = useKeyDownProps(onInvoke, ...keys);
|
|
86
90
|
// Ensure focus is placed on button after click
|
|
87
|
-
const changeSelectionWithFocus = () => {
|
|
88
|
-
if (buttonKey !=
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
91
|
+
const changeSelectionWithFocus = React.useCallback(() => {
|
|
92
|
+
if (buttonKey != selectedKey) {
|
|
93
|
+
onChange && onChange(buttonKey);
|
|
94
|
+
updateSelectedButtonRef && componentRef && updateSelectedButtonRef(componentRef);
|
|
95
|
+
updateInvoked && updateInvoked(true);
|
|
92
96
|
}
|
|
93
|
-
};
|
|
97
|
+
}, [buttonKey, componentRef, onChange, selectedKey, updateInvoked, updateSelectedButtonRef]);
|
|
94
98
|
/* RadioButton changes selection when focus is moved between each RadioButton and on a click */
|
|
95
99
|
const pressable = useAsPressable({
|
|
96
100
|
...rest,
|
|
@@ -104,10 +108,10 @@ export const RadioButton = compose({
|
|
|
104
108
|
changeSelection();
|
|
105
109
|
break;
|
|
106
110
|
}
|
|
107
|
-
}, [
|
|
111
|
+
}, [changeSelection]);
|
|
108
112
|
const state = {
|
|
109
113
|
...pressable.state,
|
|
110
|
-
selected:
|
|
114
|
+
selected: selectedKey === userProps.buttonKey && !disabled,
|
|
111
115
|
disabled: disabled || false,
|
|
112
116
|
};
|
|
113
117
|
// Grab the styling information from the userProps, referencing the state as well as the props.
|
|
@@ -121,8 +125,8 @@ export const RadioButton = compose({
|
|
|
121
125
|
accessibilityLabel: accessibilityLabel ?? ariaLabel ?? content,
|
|
122
126
|
accessibilityState: { disabled: state.disabled, selected: state.selected },
|
|
123
127
|
accessibilityActions: [{ name: 'Select', label: radioButtonSelectActionLabel }],
|
|
124
|
-
accessibilityPosInSet: accessibilityPosInSet ?? ariaPosInSet ??
|
|
125
|
-
accessibilitySetSize: accessibilitySetSize ?? ariaSetSize ??
|
|
128
|
+
accessibilityPosInSet: accessibilityPosInSet ?? ariaPosInSet ?? buttonKeys.findIndex((x) => x == buttonKey) + 1,
|
|
129
|
+
accessibilitySetSize: accessibilitySetSize ?? ariaSetSize ?? buttonKeys.length,
|
|
126
130
|
focusable: !state.disabled,
|
|
127
131
|
onAccessibilityAction: onAccessibilityAction,
|
|
128
132
|
...onKeyDownProps,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RadioButton.win32.js","sourceRoot":"","sources":["../../src/legacy/RadioButton.win32.tsx"],"names":[],"mappings":"AAAA,6DAA6D;AAC7D,YAAY,CAAC;;AACb,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAEjD,OAAO,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC;AAElE,OAAO,EAAE,cAAc,EAAE,mBAAmB,EAAE,eAAe,EAAE,MAAM,0CAA0C,CAAC;AAChH,OAAO,EAAE,IAAI,EAAE,MAAM,6BAA6B,CAAC;AACnD,OAAO,EAAE,qBAAqB,EAAE,UAAU,EAAE,YAAY,EAAE,qBAAqB,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAC;AAG5I,OAAO,EAAE,OAAO,EAAE,MAAM,oCAAoC,CAAC;AAC7D,OAAO,EAAE,aAAa,EAAE,MAAM,qCAAqC,CAAC;AAEpE,OAAO,EAAE,QAAQ,EAAE,4BAA4B,EAAE,MAAM,wBAAwB,CAAC;AAEhF,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AACtD,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAEjD,IAAK,oBAKJ;AALD,WAAK,oBAAoB;IACvB,2CAAmB,CAAA;IACnB,+CAAuB,CAAA;IACvB,iDAAyB,CAAA;IACzB,+CAAuB,CAAA;AAAC,CAC1B,EALK,oBAAoB,KAApB,oBAAoB,QAKxB;AAED,MAAM,CAAC,MAAM,WAAW,GAAG,OAAO,CAAmB;IACnD,WAAW,EAAE,eAAe;IAE5B,eAAe,EAAE,CAAC,SAA4B,EAAE,UAAgD,EAAE,EAAE,CAAC;QACnG,MAAM,mBAAmB,GAAG,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAC/C,MAAM,EACJ,OAAO,EACP,SAAS,EACT,QAAQ,EACR,kBAAkB,EAClB,SAAS,EACT,YAAY,GAAG,mBAAmB,EAClC,qBAAqB,EACrB,YAAY,EACZ,oBAAoB,EACpB,WAAW,EACX,GAAG,IAAI,EACR,GAAG,SAAS,CAAC;QAEd,2GAA2G;QAC3G,MAAM,IAAI,GAAG,KAAK,CAAC,UAAU,CAAC,iBAAiB,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"RadioButton.win32.js","sourceRoot":"","sources":["../../src/legacy/RadioButton.win32.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RadioGroup.d.ts","sourceRoot":"","sources":["../../src/legacy/RadioGroup.tsx"],"names":[],"mappings":"AAAA,6DAA6D;AAC7D,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAa/B,OAAO,KAAK,EAEV,gBAAgB,EAChB,gBAAgB,EAChB,oBAAoB,EAEpB,kBAAkB,EACnB,MAAM,oBAAoB,CAAC;AAG5B,eAAO,MAAM,iBAAiB,mCAS5B,CAAC;AAEH,eAAO,MAAM,UAAU,
|
|
1
|
+
{"version":3,"file":"RadioGroup.d.ts","sourceRoot":"","sources":["../../src/legacy/RadioGroup.tsx"],"names":[],"mappings":"AAAA,6DAA6D;AAC7D,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAa/B,OAAO,KAAK,EAEV,gBAAgB,EAChB,gBAAgB,EAChB,oBAAoB,EAEpB,kBAAkB,EACnB,MAAM,oBAAoB,CAAC;AAG5B,eAAO,MAAM,iBAAiB,mCAS5B,CAAC;AAEH,eAAO,MAAM,UAAU,mLAmHrB,CAAC;AAEH,eAAe,UAAU,CAAC"}
|