react-native-windows 0.66.2 → 0.66.6

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/Microsoft.ReactNative.Managed.CodeGen/CodeGenerator.Module.cs

@@ -375,7 +375,7 @@ namespace Microsoft.ReactNative.Managed.CodeGen
     {
       // generates:
       //   moduleBuilder.AddInitializer((IReactContext reactContext) =>
-      //      module.MyEvent = (ArgType0 arg0, ArgType1 arg1, ...) => reactContext.EmitJsEvent("eventEmitterName", "eventName", arg0, arg1, ...);
+      //      module.MyEvent = (ArgType0 arg0, ArgType1 arg1, ...) => new ReactContext(reactContext).EmitJsEvent("eventEmitterName", "eventName", arg0, arg1, ...);
       return InvocationStatement(
         MemberAccessExpression(ReactNativeNames.ModuleBuilder, ReactNativeNames.AddInitializer),
         ParenthesizedLambdaExpression(
@@ -389,7 +389,7 @@ namespace Microsoft.ReactNative.Managed.CodeGen
     {
       // generates:
       //   moduleBuilder.AddInitializer((IReactContext reactContext) =>
-      //      module.MyEvent = (ArgType0 arg0, ArgType1 arg1, ...) => reactContext.EmitJsFunction("moduleName", "eventName", arg0, arg1, ...);
+      //      module.MyEvent = (ArgType0 arg0, ArgType1 arg1, ...) => new ReactContext(reactContext).EmitJsFunction("moduleName", "eventName", arg0, arg1, ...);
       return InvocationStatement(
         MemberAccessExpression(ReactNativeNames.ModuleBuilder, ReactNativeNames.AddInitializer),
         ParenthesizedLambdaExpression(
@@ -411,7 +411,7 @@ namespace Microsoft.ReactNative.Managed.CodeGen
           block: null,
           expressionBody: InvocationExpression(
             MemberAccessExpression(ReactNativeNames.Module, Identifier(initializer.Method.Name)),
-            ObjectCreationExpression(ReactTypes.ReactContext, IdentifierName((ReactNativeNames.ReactContextLocalName)))
+            ObjectCreationExpression(ReactTypes.ReactContext, IdentifierName(ReactNativeNames.ReactContextLocalName))
             )));
     }
 
@@ -420,7 +420,8 @@ namespace Microsoft.ReactNative.Managed.CodeGen
 
       var lambdaParams = new List<ParameterSyntax>(callback.CallbackParameters.Length);
       var arguments = new List<ArgumentSyntax>(callback.CallbackParameters.Length);
-      arguments.Add(Argument(IdentifierName(ReactNativeNames.WriterLocalName)));
+      arguments.Add(Argument(LiteralExpression(callback.CallbackContextName)));
+      arguments.Add(Argument(LiteralExpression(callback.Name)));
 
       for (int i = 0; i < callback.CallbackParameters.Length; i++)
       {
@@ -433,10 +434,10 @@ namespace Microsoft.ReactNative.Managed.CodeGen
 
       // generates:
       //  module.<callackName> = (ArgType0 arg0, ArgType1 arg0, ...) =>
-      //    reactContext.<contextCallbackMethod>(
+      //    new ReactContext(reactContext).<contextCallbackMethod>(
       //      eventEmitterName,
       //      eventName,
-      //      writer => writer.WriteArgs(arg0, arg1, ...)
+      //      arg0, arg1, ...
       //      )
       return
         AssignmentExpression(
@@ -446,16 +447,11 @@ namespace Microsoft.ReactNative.Managed.CodeGen
             parameterList: ParameterList(lambdaParams.ToArray()),
             block: null,
             expressionBody: InvocationExpression(
-              MemberAccessExpression(ReactNativeNames.ReactContextLocalName, contextCallbackMethod),
-              LiteralExpression(callback.CallbackContextName),
-              LiteralExpression(callback.Name),
-              ParenthesizedLambdaExpression(
-                parameterList: ParameterList(Parameter(ReactNativeNames.WriterLocalName)),
-                block: null,
-                expressionBody: InvocationExpression(
-                  MemberAccessExpression(ReactTypes.JSValueWriter, ReactNativeNames.WriteArgsMethodName),
-                  arguments
-                  )))));
+              MemberAccessExpression(
+                ObjectCreationExpression(ReactTypes.ReactContext, IdentifierName(ReactNativeNames.ReactContextLocalName)),
+                contextCallbackMethod),
+              arguments
+              )));
     }
 
     private string GetMethodReturnTypeFromStyle(ReactMethod.MethodReturnStyle returnStyle)

