Cleanup unneeded ReactCommon patching, and extra hostplatform overrides (#14697)

* Cleanup a bunch of unneeded ReactCommon patching, and extra hostplatform overrides

* Change files

* minor cleanup

* Fix desktop build

* Remove ReactInstance.h fork

* fix

* fix leak

Author: acoates-ms

.vscode/settings.json

@@ -102,7 +102,8 @@
     "xtree": "cpp",
     "xutility": "cpp",
     "xstddef": "cpp",
-    "cfenv": "cpp"
+    "cfenv": "cpp",
+    "cfloat": "cpp"
   },
   "search.exclude": {
     "**/dist/**/*.js": true,

change/react-native-windows-eeda745f-25f4-452a-83c8-4b23671412de.json

@@ -0,0 +1,7 @@
+{
+  "type": "prerelease",
+  "comment": "Cleanup a bunch of unneeded ReactCommon patching, and extra hostplatform overrides",
+  "packageName": "react-native-windows",
+  "email": "[email protected]",
+  "dependentChangeType": "patch"
+}

vnext/Common/Common.vcxproj

@@ -72,7 +72,7 @@
       string literals. It prevents code like
         wchar_t* str = L"hello";
       from compiling. -->
-      <AdditionalOptions>%(AdditionalOptions) /Zc:strictStrings /await</AdditionalOptions>
+      <AdditionalOptions>%(AdditionalOptions) /Zc:strictStrings</AdditionalOptions>
     </ClCompile>
     <Link>
       <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>

vnext/Desktop/React.Windows.Desktop.vcxproj

@@ -127,15 +127,13 @@
       </PreprocessorDefinitions>
       <AdditionalIncludeDirectories>
         "$(ReactNativeWindowsDir)Microsoft.ReactNative";
-        "$(ReactNativeWindowsDir)Microsoft.ReactNative\Fabric\platform";
         "$(ReactNativeWindowsDir)Microsoft.ReactNative\ReactHost";
         "$(ReactNativeWindowsDir)Microsoft.ReactNative\Views";
         "$(ReactNativeWindowsDir)codegen";
         "$(ReactNativeWindowsDir)codegen\react\components\rnwcore";
-        $(ReactNativeDir)\ReactCommon\react\renderer\graphics\platform\cxx;
         %(AdditionalIncludeDirectories);
       </AdditionalIncludeDirectories>
-      <AdditionalOptions>%(AdditionalOptions) /Zc:strictStrings /bigobj /await</AdditionalOptions>
+      <AdditionalOptions>%(AdditionalOptions) /Zc:strictStrings /bigobj</AdditionalOptions>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
       <RuntimeTypeInfo Condition="'$(Configuration)'=='Debug' OR '$(UseFabric)' == 'true'">true</RuntimeTypeInfo>

vnext/Microsoft.ReactNative/Fabric/AbiShadowNode.cpp

@@ -35,15 +35,15 @@ void ShadowNode::EnsureUnsealed() noexcept {
   }
 }
 
