react-native-windows 0.69.0-preview.4 → 0.69.0-preview.7

package/Libraries/Core/ReactNativeVersion.js

@@ -13,5 +13,5 @@ exports.version = {
   major: 0,
   minor: 69,
   patch: 0,
-  prerelease: 'rc.0',
+  prerelease: 'rc.6',
 };

package/Libraries/Utilities/codegenNativeComponent.js

@@ -34,15 +34,14 @@ function codegenNativeComponent<Props>(
   componentName: string,
   options?: Options,
 ): NativeComponentType<Props> {
-  const errorMessage =
-    "Native Component '" +
-    componentName +
-    "' that calls codegenNativeComponent was not code generated at build time. Please check its definition.";
   if (global.RN$Bridgeless === true) {
+    const errorMessage =
+      "Native Component '" +
+      componentName +
+      "' that calls codegenNativeComponent was not code generated at build time. Please check its definition.";
     console.error(errorMessage);
-  } else {
-    console.warn(errorMessage);
   }
+
   let componentNameInUse =
     options && options.paperComponentName != null
       ? options.paperComponentName

package/Libraries/Utilities/useColorScheme.js

@@ -8,24 +8,18 @@
  * @flow strict-local
  */
 
-import {useMemo} from 'react';
-import {useSubscription} from 'use-subscription';
+'use strict';
+
+import {useSyncExternalStore} from 'use-sync-external-store/shim';
 import Appearance from './Appearance';
 import type {ColorSchemeName} from './NativeAppearance';
 
 export default function useColorScheme(): ?ColorSchemeName {
-  const subscription = useMemo(
-    () => ({
-      getCurrentValue: () => Appearance.getColorScheme(),
-      subscribe: callback => {
-        const appearanceSubscription = Appearance.addChangeListener(callback);
-        return () => {
-          appearanceSubscription.remove();
-        };
-      },
-    }),
-    [],
+  return useSyncExternalStore(
+    callback => {
+      const appearanceSubscription = Appearance.addChangeListener(callback);
+      return () => appearanceSubscription.remove();
+    },
+    () => Appearance.getColorScheme(),
   );
-
-  return useSubscription(subscription);
 }

package/Microsoft.ReactNative/Views/FrameworkElementViewManager.cpp

@@ -115,6 +115,12 @@ inline float ToRadians(const winrt::Microsoft::ReactNative::JSValue &value) {
   return static_cast<float>(num); // assume suffix is "rad"
 }
 
+static void MultiplyInto(
+    winrt::Windows::Foundation::Numerics::float4x4 &m,
+    winrt::Windows::Foundation::Numerics::float4x4 o) {
+  m = o * m;
+}
+
 void FrameworkElementViewManager::GetNativeProps(const winrt::Microsoft::ReactNative::IJSValueWriter &writer) const {
   Super::GetNativeProps(writer);
 
@@ -181,52 +187,60 @@ bool FrameworkElementViewManager::UpdateProperty(
                 innerMatrix.m42 = static_cast<float>(innerValue[13].AsDouble());
                 innerMatrix.m43 = static_cast<float>(innerValue[14].AsDouble());
                 innerMatrix.m44 = static_cast<float>(innerValue[15].AsDouble());
-                transformMatrix = transformMatrix * innerMatrix;
+                MultiplyInto(transformMatrix, innerMatrix);
               } else if (transformType == "perspective") {
                 auto innerMatrix = winrt::Windows::Foundation::Numerics::float4x4::identity();
                 innerMatrix.m34 = -1 / innerValue.AsSingle();
-                transformMatrix = transformMatrix * innerMatrix;
+                MultiplyInto(transformMatrix, innerMatrix);
               } else if (transformType == "rotateX") {
-                transformMatrix = transformMatrix *
-                    winrt::Windows::Foundation::Numerics::make_float4x4_rotation_x(ToRadians(innerValue));
+                MultiplyInto(
+                    transformMatrix,
+                    winrt::Windows::Foundation::Numerics::make_float4x4_rotation_x(ToRadians(innerValue)));
               } else if (transformType == "rotateY") {
-                transformMatrix = transformMatrix *
-                    winrt::Windows::Foundation::Numerics::make_float4x4_rotation_y(ToRadians(innerValue));
+                MultiplyInto(
+                    transformMatrix,
+                    winrt::Windows::Foundation::Numerics::make_float4x4_rotation_y(ToRadians(innerValue)));
               } else if (transformType == "rotate" || transformType == "rotateZ") {
-                transformMatrix = transformMatrix *
-                    winrt::Windows::Foundation::Numerics::make_float4x4_rotation_z(ToRadians(innerValue));
+                MultiplyInto(
+                    transformMatrix,
+                    winrt::Windows::Foundation::Numerics::make_float4x4_rotation_z(ToRadians(innerValue)));
               } else if (transformType == "scale") {
-                transformMatrix = transformMatrix *
+                MultiplyInto(
+                    transformMatrix,
                     winrt::Windows::Foundation::Numerics::make_float4x4_scale(
-                                      innerValue.AsSingle(), innerValue.AsSingle(), 1);
+                        innerValue.AsSingle(), innerValue.AsSingle(), 1));
               } else if (transformType == "scaleX") {
-                transformMatrix = transformMatrix *
-                    winrt::Windows::Foundation::Numerics::make_float4x4_scale(innerValue.AsSingle(), 1, 1);
+                MultiplyInto(
+                    transformMatrix,
+                    winrt::Windows::Foundation::Numerics::make_float4x4_scale(innerValue.AsSingle(), 1, 1));
               } else if (transformType == "scaleY") {
-                transformMatrix = transformMatrix *
-                    winrt::Windows::Foundation::Numerics::make_float4x4_scale(1, innerValue.AsSingle(), 1);
+                MultiplyInto(
+                    transformMatrix,
+                    winrt::Windows::Foundation::Numerics::make_float4x4_scale(1, innerValue.AsSingle(), 1));
               } else if (transformType == "translate") {
                 auto &params = innerValue.AsArray();
-                transformMatrix =
-                    transformMatrix *
+                MultiplyInto(
+                    transformMatrix,
                     winrt::Windows::Foundation::Numerics::make_float4x4_translation(
-                        params[0].AsSingle(), params[1].AsSingle(), params.size() > 2 ? params[2].AsSingle() : 0.f);
+                        params[0].AsSingle(), params[1].AsSingle(), params.size() > 2 ? params[2].AsSingle() : 0.f));
               } else if (transformType == "translateX") {
-                transformMatrix = transformMatrix *
-                    winrt::Windows::Foundation::Numerics::make_float4x4_translation(innerValue.AsSingle(), 0.f, 0.f);
+                MultiplyInto(
+                    transformMatrix,
+                    winrt::Windows::Foundation::Numerics::make_float4x4_translation(innerValue.AsSingle(), 0.f, 0.f));
               } else if (transformType == "translateY") {
-                transformMatrix = transformMatrix *
-                    winrt::Windows::Foundation::Numerics::make_float4x4_translation(0.f, innerValue.AsSingle(), 0.f);
+                MultiplyInto(
+                    transformMatrix,
+                    winrt::Windows::Foundation::Numerics::make_float4x4_translation(0.f, innerValue.AsSingle(), 0.f));
               } else if (transformType == "skewX") {
-                transformMatrix =
-                    transformMatrix *
+                MultiplyInto(
+                    transformMatrix,
                     winrt::Windows::Foundation::Numerics::float4x4(
-                        winrt::Windows::Foundation::Numerics::make_float3x2_skew(innerValue.AsSingle(), 0.f));
+                        winrt::Windows::Foundation::Numerics::make_float3x2_skew(innerValue.AsSingle(), 0.f)));
               } else if (transformType == "skewY") {
-                transformMatrix =
-                    transformMatrix *
+                MultiplyInto(
+                    transformMatrix,
                     winrt::Windows::Foundation::Numerics::float4x4(
-                        winrt::Windows::Foundation::Numerics::make_float3x2_skew(0.f, innerValue.AsSingle()));
+                        winrt::Windows::Foundation::Numerics::make_float3x2_skew(0.f, innerValue.AsSingle())));
               }
             }
           }