package/Microsoft.ReactNative.Managed.CodeGen/SyntaxHelpers.cs

@@ -38,20 +38,28 @@ namespace Microsoft.ReactNative.Managed.CodeGen
       return InvocationStatement(SyntaxFactory.IdentifierName(methodName), arguments);
     }
 
-    internal static ExpressionSyntax MemberAccessExpression(SyntaxToken instance, SyntaxToken method)
+    internal static ExpressionSyntax MemberAccessExpression(ExpressionSyntax instance, SyntaxToken member)
+    {
+      return SyntaxFactory.MemberAccessExpression(
+        SyntaxKind.SimpleMemberAccessExpression,
+        instance,
+        SyntaxFactory.IdentifierName(member));
+    }
+
+    internal static ExpressionSyntax MemberAccessExpression(SyntaxToken instance, SyntaxToken member)
     {
       return SyntaxFactory.MemberAccessExpression(
         SyntaxKind.SimpleMemberAccessExpression,
         SyntaxFactory.IdentifierName(instance),
-        SyntaxFactory.IdentifierName(method));
+        SyntaxFactory.IdentifierName(member));
     }
 
-    internal static ExpressionSyntax MemberAccessExpression(ISymbol type, SyntaxToken method)
+    internal static ExpressionSyntax MemberAccessExpression(ISymbol type, SyntaxToken member)
     {
       return SyntaxFactory.MemberAccessExpression(
         SyntaxKind.SimpleMemberAccessExpression,
         type.ToTypeSyntax(),
-        SyntaxFactory.IdentifierName(method));
+        SyntaxFactory.IdentifierName(member));
     }
 
     internal static StatementSyntax LocalDeclarationStatement(ISymbol type, SyntaxToken variableName, ExpressionSyntax initializer)

package/PropertySheets/React.Cpp.props

@@ -85,6 +85,7 @@
         BOOST_NO_TYPEID               - Configure boost not to check typeid (not to use RTTI)
         BOOST_SYSTEM_SOURCE           - Build boost::system symbols from sources (drop dependency on boost_system.lib).
         GTEST_HAS_RTTI                - Let GTest know not to use RTTI
+        USE_EDGEMODE_JSRT               When using Chakra, enforce System Chakra instead of JS9.
         WIN32_LEAN_AND_MEAN           - Reduce the Windows API included surface.
         WINRT_LEAN_AND_MEAN           - Disable rarely used cppwinrt templates that impact compile-time/PCH size.
       -->
@@ -96,6 +97,7 @@
         BOOST_NO_TYPEID;
         BOOST_SYSTEM_SOURCE;
         GTEST_HAS_RTTI=0;
+        USE_EDGEMODE_JSRT;
         WIN32_LEAN_AND_MEAN;
         %(PreprocessorDefinitions)
       </PreprocessorDefinitions>

package/Shared/IWebSocketResource.h

