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

package/Directory.Build.props

@@ -66,8 +66,9 @@
   </PropertyGroup>
 
   <PropertyGroup Label="NuGet" Condition="'$(MSBuildProjectExtension)' == '.vcxproj'">
-    <!--See https://docs.microsoft.com/en-us/nuget/reference/msbuild-targets#restore-target-->
-    <RestoreUseStaticGraphEvaluation Condition="'$(BuildingInsideVisualStudio)' == 'true' AND '$(DisableRestoreUseStaticGraphEvaluation)' != 'true'">true</RestoreUseStaticGraphEvaluation>
+    <!-- See https://docs.microsoft.com/en-us/nuget/reference/msbuild-targets#restore-target -->
+    <!-- RestoreUseStaticGraphEvaluation broke in VS 17.6, see https://github.com/microsoft/react-native-windows/issues/11670 -->
+    <RestoreUseStaticGraphEvaluation Condition="'$(BuildingInsideVisualStudio)' == 'true' AND $([MSBuild]::VersionLessThan('$(MSBuildVersion)', '17.6')) AND '$(DisableRestoreUseStaticGraphEvaluation)' != 'true'">true</RestoreUseStaticGraphEvaluation>
   </PropertyGroup>
 
 </Project>

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/IReactContext.cpp

@@ -65,6 +65,10 @@ hstring ReactSettingsSnapshot::BundleAppId() const noexcept {
   return winrt::to_hstring(m_settings->BundleAppId());
 }
 
+bool ReactSettingsSnapshot::RequestDevBundle() const noexcept {
+  return m_settings->RequestDevBundle();
+}
+
 Mso::React::IReactSettingsSnapshot const &ReactSettingsSnapshot::GetInner() const noexcept {
   return *m_settings;
 }

package/Microsoft.ReactNative/IReactContext.h

@@ -24,6 +24,7 @@ struct ReactSettingsSnapshot : winrt::implements<ReactSettingsSnapshot, IReactSe
   bool RequestInlineSourceMap() const noexcept;
   hstring JavaScriptBundleFile() const noexcept;
   hstring BundleAppId() const noexcept;
+  bool RequestDevBundle() const noexcept;
 
  public:
   // Internal accessor for within the Microsoft.ReactNative dll to allow calling into internal methods

package/Microsoft.ReactNative/IReactContext.idl

@@ -125,6 +125,12 @@ namespace Microsoft.ReactNative
       "at the time when the React instance was created.\n"
       "The name of the app passed to the packager server via the 'app' query parameter.")
     String BundleAppId { get; };
+
+    DOC_STRING(
+      "A read-only snapshot of the @ReactInstanceSettings.RequestDevBundle property value "
+      "at the time when the React instance was created.\n"
+      "When querying the bundle server for a bundle, should it request the dev bundle or release bundle.")
+    Boolean RequestDevBundle { get; };
   }
 
   [webhosthidden]

package/Microsoft.ReactNative/ReactHost/MsoReactContext.cpp

@@ -100,6 +100,13 @@ std::string ReactSettingsSnapshot::BundleAppId() const noexcept {
   return {};
 }
 
