react-native-windows 0.0.0-canary.658 → 0.0.0-canary.660

package/Microsoft.ReactNative/Views/ViewViewManager.cpp

@@ -89,13 +89,6 @@ class ViewShadowNode : public ShadowNodeBase {
     m_isControl = isControl;
   }
 
-  bool HasOuterBorder() {
-    return m_hasOuterBorder;
-  }
-  void HasOuterBorder(bool hasOuterBorder) {
-    m_hasOuterBorder = hasOuterBorder;
-  }
-
   bool EnableFocusRing() {
     return m_enableFocusRing;
   }
@@ -161,12 +154,6 @@ class ViewShadowNode : public ShadowNodeBase {
         cdebug << "Tearing down, IsControl=true but the control is not a ContentControl, it's a " << name << "\n";
       }
     }
-
-    if (HasOuterBorder()) {
-      if (auto border = current.try_as<xaml::Controls::Border>()) {
-        border.Child(nullptr);
-      }
-    }
   }
 
   void ReplaceChild(const XamlView &oldChildView, const XamlView &newChildView) override {
@@ -200,12 +187,6 @@ class ViewShadowNode : public ShadowNodeBase {
       }
     }
 
-    if (HasOuterBorder()) {
-      if (auto border = current.try_as<xaml::Controls::Border>()) {
-        current = border.Child().try_as<XamlView>();
-      }
-    }
-
     auto panel = current.try_as<xaml::Controls::Panel>();
     assert(panel != nullptr);
 
