react-native-windows 0.72.0-preview.5 → 0.72.0-preview.6

package/Libraries/Components/TextInput/TextInput.windows.js

@@ -1527,6 +1527,12 @@ function InternalTextInput(props: Props): React.Node {
     };
   }
 
+  if (focusable && !accessible) {
+    console.warn(
+      'All focusable views should report proper accessiblity information. TextInputs marked as focusable should always be accessible.',
+    );
+  }
+
   // $FlowFixMe[underconstrained-implicit-instantiation]
   let style = flattenStyle(props.style);
 

package/Libraries/Components/View/View.windows.js

@@ -183,6 +183,19 @@ const View: React.AbstractComponent<
         return updatedChildren;
       }
     };
+
+    const _focusable = tabIndex !== undefined ? !tabIndex : focusable;
+    const _accessible =
+      importantForAccessibility === 'no-hide-descendants'
+        ? false
+        : otherProps.accessible;
+
+    if (_focusable === true && _accessible === false) {
+      console.warn(
+        'All focusable views should report proper accessiblity information. Views marked as focusable should always be accessible.',
+      );
+    }
+
     // Windows]
 
     return (
@@ -205,7 +218,7 @@ const View: React.AbstractComponent<
                   : ariaLive ?? accessibilityLiveRegion
               }
               accessibilityLabel={ariaLabel ?? accessibilityLabel}
