react-native-windows 0.66.2 → 0.66.3

package/CHANGELOG.json

@@ -2,7 +2,28 @@
   "name": "react-native-windows",
   "entries": [
     {
-      "date": "Mon, 25 Oct 2021 15:07:02 GMT",
+      "date": "Mon, 01 Nov 2021 19:10:15 GMT",
+      "tag": "react-native-windows_v0.66.3",
+      "version": "0.66.3",
+      "comments": {
+        "patch": [
+          {
+            "comment": "Fix Microsoft.ReactNative.dll version string",
+            "author": "asklar@microsoft.com",
+            "commit": "61da34482a055ee52ba23b826d154a7a9fbf0bee",
+            "package": "react-native-windows"
+          },
+          {
+            "comment": "Fix crash when using TextInput.blur()",
+            "author": "30809111+acoates-ms@users.noreply.github.com",
+            "commit": "da602613ebf5593feebb432bffd8a14f0679f2cc",
+            "package": "react-native-windows"
+          }
+        ]
+      }
+    },
+    {
+      "date": "Mon, 25 Oct 2021 15:07:26 GMT",
       "tag": "react-native-windows_v0.66.2",
       "version": "0.66.2",
       "comments": {

package/CHANGELOG.md

@@ -1,21 +1,30 @@
 # Change Log - react-native-windows
 
-This log was last generated on Mon, 25 Oct 2021 15:07:02 GMT and should not be manually modified.
+This log was last generated on Mon, 01 Nov 2021 19:10:15 GMT and should not be manually modified.
 
 <!-- Start content -->
 
-## 0.66.2
+## 0.66.3
 
-Mon, 25 Oct 2021 15:07:02 GMT
+Mon, 01 Nov 2021 19:10:15 GMT
 
 ### Patches
 
-- Add more symbols to Hermes DLL Loader Shim (ngerlem@microsoft.com)
-- Fix win32 apps referencing the M.RN nuget package so they can use RNW (asklar@microsoft.com)
-- Fix EBUSY race conditions between metro bundler and msbuild (dannyvv@microsoft.com)
-- Fix crash when direct debugging Chakra (anandrag@microsoft.com)
-- Fix AppTheme Regressions (ngerlem@microsoft.com)
+- Fix Microsoft.ReactNative.dll version string (asklar@microsoft.com)
+- Fix crash when using TextInput.blur() (30809111+acoates-ms@users.noreply.github.com)
 
+## 0.66.2
+
+Mon, 25 Oct 2021 15:07:26 GMT
+
+### Patches
+
+- Add more symbols to Hermes DLL Loader Shim (ngerlem@microsoft.com)
+- Fix win32 apps referencing the M.RN nuget package so they can use RNW (asklar@microsoft.com)
+- Fix EBUSY race conditions between metro bundler and msbuild (dannyvv@microsoft.com)
+- Fix crash when direct debugging Chakra (anandrag@microsoft.com)
+- Fix AppTheme Regressions (ngerlem@microsoft.com)
+
 ## 0.66.1
 
 Mon, 18 Oct 2021 15:08:36 GMT

package/Microsoft.ReactNative/Modules/NativeUIManager.cpp

@@ -173,11 +173,9 @@ struct RootShadowNode final : public ShadowNodeBase {
   }
 
   void AddView(ShadowNode &child, int64_t index) override {
-    auto panel(GetView().as<winrt::Panel>());
-    if (panel != nullptr) {
-      auto childView = static_cast<ShadowNodeBase &>(child).GetView().as<xaml::UIElement>();
-      panel.Children().InsertAt(static_cast<uint32_t>(index), childView);
-    }
+    auto panel(GetView().as<winrt::Microsoft::ReactNative::ReactRootView>());
+    winrt::get_self<winrt::Microsoft::ReactNative::implementation::ReactRootView>(panel)->AddView(
+        static_cast<uint32_t>(index), static_cast<ShadowNodeBase &>(child).GetView().as<xaml::UIElement>());
   }
 };
 

package/Microsoft.ReactNative/ReactRootView.cpp

@@ -337,9 +337,6 @@ void ReactRootView::ShowInstanceLoading() noexcept {
 
 void ReactRootView::EnsureFocusSafeHarbor() noexcept {
   if (!m_focusSafeHarbor) {
-    // focus safe harbor is delayed to be inserted to the visual tree
-    VerifyElseCrash(Children().Size() == 1);
-
     m_focusSafeHarbor = xaml::Controls::ContentControl{};
     m_focusSafeHarbor.Width(0.0);
     m_focusSafeHarbor.IsTabStop(false);
@@ -526,4 +523,32 @@ Windows::Foundation::Size ReactRootView::ArrangeOverride(Windows::Foundation::Si
   return finalSize;
 }
 
+// Maps react-native's view of the root view to the actual UI
+// react-native is unaware that there are non-RN elements within the ReactRootView
+uint32_t ReactRootView::RNIndexToXamlIndex(uint32_t index) noexcept {
+  // If m_focusSafeHarbor exists, it should be at index 0
+  // m_xamlRootView is the next element, followed by any RN content.
+#if DEBUG
+  uint32_t findIndex{0};
+  Assert(!m_focusSafeHarbor || Children().IndexOf(m_focusSafeHarbor, findIndex) && findIndex == 0);
+  Assert(Children().IndexOf(m_xamlRootView, findIndex) && findIndex == (m_focusSafeHarbor ? 1 : 0));
+#endif
+
+  return index + (m_focusSafeHarbor ? 2 : 1);
+}
+
+void ReactRootView::AddView(uint32_t index, xaml::UIElement child) {
+  Children().InsertAt(RNIndexToXamlIndex(index), child);
+}
+
+void ReactRootView::RemoveAllChildren() {
+  const uint32_t numLeft = m_focusSafeHarbor ? 2 : 1;
+  while (Children().Size() > numLeft)
+    Children().RemoveAt(numLeft);
+}
+
+void ReactRootView::RemoveChildAt(uint32_t index) {
+  Children().RemoveAt(RNIndexToXamlIndex(index));
+}
+
 } // namespace winrt::Microsoft::ReactNative::implementation

package/Microsoft.ReactNative/ReactRootView.h

@@ -42,6 +42,11 @@ struct ReactRootView : ReactRootViewT<ReactRootView>, ::Microsoft::ReactNative::
 
   void ReloadView() noexcept;
 
+  // Used by RootViewManager
+  void AddView(uint32_t index, xaml::UIElement child);
+  void RemoveAllChildren();
+  void RemoveChildAt(uint32_t index);
+
  public: // IXamlRootView
   ::Microsoft::ReactNative::XamlView GetXamlView() const noexcept override;
 
@@ -98,6 +103,7 @@ struct ReactRootView : ReactRootViewT<ReactRootView>, ::Microsoft::ReactNative::
   //     JS created children
   winrt::Grid m_xamlRootView{nullptr};
 
+  uint32_t RNIndexToXamlIndex(uint32_t index) noexcept;
   void UpdatePerspective();
   void UpdateRootViewInternal() noexcept;
   void ClearLoadingUI() noexcept;

package/Microsoft.ReactNative/Version.rc

@@ -4,7 +4,7 @@
 #define STRINGIZE(s) #s
 
 #ifdef RNW_PKG_VERSION_STR
-#define VER_FILEVERSION_STR STRINGIZE(RNW_PKG_VERSION_STR)
+#define VER_FILEVERSION_STR XSTRINGIZE(RNW_PKG_VERSION_STR)
 #else
 #define VER_FILEVERSION_STR "Private Build"
 #endif

package/Microsoft.ReactNative/Views/RootViewManager.cpp

@@ -6,6 +6,7 @@
 #include "RootViewManager.h"
 
 #include <IXamlRootView.h>
+#include <ReactRootView.h>
 #include <UI.Xaml.Controls.h>
 
 namespace winrt {
@@ -29,21 +30,19 @@ XamlView RootViewManager::CreateViewCore(int64_t /*tag*/, const winrt::Microsoft
 }
 
 void RootViewManager::AddView(const XamlView &parent, const XamlView &child, int64_t index) {
-  auto panel(parent.as<winrt::Panel>());
-  if (panel != nullptr)
-    panel.Children().InsertAt(static_cast<uint32_t>(index), child.as<xaml::UIElement>());
+  // Goes through RootShadowNode::AddView instead of here
+  assert(false);
 }
 
 void RootViewManager::RemoveAllChildren(const XamlView &parent) {
-  auto panel(parent.as<winrt::Panel>());
-  if (panel != nullptr)
-    panel.Children().Clear();
+  auto panel(parent.as<winrt::Microsoft::ReactNative::ReactRootView>());
+  winrt::get_self<winrt::Microsoft::ReactNative::implementation::ReactRootView>(panel)->RemoveAllChildren();
 }
 
 void RootViewManager::RemoveChildAt(const XamlView &parent, int64_t index) {
-  auto panel(parent.as<winrt::Panel>());
-  if (panel != nullptr)
-    panel.Children().RemoveAt(static_cast<uint32_t>(index));
+  auto panel(parent.as<winrt::Microsoft::ReactNative::ReactRootView>());
+  winrt::get_self<winrt::Microsoft::ReactNative::implementation::ReactRootView>(panel)->RemoveChildAt(
+      static_cast<uint32_t>(index));
 }
 
 void RootViewManager::SetLayoutProps(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-windows",
-  "version": "0.66.2",
+  "version": "0.66.3",
   "license": "MIT",
   "repository": {
     "type": "git",