@@ -242,8 +223,6 @@ class ViewShadowNode : public ShadowNodeBase {
 
  private:
   bool m_isControl = false;
-  bool m_hasOuterBorder = false;
-
   bool m_enableFocusRing = true;
   bool m_onClick = false;
   int32_t m_tabIndex = std::numeric_limits<std::int32_t>::max();
@@ -252,87 +231,6 @@ class ViewShadowNode : public ShadowNodeBase {
   xaml::Controls::ContentControl::LostFocus_revoker m_contentControlLostFocusRevoker{};
 };
 
-// ViewPanel uses a ViewBackground property, not Background, so need to
-// specialize
-// PropertyUtils' TryUpdateBackgroundBrush to use ViewBackground.
-// Issue #2172: Additionally, we need to use
-// winrt::Microsoft::ReactNative::ViewPanel::implementation::ViewBackgroundProperty
-// rather than the proper projected type, because of how we're using cppwinrt.
-
-template <>
-bool TryUpdateBackgroundBrush(
-    const winrt::Microsoft::ReactNative::ViewPanel &element,
-    const std::string &propertyName,
-    const winrt::Microsoft::ReactNative::JSValue &propertyValue) {
-  if (propertyName == "backgroundColor") {
-    if (IsValidColorValue(propertyValue))
-      element.ViewBackground(BrushFrom(propertyValue));
-    else if (propertyValue.IsNull())
-      element.ClearValue(ViewPanel::ViewBackgroundProperty());
-
-    return true;
-  }
-
-  return false;
-}
-
-// Issue #2172: Calling winrt::Microsoft::ReactNative::ViewPanel::BorderBrushProperty fails
-// to call
-// down into winrt::Microsoft::ReactNative::implementation::ViewPanel::BorderBrushProperty
-// because of how we're using cppwinrt. So we specialize PropertyUtils'
-// TryUpdateBorderProperties
-// to use winrt::Microsoft::ReactNative::ViewPanel::implementation::BorderBrushProperty
-
-template <>
-bool TryUpdateBorderProperties(
-    ShadowNodeBase *node,
-    const winrt::Microsoft::ReactNative::ViewPanel &element,
-    const std::string &propertyName,
-    const winrt::Microsoft::ReactNative::JSValue &propertyValue) {
-  bool isBorderProperty = true;
-
-  if (propertyName == "borderColor") {
-    if (IsValidColorValue(propertyValue))
-      element.BorderBrush(BrushFrom(propertyValue));
-    else if (propertyValue.IsNull())
-      element.ClearValue(ViewPanel::BorderBrushProperty());
-  } else if (propertyName == "borderLeftWidth") {
-    if (propertyValue.Type() == winrt::Microsoft::ReactNative::JSValueType::Double ||
-        propertyValue.Type() == winrt::Microsoft::ReactNative::JSValueType::Int64)
-      SetBorderThickness(node, element, ShadowEdges::Left, propertyValue.AsDouble());
-  } else if (propertyName == "borderTopWidth") {
-    if (propertyValue.Type() == winrt::Microsoft::ReactNative::JSValueType::Double ||
-        propertyValue.Type() == winrt::Microsoft::ReactNative::JSValueType::Int64)
-      SetBorderThickness(node, element, ShadowEdges::Top, propertyValue.AsDouble());
-  } else if (propertyName == "borderRightWidth") {
-    if (propertyValue.Type() == winrt::Microsoft::ReactNative::JSValueType::Double ||
-        propertyValue.Type() == winrt::Microsoft::ReactNative::JSValueType::Int64)
-      SetBorderThickness(node, element, ShadowEdges::Right, propertyValue.AsDouble());
-  } else if (propertyName == "borderBottomWidth") {
-    if (propertyValue.Type() == winrt::Microsoft::ReactNative::JSValueType::Double ||
-        propertyValue.Type() == winrt::Microsoft::ReactNative::JSValueType::Int64)
-      SetBorderThickness(node, element, ShadowEdges::Bottom, propertyValue.AsDouble());
-  } else if (propertyName == "borderStartWidth") {
-    if (propertyValue.Type() == winrt::Microsoft::ReactNative::JSValueType::Double ||
-        propertyValue.Type() == winrt::Microsoft::ReactNative::JSValueType::Int64)
-      SetBorderThickness(node, element, ShadowEdges::Start, propertyValue.AsDouble());
-  } else if (propertyName == "borderEndWidth") {
-    if (propertyValue.Type() == winrt::Microsoft::ReactNative::JSValueType::Double ||
-        propertyValue.Type() == winrt::Microsoft::ReactNative::JSValueType::Int64)
-      SetBorderThickness(node, element, ShadowEdges::End, propertyValue.AsDouble());
-  } else if (propertyName == "borderWidth") {
-    if (propertyValue.Type() == winrt::Microsoft::ReactNative::JSValueType::Double ||
-        propertyValue.Type() == winrt::Microsoft::ReactNative::JSValueType::Int64)
-      SetBorderThickness(node, element, ShadowEdges::AllEdges, propertyValue.AsDouble());
-    else if (propertyValue.IsNull())
-      element.ClearValue(ViewPanel::BorderThicknessProperty());
-  } else {
-    isBorderProperty = false;
-  }
-
-  return isBorderProperty;
-}
-
 // ViewViewManager
 
 ViewViewManager::ViewViewManager(const Mso::React::IReactContext &context) : Super(context) {}
@@ -364,7 +262,7 @@ XamlView ViewViewManager::CreateViewCore(int64_t /*tag*/, const winrt::Microsoft
   auto panel = winrt::make<winrt::Microsoft::ReactNative::implementation::ViewPanel>();
   panel.VerticalAlignment(xaml::VerticalAlignment::Stretch);
   panel.HorizontalAlignment(xaml::HorizontalAlignment::Stretch);
-
+  panel.BorderBrush(DefaultBrushStore::Instance().GetDefaultBorderBrush());
   return panel.as<XamlView>();
 }
 
@@ -389,19 +287,18 @@ bool ViewViewManager::UpdateProperty(
   auto pPanel = pViewShadowNode->GetPanel().as<winrt::Microsoft::ReactNative::ViewPanel>();
   bool ret = true;
   if (pPanel != nullptr) {
-    if (TryUpdateBackgroundBrush(pPanel, propertyName, propertyValue)) {
+    if (TryUpdateBackgroundBrush(pPanel.as<xaml::Controls::Panel>(), propertyName, propertyValue)) {
     } else if (TryUpdateBorderProperties(nodeToUpdate, pPanel, propertyName, propertyValue)) {
     } else if (TryUpdateCornerRadiusOnNode(nodeToUpdate, pPanel, propertyName, propertyValue)) {
       // Do not clamp until a size has been set for the View
       auto maxCornerRadius = std::numeric_limits<double>::max();
       // The Width and Height properties are not always set on ViewPanel. In
-      // cases where it is embedded in a Control or outer Border, the values
-      // dimensions are set on those wrapper elements. We cannot depend on the
-      // default behavior of `UpdateCornerRadiusOnElement` to check for the
-      // clamp dimension from only the ViewPanel.
-      const xaml::FrameworkElement sizingElement = pViewShadowNode->IsControl() ? pViewShadowNode->GetControl()
-          : pViewShadowNode->HasOuterBorder() ? pPanel.GetOuterBorder().as<xaml::FrameworkElement>()
-                                              : pPanel;
+      // cases where it is embedded in a Control, the values dimensions are
+      // set on those wrapper elements. We cannot depend on the default
+      // behavior of `UpdateCornerRadiusOnElement` to check for the clamp
+      // dimension from only the ViewPanel.
+      const xaml::FrameworkElement sizingElement =
+          pViewShadowNode->IsControl() ? pViewShadowNode->GetControl().as<xaml::FrameworkElement>() : pPanel;
       if (sizingElement.ReadLocalValue(xaml::FrameworkElement::WidthProperty()) !=
               xaml::DependencyProperty::UnsetValue() &&
           sizingElement.ReadLocalValue(xaml::FrameworkElement::HeightProperty()) !=
@@ -471,8 +368,6 @@ void ViewViewManager::OnPropertiesUpdated(ShadowNodeBase *node) {
     shouldBeControl = shouldBeControl || HasDynamicAutomationProperties(view);
   }
 
-  panel.FinalizeProperties();
-
   TryUpdateView(viewShadowNode, panel, shouldBeControl);
   SyncFocusableAndAccessible(viewShadowNode, shouldBeControl);
 }
@@ -482,21 +377,19 @@ void ViewViewManager::TryUpdateView(
     winrt::Microsoft::ReactNative::ViewPanel &pPanel,
     bool useControl) {
   bool isControl = pViewShadowNode->IsControl();
-  bool hadOuterBorder = pViewShadowNode->HasOuterBorder();
-  bool hasOuterBorder = pPanel.GetOuterBorder() != nullptr;
 
   // This short-circuits all of the update code when we have the same hierarchy
-  if (isControl == useControl && hadOuterBorder == hasOuterBorder)
+  if (isControl == useControl)
     return;
 
   //
   // 1. Ensure we have the new 'root' and do the child replacement
-  //      This is first to ensure that we can re-parent the Border or ViewPanel
+  //      This is first to ensure that we can re-parent the ViewPanel
   //      we already have
   // 2. Transfer properties
   //      There are likely some complexities to handle here
   // 3. Do any sub=parenting
-  //      This means Panel under Border and/or Border under Control
+  //      This means Panel under Control
   //
 
   XamlView oldXamlView(pViewShadowNode->GetView());
@@ -515,20 +408,15 @@ void ViewViewManager::TryUpdateView(
   }
 
   // Clean up child of Control if needed
-  if (isControl && (!useControl || (hasOuterBorder != hadOuterBorder))) {
+  if (isControl) {
     pViewShadowNode->GetControl().Content(nullptr);
   }
 
-  // If don't need a control, then set Outer Border or the Panel as the view
-  // root
+  // If don't need a control, then set the Panel as the view root
   if (!useControl) {
-    newXamlView = hasOuterBorder ? pPanel.GetOuterBorder().try_as<XamlView>() : pPanel.try_as<XamlView>();
+    newXamlView = pPanel;
   }
 
-  // Clean up child of Border if needed
-  if (hasOuterBorder && !hadOuterBorder)
-    pPanel.GetOuterBorder().Child(nullptr);
-
   // ASSERT: One of the scenarios should be true, so we should have a root view
   assert(newXamlView != nullptr);
 
@@ -541,13 +429,8 @@ void ViewViewManager::TryUpdateView(
     TransferProperties(oldXamlView, newXamlView);
   }
 
-  // Since we transferred properties to the new view we need to make the call to
-  // finalize
-  pPanel.FinalizeProperties();
-
   // Update the meta-data in the shadow node
   pViewShadowNode->IsControl(useControl);
-  pViewShadowNode->HasOuterBorder(hasOuterBorder);
 
   //
   // 3. Setup any new parent-child relationships
@@ -574,19 +457,8 @@ void ViewViewManager::TryUpdateView(
     }
   }
 
-  // Ensure parenting is setup properly
-  auto visualRoot = pPanel.try_as<xaml::UIElement>();
-
-  if (hasOuterBorder) {
-    xaml::Controls::Border outerBorder = pPanel.GetOuterBorder();
-    if (outerBorder.Child() == nullptr)
-      outerBorder.Child(pPanel.try_as<xaml::UIElement>());
-
-    visualRoot = outerBorder;
-  }
-
   if (useControl)
-    pViewShadowNode->GetControl().Content(visualRoot);
+    pViewShadowNode->GetControl().Content(pPanel);
 }
 
 void ViewViewManager::SyncFocusableAndAccessible(ViewShadowNode *pViewShadowNode, bool useControl) {
@@ -622,13 +494,10 @@ void ViewViewManager::SetLayoutProps(
 
   Super::SetLayoutProps(nodeToUpdate, viewToUpdate, left, top, width, height);
   if (pPanel.ReadLocalValue(ViewPanel::CornerRadiusProperty()) != xaml::DependencyProperty::UnsetValue()) {
-    // Rather than use ViewPanel::FinalizeProperties, only perform the explicit
-    // logic required to propagate the CornerRadius value to the Border parent.
-    auto border = pPanel.GetOuterBorder();
-    if (border) {
+    if (pPanel.GetValue(React::ViewPanel::CornerRadiusProperty()) != xaml::DependencyProperty::UnsetValue()) {
       const auto maxCornerRadius = std::min(width, height) / 2;
       UpdateCornerRadiusOnElement(&nodeToUpdate, pPanel, maxCornerRadius);
-      border.CornerRadius(pPanel.CornerRadius());
+      pPanel.CornerRadius(pPanel.CornerRadius());
     }
   }
 }

package/Microsoft.ReactNative/Views/cppwinrt/ViewPanel.idl

@@ -8,7 +8,7 @@ namespace Microsoft.ReactNative
 {
   [default_interface]
   [webhosthidden]
-  runtimeclass ViewPanel : XAML_NAMESPACE.Controls.Panel
+  runtimeclass ViewPanel : XAML_NAMESPACE.Controls.Grid
   {
     // Constructors
     ViewPanel();
@@ -18,14 +18,8 @@ namespace Microsoft.ReactNative
     void RemoveAt(UInt32 index);
     void Clear();
 
-    void FinalizeProperties();
-    XAML_NAMESPACE.Controls.Border GetOuterBorder();
-
     // Public Properties
     XAML_NAMESPACE.Media.Brush ViewBackground { get; set; };
-    XAML_NAMESPACE.Thickness BorderThickness { get; set; };
-    XAML_NAMESPACE.Media.Brush BorderBrush { get; set; };
-    XAML_NAMESPACE.CornerRadius CornerRadius { get; set; };
 
     // ViewPanel Properties
     static XAML_NAMESPACE.DependencyProperty ViewBackgroundProperty { get; };

package/PropertySheets/Generated/PackageVersion.g.props

@@ -10,11 +10,11 @@
 -->
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <ReactNativeWindowsVersion>0.0.0-canary.658</ReactNativeWindowsVersion>
+    <ReactNativeWindowsVersion>0.0.0-canary.660</ReactNativeWindowsVersion>
     <ReactNativeWindowsMajor>0</ReactNativeWindowsMajor>
     <ReactNativeWindowsMinor>0</ReactNativeWindowsMinor>
     <ReactNativeWindowsPatch>0</ReactNativeWindowsPatch>
     <ReactNativeWindowsCanary>true</ReactNativeWindowsCanary>
-    <ReactNativeWindowsCommitId>684db1330d1a3e933274bd80e42e684a78f8e7c4</ReactNativeWindowsCommitId>
+    <ReactNativeWindowsCommitId>34cd46235b77dbdc08a4d4f56f7c7d0f0abd65a4</ReactNativeWindowsCommitId>
   </PropertyGroup>
 </Project>

package/PropertySheets/NuGet.Cpp.props

@@ -9,8 +9,9 @@
 
   <PropertyGroup Label="NuGet">
     <!-- Should match entry in $(ReactNativeWindowsDir)vnext\Directory.Build.props -->
-    <!--See https://docs.microsoft.com/en-us/nuget/reference/msbuild-targets#restore-target-->
-    <RestoreUseStaticGraphEvaluation Condition="'$(BuildingInsideVisualStudio)' == 'true' AND '$(DisableRestoreUseStaticGraphEvaluation)' != 'true'">true</RestoreUseStaticGraphEvaluation>
+    <!-- See https://docs.microsoft.com/en-us/nuget/reference/msbuild-targets#restore-target -->
+    <!-- RestoreUseStaticGraphEvaluation broke in VS 17.6, see https://github.com/microsoft/react-native-windows/issues/11670 -->
+    <RestoreUseStaticGraphEvaluation Condition="'$(BuildingInsideVisualStudio)' == 'true' AND $([MSBuild]::VersionLessThan('$(MSBuildVersion)', '17.6')) AND '$(DisableRestoreUseStaticGraphEvaluation)' != 'true'">true</RestoreUseStaticGraphEvaluation>
 
     <!-- Ensure PackageReference compatibility for any consuming projects/apps -->
     <ResolveNuGetPackages>false</ResolveNuGetPackages>

package/ReactCommon/ReactCommon.vcxproj

@@ -160,11 +160,13 @@
     <ClInclude Include="$(ReactNativeDir)\ReactCommon\react\nativemodule\core\ReactCommon\TurboModule.h" />
     <ClInclude Include="$(ReactNativeDir)\ReactCommon\react\nativemodule\core\ReactCommon\TurboModuleBinding.h" />
     <ClInclude Include="$(ReactNativeDir)\ReactCommon\react\nativemodule\core\ReactCommon\TurboModuleUtils.h" />
+    <ClInclude Include="$(ReactNativeDir)\ReactCommon\react\renderer\core\PropsParserContext.h" />
     <ClCompile Include="$(ReactNativeDir)\ReactCommon\react\bridging\LongLivedObject.cpp" />
     <ClCompile Include="$(ReactNativeDir)\ReactCommon\react\nativemodule\core\ReactCommon\TurboCxxModule.cpp" />
     <ClCompile Include="$(ReactNativeDir)\ReactCommon\react\nativemodule\core\ReactCommon\TurboModule.cpp" />
     <ClCompile Include="$(ReactNativeDir)\ReactCommon\react\nativemodule\core\ReactCommon\TurboModuleBinding.cpp" />
     <ClCompile Include="$(ReactNativeDir)\ReactCommon\react\nativemodule\core\ReactCommon\TurboModuleUtils.cpp" />
+    <ClCompile Include="$(ReactNativeDir)\ReactCommon\react\renderer\core\PropsParserContext.cpp" />
     <CLCompile Include="$(ReactNativeDir)\ReactCommon\react\nativemodule\samples\ReactCommon\NativeSampleTurboCxxModuleSpecJSI.cpp" />
     <CLCompile Include="$(ReactNativeDir)\ReactCommon\react\nativemodule\samples\ReactCommon\SampleTurboCxxModule.cpp" />
   </ItemGroup>

package/ReactCommon/TEMP_UntilReactCommonUpdate/react/renderer/components/text/ParagraphLayoutManager.cpp

@@ -0,0 +1,95 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#include "ParagraphLayoutManager.h"
+#include <folly/Hash.h>
+#include <react/renderer/core/CoreFeatures.h>
+
+namespace facebook::react {
+
+TextMeasurement ParagraphLayoutManager::measure(
+    AttributedString const &attributedString,
+    ParagraphAttributes const &paragraphAttributes,
+    LayoutConstraints layoutConstraints) const {
+  if (CoreFeatures::cacheLastTextMeasurement) {
+    bool shouldMeasure = shoudMeasureString(
+        attributedString, paragraphAttributes, layoutConstraints);
+
+    if (shouldMeasure) {
+      cachedTextMeasurement_ = textLayoutManager_->measure(
+          AttributedStringBox(attributedString),
+          paragraphAttributes,
+          layoutConstraints,
+          hostTextStorage_);
+      lastAvailableWidth_ = layoutConstraints.maximumSize.width;
+    }
+
+    return cachedTextMeasurement_;
+  } else {
+    return textLayoutManager_->measure(
+        AttributedStringBox(attributedString),
+        paragraphAttributes,
+        layoutConstraints,
+        nullptr);
+  }
+}
+
+bool ParagraphLayoutManager::shoudMeasureString(
+    AttributedString const &attributedString,
+    ParagraphAttributes const &paragraphAttributes,
+    LayoutConstraints layoutConstraints) const {
+  size_t newHash = folly::hash::hash_combine(
+      0,
+      textAttributedStringHashLayoutWise(attributedString),
+      paragraphAttributes);
+
+  if (newHash != paragraphInputHash_) {
+    // AttributedString or ParagraphAttributes have changed.
+    // Must create new host text storage and trigger measure.
+    hostTextStorage_ = textLayoutManager_->getHostTextStorage(
+        attributedString, paragraphAttributes, layoutConstraints);
+    paragraphInputHash_ = newHash;
+    return true; // Must measure again.
+  }
+
+  bool hasMaximumSizeChanged =
+      layoutConstraints.maximumSize.width != lastAvailableWidth_;
+  Float threshold = 0.01f; //Windows needs the "f" as we treat warnings as errors #11686
+  bool doesMaximumSizeMatchLastMeasurement =
+      std::abs(
+          layoutConstraints.maximumSize.width -
+          cachedTextMeasurement_.size.width) < threshold;
+  if (hasMaximumSizeChanged && !doesMaximumSizeMatchLastMeasurement) {
+    hostTextStorage_ = textLayoutManager_->getHostTextStorage(
+        attributedString, paragraphAttributes, layoutConstraints);
+    return true;
+  }
+  return false;
+}
+
+LinesMeasurements ParagraphLayoutManager::measureLines(
+    AttributedString const &attributedString,
+    ParagraphAttributes const &paragraphAttributes,
+    Size size) const {
+  return textLayoutManager_->measureLines(
+      attributedString, paragraphAttributes, size);
+}
+
+void ParagraphLayoutManager::setTextLayoutManager(
+    std::shared_ptr<TextLayoutManager const> textLayoutManager) const {
+  textLayoutManager_ = std::move(textLayoutManager);
+}
+
+std::shared_ptr<TextLayoutManager const>
+ParagraphLayoutManager::getTextLayoutManager() const {
+  return textLayoutManager_;
+}
+
+std::shared_ptr<void> ParagraphLayoutManager::getHostTextStorage() const {
+  return hostTextStorage_;
+}
+} // namespace facebook::react

package/ReactCommon/Yoga.cpp

@@ -43,8 +43,8 @@ static int YGDefaultLog(
 #ifdef ANDROID
 #include <android/log.h>
 static int YGAndroidLog(
-    const YGConfigRef config,
-    const YGNodeRef node,
+    const YGConfigRef /*config*/,
+    const YGNodeRef /*node*/,
     YGLogLevel level,
     const char *format,
     va_list args) {
@@ -232,6 +232,10 @@ YOGA_EXPORT void YGNodeFree(const YGNodeRef node) {
   }
 
   node->clearChildren();
+  YGNodeDeallocate(node);
+}
+
+YOGA_EXPORT void YGNodeDeallocate(const YGNodeRef node) {
   Event::publish<Event::NodeDeallocation>(node, {node->getConfig()});
   delete node;
 }
@@ -843,7 +847,7 @@ YOGA_EXPORT void YGNodeStyleSetMinWidthPercent(
 }
 YOGA_EXPORT YGValue YGNodeStyleGetMinWidth(const YGNodeConstRef node) {
   return node->getStyle().minDimensions()[YGDimensionWidth];
-};
+}
 
 YOGA_EXPORT void YGNodeStyleSetMinHeight(
     const YGNodeRef node,
@@ -861,7 +865,7 @@ YOGA_EXPORT void YGNodeStyleSetMinHeightPercent(
 }
 YOGA_EXPORT YGValue YGNodeStyleGetMinHeight(const YGNodeConstRef node) {
   return node->getStyle().minDimensions()[YGDimensionHeight];
-};
+}
 
 YOGA_EXPORT void YGNodeStyleSetMaxWidth(
     const YGNodeRef node,
@@ -879,7 +883,7 @@ YOGA_EXPORT void YGNodeStyleSetMaxWidthPercent(
 }
 YOGA_EXPORT YGValue YGNodeStyleGetMaxWidth(const YGNodeConstRef node) {
   return node->getStyle().maxDimensions()[YGDimensionWidth];
-};
+}
 
 YOGA_EXPORT void YGNodeStyleSetMaxHeight(
     const YGNodeRef node,
@@ -897,7 +901,7 @@ YOGA_EXPORT void YGNodeStyleSetMaxHeightPercent(
 }
 YOGA_EXPORT YGValue YGNodeStyleGetMaxHeight(const YGNodeConstRef node) {
   return node->getStyle().maxDimensions()[YGDimensionHeight];
-};
+}
 
 #define YG_NODE_LAYOUT_PROPERTY_IMPL(type, name, instanceName)   \
   YOGA_EXPORT type YGNodeLayoutGet##name(const YGNodeRef node) { \
@@ -931,18 +935,18 @@ YOGA_EXPORT YGValue YGNodeStyleGetMaxHeight(const YGNodeConstRef node) {
     return node->getLayout().instanceName[edge];                        \
   }
 
-YG_NODE_LAYOUT_PROPERTY_IMPL(float, Left, position[YGEdgeLeft]);
-YG_NODE_LAYOUT_PROPERTY_IMPL(float, Top, position[YGEdgeTop]);
-YG_NODE_LAYOUT_PROPERTY_IMPL(float, Right, position[YGEdgeRight]);
-YG_NODE_LAYOUT_PROPERTY_IMPL(float, Bottom, position[YGEdgeBottom]);
-YG_NODE_LAYOUT_PROPERTY_IMPL(float, Width, dimensions[YGDimensionWidth]);
-YG_NODE_LAYOUT_PROPERTY_IMPL(float, Height, dimensions[YGDimensionHeight]);
-YG_NODE_LAYOUT_PROPERTY_IMPL(YGDirection, Direction, direction());
-YG_NODE_LAYOUT_PROPERTY_IMPL(bool, HadOverflow, hadOverflow());
+YG_NODE_LAYOUT_PROPERTY_IMPL(float, Left, position[YGEdgeLeft])
+YG_NODE_LAYOUT_PROPERTY_IMPL(float, Top, position[YGEdgeTop])
+YG_NODE_LAYOUT_PROPERTY_IMPL(float, Right, position[YGEdgeRight])
+YG_NODE_LAYOUT_PROPERTY_IMPL(float, Bottom, position[YGEdgeBottom])
+YG_NODE_LAYOUT_PROPERTY_IMPL(float, Width, dimensions[YGDimensionWidth])
+YG_NODE_LAYOUT_PROPERTY_IMPL(float, Height, dimensions[YGDimensionHeight])
+YG_NODE_LAYOUT_PROPERTY_IMPL(YGDirection, Direction, direction())
+YG_NODE_LAYOUT_PROPERTY_IMPL(bool, HadOverflow, hadOverflow())
 
-YG_NODE_LAYOUT_RESOLVED_PROPERTY_IMPL(float, Margin, margin);
-YG_NODE_LAYOUT_RESOLVED_PROPERTY_IMPL(float, Border, border);
-YG_NODE_LAYOUT_RESOLVED_PROPERTY_IMPL(float, Padding, padding);
+YG_NODE_LAYOUT_RESOLVED_PROPERTY_IMPL(float, Margin, margin)
+YG_NODE_LAYOUT_RESOLVED_PROPERTY_IMPL(float, Border, border)
+YG_NODE_LAYOUT_RESOLVED_PROPERTY_IMPL(float, Padding, padding)
 
 std::atomic<uint32_t> gCurrentGenerationCount(0);
 
@@ -2981,7 +2985,7 @@ static void YGNodelayoutImpl(
         availableInnerMainDim = maxInnerMainDim;
       } else {
         bool useLegacyStretchBehaviour =
-            node->getConfig()->getErrata() & YGErrataStretchFlexBasis;
+            node->hasErrata(YGErrataStretchFlexBasis);
 
         if (!useLegacyStretchBehaviour &&
             ((!YGFloatIsUndefined(
@@ -4076,6 +4080,10 @@ YOGA_EXPORT void YGConfigSetPointScaleFactor(
   }
 }
 
+YOGA_EXPORT float YGConfigGetPointScaleFactor(const YGConfigRef config) {
+  return config->getPointScaleFactor();
+}
+
 static void YGRoundToPixelGrid(
     const YGNodeRef node,
     const double pointScaleFactor,
@@ -4305,16 +4313,16 @@ YOGA_EXPORT void YGConfigSetUseWebDefaults(
 
 YOGA_EXPORT bool YGConfigGetUseLegacyStretchBehaviour(
     const YGConfigRef config) {
-  return config->getErrata() & YGErrataStretchFlexBasis;
+  return config->hasErrata(YGErrataStretchFlexBasis);
 }
 
 YOGA_EXPORT void YGConfigSetUseLegacyStretchBehaviour(
     const YGConfigRef config,
     const bool useLegacyStretchBehaviour) {
   if (useLegacyStretchBehaviour) {
-    config->setErrata(config->getErrata() | YGErrataStretchFlexBasis);
+    config->addErrata(YGErrataStretchFlexBasis);
   } else {
-    config->setErrata(config->getErrata() & ~YGErrataStretchFlexBasis);
+    config->removeErrata(YGErrataStretchFlexBasis);
   }
 }
 

package/Shared/Shared.vcxitems

@@ -36,6 +36,11 @@
       <DependentUpon>$(ReactNativeWindowsDir)Microsoft.ReactNative\CompositionContext.idl</DependentUpon>
       <SubType>Code</SubType>
     </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)..\Microsoft.ReactNative\Fabric\Composition\CompositionContextHelper_emptyimpl.cpp">
+      <ExcludedFromBuild Condition="'$(UseFabric)' == 'true' OR '$(IncludeFabricInterface)' != 'true'">true</ExcludedFromBuild>
+      <DependentUpon>$(ReactNativeWindowsDir)Microsoft.ReactNative\CompositionContext.idl</DependentUpon>
+      <SubType>Code</SubType>
+    </ClCompile>
     <ClCompile Include="$(MSBuildThisFileDirectory)..\Microsoft.ReactNative\Fabric\Composition\ReactCompositionViewComponentBuilder.cpp">
       <ExcludedFromBuild Condition="'$(UseFabric)' != 'true'">true</ExcludedFromBuild>
       <DependentUpon>$(ReactNativeWindowsDir)Microsoft.ReactNative\IReactCompositionViewComponentBuilder.idl</DependentUpon>
@@ -63,10 +68,20 @@
       <DependentUpon>$(ReactNativeWindowsDir)Microsoft.ReactNative\CompositionRootView.idl</DependentUpon>
       <SubType>Code</SubType>
     </ClCompile>
+    <ClCompile Include="$(MSBuildThisFileDirectory)..\Microsoft.ReactNative\Fabric\Composition\CompositionRootView_emptyimpl.cpp">
+      <ExcludedFromBuild Condition="'$(UseFabric)' == 'true' OR '$(IncludeFabricInterface)' != 'true'">true</ExcludedFromBuild>
+      <DependentUpon>$(ReactNativeWindowsDir)Microsoft.ReactNative\CompositionRootView.idl</DependentUpon>
+      <SubType>Code</SubType>
+    </ClCompile>
     <ClCompile Include="$(MSBuildThisFileDirectory)..\Microsoft.ReactNative\Fabric\Composition\CompositionUIService.cpp">
       <ExcludedFromBuild Condition="'$(UseFabric)' != 'true'">true</ExcludedFromBuild>
       <DependentUpon>$(ReactNativeWindowsDir)Microsoft.ReactNative\CompositionUIService.idl</DependentUpon>
       <SubType>Code</SubType>
+    </ClCompile>
+        <ClCompile Include="$(MSBuildThisFileDirectory)..\Microsoft.ReactNative\Fabric\Composition\CompositionUIService_emptyimpl.cpp">
+      <ExcludedFromBuild Condition="'$(UseFabric)' == 'true' OR '$(IncludeFabricInterface)' != 'true'">true</ExcludedFromBuild>
+      <DependentUpon>$(ReactNativeWindowsDir)Microsoft.ReactNative\CompositionUIService.idl</DependentUpon>
+      <SubType>Code</SubType>
     </ClCompile>
     <ClCompile Include="$(MSBuildThisFileDirectory)..\Microsoft.ReactNative\Fabric\Composition\CompositionViewComponentView.cpp">
       <ExcludedFromBuild Condition="'$(UseFabric)' != 'true'">true</ExcludedFromBuild>
@@ -505,15 +520,15 @@
     <Midl Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\ReactNativeHost.idl" />
     <Midl Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\RedBoxHandler.idl" />
   </ItemGroup>
-  <ItemGroup Condition="'$(UseFabric)' == 'true'">
-    <Midl Condition="'$(UseFabric)' == 'true'" Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\CompositionContext.idl" />
-    <Midl Condition="'$(UseFabric)' == 'true'" Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\CompositionHwndHost.idl" />
-    <Midl Condition="'$(UseFabric)' == 'true'" Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\CompositionRootView.idl" />
-    <Midl Condition="'$(UseFabric)' == 'true'" Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\CompositionSwitcher.idl" />
-    <Midl Condition="'$(UseFabric)' == 'true'" Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\CompositionUIService.idl" />
-    <Midl Condition="'$(UseFabric)' == 'true'" Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\IReactCompositionViewComponentBuilder.idl" />
-    <Midl Condition="'$(UseFabric)' == 'true'" Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\IReactPackageBuilderFabric.idl" />
-    <Midl Condition="'$(UseFabric)' == 'true'" Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\IReactViewComponentBuilder.idl" />
-    <Midl Condition="'$(UseFabric)' == 'true'" Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\ViewProps.idl" />
+  <ItemGroup Condition="'$(UseFabric)' == 'true' OR '$(IncludeFabricInterface)' == 'true'">
+    <Midl Condition="'$(UseFabric)' == 'true' OR '$(IncludeFabricInterface)' == 'true'" Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\CompositionContext.idl" />
+    <Midl Condition="'$(UseFabric)' == 'true' OR '$(IncludeFabricInterface)' == 'true'" Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\CompositionHwndHost.idl" />
+    <Midl Condition="'$(UseFabric)' == 'true' OR '$(IncludeFabricInterface)' == 'true'" Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\CompositionRootView.idl" />
+    <Midl Condition="'$(UseFabric)' == 'true' OR '$(IncludeFabricInterface)' == 'true'" Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\CompositionSwitcher.idl" />
+    <Midl Condition="'$(UseFabric)' == 'true' OR '$(IncludeFabricInterface)' == 'true'" Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\CompositionUIService.idl" />
+    <Midl Condition="'$(UseFabric)' == 'true' OR '$(IncludeFabricInterface)' == 'true'" Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\IReactCompositionViewComponentBuilder.idl" />
+    <Midl Condition="'$(UseFabric)' == 'true' OR '$(IncludeFabricInterface)' == 'true'" Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\IReactPackageBuilderFabric.idl" />
+    <Midl Condition="'$(UseFabric)' == 'true' OR '$(IncludeFabricInterface)' == 'true'" Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\IReactViewComponentBuilder.idl" />
+    <Midl Condition="'$(UseFabric)' == 'true' OR '$(IncludeFabricInterface)' == 'true'" Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\ViewProps.idl" />
   </ItemGroup>
 </Project>