react-native-windows 0.0.0-canary.652 → 0.0.0-canary.653

package/.flowconfig

@@ -131,4 +131,4 @@ untyped-import
 untyped-type-import
 
 [version]
-^0.204.1
+^0.205.1

package/Libraries/Animated/NativeAnimatedHelper.js

@@ -28,9 +28,7 @@ import invariant from 'invariant';
 
 // TODO T69437152 @petetheheat - Delete this fork when Fabric ships to 100%.
 const NativeAnimatedModule =
-  Platform.OS === 'ios' && global.RN$Bridgeless === true
-    ? NativeAnimatedTurboModule
-    : NativeAnimatedNonTurboModule;
+  NativeAnimatedNonTurboModule ?? NativeAnimatedTurboModule;
 
 let __nativeAnimatedNodeTagCount = 1; /* used for animated nodes */
 let __nativeAnimationIdCount = 1; /* used for started animations */

package/Libraries/Animated/NativeAnimatedModule.js

@@ -11,6 +11,7 @@
 import type {TurboModule} from '../TurboModule/RCTExport';
 
 import * as TurboModuleRegistry from '../TurboModule/TurboModuleRegistry';
+import shouldUseTurboAnimatedModule from './shouldUseTurboAnimatedModule';
 
 type EndResult = {finished: boolean, ...};
 type EndCallback = (result: EndResult) => void;
@@ -70,4 +71,7 @@ export interface Spec extends TurboModule {
   +queueAndExecuteBatchedOperations?: (operationsAndArgs: Array<any>) => void;
 }
 
-export default (TurboModuleRegistry.get<Spec>('NativeAnimatedModule'): ?Spec);
+const NativeModule: ?Spec = !shouldUseTurboAnimatedModule()
+  ? TurboModuleRegistry.get<Spec>('NativeAnimatedModule')
+  : null;
+export default NativeModule;

package/Libraries/Animated/NativeAnimatedTurboModule.js

@@ -11,6 +11,7 @@
 import type {TurboModule} from '../TurboModule/RCTExport';
 
 import * as TurboModuleRegistry from '../TurboModule/TurboModuleRegistry';
+import shouldUseTurboAnimatedModule from './shouldUseTurboAnimatedModule';
 
 type EndResult = {finished: boolean, ...};
 type EndCallback = (result: EndResult) => void;
@@ -70,6 +71,8 @@ export interface Spec extends TurboModule {
   +queueAndExecuteBatchedOperations?: (operationsAndArgs: Array<any>) => void;
 }
 
-export default (TurboModuleRegistry.get<Spec>(
-  'NativeAnimatedTurboModule',
-): ?Spec);
+const NativeModule: ?Spec = shouldUseTurboAnimatedModule()
+  ? TurboModuleRegistry.get<Spec>('NativeAnimatedTurboModule')
+  : null;
+
+export default NativeModule;

package/Libraries/Animated/shouldUseTurboAnimatedModule.js

@@ -0,0 +1,17 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow
+ * @format
+ */
+
+import Platform from '../Utilities/Platform';
+
+function shouldUseTurboAnimatedModule(): boolean {
+  return Platform.OS === 'ios' && global.RN$Bridgeless === true;
+}
+
+export default shouldUseTurboAnimatedModule;

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

@@ -1513,6 +1513,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/Core/ReactNativeVersion.js

@@ -13,5 +13,5 @@ exports.version = {
   major: 0,
   minor: 0,
   patch: 0,
-  prerelease: '20230429-2107-c4a6c3728',
+  prerelease: '20230505-2109-9b69263a1',
 };

package/Libraries/DOM/Nodes/ReadOnlyCharacterData.js

@@ -67,6 +67,6 @@ export default class ReadOnlyCharacterData extends ReadOnlyNode {
       );
     }
     let adjustedCount = count < 0 || count > data.length ? data.length : count;
-    return data.substr(offset, adjustedCount);
+    return data.slice(offset, offset + adjustedCount);
   }
 }

package/Libraries/Inspector/NetworkOverlay.js

@@ -64,7 +64,7 @@ function getStringByValue(value: any): string {
   }
   if (typeof value === 'string' && value.length > 500) {
     return String(value)
-      .substr(0, 500)
+      .slice(0, 500)
       .concat('\n***TRUNCATED TO 500 CHARACTERS***');
   }
   return value;