-winrt::IInspectable ShadowNode::Tag() const noexcept {
+winrt::Windows::Foundation::IInspectable ShadowNode::Tag() const noexcept {
   return m_tag;
 }
 
-void ShadowNode::Tag(winrt::IInspectable tag) noexcept {
+void ShadowNode::Tag(winrt::Windows::Foundation::IInspectable tag) noexcept {
   m_tag = tag;
 }
 
-winrt::IInspectable ShadowNode::StateData() const noexcept {
+winrt::Windows::Foundation::IInspectable ShadowNode::StateData() const noexcept {
   if (auto shadowNode = m_shadowNode.lock()) {
     auto state = shadowNode->getState();
     react_native_assert(state && "State must not be `nullptr`.");
@@ -55,7 +55,7 @@ winrt::IInspectable ShadowNode::StateData() const noexcept {
   return nullptr;
 }
 
-void ShadowNode::StateData(winrt::IInspectable tag) noexcept {
+void ShadowNode::StateData(winrt::Windows::Foundation::IInspectable tag) noexcept {
   if (auto shadowNode = m_shadowNode.lock()) {
     shadowNode->ensureUnsealed();
 

vnext/Microsoft.ReactNative/Fabric/AbiShadowNode.h

@@ -37,17 +37,17 @@ struct ShadowNode : ShadowNodeT<ShadowNode> {
   ShadowNode(facebook::react::ShadowNode::Shared shadowNode) noexcept;
 
   void EnsureUnsealed() noexcept;
-  winrt::IInspectable Tag() const noexcept;
-  void Tag(winrt::IInspectable tag) noexcept;
+  winrt::Windows::Foundation::IInspectable Tag() const noexcept;
+  void Tag(winrt::Windows::Foundation::IInspectable tag) noexcept;
 
-  winrt::IInspectable StateData() const noexcept;
-  void StateData(winrt::IInspectable tag) noexcept;
+  winrt::Windows::Foundation::IInspectable StateData() const noexcept;
+  void StateData(winrt::Windows::Foundation::IInspectable tag) noexcept;
 
   winrt::Microsoft::ReactNative::EventEmitter EventEmitter() const noexcept;
 
  protected:
   facebook::react::ShadowNode::Weak m_shadowNode;
-  winrt::IInspectable m_tag;
+  winrt::Windows::Foundation::IInspectable m_tag;
 };
 
 } // namespace winrt::Microsoft::ReactNative::implementation

vnext/Microsoft.ReactNative/Fabric/ComponentView.h

@@ -103,7 +103,8 @@ struct ComponentView
       const noexcept;
   virtual void parent(const winrt::Microsoft::ReactNative::ComponentView &parent) noexcept;
   virtual winrt::Microsoft::ReactNative::ComponentView Parent() const noexcept;
-  virtual winrt::IVectorView<winrt::Microsoft::ReactNative::ComponentView> Children() const noexcept;
+  virtual winrt::Windows::Foundation::Collections::IVectorView<winrt::Microsoft::ReactNative::ComponentView> Children()
+      const noexcept;
   virtual void theme(winrt::Microsoft::ReactNative::Composition::implementation::Theme *theme) noexcept;
   virtual winrt::Microsoft::ReactNative::Composition::implementation::Theme *theme() const noexcept;
   virtual void onThemeChanged() noexcept;
@@ -206,7 +207,7 @@ struct ComponentView
   // If ignorePointerEvents = true, all Components are treated as valid targets
   virtual facebook::react::Tag
   hitTest(facebook::react::Point pt, facebook::react::Point &localPt, bool ignorePointerEvents = false) const noexcept;
-  virtual winrt::IInspectable EnsureUiaProvider() noexcept;
+  virtual winrt::Windows::Foundation::IInspectable EnsureUiaProvider() noexcept;
   virtual std::optional<std::string> getAccessiblityValue() noexcept;
   virtual void setAcccessiblityValue(std::string &&value) noexcept;
   virtual bool getAcccessiblityIsReadOnly() noexcept;
@@ -223,8 +224,8 @@ struct ComponentView
   virtual const winrt::Microsoft::ReactNative::IComponentProps userProps(
       facebook::react::Props::Shared const &props) noexcept;
 
-  void UserData(const winrt::IInspectable &userData) noexcept;
-  winrt::IInspectable UserData() const noexcept;
+  void UserData(const winrt::Windows::Foundation::IInspectable &userData) noexcept;
+  winrt::Windows::Foundation::IInspectable UserData() const noexcept;
 
   virtual void MountChildComponentView(
       const winrt::Microsoft::ReactNative::ComponentView &childComponentView,
@@ -256,7 +257,7 @@ struct ComponentView
   winrt::com_ptr<winrt::Microsoft::ReactNative::Composition::ReactCompositionViewComponentBuilder> m_builder;
   bool m_mounted : 1 {false};
   const facebook::react::Tag m_tag;
-  winrt::IInspectable m_userData;
+  winrt::Windows::Foundation::IInspectable m_userData;
   mutable winrt::Microsoft::ReactNative::Composition::implementation::RootComponentView *m_rootView{nullptr};
   mutable winrt::Microsoft::ReactNative::Composition::implementation::Theme *m_theme{nullptr};
   const winrt::Microsoft::ReactNative::ReactContext m_reactContext;

vnext/Microsoft.ReactNative/Fabric/Composition/CompositionViewComponentView.h

@@ -4,6 +4,7 @@
 
 #pragma once
 
+#include <CppWinRTIncludes.h>
 #include <Fabric/ComponentView.h>
 #include <Microsoft.ReactNative.Cxx/ReactContext.h>
 #include <react/renderer/components/view/ViewEventEmitter.h>

vnext/Microsoft.ReactNative/Fabric/Composition/ContentIslandComponentView.h

@@ -40,7 +40,7 @@ struct ContentIslandComponentView : ContentIslandComponentViewT<ContentIslandCom
 
   bool focusable() const noexcept override;
 
-  winrt::IInspectable EnsureUiaProvider() noexcept override;
+  winrt::Windows::Foundation::IInspectable EnsureUiaProvider() noexcept override;
 
   void onGotFocus(const winrt::Microsoft::ReactNative::Composition::Input::RoutedEventArgs &args) noexcept override;
 

vnext/Microsoft.ReactNative/Fabric/Composition/ParagraphComponentView.cpp

@@ -5,6 +5,8 @@
 
 #include "ParagraphComponentView.h"
 
+#include <react/renderer/textlayoutmanager/WindowsTextLayoutManager.h>
+
 #include <AutoDraw.h>
 #include <Utils/ValueUtils.h>
 #include <react/renderer/components/text/ParagraphShadowNode.h>
@@ -169,7 +171,7 @@ void ParagraphComponentView::updateVisualBrush() noexcept {
     constraints.maximumSize.height =
         m_layoutMetrics.frame.size.height - m_layoutMetrics.contentInsets.top - m_layoutMetrics.contentInsets.bottom;
 
-    facebook::react::TextLayoutManager::GetTextLayout(
+    facebook::react::WindowsTextLayoutManager::GetTextLayout(
         m_attributedStringBox, m_paragraphAttributes, constraints, m_textLayout);
 
     requireNewBrush = true;