-              focusable={tabIndex !== undefined ? !tabIndex : focusable}
+              focusable={_focusable}
               disabled={disabled}
               accessibilityState={_accessibilityState}
               accessibilityRole={
@@ -230,11 +243,7 @@ const View: React.AbstractComponent<
               onKeyUp={_keyUp}
               onKeyUpCapture={_keyUpCapture}
               // [Windows
-              accessible={
-                importantForAccessibility === 'no-hide-descendants'
-                  ? false
-                  : otherProps.accessible
-              }
+              accessible={_accessible}
               children={
                 importantForAccessibility === 'no-hide-descendants'
                   ? childrenWithImportantForAccessibility(otherProps.children)

package/Libraries/Text/Text.windows.js

@@ -208,6 +208,7 @@ const Text: React.AbstractComponent<
 
   const _accessible = Platform.select({
     ios: accessible !== false,
+    windows: accessible !== false,
     default: accessible,
   });
 
@@ -307,13 +308,26 @@ const Text: React.AbstractComponent<
             <NativeText
               {...textPropsLessStyle}
               {...eventHandlersForText}
-              accessible={accessible !== false}
+              accessibilityLabel={ariaLabel ?? accessibilityLabel}
+              accessibilityRole={
+                role ? getAccessibilityRoleFromRole(role) : accessibilityRole
+              }
+              accessibilityState={nativeTextAccessibilityState}
+              accessible={
+                accessible == null && Platform.OS === 'android'
+                  ? _hasOnPressOrOnLongPress
+                  : _accessible
+              }
               allowFontScaling={allowFontScaling !== false}
+              disabled={_disabled}
               ellipsizeMode={ellipsizeMode ?? 'tail'}
               isHighlighted={isHighlighted}
+              nativeID={id ?? nativeID}
+              numberOfLines={numberOfLines}
+              ref={forwardedRef}
+              selectable={_selectable}
               selectionColor={selectionColor}
               style={((rest: any): TextStyleProp)}
-              ref={forwardedRef}
             />
           </TextAncestor.Provider>
         </View>
@@ -324,13 +338,26 @@ const Text: React.AbstractComponent<
           <NativeText
             {...restProps}
             {...eventHandlersForText}
-            accessible={accessible !== false}
+            accessibilityLabel={ariaLabel ?? accessibilityLabel}
+            accessibilityRole={
+              role ? getAccessibilityRoleFromRole(role) : accessibilityRole
+            }
+            accessibilityState={nativeTextAccessibilityState}
+            accessible={
+              accessible == null && Platform.OS === 'android'
+                ? _hasOnPressOrOnLongPress
+                : _accessible
+            }
             allowFontScaling={allowFontScaling !== false}
+            disabled={_disabled}
             ellipsizeMode={ellipsizeMode ?? 'tail'}
             isHighlighted={isHighlighted}
+            nativeID={id ?? nativeID}
+            numberOfLines={numberOfLines}
+            ref={forwardedRef}
+            selectable={_selectable}
             selectionColor={selectionColor}
             style={style}
-            ref={forwardedRef}
           />
         </TextAncestor.Provider>
       );

package/Microsoft.ReactNative/Views/ControlViewManager.cpp

@@ -125,12 +125,9 @@ void ControlViewManager::SetLayoutProps(
 
 void ControlViewManager::OnPropertiesUpdated(ShadowNodeBase *node) {
   auto control(node->GetView().as<xaml::Controls::Control>());
-
-  // If developer specifies either the accessible and focusable prop to be false
-  // remove accessibility and keyboard focus for component.
-  const auto isTabStop = !node->IsDisable() && (node->IsAccessible() && node->IsFocusable());
-  const auto accessibilityView =
-      isTabStop ? xaml::Automation::Peers::AccessibilityView::Content : xaml::Automation::Peers::AccessibilityView::Raw;
+  const auto isTabStop = !node->IsDisable() && node->IsFocusable();
+  const auto accessibilityView = node->IsAccessible() ? xaml::Automation::Peers::AccessibilityView::Content
+                                                      : xaml::Automation::Peers::AccessibilityView::Raw;
   control.IsTabStop(isTabStop);
   xaml::Automation::AutomationProperties::SetAccessibilityView(control, accessibilityView);
 }

package/Microsoft.ReactNative/Views/ViewViewManager.cpp

@@ -595,20 +595,13 @@ void ViewViewManager::TryUpdateView(
 }
 
 void ViewViewManager::SyncFocusableAndAccessible(ViewShadowNode *pViewShadowNode, bool useControl) {
-  // If developer specifies either the accessible and focusable prop to be false
-  // remove accessibility and keyboard focus for component. Exception is made
-  // for case where a View with undefined onPress is specified, where
-  // component gains accessibility focus when either the accessible and focusable prop are true.
   if (useControl) {
     const auto isFocusable = pViewShadowNode->IsFocusable();
     const auto isAccessible = pViewShadowNode->IsAccessible();
-    const auto isPressable = pViewShadowNode->OnClick();
     const auto isDisabled = pViewShadowNode->IsDisable();
-    const auto isTabStop =
-        (!isDisabled &&
-         ((isPressable && isFocusable && isAccessible) || (!isPressable && (isFocusable || isAccessible))));
-    const auto accessibilityView = isTabStop ? xaml::Automation::Peers::AccessibilityView::Content
-                                             : xaml::Automation::Peers::AccessibilityView::Raw;
+    const auto isTabStop = !isDisabled && isFocusable;
+    const auto accessibilityView = isAccessible ? xaml::Automation::Peers::AccessibilityView::Content
+                                                : xaml::Automation::Peers::AccessibilityView::Raw;
     pViewShadowNode->GetControl().IsTabStop(isTabStop);
     xaml::Automation::AutomationProperties::SetAccessibilityView(pViewShadowNode->GetControl(), accessibilityView);
   }

package/PropertySheets/Generated/PackageVersion.g.props

@@ -10,11 +10,11 @@
 -->
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <ReactNativeWindowsVersion>0.72.0-preview.5</ReactNativeWindowsVersion>
+    <ReactNativeWindowsVersion>0.72.0-preview.6</ReactNativeWindowsVersion>
     <ReactNativeWindowsMajor>0</ReactNativeWindowsMajor>
     <ReactNativeWindowsMinor>72</ReactNativeWindowsMinor>
     <ReactNativeWindowsPatch>0</ReactNativeWindowsPatch>
     <ReactNativeWindowsCanary>false</ReactNativeWindowsCanary>
-    <ReactNativeWindowsCommitId>1fe020c840d9e24856d7efabe16e21878f5a5b73</ReactNativeWindowsCommitId>
+    <ReactNativeWindowsCommitId>b9a2d51896667aadcd9a7c497631ca96fe0d1ca4</ReactNativeWindowsCommitId>
   </PropertyGroup>
 </Project>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-windows",
-  "version": "0.72.0-preview.5",
+  "version": "0.72.0-preview.6",
   "license": "MIT",
   "repository": {
     "type": "git",