package/Microsoft.ReactNative.Cxx/JSI/JsiApiContext.cpp

@@ -10,16 +10,19 @@ extern "C" IMAGE_DOS_HEADER __ImageBase;
 
 namespace winrt::Microsoft::ReactNative {
 
-// Get JSI Runtime from the current JS dispatcher thread.
-// If it is not found, then create it and store it in the context.Properties().
-// Make sure that the JSI runtime holder is removed when the instance is unloaded.
-facebook::jsi::Runtime &GetOrCreateContextRuntime(ReactContext const &context) noexcept {
+// Try to get JSI Runtime for the current JS dispatcher thread.
+// If it is not found, then create it based on context JSI runtime and store it in the context.Properties().
+// The function returns nullptr if the current context does not have JSI runtime.
+// It makes sure that the JSI runtime holder is removed when the instance is unloaded.
+facebook::jsi::Runtime *TryGetOrCreateContextRuntime(ReactContext const &context) noexcept {
   ReactDispatcher jsDispatcher = context.JSDispatcher();
   VerifyElseCrashSz(jsDispatcher.HasThreadAccess(), "Must be in JS thread");
 
   // The JSI runtime is not available if we do Web debugging when JS is running in web browser.
   JsiRuntime abiJsiRuntime = context.Handle().JSRuntime().as<JsiRuntime>();
-  VerifyElseCrashSz(abiJsiRuntime, "JSI runtime is not available");
+  if (!abiJsiRuntime) {
+    return nullptr;
+  }
 
   // See if the JSI runtime was previously created.
   JsiAbiRuntime *runtime = JsiAbiRuntime::GetFromJsiRuntime(abiJsiRuntime);
@@ -51,6 +54,15 @@ facebook::jsi::Runtime &GetOrCreateContextRuntime(ReactContext const &context) n
         });
   }
 