@@ -79,17 +79,17 @@ struct IWebSocketResource {
   /// <summary>
   /// Creates an <c>IWebSocketResource</c> instance.
   /// </summary>
-  /// <param name="url">
-  /// WebSocket URL address the instance will connect to.
-  /// The address's scheme can be either ws:// or wss://.
-  /// </param>
-  static std::shared_ptr<IWebSocketResource> Make(std::string &&url);
+  static std::shared_ptr<IWebSocketResource> Make();
 
   virtual ~IWebSocketResource() noexcept {}
 
   /// <summary>
   /// Establishes a continuous connection with the remote endpoint.
   /// </summary>
+  /// <param name="url">
+  /// WebSocket URL address the instance will connect to.
+  /// The address's scheme can be either ws:// or wss://.
+  /// </param>
   /// <param name="protocols">
   /// Currently unused
   /// </param>
@@ -97,7 +97,7 @@ struct IWebSocketResource {
   /// HTTP header fields passed by the remote endpoint, to be used in the
   /// handshake process.
   /// </param>
-  virtual void Connect(const Protocols &protocols = {}, const Options &options = {}) noexcept = 0;
+  virtual void Connect(std::string &&url, const Protocols &protocols = {}, const Options &options = {}) noexcept = 0;
 
   /// <summary>
   /// Sends a ping frame to the remote endpoint.

package/Shared/InspectorPackagerConnection.cpp

@@ -204,8 +204,7 @@ winrt::fire_and_forget InspectorPackagerConnection::connectAsync() {
   co_await winrt::resume_background();
 
   std::vector<winrt::Windows::Security::Cryptography::Certificates::ChainValidationResult> certExceptions;
-  m_packagerWebSocketConnection =
-      std::make_shared<Microsoft::React::WinRTWebSocketResource>(m_url, std::move(certExceptions));
+  m_packagerWebSocketConnection = std::make_shared<Microsoft::React::WinRTWebSocketResource>(std::move(certExceptions));
 
   m_packagerWebSocketConnection->SetOnError([](const Microsoft::React::IWebSocketResource::Error &err) {
     facebook::react::tracing::error(err.Message.c_str());
@@ -270,7 +269,7 @@ winrt::fire_and_forget InspectorPackagerConnection::connectAsync() {
 
   Microsoft::React::IWebSocketResource::Protocols protocols;
   Microsoft::React::IWebSocketResource::Options options;
-  m_packagerWebSocketConnection->Connect(protocols, options);
+  m_packagerWebSocketConnection->Connect(std::string{m_url}, protocols, options);
 
   co_return;
 }

package/Shared/JSI/ChakraApi.cpp

@@ -144,17 +144,9 @@ ChakraApi::JsRefHolder::~JsRefHolder() noexcept {
   JsPropertyIdRef propertyId{JS_INVALID_REFERENCE};
   // We use a #ifdef here because we can avoid a UTF-8 to UTF-16 conversion
   // using ChakraCore's JsCreatePropertyId API.
-#ifdef CHAKRACORE
-  if (React::GetRuntimeOptionBool("JSI.ForceSystemChakra")) {
-    std::wstring utf16 = Common::Unicode::Utf8ToUtf16(name.data(), name.length());
-    ChakraVerifyJsErrorElseThrow(JsGetPropertyIdFromName(utf16.data(), &propertyId));
-  } else {
-    ChakraVerifyJsErrorElseThrow(JsCreatePropertyId(name.data(), name.length(), &propertyId));
-  }
-#else
   std::wstring utf16 = Common::Unicode::Utf8ToUtf16(name.data(), name.length());
   ChakraVerifyJsErrorElseThrow(JsGetPropertyIdFromName(utf16.data(), &propertyId));
-#endif
+
   return propertyId;
 }
 
@@ -275,18 +267,7 @@ ChakraApi::JsRefHolder::~JsRefHolder() noexcept {
 /*static*/ JsValueRef ChakraApi::PointerToString(std::string_view value) {
   ChakraVerifyElseThrow(value.data(), "Cannot convert a nullptr to a JS string.");
 
-  // ChakraCore  API helps to reduce cost of UTF-8 to UTF-16 conversion.
-#ifdef CHAKRACORE
-  if (React::GetRuntimeOptionBool("JSI.ForceSystemChakra")) {
-    return PointerToString(Common::Unicode::Utf8ToUtf16(value));
-  } else {
-    JsValueRef result{JS_INVALID_REFERENCE};
-    ChakraVerifyJsErrorElseThrow(JsCreateString(value.data(), value.length(), &result));
-    return result;
-  }
-#else
   return PointerToString(Common::Unicode::Utf8ToUtf16(value));
-#endif
 }
 
 /*static*/ std::wstring_view ChakraApi::StringToPointer(JsValueRef string) {
@@ -300,24 +281,7 @@ ChakraApi::JsRefHolder::~JsRefHolder() noexcept {
   ChakraVerifyElseThrow(
       GetValueType(string) == JsString, "Cannot convert a non JS string ChakraObjectRef to a std::string.");
 
-  // We use a #ifdef here because we can avoid a UTF-8 to UTF-16 conversion
-  // using ChakraCore's JsCopyString API.
-#ifdef CHAKRACORE
-  if (React::GetRuntimeOptionBool("JSI.ForceSystemChakra")) {
-    return Common::Unicode::Utf16ToUtf8(StringToPointer(string));
-  } else {
-    size_t length{0};
-    ChakraVerifyJsErrorElseThrow(JsCopyString(string, nullptr, 0, &length));
-
-    std::string result(length, 'a');
-    ChakraVerifyJsErrorElseThrow(JsCopyString(string, result.data(), result.length(), &length));
-
-    ChakraVerifyElseThrow(length == result.length(), "Failed to convert a JS string to a std::string.");
-    return result;
-  }
-#else
   return Common::Unicode::Utf16ToUtf8(StringToPointer(string));
-#endif
 }
 
 /*static*/ JsValueRef ChakraApi::ConvertValueToString(JsValueRef value) {

package/Shared/JSI/ChakraApi.h

@@ -3,14 +3,10 @@
 
 #pragma once
 
-#ifdef CHAKRACORE
-#include "ChakraCore.h"
-#else
 #ifndef USE_EDGEMODE_JSRT
 #define USE_EDGEMODE_JSRT
 #endif
 #include <jsrt.h>
-#endif
 
 #include <cassert>
 #include <cstddef>

package/Shared/JSI/ChakraJsiRuntime_edgemode.cpp

@@ -15,7 +15,7 @@ JsStartDebugging();
 
 namespace Microsoft::JSI {
 
-#if defined(USE_EDGEMODE_JSRT) && !defined(CHAKRACORE)
+#if defined(USE_EDGEMODE_JSRT)
 /*static*/ void ChakraRuntime::initRuntimeVersion() noexcept {}
 #endif
 
@@ -42,11 +42,7 @@ std::unique_ptr<const facebook::jsi::Buffer> SystemChakraRuntime::generatePrepar
   const std::wstring scriptUTF16 =
       Microsoft::Common::Unicode::Utf8ToUtf16(reinterpret_cast<const char *>(sourceBuffer.data()), sourceBuffer.size());
 
-#ifdef CHAKRACORE
-  unsigned int bytecodeSize = 0;
-#else
   unsigned long bytecodeSize = 0;
-#endif
   if (JsSerializeScript(scriptUTF16.c_str(), nullptr, &bytecodeSize) == JsNoError) {
     std::unique_ptr<ByteArrayBuffer> bytecodeBuffer(std::make_unique<ByteArrayBuffer>(bytecodeSize));
     if (JsSerializeScript(scriptUTF16.c_str(), bytecodeBuffer->data(), &bytecodeSize) == JsNoError) {

package/Shared/JSI/ChakraRuntime.cpp

@@ -16,14 +16,10 @@
 #include <sstream>
 #include <unordered_set>
 
-#ifdef CHAKRACORE
-#include <ChakraCore.h>
-#else
 #ifndef USE_EDGEMODE_JSRT
 #define USE_EDGEMODE_JSRT
 #endif
 #include <jsrt.h>
-#endif
 
 namespace Microsoft::JSI {
 
@@ -1011,15 +1007,7 @@ std::once_flag ChakraRuntime::s_runtimeVersionInitFlag;
 uint64_t ChakraRuntime::s_runtimeVersion = 0;
 
 std::unique_ptr<facebook::jsi::Runtime> makeChakraRuntime(ChakraRuntimeArgs &&args) noexcept {
-#ifdef CHAKRACORE
-  if (React::GetRuntimeOptionBool("JSI.ForceSystemChakra")) {
-    return MakeSystemChakraRuntime(std::move(args));
-  } else {
-    return MakeChakraCoreRuntime(std::move(args));
-  }
-#else
   return MakeSystemChakraRuntime(std::move(args));
-#endif // CHAKRACORE
 }
 
 } // namespace Microsoft::JSI

package/Shared/JSI/ChakraRuntimeFactory.h

@@ -11,7 +11,5 @@ struct ChakraRuntimeArgs;
 
 std::unique_ptr<facebook::jsi::Runtime> makeChakraRuntime(ChakraRuntimeArgs &&args) noexcept;
 
-std::unique_ptr<facebook::jsi::Runtime> MakeChakraCoreRuntime(ChakraRuntimeArgs &&args) noexcept;
-
 std::unique_ptr<facebook::jsi::Runtime> MakeSystemChakraRuntime(ChakraRuntimeArgs &&args) noexcept;
 } // namespace Microsoft::JSI