@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
|
@@ -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
|
|
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;QAClG,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;YAC7C,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;QACH,CAAC,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;YACnB,IAAI,SAAS,KAAK,WAAW,EAAE,CAAC;gBAC9B,uBAAuB,IAAI,YAAY,IAAI,uBAAuB,CAAC,YAAY,CAAC,CAAC;YACnF,CAAC;YACD,kGAAkG;QACpG,CAAC,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;IACvB,CAAC;IACD,KAAK,EAAE;QACL,IAAI,EAAE,qBAAqB;KAC5B;IACD,MAAM,EAAE;QACN,IAAI,EAAE,EAAE;KACT;IACD,MAAM,EAAE,CAAC,KAAoC,EAAE,EAAE;QAC/C,OAAO,KAAC,KAAK,CAAC,IAAI,KAAG,CAAC;IACxB,CAAC;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;
|
|
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;AAY9H,eAAO,MAAM,WAAW,6KAgMtB,CAAC;eAEY,WAAW"}
|
|
@@ -12,13 +12,12 @@ import { mergeSettings } from '@uifabricshared/foundation-settings';
|
|
|
12
12
|
import { settings, radioButtonSelectActionLabel } from './RadioButton.settings';
|
|
13
13
|
import { radioButtonName } from './RadioButton.types';
|
|
14
14
|
import { RadioGroupContext } from './RadioGroup';
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
})(DirectionalArrowKeys || (DirectionalArrowKeys = {}));
|
|
15
|
+
const DirectionalArrowKeys = {
|
|
16
|
+
ArrowUp: 'ArrowUp',
|
|
17
|
+
ArrowDown: 'ArrowDown',
|
|
18
|
+
ArrowRight: 'ArrowRight',
|
|
19
|
+
ArrowLeft: 'ArrowLeft',
|
|
20
|
+
};
|
|
22
21
|
export const RadioButton = compose({
|
|
23
22
|
displayName: radioButtonName,
|
|
24
23
|
usePrepareProps: (userProps, useStyling) => {
|
|
@@ -26,40 +25,43 @@ export const RadioButton = compose({
|
|
|
26
25
|
const { content, buttonKey, disabled, accessibilityLabel, ariaLabel, componentRef = defaultComponentRef, accessibilityPosInSet, ariaPosInSet, accessibilitySetSize, ariaSetSize, ...rest } = userProps;
|
|
27
26
|
// Grabs the context information from RadioGroup (currently selected button and client's onChange callback)
|
|
28
27
|
const info = React.useContext(RadioGroupContext);
|
|
28
|
+
const { addRadioButtonEnabledKey, addRadioButtonKey, buttonKeys, enabledButtonKeys, invoked, onChange, removeRadioButtonEnabledKey, removeRadioButtonKey, selectedKey, updateInvoked, updateSelectedButtonRef, } = info;
|
|
29
29
|
const buttonRef = useViewCommandFocus(componentRef);
|
|
30
30
|
/* We don't want to call the user's onChange multiple times on the same selection. */
|
|
31
|
-
const changeSelection = () => {
|
|
32
|
-
if (buttonKey !=
|
|
33
|
-
|
|
34
|
-
|
|
31
|
+
const changeSelection = React.useCallback(() => {
|
|
32
|
+
if (buttonKey != selectedKey) {
|
|
33
|
+
onChange && onChange(buttonKey);
|
|
34
|
+
updateSelectedButtonRef && componentRef && updateSelectedButtonRef(componentRef);
|
|
35
35
|
}
|
|
36
|
-
};
|
|
36
|
+
}, [buttonKey, componentRef, onChange, selectedKey, updateSelectedButtonRef]);
|
|
37
37
|
/* We use the componentRef of the currently selected button to maintain the default tabbable
|
|
38
38
|
element in a RadioGroup. Since the componentRef isn't generated until after initial render,
|
|
39
39
|
we must update it once here. */
|
|
40
40
|
React.useEffect(() => {
|
|
41
|
-
if (buttonKey ==
|
|
42
|
-
|
|
41
|
+
if (buttonKey == selectedKey) {
|
|
42
|
+
updateSelectedButtonRef && componentRef && updateSelectedButtonRef(componentRef);
|
|
43
43
|
}
|
|
44
|
+
// eslint-disable-next-line react-hooks/exhaustive-deps -- intentionally run only on mount/unmount
|
|
44
45
|
}, []);
|
|
45
46
|
// Explicitly only run on mount and unmount
|
|
46
47
|
React.useEffect(() => {
|
|
47
|
-
|
|
48
|
+
addRadioButtonKey(buttonKey);
|
|
48
49
|
if (!disabled) {
|
|
49
|
-
|
|
50
|
+
addRadioButtonEnabledKey(buttonKey);
|
|
50
51
|
}
|
|
51
52
|
return () => {
|
|
52
|
-
|
|
53
|
-
|
|
53
|
+
removeRadioButtonKey(buttonKey);
|
|
54
|
+
removeRadioButtonEnabledKey(buttonKey);
|
|
54
55
|
};
|
|
56
|
+
// eslint-disable-next-line react-hooks/exhaustive-deps -- intentionally run only on mount/unmount
|
|
55
57
|
}, []);
|
|
56
58
|
const isRTL = I18nManager.isRTL;
|
|
57
59
|
const onInvoke = React.useCallback((e) => {
|
|
58
60
|
if (e.nativeEvent.key in DirectionalArrowKeys) {
|
|
59
|
-
const length =
|
|
61
|
+
const length = enabledButtonKeys.length;
|
|
60
62
|
const next = e.nativeEvent.key === DirectionalArrowKeys.ArrowDown ||
|
|
61
63
|
(isRTL ? e.nativeEvent.key === DirectionalArrowKeys.ArrowLeft : e.nativeEvent.key === DirectionalArrowKeys.ArrowRight);
|
|
62
|
-
const currRadioButtonIndex =
|
|
64
|
+
const currRadioButtonIndex = enabledButtonKeys.indexOf(selectedKey);
|
|
63
65
|
let newCurrRadioButtonIndex;
|
|
64
66
|
if (next) {
|
|
65
67
|
newCurrRadioButtonIndex = (currRadioButtonIndex + 1) % length;
|
|
@@ -68,29 +70,30 @@ export const RadioButton = compose({
|
|
|
68
70
|
// previous
|
|
69
71
|
newCurrRadioButtonIndex = (currRadioButtonIndex - 1 + length) % length;
|
|
70
72
|
}
|
|
71
|
-
|
|
72
|
-
|
|
73
|
+
onChange && onChange(enabledButtonKeys[newCurrRadioButtonIndex]);
|
|
74
|
+
updateInvoked && updateInvoked(true);
|
|
73
75
|
}
|
|
74
|
-
}, [
|
|
76
|
+
}, [enabledButtonKeys, isRTL, onChange, selectedKey, updateInvoked]);
|
|
75
77
|
// Sets the updated selected button ref and focus if this Radio is selected via arrow key.
|
|
76
78
|
React.useEffect(() => {
|
|
77
|
-
if (
|
|
78
|
-
|
|
79
|
+
if (invoked && buttonKey === selectedKey && !disabled) {
|
|
80
|
+
updateSelectedButtonRef && componentRef && updateSelectedButtonRef(componentRef);
|
|
79
81
|
componentRef?.current?.focus();
|
|
80
|
-
|
|
82
|
+
updateInvoked && updateInvoked(false);
|
|
81
83
|
}
|
|
82
|
-
|
|
84
|
+
// eslint-disable-next-line react-hooks/exhaustive-deps -- only re-run when invoked changes
|
|
85
|
+
}, [invoked]);
|
|
83
86
|
const keys = ['ArrowDown', 'ArrowRight', 'ArrowUp', 'ArrowLeft'];
|
|
84
87
|
// Explicitly override onKeyDown to override the native behavior of moving focus with arrow keys.
|
|
85
88
|
const onKeyDownProps = useKeyDownProps(onInvoke, ...keys);
|
|
86
89
|
// Ensure focus is placed on button after click
|
|
87
|
-
const changeSelectionWithFocus = () => {
|
|
88
|
-
if (buttonKey !=
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
90
|
+
const changeSelectionWithFocus = React.useCallback(() => {
|
|
91
|
+
if (buttonKey != selectedKey) {
|
|
92
|
+
onChange && onChange(buttonKey);
|
|
93
|
+
updateSelectedButtonRef && componentRef && updateSelectedButtonRef(componentRef);
|
|
94
|
+
updateInvoked && updateInvoked(true);
|
|
92
95
|
}
|
|
93
|
-
};
|
|
96
|
+
}, [buttonKey, componentRef, onChange, selectedKey, updateInvoked, updateSelectedButtonRef]);
|
|
94
97
|
/* RadioButton changes selection when focus is moved between each RadioButton and on a click */
|
|
95
98
|
const pressable = useAsPressable({
|
|
96
99
|
...rest,
|
|
@@ -104,10 +107,10 @@ export const RadioButton = compose({
|
|
|
104
107
|
changeSelection();
|
|
105
108
|
break;
|
|
106
109
|
}
|
|
107
|
-
}, [
|
|
110
|
+
}, [changeSelection]);
|
|
108
111
|
const state = {
|
|
109
112
|
...pressable.state,
|
|
110
|
-
selected:
|
|
113
|
+
selected: selectedKey === userProps.buttonKey && !disabled,
|
|
111
114
|
disabled: disabled || false,
|
|
112
115
|
};
|
|
113
116
|
// Grab the styling information from the userProps, referencing the state as well as the props.
|
|
@@ -121,8 +124,8 @@ export const RadioButton = compose({
|
|
|
121
124
|
accessibilityLabel: accessibilityLabel ?? ariaLabel ?? content,
|
|
122
125
|
accessibilityState: { disabled: state.disabled, selected: state.selected },
|
|
123
126
|
accessibilityActions: [{ name: 'Select', label: radioButtonSelectActionLabel }],
|
|
124
|
-
accessibilityPosInSet: accessibilityPosInSet ?? ariaPosInSet ??
|
|
125
|
-
accessibilitySetSize: accessibilitySetSize ?? ariaSetSize ??
|
|
127
|
+
accessibilityPosInSet: accessibilityPosInSet ?? ariaPosInSet ?? buttonKeys.findIndex((x) => x == buttonKey) + 1,
|
|
128
|
+
accessibilitySetSize: accessibilitySetSize ?? ariaSetSize ?? buttonKeys.length,
|
|
126
129
|
focusable: !state.disabled,
|
|
127
130
|
onAccessibilityAction: onAccessibilityAction,
|
|
128
131
|
...onKeyDownProps,
|
|
@@ -132,8 +135,7 @@ export const RadioButton = compose({
|
|
|
132
135
|
return { slotProps };
|
|
133
136
|
},
|
|
134
137
|
render: (Slots, _renderData, ...children) => {
|
|
135
|
-
return (_jsxs(Slots.root, { children: [
|
|
136
|
-
_jsx(Slots.button, { children: _jsx(Slots.innerCircle, {}) }), _jsx(Slots.content, {}), children] }));
|
|
138
|
+
return (_jsxs(Slots.root, { children: [_jsx(Slots.button, { children: _jsx(Slots.innerCircle, {}) }), _jsx(Slots.content, {}), children] }));
|
|
137
139
|
},
|
|
138
140
|
settings,
|
|
139
141
|
slots: {
|
|
@@ -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,
|
|
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;eAEY,UAAU"}
|
package/lib/legacy/RadioGroup.js
CHANGED
|
@@ -12,10 +12,10 @@ import { settings } from './RadioGroup.settings';
|
|
|
12
12
|
import { radioGroupName } from './RadioGroup.types';
|
|
13
13
|
export const RadioGroupContext = React.createContext({
|
|
14
14
|
selectedKey: null,
|
|
15
|
-
onChange: ( /* key: string */
|
|
15
|
+
onChange: ( /* key: string */) => {
|
|
16
16
|
return;
|
|
17
17
|
},
|
|
18
|
-
updateSelectedButtonRef: ( /* ref: React.RefObject<any>*/
|
|
18
|
+
updateSelectedButtonRef: ( /* ref: React.RefObject<any>*/) => {
|
|
19
19
|
return;
|
|
20
20
|
},
|
|
21
21
|
buttonKeys: [],
|
|
@@ -36,21 +36,17 @@ export const RadioGroup = compose({
|
|
|
36
36
|
}, [setInvoked]);
|
|
37
37
|
const [buttonKeys, setButtonKeys] = React.useState([]);
|
|
38
38
|
const onAddRadioButtonKey = React.useCallback((buttonKey) => {
|
|
39
|
-
|
|
40
|
-
setButtonKeys(buttonKeys);
|
|
39
|
+
setButtonKeys((prevButtonKeys) => [...prevButtonKeys, buttonKey]);
|
|
41
40
|
}, [setButtonKeys]);
|
|
42
41
|
const onRemoveRadioButtonKey = React.useCallback((buttonKey) => {
|
|
43
|
-
|
|
44
|
-
setButtonKeys(buttonKeys);
|
|
42
|
+
setButtonKeys((prevButtonKeys) => prevButtonKeys.filter((item) => item !== buttonKey));
|
|
45
43
|
}, [setButtonKeys]);
|
|
46
44
|
const [enabledButtonKeys, setEnabledButtonKeys] = React.useState([]);
|
|
47
45
|
const onAddRadioButtonEnabledKey = React.useCallback((buttonKey) => {
|
|
48
|
-
|
|
49
|
-
setEnabledButtonKeys(enabledButtonKeys);
|
|
46
|
+
setEnabledButtonKeys((prevEnabledButtonKeys) => [...prevEnabledButtonKeys, buttonKey]);
|
|
50
47
|
}, [setEnabledButtonKeys]);
|
|
51
48
|
const onRemoveRadioButtonEnabledKey = React.useCallback((buttonKey) => {
|
|
52
|
-
|
|
53
|
-
setEnabledButtonKeys(enabledButtonKeys);
|
|
49
|
+
setEnabledButtonKeys((prevEnabledButtonKeys) => prevEnabledButtonKeys.filter((item) => item !== buttonKey));
|
|
54
50
|
}, [setEnabledButtonKeys]);
|
|
55
51
|
const state = {
|
|
56
52
|
context: {
|
|
@@ -83,9 +79,7 @@ export const RadioGroup = compose({
|
|
|
83
79
|
// Passes in the selected key and a hook function to update the newly selected button and call the client's onChange callback
|
|
84
80
|
, {
|
|
85
81
|
// Passes in the selected key and a hook function to update the newly selected button and call the client's onChange callback
|
|
86
|
-
value: renderData.state.context, children: _jsxs(Slots.root, { children: [
|
|
87
|
-
_jsx(Slots.label, {}), _jsx(Slots.container, { children: children })
|
|
88
|
-
] }) }));
|
|
82
|
+
value: renderData.state.context, children: _jsxs(Slots.root, { children: [_jsx(Slots.label, {}), _jsx(Slots.container, { children: children })] }) }));
|
|
89
83
|
},
|
|
90
84
|
settings,
|
|
91
85
|
slots: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RadioGroup.js","sourceRoot":"","sources":["../../src/legacy/RadioGroup.tsx"],"names":[],"mappings":";AAAA,6DAA6D;AAC7D,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAAE,IAAI,EAAE,MAAM,cAAc,CAAC;AAEpC,OAAO,EAAE,SAAS,EAAE,MAAM,mCAAmC,CAAC;AAC9D,OAAO,EAAE,cAAc,EAAE,MAAM,0CAA0C,CAAC;AAC1E,OAAO,EAAE,IAAI,EAAE,MAAM,6BAA6B,CAAC;AACnD,OAAO,EAAE,qBAAqB,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAGlF,OAAO,EAAE,OAAO,EAAE,MAAM,oCAAoC,CAAC;AAC7D,OAAO,EAAE,aAAa,EAAE,MAAM,qCAAqC,CAAC;AAEpE,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AASjD,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAEpD,MAAM,CAAC,MAAM,iBAAiB,GAAG,KAAK,CAAC,aAAa,CAAqB;IACvE,WAAW,EAAE,IAAI;IACjB,QAAQ,EAAE,EAAC,iBAAiB,
|
|
1
|
+
{"version":3,"file":"RadioGroup.js","sourceRoot":"","sources":["../../src/legacy/RadioGroup.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RadioButton.test.js","sourceRoot":"","sources":["../../../src/legacy/__tests__/RadioButton.test.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,OAAO,CAAC;AAE5B,OAAO,KAAK,QAAQ,MAAM,qBAAqB,CAAC;AAEhD,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAE7C,QAAQ,CAAC,6BAA6B,EAAE,GAAG,EAAE
|
|
1
|
+
{"version":3,"file":"RadioButton.test.js","sourceRoot":"","sources":["../../../src/legacy/__tests__/RadioButton.test.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,OAAO,CAAC;AAE5B,OAAO,KAAK,QAAQ,MAAM,qBAAqB,CAAC;AAEhD,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAE7C,QAAQ,CAAC,6BAA6B,EAAE,GAAG,EAAE;IAC3C,EAAE,CAAC,qBAAqB,EAAE,GAAG,EAAE;QAC7B,IAAI,SAAqC,CAAC;QAC1C,GAAG,CAAC,GAAG,EAAE;YACP,SAAS,GAAG,QAAQ,CAAC,MAAM,CAAC,KAAC,WAAW,IAAC,SAAS,EAAC,MAAM,EAAC,OAAO,EAAC,gBAAgB,GAAG,CAAC,CAAC;QACzF,CAAC,CAAC,CAAC;QACH,MAAM,CAAC,SAAU,CAAC,MAAM,EAAE,CAAC,CAAC,eAAe,EAAE,CAAC;IAChD,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
|
@@ -7,18 +7,14 @@ describe('RadioButton component tests', () => {
|
|
|
7
7
|
it('RadioButton default', () => {
|
|
8
8
|
let component;
|
|
9
9
|
act(() => {
|
|
10
|
-
component = renderer.create(_jsxs(RadioGroup, { label: "Uncontrolled RadioGroup", defaultSelectedKey: "key2", children: [
|
|
11
|
-
_jsx(RadioButton, { buttonKey: "key1", content: "RadioButton1" }), _jsx(RadioButton, { buttonKey: "key2", content: "RadioButton2" })
|
|
12
|
-
] }));
|
|
10
|
+
component = renderer.create(_jsxs(RadioGroup, { label: "Uncontrolled RadioGroup", defaultSelectedKey: "key2", children: [_jsx(RadioButton, { buttonKey: "key1", content: "RadioButton1" }), _jsx(RadioButton, { buttonKey: "key2", content: "RadioButton2" })] }));
|
|
13
11
|
});
|
|
14
12
|
expect(component.toJSON()).toMatchSnapshot();
|
|
15
13
|
});
|
|
16
14
|
it('RadioButton not direct child of radio group', () => {
|
|
17
15
|
let component;
|
|
18
16
|
act(() => {
|
|
19
|
-
component = renderer.create(_jsx(RadioGroup, { label: "Uncontrolled RadioGroup", defaultSelectedKey: "key2", children: _jsxs(View, { children: [
|
|
20
|
-
_jsx(RadioButton, { buttonKey: "key1", content: "RadioButton1", accessibilityPosInSet: 1, accessibilitySetSize: 2 }), _jsx(RadioButton, { buttonKey: "key2", content: "RadioButton2", accessibilityPosInSet: 2, accessibilitySetSize: 2 })
|
|
21
|
-
] }) }));
|
|
17
|
+
component = renderer.create(_jsx(RadioGroup, { label: "Uncontrolled RadioGroup", defaultSelectedKey: "key2", children: _jsxs(View, { children: [_jsx(RadioButton, { buttonKey: "key1", content: "RadioButton1", accessibilityPosInSet: 1, accessibilitySetSize: 2 }), _jsx(RadioButton, { buttonKey: "key2", content: "RadioButton2", accessibilityPosInSet: 2, accessibilitySetSize: 2 })] }) }));
|
|
22
18
|
});
|
|
23
19
|
expect(component.toJSON()).toMatchSnapshot();
|
|
24
20
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RadioButtonGroup.test.js","sourceRoot":"","sources":["../../../src/legacy/__tests__/RadioButtonGroup.test.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,OAAO,CAAC;AAC5B,OAAO,EAAE,IAAI,EAAE,MAAM,cAAc,CAAC;AAEpC,OAAO,KAAK,QAAQ,MAAM,qBAAqB,CAAC;AAEhD,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,OAAO,CAAC;AAEhD,QAAQ,CAAC,6BAA6B,EAAE,GAAG,EAAE
|
|
1
|
+
{"version":3,"file":"RadioButtonGroup.test.js","sourceRoot":"","sources":["../../../src/legacy/__tests__/RadioButtonGroup.test.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,OAAO,CAAC;AAC5B,OAAO,EAAE,IAAI,EAAE,MAAM,cAAc,CAAC;AAEpC,OAAO,KAAK,QAAQ,MAAM,qBAAqB,CAAC;AAEhD,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,OAAO,CAAC;AAEhD,QAAQ,CAAC,6BAA6B,EAAE,GAAG,EAAE;IAC3C,EAAE,CAAC,qBAAqB,EAAE,GAAG,EAAE;QAC7B,IAAI,SAAqC,CAAC;QAC1C,GAAG,CAAC,GAAG,EAAE;YACP,SAAS,GAAG,QAAQ,CAAC,MAAM,CACzB,MAAC,UAAU,IAAC,KAAK,EAAC,yBAAyB,EAAC,kBAAkB,EAAC,MAAM,aACnE,KAAC,WAAW,IAAC,SAAS,EAAC,MAAM,EAAC,OAAO,EAAC,cAAc,GAAG,EACvD,KAAC,WAAW,IAAC,SAAS,EAAC,MAAM,EAAC,OAAO,EAAC,cAAc,GAAG,IAC5C,CACd,CAAC;QACJ,CAAC,CAAC,CAAC;QACH,MAAM,CAAC,SAAU,CAAC,MAAM,EAAE,CAAC,CAAC,eAAe,EAAE,CAAC;IAChD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,6CAA6C,EAAE,GAAG,EAAE;QACrD,IAAI,SAAqC,CAAC;QAC1C,GAAG,CAAC,GAAG,EAAE;YACP,SAAS,GAAG,QAAQ,CAAC,MAAM,CACzB,KAAC,UAAU,IAAC,KAAK,EAAC,yBAAyB,EAAC,kBAAkB,EAAC,MAAM,YACnE,MAAC,IAAI,eACH,KAAC,WAAW,IAAC,SAAS,EAAC,MAAM,EAAC,OAAO,EAAC,cAAc,EAAC,qBAAqB,EAAE,CAAC,EAAE,oBAAoB,EAAE,CAAC,GAAI,EAC1G,KAAC,WAAW,IAAC,SAAS,EAAC,MAAM,EAAC,OAAO,EAAC,cAAc,EAAC,qBAAqB,EAAE,CAAC,EAAE,oBAAoB,EAAE,CAAC,GAAI,IACrG,GACI,CACd,CAAC;QACJ,CAAC,CAAC,CAAC;QACH,MAAM,CAAC,SAAU,CAAC,MAAM,EAAE,CAAC,CAAC,eAAe,EAAE,CAAC;IAChD,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@fluentui-react-native/radio-group",
|
|
3
|
-
"version": "0.22.
|
|
3
|
+
"version": "0.22.4",
|
|
4
4
|
"description": "A cross-platform Radio Group component using the Fluent Design System",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"author": "",
|
|
@@ -9,73 +9,67 @@
|
|
|
9
9
|
"url": "https://github.com/microsoft/fluentui-react-native.git",
|
|
10
10
|
"directory": "packages/components/RadioGroup"
|
|
11
11
|
},
|
|
12
|
+
"type": "module",
|
|
12
13
|
"sideEffects": false,
|
|
13
|
-
"main": "lib
|
|
14
|
+
"main": "lib/index.js",
|
|
14
15
|
"module": "lib/index.js",
|
|
15
16
|
"types": "lib/index.d.ts",
|
|
16
17
|
"exports": {
|
|
17
18
|
".": {
|
|
18
19
|
"types": "./lib/index.d.ts",
|
|
20
|
+
"react-native": "./src/index.ts",
|
|
19
21
|
"import": "./lib/index.js",
|
|
20
|
-
"require": "./lib-commonjs/index.js",
|
|
21
22
|
"default": "./src/index.ts"
|
|
22
23
|
}
|
|
23
24
|
},
|
|
24
25
|
"scripts": {
|
|
25
|
-
"build": "
|
|
26
|
-
"build-cjs": "tsgo --outDir lib-commonjs",
|
|
27
|
-
"build-core": "tsgo --outDir lib --module esnext --moduleResolution bundler",
|
|
26
|
+
"build": "tsgo -b",
|
|
28
27
|
"clean": "fluentui-scripts clean",
|
|
29
28
|
"depcheck": "fluentui-scripts depcheck",
|
|
30
|
-
"lint": "fluentui-scripts eslint",
|
|
31
|
-
"lint-package": "fluentui-scripts lint-package",
|
|
32
29
|
"format": "fluentui-scripts format",
|
|
30
|
+
"lint": "fluentui-scripts lint",
|
|
33
31
|
"test": "fluentui-scripts jest",
|
|
34
32
|
"update-snapshots": "fluentui-scripts jest -u"
|
|
35
33
|
},
|
|
36
34
|
"dependencies": {
|
|
37
|
-
"@fluentui-react-native/adapters": "0.14.
|
|
38
|
-
"@fluentui-react-native/focus-zone": "0.22.
|
|
39
|
-
"@fluentui-react-native/framework": "0.
|
|
40
|
-
"@fluentui-react-native/interactive-hooks": "0.28.
|
|
41
|
-
"@fluentui-react-native/pressable": "0.13.
|
|
42
|
-
"@fluentui-react-native/text": "0.25.
|
|
43
|
-
"@fluentui-react-native/theme-tokens": "0.28.
|
|
44
|
-
"@fluentui-react-native/tokens": "0.24.
|
|
45
|
-
"@fluentui-react-native/use-styling": "0.
|
|
46
|
-
"@uifabricshared/foundation-composable": "0.14.
|
|
47
|
-
"@uifabricshared/foundation-compose": "1.16.
|
|
48
|
-
"@uifabricshared/foundation-settings": "0.16.
|
|
35
|
+
"@fluentui-react-native/adapters": "0.14.4",
|
|
36
|
+
"@fluentui-react-native/focus-zone": "0.22.4",
|
|
37
|
+
"@fluentui-react-native/framework": "0.16.0",
|
|
38
|
+
"@fluentui-react-native/interactive-hooks": "0.28.4",
|
|
39
|
+
"@fluentui-react-native/pressable": "0.13.4",
|
|
40
|
+
"@fluentui-react-native/text": "0.25.4",
|
|
41
|
+
"@fluentui-react-native/theme-tokens": "0.28.4",
|
|
42
|
+
"@fluentui-react-native/tokens": "0.24.4",
|
|
43
|
+
"@fluentui-react-native/use-styling": "0.15.0",
|
|
44
|
+
"@uifabricshared/foundation-composable": "0.14.4",
|
|
45
|
+
"@uifabricshared/foundation-compose": "1.16.4",
|
|
46
|
+
"@uifabricshared/foundation-settings": "0.16.4"
|
|
49
47
|
},
|
|
50
48
|
"devDependencies": {
|
|
51
49
|
"@babel/core": "^7.20.0",
|
|
52
|
-
"@fluentui-react-native/
|
|
53
|
-
"@fluentui-react-native/eslint-config-rules": "0.1.2",
|
|
54
|
-
"@fluentui-react-native/framework-base": "0.3.1",
|
|
55
|
-
"@fluentui-react-native/jest-config": "0.1.0",
|
|
56
|
-
"@fluentui-react-native/kit-config": "0.1.2",
|
|
50
|
+
"@fluentui-react-native/framework-base": "0.4.0",
|
|
57
51
|
"@fluentui-react-native/scripts": "0.1.0",
|
|
58
52
|
"@fluentui-react-native/test-tools": "0.1.0",
|
|
59
|
-
"@office-iss/react-native-win32": "^0.
|
|
53
|
+
"@office-iss/react-native-win32": "^0.81.8",
|
|
60
54
|
"@react-native-community/cli": "^20.0.0",
|
|
61
55
|
"@react-native-community/cli-platform-android": "^20.0.0",
|
|
62
56
|
"@react-native-community/cli-platform-ios": "^20.0.0",
|
|
63
57
|
"@react-native/babel-preset": "^0.81.0",
|
|
64
58
|
"@react-native/metro-config": "^0.81.0",
|
|
65
|
-
"@types/react": "~19.1.
|
|
59
|
+
"@types/react": "~19.1.4",
|
|
66
60
|
"@types/react-test-renderer": "^19.1.0",
|
|
67
|
-
"react": "19.1.
|
|
68
|
-
"react-native": "^0.81.
|
|
61
|
+
"react": "19.1.4",
|
|
62
|
+
"react-native": "^0.81.6",
|
|
69
63
|
"react-native-macos": "^0.81.0",
|
|
70
64
|
"react-native-svg": "^15.12.1",
|
|
71
65
|
"react-native-windows": "^0.81.0",
|
|
72
|
-
"react-test-renderer": "19.1.
|
|
66
|
+
"react-test-renderer": "19.1.4"
|
|
73
67
|
},
|
|
74
68
|
"peerDependencies": {
|
|
75
|
-
"@office-iss/react-native-win32": "^0.74.0",
|
|
76
|
-
"@types/react": "~18.2.0 || ~19.0.0 || ~19.1.
|
|
77
|
-
"react": "18.2.0 || 19.0.0 || 19.1.
|
|
78
|
-
"react-native": "^0.73.0 || ^0.74.0 || ^0.78.0 || ^0.81.
|
|
69
|
+
"@office-iss/react-native-win32": "^0.74.0 || ^0.81.0",
|
|
70
|
+
"@types/react": "~18.2.0 || ~19.0.0 || ~19.1.4",
|
|
71
|
+
"react": "18.2.0 || 19.0.0 || 19.1.4",
|
|
72
|
+
"react-native": "^0.73.0 || ^0.74.0 || ^0.78.0 || ^0.81.6",
|
|
79
73
|
"react-native-macos": "^0.73.0 || ^0.74.0 || ^0.78.0 || ^0.81.0",
|
|
80
74
|
"react-native-svg": ">=15.0.0 <15.13.0 || >=15.4.0 <15.13.0 || ^15.11.2 || ^15.12.1",
|
|
81
75
|
"react-native-windows": "^0.73.0 || ^0.74.0 || ^0.78.0 || ^0.81.0"
|
|
@@ -94,6 +88,9 @@
|
|
|
94
88
|
"optional": true
|
|
95
89
|
}
|
|
96
90
|
},
|
|
91
|
+
"furn": {
|
|
92
|
+
"jestPlatform": "android"
|
|
93
|
+
},
|
|
97
94
|
"rnx-kit": {
|
|
98
95
|
"kitType": "library",
|
|
99
96
|
"alignDeps": {
|
|
@@ -106,11 +103,9 @@
|
|
|
106
103
|
"core-windows",
|
|
107
104
|
"react",
|
|
108
105
|
"react-test-renderer",
|
|
109
|
-
"svg"
|
|
110
|
-
"tools-core",
|
|
111
|
-
"tools-jest"
|
|
106
|
+
"svg"
|
|
112
107
|
]
|
|
113
108
|
},
|
|
114
|
-
"extends": "@fluentui-react-native/kit-config"
|
|
109
|
+
"extends": "@fluentui-react-native/scripts/kit-config"
|
|
115
110
|
}
|
|
116
111
|
}
|
package/src/Radio/useRadio.ts
CHANGED
|
@@ -14,13 +14,14 @@ export const useRadio = (props: RadioProps): RadioInfo => {
|
|
|
14
14
|
|
|
15
15
|
// Grabs the context information from RadioGroup (currently selected button and client's onChange callback)
|
|
16
16
|
const radioGroupContext = useRadioGroupContext();
|
|
17
|
+
const { disabled: groupDisabled, layout, onChange, updateSelectedButtonRef, value: selectedValue, values } = radioGroupContext;
|
|
17
18
|
|
|
18
19
|
const {
|
|
19
20
|
label,
|
|
20
21
|
subtext,
|
|
21
22
|
value,
|
|
22
23
|
disabled,
|
|
23
|
-
labelPosition =
|
|
24
|
+
labelPosition = layout === 'horizontal-stacked' ? 'below' : 'after',
|
|
24
25
|
accessibilityActions,
|
|
25
26
|
accessibilityLabel,
|
|
26
27
|
accessibilityHint,
|
|
@@ -32,25 +33,26 @@ export const useRadio = (props: RadioProps): RadioInfo => {
|
|
|
32
33
|
...rest
|
|
33
34
|
} = props;
|
|
34
35
|
|
|
35
|
-
const isDisabled =
|
|
36
|
+
const isDisabled = groupDisabled || disabled;
|
|
36
37
|
|
|
37
38
|
const buttonRef = useViewCommandFocus(componentRef);
|
|
38
39
|
|
|
39
40
|
/* We don't want to call the user's onChange multiple times on the same selection. */
|
|
40
41
|
const changeSelection = React.useCallback(() => {
|
|
41
|
-
if (value !==
|
|
42
|
-
|
|
43
|
-
|
|
42
|
+
if (value !== selectedValue) {
|
|
43
|
+
onChange && onChange(value);
|
|
44
|
+
updateSelectedButtonRef && componentRef && updateSelectedButtonRef(componentRef);
|
|
44
45
|
}
|
|
45
|
-
}, [
|
|
46
|
+
}, [componentRef, onChange, selectedValue, updateSelectedButtonRef, value]);
|
|
46
47
|
|
|
47
48
|
/* We use the componentRef of the currently selected button to maintain the default tabbable
|
|
48
49
|
element in a RadioGroup. Since the componentRef isn't generated until after initial render,
|
|
49
50
|
we must update it once here. */
|
|
50
51
|
React.useEffect(() => {
|
|
51
|
-
if (value ===
|
|
52
|
-
|
|
52
|
+
if (value === selectedValue && !isDisabled) {
|
|
53
|
+
updateSelectedButtonRef && componentRef && updateSelectedButtonRef(componentRef);
|
|
53
54
|
}
|
|
55
|
+
// eslint-disable-next-line react-hooks/exhaustive-deps -- intentionally run only on mount/unmount
|
|
54
56
|
}, []);
|
|
55
57
|
|
|
56
58
|
// Ensure focus is placed on button after click
|
|
@@ -82,7 +84,7 @@ export const useRadio = (props: RadioProps): RadioInfo => {
|
|
|
82
84
|
|
|
83
85
|
const state = {
|
|
84
86
|
...pressable.state,
|
|
85
|
-
selected:
|
|
87
|
+
selected: selectedValue === props.value && !isDisabled,
|
|
86
88
|
disabled: isDisabled || false,
|
|
87
89
|
labelPositionBelow: labelPosition === 'below',
|
|
88
90
|
};
|
|
@@ -101,8 +103,8 @@ export const useRadio = (props: RadioProps): RadioInfo => {
|
|
|
101
103
|
accessibilityHint: accessibilityHint ?? subtext,
|
|
102
104
|
accessibilityState: getAccessibilityState(state.disabled, state.selected, accessibilityState),
|
|
103
105
|
accessibilityActions: accessibilityActionsProp,
|
|
104
|
-
accessibilityPosInSet: accessibilityPosInSet ??
|
|
105
|
-
accessibilitySetSize: accessibilitySetSize ??
|
|
106
|
+
accessibilityPosInSet: accessibilityPosInSet ?? values.findIndex((x) => x == value) + 1,
|
|
107
|
+
accessibilitySetSize: accessibilitySetSize ?? values.length,
|
|
106
108
|
focusable: !state.disabled,
|
|
107
109
|
disabled: isDisabled,
|
|
108
110
|
enableFocusRing: enableFocusRing ?? true,
|