@fluentui-react-native/radio-group 0.22.1 → 0.22.4
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/.cache/tsconfig.tsbuildinfo +1 -0
- package/CHANGELOG.md +67 -0
- package/jest.config.cjs +1 -0
- package/lib/Radio/Radio.d.ts.map +1 -1
- package/lib/Radio/Radio.ios.d.ts.map +1 -1
- package/lib/Radio/Radio.ios.js +2 -4
- package/lib/Radio/Radio.ios.js.map +1 -1
- package/lib/Radio/Radio.js +2 -4
- package/lib/Radio/Radio.js.map +1 -1
- package/lib/Radio/__tests__/RadioExperimental.test.js.map +1 -1
- 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 +37 -33
- package/lib/Radio/useRadio.win32.js.map +1 -1
- package/lib/RadioGroup/RadioGroup.d.ts.map +1 -1
- package/lib/RadioGroup/RadioGroup.js +1 -2
- package/lib/RadioGroup/RadioGroup.js.map +1 -1
- package/lib/RadioGroup/__tests__/RadioGroupExperimental.test.js +6 -18
- package/lib/RadioGroup/__tests__/RadioGroupExperimental.test.js.map +1 -1
- package/lib/RadioGroup/radioGroupContext.js +6 -6
- package/lib/RadioGroup/radioGroupContext.js.map +1 -1
- package/lib/RadioGroup/useRadioGroup.d.ts.map +1 -1
- package/lib/RadioGroup/useRadioGroup.js.map +1 -1
- package/lib/RadioGroup/useRadioGroupContextValue.d.ts +2 -1
- package/lib/RadioGroup/useRadioGroupContextValue.d.ts.map +1 -1
- package/lib/RadioGroup/useRadioGroupContextValue.js.map +1 -1
- package/lib/legacy/MacOSRadioButtonNativeComponent.d.ts.map +1 -1
- package/lib/legacy/RadioButton.d.ts.map +1 -1
- package/lib/legacy/RadioButton.js +14 -13
- 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 +41 -39
- package/lib/legacy/RadioButton.win32.js.map +1 -1
- package/lib/legacy/RadioGroup.d.ts.map +1 -1
- package/lib/legacy/RadioGroup.js +7 -13
- package/lib/legacy/RadioGroup.js.map +1 -1
- package/lib/legacy/__tests__/RadioButton.test.js.map +1 -1
- package/lib/legacy/__tests__/RadioButtonGroup.test.js +2 -6
- package/lib/legacy/__tests__/RadioButtonGroup.test.js.map +1 -1
- package/package.json +33 -38
- package/src/Radio/useRadio.ts +13 -11
- package/src/Radio/useRadio.win32.ts +52 -32
- package/src/legacy/RadioButton.macos.tsx +10 -8
- package/src/legacy/RadioButton.tsx +13 -11
- package/src/legacy/RadioButton.win32.tsx +53 -36
- package/src/legacy/RadioGroup.tsx +4 -8
- package/tsconfig.json +53 -3
- package/babel.config.js +0 -1
- package/eslint.config.js +0 -3
- package/jest.config.js +0 -2
- package/lib-commonjs/Radio/Radio.d.ts +0 -13
- package/lib-commonjs/Radio/Radio.d.ts.map +0 -1
- package/lib-commonjs/Radio/Radio.ios.d.ts +0 -13
- package/lib-commonjs/Radio/Radio.ios.d.ts.map +0 -1
- package/lib-commonjs/Radio/Radio.ios.js +0 -55
- package/lib-commonjs/Radio/Radio.ios.js.map +0 -1
- package/lib-commonjs/Radio/Radio.js +0 -54
- package/lib-commonjs/Radio/Radio.js.map +0 -1
- package/lib-commonjs/Radio/Radio.styling.d.ts +0 -5
- package/lib-commonjs/Radio/Radio.styling.d.ts.map +0 -1
- package/lib-commonjs/Radio/Radio.styling.js +0 -98
- package/lib-commonjs/Radio/Radio.styling.js.map +0 -1
- package/lib-commonjs/Radio/Radio.types.d.ts +0 -186
- package/lib-commonjs/Radio/Radio.types.d.ts.map +0 -1
- package/lib-commonjs/Radio/Radio.types.js +0 -5
- package/lib-commonjs/Radio/Radio.types.js.map +0 -1
- package/lib-commonjs/Radio/RadioTokens.android.d.ts +0 -5
- package/lib-commonjs/Radio/RadioTokens.android.d.ts.map +0 -1
- package/lib-commonjs/Radio/RadioTokens.android.js +0 -53
- package/lib-commonjs/Radio/RadioTokens.android.js.map +0 -1
- package/lib-commonjs/Radio/RadioTokens.d.ts +0 -5
- package/lib-commonjs/Radio/RadioTokens.d.ts.map +0 -1
- package/lib-commonjs/Radio/RadioTokens.ios.d.ts +0 -5
- package/lib-commonjs/Radio/RadioTokens.ios.d.ts.map +0 -1
- package/lib-commonjs/Radio/RadioTokens.ios.js +0 -51
- package/lib-commonjs/Radio/RadioTokens.ios.js.map +0 -1
- package/lib-commonjs/Radio/RadioTokens.js +0 -88
- package/lib-commonjs/Radio/RadioTokens.js.map +0 -1
- package/lib-commonjs/Radio/RadioTokens.win32.d.ts +0 -5
- package/lib-commonjs/Radio/RadioTokens.win32.d.ts.map +0 -1
- package/lib-commonjs/Radio/RadioTokens.win32.js +0 -102
- package/lib-commonjs/Radio/RadioTokens.win32.js.map +0 -1
- package/lib-commonjs/Radio/__tests__/RadioExperimental.test.d.ts +0 -2
- package/lib-commonjs/Radio/__tests__/RadioExperimental.test.d.ts.map +0 -1
- package/lib-commonjs/Radio/__tests__/RadioExperimental.test.js +0 -56
- package/lib-commonjs/Radio/__tests__/RadioExperimental.test.js.map +0 -1
- package/lib-commonjs/Radio/useRadio.d.ts +0 -3
- package/lib-commonjs/Radio/useRadio.d.ts.map +0 -1
- package/lib-commonjs/Radio/useRadio.js +0 -119
- package/lib-commonjs/Radio/useRadio.js.map +0 -1
- package/lib-commonjs/Radio/useRadio.win32.d.ts +0 -3
- package/lib-commonjs/Radio/useRadio.win32.d.ts.map +0 -1
- package/lib-commonjs/Radio/useRadio.win32.js +0 -175
- package/lib-commonjs/Radio/useRadio.win32.js.map +0 -1
- package/lib-commonjs/RadioGroup/RadioGroup.d.ts +0 -12
- package/lib-commonjs/RadioGroup/RadioGroup.d.ts.map +0 -1
- package/lib-commonjs/RadioGroup/RadioGroup.js +0 -59
- package/lib-commonjs/RadioGroup/RadioGroup.js.map +0 -1
- package/lib-commonjs/RadioGroup/RadioGroup.styling.d.ts +0 -5
- package/lib-commonjs/RadioGroup/RadioGroup.styling.d.ts.map +0 -1
- package/lib-commonjs/RadioGroup/RadioGroup.styling.js +0 -52
- package/lib-commonjs/RadioGroup/RadioGroup.styling.js.map +0 -1
- package/lib-commonjs/RadioGroup/RadioGroup.types.d.ts +0 -134
- package/lib-commonjs/RadioGroup/RadioGroup.types.d.ts.map +0 -1
- package/lib-commonjs/RadioGroup/RadioGroup.types.js +0 -5
- package/lib-commonjs/RadioGroup/RadioGroup.types.js.map +0 -1
- package/lib-commonjs/RadioGroup/RadioGroupTokens.android.d.ts +0 -3
- package/lib-commonjs/RadioGroup/RadioGroupTokens.android.d.ts.map +0 -1
- package/lib-commonjs/RadioGroup/RadioGroupTokens.android.js +0 -6
- package/lib-commonjs/RadioGroup/RadioGroupTokens.android.js.map +0 -1
- package/lib-commonjs/RadioGroup/RadioGroupTokens.d.ts +0 -5
- package/lib-commonjs/RadioGroup/RadioGroupTokens.d.ts.map +0 -1
- package/lib-commonjs/RadioGroup/RadioGroupTokens.ios.d.ts +0 -2
- package/lib-commonjs/RadioGroup/RadioGroupTokens.ios.d.ts.map +0 -1
- package/lib-commonjs/RadioGroup/RadioGroupTokens.ios.js +0 -6
- package/lib-commonjs/RadioGroup/RadioGroupTokens.ios.js.map +0 -1
- package/lib-commonjs/RadioGroup/RadioGroupTokens.js +0 -19
- package/lib-commonjs/RadioGroup/RadioGroupTokens.js.map +0 -1
- package/lib-commonjs/RadioGroup/RadioGroupTokens.mobile.d.ts +0 -5
- package/lib-commonjs/RadioGroup/RadioGroupTokens.mobile.d.ts.map +0 -1
- package/lib-commonjs/RadioGroup/RadioGroupTokens.mobile.js +0 -20
- package/lib-commonjs/RadioGroup/RadioGroupTokens.mobile.js.map +0 -1
- package/lib-commonjs/RadioGroup/__tests__/RadioGroupExperimental.test.d.ts +0 -2
- package/lib-commonjs/RadioGroup/__tests__/RadioGroupExperimental.test.d.ts.map +0 -1
- package/lib-commonjs/RadioGroup/__tests__/RadioGroupExperimental.test.js +0 -104
- package/lib-commonjs/RadioGroup/__tests__/RadioGroupExperimental.test.js.map +0 -1
- package/lib-commonjs/RadioGroup/radioGroupContext.d.ts +0 -10
- package/lib-commonjs/RadioGroup/radioGroupContext.d.ts.map +0 -1
- package/lib-commonjs/RadioGroup/radioGroupContext.js +0 -59
- package/lib-commonjs/RadioGroup/radioGroupContext.js.map +0 -1
- package/lib-commonjs/RadioGroup/useRadioGroup.d.ts +0 -3
- package/lib-commonjs/RadioGroup/useRadioGroup.d.ts.map +0 -1
- package/lib-commonjs/RadioGroup/useRadioGroup.js +0 -108
- package/lib-commonjs/RadioGroup/useRadioGroup.js.map +0 -1
- package/lib-commonjs/RadioGroup/useRadioGroupContextValue.d.ts +0 -3
- package/lib-commonjs/RadioGroup/useRadioGroupContextValue.d.ts.map +0 -1
- package/lib-commonjs/RadioGroup/useRadioGroupContextValue.js +0 -8
- package/lib-commonjs/RadioGroup/useRadioGroupContextValue.js.map +0 -1
- package/lib-commonjs/index.d.ts +0 -18
- package/lib-commonjs/index.d.ts.map +0 -1
- package/lib-commonjs/index.js +0 -32
- package/lib-commonjs/index.js.map +0 -1
- package/lib-commonjs/legacy/MacOSRadioButtonNativeComponent.d.ts +0 -17
- package/lib-commonjs/legacy/MacOSRadioButtonNativeComponent.d.ts.map +0 -1
- package/lib-commonjs/legacy/MacOSRadioButtonNativeComponent.js +0 -13
- package/lib-commonjs/legacy/MacOSRadioButtonNativeComponent.js.map +0 -1
- package/lib-commonjs/legacy/RadioButton.d.ts +0 -4
- package/lib-commonjs/legacy/RadioButton.d.ts.map +0 -1
- package/lib-commonjs/legacy/RadioButton.js +0 -133
- package/lib-commonjs/legacy/RadioButton.js.map +0 -1
- package/lib-commonjs/legacy/RadioButton.macos.d.ts +0 -4
- package/lib-commonjs/legacy/RadioButton.macos.d.ts.map +0 -1
- package/lib-commonjs/legacy/RadioButton.macos.js +0 -104
- package/lib-commonjs/legacy/RadioButton.macos.js.map +0 -1
- package/lib-commonjs/legacy/RadioButton.settings.d.ts +0 -5
- package/lib-commonjs/legacy/RadioButton.settings.d.ts.map +0 -1
- package/lib-commonjs/legacy/RadioButton.settings.js +0 -98
- package/lib-commonjs/legacy/RadioButton.settings.js.map +0 -1
- package/lib-commonjs/legacy/RadioButton.types.d.ts +0 -62
- package/lib-commonjs/legacy/RadioButton.types.d.ts.map +0 -1
- package/lib-commonjs/legacy/RadioButton.types.js +0 -5
- package/lib-commonjs/legacy/RadioButton.types.js.map +0 -1
- package/lib-commonjs/legacy/RadioButton.win32.d.ts +0 -4
- package/lib-commonjs/legacy/RadioButton.win32.d.ts.map +0 -1
- package/lib-commonjs/legacy/RadioButton.win32.js +0 -188
- package/lib-commonjs/legacy/RadioButton.win32.js.map +0 -1
- package/lib-commonjs/legacy/RadioGroup.d.ts +0 -7
- package/lib-commonjs/legacy/RadioGroup.d.ts.map +0 -1
- package/lib-commonjs/legacy/RadioGroup.js +0 -139
- package/lib-commonjs/legacy/RadioGroup.js.map +0 -1
- package/lib-commonjs/legacy/RadioGroup.settings.d.ts +0 -4
- package/lib-commonjs/legacy/RadioGroup.settings.d.ts.map +0 -1
- package/lib-commonjs/legacy/RadioGroup.settings.js +0 -28
- package/lib-commonjs/legacy/RadioGroup.settings.js.map +0 -1
- package/lib-commonjs/legacy/RadioGroup.types.d.ts +0 -96
- package/lib-commonjs/legacy/RadioGroup.types.d.ts.map +0 -1
- package/lib-commonjs/legacy/RadioGroup.types.js +0 -5
- package/lib-commonjs/legacy/RadioGroup.types.js.map +0 -1
- package/lib-commonjs/legacy/__tests__/RadioButton.test.d.ts +0 -2
- package/lib-commonjs/legacy/__tests__/RadioButton.test.d.ts.map +0 -1
- package/lib-commonjs/legacy/__tests__/RadioButton.test.js +0 -49
- package/lib-commonjs/legacy/__tests__/RadioButton.test.js.map +0 -1
- package/lib-commonjs/legacy/__tests__/RadioButtonGroup.test.d.ts +0 -2
- package/lib-commonjs/legacy/__tests__/RadioButtonGroup.test.d.ts.map +0 -1
- package/lib-commonjs/legacy/__tests__/RadioButtonGroup.test.js +0 -61
- package/lib-commonjs/legacy/__tests__/RadioButtonGroup.test.js.map +0 -1
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
|
|
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;
|
|
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;AAa3D,eAAO,MAAM,QAAQ,UAAW,UAAU,KAAG,SAkL5C,CAAC"}
|
|
@@ -4,81 +4,85 @@ import { memoize } from '@fluentui-react-native/framework';
|
|
|
4
4
|
import { usePressableState, useOnPressWithFocus, useViewCommandFocus, useKeyDownProps } from '@fluentui-react-native/interactive-hooks';
|
|
5
5
|
import { useRadioGroupContext } from '../RadioGroup/radioGroupContext';
|
|
6
6
|
const defaultAccessibilityActions = [{ name: 'Select' }];
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
})(DirectionalArrowKeys || (DirectionalArrowKeys = {}));
|
|
7
|
+
const DirectionalArrowKeys = {
|
|
8
|
+
ArrowUp: 'ArrowUp',
|
|
9
|
+
ArrowDown: 'ArrowDown',
|
|
10
|
+
ArrowRight: 'ArrowRight',
|
|
11
|
+
ArrowLeft: 'ArrowLeft',
|
|
12
|
+
};
|
|
14
13
|
export const useRadio = (props) => {
|
|
15
14
|
const defaultComponentRef = React.useRef(null);
|
|
16
15
|
// Grabs the context information from RadioGroup (currently selected button and client's onChange callback)
|
|
17
16
|
const radioGroupContext = useRadioGroupContext();
|
|
17
|
+
const { addRadioEnabledValue, addRadioValue, disabled: groupDisabled, enabledValues, invoked, layout, onChange, removeRadioEnabledValue, removeRadioValue, updateInvoked, updateSelectedButtonRef, value: selectedValue, values, } = radioGroupContext;
|
|
18
18
|
const { label, subtext, value, disabled, accessibilityActions, accessibilityLabel, accessibilityHint, accessibilityState, componentRef = defaultComponentRef, accessibilityPosInSet, accessibilitySetSize, ...rest } = props;
|
|
19
|
-
const labelPosition =
|
|
20
|
-
const isDisabled =
|
|
19
|
+
const labelPosition = layout === 'horizontal-stacked' ? 'below' : 'after';
|
|
20
|
+
const isDisabled = groupDisabled || disabled;
|
|
21
21
|
const buttonRef = useViewCommandFocus(componentRef);
|
|
22
22
|
/* We don't want to call the user's onChange multiple times on the same selection. */
|
|
23
23
|
const changeSelection = React.useCallback(() => {
|
|
24
|
-
if (value !==
|
|
25
|
-
|
|
26
|
-
|
|
24
|
+
if (value !== selectedValue) {
|
|
25
|
+
onChange && onChange(value);
|
|
26
|
+
updateSelectedButtonRef && componentRef && updateSelectedButtonRef(componentRef);
|
|
27
27
|
}
|
|
28
|
-
}, [
|
|
28
|
+
}, [componentRef, onChange, selectedValue, updateSelectedButtonRef, value]);
|
|
29
29
|
/* We use the componentRef of the currently selected button to maintain the default tabbable
|
|
30
30
|
element in a RadioGroup. Since the componentRef isn't generated until after initial render,
|
|
31
31
|
we must update it once here. */
|
|
32
32
|
React.useEffect(() => {
|
|
33
|
-
if (value ===
|
|
34
|
-
|
|
33
|
+
if (value === selectedValue && !isDisabled) {
|
|
34
|
+
updateSelectedButtonRef && componentRef && updateSelectedButtonRef(componentRef);
|
|
35
35
|
}
|
|
36
|
+
// eslint-disable-next-line react-hooks/exhaustive-deps -- intentionally run only on mount/unmount
|
|
36
37
|
}, []);
|
|
37
38
|
// Explicitly only run on mount and unmount
|
|
38
39
|
React.useEffect(() => {
|
|
39
|
-
|
|
40
|
+
addRadioValue(value);
|
|
40
41
|
return () => {
|
|
41
|
-
|
|
42
|
+
removeRadioValue(value);
|
|
42
43
|
};
|
|
44
|
+
// eslint-disable-next-line react-hooks/exhaustive-deps -- intentionally run only on mount/unmount
|
|
43
45
|
}, []);
|
|
44
46
|
React.useEffect(() => {
|
|
45
47
|
if (isDisabled) {
|
|
46
|
-
|
|
48
|
+
removeRadioEnabledValue(value);
|
|
47
49
|
}
|
|
48
50
|
else {
|
|
49
|
-
|
|
51
|
+
addRadioEnabledValue(value);
|
|
50
52
|
}
|
|
53
|
+
// eslint-disable-next-line react-hooks/exhaustive-deps -- only re-run when isDisabled changes
|
|
51
54
|
}, [isDisabled]);
|
|
52
55
|
const isRTL = I18nManager.isRTL;
|
|
53
56
|
const onInvoke = React.useCallback((e) => {
|
|
54
57
|
if (e.nativeEvent.key in DirectionalArrowKeys) {
|
|
55
|
-
const length =
|
|
58
|
+
const length = enabledValues.length;
|
|
56
59
|
const previous = e.nativeEvent.key === DirectionalArrowKeys.ArrowUp ||
|
|
57
60
|
(isRTL ? e.nativeEvent.key === DirectionalArrowKeys.ArrowRight : e.nativeEvent.key === DirectionalArrowKeys.ArrowLeft);
|
|
58
61
|
const next = e.nativeEvent.key === DirectionalArrowKeys.ArrowDown ||
|
|
59
62
|
(isRTL ? e.nativeEvent.key === DirectionalArrowKeys.ArrowLeft : e.nativeEvent.key === DirectionalArrowKeys.ArrowRight);
|
|
60
|
-
const currRadioIndex =
|
|
63
|
+
const currRadioIndex = enabledValues.indexOf(selectedValue);
|
|
61
64
|
let newCurrRadioIndex;
|
|
62
65
|
if (next) {
|
|
63
66
|
newCurrRadioIndex = (currRadioIndex + 1) % length;
|
|
64
|
-
|
|
65
|
-
|
|
67
|
+
onChange && onChange(enabledValues[newCurrRadioIndex]);
|
|
68
|
+
updateInvoked && updateInvoked(true);
|
|
66
69
|
}
|
|
67
70
|
else if (previous) {
|
|
68
71
|
newCurrRadioIndex = (currRadioIndex - 1 + length) % length;
|
|
69
|
-
|
|
70
|
-
|
|
72
|
+
onChange && onChange(enabledValues[newCurrRadioIndex]);
|
|
73
|
+
updateInvoked && updateInvoked(true);
|
|
71
74
|
}
|
|
72
75
|
}
|
|
73
|
-
}, [
|
|
76
|
+
}, [enabledValues, isRTL, onChange, selectedValue, updateInvoked]);
|
|
74
77
|
// Sets the updated selected button ref and focus if this Radio is selected via arrow key.
|
|
75
78
|
React.useEffect(() => {
|
|
76
|
-
if (
|
|
77
|
-
|
|
79
|
+
if (invoked && value === selectedValue && !isDisabled) {
|
|
80
|
+
updateSelectedButtonRef && componentRef && updateSelectedButtonRef(componentRef);
|
|
78
81
|
componentRef?.current?.focus();
|
|
79
|
-
|
|
82
|
+
updateInvoked && updateInvoked(false);
|
|
80
83
|
}
|
|
81
|
-
|
|
84
|
+
// eslint-disable-next-line react-hooks/exhaustive-deps -- only re-run when invoked changes
|
|
85
|
+
}, [invoked]);
|
|
82
86
|
const keys = ['ArrowDown', 'ArrowRight', 'ArrowUp', 'ArrowLeft'];
|
|
83
87
|
// Explicitly override onKeyDown to override the native behavior of moving focus with arrow keys.
|
|
84
88
|
const onKeyDownProps = useKeyDownProps(onInvoke, ...keys);
|
|
@@ -101,7 +105,7 @@ export const useRadio = (props) => {
|
|
|
101
105
|
}, [changeSelection]);
|
|
102
106
|
const state = {
|
|
103
107
|
...pressable.state,
|
|
104
|
-
selected:
|
|
108
|
+
selected: selectedValue === props.value && !isDisabled,
|
|
105
109
|
disabled: isDisabled || false,
|
|
106
110
|
};
|
|
107
111
|
return {
|
|
@@ -118,8 +122,8 @@ export const useRadio = (props) => {
|
|
|
118
122
|
accessibilityHint: accessibilityHint ?? subtext,
|
|
119
123
|
accessibilityState: getAccessibilityState(state.disabled, state.selected, accessibilityState),
|
|
120
124
|
accessibilityActions: accessibilityActionsProp,
|
|
121
|
-
accessibilityPosInSet: accessibilityPosInSet ??
|
|
122
|
-
accessibilitySetSize: accessibilitySetSize ??
|
|
125
|
+
accessibilityPosInSet: accessibilityPosInSet ?? values.findIndex((x) => x == value) + 1,
|
|
126
|
+
accessibilitySetSize: accessibilitySetSize ?? values.length,
|
|
123
127
|
focusable: !state.disabled,
|
|
124
128
|
disabled: isDisabled,
|
|
125
129
|
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,
|
|
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":"RadioGroup.d.ts","sourceRoot":"","sources":["../../src/RadioGroup/RadioGroup.tsx"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAkB,eAAe,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAM3F;;;;;;;GAOG;AACH,eAAO,MAAM,gBAAgB,
|
|
1
|
+
{"version":3,"file":"RadioGroup.d.ts","sourceRoot":"","sources":["../../src/RadioGroup/RadioGroup.tsx"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAkB,eAAe,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAM3F;;;;;;;GAOG;AACH,eAAO,MAAM,gBAAgB,UAAW,MAAM,SAAS,eAAe,aAAa,eAAe,KAAG,OAQpG,CAAC;AAEF,eAAO,MAAM,UAAU,8OAqDrB,CAAC"}
|
|
@@ -43,8 +43,7 @@ export const RadioGroup = compose({
|
|
|
43
43
|
return null;
|
|
44
44
|
}
|
|
45
45
|
const { label, required, defaultTabbableElement, isCircularNavigation, ...mergedProps } = mergeProps(radioGroup.props, final);
|
|
46
|
-
const labelComponent = (_jsxs(Slots.label, { children: [
|
|
47
|
-
_jsx(Slots.labelText, { children: label }, "label"), !!required && _jsx(Slots.required, { children: '*' })] }));
|
|
46
|
+
const labelComponent = (_jsxs(Slots.label, { children: [_jsx(Slots.labelText, { children: label }, "label"), !!required && _jsx(Slots.required, { children: '*' })] }));
|
|
48
47
|
const isFocusZoneImplemented = ['macos', 'win32'].includes(Platform.OS);
|
|
49
48
|
const radioGroupContent = _jsx(Slots.options, { children: children });
|
|
50
49
|
const radioGroupContentWithFocusZone = (_jsx(Slots.container, { disabled: radioGroup.state.selectedButtonDisabled, isCircularNavigation: true, defaultTabbableElement: defaultTabbableElement, children: radioGroupContent }));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RadioGroup.js","sourceRoot":"","sources":["../../src/RadioGroup/RadioGroup.tsx"],"names":[],"mappings":";AAEA,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,cAAc,CAAC;AAE9C,OAAO,EAAE,SAAS,EAAE,MAAM,mCAAmC,CAAC;AAE9D,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,kCAAkC,CAAC;AACvE,OAAO,EAAE,MAAM,IAAI,IAAI,EAAE,MAAM,6BAA6B,CAAC;AAE7D,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAEvD,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AACzD,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,yBAAyB,EAAE,MAAM,6BAA6B,CAAC;AAExE;;;;;;;GAOG;AACH,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,KAAa,EAAE,KAAsB,EAAE,SAA0B,EAAW,EAAE
|
|
1
|
+
{"version":3,"file":"RadioGroup.js","sourceRoot":"","sources":["../../src/RadioGroup/RadioGroup.tsx"],"names":[],"mappings":"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"}
|
|
@@ -8,9 +8,7 @@ describe('RadioGroup component tests', () => {
|
|
|
8
8
|
it('RadioGroup default', async () => {
|
|
9
9
|
let component;
|
|
10
10
|
act(() => {
|
|
11
|
-
component = renderer.create(_jsxs(RadioGroup, { label: "Uncontrolled RadioGroup", defaultValue: "key2", children: [
|
|
12
|
-
_jsx(Radio, { value: "key1", label: "RadioButton1" }), _jsx(Radio, { value: "key2", label: "RadioButton2" })
|
|
13
|
-
] }));
|
|
11
|
+
component = renderer.create(_jsxs(RadioGroup, { label: "Uncontrolled RadioGroup", defaultValue: "key2", children: [_jsx(Radio, { value: "key1", label: "RadioButton1" }), _jsx(Radio, { value: "key2", label: "RadioButton2" })] }));
|
|
14
12
|
});
|
|
15
13
|
expect(component.toJSON()).toMatchSnapshot();
|
|
16
14
|
await act(async () => null);
|
|
@@ -18,9 +16,7 @@ describe('RadioGroup component tests', () => {
|
|
|
18
16
|
it('Radio not direct child of radio group', async () => {
|
|
19
17
|
let component;
|
|
20
18
|
act(() => {
|
|
21
|
-
component = renderer.create(_jsxs(RadioGroup, { label: "Uncontrolled RadioGroup", defaultValue: "key2", children: [
|
|
22
|
-
_jsx(Radio, { value: "key1", label: "Radio1", accessibilityPosInSet: 1, accessibilitySetSize: 2 }), _jsx(Radio, { value: "key2", label: "Radio2", accessibilityPosInSet: 2, accessibilitySetSize: 2 })
|
|
23
|
-
] }));
|
|
19
|
+
component = renderer.create(_jsxs(RadioGroup, { label: "Uncontrolled RadioGroup", defaultValue: "key2", children: [_jsx(Radio, { value: "key1", label: "Radio1", accessibilityPosInSet: 1, accessibilitySetSize: 2 }), _jsx(Radio, { value: "key2", label: "Radio2", accessibilityPosInSet: 2, accessibilitySetSize: 2 })] }));
|
|
24
20
|
});
|
|
25
21
|
expect(component.toJSON()).toMatchSnapshot();
|
|
26
22
|
await act(async () => null);
|
|
@@ -28,9 +24,7 @@ describe('RadioGroup component tests', () => {
|
|
|
28
24
|
it('RadioGroup disabled', async () => {
|
|
29
25
|
let component;
|
|
30
26
|
act(() => {
|
|
31
|
-
component = renderer.create(_jsxs(RadioGroup, { disabled: true, label: "Disabled RadioGroup", children: [
|
|
32
|
-
_jsx(Radio, { value: "key1", label: "Radio1", accessibilityPosInSet: 1, accessibilitySetSize: 2 }), _jsx(Radio, { value: "key2", label: "Radio2", accessibilityPosInSet: 2, accessibilitySetSize: 2 })
|
|
33
|
-
] }));
|
|
27
|
+
component = renderer.create(_jsxs(RadioGroup, { disabled: true, label: "Disabled RadioGroup", children: [_jsx(Radio, { value: "key1", label: "Radio1", accessibilityPosInSet: 1, accessibilitySetSize: 2 }), _jsx(Radio, { value: "key2", label: "Radio2", accessibilityPosInSet: 2, accessibilitySetSize: 2 })] }));
|
|
34
28
|
});
|
|
35
29
|
expect(component.toJSON()).toMatchSnapshot();
|
|
36
30
|
await act(async () => null);
|
|
@@ -38,9 +32,7 @@ describe('RadioGroup component tests', () => {
|
|
|
38
32
|
it('RadioGroup required', async () => {
|
|
39
33
|
let component;
|
|
40
34
|
act(() => {
|
|
41
|
-
component = renderer.create(_jsxs(RadioGroup, { required: true, label: "Required RadioGroup", defaultValue: "key2", children: [
|
|
42
|
-
_jsx(Radio, { value: "key1", label: "Radio1", accessibilityPosInSet: 1, accessibilitySetSize: 2 }), _jsx(Radio, { value: "key2", label: "Radio2", accessibilityPosInSet: 2, accessibilitySetSize: 2 })
|
|
43
|
-
] }));
|
|
35
|
+
component = renderer.create(_jsxs(RadioGroup, { required: true, label: "Required RadioGroup", defaultValue: "key2", children: [_jsx(Radio, { value: "key1", label: "Radio1", accessibilityPosInSet: 1, accessibilitySetSize: 2 }), _jsx(Radio, { value: "key2", label: "Radio2", accessibilityPosInSet: 2, accessibilitySetSize: 2 })] }));
|
|
44
36
|
});
|
|
45
37
|
expect(component.toJSON()).toMatchSnapshot();
|
|
46
38
|
await act(async () => null);
|
|
@@ -48,9 +40,7 @@ describe('RadioGroup component tests', () => {
|
|
|
48
40
|
it('RadioGroup horizontal', async () => {
|
|
49
41
|
let component;
|
|
50
42
|
act(() => {
|
|
51
|
-
component = renderer.create(_jsxs(RadioGroup, { layout: "horizontal", label: "Horizontal RadioGroup", defaultValue: "key2", children: [
|
|
52
|
-
_jsx(Radio, { value: "key1", label: "Radio1", accessibilityPosInSet: 1, accessibilitySetSize: 2 }), _jsx(Radio, { value: "key2", label: "Radio2", accessibilityPosInSet: 2, accessibilitySetSize: 2 })
|
|
53
|
-
] }));
|
|
43
|
+
component = renderer.create(_jsxs(RadioGroup, { layout: "horizontal", label: "Horizontal RadioGroup", defaultValue: "key2", children: [_jsx(Radio, { value: "key1", label: "Radio1", accessibilityPosInSet: 1, accessibilitySetSize: 2 }), _jsx(Radio, { value: "key2", label: "Radio2", accessibilityPosInSet: 2, accessibilitySetSize: 2 })] }));
|
|
54
44
|
});
|
|
55
45
|
expect(component.toJSON()).toMatchSnapshot();
|
|
56
46
|
await act(async () => null);
|
|
@@ -58,9 +48,7 @@ describe('RadioGroup component tests', () => {
|
|
|
58
48
|
it('RadioGroup horizontal-stacked', async () => {
|
|
59
49
|
let component;
|
|
60
50
|
act(() => {
|
|
61
|
-
component = renderer.create(_jsxs(RadioGroup, { layout: "horizontal-stacked", label: "Horizontal-Stacked RadioGroup", defaultValue: "key2", children: [
|
|
62
|
-
_jsx(Radio, { value: "key1", label: "Radio1", accessibilityPosInSet: 1, accessibilitySetSize: 2 }), _jsx(Radio, { value: "key2", label: "Radio2", accessibilityPosInSet: 2, accessibilitySetSize: 2 })
|
|
63
|
-
] }));
|
|
51
|
+
component = renderer.create(_jsxs(RadioGroup, { layout: "horizontal-stacked", label: "Horizontal-Stacked RadioGroup", defaultValue: "key2", children: [_jsx(Radio, { value: "key1", label: "Radio1", accessibilityPosInSet: 1, accessibilitySetSize: 2 }), _jsx(Radio, { value: "key2", label: "Radio2", accessibilityPosInSet: 2, accessibilitySetSize: 2 })] }));
|
|
64
52
|
});
|
|
65
53
|
expect(component.toJSON()).toMatchSnapshot();
|
|
66
54
|
await act(async () => null);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RadioGroupExperimental.test.js","sourceRoot":"","sources":["../../../src/RadioGroup/__tests__/RadioGroupExperimental.test.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,OAAO,CAAC;AAE5B,OAAO,KAAK,QAAQ,MAAM,qBAAqB,CAAC;AAEhD,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAC1C,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAE3C,IAAI,CAAC,aAAa,EAAE,CAAC;AAErB,QAAQ,CAAC,4BAA4B,EAAE,GAAG,EAAE
|
|
1
|
+
{"version":3,"file":"RadioGroupExperimental.test.js","sourceRoot":"","sources":["../../../src/RadioGroup/__tests__/RadioGroupExperimental.test.tsx"],"names":[],"mappings":"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"}
|
|
@@ -3,19 +3,19 @@ export const RadioGroupContext = React.createContext({
|
|
|
3
3
|
value: null,
|
|
4
4
|
disabled: false,
|
|
5
5
|
layout: 'vertical',
|
|
6
|
-
onChange: ( /* key: string */
|
|
6
|
+
onChange: ( /* key: string */) => {
|
|
7
7
|
return;
|
|
8
8
|
},
|
|
9
|
-
updateSelectedButtonRef: ( /* ref: React.RefObject<any>*/
|
|
9
|
+
updateSelectedButtonRef: ( /* ref: React.RefObject<any>*/) => {
|
|
10
10
|
return;
|
|
11
11
|
},
|
|
12
12
|
values: [],
|
|
13
13
|
enabledValues: [],
|
|
14
14
|
invoked: false,
|
|
15
|
-
addRadioValue: ( /* value: string */
|
|
16
|
-
removeRadioValue: ( /* value: string */
|
|
17
|
-
addRadioEnabledValue: ( /* value: string */
|
|
18
|
-
removeRadioEnabledValue: ( /* value: string */
|
|
15
|
+
addRadioValue: ( /* value: string */) => false,
|
|
16
|
+
removeRadioValue: ( /* value: string */) => false,
|
|
17
|
+
addRadioEnabledValue: ( /* value: string */) => false,
|
|
18
|
+
removeRadioEnabledValue: ( /* value: string */) => false,
|
|
19
19
|
});
|
|
20
20
|
export const RadioGroupProvider = RadioGroupContext.Provider;
|
|
21
21
|
export const useRadioGroupContext = () => React.useContext(RadioGroupContext);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"radioGroupContext.js","sourceRoot":"","sources":["../../src/RadioGroup/radioGroupContext.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAS/B,MAAM,CAAC,MAAM,iBAAiB,GAAG,KAAK,CAAC,aAAa,CAAyB;IAC3E,KAAK,EAAE,IAAI;IACX,QAAQ,EAAE,KAAK;IACf,MAAM,EAAE,UAAU;IAClB,QAAQ,EAAE,EAAC,iBAAiB,
|
|
1
|
+
{"version":3,"file":"radioGroupContext.js","sourceRoot":"","sources":["../../src/RadioGroup/radioGroupContext.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAS/B,MAAM,CAAC,MAAM,iBAAiB,GAAG,KAAK,CAAC,aAAa,CAAyB;IAC3E,KAAK,EAAE,IAAI;IACX,QAAQ,EAAE,KAAK;IACf,MAAM,EAAE,UAAU;IAClB,QAAQ,EAAE,EAAC,iBAAiB,EAAE,EAAE;QAC9B,OAAO;IACT,CAAC;IACD,uBAAuB,EAAE,EAAC,8BAA8B,EAAE,EAAE;QAC1D,OAAO;IACT,CAAC;IACD,MAAM,EAAE,EAAE;IACV,aAAa,EAAE,EAAE;IACjB,OAAO,EAAE,KAAK;IACd,aAAa,EAAE,EAAC,mBAAmB,EAAE,EAAE,CAAC,KAAK;IAC7C,gBAAgB,EAAE,EAAC,mBAAmB,EAAE,EAAE,CAAC,KAAK;IAChD,oBAAoB,EAAE,EAAC,oBAAoB,EAAE,EAAE,CAAC,KAAK;IACrD,uBAAuB,EAAE,EAAC,mBAAmB,EAAE,EAAE,CAAC,KAAK;CACxD,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,kBAAkB,GAAG,iBAAiB,CAAC,QAAQ,CAAC;AAC7D,MAAM,CAAC,MAAM,oBAAoB,GAAG,GAAG,EAAE,CAAC,KAAK,CAAC,UAAU,CAAC,iBAAiB,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useRadioGroup.d.ts","sourceRoot":"","sources":["../../src/RadioGroup/useRadioGroup.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,cAAc,EAAE,eAAe,EAAmB,MAAM,oBAAoB,CAAC;AAE3F,eAAO,MAAM,aAAa,
|
|
1
|
+
{"version":3,"file":"useRadioGroup.d.ts","sourceRoot":"","sources":["../../src/RadioGroup/useRadioGroup.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,cAAc,EAAE,eAAe,EAAmB,MAAM,oBAAoB,CAAC;AAE3F,eAAO,MAAM,aAAa,UAAW,eAAe,KAAG,cAsGtD,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useRadioGroup.js","sourceRoot":"","sources":["../../src/RadioGroup/useRadioGroup.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAI/B,OAAO,EAAE,OAAO,EAAE,MAAM,kCAAkC,CAAC;AAC3D,OAAO,EAAE,cAAc,IAAI,QAAQ,EAAE,MAAM,0CAA0C,CAAC;AAItF,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,KAAsB,EAAkB,EAAE
|
|
1
|
+
{"version":3,"file":"useRadioGroup.js","sourceRoot":"","sources":["../../src/RadioGroup/useRadioGroup.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
1
|
import type { RadioGroupState } from './RadioGroup.types';
|
|
2
|
-
|
|
2
|
+
import type { RadioGroupContextValue } from './radioGroupContext';
|
|
3
|
+
export declare const useRadioGroupContextValue: (state: RadioGroupState) => RadioGroupContextValue;
|
|
3
4
|
//# sourceMappingURL=useRadioGroupContextValue.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useRadioGroupContextValue.d.ts","sourceRoot":"","sources":["../../src/RadioGroup/useRadioGroupContextValue.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"useRadioGroupContextValue.d.ts","sourceRoot":"","sources":["../../src/RadioGroup/useRadioGroupContextValue.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAC1D,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,qBAAqB,CAAC;AAElE,eAAO,MAAM,yBAAyB,UAAW,eAAe,KAAG,sBAElE,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useRadioGroupContextValue.js","sourceRoot":"","sources":["../../src/RadioGroup/useRadioGroupContextValue.ts"],"names":[],"mappings":"AAGA,MAAM,CAAC,MAAM,yBAAyB,GAAG,CAAC,KAAsB,EAA0B,EAAE
|
|
1
|
+
{"version":3,"file":"useRadioGroupContextValue.js","sourceRoot":"","sources":["../../src/RadioGroup/useRadioGroupContextValue.ts"],"names":[],"mappings":"AAGA,MAAM,CAAC,MAAM,yBAAyB,GAAG,CAAC,KAAsB,EAA0B,EAAE;IAC1F,OAAO,EAAE,GAAG,KAAK,EAAE,CAAC;AACtB,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MacOSRadioButtonNativeComponent.d.ts","sourceRoot":"","sources":["../../src/legacy/MacOSRadioButtonNativeComponent.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EAAE,aAAa,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAE7D,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,2CAA2C,CAAC;AAGtF,MAAM,WAAW,WAAY,SAAQ,SAAS;IAC5C,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,OAAO,CAAC,EAAE,oBAAoB,CAAC,IAAI,CAAC,CAAC;CACtC
|
|
1
|
+
{"version":3,"file":"MacOSRadioButtonNativeComponent.d.ts","sourceRoot":"","sources":["../../src/legacy/MacOSRadioButtonNativeComponent.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EAAE,aAAa,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAE7D,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,2CAA2C,CAAC;AAGtF,MAAM,WAAW,WAAY,SAAQ,SAAS;IAC5C,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,OAAO,CAAC,EAAE,oBAAoB,CAAC,IAAI,CAAC,CAAC;CACtC;wBAE2E,aAAa,CAAC,WAAW,CAAC"}
|
|
@@ -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;eAEY,WAAW"}
|
|
@@ -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
|
},
|
|
@@ -77,8 +79,7 @@ export const RadioButton = compose({
|
|
|
77
79
|
return { slotProps };
|
|
78
80
|
},
|
|
79
81
|
render: (Slots, _renderData, ...children) => {
|
|
80
|
-
return (_jsxs(Slots.root, { children: [
|
|
81
|
-
_jsx(Slots.button, { children: _jsx(Slots.innerCircle, {}) }), _jsx(Slots.content, {}), children] }));
|
|
82
|
+
return (_jsxs(Slots.root, { children: [_jsx(Slots.button, { children: _jsx(Slots.innerCircle, {}) }), _jsx(Slots.content, {}), children] }));
|
|
82
83
|
},
|
|
83
84
|
settings,
|
|
84
85
|
slots: {
|
|
@@ -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
|
|
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;eAEY,WAAW"}
|
|
@@ -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,
|