@fluentui-react-native/radio-group 0.22.0 → 0.22.3

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