react-native-windows 0.71.7 → 0.72.0-preview.1

package/Microsoft.ReactNative/ReactInstanceSettings.h

@@ -63,6 +63,9 @@ struct ReactInstanceSettings : ReactInstanceSettingsT<ReactInstanceSettings> {
   hstring JavaScriptBundleFile() noexcept;
   void JavaScriptBundleFile(hstring const &value) noexcept;
 
+  hstring BundleAppId() noexcept;
+  void BundleAppId(hstring const &value) noexcept;
+
   //! Should the instance run in a remote environment such as within a browser
   //! By default, this is using a browser navigated to  http://localhost:8081/debugger-ui served
   //! by Metro/Haul. Debugging will start as soon as the React Native instance is loaded.
@@ -170,6 +173,7 @@ struct ReactInstanceSettings : ReactInstanceSettingsT<ReactInstanceSettings> {
   Windows::Foundation::Collections::IVector<IReactPackageProvider> m_packageProviders{
       single_threaded_vector<IReactPackageProvider>()};
   hstring m_javaScriptBundleFile{};
+  hstring m_bundleAppId{};
   bool m_enableJITCompilation{true};
   bool m_enableByteCodeCaching{false};
   hstring m_byteCodeFileUri{};
@@ -227,6 +231,14 @@ inline void ReactInstanceSettings::JavaScriptBundleFile(hstring const &value) no
   m_javaScriptBundleFile = value;
 }
 
+inline hstring ReactInstanceSettings::BundleAppId() noexcept {
+  return m_bundleAppId;
+}
+
+inline void ReactInstanceSettings::BundleAppId(hstring const &value) noexcept {
+  m_bundleAppId = value;
+}
+
 inline bool ReactInstanceSettings::EnableJITCompilation() noexcept {
   return m_enableJITCompilation;
 }

package/Microsoft.ReactNative/ReactInstanceSettings.idl

@@ -105,6 +105,12 @@ namespace Microsoft.ReactNative
     DOC_DEFAULT("index.windows")
     String JavaScriptBundleFile { get; set; };
 
+    DOC_STRING(
+      "The name of the app passed to the packager server via the 'app' query parameter. "
+      "This is useful when bundling multiple applications from the same packager instance. "
+      "If no value is set, the parameter will not be passed.")
+    String BundleAppId { get; set; };
+
     DOC_STRING(
       "Controls whether the instance JavaScript runs in a remote environment such as within a browser.\n"
       "By default, this is using a browser navigated to http://localhost:8081/debugger-ui served by Metro/Haul.\n"

package/Microsoft.ReactNative/ReactNativeHost.cpp

@@ -14,6 +14,11 @@
 #include "IReactContext.h"
 #include "ReactInstanceSettings.h"
 
+#ifdef USE_FABRIC
+#include <Fabric/WindowsComponentDescriptorRegistry.h>
+#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
+#endif
+
 using namespace winrt;
 using namespace Windows::Foundation;
 using namespace Windows::Foundation::Collections;
@@ -87,12 +92,23 @@ IAsyncAction ReactNativeHost::ReloadInstance() noexcept {
 
   auto turboModulesProvider = std::make_shared<TurboModulesProvider>();
 
+#ifdef USE_FABRIC
+  auto componentregistry = std::make_shared<::Microsoft::ReactNative::WindowsComponentDescriptorRegistry>();
+  auto componentDescriptorRegistry = std::make_shared<facebook::react::ComponentDescriptorProviderRegistry>();
+
+  ::Microsoft::ReactNative::WindowsComponentDescriptorRegistry::AddToProperties(
+      ReactPropertyBag(m_instanceSettings.Properties()), componentregistry);
+#endif
+
   m_packageBuilder = make<ReactPackageBuilder>(
       modulesProvider,
 #ifndef CORE_ABI
       viewManagersProvider,
 #endif
       turboModulesProvider,
+#ifdef USE_FABRIC
+      componentregistry,
+#endif
       m_instanceSettings.UseWebDebugger());
 
   if (auto packageProviders = InstanceSettings().PackageProviders()) {
@@ -134,6 +150,7 @@ IAsyncAction ReactNativeHost::ReloadInstance() noexcept {
   reactOptions.DeveloperSettings.SourceBundleHost = to_string(m_instanceSettings.SourceBundleHost());
   reactOptions.DeveloperSettings.SourceBundlePort = m_instanceSettings.SourceBundlePort();
   reactOptions.DeveloperSettings.RequestInlineSourceMap = m_instanceSettings.RequestInlineSourceMap();
+  reactOptions.DeveloperSettings.BundleAppId = to_string(m_instanceSettings.BundleAppId());
 
   reactOptions.ByteCodeFileUri = to_string(m_instanceSettings.ByteCodeFileUri());
   reactOptions.EnableByteCodeCaching = m_instanceSettings.EnableByteCodeCaching();

package/Microsoft.ReactNative/ReactPackageBuilder.cpp

@@ -4,6 +4,10 @@
 #include "pch.h"
 #include "ReactPackageBuilder.h"
 
+#ifdef USE_FABRIC
+#include <Fabric/AbiViewComponentDescriptor.h>
+#endif
+
 namespace winrt::Microsoft::ReactNative {
 
 //===========================================================================
@@ -16,12 +20,19 @@ ReactPackageBuilder::ReactPackageBuilder(
     std::shared_ptr<ViewManagersProvider> const &viewManagersProvider,
 #endif
     std::shared_ptr<TurboModulesProvider> const &turboModulesProvider,
+#ifdef USE_FABRIC
+    std::shared_ptr<::Microsoft::ReactNative::WindowsComponentDescriptorRegistry> const &componentRegistry,
+#endif
     bool isWebDebugging) noexcept
     : m_modulesProvider{modulesProvider},
 #ifndef CORE_ABI
       m_viewManagersProvider{viewManagersProvider},
 #endif
       m_turboModulesProvider{turboModulesProvider},
+#ifdef USE_FABRIC
+      m_componentRegistry{componentRegistry},
+#endif
+
       m_isWebDebugging{isWebDebugging} {
 }
 
@@ -46,4 +57,11 @@ void ReactPackageBuilder::AddTurboModule(
     m_turboModulesProvider->AddModuleProvider(moduleName, moduleProvider, true);
 }
 
+#ifdef USE_FABRIC
+void ReactPackageBuilder::AddViewComponent(
+    winrt::hstring componentName,
+    ReactViewComponentProvider const &viewComponentProvider) noexcept {
+  m_componentRegistry->Add(componentName, viewComponentProvider);
+}
+#endif
 } // namespace winrt::Microsoft::ReactNative

package/Microsoft.ReactNative/ReactPackageBuilder.h

@@ -8,16 +8,29 @@
 #include "ViewManagersProvider.h"
 #endif
 #include "winrt/Microsoft.ReactNative.h"
+#ifdef USE_FABRIC
+#include <Fabric/WindowsComponentDescriptorRegistry.h>
+#endif
 
 namespace winrt::Microsoft::ReactNative {
 
-struct ReactPackageBuilder : winrt::implements<ReactPackageBuilder, IReactPackageBuilder> {
+struct ReactPackageBuilder : winrt::implements<
+                                 ReactPackageBuilder,
+                                 IReactPackageBuilder
+#ifdef USE_FABRIC
+                                 ,
+                                 IReactPackageBuilderFabric
+#endif
+                                 > {
   ReactPackageBuilder(
       std::shared_ptr<NativeModulesProvider> const &modulesProvider,
 #ifndef CORE_ABI
       std::shared_ptr<ViewManagersProvider> const &viewManagersProvider,
 #endif
       std::shared_ptr<TurboModulesProvider> const &turboModulesProvider,
+#ifdef USE_FABRIC
+      std::shared_ptr<::Microsoft::ReactNative::WindowsComponentDescriptorRegistry> const &componentRegistry,
+#endif
       bool isWebDebugging) noexcept;
 
  public: // IReactPackageBuilder
@@ -27,12 +40,22 @@ struct ReactPackageBuilder : winrt::implements<ReactPackageBuilder, IReactPackag
 #endif
   void AddTurboModule(hstring const &moduleName, ReactModuleProvider const &moduleProvider) noexcept;
 
+#ifdef USE_FABRIC
+  // IReactPackageBuilderFabric
+  void AddViewComponent(winrt::hstring componentName, ReactViewComponentProvider const &viewComponentProvider) noexcept;
+#endif // USE_FABRIC
+
  private:
   std::shared_ptr<NativeModulesProvider> m_modulesProvider;
 #ifndef CORE_ABI
   std::shared_ptr<ViewManagersProvider> m_viewManagersProvider;
 #endif
   std::shared_ptr<TurboModulesProvider> m_turboModulesProvider;
+
+#ifdef USE_FABRIC
+  std::shared_ptr<::Microsoft::ReactNative::WindowsComponentDescriptorRegistry> m_componentRegistry;
+#endif
+
   const bool m_isWebDebugging;
 };
 

package/Microsoft.ReactNative/ReactRootView.cpp

@@ -206,11 +206,11 @@ void ReactRootView::UninitRootView() noexcept {
     }
   }
 
-  if (m_touchEventHandler != nullptr) {
+  if (m_touchEventHandler) {
     m_touchEventHandler->RemoveTouchHandlers();
   }
 
-  if (!m_previewKeyboardEventHandlerOnRoot) {
+  if (m_previewKeyboardEventHandlerOnRoot) {
     m_previewKeyboardEventHandlerOnRoot->unhook();
   }
 

package/Microsoft.ReactNative/RedBox.cpp

@@ -17,6 +17,7 @@
 #ifndef CORE_ABI
 
 #ifdef USE_FABRIC
+#include <ReactCoreInjection.h>
 #include <Shobjidl.h>
 #include <Utils/Helpers.h>
 #include <winrt/Windows.UI.Popups.h>
@@ -90,7 +91,7 @@ struct RedBox : public std::enable_shared_from_this<RedBox> {
 
     auto msg = winrt::Windows::UI::Popups::MessageDialog(winrt::to_hstring(ss.str()), L"React Native Error");
     auto hwnd = reinterpret_cast<HWND>(
-        *m_propBag.Get(winrt::Microsoft::ReactNative::ReactPropertyId<uint64_t>(L"RootHwndForDevUI")));
+        winrt::Microsoft::ReactNative::implementation::ReactCoreInjection::GetTopLevelWindowId(m_propBag.Handle()));
     auto initializeWithWindow{msg.as<::IInitializeWithWindow>()};
     initializeWithWindow->Initialize(hwnd);
     msg.Commands().Append(

package/Microsoft.ReactNative/Utils/Helpers.cpp

@@ -3,12 +3,9 @@
 
 #include "pch.h"
 
-#include <Modules/NativeUIManager.h>
-#include <UI.Xaml.Media.h>
 #include <Utils/Helpers.h>
 #include <winrt/Windows.Foundation.Metadata.h>
 
-#include <Modules/PaperUIManagerModule.h>
 #include <appmodel.h>
 #include <processthreadsapi.h>
 
@@ -24,35 +21,6 @@ using namespace Windows::Foundation::Metadata;
 
 namespace Microsoft::ReactNative {
 
-// Not only react-native, native modules could set tag too for controls.
-// For example, to identify an clicked item, customer may add tag in
-// NavigationView since content for the two NavigationViewItem are empty.
-//
-// <NavigationView>
-//  <NavigationViewItem Icon="Accept" Tag="1" />
-//  <NavigationViewItem Icon="Accept" Tag="2" />
-// </NavigationView>
-// Instead of deduce view id directly from FrameworkElement.Tag, this do
-// additional check by uimanager.
-ReactId getViewId(const Mso::React::IReactContext &context, xaml::FrameworkElement const &fe) {
-  ReactId reactId{};
-  if (auto uiManager = Microsoft::ReactNative::GetNativeUIManager(context).lock()) {
-    if (auto peer = uiManager->reactPeerOrContainerFrom(fe)) {
-      reactId.isValid = true;
-      reactId.tag = Microsoft::ReactNative::GetTag(peer);
-    }
-  }
-  return reactId;
-};
-
-std::int32_t CountOpenPopups() {
-  // TODO: Use VisualTreeHelper::GetOpenPopupsFromXamlRoot when running against
-  // RS6
-  winrt::Windows::Foundation::Collections::IVectorView<xaml::Controls::Primitives::Popup> popups =
-      xaml::Media::VisualTreeHelper::GetOpenPopups(xaml::Window::Current());
-  return (int32_t)popups.Size();
-}
-
 template <uint16_t APIVersion>
 bool IsAPIContractVxAvailable() {
   static bool isAPIContractVxAvailableInitialized = false;

package/Microsoft.ReactNative/Utils/Helpers.h

@@ -12,19 +12,11 @@ namespace Microsoft::ReactNative {
 
 using namespace std;
 
-struct ReactId {
-  int64_t tag{0};
-  bool isValid{false};
-};
-
 template <typename T>
 inline T asEnum(winrt::Microsoft::ReactNative::JSValue const &obj) {
   return static_cast<T>(obj.AsInt64());
 }
 
-ReactId getViewId(const Mso::React::IReactContext &context, xaml::FrameworkElement const &fe);
-std::int32_t CountOpenPopups();
-
 bool IsRS3OrHigher();
 bool IsRS4OrHigher();
 bool IsRS5OrHigher();

package/Microsoft.ReactNative/Utils/ImageUtils.cpp

@@ -5,6 +5,8 @@
 #include "ImageUtils.h"
 
 #include <Shared/cdebug.h>
+#include <Utils/CppWinrtLessExceptions.h>
+#include <windows.Web.Http.h>
 #include <winrt/Windows.Security.Cryptography.h>
 #include <winrt/Windows.Web.Http.Headers.h>
 #include <winrt/Windows.Web.Http.h>
@@ -24,7 +26,10 @@ winrt::IAsyncOperation<winrt::IRandomAccessStream> GetImageStreamAsync(ReactImag
     auto httpMethod{
         source.method.empty() ? winrt::HttpMethod::Get() : winrt::HttpMethod{winrt::to_hstring(source.method)}};
 
-    winrt::Uri uri{winrt::to_hstring(source.uri)};
+    winrt::Uri uri = UriTryCreate(winrt::to_hstring(source.uri));
+    if (!uri) {
+      co_return nullptr;
+    }
     winrt::HttpRequestMessage request{httpMethod, uri};
 
     if (!source.headers.empty()) {
@@ -39,14 +44,56 @@ winrt::IAsyncOperation<winrt::IRandomAccessStream> GetImageStreamAsync(ReactImag
     }
 
     winrt::HttpClient httpClient;
-    winrt::HttpResponseMessage response{co_await httpClient.SendRequestAsync(request)};
+    auto httpClientAbi = reinterpret_cast<ABI::Windows::Web::Http::IHttpClient *>(winrt::get_abi(httpClient));
+
+    winrt::Windows::Foundation::IAsyncOperationWithProgress<
+        winrt::Windows::Web::Http::HttpResponseMessage,
+        winrt::Windows::Web::Http::HttpProgress>
+        asyncRequest{nullptr};
+
+    if (FAILED(httpClientAbi->SendRequestAsync(
+            reinterpret_cast<ABI::Windows::Web::Http::IHttpRequestMessage *>(winrt::get_abi(request)),
+            reinterpret_cast<
+                ABI::Windows::Foundation::
+                    __FIAsyncOperationWithProgress_2_Windows__CWeb__CHttp__CHttpResponseMessage_Windows__CWeb__CHttp__CHttpProgress_t
+                        **>(winrt::put_abi(asyncRequest))))) {
+      co_return nullptr;
+    }
+
+    if (!asyncRequest) {
+      co_return nullptr;
+    }
+
+    co_await lessthrow_await_adapter<winrt::Windows::Foundation::IAsyncOperationWithProgress<
+        winrt::Windows::Web::Http::HttpResponseMessage,
+        winrt::Windows::Web::Http::HttpProgress>>{asyncRequest};
+
+    if (FAILED(asyncRequest.ErrorCode())) {
+      co_return nullptr;
+    }
+
+    winrt::HttpResponseMessage response{asyncRequest.GetResults()};
 
     if (response && response.StatusCode() == winrt::HttpStatusCode::Ok) {
-      winrt::IInputStream inputStream{co_await response.Content().ReadAsInputStreamAsync()};
+      auto asyncRead = response.Content().ReadAsInputStreamAsync();
+      co_await lessthrow_await_adapter<winrt::Windows::Foundation::IAsyncOperationWithProgress<
+          winrt::Windows::Storage::Streams::IInputStream,
+          uint64_t>>{asyncRead};
+      if (FAILED(asyncRead.ErrorCode())) {
+        co_return nullptr;
+      }
+
+      winrt::IInputStream inputStream{asyncRead.GetResults()};
       winrt::InMemoryRandomAccessStream memoryStream;
-      co_await winrt::RandomAccessStream::CopyAsync(inputStream, memoryStream);
-      memoryStream.Seek(0);
 
+      auto asyncCopy = winrt::RandomAccessStream::CopyAsync(inputStream, memoryStream);
+      co_await lessthrow_await_adapter<winrt::Windows::Foundation::IAsyncOperationWithProgress<uint64_t, uint64_t>>{
+          asyncCopy};
+      if (FAILED(asyncCopy.ErrorCode())) {
+        co_return nullptr;
+      }
+
+      memoryStream.Seek(0);
       co_return memoryStream;
     }
   } catch (winrt::hresult_error const &e) {
@@ -91,4 +138,20 @@ winrt::IAsyncOperation<winrt::IRandomAccessStream> GetImageMemoryStreamAsync(Rea
   }
 }
 
-} // namespace Microsoft::ReactNative
+// C# provides System.Uri.TryCreate, but no native equivalent seems to exist
+winrt::Uri UriTryCreate(winrt::param::hstring const &uri) {
+  auto factory = winrt::
+      get_activation_factory<winrt::Windows::Foundation::Uri, winrt::Windows::Foundation::IUriRuntimeClassFactory>();
+  auto abiFactory = static_cast<ABI::Windows::Foundation::IUriRuntimeClassFactory *>(winrt::get_abi(factory));
+
+  const winrt::hstring &localUri = uri;
+  winrt::Windows::Foundation::Uri returnValue{nullptr};
+  if (FAILED(abiFactory->CreateUri(
+          static_cast<HSTRING>(winrt::get_abi(localUri)),
+          reinterpret_cast<ABI::Windows::Foundation::IUriRuntimeClass **>(winrt::put_abi(returnValue))))) {
+    return winrt::Windows::Foundation::Uri{nullptr};
+  }
+  return returnValue;
+}
+
+} // namespace Microsoft::ReactNative

package/Microsoft.ReactNative/Utils/ImageUtils.h

@@ -32,4 +32,6 @@ winrt::Windows::Foundation::IAsyncOperation<winrt::Windows::Storage::Streams::IR
 winrt::Windows::Foundation::IAsyncOperation<winrt::Windows::Storage::Streams::IRandomAccessStream>
 GetImageInlineDataAsync(ReactImageSource source);
 
-} // namespace Microsoft::ReactNative
+winrt::Windows::Foundation::Uri UriTryCreate(winrt::param::hstring const &uri);
+
+} // namespace Microsoft::ReactNative