+  return runtime;
+}
+
+// Calls TryGetOrCreateContextRuntime to get JSI runtime.
+// It crashes when TryGetOrCreateContextRuntime returns null.
+// Note: deprecated in favor of TryGetOrCreateContextRuntime.
+[[deprecated]] facebook::jsi::Runtime &GetOrCreateContextRuntime(ReactContext const &context) noexcept {
+  facebook::jsi::Runtime *runtime = TryGetOrCreateContextRuntime(context);
+  VerifyElseCrashSz(runtime, "JSI runtime is not available");
   return *runtime;
 }
 

package/Microsoft.ReactNative.Cxx/JSI/JsiApiContext.h

@@ -7,26 +7,55 @@
 
 #include "../ReactContext.h"
 #include "JsiAbiApi.h"
+#include "ReactPromise.h"
 
 namespace winrt::Microsoft::ReactNative {
 
-// Get JSI Runtime from the current JS dispatcher thread.
-// If it is not found, then create it and store it in the context.Properties().
-// Make sure that the JSI runtime holder is removed when the instance is unloaded.
-facebook::jsi::Runtime &GetOrCreateContextRuntime(ReactContext const &context) noexcept;
+// Try to get JSI Runtime for the current JS dispatcher thread.
+// If it is not found, then create it based on context JSI runtime and store it in the context.Properties().
+// The function returns nullptr if the current context does not have JSI runtime.
+// It makes sure that the JSI runtime holder is removed when the instance is unloaded.
+facebook::jsi::Runtime *TryGetOrCreateContextRuntime(ReactContext const &context) noexcept;
+
+// Calls TryGetOrCreateContextRuntime to get JSI runtime.
+// It crashes when TryGetOrCreateContextRuntime returns null.
+// Note: deprecated in favor of TryGetOrCreateContextRuntime.
+[[deprecated]] facebook::jsi::Runtime &GetOrCreateContextRuntime(ReactContext const &context) noexcept;
 
 // Call provided lambda with the facebook::jsi::Runtime& parameter.
 // For example: ExecuteJsi(context, [](facebook::jsi::Runtime& runtime){...})
 // The code is executed synchronously if it is already in JSDispatcher, or asynchronously otherwise.
 template <class TCodeWithRuntime>
-void ExecuteJsi(ReactContext const &context, TCodeWithRuntime const &code) {
+void ExecuteJsi(ReactContext const &context, TCodeWithRuntime const &code, ReactPromise<void> *callStatus = nullptr) {
   ReactDispatcher jsDispatcher = context.JSDispatcher();
+  auto callCode = [](ReactContext const &context, TCodeWithRuntime const &code, ReactPromise<void> *callStatus) {
+    facebook::jsi::Runtime *runtime = TryGetOrCreateContextRuntime(context);
+    if (runtime) {
+      code(*runtime);
+    }
+
+    // Report status of the call
+    if (callStatus) {
+      if (runtime) {
+        callStatus->Resolve();
+      } else {
+        callStatus->Reject("No JSI runtime");
+      }
+    }
+  };
+
   if (jsDispatcher.HasThreadAccess()) {
     // Execute immediately if we are in JS thread.
-    code(GetOrCreateContextRuntime(context));
+    callCode(context, code, callStatus);
   } else {
     // Otherwise, schedule work in JS thread.
-    jsDispatcher.Post([context, code]() noexcept { code(GetOrCreateContextRuntime(context)); });
+    jsDispatcher.Post([callCode,
+                       context,
+                       code,
+                       callStatus = callStatus ? std::make_unique<ReactPromise<void>>(*callStatus)
+                                               : std::unique_ptr<ReactPromise<void>>(nullptr)]() noexcept {
+      callCode(context, code, callStatus.get());
+    });
   }
 }
 

package/Microsoft.ReactNative.Cxx/JSValueWriter.h

@@ -287,7 +287,7 @@ inline JSValueArgWriter MakeJSValueWriter(T &&argWriter) noexcept {
 
 template <class... TArgs>
 inline JSValueArgWriter MakeJSValueWriter(TArgs &&...args) noexcept {
-  return [&args...](IJSValueWriter const &[[maybe_unused]] writer) noexcept { (WriteValue(writer, args), ...); };
+  return [&args...]([[maybe_unused]] IJSValueWriter const &writer) noexcept { (WriteValue(writer, args), ...); };
 }
 
 } // namespace winrt::Microsoft::ReactNative

package/Microsoft.ReactNative.Cxx/ReactPromise.cpp

@@ -6,7 +6,6 @@
 
 #include "pch.h"
 #include "ReactPromise.h"
-#include "JSValueWriter.h"
 
 namespace winrt::Microsoft::ReactNative {
 
@@ -105,6 +104,27 @@ bool ReactPromiseBase::TrySetState(State newState) const noexcept {
   return false;
 }
 
+/*static*/ MethodResultCallback ReactPromiseBase::GetRejectResultCallback(
+    std::function<void(ReactError const &)> const &reject) noexcept {
+  return [reject](IJSValueWriter const &outputWriter) noexcept {
+    winrt::com_ptr<JSValueTreeWriter> writer = outputWriter.as<JSValueTreeWriter>();
+    JSValue jsValue = writer->TakeValue();
+    ReactError err{};
+    err.Code = jsValue.AsArray()[0].AsObject()[ErrorMapKeyCode].AsString();
+    err.Message = jsValue.AsArray()[0].AsObject()[ErrorMapKeyMessage].AsString();
+    err.UserInfo = jsValue.AsArray()[0].AsObject()[ErrorMapKeyUserInfo].AsObject().Copy();
+    reject(err);
+  };
+}
+
+ReactPromise<void>::ReactPromise(
+    std::function<void()> const &resolve,
+    std::function<void(ReactError const &)> const &reject) noexcept
+    : ReactPromiseBase(
+          winrt::make<JSValueTreeWriter>(),
+          [resolve](IJSValueWriter const & /*outputWriter*/) noexcept { resolve(); },
+          GetRejectResultCallback(reject)) {}
+
 // Successfully resolve the ReactPromise<void>.
 void ReactPromise<void>::Resolve() const noexcept {
   if (TrySetState(State::Resolved) && m_resolve) {

package/Microsoft.ReactNative.Cxx/ReactPromise.h

@@ -5,6 +5,11 @@
 // vnext/Microsoft.ReactNative.Cxx/README.md
 
 #pragma once
+#include <functional>
+#include "JSValueReader.h"
+#include "JSValueTreeReader.h"
+#include "JSValueTreeWriter.h"
+#include "JSValueWriter.h"
 #include "ReactError.h"
 #include "winrt/Microsoft.ReactNative.h"
 
@@ -35,6 +40,7 @@ struct ReactPromiseBase {
 
  protected:
   bool TrySetState(State newState) const noexcept;
+  static MethodResultCallback GetRejectResultCallback(std::function<void(ReactError const &)> const &reject) noexcept;
 
  protected:
   const std::shared_ptr<std::atomic<State>> m_state;
@@ -47,6 +53,10 @@ template <class T>
 struct ReactPromise : ReactPromiseBase {
   using ReactPromiseBase::ReactPromiseBase;
 
+  ReactPromise(
+      std::function<void(T const &)> const &resolve,
+      std::function<void(ReactError const &)> const &reject) noexcept;
+
   // Successfully resolve the IReactPromise with an optional value.
   void Resolve(T const &value) const noexcept;
 };
@@ -55,10 +65,27 @@ template <>
 struct ReactPromise<void> : ReactPromiseBase {
   using ReactPromiseBase::ReactPromiseBase;
 
+  ReactPromise(std::function<void()> const &resolve, std::function<void(ReactError const &)> const &reject) noexcept;
+
   // Successfully resolve the IReactPromise with an optional value.
   void Resolve() const noexcept;
 };
 
+template <class T>
+ReactPromise<T>::ReactPromise(
+    std::function<void(T const &)> const &resolve,
+    std::function<void(ReactError const &)> const &reject) noexcept
+    : ReactPromiseBase(
+          winrt::make<JSValueTreeWriter>(),
+          [resolve](IJSValueWriter const &outputWriter) noexcept {
+            winrt::com_ptr<JSValueTreeWriter> writer = outputWriter.as<JSValueTreeWriter>();
+            auto reader = winrt::make<JSValueTreeReader>(writer->TakeValue());
+            T result{};
+            ReadArgs(reader, result);
+            resolve(result);
+          },
+          GetRejectResultCallback(reject)) {}
+
 // Successfully resolve the ReactPromise with an optional value.
 template <class T>
 void ReactPromise<T>::Resolve(T const &value) const noexcept {

package/Microsoft.ReactNative.Cxx/TurboModuleProvider.h

@@ -23,7 +23,7 @@ void AddTurboModuleProvider(IReactPackageBuilder const &packageBuilder, std::wst
         IJsiHostObject abiTurboModule{nullptr};
         // We expect the initializer to be called immediately for TurboModules
         moduleBuilder.AddInitializer([&abiTurboModule](IReactContext const &context) mutable {
-          GetOrCreateContextRuntime(ReactContext{context}); // Ensure the JSI runtime is created.
+          TryGetOrCreateContextRuntime(ReactContext{context}); // Ensure the JSI runtime is created.
           auto callInvoker = MakeAbiCallInvoker(context.JSDispatcher());
           auto turboModule = std::make_shared<TTurboModule>(callInvoker);
           abiTurboModule = winrt::make<JsiHostObjectWrapper>(std::move(turboModule));

package/PropertySheets/Generated/PackageVersion.g.props

@@ -10,7 +10,7 @@
 -->
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <ReactNativeWindowsVersion>0.69.0-preview.4</ReactNativeWindowsVersion>
+    <ReactNativeWindowsVersion>0.69.0-preview.7</ReactNativeWindowsVersion>
     <ReactNativeWindowsMajor>0</ReactNativeWindowsMajor>
     <ReactNativeWindowsMinor>69</ReactNativeWindowsMinor>
     <ReactNativeWindowsPatch>0</ReactNativeWindowsPatch>

package/PropertySheets/JSEngine.props

@@ -8,7 +8,7 @@
     <!-- Enabling this will (1) Include hermes glues in the Microsoft.ReactNative binaries AND (2) Make hermes the default engine -->
     <UseHermes Condition="'$(UseHermes)' == ''">false</UseHermes>
     <!-- This will be true if (1) the client want to use hermes by setting UseHermes to true OR (2) We are building for UWP where dynamic switching is enabled -->
-    <HermesVersion Condition="'$(HermesVersion)' == ''">0.11.0-ms.6</HermesVersion>
+    <HermesVersion Condition="'$(HermesVersion)' == ''">0.12.1</HermesVersion>
     <HermesPackage Condition="'$(HermesPackage)' == '' And Exists('$(PkgReactNative_Hermes_Windows)')">$(PkgReactNative_Hermes_Windows)</HermesPackage>
     <HermesPackage Condition="'$(HermesPackage)' == ''">$(NuGetPackageRoot)\ReactNative.Hermes.Windows\$(HermesVersion)</HermesPackage>
     <EnableHermesInspectorInReleaseFlavor Condition="'$(EnableHermesInspectorInReleaseFlavor)' == ''">false</EnableHermesInspectorInReleaseFlavor>

package/Shared/InspectorPackagerConnection.cpp

@@ -86,8 +86,8 @@ struct InspectorProtocol {
     for (const facebook::react::InspectorPage2 &page : pages) {
       folly::dynamic pageDyn = folly::dynamic::object;
       pageDyn["id"] = page.id;
-      pageDyn["title"] = std::string(page.title);
-      pageDyn["vm"] = std::string(page.vm);
+      pageDyn["title"] = page.title;
+      pageDyn["vm"] = page.vm;
 
       pageDyn["isLastBundleDownloadSuccess"] = bundleStatus.m_isLastDownloadSucess;
       pageDyn["bundleUpdateTimestamp"] = bundleStatus.m_updateTimestamp;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-windows",
-  "version": "0.69.0-preview.4",
+  "version": "0.69.0-preview.7",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -23,11 +23,11 @@
   "dependencies": {
     "@babel/runtime": "^7.0.0",
     "@jest/create-cache-key-function": "^27.0.1",
-    "@react-native-community/cli": "^8.0.0-alpha.6",
-    "@react-native-community/cli-platform-android": "^8.0.0-alpha.3",
-    "@react-native-community/cli-platform-ios": "^8.0.0-alpha.3",
+    "@react-native-community/cli": "^8.0.0",
+    "@react-native-community/cli-platform-android": "^8.0.0",
+    "@react-native-community/cli-platform-ios": "^8.0.0",
     "@react-native-windows/cli": "0.69.0-preview.1",
-    "@react-native-windows/virtualized-list": "0.69.0-preview.1",
+    "@react-native-windows/virtualized-list": "0.69.0-preview.3",
     "@react-native/assets": "1.0.0",
     "@react-native/normalize-color": "2.0.0",
     "@react-native/polyfills": "2.0.0",
@@ -39,22 +39,24 @@
     "invariant": "^2.2.4",
     "jsc-android": "^250230.2.1",
     "memoize-one": "^5.0.0",
-    "metro-react-native-babel-transformer": "0.70.1",
-    "metro-runtime": "0.70.1",
-    "metro-source-map": "0.70.1",
+    "metro-react-native-babel-transformer": "0.70.3",
+    "metro-runtime": "0.70.3",
+    "metro-source-map": "0.70.3",
+    "mkdirp": "^0.5.1",
     "nullthrows": "^1.1.1",
     "pretty-format": "^26.5.2",
     "promise": "^8.0.3",
     "react-devtools-core": "4.24.0",
-    "react-native-codegen": "^0.0.15",
+    "react-native-codegen": "^0.69.1",
     "react-native-gradle-plugin": "^0.0.7",
     "react-refresh": "^0.4.0",
     "react-shallow-renderer": "16.14.1",
     "regenerator-runtime": "^0.13.2",
     "scheduler": "^0.21.0",
+    "shelljs": "^0.8.5",
     "source-map-support": "^0.5.19",
     "stacktrace-parser": "^0.1.3",
-    "use-subscription": ">=1.0.0 <1.6.0",
+    "use-sync-external-store": "^1.0.0",
     "whatwg-fetch": "^3.0.0",
     "ws": "^6.1.4"
   },
@@ -75,7 +77,7 @@
     "metro-config": "^0.70.1",
     "prettier": "^2.4.1",
     "react": "18.0.0",
-    "react-native": "0.69.0-rc.0",
+    "react-native": "0.69.0-rc.6",
     "react-native-platform-override": "^1.6.11",
     "react-refresh": "^0.4.0",
     "react-shallow-renderer": "16.14.1",
@@ -83,7 +85,7 @@
   },
   "peerDependencies": {
     "react": "18.0.0",
-    "react-native": "0.69.0-rc.0"
+    "react-native": "0.69.0-rc.6"
   },
   "beachball": {
     "defaultNpmTag": "preview",