@fluentui-react-native/radio-group 0.21.17 → 0.21.19
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.json +42 -1
- package/CHANGELOG.md +10 -2
- package/eslint.config.js +3 -0
- package/lib/Radio/Radio.ios.js +17 -13
- package/lib/Radio/Radio.ios.js.map +1 -1
- package/lib/Radio/Radio.js +17 -13
- package/lib/Radio/Radio.js.map +1 -1
- package/lib/Radio/Radio.styling.js +31 -19
- package/lib/Radio/Radio.styling.js.map +1 -1
- package/lib/Radio/Radio.types.js +1 -1
- package/lib/Radio/Radio.types.js.map +1 -1
- package/lib/Radio/RadioTokens.android.js +42 -44
- package/lib/Radio/RadioTokens.android.js.map +1 -1
- package/lib/Radio/RadioTokens.ios.js +39 -41
- package/lib/Radio/RadioTokens.ios.js.map +1 -1
- package/lib/Radio/RadioTokens.js +74 -76
- package/lib/Radio/RadioTokens.js.map +1 -1
- package/lib/Radio/RadioTokens.win32.js +87 -89
- package/lib/Radio/RadioTokens.win32.js.map +1 -1
- package/lib/Radio/__tests__/RadioExperimental.test.js +5 -5
- package/lib/Radio/__tests__/RadioExperimental.test.js.map +1 -1
- package/lib/Radio/useRadio.js +46 -19
- package/lib/Radio/useRadio.js.map +1 -1
- package/lib/Radio/useRadio.win32.js +62 -37
- package/lib/Radio/useRadio.win32.js.map +1 -1
- package/lib/RadioGroup/RadioGroup.js +19 -19
- package/lib/RadioGroup/RadioGroup.js.map +1 -1
- package/lib/RadioGroup/RadioGroup.styling.js +16 -14
- package/lib/RadioGroup/RadioGroup.styling.js.map +1 -1
- package/lib/RadioGroup/RadioGroup.types.js +1 -1
- package/lib/RadioGroup/RadioGroup.types.js.map +1 -1
- package/lib/RadioGroup/RadioGroupTokens.js +13 -15
- package/lib/RadioGroup/RadioGroupTokens.js.map +1 -1
- package/lib/RadioGroup/RadioGroupTokens.mobile.js +14 -16
- package/lib/RadioGroup/RadioGroupTokens.mobile.js.map +1 -1
- package/lib/RadioGroup/__tests__/RadioGroupExperimental.test.js +55 -122
- package/lib/RadioGroup/__tests__/RadioGroupExperimental.test.js.map +1 -1
- package/lib/RadioGroup/radioGroupContext.js +9 -9
- package/lib/RadioGroup/radioGroupContext.js.map +1 -1
- package/lib/RadioGroup/useRadioGroup.js +35 -24
- package/lib/RadioGroup/useRadioGroup.js.map +1 -1
- package/lib/RadioGroup/useRadioGroupContextValue.js +2 -3
- package/lib/RadioGroup/useRadioGroupContextValue.js.map +1 -1
- package/lib/legacy/RadioButton.js +38 -24
- package/lib/legacy/RadioButton.js.map +1 -1
- package/lib/legacy/RadioButton.macos.js +12 -12
- package/lib/legacy/RadioButton.macos.js.map +1 -1
- package/lib/legacy/RadioButton.settings.js +6 -6
- package/lib/legacy/RadioButton.settings.js.map +1 -1
- package/lib/legacy/RadioButton.types.js +1 -1
- package/lib/legacy/RadioButton.types.js.map +1 -1
- package/lib/legacy/RadioButton.win32.js +53 -39
- package/lib/legacy/RadioButton.win32.js.map +1 -1
- package/lib/legacy/RadioGroup.js +27 -33
- package/lib/legacy/RadioGroup.js.map +1 -1
- package/lib/legacy/RadioGroup.settings.js +1 -1
- package/lib/legacy/RadioGroup.settings.js.map +1 -1
- package/lib/legacy/RadioGroup.types.js +1 -1
- package/lib/legacy/RadioGroup.types.js.map +1 -1
- package/lib/legacy/__tests__/RadioButton.test.js +3 -3
- package/lib/legacy/__tests__/RadioButton.test.js.map +1 -1
- package/lib/legacy/__tests__/RadioButtonGroup.test.js +5 -5
- package/lib/legacy/__tests__/RadioButtonGroup.test.js.map +1 -1
- package/lib-commonjs/Radio/Radio.ios.js +24 -20
- package/lib-commonjs/Radio/Radio.ios.js.map +1 -1
- package/lib-commonjs/Radio/Radio.js +23 -19
- package/lib-commonjs/Radio/Radio.js.map +1 -1
- package/lib-commonjs/Radio/Radio.styling.js +33 -21
- package/lib-commonjs/Radio/Radio.styling.js.map +1 -1
- package/lib-commonjs/Radio/RadioTokens.android.js +43 -45
- package/lib-commonjs/Radio/RadioTokens.android.js.map +1 -1
- package/lib-commonjs/Radio/RadioTokens.ios.js +40 -42
- package/lib-commonjs/Radio/RadioTokens.ios.js.map +1 -1
- package/lib-commonjs/Radio/RadioTokens.js +75 -77
- package/lib-commonjs/Radio/RadioTokens.js.map +1 -1
- package/lib-commonjs/Radio/RadioTokens.win32.js +88 -90
- package/lib-commonjs/Radio/RadioTokens.win32.js.map +1 -1
- package/lib-commonjs/Radio/__tests__/RadioExperimental.test.js +9 -9
- package/lib-commonjs/Radio/__tests__/RadioExperimental.test.js.map +1 -1
- package/lib-commonjs/Radio/useRadio.js +51 -23
- package/lib-commonjs/Radio/useRadio.js.map +1 -1
- package/lib-commonjs/Radio/useRadio.win32.js +68 -42
- package/lib-commonjs/Radio/useRadio.win32.js.map +1 -1
- package/lib-commonjs/RadioGroup/RadioGroup.js +28 -28
- package/lib-commonjs/RadioGroup/RadioGroup.js.map +1 -1
- package/lib-commonjs/RadioGroup/RadioGroup.styling.js +18 -16
- package/lib-commonjs/RadioGroup/RadioGroup.styling.js.map +1 -1
- package/lib-commonjs/RadioGroup/RadioGroupTokens.android.js +1 -1
- package/lib-commonjs/RadioGroup/RadioGroupTokens.android.js.map +1 -1
- package/lib-commonjs/RadioGroup/RadioGroupTokens.js +14 -16
- package/lib-commonjs/RadioGroup/RadioGroupTokens.js.map +1 -1
- package/lib-commonjs/RadioGroup/RadioGroupTokens.mobile.js +15 -17
- package/lib-commonjs/RadioGroup/RadioGroupTokens.mobile.js.map +1 -1
- package/lib-commonjs/RadioGroup/__tests__/RadioGroupExperimental.test.js +60 -126
- package/lib-commonjs/RadioGroup/__tests__/RadioGroupExperimental.test.js.map +1 -1
- package/lib-commonjs/RadioGroup/radioGroupContext.js +9 -9
- package/lib-commonjs/RadioGroup/radioGroupContext.js.map +1 -1
- package/lib-commonjs/RadioGroup/useRadioGroup.js +39 -27
- package/lib-commonjs/RadioGroup/useRadioGroup.js.map +1 -1
- package/lib-commonjs/RadioGroup/useRadioGroupContextValue.js +2 -3
- package/lib-commonjs/RadioGroup/useRadioGroupContextValue.js.map +1 -1
- package/lib-commonjs/legacy/MacOSRadioButtonNativeComponent.js +1 -11
- package/lib-commonjs/legacy/MacOSRadioButtonNativeComponent.js.map +1 -1
- package/lib-commonjs/legacy/RadioButton.js +49 -34
- package/lib-commonjs/legacy/RadioButton.js.map +1 -1
- package/lib-commonjs/legacy/RadioButton.macos.js +19 -19
- package/lib-commonjs/legacy/RadioButton.macos.js.map +1 -1
- package/lib-commonjs/legacy/RadioButton.settings.js +5 -5
- package/lib-commonjs/legacy/RadioButton.settings.js.map +1 -1
- package/lib-commonjs/legacy/RadioButton.win32.js +64 -49
- package/lib-commonjs/legacy/RadioButton.win32.js.map +1 -1
- package/lib-commonjs/legacy/RadioGroup.js +36 -41
- package/lib-commonjs/legacy/RadioGroup.js.map +1 -1
- package/lib-commonjs/legacy/RadioGroup.settings.js +1 -1
- package/lib-commonjs/legacy/RadioGroup.settings.js.map +1 -1
- package/lib-commonjs/legacy/__tests__/RadioButton.test.js +7 -7
- package/lib-commonjs/legacy/__tests__/RadioButton.test.js.map +1 -1
- package/lib-commonjs/legacy/__tests__/RadioButtonGroup.test.js +10 -10
- package/lib-commonjs/legacy/__tests__/RadioButtonGroup.test.js.map +1 -1
- package/package.json +26 -14
- package/.eslintrc.js +0 -3
|
@@ -1,129 +1,62 @@
|
|
|
1
|
-
import { __awaiter, __generator } from "tslib";
|
|
2
1
|
import * as React from 'react';
|
|
3
2
|
import * as renderer from 'react-test-renderer';
|
|
4
3
|
import { Radio } from '../../Radio/Radio';
|
|
5
4
|
import { RadioGroup } from '../RadioGroup';
|
|
6
5
|
jest.useFakeTimers();
|
|
7
|
-
describe('RadioGroup component tests',
|
|
8
|
-
it('RadioGroup default',
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
case 1:
|
|
63
|
-
_a.sent();
|
|
64
|
-
return [2 /*return*/];
|
|
65
|
-
}
|
|
66
|
-
});
|
|
67
|
-
}); });
|
|
68
|
-
it('RadioGroup required', function () { return __awaiter(void 0, void 0, void 0, function () {
|
|
69
|
-
var tree;
|
|
70
|
-
return __generator(this, function (_a) {
|
|
71
|
-
switch (_a.label) {
|
|
72
|
-
case 0:
|
|
73
|
-
tree = renderer
|
|
74
|
-
.create(React.createElement(RadioGroup, { required: true, label: "Required RadioGroup", defaultValue: "key2" },
|
|
75
|
-
React.createElement(Radio, { value: "key1", label: "Radio1", accessibilityPositionInSet: 1, accessibilitySetSize: 2 }),
|
|
76
|
-
React.createElement(Radio, { value: "key2", label: "Radio2", accessibilityPositionInSet: 2, accessibilitySetSize: 2 })))
|
|
77
|
-
.toJSON();
|
|
78
|
-
expect(tree).toMatchSnapshot();
|
|
79
|
-
return [4 /*yield*/, renderer.act(function () { return __awaiter(void 0, void 0, void 0, function () { return __generator(this, function (_a) {
|
|
80
|
-
return [2 /*return*/, null];
|
|
81
|
-
}); }); })];
|
|
82
|
-
case 1:
|
|
83
|
-
_a.sent();
|
|
84
|
-
return [2 /*return*/];
|
|
85
|
-
}
|
|
86
|
-
});
|
|
87
|
-
}); });
|
|
88
|
-
it('RadioGroup horizontal', function () { return __awaiter(void 0, void 0, void 0, function () {
|
|
89
|
-
var tree;
|
|
90
|
-
return __generator(this, function (_a) {
|
|
91
|
-
switch (_a.label) {
|
|
92
|
-
case 0:
|
|
93
|
-
tree = renderer
|
|
94
|
-
.create(React.createElement(RadioGroup, { layout: "horizontal", label: "Horizontal RadioGroup", defaultValue: "key2" },
|
|
95
|
-
React.createElement(Radio, { value: "key1", label: "Radio1", accessibilityPositionInSet: 1, accessibilitySetSize: 2 }),
|
|
96
|
-
React.createElement(Radio, { value: "key2", label: "Radio2", accessibilityPositionInSet: 2, accessibilitySetSize: 2 })))
|
|
97
|
-
.toJSON();
|
|
98
|
-
expect(tree).toMatchSnapshot();
|
|
99
|
-
return [4 /*yield*/, renderer.act(function () { return __awaiter(void 0, void 0, void 0, function () { return __generator(this, function (_a) {
|
|
100
|
-
return [2 /*return*/, null];
|
|
101
|
-
}); }); })];
|
|
102
|
-
case 1:
|
|
103
|
-
_a.sent();
|
|
104
|
-
return [2 /*return*/];
|
|
105
|
-
}
|
|
106
|
-
});
|
|
107
|
-
}); });
|
|
108
|
-
it('RadioGroup horizontal-stacked', function () { return __awaiter(void 0, void 0, void 0, function () {
|
|
109
|
-
var tree;
|
|
110
|
-
return __generator(this, function (_a) {
|
|
111
|
-
switch (_a.label) {
|
|
112
|
-
case 0:
|
|
113
|
-
tree = renderer
|
|
114
|
-
.create(React.createElement(RadioGroup, { layout: "horizontal-stacked", label: "Horizontal-Stacked RadioGroup", defaultValue: "key2" },
|
|
115
|
-
React.createElement(Radio, { value: "key1", label: "Radio1", accessibilityPositionInSet: 1, accessibilitySetSize: 2 }),
|
|
116
|
-
React.createElement(Radio, { value: "key2", label: "Radio2", accessibilityPositionInSet: 2, accessibilitySetSize: 2 })))
|
|
117
|
-
.toJSON();
|
|
118
|
-
expect(tree).toMatchSnapshot();
|
|
119
|
-
return [4 /*yield*/, renderer.act(function () { return __awaiter(void 0, void 0, void 0, function () { return __generator(this, function (_a) {
|
|
120
|
-
return [2 /*return*/, null];
|
|
121
|
-
}); }); })];
|
|
122
|
-
case 1:
|
|
123
|
-
_a.sent();
|
|
124
|
-
return [2 /*return*/];
|
|
125
|
-
}
|
|
126
|
-
});
|
|
127
|
-
}); });
|
|
6
|
+
describe('RadioGroup component tests', () => {
|
|
7
|
+
it('RadioGroup default', async () => {
|
|
8
|
+
const tree = renderer
|
|
9
|
+
.create(React.createElement(RadioGroup, { label: "Uncontrolled RadioGroup", defaultValue: "key2" },
|
|
10
|
+
React.createElement(Radio, { value: "key1", label: "RadioButton1" }),
|
|
11
|
+
React.createElement(Radio, { value: "key2", label: "RadioButton2" })))
|
|
12
|
+
.toJSON();
|
|
13
|
+
expect(tree).toMatchSnapshot();
|
|
14
|
+
await renderer.act(async () => null);
|
|
15
|
+
});
|
|
16
|
+
it('Radio not direct child of radio group', async () => {
|
|
17
|
+
const tree = renderer
|
|
18
|
+
.create(React.createElement(RadioGroup, { label: "Uncontrolled RadioGroup", defaultValue: "key2" },
|
|
19
|
+
React.createElement(Radio, { value: "key1", label: "Radio1", accessibilityPositionInSet: 1, accessibilitySetSize: 2 }),
|
|
20
|
+
React.createElement(Radio, { value: "key2", label: "Radio2", accessibilityPositionInSet: 2, accessibilitySetSize: 2 })))
|
|
21
|
+
.toJSON();
|
|
22
|
+
expect(tree).toMatchSnapshot();
|
|
23
|
+
await renderer.act(async () => null);
|
|
24
|
+
});
|
|
25
|
+
it('RadioGroup disabled', async () => {
|
|
26
|
+
const tree = renderer
|
|
27
|
+
.create(React.createElement(RadioGroup, { disabled: true, label: "Disabled RadioGroup" },
|
|
28
|
+
React.createElement(Radio, { value: "key1", label: "Radio1", accessibilityPositionInSet: 1, accessibilitySetSize: 2 }),
|
|
29
|
+
React.createElement(Radio, { value: "key2", label: "Radio2", accessibilityPositionInSet: 2, accessibilitySetSize: 2 })))
|
|
30
|
+
.toJSON();
|
|
31
|
+
expect(tree).toMatchSnapshot();
|
|
32
|
+
await renderer.act(async () => null);
|
|
33
|
+
});
|
|
34
|
+
it('RadioGroup required', async () => {
|
|
35
|
+
const tree = renderer
|
|
36
|
+
.create(React.createElement(RadioGroup, { required: true, label: "Required RadioGroup", defaultValue: "key2" },
|
|
37
|
+
React.createElement(Radio, { value: "key1", label: "Radio1", accessibilityPositionInSet: 1, accessibilitySetSize: 2 }),
|
|
38
|
+
React.createElement(Radio, { value: "key2", label: "Radio2", accessibilityPositionInSet: 2, accessibilitySetSize: 2 })))
|
|
39
|
+
.toJSON();
|
|
40
|
+
expect(tree).toMatchSnapshot();
|
|
41
|
+
await renderer.act(async () => null);
|
|
42
|
+
});
|
|
43
|
+
it('RadioGroup horizontal', async () => {
|
|
44
|
+
const tree = renderer
|
|
45
|
+
.create(React.createElement(RadioGroup, { layout: "horizontal", label: "Horizontal RadioGroup", defaultValue: "key2" },
|
|
46
|
+
React.createElement(Radio, { value: "key1", label: "Radio1", accessibilityPositionInSet: 1, accessibilitySetSize: 2 }),
|
|
47
|
+
React.createElement(Radio, { value: "key2", label: "Radio2", accessibilityPositionInSet: 2, accessibilitySetSize: 2 })))
|
|
48
|
+
.toJSON();
|
|
49
|
+
expect(tree).toMatchSnapshot();
|
|
50
|
+
await renderer.act(async () => null);
|
|
51
|
+
});
|
|
52
|
+
it('RadioGroup horizontal-stacked', async () => {
|
|
53
|
+
const tree = renderer
|
|
54
|
+
.create(React.createElement(RadioGroup, { layout: "horizontal-stacked", label: "Horizontal-Stacked RadioGroup", defaultValue: "key2" },
|
|
55
|
+
React.createElement(Radio, { value: "key1", label: "Radio1", accessibilityPositionInSet: 1, accessibilitySetSize: 2 }),
|
|
56
|
+
React.createElement(Radio, { value: "key2", label: "Radio2", accessibilityPositionInSet: 2, accessibilitySetSize: 2 })))
|
|
57
|
+
.toJSON();
|
|
58
|
+
expect(tree).toMatchSnapshot();
|
|
59
|
+
await renderer.act(async () => null);
|
|
60
|
+
});
|
|
128
61
|
});
|
|
129
62
|
//# sourceMappingURL=RadioGroupExperimental.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RadioGroupExperimental.test.js","sourceRoot":"","sources":["../../../src/RadioGroup/__tests__/RadioGroupExperimental.test.tsx"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"RadioGroupExperimental.test.js","sourceRoot":"","sources":["../../../src/RadioGroup/__tests__/RadioGroupExperimental.test.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1,22 +1,22 @@
|
|
|
1
1
|
import * as React from 'react';
|
|
2
|
-
export
|
|
2
|
+
export const RadioGroupContext = React.createContext({
|
|
3
3
|
value: null,
|
|
4
4
|
disabled: false,
|
|
5
5
|
layout: 'vertical',
|
|
6
|
-
onChange:
|
|
6
|
+
onChange: ( /* key: string */) => {
|
|
7
7
|
return;
|
|
8
8
|
},
|
|
9
|
-
updateSelectedButtonRef:
|
|
9
|
+
updateSelectedButtonRef: ( /* ref: React.RefObject<any>*/) => {
|
|
10
10
|
return;
|
|
11
11
|
},
|
|
12
12
|
values: [],
|
|
13
13
|
enabledValues: [],
|
|
14
14
|
invoked: false,
|
|
15
|
-
addRadioValue:
|
|
16
|
-
removeRadioValue:
|
|
17
|
-
addRadioEnabledValue:
|
|
18
|
-
removeRadioEnabledValue:
|
|
15
|
+
addRadioValue: ( /* value: string */) => false,
|
|
16
|
+
removeRadioValue: ( /* value: string */) => false,
|
|
17
|
+
addRadioEnabledValue: ( /* value: string */) => false,
|
|
18
|
+
removeRadioEnabledValue: ( /* value: string */) => false,
|
|
19
19
|
});
|
|
20
|
-
export
|
|
21
|
-
export
|
|
20
|
+
export const RadioGroupProvider = RadioGroupContext.Provider;
|
|
21
|
+
export const useRadioGroupContext = () => React.useContext(RadioGroupContext);
|
|
22
22
|
//# sourceMappingURL=radioGroupContext.js.map
|
|
@@ -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,
|
|
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,34 +1,33 @@
|
|
|
1
|
-
import { __assign, __spreadArray } from "tslib";
|
|
2
1
|
import * as React from 'react';
|
|
3
2
|
import { memoize } from '@fluentui-react-native/framework';
|
|
4
3
|
import { useSelectedKey as useValue } from '@fluentui-react-native/interactive-hooks';
|
|
5
|
-
export
|
|
6
|
-
|
|
4
|
+
export const useRadioGroup = (props) => {
|
|
5
|
+
const { accessible, value, defaultValue, disabled, required, layout, onChange, isCircularNavigation, accessibilityLabel, label, accessibilityState, } = props;
|
|
7
6
|
// This hook updates the selected Radio and calls the customer's onClick function. This gets called after a button is pressed.
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
7
|
+
const data = useValue(value || defaultValue || null, onChange);
|
|
8
|
+
const [selectedButtonRef, setSelectedButtonRef] = React.useState(React.useRef(null));
|
|
9
|
+
const onSelectButtonRef = React.useCallback((ref) => {
|
|
11
10
|
setSelectedButtonRef(ref);
|
|
12
11
|
}, [setSelectedButtonRef]);
|
|
13
|
-
|
|
14
|
-
|
|
12
|
+
const [invoked, setInvoked] = React.useState(false);
|
|
13
|
+
const onInvoked = React.useCallback((check) => {
|
|
15
14
|
setInvoked(check);
|
|
16
15
|
}, [setInvoked]);
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
setValues(
|
|
16
|
+
const [values, setValues] = React.useState([]);
|
|
17
|
+
const onAddRadioValue = React.useCallback((value) => {
|
|
18
|
+
setValues((values) => [...values, value]);
|
|
20
19
|
}, [setValues]);
|
|
21
|
-
|
|
22
|
-
setValues(
|
|
20
|
+
const onRemoveRadioValue = React.useCallback((value) => {
|
|
21
|
+
setValues((values) => values.filter((item) => item !== value));
|
|
23
22
|
}, [setValues]);
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
setEnabledValues(
|
|
23
|
+
const [enabledValues, setEnabledValues] = React.useState([]);
|
|
24
|
+
const onAddRadioEnabledValue = React.useCallback((value) => {
|
|
25
|
+
setEnabledValues((enabledValues) => [...enabledValues, value]);
|
|
27
26
|
}, [setEnabledValues]);
|
|
28
|
-
|
|
29
|
-
setEnabledValues(
|
|
27
|
+
const onRemoveRadioEnabledValue = React.useCallback((value) => {
|
|
28
|
+
setEnabledValues((enabledValues) => enabledValues.filter((item) => item !== value));
|
|
30
29
|
}, [setEnabledValues]);
|
|
31
|
-
|
|
30
|
+
const state = {
|
|
32
31
|
value: data.selectedKey,
|
|
33
32
|
required: required || false,
|
|
34
33
|
disabled: disabled || false,
|
|
@@ -46,15 +45,27 @@ export var useRadioGroup = function (props) {
|
|
|
46
45
|
selectedButtonDisabled: values.includes(data.selectedKey) && !enabledValues.includes(data.selectedKey),
|
|
47
46
|
};
|
|
48
47
|
return {
|
|
49
|
-
props:
|
|
50
|
-
|
|
48
|
+
props: {
|
|
49
|
+
...props,
|
|
50
|
+
required,
|
|
51
|
+
layout,
|
|
52
|
+
accessible: accessible ?? true,
|
|
53
|
+
accessibilityRole: 'radiogroup',
|
|
54
|
+
accessibilityLabel: accessibilityLabel ?? label,
|
|
55
|
+
accessibilityState: getAccessibilityState(state.disabled, state.required, accessibilityState),
|
|
56
|
+
defaultTabbableElement: selectedButtonRef,
|
|
57
|
+
isCircularNavigation: isCircularNavigation ?? true,
|
|
58
|
+
},
|
|
59
|
+
state: {
|
|
60
|
+
...state,
|
|
61
|
+
},
|
|
51
62
|
};
|
|
52
63
|
};
|
|
53
|
-
|
|
64
|
+
const getAccessibilityState = memoize(getAccessibilityStateWorker);
|
|
54
65
|
function getAccessibilityStateWorker(disabled, required, accessibilityState) {
|
|
55
66
|
if (accessibilityState) {
|
|
56
|
-
return
|
|
67
|
+
return { disabled, required, ...accessibilityState };
|
|
57
68
|
}
|
|
58
|
-
return { disabled
|
|
69
|
+
return { disabled, required };
|
|
59
70
|
}
|
|
60
71
|
//# sourceMappingURL=useRadioGroup.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useRadioGroup.js","sourceRoot":"","sources":["../../src/RadioGroup/useRadioGroup.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"useRadioGroup.js","sourceRoot":"","sources":["../../src/RadioGroup/useRadioGroup.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useRadioGroupContextValue.js","sourceRoot":"","sources":["../../src/RadioGroup/useRadioGroupContextValue.ts"],"names":[],"mappings":"
|
|
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,7 +1,6 @@
|
|
|
1
1
|
/** @jsxRuntime classic */
|
|
2
2
|
/** @jsx withSlots */
|
|
3
3
|
'use strict';
|
|
4
|
-
import { __assign, __rest } from "tslib";
|
|
5
4
|
import * as React from 'react';
|
|
6
5
|
import { View } from 'react-native';
|
|
7
6
|
import { filterViewProps } from '@fluentui-react-native/adapters';
|
|
@@ -14,17 +13,16 @@ import { mergeSettings } from '@uifabricshared/foundation-settings';
|
|
|
14
13
|
import { settings, radioButtonSelectActionLabel } from './RadioButton.settings';
|
|
15
14
|
import { radioButtonName } from './RadioButton.types';
|
|
16
15
|
import { RadioGroupContext } from './RadioGroup';
|
|
17
|
-
export
|
|
16
|
+
export const RadioButton = compose({
|
|
18
17
|
displayName: radioButtonName,
|
|
19
|
-
usePrepareProps:
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
var content = userProps.content, buttonKey = userProps.buttonKey, disabled = userProps.disabled, accessibilityLabel = userProps.accessibilityLabel, ariaLabel = userProps.ariaLabel, _d = userProps.componentRef, componentRef = _d === void 0 ? defaultComponentRef : _d, accessibilityPositionInSet = userProps.accessibilityPositionInSet, ariaPosInSet = userProps.ariaPosInSet, accessibilitySetSize = userProps.accessibilitySetSize, ariaSetSize = userProps.ariaSetSize, rest = __rest(userProps, ["content", "buttonKey", "disabled", "accessibilityLabel", "ariaLabel", "componentRef", "accessibilityPositionInSet", "ariaPosInSet", "accessibilitySetSize", "ariaSetSize"]);
|
|
18
|
+
usePrepareProps: (userProps, useStyling) => {
|
|
19
|
+
const defaultComponentRef = React.useRef(null);
|
|
20
|
+
const { content, buttonKey, disabled, accessibilityLabel, ariaLabel, componentRef = defaultComponentRef, accessibilityPositionInSet, ariaPosInSet, accessibilitySetSize, ariaSetSize, ...rest } = userProps;
|
|
23
21
|
// Grabs the context information from RadioGroup (currently selected button and client's onChange callback)
|
|
24
|
-
|
|
25
|
-
|
|
22
|
+
const info = React.useContext(RadioGroupContext);
|
|
23
|
+
const buttonRef = useViewCommandFocus(componentRef);
|
|
26
24
|
/* We don't want to call the user's onChange multiple times on the same selection. */
|
|
27
|
-
|
|
25
|
+
const changeSelection = () => {
|
|
28
26
|
if (buttonKey != info.selectedKey) {
|
|
29
27
|
info.onChange && info.onChange(buttonKey);
|
|
30
28
|
info.updateSelectedButtonRef && componentRef && info.updateSelectedButtonRef(componentRef);
|
|
@@ -33,44 +31,60 @@ export var RadioButton = compose({
|
|
|
33
31
|
/* We use the componentRef of the currently selected button to maintain the default tabbable
|
|
34
32
|
element in a RadioGroup. Since the componentRef isn't generated until after initial render,
|
|
35
33
|
we must update it once here. */
|
|
36
|
-
React.useEffect(
|
|
34
|
+
React.useEffect(() => {
|
|
37
35
|
if (buttonKey == info.selectedKey) {
|
|
38
36
|
info.updateSelectedButtonRef && componentRef && info.updateSelectedButtonRef(componentRef);
|
|
39
37
|
}
|
|
40
38
|
}, []);
|
|
41
39
|
// Ensure focus is placed on button after click
|
|
42
|
-
|
|
40
|
+
const changeSelectionWithFocus = useOnPressWithFocus(componentRef, changeSelection);
|
|
43
41
|
/* RadioButton changes selection when focus is moved between each RadioButton and on a click */
|
|
44
|
-
|
|
42
|
+
const pressable = useAsPressable({
|
|
43
|
+
...rest,
|
|
44
|
+
onPress: changeSelectionWithFocus,
|
|
45
|
+
onFocus: changeSelection,
|
|
46
|
+
});
|
|
45
47
|
// Used when creating accessibility properties in mergeSettings below
|
|
46
|
-
|
|
48
|
+
const onAccessibilityAction = React.useCallback((event) => {
|
|
47
49
|
switch (event.nativeEvent.actionName) {
|
|
48
50
|
case 'Select':
|
|
49
51
|
changeSelection();
|
|
50
52
|
break;
|
|
51
53
|
}
|
|
52
54
|
}, [info, buttonKey]);
|
|
53
|
-
|
|
55
|
+
const state = {
|
|
56
|
+
...pressable.state,
|
|
57
|
+
selected: info.selectedKey === userProps.buttonKey,
|
|
58
|
+
disabled: disabled || false,
|
|
59
|
+
};
|
|
54
60
|
// Grab the styling information from the userProps, referencing the state as well as the props.
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
root:
|
|
61
|
+
const styleProps = useStyling(userProps, (override) => state[override] || userProps[override]);
|
|
62
|
+
const slotProps = mergeSettings(styleProps, {
|
|
63
|
+
root: {
|
|
64
|
+
...rest,
|
|
65
|
+
ref: buttonRef,
|
|
66
|
+
...pressable.props,
|
|
67
|
+
accessibilityRole: 'radio',
|
|
68
|
+
accessibilityLabel: accessibilityLabel ?? ariaLabel ?? content,
|
|
69
|
+
accessibilityState: { disabled: state.disabled, selected: state.selected },
|
|
70
|
+
accessibilityActions: [{ name: 'Select', label: radioButtonSelectActionLabel }],
|
|
71
|
+
accessibilityPositionInSet: accessibilityPositionInSet ?? ariaPosInSet ?? info.buttonKeys.findIndex((x) => x == buttonKey) + 1,
|
|
72
|
+
accessibilitySetSize: accessibilitySetSize ?? ariaSetSize ?? info.buttonKeys.length,
|
|
73
|
+
focusable: !state.disabled,
|
|
74
|
+
onAccessibilityAction: onAccessibilityAction,
|
|
75
|
+
},
|
|
58
76
|
content: { children: content },
|
|
59
77
|
});
|
|
60
|
-
return { slotProps
|
|
78
|
+
return { slotProps };
|
|
61
79
|
},
|
|
62
|
-
render:
|
|
63
|
-
var children = [];
|
|
64
|
-
for (var _i = 2; _i < arguments.length; _i++) {
|
|
65
|
-
children[_i - 2] = arguments[_i];
|
|
66
|
-
}
|
|
80
|
+
render: (Slots, _renderData, ...children) => {
|
|
67
81
|
return (withSlots(Slots.root, null,
|
|
68
82
|
withSlots(Slots.button, null,
|
|
69
83
|
withSlots(Slots.innerCircle, null)),
|
|
70
84
|
withSlots(Slots.content, null),
|
|
71
85
|
children));
|
|
72
86
|
},
|
|
73
|
-
settings
|
|
87
|
+
settings,
|
|
74
88
|
slots: {
|
|
75
89
|
root: View,
|
|
76
90
|
button: { slotType: View, filter: filterViewProps },
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RadioButton.js","sourceRoot":"","sources":["../../src/legacy/RadioButton.tsx"],"names":[],"mappings":"AAAA,0BAA0B;AAC1B,qBAAqB;AACrB,YAAY,CAAC
|
|
1
|
+
{"version":3,"file":"RadioButton.js","sourceRoot":"","sources":["../../src/legacy/RadioButton.tsx"],"names":[],"mappings":"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"}
|
|
@@ -12,14 +12,14 @@ import { mergeSettings } from '@uifabricshared/foundation-settings';
|
|
|
12
12
|
import NativeRadioButtonView from './MacOSRadioButtonNativeComponent';
|
|
13
13
|
import { radioButtonName } from './RadioButton.types';
|
|
14
14
|
import { RadioGroupContext } from './RadioGroup';
|
|
15
|
-
export
|
|
15
|
+
export const RadioButton = compose({
|
|
16
16
|
displayName: radioButtonName,
|
|
17
|
-
usePrepareProps:
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
17
|
+
usePrepareProps: (userProps, useStyling) => {
|
|
18
|
+
const defaultComponentRef = React.useRef(null);
|
|
19
|
+
const { content, buttonKey, disabled, componentRef = defaultComponentRef } = userProps;
|
|
20
|
+
const info = React.useContext(RadioGroupContext);
|
|
21
21
|
// Reroute the native component's onPress event to RadioGroup's onChange
|
|
22
|
-
|
|
22
|
+
const onPressRerouted = () => {
|
|
23
23
|
// Prevent calls to RadioGroup's onChange on the currently selected button
|
|
24
24
|
if (buttonKey != info.selectedKey) {
|
|
25
25
|
info.onChange && info.onChange(buttonKey);
|
|
@@ -29,14 +29,14 @@ export var RadioButton = compose({
|
|
|
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
|
-
React.useEffect(
|
|
32
|
+
React.useEffect(() => {
|
|
33
33
|
if (buttonKey === info.selectedKey) {
|
|
34
34
|
info.updateSelectedButtonRef && componentRef && info.updateSelectedButtonRef(componentRef);
|
|
35
35
|
}
|
|
36
36
|
}, []);
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
37
|
+
const styleProps = useStyling(userProps);
|
|
38
|
+
const isSelected = info.selectedKey === buttonKey;
|
|
39
|
+
const slotProps = mergeSettings(styleProps, {
|
|
40
40
|
root: {
|
|
41
41
|
ref: componentRef,
|
|
42
42
|
buttonKey: buttonKey,
|
|
@@ -50,7 +50,7 @@ export var RadioButton = compose({
|
|
|
50
50
|
},
|
|
51
51
|
},
|
|
52
52
|
});
|
|
53
|
-
return { slotProps
|
|
53
|
+
return { slotProps };
|
|
54
54
|
},
|
|
55
55
|
slots: {
|
|
56
56
|
root: NativeRadioButtonView,
|
|
@@ -58,7 +58,7 @@ export var RadioButton = compose({
|
|
|
58
58
|
styles: {
|
|
59
59
|
root: [],
|
|
60
60
|
},
|
|
61
|
-
render:
|
|
61
|
+
render: (Slots) => {
|
|
62
62
|
return withSlots(Slots.root, null);
|
|
63
63
|
},
|
|
64
64
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RadioButton.macos.js","sourceRoot":"","sources":["../../src/legacy/RadioButton.macos.tsx"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,0BAA0B;AAC1B,qBAAqB;AACrB,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAG/B,OAAO,EAAE,SAAS,EAAE,MAAM,uCAAuC,CAAC;AAClE,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,
|
|
1
|
+
{"version":3,"file":"RadioButton.macos.js","sourceRoot":"","sources":["../../src/legacy/RadioButton.macos.tsx"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,0BAA0B;AAC1B,qBAAqB;AACrB,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAG/B,OAAO,EAAE,SAAS,EAAE,MAAM,uCAAuC,CAAC;AAClE,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;QAEjD,wEAAwE;QACxE,MAAM,eAAe,GAAG,GAAG,EAAE;YAC3B,0EAA0E;YAC1E,IAAI,SAAS,IAAI,IAAI,CAAC,WAAW,EAAE;gBACjC,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;gBAC1C,IAAI,CAAC,uBAAuB,IAAI,YAAY,IAAI,IAAI,CAAC,uBAAuB,CAAC,YAAY,CAAC,CAAC;aAC5F;QACH,CAAC,CAAC;QAEF;;uCAE+B;QAC/B,KAAK,CAAC,SAAS,CAAC,GAAG,EAAE;YACnB,IAAI,SAAS,KAAK,IAAI,CAAC,WAAW,EAAE;gBAClC,IAAI,CAAC,uBAAuB,IAAI,YAAY,IAAI,IAAI,CAAC,uBAAuB,CAAC,YAAY,CAAC,CAAC;aAC5F;QACH,CAAC,EAAE,EAAE,CAAC,CAAC;QAEP,MAAM,UAAU,GAAG,UAAU,CAAC,SAAS,CAAC,CAAC;QACzC,MAAM,UAAU,GAAG,IAAI,CAAC,WAAW,KAAK,SAAS,CAAC;QAClD,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,UAAC,KAAK,CAAC,IAAI,OAAG,CAAC;IACxB,CAAC;CACF,CAAC,CAAC;AAEH,eAAe,WAAW,CAAC"}
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
import { radioButtonName } from './RadioButton.types';
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
export
|
|
7
|
-
export
|
|
2
|
+
const radioButtonSize = 20;
|
|
3
|
+
const radioButtonRadius = radioButtonSize / 2;
|
|
4
|
+
const radioButtonInnerCircleSize = 10;
|
|
5
|
+
const radioButtonInnerCircleRadius = radioButtonInnerCircleSize / 2;
|
|
6
|
+
export const radioButtonSelectActionLabel = 'Select a RadioButton';
|
|
7
|
+
export const settings = [
|
|
8
8
|
{
|
|
9
9
|
tokens: {
|
|
10
10
|
borderColor: 'menuItemText',
|