react-native-windows 0.66.0-preview.2 → 0.66.0-preview.6

package/CHANGELOG.json

@@ -2,7 +2,85 @@
   "name": "react-native-windows",
   "entries": [
     {
-      "date": "Mon, 06 Sep 2021 15:06:33 GMT",
+      "date": "Mon, 04 Oct 2021 15:07:18 GMT",
+      "tag": "react-native-windows_v0.66.0-preview.6",
+      "version": "0.66.0-preview.6",
+      "comments": {
+        "prerelease": [
+          {
+            "comment": "Upgrade ReactNative.V8Jsi.Windows to 0.65.5",
+            "author": "julio.rocha@microsoft.com",
+            "commit": "8b1048e4a3491c01f2b2d4382822f8d98f3ccfe5",
+            "package": "react-native-windows"
+          },
+          {
+            "comment": "Allow injection of custom UI thread",
+            "author": "30809111+acoates-ms@users.noreply.github.com",
+            "commit": "a20892ade44390cdb10f25c31a2f35ce61328b97",
+            "package": "react-native-windows"
+          },
+          {
+            "comment": "ReactNativeHost ReloadInstance and UnloadInstance actions do not always fire completed events",
+            "author": "30809111+acoates-ms@users.noreply.github.com",
+            "commit": "b848d68c45c3f9b51938ce9881e276cae1d58448",
+            "package": "react-native-windows"
+          },
+          {
+            "comment": "Make hermes consume icu.dll in Windows for local aware functions",
+            "author": "anandrag@microsoft.com",
+            "commit": "652dfd2e5f50f575c0dfb9dd90efd5eb14d485bb",
+            "package": "react-native-windows"
+          }
+        ]
+      }
+    },
+    {
+      "date": "Mon, 27 Sep 2021 15:07:31 GMT",
+      "tag": "react-native-windows_v0.66.0-preview.5",
+      "version": "0.66.0-preview.5",
+      "comments": {
+        "prerelease": [
+          {
+            "comment": "Migrate NapiJsiRuntime from V8-JSI (#8617)",
+            "author": "julio.rocha@microsoft.com",
+            "commit": "b4d6793bc39203a7671163f7770307f24f90ef91",
+            "package": "react-native-windows"
+          }
+        ]
+      }
+    },
+    {
+      "date": "Mon, 20 Sep 2021 15:07:01 GMT",
+      "tag": "react-native-windows_v0.66.0-preview.4",
+      "version": "0.66.0-preview.4",
+      "comments": {
+        "prerelease": [
+          {
+            "comment": "Restore Fast Refresh",
+            "author": "34109996+chiaramooney@users.noreply.github.com",
+            "commit": "71803345c9e89ee419332119fd5667370c5c19d3",
+            "package": "react-native-windows"
+          }
+        ]
+      }
+    },
+    {
+      "date": "Mon, 13 Sep 2021 15:06:37 GMT",
+      "tag": "react-native-windows_v0.66.0-preview.3",
+      "version": "0.66.0-preview.3",
+      "comments": {
+        "prerelease": [
+          {
+            "comment": "Bump hermes to v0.9",
+            "author": "anandrag@microsoft.com",
+            "commit": "2afad93679990d06cec763bd6c12ce44efef0c4a",
+            "package": "react-native-windows"
+          }
+        ]
+      }
+    },
+    {
+      "date": "Mon, 06 Sep 2021 15:06:48 GMT",
       "tag": "react-native-windows_v0.66.0-preview.2",
       "version": "0.66.0-preview.2",
       "comments": {

package/CHANGELOG.md

@@ -1,17 +1,52 @@
 # Change Log - react-native-windows
 
-This log was last generated on Mon, 06 Sep 2021 15:06:33 GMT and should not be manually modified.
+This log was last generated on Mon, 04 Oct 2021 15:07:18 GMT and should not be manually modified.
 
 <!-- Start content -->
 
-## 0.66.0-preview.2
+## 0.66.0-preview.6
 
-Mon, 06 Sep 2021 15:06:33 GMT
+Mon, 04 Oct 2021 15:07:18 GMT
 
 ### Changes
 
-- Fix race condition when building customer projects (dannyvv@microsoft.com)
+- Upgrade ReactNative.V8Jsi.Windows to 0.65.5 (julio.rocha@microsoft.com)
+- Allow injection of custom UI thread (30809111+acoates-ms@users.noreply.github.com)
+- ReactNativeHost ReloadInstance and UnloadInstance actions do not always fire completed events (30809111+acoates-ms@users.noreply.github.com)
+- Make hermes consume icu.dll in Windows for local aware functions (anandrag@microsoft.com)
 
+## 0.66.0-preview.5
+
+Mon, 27 Sep 2021 15:07:31 GMT
+
+### Changes
+
+- Migrate NapiJsiRuntime from V8-JSI (#8617) (julio.rocha@microsoft.com)
+
+## 0.66.0-preview.4
+
+Mon, 20 Sep 2021 15:07:01 GMT
+
+### Changes
+
+- Restore Fast Refresh (34109996+chiaramooney@users.noreply.github.com)
+
+## 0.66.0-preview.3
+
+Mon, 13 Sep 2021 15:06:37 GMT
+
+### Changes
+
+- Bump hermes to v0.9 (anandrag@microsoft.com)
+
+## 0.66.0-preview.2
+
+Mon, 06 Sep 2021 15:06:48 GMT
+
+### Changes
+
+- Fix race condition when building customer projects (dannyvv@microsoft.com)
+
 ## 0.66.0-preview.1
 
 Fri, 03 Sep 2021 18:48:19 GMT

package/Microsoft.ReactNative/IReactDispatcher.cpp

@@ -10,6 +10,27 @@ using namespace Windows::Foundation;
 
 namespace winrt::Microsoft::ReactNative::implementation {
 
+// Implements IDispatchQueue2 on top of a custom IReactDispatcher provided by the application
+struct WrappedReactDispatcher : public Mso::UnknownObject<Mso::React::IDispatchQueue2> {
+  WrappedReactDispatcher(const winrt::Microsoft::ReactNative::IReactDispatcher &dispatcher) noexcept
+      : m_dispatcher(dispatcher) {}
+
+  void Post(Mso::DispatchTask &&task) const noexcept override {
+    m_dispatcher.Post(task);
+  }
+
+  void InvokeElsePost(Mso::DispatchTask &&task) const noexcept override {
+    if (m_dispatcher.HasThreadAccess()) {
+      task();
+    } else {
+      Post(std::move(task));
+    }
+  }
+
+ private:
+  winrt::Microsoft::ReactNative::IReactDispatcher m_dispatcher;
+};
+
 ReactDispatcher::ReactDispatcher(Mso::DispatchQueue &&queue) noexcept : m_queue{std::move(queue)} {}
 
 bool ReactDispatcher::HasThreadAccess() noexcept {
@@ -20,12 +41,29 @@ void ReactDispatcher::Post(ReactDispatcherCallback const &callback) noexcept {
   return m_queue.Post([callback]() noexcept { callback(); });
 }
 
+void ReactDispatcher::Post(Mso::DispatchTask &&task) const noexcept {
+  m_queue.Post(std::move(task));
+}
+
+void ReactDispatcher::InvokeElsePost(Mso::DispatchTask &&task) const noexcept {
+  m_queue.InvokeElsePost(std::move(task));
+}
+
 /*static*/ IReactDispatcher ReactDispatcher::CreateSerialDispatcher() noexcept {
   return make<ReactDispatcher>(Mso::DispatchQueue{});
 }
 
-/*static*/ Mso::DispatchQueue ReactDispatcher::GetUIDispatchQueue(IReactPropertyBag const &properties) noexcept {
-  return GetUIDispatcher(properties).as<ReactDispatcher>()->m_queue;
+/*static*/ Mso::CntPtr<Mso::React::IDispatchQueue2> ReactDispatcher::GetUIDispatchQueue2(
+    IReactPropertyBag const &properties) noexcept {
+  auto iReactDispatcher = GetUIDispatcher(properties);
+
+  if (!iReactDispatcher)
+    return nullptr;
+
+  if (auto simpleDispatcher = iReactDispatcher.try_as<IDispatchQueue2>())
+    return simpleDispatcher.get();
+
+  return Mso::Make<WrappedReactDispatcher>(iReactDispatcher);
 }
 
 /*static*/ IReactDispatcher ReactDispatcher::UIThreadDispatcher() noexcept {

package/Microsoft.ReactNative/IReactDispatcher.h

@@ -6,9 +6,23 @@
 #include <dispatchQueue/dispatchQueue.h>
 #include <winrt/Microsoft.ReactNative.h>
 
+namespace Mso::React {
+
+MSO_GUID(IDispatchQueue2, "a8d9db25-3d16-4476-ae65-682fcee1260c")
+struct IDispatchQueue2 : ::IUnknown {
+  //! Post the task to the end of the queue for asynchronous invocation.
+  virtual void Post(Mso::DispatchTask &&task) const noexcept = 0;
+
+  //! Invoke the task immediately if the queue uses the current thread. Otherwise, post it.
+  //! The immediate execution ignores the suspend or shutdown states.
+  virtual void InvokeElsePost(Mso::DispatchTask &&task) const noexcept = 0;
+};
+
+} // namespace Mso::React
+
 namespace winrt::Microsoft::ReactNative::implementation {
 
-struct ReactDispatcher : implements<ReactDispatcher, winrt::default_interface<IReactDispatcher>> {
+struct ReactDispatcher : implements<ReactDispatcher, IReactDispatcher, Mso::React::IDispatchQueue2> {
   ReactDispatcher() = default;
   ReactDispatcher(Mso::DispatchQueue &&queue) noexcept;
 
@@ -17,8 +31,7 @@ struct ReactDispatcher : implements<ReactDispatcher, winrt::default_interface<IR
 
   static IReactDispatcher CreateSerialDispatcher() noexcept;
 
-  static Mso::DispatchQueue GetUIDispatchQueue(IReactPropertyBag const &properties) noexcept;
-
+  static Mso::CntPtr<IDispatchQueue2> GetUIDispatchQueue2(IReactPropertyBag const &properties) noexcept;
   static IReactDispatcher UIThreadDispatcher() noexcept;
   static IReactPropertyName UIDispatcherProperty() noexcept;
   static IReactDispatcher GetUIDispatcher(IReactPropertyBag const &properties) noexcept;
@@ -26,6 +39,9 @@ struct ReactDispatcher : implements<ReactDispatcher, winrt::default_interface<IR
 
   static IReactPropertyName JSDispatcherProperty() noexcept;
 
+  void Post(Mso::DispatchTask &&task) const noexcept override;
+  void InvokeElsePost(Mso::DispatchTask &&task) const noexcept override;
+
  private:
   Mso::DispatchQueue m_queue;
 };

package/Microsoft.ReactNative/Modules/AppearanceModule.cpp

@@ -16,11 +16,8 @@ namespace Microsoft::ReactNative {
 
 AppearanceChangeListener::AppearanceChangeListener(
     const Mso::React::IReactContext &context,
-    Mso::DispatchQueue const &uiQueue) noexcept
-    : Mso::ActiveObject<>(uiQueue), m_context(&context) {
-  // Ensure we're constructed on the UI thread
-  VerifyElseCrash(uiQueue.HasThreadAccess());
-
+    const Mso::React::IDispatchQueue2 &uiQueue) noexcept
+    : m_queue(&uiQueue), m_context(&context) {
   if (auto currentApp = xaml::TryGetCurrentApplication()) {
     m_currentTheme = currentApp.RequestedTheme();
 
@@ -29,7 +26,11 @@ AppearanceChangeListener::AppearanceChangeListener(
     m_revoker = m_uiSettings.ColorValuesChanged(
         winrt::auto_revoke, [weakThis{Mso::WeakPtr(this)}](const auto & /*sender*/, const auto & /*args*/) noexcept {
           if (auto strongThis = weakThis.GetStrongPtr()) {
-            strongThis->InvokeInQueueStrong([strongThis]() noexcept { strongThis->OnColorValuesChanged(); });
+            strongThis->m_queue->Post([weakThis]() noexcept {
+              if (auto strongThis = weakThis.GetStrongPtr()) {
+                strongThis->OnColorValuesChanged();
+              }
+            });
           }
         });
   }

package/Microsoft.ReactNative/Modules/AppearanceModule.h

@@ -3,30 +3,34 @@
 
 #pragma once
 
-#include <activeObject/activeObject.h>
 #include <cxxreact/CxxModule.h>
 #include <eventWaitHandle/eventWaitHandle.h>
 
 #include <winrt/Windows.UI.ViewManagement.h>
 
+#include <IReactDispatcher.h>
 #include <React.h>
+#include <object/refCountedObject.h>
 #include "IReactInstance.h"
 
 namespace Microsoft::ReactNative {
 
 // Listens for the current theme on the UI thread, storing the most recent. Will emit JS events on Appearance change.
-class AppearanceChangeListener final : public Mso::ActiveObject<> {
+class AppearanceChangeListener final : public Mso::RefCountedObject<Mso::RefCountStrategy::WeakRef, Mso::IRefCounted> {
   using ApplicationTheme = xaml::ApplicationTheme;
   using UISettings = winrt::Windows::UI::ViewManagement::UISettings;
 
  public:
-  AppearanceChangeListener(const Mso::React::IReactContext &context, Mso::DispatchQueue const &uiQueue) noexcept;
+  AppearanceChangeListener(
+      const Mso::React::IReactContext &context,
+      const Mso::React::IDispatchQueue2 &uiQueue) noexcept;
   const char *GetColorScheme() const noexcept;
 
  private:
   static const char *ToString(ApplicationTheme theme) noexcept;
   void OnColorValuesChanged() noexcept;
 
+  Mso::CntPtr<const Mso::React::IDispatchQueue2> m_queue;
   UISettings m_uiSettings;
   UISettings::ColorValuesChanged_revoker m_revoker;
   std::atomic<ApplicationTheme> m_currentTheme;

package/Microsoft.ReactNative/ReactCoreInjection.cpp

@@ -5,6 +5,7 @@
 #include "ReactCoreInjection.h"
 #include "ReactCoreInjection.g.cpp"
 #include "ReactViewOptions.g.cpp"
+#include <future/futureWinRT.h>
 #include "IReactContext.h"
 #include "ReactContext.h"
 #include "ReactInstanceWin.h"
@@ -86,16 +87,18 @@ ReactViewHost::ReactViewHost(
 
 // ReactViewOptions ReactViewHost::Options() noexcept;
 // ReactNative::ReactNativeHost ReactViewHost::ReactHost() noexcept {}
-void ReactViewHost::ReloadViewInstance() noexcept {
-  m_viewHost->ReloadViewInstance();
+winrt::Windows::Foundation::IAsyncAction ReactViewHost::ReloadViewInstance() noexcept {
+  return make<Mso::AsyncActionFutureAdapter>(m_viewHost->ReloadViewInstance());
 }
 
-void ReactViewHost::ReloadViewInstanceWithOptions(ReactNative::ReactViewOptions options) noexcept {
-  m_viewHost->ReloadViewInstanceWithOptions(options.as<ReactViewOptions>()->CreateViewOptions());
+winrt::Windows::Foundation::IAsyncAction ReactViewHost::ReloadViewInstanceWithOptions(
+    ReactNative::ReactViewOptions options) noexcept {
+  return make<Mso::AsyncActionFutureAdapter>(
+      m_viewHost->ReloadViewInstanceWithOptions(options.as<ReactViewOptions>()->CreateViewOptions()));
 }
 
-void ReactViewHost::UnloadViewInstance() noexcept {
-  m_viewHost->UnloadViewInstance();
+winrt::Windows::Foundation::IAsyncAction ReactViewHost::UnloadViewInstance() noexcept {
+  return make<Mso::AsyncActionFutureAdapter>(m_viewHost->UnloadViewInstance());
 }
 
 //! This class ensures that we access ReactRootView from UI thread.
@@ -149,10 +152,16 @@ struct ReactViewInstance : public Mso::UnknownObject<Mso::RefCountStrategy::Weak
   }
 };
 
-void ReactViewHost::AttachViewInstance(ReactNative::IReactViewInstance viewInstance) noexcept {
-  m_viewHost->AttachViewInstance(*Mso::Make<ReactViewInstance>(viewInstance, m_uiDispatcher));
+winrt::Windows::Foundation::IAsyncAction ReactViewHost::AttachViewInstance(
+    ReactNative::IReactViewInstance viewInstance) noexcept {
+  return make<Mso::AsyncActionFutureAdapter>(
+      m_viewHost->AttachViewInstance(*Mso::Make<ReactViewInstance>(viewInstance, m_uiDispatcher)));
 }
 
-void ReactViewHost::DetachViewInstance() noexcept {}
+winrt::Windows::Foundation::IAsyncAction ReactViewHost::DetachViewInstance() noexcept {
+  Mso::Promise<void> promise;
+  promise.SetValue();
+  return make<Mso::AsyncActionFutureAdapter>(promise.AsFuture());
+}
 
 } // namespace winrt::Microsoft::ReactNative::implementation

package/Microsoft.ReactNative/ReactCoreInjection.h

@@ -53,12 +53,11 @@ struct ReactViewHost : public winrt::implements<ReactViewHost, IReactViewHost> {
       Mso::React::IReactViewHost &viewHost,
       const winrt::Microsoft::ReactNative::IReactDispatcher &uiDispatcher);
 
-  /*Windows::Foundation::IAsyncAction */ void ReloadViewInstance() noexcept;
-  /*Windows::Foundation::IAsyncAction */ void ReloadViewInstanceWithOptions(
-      ReactNative::ReactViewOptions options) noexcept;
-  /*Windows::Foundation::IAsyncAction */ void UnloadViewInstance() noexcept;
-  /*Windows::Foundation::IAsyncAction */ void AttachViewInstance(IReactViewInstance viewInstance) noexcept;
-  /*Windows::Foundation::IAsyncAction */ void DetachViewInstance() noexcept;
+  Windows::Foundation::IAsyncAction ReloadViewInstance() noexcept;
+  Windows::Foundation::IAsyncAction ReloadViewInstanceWithOptions(ReactNative::ReactViewOptions options) noexcept;
+  Windows::Foundation::IAsyncAction UnloadViewInstance() noexcept;
+  Windows::Foundation::IAsyncAction AttachViewInstance(IReactViewInstance viewInstance) noexcept;
+  Windows::Foundation::IAsyncAction DetachViewInstance() noexcept;
 
  private:
   Mso::CntPtr<Mso::React::IReactViewHost> m_viewHost;

package/Microsoft.ReactNative/ReactCoreInjection.idl

@@ -50,19 +50,19 @@ DOC_STRING("Settings per each IReactViewHost associated with an IReactHost insta
     interface IReactViewHost
   {
     DOC_STRING("Reloads the IReactViewInstance if it is attached.")
-      /*Windows.Foundation.IAsyncAction*/ void ReloadViewInstance();
+      Windows.Foundation.IAsyncAction ReloadViewInstance();
 
     DOC_STRING("Reloads IReactViewInstance if it is attached with a new set of options.")
-      /*Windows.Foundation.IAsyncAction*/ void ReloadViewInstanceWithOptions(ReactViewOptions options);
+      Windows.Foundation.IAsyncAction ReloadViewInstanceWithOptions(ReactViewOptions options);
 
     DOC_STRING("Unloads the attached IReactViewInstance.")
-      /*Windows.Foundation.IAsyncAction*/ void UnloadViewInstance();
+      Windows.Foundation.IAsyncAction UnloadViewInstance();
 
     DOC_STRING("Attaches IReactViewInstance to the IReactViewHost.")
-      /*Windows.Foundation.IAsyncAction*/ void AttachViewInstance(IReactViewInstance viewInstance);
+      Windows.Foundation.IAsyncAction AttachViewInstance(IReactViewInstance viewInstance);
 
     DOC_STRING("Detaches IReactViewInstance from the IReactViewHost.")
-      /*Windows.Foundation.IAsyncAction*/ void DetachViewInstance();
+      Windows.Foundation.IAsyncAction DetachViewInstance();
   }
 
   [experimental]