+bool ReactSettingsSnapshot::RequestDevBundle() const noexcept {
+  if (auto instance = m_reactInstance.GetStrongPtr()) {
+    return instance->RequestDevBundle();
+  }
+  return {};
+}
+
 JSIEngine ReactSettingsSnapshot::JsiEngine() const noexcept {
   if (auto instance = m_reactInstance.GetStrongPtr()) {
     return instance->JsiEngine();

package/Microsoft.ReactNative/ReactHost/MsoReactContext.h

@@ -30,6 +30,7 @@ class ReactSettingsSnapshot final : public Mso::UnknownObject<IReactSettingsSnap
   bool RequestInlineSourceMap() const noexcept override;
   std::string JavaScriptBundleFile() const noexcept override;
   std::string BundleAppId() const noexcept override;
+  bool RequestDevBundle() const noexcept override;
   bool UseDeveloperSupport() const noexcept override;
   JSIEngine JsiEngine() const noexcept override;
 

package/Microsoft.ReactNative/ReactHost/React.h

@@ -105,6 +105,7 @@ struct IReactSettingsSnapshot : IUnknown {
   virtual bool RequestInlineSourceMap() const noexcept = 0;
   virtual std::string JavaScriptBundleFile() const noexcept = 0;
   virtual std::string BundleAppId() const noexcept = 0;
+  virtual bool RequestDevBundle() const noexcept = 0;
   virtual bool UseDeveloperSupport() const noexcept = 0;
   virtual JSIEngine JsiEngine() const noexcept = 0;
 };
@@ -152,6 +153,7 @@ struct ReactDevOptions {
   std::string SourceBundleName; // Bundle name without any extension (e.g. "index.win32"). Default: "index.{PLATFORM}"
   std::string SourceBundleExtension; // Bundle name extension. Default: ".bundle".
   std::string BundleAppId; // Bundle app id. Default: "".
+  bool DevBundle{true}; // When requesting bundle from bundle server, query for dev bundle or release bundle
 
   //! Module name used for loading the debug bundle.
   //! e.g. The modules name registered in the jsbundle via AppRegistry.registerComponent('ModuleName', () =>

package/Microsoft.ReactNative/ReactHost/ReactInstanceWin.cpp

@@ -451,6 +451,7 @@ void ReactInstanceWin::Initialize() noexcept {
           devSettings->debuggerAttachCallback = GetDebuggerAttachCallback();
           devSettings->enableDefaultCrashHandler = m_options.EnableDefaultCrashHandler();
           devSettings->bundleAppId = BundleAppId();
+          devSettings->devBundle = RequestDevBundle();
           devSettings->showDevMenuCallback = [weakThis]() noexcept {
             if (auto strongThis = weakThis.GetStrongPtr()) {
               strongThis->m_uiQueue->Post(
@@ -1166,6 +1167,10 @@ std::string ReactInstanceWin::BundleAppId() const noexcept {
   return m_options.DeveloperSettings.BundleAppId;
 }
 
+bool ReactInstanceWin::RequestDevBundle() const noexcept {
+  return m_options.DeveloperSettings.DevBundle;
+}
+
 bool ReactInstanceWin::UseDeveloperSupport() const noexcept {
   return m_options.UseDeveloperSupport();
 }

package/Microsoft.ReactNative/ReactHost/ReactInstanceWin.h

@@ -80,6 +80,7 @@ class ReactInstanceWin final : public Mso::ActiveObject<IReactInstanceInternal>
   bool RequestInlineSourceMap() const noexcept;
   std::string JavaScriptBundleFile() const noexcept;
   std::string BundleAppId() const noexcept;
+  bool RequestDevBundle() const noexcept;
   bool UseDeveloperSupport() const noexcept;
   JSIEngine JsiEngine() const noexcept;
 

package/Microsoft.ReactNative/ReactInstanceSettings.h

@@ -66,6 +66,10 @@ struct ReactInstanceSettings : ReactInstanceSettingsT<ReactInstanceSettings> {
   hstring BundleAppId() noexcept;
   void BundleAppId(hstring const &value) noexcept;
 
+  //! When querying the bundle server for a bundle, should it request the dev bundle or release bundle
+  bool RequestDevBundle() noexcept;
+  void RequestDevBundle(bool value) noexcept;
+
   //! Should the instance run in a remote environment such as within a browser
   //! By default, this is using a browser navigated to  http://localhost:8081/debugger-ui served
   //! by Metro/Haul. Debugging will start as soon as the React Native instance is loaded.
@@ -174,6 +178,7 @@ struct ReactInstanceSettings : ReactInstanceSettingsT<ReactInstanceSettings> {
       single_threaded_vector<IReactPackageProvider>()};
   hstring m_javaScriptBundleFile{};
   hstring m_bundleAppId{};
+  bool m_devBundle{true};
   bool m_enableJITCompilation{true};
   bool m_enableByteCodeCaching{false};
   hstring m_byteCodeFileUri{};
@@ -239,6 +244,14 @@ inline void ReactInstanceSettings::BundleAppId(hstring const &value) noexcept {
   m_bundleAppId = value;
 }
 
+inline bool ReactInstanceSettings::RequestDevBundle() noexcept {
+  return m_devBundle;
+}
+
+inline void ReactInstanceSettings::RequestDevBundle(bool value) noexcept {
+  m_devBundle = value;
+}
+
 inline bool ReactInstanceSettings::EnableJITCompilation() noexcept {
   return m_enableJITCompilation;
 }

package/Microsoft.ReactNative/ReactInstanceSettings.idl

@@ -111,6 +111,10 @@ namespace Microsoft.ReactNative
       "If no value is set, the parameter will not be passed.")
     String BundleAppId { get; set; };
 
+    DOC_STRING(
+      "When querying the bundle server for a bundle, should it request the dev bundle or release bundle.")
+    Boolean RequestDevBundle { get; set; };
+
     DOC_STRING(
       "Controls whether the instance JavaScript runs in a remote environment such as within a browser.\n"
       "By default, this is using a browser navigated to http://localhost:8081/debugger-ui served by Metro/Haul.\n"

package/Microsoft.ReactNative/ReactNativeHost.cpp

@@ -151,6 +151,7 @@ IAsyncAction ReactNativeHost::ReloadInstance() noexcept {
   reactOptions.DeveloperSettings.SourceBundlePort = m_instanceSettings.SourceBundlePort();
   reactOptions.DeveloperSettings.RequestInlineSourceMap = m_instanceSettings.RequestInlineSourceMap();
   reactOptions.DeveloperSettings.BundleAppId = to_string(m_instanceSettings.BundleAppId());
+  reactOptions.DeveloperSettings.DevBundle = m_instanceSettings.RequestDevBundle();
 
   reactOptions.ByteCodeFileUri = to_string(m_instanceSettings.ByteCodeFileUri());
   reactOptions.EnableByteCodeCaching = m_instanceSettings.EnableByteCodeCaching();

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/Microsoft.ReactNative.Managed/ReactSettingsSnapshot.cs

@@ -32,6 +32,8 @@ namespace Microsoft.ReactNative.Managed
 
     public bool UseWebDebugger => IsValid ? Handle.UseWebDebugger : false;
 
+    public bool RequestDevBundle => IsValid ? Handle.RequestDevBundle : true;
+
     public IReactSettingsSnapshot Handle { get; }
 
     public bool IsValid => Handle != null;

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.7</ReactNativeWindowsVersion>
     <ReactNativeWindowsMajor>0</ReactNativeWindowsMajor>
     <ReactNativeWindowsMinor>72</ReactNativeWindowsMinor>
     <ReactNativeWindowsPatch>0</ReactNativeWindowsPatch>
     <ReactNativeWindowsCanary>false</ReactNativeWindowsCanary>
-    <ReactNativeWindowsCommitId>1fe020c840d9e24856d7efabe16e21878f5a5b73</ReactNativeWindowsCommitId>
+    <ReactNativeWindowsCommitId>56e59fa610772e15646fa444a1fe246ed14ebfd3</ReactNativeWindowsCommitId>
   </PropertyGroup>
 </Project>

package/PropertySheets/NuGet.Cpp.props

@@ -9,8 +9,9 @@
 
   <PropertyGroup Label="NuGet">
     <!-- Should match entry in $(ReactNativeWindowsDir)vnext\Directory.Build.props -->
-    <!--See https://docs.microsoft.com/en-us/nuget/reference/msbuild-targets#restore-target-->
-    <RestoreUseStaticGraphEvaluation Condition="'$(BuildingInsideVisualStudio)' == 'true' AND '$(DisableRestoreUseStaticGraphEvaluation)' != 'true'">true</RestoreUseStaticGraphEvaluation>
+    <!-- See https://docs.microsoft.com/en-us/nuget/reference/msbuild-targets#restore-target -->
+    <!-- RestoreUseStaticGraphEvaluation broke in VS 17.6, see https://github.com/microsoft/react-native-windows/issues/11670 -->
+    <RestoreUseStaticGraphEvaluation Condition="'$(BuildingInsideVisualStudio)' == 'true' AND $([MSBuild]::VersionLessThan('$(MSBuildVersion)', '17.6')) AND '$(DisableRestoreUseStaticGraphEvaluation)' != 'true'">true</RestoreUseStaticGraphEvaluation>
 
     <!-- Ensure PackageReference compatibility for any consuming projects/apps -->
     <ResolveNuGetPackages>false</ResolveNuGetPackages>

package/Shared/DevSettings.h

@@ -95,6 +95,9 @@ struct DevSettings {
 
   bool inlineSourceMap{true};
 
+  // When querying the bundle server for a bundle, should it request the dev bundle or release bundle
+  bool devBundle{true};
+
   bool enableDefaultCrashHandler{false};
 };
 

package/Shared/OInstance.cpp

@@ -448,7 +448,7 @@ void InstanceImpl::loadBundleInternal(std::string &&jsBundleRelativePath, bool s
           m_devSettings->debugBundlePath.empty() ? jsBundleRelativePath : m_devSettings->debugBundlePath,
           m_devSettings->platformName,
           m_devSettings->bundleAppId,
-          true /* dev */,
+          m_devSettings->devBundle,
           m_devSettings->useFastRefresh,
           m_devSettings->inlineSourceMap,
           hermesBytecodeVersion);
@@ -470,8 +470,8 @@ void InstanceImpl::loadBundleInternal(std::string &&jsBundleRelativePath, bool s
           m_devSettings->debugBundlePath.empty() ? jsBundleRelativePath : m_devSettings->debugBundlePath,
           m_devSettings->platformName,
           m_devSettings->bundleAppId,
-          /*dev*/ true,
-          /*hot*/ false,
+          m_devSettings->devBundle,
+          m_devSettings->useFastRefresh,
           m_devSettings->inlineSourceMap,
           hermesBytecodeVersion);
 
@@ -607,7 +607,7 @@ std::vector<std::unique_ptr<NativeModule>> InstanceImpl::GetDefaultNativeModules
             m_devSettings->debugBundlePath,
             m_devSettings->platformName,
             m_devSettings->bundleAppId,
-            true /*dev*/,
+            m_devSettings->devBundle,
             m_devSettings->useFastRefresh,
             m_devSettings->inlineSourceMap,
             hermesBytecodeVersion)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-windows",
-  "version": "0.72.0-preview.5",
+  "version": "0.72.0-preview.7",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -26,7 +26,7 @@
     "@react-native-community/cli": "11.2.3",
     "@react-native-community/cli-platform-android": "11.2.3",
     "@react-native-community/cli-platform-ios": "11.2.3",
-    "@react-native-windows/cli": "0.72.0-preview.4",
+    "@react-native-windows/cli": "0.72.0-preview.5",
     "@react-native/assets": "1.0.0",
     "@react-native/assets-registry": "^0.72.0",
     "@react-native/codegen": "^0.72.3",