From ce291529a882478a4d8cfbb3bcea00b057fcbbff Mon Sep 17 00:00:00 2001 From: Krystal Kramer Date: Fri, 18 Aug 2023 13:21:33 -0400 Subject: [PATCH 01/11] add missing a11yState props on win32 --- .../src/Libraries/Components/View/View.win32.js | 2 ++ .../src/Libraries/Components/View/ViewAccessibility.win32.js | 2 ++ 2 files changed, 4 insertions(+) diff --git a/packages/@office-iss/react-native-win32/src/Libraries/Components/View/View.win32.js b/packages/@office-iss/react-native-win32/src/Libraries/Components/View/View.win32.js index ec4f0dec335..f3cf062311c 100644 --- a/packages/@office-iss/react-native-win32/src/Libraries/Components/View/View.win32.js +++ b/packages/@office-iss/react-native-win32/src/Libraries/Components/View/View.win32.js @@ -93,6 +93,8 @@ const View: React.AbstractComponent< disabled: ariaDisabled ?? accessibilityState?.disabled, expanded: ariaExpanded ?? accessibilityState?.expanded, selected: ariaSelected ?? accessibilityState?.selected, + multiselectable: accessibilityState?.multiselectable, + required: accessibilityState?.required, }; } let _accessibilityValue; diff --git a/packages/@office-iss/react-native-win32/src/Libraries/Components/View/ViewAccessibility.win32.js b/packages/@office-iss/react-native-win32/src/Libraries/Components/View/ViewAccessibility.win32.js index 535fa29e56e..caebbb930cf 100644 --- a/packages/@office-iss/react-native-win32/src/Libraries/Components/View/ViewAccessibility.win32.js +++ b/packages/@office-iss/react-native-win32/src/Libraries/Components/View/ViewAccessibility.win32.js @@ -152,6 +152,8 @@ export type AccessibilityState = { checked?: ?boolean | 'mixed', busy?: boolean, expanded?: boolean, + multiselectable?: boolean, + required?: boolean, ... }; From cb12f9bf1cd0774d052d1ad2c1f77ac466b239aa Mon Sep 17 00:00:00 2001 From: Krystal Kramer Date: Fri, 18 Aug 2023 13:22:07 -0400 Subject: [PATCH 02/11] Change files --- ...-native-win32-7fd6b7f9-9ded-4985-87b5-70b02f87b6c1.json | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 change/@office-iss-react-native-win32-7fd6b7f9-9ded-4985-87b5-70b02f87b6c1.json diff --git a/change/@office-iss-react-native-win32-7fd6b7f9-9ded-4985-87b5-70b02f87b6c1.json b/change/@office-iss-react-native-win32-7fd6b7f9-9ded-4985-87b5-70b02f87b6c1.json new file mode 100644 index 00000000000..570c51e6459 --- /dev/null +++ b/change/@office-iss-react-native-win32-7fd6b7f9-9ded-4985-87b5-70b02f87b6c1.json @@ -0,0 +1,7 @@ +{ + "type": "prerelease", + "comment": "add missing a11yState props on win32", + "packageName": "@office-iss/react-native-win32", + "email": "krsiler@microsoft.com", + "dependentChangeType": "patch" +} From 0d12490bc2fc8df602296ff0de6d1f06e2f7c4e5 Mon Sep 17 00:00:00 2001 From: Krystal Kramer Date: Fri, 18 Aug 2023 13:35:27 -0400 Subject: [PATCH 03/11] fix missing a11yState props for other components --- .../react-native-win32/src/Libraries/Components/Button.win32.js | 2 ++ .../src/Libraries/Components/Pressable/Pressable.win32.js | 2 ++ .../src/Libraries/Components/TextInput/TextInput.win32.js | 2 ++ .../react-native-win32/src/Libraries/Image/Image.win32.js | 2 ++ .../react-native-win32/src/Libraries/Text/Text.win32.js | 2 ++ 5 files changed, 10 insertions(+) diff --git a/packages/@office-iss/react-native-win32/src/Libraries/Components/Button.win32.js b/packages/@office-iss/react-native-win32/src/Libraries/Components/Button.win32.js index 4cf2d0b3cfb..b0c01d9bd10 100644 --- a/packages/@office-iss/react-native-win32/src/Libraries/Components/Button.win32.js +++ b/packages/@office-iss/react-native-win32/src/Libraries/Components/Button.win32.js @@ -328,6 +328,8 @@ class Button extends React.Component { disabled: ariaDisabled ?? accessibilityState?.disabled, expanded: ariaExpanded ?? accessibilityState?.expanded, selected: ariaSelected ?? accessibilityState?.selected, + multiselectable: accessibilityState?.multiselectable, + required: accessibilityState?.required, }; const disabled = diff --git a/packages/@office-iss/react-native-win32/src/Libraries/Components/Pressable/Pressable.win32.js b/packages/@office-iss/react-native-win32/src/Libraries/Components/Pressable/Pressable.win32.js index 4939b0815f8..96e56d45778 100644 --- a/packages/@office-iss/react-native-win32/src/Libraries/Components/Pressable/Pressable.win32.js +++ b/packages/@office-iss/react-native-win32/src/Libraries/Components/Pressable/Pressable.win32.js @@ -298,6 +298,8 @@ function Pressable(props: Props, forwardedRef): React.Node { disabled: ariaDisabled ?? accessibilityState?.disabled, expanded: ariaExpanded ?? accessibilityState?.expanded, selected: ariaSelected ?? accessibilityState?.selected, + multiselectable: accessibilityState?.multiselectable, + required: accessibilityState?.required, }; _accessibilityState = diff --git a/packages/@office-iss/react-native-win32/src/Libraries/Components/TextInput/TextInput.win32.js b/packages/@office-iss/react-native-win32/src/Libraries/Components/TextInput/TextInput.win32.js index b23f4fd8ed3..d4f94d4a600 100644 --- a/packages/@office-iss/react-native-win32/src/Libraries/Components/TextInput/TextInput.win32.js +++ b/packages/@office-iss/react-native-win32/src/Libraries/Components/TextInput/TextInput.win32.js @@ -1532,6 +1532,8 @@ function InternalTextInput(props: Props): React.Node { disabled: ariaDisabled ?? accessibilityState?.disabled, expanded: ariaExpanded ?? accessibilityState?.expanded, selected: ariaSelected ?? accessibilityState?.selected, + multiselectable: accessibilityState?.multiselectable, + required: accessibilityState?.required, }; } diff --git a/packages/@office-iss/react-native-win32/src/Libraries/Image/Image.win32.js b/packages/@office-iss/react-native-win32/src/Libraries/Image/Image.win32.js index 5ca5f4e5e9b..42d420293dd 100644 --- a/packages/@office-iss/react-native-win32/src/Libraries/Image/Image.win32.js +++ b/packages/@office-iss/react-native-win32/src/Libraries/Image/Image.win32.js @@ -186,6 +186,8 @@ const BaseImage = (props: ImagePropsType, forwardedRef) => { disabled: ariaDisabled ?? props.accessibilityState?.disabled, expanded: ariaExpanded ?? props.accessibilityState?.expanded, selected: ariaSelected ?? props.accessibilityState?.selected, + multiselectable: accessibilityState?.multiselectable, + required: accessibilityState?.required, }; const accessibilityLabel = props['aria-label'] ?? props.accessibilityLabel; diff --git a/packages/@office-iss/react-native-win32/src/Libraries/Text/Text.win32.js b/packages/@office-iss/react-native-win32/src/Libraries/Text/Text.win32.js index 355ad43e477..93b00da3996 100644 --- a/packages/@office-iss/react-native-win32/src/Libraries/Text/Text.win32.js +++ b/packages/@office-iss/react-native-win32/src/Libraries/Text/Text.win32.js @@ -88,6 +88,8 @@ const Text: React.AbstractComponent< disabled: ariaDisabled ?? accessibilityState?.disabled, expanded: ariaExpanded ?? accessibilityState?.expanded, selected: ariaSelected ?? accessibilityState?.selected, + multiselectable: accessibilityState?.multiselectable, + required: accessibilityState?.required, }; } From d279bfeefc461766998a50a0d46908c8e8dd9b1e Mon Sep 17 00:00:00 2001 From: Krystal Kramer Date: Fri, 18 Aug 2023 14:21:11 -0400 Subject: [PATCH 04/11] minor fix --- .../react-native-win32/src/Libraries/Image/Image.win32.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/@office-iss/react-native-win32/src/Libraries/Image/Image.win32.js b/packages/@office-iss/react-native-win32/src/Libraries/Image/Image.win32.js index 42d420293dd..37e80d92deb 100644 --- a/packages/@office-iss/react-native-win32/src/Libraries/Image/Image.win32.js +++ b/packages/@office-iss/react-native-win32/src/Libraries/Image/Image.win32.js @@ -186,8 +186,8 @@ const BaseImage = (props: ImagePropsType, forwardedRef) => { disabled: ariaDisabled ?? props.accessibilityState?.disabled, expanded: ariaExpanded ?? props.accessibilityState?.expanded, selected: ariaSelected ?? props.accessibilityState?.selected, - multiselectable: accessibilityState?.multiselectable, - required: accessibilityState?.required, + multiselectable: props.accessibilityState?.multiselectable, + required: props.accessibilityState?.required, }; const accessibilityLabel = props['aria-label'] ?? props.accessibilityLabel; From 5cca74ac2d6232e33972af44adcf7f582e94da8b Mon Sep 17 00:00:00 2001 From: Krystal Kramer Date: Mon, 21 Aug 2023 09:56:43 -0400 Subject: [PATCH 05/11] add aria- equivalent props --- .../Accessibility/AccessibilityExampleWin32.tsx | 2 +- .../src/Libraries/Components/Button.win32.js | 6 ++++-- .../src/Libraries/Components/Pressable/Pressable.win32.js | 6 ++++-- .../src/Libraries/Components/TextInput/TextInput.win32.js | 8 ++++++-- .../src/Libraries/Components/View/View.win32.js | 8 ++++++-- .../src/Libraries/Components/View/ViewAccessibility.d.ts | 2 ++ .../src/Libraries/Components/View/ViewPropTypes.win32.js | 2 ++ .../react-native-win32/src/Libraries/Image/Image.win32.js | 6 ++++-- .../react-native-win32/src/Libraries/Text/Text.win32.js | 8 ++++++-- 9 files changed, 35 insertions(+), 13 deletions(-) diff --git a/packages/@office-iss/react-native-win32-tester/src/js/examples-win32/Accessibility/AccessibilityExampleWin32.tsx b/packages/@office-iss/react-native-win32-tester/src/js/examples-win32/Accessibility/AccessibilityExampleWin32.tsx index 904d615b7b8..6938fddca55 100644 --- a/packages/@office-iss/react-native-win32-tester/src/js/examples-win32/Accessibility/AccessibilityExampleWin32.tsx +++ b/packages/@office-iss/react-native-win32-tester/src/js/examples-win32/Accessibility/AccessibilityExampleWin32.tsx @@ -181,7 +181,7 @@ class MultiSelectionExample extends React.Component<{}, IMultiSelectionExampleSt public render() { return ( - + { 'aria-disabled': ariaDisabled, 'aria-expanded': ariaExpanded, 'aria-label': ariaLabel, + 'aria-multiselectable': ariaMultiselectable, // Win32 + 'aria-required': ariaRequired, // Win32 'aria-selected': ariaSelected, importantForAccessibility, color, @@ -327,9 +329,9 @@ class Button extends React.Component { checked: ariaChecked ?? accessibilityState?.checked, disabled: ariaDisabled ?? accessibilityState?.disabled, expanded: ariaExpanded ?? accessibilityState?.expanded, + multiselectable: ariaMultiselectable ?? accessibilityState?.multiselectable, // Win32 + required: ariaRequired ?? accessibilityState?.required, // Win32 selected: ariaSelected ?? accessibilityState?.selected, - multiselectable: accessibilityState?.multiselectable, - required: accessibilityState?.required, }; const disabled = diff --git a/packages/@office-iss/react-native-win32/src/Libraries/Components/Pressable/Pressable.win32.js b/packages/@office-iss/react-native-win32/src/Libraries/Components/Pressable/Pressable.win32.js index 96e56d45778..15d9b8b36e8 100644 --- a/packages/@office-iss/react-native-win32/src/Libraries/Components/Pressable/Pressable.win32.js +++ b/packages/@office-iss/react-native-win32/src/Libraries/Components/Pressable/Pressable.win32.js @@ -257,6 +257,8 @@ function Pressable(props: Props, forwardedRef): React.Node { 'aria-disabled': ariaDisabled, 'aria-expanded': ariaExpanded, 'aria-label': ariaLabel, + 'aria-multiselectable': ariaMultiselectable, // Win32 + 'aria-required': ariaRequired, // Win32 'aria-selected': ariaSelected, cancelable, children, @@ -297,9 +299,9 @@ function Pressable(props: Props, forwardedRef): React.Node { checked: ariaChecked ?? accessibilityState?.checked, disabled: ariaDisabled ?? accessibilityState?.disabled, expanded: ariaExpanded ?? accessibilityState?.expanded, + multiselectable: ariaMultiselectable ?? accessibilityState?.multiselectable, // Win32 + required: ariaRequired ?? accessibilityState?.required, // Win32 selected: ariaSelected ?? accessibilityState?.selected, - multiselectable: accessibilityState?.multiselectable, - required: accessibilityState?.required, }; _accessibilityState = diff --git a/packages/@office-iss/react-native-win32/src/Libraries/Components/TextInput/TextInput.win32.js b/packages/@office-iss/react-native-win32/src/Libraries/Components/TextInput/TextInput.win32.js index d4f94d4a600..11b296b5529 100644 --- a/packages/@office-iss/react-native-win32/src/Libraries/Components/TextInput/TextInput.win32.js +++ b/packages/@office-iss/react-native-win32/src/Libraries/Components/TextInput/TextInput.win32.js @@ -1142,6 +1142,8 @@ function InternalTextInput(props: Props): React.Node { 'aria-disabled': ariaDisabled, 'aria-expanded': ariaExpanded, 'aria-selected': ariaSelected, + 'aria-multiselectable': ariaMultiselectable, // Win32 + 'aria-required': ariaRequired, // Win32 accessibilityState, id, tabIndex, @@ -1524,6 +1526,8 @@ function InternalTextInput(props: Props): React.Node { ariaChecked != null || ariaDisabled != null || ariaExpanded != null || + ariaMultiselectable != null || + ariaRequired != null || ariaSelected != null ) { _accessibilityState = { @@ -1531,9 +1535,9 @@ function InternalTextInput(props: Props): React.Node { checked: ariaChecked ?? accessibilityState?.checked, disabled: ariaDisabled ?? accessibilityState?.disabled, expanded: ariaExpanded ?? accessibilityState?.expanded, + multiselectable: ariaMultiselectable ?? accessibilityState?.multiselectable, // Win32 + required: ariaRequired ?? accessibilityState?.required, // Win32 selected: ariaSelected ?? accessibilityState?.selected, - multiselectable: accessibilityState?.multiselectable, - required: accessibilityState?.required, }; } diff --git a/packages/@office-iss/react-native-win32/src/Libraries/Components/View/View.win32.js b/packages/@office-iss/react-native-win32/src/Libraries/Components/View/View.win32.js index f3cf062311c..7c6544b83c6 100644 --- a/packages/@office-iss/react-native-win32/src/Libraries/Components/View/View.win32.js +++ b/packages/@office-iss/react-native-win32/src/Libraries/Components/View/View.win32.js @@ -58,7 +58,9 @@ const View: React.AbstractComponent< 'aria-labelledby': ariaLabelledBy, 'aria-level': ariaLevel, // Win32 'aria-live': ariaLive, + 'aria-multiselectable': ariaMultiselectable, // Win32 'aria-posinset': ariaPosinset, // Win32 + 'aria-required': ariaRequired, // Win32 'aria-selected': ariaSelected, 'aria-setsize': ariaSetsize, // Win32 'aria-valuemax': ariaValueMax, @@ -85,6 +87,8 @@ const View: React.AbstractComponent< ariaChecked != null || ariaDisabled != null || ariaExpanded != null || + ariaMultiselectable != null || + ariaRequired != null || ariaSelected != null ) { _accessibilityState = { @@ -92,9 +96,9 @@ const View: React.AbstractComponent< checked: ariaChecked ?? accessibilityState?.checked, disabled: ariaDisabled ?? accessibilityState?.disabled, expanded: ariaExpanded ?? accessibilityState?.expanded, + multiselectable: ariaMultiselectable ?? accessibilityState?.multiselectable, // Win32 + required: ariaRequired ?? accessibilityState?.required, // Win32 selected: ariaSelected ?? accessibilityState?.selected, - multiselectable: accessibilityState?.multiselectable, - required: accessibilityState?.required, }; } let _accessibilityValue; diff --git a/packages/@office-iss/react-native-win32/src/Libraries/Components/View/ViewAccessibility.d.ts b/packages/@office-iss/react-native-win32/src/Libraries/Components/View/ViewAccessibility.d.ts index b7c84831b96..c3c546c5bbc 100644 --- a/packages/@office-iss/react-native-win32/src/Libraries/Components/View/ViewAccessibility.d.ts +++ b/packages/@office-iss/react-native-win32/src/Libraries/Components/View/ViewAccessibility.d.ts @@ -57,6 +57,8 @@ export interface AccessibilityProps 'aria-checked'?: boolean | 'mixed' | undefined; 'aria-disabled'?: boolean | undefined; 'aria-expanded'?: boolean | undefined; + 'aria-multiselectable'?: boolean | undefined; // Win32 + 'aria-required'?: boolean | undefined; // Win32 'aria-selected'?: boolean | undefined; /** diff --git a/packages/@office-iss/react-native-win32/src/Libraries/Components/View/ViewPropTypes.win32.js b/packages/@office-iss/react-native-win32/src/Libraries/Components/View/ViewPropTypes.win32.js index 1e35f1656b1..0f5701046a7 100644 --- a/packages/@office-iss/react-native-win32/src/Libraries/Components/View/ViewPropTypes.win32.js +++ b/packages/@office-iss/react-native-win32/src/Libraries/Components/View/ViewPropTypes.win32.js @@ -483,6 +483,8 @@ type WindowsViewProps = $ReadOnly<{| 'aria-level'?: ?number, 'aria-controls'?: ?Stringish, 'aria-describedby'?: ?Stringish, + 'aria-multiselectable'?: ?boolean, + 'aria-required'?: ?boolean, /** * Specifies if the control should show System focus visuals diff --git a/packages/@office-iss/react-native-win32/src/Libraries/Image/Image.win32.js b/packages/@office-iss/react-native-win32/src/Libraries/Image/Image.win32.js index 37e80d92deb..a0da8996023 100644 --- a/packages/@office-iss/react-native-win32/src/Libraries/Image/Image.win32.js +++ b/packages/@office-iss/react-native-win32/src/Libraries/Image/Image.win32.js @@ -173,6 +173,8 @@ const BaseImage = (props: ImagePropsType, forwardedRef) => { 'aria-checked': ariaChecked, 'aria-disabled': ariaDisabled, 'aria-expanded': ariaExpanded, + 'aria-multiselectable': ariaMultiselectable, // Win32 + 'aria-required': ariaRequired, // Win32 'aria-selected': ariaSelected, height, src, @@ -185,9 +187,9 @@ const BaseImage = (props: ImagePropsType, forwardedRef) => { checked: ariaChecked ?? props.accessibilityState?.checked, disabled: ariaDisabled ?? props.accessibilityState?.disabled, expanded: ariaExpanded ?? props.accessibilityState?.expanded, + multiselectable: ariaMultiselectable ?? accessibilityState?.multiselectable, // Win32 + required: ariaRequired ?? accessibilityState?.required, // Win32 selected: ariaSelected ?? props.accessibilityState?.selected, - multiselectable: props.accessibilityState?.multiselectable, - required: props.accessibilityState?.required, }; const accessibilityLabel = props['aria-label'] ?? props.accessibilityLabel; diff --git a/packages/@office-iss/react-native-win32/src/Libraries/Text/Text.win32.js b/packages/@office-iss/react-native-win32/src/Libraries/Text/Text.win32.js index 93b00da3996..fb1cc8ed97f 100644 --- a/packages/@office-iss/react-native-win32/src/Libraries/Text/Text.win32.js +++ b/packages/@office-iss/react-native-win32/src/Libraries/Text/Text.win32.js @@ -50,7 +50,9 @@ const Text: React.AbstractComponent< 'aria-expanded': ariaExpanded, 'aria-label': ariaLabel, 'aria-level': ariaLevel, // Win32 + 'aria-multiselectable': ariaMultiselectable, // Win32 'aria-posinset': ariaPosinset, // Win32 + 'aria-required': ariaRequired, // Win32 'aria-selected': ariaSelected, 'aria-setsize': ariaSetsize, // Win32 ellipsizeMode, @@ -80,6 +82,8 @@ const Text: React.AbstractComponent< ariaChecked != null || ariaDisabled != null || ariaExpanded != null || + ariaMultiselectable != null || + ariaRequired != null || ariaSelected != null ) { _accessibilityState = { @@ -87,9 +91,9 @@ const Text: React.AbstractComponent< checked: ariaChecked ?? accessibilityState?.checked, disabled: ariaDisabled ?? accessibilityState?.disabled, expanded: ariaExpanded ?? accessibilityState?.expanded, + multiselectable: ariaMultiselectable ?? accessibilityState?.multiselectable, // Win32 + required: ariaRequired ?? accessibilityState?.required, // Win32 selected: ariaSelected ?? accessibilityState?.selected, - multiselectable: accessibilityState?.multiselectable, - required: accessibilityState?.required, }; } From ae95d2c42321853a2531355db5634b03557138ae Mon Sep 17 00:00:00 2001 From: Krystal Kramer Date: Mon, 21 Aug 2023 09:59:06 -0400 Subject: [PATCH 06/11] edit change file comment --- ...react-native-win32-7fd6b7f9-9ded-4985-87b5-70b02f87b6c1.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/change/@office-iss-react-native-win32-7fd6b7f9-9ded-4985-87b5-70b02f87b6c1.json b/change/@office-iss-react-native-win32-7fd6b7f9-9ded-4985-87b5-70b02f87b6c1.json index 570c51e6459..f1a2dccfe31 100644 --- a/change/@office-iss-react-native-win32-7fd6b7f9-9ded-4985-87b5-70b02f87b6c1.json +++ b/change/@office-iss-react-native-win32-7fd6b7f9-9ded-4985-87b5-70b02f87b6c1.json @@ -1,6 +1,6 @@ { "type": "prerelease", - "comment": "add missing a11yState props on win32", + "comment": "fix a11yState and add support for aria-required and -multiselectable", "packageName": "@office-iss/react-native-win32", "email": "krsiler@microsoft.com", "dependentChangeType": "patch" From 0a4922f9603e28944c854fee16066bd1bddb8108 Mon Sep 17 00:00:00 2001 From: Krystal Kramer Date: Mon, 21 Aug 2023 10:04:04 -0400 Subject: [PATCH 07/11] Add win32 comment tags --- .../src/Libraries/Components/View/ViewAccessibility.win32.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/@office-iss/react-native-win32/src/Libraries/Components/View/ViewAccessibility.win32.js b/packages/@office-iss/react-native-win32/src/Libraries/Components/View/ViewAccessibility.win32.js index caebbb930cf..6736dd38e6e 100644 --- a/packages/@office-iss/react-native-win32/src/Libraries/Components/View/ViewAccessibility.win32.js +++ b/packages/@office-iss/react-native-win32/src/Libraries/Components/View/ViewAccessibility.win32.js @@ -152,8 +152,8 @@ export type AccessibilityState = { checked?: ?boolean | 'mixed', busy?: boolean, expanded?: boolean, - multiselectable?: boolean, - required?: boolean, + multiselectable?: boolean, // Win32 + required?: boolean, // Win32 ... }; From f7fb2fe1fbe3fb11819f67c3c2a9db7712bfa327 Mon Sep 17 00:00:00 2001 From: Krystal Kramer Date: Mon, 21 Aug 2023 12:42:56 -0400 Subject: [PATCH 08/11] lint fix --- .../src/Libraries/Components/Button.win32.js | 3 ++- .../src/Libraries/Components/TextInput/TextInput.win32.js | 3 ++- .../src/Libraries/Components/View/View.win32.js | 3 ++- .../react-native-win32/src/Libraries/Text/Text.win32.js | 3 ++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/packages/@office-iss/react-native-win32/src/Libraries/Components/Button.win32.js b/packages/@office-iss/react-native-win32/src/Libraries/Components/Button.win32.js index 1f5320104f7..1d86951f9fd 100644 --- a/packages/@office-iss/react-native-win32/src/Libraries/Components/Button.win32.js +++ b/packages/@office-iss/react-native-win32/src/Libraries/Components/Button.win32.js @@ -329,7 +329,8 @@ class Button extends React.Component { checked: ariaChecked ?? accessibilityState?.checked, disabled: ariaDisabled ?? accessibilityState?.disabled, expanded: ariaExpanded ?? accessibilityState?.expanded, - multiselectable: ariaMultiselectable ?? accessibilityState?.multiselectable, // Win32 + multiselectable: + ariaMultiselectable ?? accessibilityState?.multiselectable, // Win32 required: ariaRequired ?? accessibilityState?.required, // Win32 selected: ariaSelected ?? accessibilityState?.selected, }; diff --git a/packages/@office-iss/react-native-win32/src/Libraries/Components/TextInput/TextInput.win32.js b/packages/@office-iss/react-native-win32/src/Libraries/Components/TextInput/TextInput.win32.js index 11b296b5529..ecb111eb92f 100644 --- a/packages/@office-iss/react-native-win32/src/Libraries/Components/TextInput/TextInput.win32.js +++ b/packages/@office-iss/react-native-win32/src/Libraries/Components/TextInput/TextInput.win32.js @@ -1535,7 +1535,8 @@ function InternalTextInput(props: Props): React.Node { checked: ariaChecked ?? accessibilityState?.checked, disabled: ariaDisabled ?? accessibilityState?.disabled, expanded: ariaExpanded ?? accessibilityState?.expanded, - multiselectable: ariaMultiselectable ?? accessibilityState?.multiselectable, // Win32 + multiselectable: + ariaMultiselectable ?? accessibilityState?.multiselectable, // Win32 required: ariaRequired ?? accessibilityState?.required, // Win32 selected: ariaSelected ?? accessibilityState?.selected, }; diff --git a/packages/@office-iss/react-native-win32/src/Libraries/Components/View/View.win32.js b/packages/@office-iss/react-native-win32/src/Libraries/Components/View/View.win32.js index 7c6544b83c6..5ef908fdd23 100644 --- a/packages/@office-iss/react-native-win32/src/Libraries/Components/View/View.win32.js +++ b/packages/@office-iss/react-native-win32/src/Libraries/Components/View/View.win32.js @@ -96,7 +96,8 @@ const View: React.AbstractComponent< checked: ariaChecked ?? accessibilityState?.checked, disabled: ariaDisabled ?? accessibilityState?.disabled, expanded: ariaExpanded ?? accessibilityState?.expanded, - multiselectable: ariaMultiselectable ?? accessibilityState?.multiselectable, // Win32 + multiselectable: + ariaMultiselectable ?? accessibilityState?.multiselectable, // Win32 required: ariaRequired ?? accessibilityState?.required, // Win32 selected: ariaSelected ?? accessibilityState?.selected, }; diff --git a/packages/@office-iss/react-native-win32/src/Libraries/Text/Text.win32.js b/packages/@office-iss/react-native-win32/src/Libraries/Text/Text.win32.js index fb1cc8ed97f..9873e70791c 100644 --- a/packages/@office-iss/react-native-win32/src/Libraries/Text/Text.win32.js +++ b/packages/@office-iss/react-native-win32/src/Libraries/Text/Text.win32.js @@ -91,7 +91,8 @@ const Text: React.AbstractComponent< checked: ariaChecked ?? accessibilityState?.checked, disabled: ariaDisabled ?? accessibilityState?.disabled, expanded: ariaExpanded ?? accessibilityState?.expanded, - multiselectable: ariaMultiselectable ?? accessibilityState?.multiselectable, // Win32 + multiselectable: + ariaMultiselectable ?? accessibilityState?.multiselectable, // Win32 required: ariaRequired ?? accessibilityState?.required, // Win32 selected: ariaSelected ?? accessibilityState?.selected, }; From e43b4ed41e1d7278413599bc57fbc0e7e5d077b7 Mon Sep 17 00:00:00 2001 From: Krystal Kramer Date: Mon, 21 Aug 2023 13:53:36 -0400 Subject: [PATCH 09/11] fix lint errors --- .../src/Libraries/Components/Button.win32.js | 2 ++ .../src/Libraries/Components/Pressable/Pressable.win32.js | 2 ++ .../src/Libraries/Components/Text/TextWin32.Props.ts | 2 ++ .../react-native-win32/src/Libraries/Image/Image.win32.js | 5 +++-- 4 files changed, 9 insertions(+), 2 deletions(-) diff --git a/packages/@office-iss/react-native-win32/src/Libraries/Components/Button.win32.js b/packages/@office-iss/react-native-win32/src/Libraries/Components/Button.win32.js index 1d86951f9fd..3a7d0c3d6b8 100644 --- a/packages/@office-iss/react-native-win32/src/Libraries/Components/Button.win32.js +++ b/packages/@office-iss/react-native-win32/src/Libraries/Components/Button.win32.js @@ -163,6 +163,8 @@ type ButtonProps = $ReadOnly<{| 'aria-disabled'?: ?boolean, 'aria-expanded'?: ?boolean, 'aria-selected'?: ?boolean, + 'aria-multiselectable'?: ?boolean, // Win32 + 'aria-required'?: ?boolean, // Win32 /** * [Android] Controlling if a view fires accessibility events and if it is reported to accessibility services. diff --git a/packages/@office-iss/react-native-win32/src/Libraries/Components/Pressable/Pressable.win32.js b/packages/@office-iss/react-native-win32/src/Libraries/Components/Pressable/Pressable.win32.js index 15d9b8b36e8..85b27be3544 100644 --- a/packages/@office-iss/react-native-win32/src/Libraries/Components/Pressable/Pressable.win32.js +++ b/packages/@office-iss/react-native-win32/src/Libraries/Components/Pressable/Pressable.win32.js @@ -74,6 +74,8 @@ type Props = $ReadOnly<{| 'aria-disabled'?: ?boolean, 'aria-expanded'?: ?boolean, 'aria-selected'?: ?boolean, + 'aria-multiselectable'?: ?boolean, // Win32 + 'aria-required'?: ?boolean, // Win32 /** * A value indicating whether the accessibility elements contained within * this accessibility element are hidden. diff --git a/packages/@office-iss/react-native-win32/src/Libraries/Components/Text/TextWin32.Props.ts b/packages/@office-iss/react-native-win32/src/Libraries/Components/Text/TextWin32.Props.ts index 17a9d8ffbbf..46e4932d76e 100644 --- a/packages/@office-iss/react-native-win32/src/Libraries/Components/Text/TextWin32.Props.ts +++ b/packages/@office-iss/react-native-win32/src/Libraries/Components/Text/TextWin32.Props.ts @@ -19,6 +19,8 @@ export type TextWin32TextStyle = | 'HugeStandard'; export interface ITextWin32Props extends RN.TextProps { + 'aria-multiselectable'?: boolean | undefined; // Win32 + 'aria-required'?: boolean | undefined; // Win32 onKeyDown?: (args: IKeyboardEvent) => void; onKeyDownCapture?: (args: IKeyboardEvent) => void; onKeyUp?: (args: IKeyboardEvent) => void; diff --git a/packages/@office-iss/react-native-win32/src/Libraries/Image/Image.win32.js b/packages/@office-iss/react-native-win32/src/Libraries/Image/Image.win32.js index a0da8996023..c15c6f90c7a 100644 --- a/packages/@office-iss/react-native-win32/src/Libraries/Image/Image.win32.js +++ b/packages/@office-iss/react-native-win32/src/Libraries/Image/Image.win32.js @@ -187,8 +187,9 @@ const BaseImage = (props: ImagePropsType, forwardedRef) => { checked: ariaChecked ?? props.accessibilityState?.checked, disabled: ariaDisabled ?? props.accessibilityState?.disabled, expanded: ariaExpanded ?? props.accessibilityState?.expanded, - multiselectable: ariaMultiselectable ?? accessibilityState?.multiselectable, // Win32 - required: ariaRequired ?? accessibilityState?.required, // Win32 + multiselectable: + ariaMultiselectable ?? props.accessibilityState?.multiselectable, // Win32 + required: ariaRequired ?? props.accessibilityState?.required, // Win32 selected: ariaSelected ?? props.accessibilityState?.selected, }; const accessibilityLabel = props['aria-label'] ?? props.accessibilityLabel; From b2b3edfcf61f1d75824139e709890962d889a265 Mon Sep 17 00:00:00 2001 From: Krystal Kramer Date: Tue, 22 Aug 2023 10:54:53 -0400 Subject: [PATCH 10/11] add aria- props to textprops --- .../react-native-win32/src/Libraries/Text/TextProps.win32.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/@office-iss/react-native-win32/src/Libraries/Text/TextProps.win32.js b/packages/@office-iss/react-native-win32/src/Libraries/Text/TextProps.win32.js index ba428663ed1..a2f86b80133 100644 --- a/packages/@office-iss/react-native-win32/src/Libraries/Text/TextProps.win32.js +++ b/packages/@office-iss/react-native-win32/src/Libraries/Text/TextProps.win32.js @@ -96,6 +96,8 @@ export type TextProps = $ReadOnly<{| 'aria-disabled'?: ?boolean, 'aria-expanded'?: ?boolean, 'aria-selected'?: ?boolean, + 'aria-multiselectable'?: ?boolean, // Win32 + 'aria-required'?: ?boolean, // Win32 'aria-controls'?: ?Stringish, // Win32 'aria-describedby'?: ?Stringish, // Win32 'aria-description'?: ?Stringish, // Win32 From d109498758b2fc0850b15f8485bb310903768a31 Mon Sep 17 00:00:00 2001 From: Krystal Kramer Date: Wed, 23 Aug 2023 14:37:21 -0400 Subject: [PATCH 11/11] remove unneeded props --- .../src/Libraries/Components/Text/TextWin32.Props.ts | 2 -- 1 file changed, 2 deletions(-) diff --git a/packages/@office-iss/react-native-win32/src/Libraries/Components/Text/TextWin32.Props.ts b/packages/@office-iss/react-native-win32/src/Libraries/Components/Text/TextWin32.Props.ts index 46e4932d76e..17a9d8ffbbf 100644 --- a/packages/@office-iss/react-native-win32/src/Libraries/Components/Text/TextWin32.Props.ts +++ b/packages/@office-iss/react-native-win32/src/Libraries/Components/Text/TextWin32.Props.ts @@ -19,8 +19,6 @@ export type TextWin32TextStyle = | 'HugeStandard'; export interface ITextWin32Props extends RN.TextProps { - 'aria-multiselectable'?: boolean | undefined; // Win32 - 'aria-required'?: boolean | undefined; // Win32 onKeyDown?: (args: IKeyboardEvent) => void; onKeyDownCapture?: (args: IKeyboardEvent) => void; onKeyUp?: (args: IKeyboardEvent) => void;