@fluentui-react-native/radio-group 0.22.0 → 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 +60 -0
- package/lib/Radio/Radio.d.ts +2 -7
- package/lib/Radio/Radio.ios.d.ts +2 -7
- package/lib/Radio/Radio.ios.js +31 -50
- package/lib/Radio/Radio.js +31 -46
- package/lib/Radio/Radio.styling.d.ts +1 -1
- package/lib/Radio/Radio.styling.js +88 -109
- package/lib/Radio/Radio.types.d.ts +170 -176
- package/lib/Radio/Radio.types.js +1 -1
- package/lib/Radio/RadioTokens.android.d.ts +1 -1
- package/lib/Radio/RadioTokens.android.js +42 -42
- package/lib/Radio/RadioTokens.android.js.map +1 -1
- package/lib/Radio/RadioTokens.d.ts +1 -1
- package/lib/Radio/RadioTokens.ios.d.ts +1 -1
- package/lib/Radio/RadioTokens.ios.js +39 -39
- package/lib/Radio/RadioTokens.ios.js.map +1 -1
- package/lib/Radio/RadioTokens.js +76 -76
- package/lib/Radio/RadioTokens.js.map +1 -1
- package/lib/Radio/RadioTokens.win32.d.ts +1 -1
- package/lib/Radio/RadioTokens.win32.js +89 -89
- package/lib/Radio/RadioTokens.win32.js.map +1 -1
- package/lib/Radio/__tests__/RadioExperimental.test.d.ts +1 -1
- package/lib/Radio/__tests__/RadioExperimental.test.js +14 -14
- package/lib/Radio/useRadio.d.ts +1 -1
- package/lib/Radio/useRadio.d.ts.map +1 -1
- package/lib/Radio/useRadio.js +72 -91
- package/lib/Radio/useRadio.js.map +1 -1
- package/lib/Radio/useRadio.win32.d.ts +1 -1
- package/lib/Radio/useRadio.win32.d.ts.map +1 -1
- package/lib/Radio/useRadio.win32.js +126 -143
- package/lib/Radio/useRadio.win32.js.map +1 -1
- package/lib/RadioGroup/RadioGroup.d.ts +2 -7
- package/lib/RadioGroup/RadioGroup.js +34 -48
- package/lib/RadioGroup/RadioGroup.styling.d.ts +1 -1
- package/lib/RadioGroup/RadioGroup.styling.js +42 -51
- package/lib/RadioGroup/RadioGroup.types.d.ts +117 -117
- package/lib/RadioGroup/RadioGroup.types.js +1 -1
- package/lib/RadioGroup/RadioGroupTokens.android.d.ts +1 -1
- package/lib/RadioGroup/RadioGroupTokens.android.js +1 -1
- package/lib/RadioGroup/RadioGroupTokens.d.ts +1 -1
- package/lib/RadioGroup/RadioGroupTokens.ios.d.ts +1 -1
- package/lib/RadioGroup/RadioGroupTokens.ios.js +1 -1
- package/lib/RadioGroup/RadioGroupTokens.js +12 -12
- package/lib/RadioGroup/RadioGroupTokens.js.map +1 -1
- package/lib/RadioGroup/RadioGroupTokens.mobile.d.ts +1 -1
- package/lib/RadioGroup/RadioGroupTokens.mobile.js +13 -13
- package/lib/RadioGroup/RadioGroupTokens.mobile.js.map +1 -1
- package/lib/RadioGroup/__tests__/RadioGroupExperimental.test.d.ts +1 -1
- package/lib/RadioGroup/__tests__/RadioGroupExperimental.test.js +56 -98
- package/lib/RadioGroup/radioGroupContext.d.ts +1 -1
- package/lib/RadioGroup/radioGroupContext.js +15 -19
- package/lib/RadioGroup/useRadioGroup.d.ts +1 -1
- package/lib/RadioGroup/useRadioGroup.js +63 -93
- package/lib/RadioGroup/useRadioGroupContextValue.d.ts +1 -1
- package/lib/RadioGroup/useRadioGroupContextValue.js +2 -2
- package/lib/index.d.ts +4 -25
- package/lib/index.js +1 -1
- package/lib/legacy/MacOSRadioButtonNativeComponent.d.ts +6 -6
- package/lib/legacy/MacOSRadioButtonNativeComponent.js +1 -1
- package/lib/legacy/RadioButton.d.ts +2 -8
- package/lib/legacy/RadioButton.d.ts.map +1 -1
- package/lib/legacy/RadioButton.js +82 -96
- package/lib/legacy/RadioButton.js.map +1 -1
- package/lib/legacy/RadioButton.macos.d.ts +2 -8
- package/lib/legacy/RadioButton.macos.d.ts.map +1 -1
- package/lib/legacy/RadioButton.macos.js +50 -48
- package/lib/legacy/RadioButton.macos.js.map +1 -1
- package/lib/legacy/RadioButton.settings.d.ts +2 -2
- package/lib/legacy/RadioButton.settings.js +81 -81
- package/lib/legacy/RadioButton.types.d.ts +45 -45
- package/lib/legacy/RadioButton.types.js +1 -1
- package/lib/legacy/RadioButton.win32.d.ts +2 -8
- package/lib/legacy/RadioButton.win32.d.ts.map +1 -1
- package/lib/legacy/RadioButton.win32.js +136 -151
- package/lib/legacy/RadioButton.win32.js.map +1 -1
- package/lib/legacy/RadioGroup.d.ts +2 -8
- package/lib/legacy/RadioGroup.d.ts.map +1 -1
- package/lib/legacy/RadioGroup.js +80 -108
- package/lib/legacy/RadioGroup.js.map +1 -1
- package/lib/legacy/RadioGroup.settings.d.ts +1 -1
- package/lib/legacy/RadioGroup.settings.js +21 -21
- package/lib/legacy/RadioGroup.types.d.ts +79 -78
- package/lib/legacy/RadioGroup.types.js +1 -1
- package/lib/legacy/__tests__/RadioButton.test.d.ts +1 -1
- package/lib/legacy/__tests__/RadioButton.test.js +8 -8
- package/lib/legacy/__tests__/RadioButtonGroup.test.d.ts +1 -1
- package/lib/legacy/__tests__/RadioButtonGroup.test.js +18 -34
- package/lib-commonjs/Radio/Radio.d.ts +2 -7
- package/lib-commonjs/Radio/Radio.ios.d.ts +2 -7
- package/lib-commonjs/Radio/Radio.ios.js +40 -64
- package/lib-commonjs/Radio/Radio.js +39 -59
- package/lib-commonjs/Radio/Radio.styling.d.ts +1 -1
- package/lib-commonjs/Radio/Radio.styling.js +94 -115
- package/lib-commonjs/Radio/Radio.types.d.ts +170 -176
- package/lib-commonjs/Radio/Radio.types.js +3 -3
- package/lib-commonjs/Radio/RadioTokens.android.d.ts +1 -1
- package/lib-commonjs/Radio/RadioTokens.android.js +45 -45
- package/lib-commonjs/Radio/RadioTokens.android.js.map +1 -1
- package/lib-commonjs/Radio/RadioTokens.d.ts +1 -1
- package/lib-commonjs/Radio/RadioTokens.ios.d.ts +1 -1
- package/lib-commonjs/Radio/RadioTokens.ios.js +42 -42
- package/lib-commonjs/Radio/RadioTokens.ios.js.map +1 -1
- package/lib-commonjs/Radio/RadioTokens.js +79 -79
- package/lib-commonjs/Radio/RadioTokens.js.map +1 -1
- package/lib-commonjs/Radio/RadioTokens.win32.d.ts +1 -1
- package/lib-commonjs/Radio/RadioTokens.win32.js +92 -92
- package/lib-commonjs/Radio/RadioTokens.win32.js.map +1 -1
- package/lib-commonjs/Radio/__tests__/RadioExperimental.test.d.ts +1 -1
- package/lib-commonjs/Radio/__tests__/RadioExperimental.test.js +48 -65
- package/lib-commonjs/Radio/useRadio.d.ts +1 -1
- package/lib-commonjs/Radio/useRadio.d.ts.map +1 -1
- package/lib-commonjs/Radio/useRadio.js +107 -143
- package/lib-commonjs/Radio/useRadio.js.map +1 -1
- package/lib-commonjs/Radio/useRadio.win32.d.ts +1 -1
- package/lib-commonjs/Radio/useRadio.win32.d.ts.map +1 -1
- package/lib-commonjs/Radio/useRadio.win32.js +162 -196
- package/lib-commonjs/Radio/useRadio.win32.js.map +1 -1
- package/lib-commonjs/RadioGroup/RadioGroup.d.ts +2 -7
- package/lib-commonjs/RadioGroup/RadioGroup.js +45 -65
- package/lib-commonjs/RadioGroup/RadioGroup.styling.d.ts +1 -1
- package/lib-commonjs/RadioGroup/RadioGroup.styling.js +48 -57
- package/lib-commonjs/RadioGroup/RadioGroup.types.d.ts +117 -117
- package/lib-commonjs/RadioGroup/RadioGroup.types.js +3 -3
- package/lib-commonjs/RadioGroup/RadioGroupTokens.android.d.ts +1 -1
- package/lib-commonjs/RadioGroup/RadioGroupTokens.android.js +5 -10
- package/lib-commonjs/RadioGroup/RadioGroupTokens.d.ts +1 -1
- package/lib-commonjs/RadioGroup/RadioGroupTokens.ios.d.ts +1 -1
- package/lib-commonjs/RadioGroup/RadioGroupTokens.ios.js +5 -10
- package/lib-commonjs/RadioGroup/RadioGroupTokens.js +15 -15
- package/lib-commonjs/RadioGroup/RadioGroupTokens.js.map +1 -1
- package/lib-commonjs/RadioGroup/RadioGroupTokens.mobile.d.ts +1 -1
- package/lib-commonjs/RadioGroup/RadioGroupTokens.mobile.js +16 -16
- package/lib-commonjs/RadioGroup/RadioGroupTokens.mobile.js.map +1 -1
- package/lib-commonjs/RadioGroup/__tests__/RadioGroupExperimental.test.d.ts +1 -1
- package/lib-commonjs/RadioGroup/__tests__/RadioGroupExperimental.test.js +91 -153
- package/lib-commonjs/RadioGroup/radioGroupContext.d.ts +1 -1
- package/lib-commonjs/RadioGroup/radioGroupContext.js +47 -68
- package/lib-commonjs/RadioGroup/useRadioGroup.d.ts +1 -1
- package/lib-commonjs/RadioGroup/useRadioGroup.js +97 -144
- package/lib-commonjs/RadioGroup/useRadioGroupContextValue.d.ts +1 -1
- package/lib-commonjs/RadioGroup/useRadioGroupContextValue.js +4 -4
- package/lib-commonjs/index.d.ts +4 -25
- package/lib-commonjs/index.js +32 -128
- package/lib-commonjs/legacy/MacOSRadioButtonNativeComponent.d.ts +6 -6
- package/lib-commonjs/legacy/MacOSRadioButtonNativeComponent.js +7 -9
- package/lib-commonjs/legacy/RadioButton.d.ts +2 -8
- package/lib-commonjs/legacy/RadioButton.d.ts.map +1 -1
- package/lib-commonjs/legacy/RadioButton.js +123 -162
- package/lib-commonjs/legacy/RadioButton.js.map +1 -1
- package/lib-commonjs/legacy/RadioButton.macos.d.ts +2 -8
- package/lib-commonjs/legacy/RadioButton.macos.d.ts.map +1 -1
- package/lib-commonjs/legacy/RadioButton.macos.js +90 -107
- package/lib-commonjs/legacy/RadioButton.macos.js.map +1 -1
- package/lib-commonjs/legacy/RadioButton.settings.d.ts +2 -2
- package/lib-commonjs/legacy/RadioButton.settings.js +84 -84
- package/lib-commonjs/legacy/RadioButton.types.d.ts +45 -45
- package/lib-commonjs/legacy/RadioButton.types.js +3 -3
- package/lib-commonjs/legacy/RadioButton.win32.d.ts +2 -8
- package/lib-commonjs/legacy/RadioButton.win32.d.ts.map +1 -1
- package/lib-commonjs/legacy/RadioButton.win32.js +177 -217
- package/lib-commonjs/legacy/RadioButton.win32.js.map +1 -1
- package/lib-commonjs/legacy/RadioGroup.d.ts +2 -8
- package/lib-commonjs/legacy/RadioGroup.d.ts.map +1 -1
- package/lib-commonjs/legacy/RadioGroup.js +121 -168
- package/lib-commonjs/legacy/RadioGroup.js.map +1 -1
- package/lib-commonjs/legacy/RadioGroup.settings.d.ts +1 -1
- package/lib-commonjs/legacy/RadioGroup.settings.js +24 -24
- package/lib-commonjs/legacy/RadioGroup.types.d.ts +79 -78
- package/lib-commonjs/legacy/RadioGroup.types.js +3 -3
- package/lib-commonjs/legacy/__tests__/RadioButton.test.d.ts +1 -1
- package/lib-commonjs/legacy/__tests__/RadioButton.test.js +42 -59
- package/lib-commonjs/legacy/__tests__/RadioButtonGroup.test.d.ts +1 -1
- package/lib-commonjs/legacy/__tests__/RadioButtonGroup.test.js +53 -96
- package/package.json +35 -34
- package/src/Radio/RadioTokens.android.ts +1 -1
- package/src/Radio/RadioTokens.ios.ts +1 -1
- package/src/Radio/RadioTokens.ts +1 -1
- package/src/Radio/RadioTokens.win32.ts +1 -1
- package/src/Radio/useRadio.ts +13 -11
- package/src/Radio/useRadio.win32.ts +45 -26
- package/src/RadioGroup/RadioGroupTokens.mobile.ts +1 -1
- package/src/RadioGroup/RadioGroupTokens.ts +1 -1
- 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
|
@@ -22,27 +22,29 @@ export const RadioButton = compose<IRadioButtonType>({
|
|
|
22
22
|
const defaultComponentRef = React.useRef(null);
|
|
23
23
|
const { content, buttonKey, disabled, componentRef = defaultComponentRef } = userProps;
|
|
24
24
|
const info = React.useContext(RadioGroupContext);
|
|
25
|
+
const { onChange, selectedKey, updateSelectedButtonRef } = info;
|
|
25
26
|
|
|
26
27
|
// Reroute the native component's onPress event to RadioGroup's onChange
|
|
27
|
-
const onPressRerouted = () => {
|
|
28
|
+
const onPressRerouted = React.useCallback(() => {
|
|
28
29
|
// Prevent calls to RadioGroup's onChange on the currently selected button
|
|
29
|
-
if (buttonKey !=
|
|
30
|
-
|
|
31
|
-
|
|
30
|
+
if (buttonKey != selectedKey) {
|
|
31
|
+
onChange && onChange(buttonKey);
|
|
32
|
+
updateSelectedButtonRef && componentRef && updateSelectedButtonRef(componentRef);
|
|
32
33
|
}
|
|
33
|
-
};
|
|
34
|
+
}, [buttonKey, componentRef, onChange, selectedKey, updateSelectedButtonRef]);
|
|
34
35
|
|
|
35
36
|
/* We use the componentRef of the currently selected button to maintain the default tabbable
|
|
36
37
|
element in a RadioGroup. Since the componentRef isn't generated until after initial render,
|
|
37
38
|
we must update it once here. */
|
|
38
39
|
React.useEffect(() => {
|
|
39
|
-
if (buttonKey ===
|
|
40
|
-
|
|
40
|
+
if (buttonKey === selectedKey) {
|
|
41
|
+
updateSelectedButtonRef && componentRef && updateSelectedButtonRef(componentRef);
|
|
41
42
|
}
|
|
43
|
+
// eslint-disable-next-line react-hooks/exhaustive-deps -- intentionally run only on mount/unmount
|
|
42
44
|
}, []);
|
|
43
45
|
|
|
44
46
|
const styleProps = useStyling(userProps);
|
|
45
|
-
const isSelected =
|
|
47
|
+
const isSelected = selectedKey === buttonKey;
|
|
46
48
|
const slotProps = mergeSettings<IRadioButtonSlotProps>(styleProps, {
|
|
47
49
|
root: {
|
|
48
50
|
ref: componentRef,
|
|
@@ -38,24 +38,26 @@ export const RadioButton = compose<IRadioButtonType>({
|
|
|
38
38
|
|
|
39
39
|
// Grabs the context information from RadioGroup (currently selected button and client's onChange callback)
|
|
40
40
|
const info = React.useContext(RadioGroupContext);
|
|
41
|
+
const { selectedKey, onChange, updateSelectedButtonRef, buttonKeys } = info;
|
|
41
42
|
|
|
42
43
|
const buttonRef = useViewCommandFocus(componentRef);
|
|
43
44
|
|
|
44
45
|
/* We don't want to call the user's onChange multiple times on the same selection. */
|
|
45
|
-
const changeSelection = () => {
|
|
46
|
-
if (buttonKey !=
|
|
47
|
-
|
|
48
|
-
|
|
46
|
+
const changeSelection = React.useCallback(() => {
|
|
47
|
+
if (buttonKey != selectedKey) {
|
|
48
|
+
onChange && onChange(buttonKey);
|
|
49
|
+
updateSelectedButtonRef && componentRef && updateSelectedButtonRef(componentRef);
|
|
49
50
|
}
|
|
50
|
-
};
|
|
51
|
+
}, [buttonKey, componentRef, onChange, selectedKey, updateSelectedButtonRef]);
|
|
51
52
|
|
|
52
53
|
/* We use the componentRef of the currently selected button to maintain the default tabbable
|
|
53
54
|
element in a RadioGroup. Since the componentRef isn't generated until after initial render,
|
|
54
55
|
we must update it once here. */
|
|
55
56
|
React.useEffect(() => {
|
|
56
|
-
if (buttonKey ==
|
|
57
|
-
|
|
57
|
+
if (buttonKey == selectedKey) {
|
|
58
|
+
updateSelectedButtonRef && componentRef && updateSelectedButtonRef(componentRef);
|
|
58
59
|
}
|
|
60
|
+
// eslint-disable-next-line react-hooks/exhaustive-deps -- intentionally run only on mount/unmount
|
|
59
61
|
}, []);
|
|
60
62
|
|
|
61
63
|
// Ensure focus is placed on button after click
|
|
@@ -77,12 +79,12 @@ export const RadioButton = compose<IRadioButtonType>({
|
|
|
77
79
|
break;
|
|
78
80
|
}
|
|
79
81
|
},
|
|
80
|
-
[
|
|
82
|
+
[changeSelection],
|
|
81
83
|
);
|
|
82
84
|
|
|
83
85
|
const state = {
|
|
84
86
|
...pressable.state,
|
|
85
|
-
selected:
|
|
87
|
+
selected: selectedKey === userProps.buttonKey,
|
|
86
88
|
disabled: disabled || false,
|
|
87
89
|
};
|
|
88
90
|
|
|
@@ -98,8 +100,8 @@ export const RadioButton = compose<IRadioButtonType>({
|
|
|
98
100
|
accessibilityLabel: accessibilityLabel ?? ariaLabel ?? content,
|
|
99
101
|
accessibilityState: { disabled: state.disabled, selected: state.selected },
|
|
100
102
|
accessibilityActions: [{ name: 'Select', label: radioButtonSelectActionLabel }],
|
|
101
|
-
accessibilityPosInSet: accessibilityPosInSet ?? ariaPosInSet ??
|
|
102
|
-
accessibilitySetSize: accessibilitySetSize ?? ariaSetSize ??
|
|
103
|
+
accessibilityPosInSet: accessibilityPosInSet ?? ariaPosInSet ?? buttonKeys.findIndex((x) => x == buttonKey) + 1,
|
|
104
|
+
accessibilitySetSize: accessibilitySetSize ?? ariaSetSize ?? buttonKeys.length,
|
|
103
105
|
focusable: !state.disabled,
|
|
104
106
|
onAccessibilityAction: onAccessibilityAction,
|
|
105
107
|
},
|
|
@@ -46,38 +46,53 @@ export const RadioButton = compose<IRadioButtonType>({
|
|
|
46
46
|
|
|
47
47
|
// Grabs the context information from RadioGroup (currently selected button and client's onChange callback)
|
|
48
48
|
const info = React.useContext(RadioGroupContext);
|
|
49
|
+
const {
|
|
50
|
+
addRadioButtonEnabledKey,
|
|
51
|
+
addRadioButtonKey,
|
|
52
|
+
buttonKeys,
|
|
53
|
+
enabledButtonKeys,
|
|
54
|
+
invoked,
|
|
55
|
+
onChange,
|
|
56
|
+
removeRadioButtonEnabledKey,
|
|
57
|
+
removeRadioButtonKey,
|
|
58
|
+
selectedKey,
|
|
59
|
+
updateInvoked,
|
|
60
|
+
updateSelectedButtonRef,
|
|
61
|
+
} = info;
|
|
49
62
|
|
|
50
63
|
const buttonRef = useViewCommandFocus(componentRef);
|
|
51
64
|
|
|
52
65
|
/* We don't want to call the user's onChange multiple times on the same selection. */
|
|
53
|
-
const changeSelection = () => {
|
|
54
|
-
if (buttonKey !=
|
|
55
|
-
|
|
56
|
-
|
|
66
|
+
const changeSelection = React.useCallback(() => {
|
|
67
|
+
if (buttonKey != selectedKey) {
|
|
68
|
+
onChange && onChange(buttonKey);
|
|
69
|
+
updateSelectedButtonRef && componentRef && updateSelectedButtonRef(componentRef);
|
|
57
70
|
}
|
|
58
|
-
};
|
|
71
|
+
}, [buttonKey, componentRef, onChange, selectedKey, updateSelectedButtonRef]);
|
|
59
72
|
|
|
60
73
|
/* We use the componentRef of the currently selected button to maintain the default tabbable
|
|
61
74
|
element in a RadioGroup. Since the componentRef isn't generated until after initial render,
|
|
62
75
|
we must update it once here. */
|
|
63
76
|
React.useEffect(() => {
|
|
64
|
-
if (buttonKey ==
|
|
65
|
-
|
|
77
|
+
if (buttonKey == selectedKey) {
|
|
78
|
+
updateSelectedButtonRef && componentRef && updateSelectedButtonRef(componentRef);
|
|
66
79
|
}
|
|
80
|
+
// eslint-disable-next-line react-hooks/exhaustive-deps -- intentionally run only on mount/unmount
|
|
67
81
|
}, []);
|
|
68
82
|
|
|
69
83
|
// Explicitly only run on mount and unmount
|
|
70
84
|
React.useEffect(() => {
|
|
71
|
-
|
|
85
|
+
addRadioButtonKey(buttonKey);
|
|
72
86
|
|
|
73
87
|
if (!disabled) {
|
|
74
|
-
|
|
88
|
+
addRadioButtonEnabledKey(buttonKey);
|
|
75
89
|
}
|
|
76
90
|
|
|
77
91
|
return () => {
|
|
78
|
-
|
|
79
|
-
|
|
92
|
+
removeRadioButtonKey(buttonKey);
|
|
93
|
+
removeRadioButtonEnabledKey(buttonKey);
|
|
80
94
|
};
|
|
95
|
+
// eslint-disable-next-line react-hooks/exhaustive-deps -- intentionally run only on mount/unmount
|
|
81
96
|
}, []);
|
|
82
97
|
|
|
83
98
|
const isRTL = I18nManager.isRTL;
|
|
@@ -85,11 +100,11 @@ export const RadioButton = compose<IRadioButtonType>({
|
|
|
85
100
|
const onInvoke = React.useCallback(
|
|
86
101
|
(e: KeyPressEvent) => {
|
|
87
102
|
if (e.nativeEvent.key in DirectionalArrowKeys) {
|
|
88
|
-
const length =
|
|
103
|
+
const length = enabledButtonKeys.length;
|
|
89
104
|
const next =
|
|
90
105
|
e.nativeEvent.key === DirectionalArrowKeys.ArrowDown ||
|
|
91
106
|
(isRTL ? e.nativeEvent.key === DirectionalArrowKeys.ArrowLeft : e.nativeEvent.key === DirectionalArrowKeys.ArrowRight);
|
|
92
|
-
const currRadioButtonIndex =
|
|
107
|
+
const currRadioButtonIndex = enabledButtonKeys.indexOf(selectedKey);
|
|
93
108
|
let newCurrRadioButtonIndex;
|
|
94
109
|
if (next) {
|
|
95
110
|
newCurrRadioButtonIndex = (currRadioButtonIndex + 1) % length;
|
|
@@ -97,21 +112,22 @@ export const RadioButton = compose<IRadioButtonType>({
|
|
|
97
112
|
// previous
|
|
98
113
|
newCurrRadioButtonIndex = (currRadioButtonIndex - 1 + length) % length;
|
|
99
114
|
}
|
|
100
|
-
|
|
101
|
-
|
|
115
|
+
onChange && onChange(enabledButtonKeys[newCurrRadioButtonIndex]);
|
|
116
|
+
updateInvoked && updateInvoked(true);
|
|
102
117
|
}
|
|
103
118
|
},
|
|
104
|
-
[
|
|
119
|
+
[enabledButtonKeys, isRTL, onChange, selectedKey, updateInvoked],
|
|
105
120
|
);
|
|
106
121
|
|
|
107
122
|
// Sets the updated selected button ref and focus if this Radio is selected via arrow key.
|
|
108
123
|
React.useEffect(() => {
|
|
109
|
-
if (
|
|
110
|
-
|
|
124
|
+
if (invoked && buttonKey === selectedKey && !disabled) {
|
|
125
|
+
updateSelectedButtonRef && componentRef && updateSelectedButtonRef(componentRef);
|
|
111
126
|
componentRef?.current?.focus();
|
|
112
|
-
|
|
127
|
+
updateInvoked && updateInvoked(false);
|
|
113
128
|
}
|
|
114
|
-
|
|
129
|
+
// eslint-disable-next-line react-hooks/exhaustive-deps -- only re-run when invoked changes
|
|
130
|
+
}, [invoked]);
|
|
115
131
|
|
|
116
132
|
const keys = ['ArrowDown', 'ArrowRight', 'ArrowUp', 'ArrowLeft'];
|
|
117
133
|
|
|
@@ -119,13 +135,13 @@ export const RadioButton = compose<IRadioButtonType>({
|
|
|
119
135
|
const onKeyDownProps = useKeyDownProps(onInvoke, ...keys);
|
|
120
136
|
|
|
121
137
|
// Ensure focus is placed on button after click
|
|
122
|
-
const changeSelectionWithFocus = () => {
|
|
123
|
-
if (buttonKey !=
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
138
|
+
const changeSelectionWithFocus = React.useCallback(() => {
|
|
139
|
+
if (buttonKey != selectedKey) {
|
|
140
|
+
onChange && onChange(buttonKey);
|
|
141
|
+
updateSelectedButtonRef && componentRef && updateSelectedButtonRef(componentRef);
|
|
142
|
+
updateInvoked && updateInvoked(true);
|
|
127
143
|
}
|
|
128
|
-
};
|
|
144
|
+
}, [buttonKey, componentRef, onChange, selectedKey, updateInvoked, updateSelectedButtonRef]);
|
|
129
145
|
|
|
130
146
|
/* RadioButton changes selection when focus is moved between each RadioButton and on a click */
|
|
131
147
|
const pressable = useAsPressable({
|
|
@@ -143,12 +159,12 @@ export const RadioButton = compose<IRadioButtonType>({
|
|
|
143
159
|
break;
|
|
144
160
|
}
|
|
145
161
|
},
|
|
146
|
-
[
|
|
162
|
+
[changeSelection],
|
|
147
163
|
);
|
|
148
164
|
|
|
149
165
|
const state = {
|
|
150
166
|
...pressable.state,
|
|
151
|
-
selected:
|
|
167
|
+
selected: selectedKey === userProps.buttonKey && !disabled,
|
|
152
168
|
disabled: disabled || false,
|
|
153
169
|
};
|
|
154
170
|
|
|
@@ -164,8 +180,8 @@ export const RadioButton = compose<IRadioButtonType>({
|
|
|
164
180
|
accessibilityLabel: accessibilityLabel ?? ariaLabel ?? content,
|
|
165
181
|
accessibilityState: { disabled: state.disabled, selected: state.selected },
|
|
166
182
|
accessibilityActions: [{ name: 'Select', label: radioButtonSelectActionLabel }],
|
|
167
|
-
accessibilityPosInSet: accessibilityPosInSet ?? ariaPosInSet ??
|
|
168
|
-
accessibilitySetSize: accessibilitySetSize ?? ariaSetSize ??
|
|
183
|
+
accessibilityPosInSet: accessibilityPosInSet ?? ariaPosInSet ?? buttonKeys.findIndex((x) => x == buttonKey) + 1,
|
|
184
|
+
accessibilitySetSize: accessibilitySetSize ?? ariaSetSize ?? buttonKeys.length,
|
|
169
185
|
focusable: !state.disabled,
|
|
170
186
|
onAccessibilityAction: onAccessibilityAction,
|
|
171
187
|
...onKeyDownProps,
|
|
@@ -64,16 +64,14 @@ export const RadioGroup = compose<IRadioGroupType>({
|
|
|
64
64
|
|
|
65
65
|
const onAddRadioButtonKey = React.useCallback(
|
|
66
66
|
(buttonKey: string) => {
|
|
67
|
-
|
|
68
|
-
setButtonKeys(buttonKeys);
|
|
67
|
+
setButtonKeys((prevButtonKeys) => [...prevButtonKeys, buttonKey]);
|
|
69
68
|
},
|
|
70
69
|
[setButtonKeys],
|
|
71
70
|
);
|
|
72
71
|
|
|
73
72
|
const onRemoveRadioButtonKey = React.useCallback(
|
|
74
73
|
(buttonKey: string) => {
|
|
75
|
-
|
|
76
|
-
setButtonKeys(buttonKeys);
|
|
74
|
+
setButtonKeys((prevButtonKeys) => prevButtonKeys.filter((item) => item !== buttonKey));
|
|
77
75
|
},
|
|
78
76
|
[setButtonKeys],
|
|
79
77
|
);
|
|
@@ -82,16 +80,14 @@ export const RadioGroup = compose<IRadioGroupType>({
|
|
|
82
80
|
|
|
83
81
|
const onAddRadioButtonEnabledKey = React.useCallback(
|
|
84
82
|
(buttonKey: string) => {
|
|
85
|
-
|
|
86
|
-
setEnabledButtonKeys(enabledButtonKeys);
|
|
83
|
+
setEnabledButtonKeys((prevEnabledButtonKeys) => [...prevEnabledButtonKeys, buttonKey]);
|
|
87
84
|
},
|
|
88
85
|
[setEnabledButtonKeys],
|
|
89
86
|
);
|
|
90
87
|
|
|
91
88
|
const onRemoveRadioButtonEnabledKey = React.useCallback(
|
|
92
89
|
(buttonKey: string) => {
|
|
93
|
-
|
|
94
|
-
setEnabledButtonKeys(enabledButtonKeys);
|
|
90
|
+
setEnabledButtonKeys((prevEnabledButtonKeys) => prevEnabledButtonKeys.filter((item) => item !== buttonKey));
|
|
95
91
|
},
|
|
96
92
|
[setEnabledButtonKeys],
|
|
97
93
|
);
|
package/eslint.config.js
DELETED