package/Libraries/LogBox/UI/AnsiHighlight.js

@@ -73,7 +73,7 @@ export default function Ansi({
       return content.replace(/\| $/, ' ');
     } else if (key === 2 && commonWhitespaceLength < Infinity) {
       // Remove common whitespace at the beginning of the line
-      return content.substr(commonWhitespaceLength);
+      return content.slice(commonWhitespaceLength);
     } else {
       return content;
     }

package/Libraries/LogBox/UI/LogBoxMessage.js

@@ -138,17 +138,14 @@ function LogBoxMessage(props: Props): React.Node {
     const key = String(index);
 
     if (substitution.offset > prevOffset) {
-      const prevPart = content.substr(
-        prevOffset,
-        substitution.offset - prevOffset,
-      );
+      const prevPart = content.slice(prevOffset, substitution.offset);
 
       createUnderLength(key, prevPart);
     }
 
-    const substitutionPart = content.substr(
+    const substitutionPart = content.slice(
       substitution.offset,
-      substitution.length,
+      substitution.offset + substitution.length,
     );
 
     createUnderLength(key + '.5', substitutionPart, substitutionStyle);
@@ -156,7 +153,7 @@ function LogBoxMessage(props: Props): React.Node {
   }, 0);
 
   if (lastOffset < content.length) {
-    const lastPart = content.substr(lastOffset);
+    const lastPart = content.slice(lastOffset);
     createUnderLength('-1', lastPart);
   }
 

package/Libraries/ReactNative/AppRegistry.d.ts

@@ -85,11 +85,6 @@ export namespace AppRegistry {
     displayMode?: number,
   ): void;
 
-  export function registerHeadlessTask(
-    appKey: string,
-    task: TaskProvider,
-  ): void;
-
   export function getRunnable(appKey: string): Runnable | undefined;
 
   export function getRegistry(): {sections: string[]; runnables: Runnable[]};

package/Libraries/Utilities/PolyfillFunctions.js

@@ -32,7 +32,7 @@ function polyfillObjectProperty<T>(
 ): void {
   const descriptor = Object.getOwnPropertyDescriptor<$FlowFixMe>(object, name);
   if (__DEV__ && descriptor) {
-    const backupName = `original${name[0].toUpperCase()}${name.substr(1)}`;
+    const backupName = `original${name[0].toUpperCase()}${name.slice(1)}`;
     Object.defineProperty(object, backupName, descriptor);
   }
 

package/Microsoft.ReactNative/Fabric/ImageRequest.cpp

@@ -12,27 +12,17 @@ ImageRequest::ImageRequest(ImageSource imageSource, std::shared_ptr<const ImageT
   coordinator_ = std::make_shared<ImageResponseObserverCoordinator>();
 }
 
-ImageRequest::ImageRequest(ImageRequest &&other) noexcept
-    : imageSource_(std::move(other.imageSource_)),
-      telemetry_(std::move(other.telemetry_)),
-      coordinator_(std::move(other.coordinator_)) {
-  other.coordinator_ = nullptr;
-  other.cancelRequest_ = nullptr;
-  other.telemetry_ = nullptr;
-  other.imageSource_ = {};
+// cspell:disable-next-line
+void ImageRequest::setCancelationFunction(std::function<void(void)> cancellationFunction) {
+  cancelRequest_ = cancellationFunction;
 }
 
-ImageRequest::~ImageRequest() {
+void ImageRequest::cancel() const {
   if (cancelRequest_) {
     cancelRequest_();
   }
 }
 
-// cspell:disable-next-line
-void ImageRequest::setCancelationFunction(std::function<void(void)> cancellationFunction) {
-  cancelRequest_ = cancellationFunction;
-}
-
 const ImageSource &ImageRequest::getImageSource() const {
   return imageSource_;
 }

package/Microsoft.ReactNative/Modules/NativeUIManager.cpp

@@ -154,7 +154,7 @@ NativeUIManager::NativeUIManager(winrt::Microsoft::ReactNative::ReactContext con
   if (React::implementation::QuirkSettings::GetUseWebFlexBasisBehavior(m_context.Properties()))
     YGConfigSetExperimentalFeatureEnabled(m_yogaConfig, YGExperimentalFeatureWebFlexBasis, true);
   if (React::implementation::QuirkSettings::GetMatchAndroidAndIOSStretchBehavior(m_context.Properties()))
-    YGConfigSetUseLegacyStretchBehaviour(m_yogaConfig, true);
+    YGConfigSetErrata(m_yogaConfig, YGErrataStretchFlexBasis);
 
 #if defined(_DEBUG)
   YGConfigSetLogger(m_yogaConfig, &YogaLog);

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

@@ -590,20 +590,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/Mso/compilerAdapters/compilerFeatures.h

@@ -20,7 +20,7 @@
 
 // Check if compiler supports UUID
 #ifndef COMPILER_SUPPORTS_UUID
-#if defined(__clang__) || defined(__GNUC__)
+#if (defined(__APPLE__) && defined(__clang__)) || defined(__GNUC__)
 #define COMPILER_SUPPORTS_UUID 0
 #elif defined(_MSC_VER)
 #define COMPILER_SUPPORTS_UUID 1

package/PropertySheets/Generated/PackageVersion.g.props

@@ -10,11 +10,11 @@
 -->
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <ReactNativeWindowsVersion>0.0.0-canary.652</ReactNativeWindowsVersion>
+    <ReactNativeWindowsVersion>0.0.0-canary.653</ReactNativeWindowsVersion>
     <ReactNativeWindowsMajor>0</ReactNativeWindowsMajor>
     <ReactNativeWindowsMinor>0</ReactNativeWindowsMinor>
     <ReactNativeWindowsPatch>0</ReactNativeWindowsPatch>
     <ReactNativeWindowsCanary>true</ReactNativeWindowsCanary>
-    <ReactNativeWindowsCommitId>b603bc740703e3725e21087cf26aee2b164c1307</ReactNativeWindowsCommitId>
+    <ReactNativeWindowsCommitId>47eeb713077963b7e41a80265d16bbeee568d674</ReactNativeWindowsCommitId>
   </PropertyGroup>
 </Project>

package/ReactCommon/TEMP_UntilReactCommonUpdate/react/bridging/Bridging.h

@@ -0,0 +1,20 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#pragma once
+
+#include <react/bridging/AString.h>
+#include <react/bridging/Array.h>
+#include <react/bridging/Bool.h>
+#include <react/bridging/Class.h>
+// #include <react/bridging/Dynamic.h> // Line causes Error C1083 Cannot open include file: 'double-conversion/double-conversion.h' #11644
+#include <react/bridging/Error.h>
+#include <react/bridging/Function.h>
+#include <react/bridging/Number.h>
+#include <react/bridging/Object.h>
+#include <react/bridging/Promise.h>
+#include <react/bridging/Value.h>

package/ReactCommon/Yoga.cpp

@@ -11,22 +11,15 @@
 #include <algorithm>
 #include <atomic>
 #include <memory>
+
+#include <yoga/Yoga.h>
+
+#include "log.h"
 #include "Utils.h"
 #include "YGNode.h"
 #include "YGNodePrint.h"
 #include "Yoga-internal.h"
 #include "event/event.h"
-#include "log.h"
-#ifdef _MSC_VER
-#include <float.h>
-
-/* define fmaxf if < VC12 */
-#if _MSC_VER < 1800
-__forceinline const float fmaxf(const float a, const float b) {
-  return (a > b) ? a : b;
-}
-#endif
-#endif
 
 using namespace facebook::yoga;
 using detail::Log;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-windows",
-  "version": "0.0.0-canary.652",
+  "version": "0.0.0-canary.653",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -73,20 +73,20 @@
     "@types/react": "^18.0.18",
     "eslint": "^8.19.0",
     "eslint-plugin-prettier": "^4.2.1",
-    "flow-bin": "^0.204.1",
+    "flow-bin": "^0.205.1",
     "jscodeshift": "^0.14.0",
     "just-scripts": "^1.3.3",
     "metro-config": "0.76.2",
     "prettier": "^2.4.1",
     "react": "18.2.0",
-    "react-native": "0.0.0-20230429-2107-c4a6c3728",
+    "react-native": "0.0.0-20230505-2109-9b69263a1",
     "react-native-platform-override": "^1.9.7",
     "react-refresh": "^0.4.0",
     "typescript": "^4.9.5"
   },
   "peerDependencies": {
     "react": "18.2.0",
-    "react-native": "0.0.0-20230429-2107-c4a6c3728"
+    "react-native": "0.0.0-20230505-2109-9b69263a1"
   },
   "beachball": {
     "defaultNpmTag": "canary",