microsoft
diff --git a/‎change/@react-native-windows-codegen-e7b6a9a3-a6de-499d-95bb-1510e5009dd2.json
Copy file name to clipboard
+7Lines changed: 7 additions & 0 deletions b/‎change/@react-native-windows-codegen-e7b6a9a3-a6de-499d-95bb-1510e5009dd2.json
Copy file name to clipboard
+7Lines changed: 7 additions & 0 deletions
diff --git a/‎change/react-native-windows-56595f43-5a8f-443b-9594-7de92ea7e45c.json
Copy file name to clipboard
+7Lines changed: 7 additions & 0 deletions b/‎change/react-native-windows-56595f43-5a8f-443b-9594-7de92ea7e45c.json
Copy file name to clipboard
+7Lines changed: 7 additions & 0 deletions
diff --git a/‎packages/@react-native-windows/codegen/src/generators/GenerateComponentWindows.ts
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion b/‎packages/@react-native-windows/codegen/src/generators/GenerateComponentWindows.ts
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎packages/@react-native-windows/tester/src/js/examples/Modal/ModalPresentation.windows.js
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion b/‎packages/@react-native-windows/tester/src/js/examples/Modal/ModalPresentation.windows.js
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎packages/sample-custom-component/windows/SampleCustomComponent/codegen/react/components/SampleCustomComponent/CalendarView.g.h
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion b/‎packages/sample-custom-component/windows/SampleCustomComponent/codegen/react/components/SampleCustomComponent/CalendarView.g.h
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎packages/sample-custom-component/windows/SampleCustomComponent/codegen/react/components/SampleCustomComponent/DrawingIsland.g.h
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion b/‎packages/sample-custom-component/windows/SampleCustomComponent/codegen/react/components/SampleCustomComponent/DrawingIsland.g.h
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎packages/sample-custom-component/windows/SampleCustomComponent/codegen/react/components/SampleCustomComponent/MovingLight.g.h
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion b/‎packages/sample-custom-component/windows/SampleCustomComponent/codegen/react/components/SampleCustomComponent/MovingLight.g.h
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎vnext/Microsoft.ReactNative/Fabric/AbiPortalShadowNode.cpp
Copy file name to clipboard
+97Lines changed: 97 additions & 0 deletions b/‎vnext/Microsoft.ReactNative/Fabric/AbiPortalShadowNode.cpp
Copy file name to clipboard
+97Lines changed: 97 additions & 0 deletions
diff --git a/‎vnext/Microsoft.ReactNative/Fabric/AbiPortalShadowNode.h
Copy file name to clipboard
+53Lines changed: 53 additions & 0 deletions b/‎vnext/Microsoft.ReactNative/Fabric/AbiPortalShadowNode.h
Copy file name to clipboard
+53Lines changed: 53 additions & 0 deletions
@@ -0,0 +1,7 @@
+{
+  "type": "prerelease",
+  "comment": "Fix UpdateState on generated base class",
+  "packageName": "@react-native-windows/codegen",
+  "email": "30809111+acoates-ms@users.noreply.github.com",
+  "dependentChangeType": "patch"
+}
@@ -0,0 +1,7 @@
+{
+  "type": "prerelease",
+  "comment": "Allow portals to have independent layout constraints and scale factor",
+  "packageName": "react-native-windows",
+  "email": "30809111+acoates-ms@users.noreply.github.com",
+  "dependentChangeType": "patch"
+}
@@ -200,7 +200,7 @@ void Register::_COMPONENT_NAME_::NativeComponent(
           builder.SetUpdateStateHandler([](const winrt::Microsoft::ReactNative::ComponentView &view,
                                      const winrt::Microsoft::ReactNative::IComponentState &newState) noexcept {
             auto userData = view.UserData().as<TUserData>();
-            userData->member(view, newState);
+            userData->UpdateState(view, newState);
           });
         }
 
 
@@ -348,7 +348,7 @@ const styles = StyleSheet.create({
     marginTop: 6,
   },
   modalContainer: {
-    flex: 1,
+    //flex: 1, // [Windows] - This will cause the modal to stretch to be as tall as the availiable space given to it.
     justifyContent: 'center',
     padding: 20,
   },
 
@@ -170,7 +170,7 @@ void RegisterCalendarViewNativeComponent(
           builder.SetUpdateStateHandler([](const winrt::Microsoft::ReactNative::ComponentView &view,
                                      const winrt::Microsoft::ReactNative::IComponentState &newState) noexcept {
             auto userData = view.UserData().as<TUserData>();
-            userData->member(view, newState);
+            userData->UpdateState(view, newState);
           });
         }
 
 
@@ -150,7 +150,7 @@ void RegisterDrawingIslandNativeComponent(
           builder.SetUpdateStateHandler([](const winrt::Microsoft::ReactNative::ComponentView &view,
                                      const winrt::Microsoft::ReactNative::IComponentState &newState) noexcept {
             auto userData = view.UserData().as<TUserData>();
-            userData->member(view, newState);
+            userData->UpdateState(view, newState);
           });
         }
 
 
@@ -203,7 +203,7 @@ void RegisterMovingLightNativeComponent(
           builder.SetUpdateStateHandler([](const winrt::Microsoft::ReactNative::ComponentView &view,
                                      const winrt::Microsoft::ReactNative::IComponentState &newState) noexcept {
             auto userData = view.UserData().as<TUserData>();
-            userData->member(view, newState);
+            userData->UpdateState(view, newState);
           });
         }
 
 
@@ -0,0 +1,97 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+#include "AbiPortalShadowNode.h"
+
+#include <Fabric/Composition/ReactCompositionViewComponentBuilder.h>
+#include <react/debug/react_native_assert.h>
+#include <react/renderer/core/LayoutConstraints.h>
+#include <react/renderer/core/LayoutContext.h>
+#include <react/renderer/core/conversions.h>
+
+#include <utility>
+
+namespace Microsoft::ReactNative {
+
+extern const char AbiPortalComponentName[] = "AbiPortal";
+
+facebook::react::Size AbiPortalShadowNode::measureContent(
+    const facebook::react::LayoutContext &layoutContext,
+    const facebook::react::LayoutConstraints &layoutConstraints) const {
+  return {0, 0}; // The portal placeholder node shouldn't take up any space
+}
+
+void AbiPortalShadowNode::layout(facebook::react::LayoutContext layoutContext) {
+  ensureUnsealed();
+  auto layoutMetrics = getLayoutMetrics();
+
+  auto portalOwningShadowNode = ShadowNode::Unshared{};
+
+  if (getChildren().empty()) {
+    return;
+  }
+
+  // A Portal should only have a single child
+  react_native_assert(getChildren().size() == 1);
+
+  const auto &childNode = getChildren()[0];
+
+  auto clonedShadowNode = ShadowNode::Unshared{};
+
+  portalOwningShadowNode = cloneTree(childNode->getFamily(), [&](const ShadowNode &oldShadowNode) {
+    clonedShadowNode = oldShadowNode.clone({});
+    return clonedShadowNode;
+  });
+  auto portalShadowNode = static_cast<AbiPortalShadowNode *>(portalOwningShadowNode.get());
+
+  auto &layoutableShadowNode = dynamic_cast<LayoutableShadowNode &>(*clonedShadowNode);
+
+  auto &state = getStateData();
+
+  facebook::react::LayoutConstraints layoutConstraints;
+  layoutConstraints.layoutDirection = layoutMetrics.layoutDirection;
+
+  if (state.userdata) {
+    // If the portal component set a state of type IPortalStateData,
+    // extract constraint information from it, and use that for layout
+    if (auto portalState = state.userdata.try_as<winrt::Microsoft::ReactNative::Composition::IPortalStateData>()) {
+      auto stateConstraints = portalState.LayoutConstraints();
+
+      layoutConstraints.minimumSize = {stateConstraints.MinimumSize.Width, stateConstraints.MinimumSize.Height};
+      layoutConstraints.maximumSize = {stateConstraints.MaximumSize.Width, stateConstraints.MaximumSize.Height};
+      if (stateConstraints.LayoutDirection == winrt::Microsoft::ReactNative::LayoutDirection::LeftToRight) {
+        layoutConstraints.layoutDirection = facebook::react::LayoutDirection::LeftToRight;
+      } else if (stateConstraints.LayoutDirection == winrt::Microsoft::ReactNative::LayoutDirection::RightToLeft) {
+        layoutConstraints.layoutDirection = facebook::react::LayoutDirection::RightToLeft;
+      }
+    }
+  }
+
+  // Laying out the `ShadowNode` and the subtree starting from it.
+  layoutableShadowNode.layoutTree(layoutContext, layoutConstraints);
+
+  auto childLayoutMetrics = layoutableShadowNode.getLayoutMetrics();
+  childLayoutMetrics.frame.origin = {0, 0};
+  layoutableShadowNode.setLayoutMetrics(childLayoutMetrics);
+
+  // Update the list of children to reflect the changes that we made.
+  this->children_ = static_cast<AbiPortalShadowNode *>(portalOwningShadowNode.get())->children_;
+}
+
+void AbiPortalShadowNode::Builder(winrt::Microsoft::ReactNative::IReactViewComponentBuilder builder) noexcept {
+  m_builder = builder;
+}
+
+winrt::Microsoft::ReactNative::IReactViewComponentBuilder AbiPortalShadowNode::Builder() const noexcept {
+  return m_builder;
+}
+
+void AbiPortalShadowNode::Proxy(winrt::Microsoft::ReactNative::ShadowNode proxy) noexcept {
+  m_proxy = proxy;
+}
+
+winrt::Microsoft::ReactNative::ShadowNode AbiPortalShadowNode::Proxy() const noexcept {
+  return m_proxy;
+}
+
+} // namespace Microsoft::ReactNative
@@ -0,0 +1,53 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+#pragma once
+
+#include <react/components/rnwcore/EventEmitters.h>
+#include <unordered_map>
+#include "AbiShadowNode.h"
+#include "AbiState.h"
+#include "AbiViewProps.h"
+
+#include <react/renderer/components/view/ConcreteViewShadowNode.h>
+#include <react/renderer/core/LayoutContext.h>
+
+namespace Microsoft::ReactNative {
+
+extern const char AbiPortalComponentName[];
+
+class AbiPortalShadowNode final : public facebook::react::ConcreteViewShadowNode<
+                                      AbiPortalComponentName,
+                                      AbiViewProps,
+                                      facebook::react::ViewEventEmitter,
+                                      Microsoft::ReactNative::AbiStateData> {
+ public:
+  using ConcreteViewShadowNode::ConcreteViewShadowNode;
+
+  static facebook::react::ShadowNodeTraits BaseTraits() {
+    auto traits = facebook::react::ShadowNode::BaseTraits();
+    traits.set(facebook::react::ShadowNodeTraits::Trait::FormsStackingContext);
+    traits.set(facebook::react::ShadowNodeTraits::Trait::FormsView);
+    traits.set(facebook::react::ShadowNodeTraits::Trait::RootNodeKind);
+    traits.set(facebook::react::ShadowNodeTraits::Trait::LeafYogaNode);
+    traits.set(facebook::react::ShadowNodeTraits::Trait::MeasurableYogaNode);
+    return traits;
+  }
+
+  facebook::react::Size measureContent(
+      const facebook::react::LayoutContext &layoutContext,
+      const facebook::react::LayoutConstraints &layoutConstraints) const override;
+  void layout(facebook::react::LayoutContext layoutContext) override;
+
+  void OnClone(const facebook::react::ShadowNode &sourceShadowNode) noexcept;
+  void Builder(winrt::Microsoft::ReactNative::IReactViewComponentBuilder builder) noexcept;
+  winrt::Microsoft::ReactNative::IReactViewComponentBuilder Builder() const noexcept;
+  void Proxy(winrt::Microsoft::ReactNative::ShadowNode handle) noexcept;
+  winrt::Microsoft::ReactNative::ShadowNode Proxy() const noexcept;
+
+ private:
+  winrt::Microsoft::ReactNative::ShadowNode m_proxy{nullptr};
+  winrt::Microsoft::ReactNative::IReactViewComponentBuilder m_builder{nullptr};
+};
+
+} // namespace Microsoft::ReactNative
Original file line number	Diff line number	Diff line change
`@@ -200,7 +200,7 @@ void Register::_COMPONENT_NAME_::NativeComponent(`
`200`	`200`	`builder.SetUpdateStateHandler([](const winrt::Microsoft::ReactNative::ComponentView &view,`
`201`	`201`	`const winrt::Microsoft::ReactNative::IComponentState &newState) noexcept {`
`202`	`202`	`auto userData = view.UserData().as<TUserData>();`
`203`		`- userData->member(view, newState);`
	`203`	`+ userData->UpdateState(view, newState);`
`204`	`204`	`});`
`205`	`205`	`}`
`206`	`206`
Original file line number	Diff line number	Diff line change
`@@ -170,7 +170,7 @@ void RegisterCalendarViewNativeComponent(`
`170`	`170`	`builder.SetUpdateStateHandler([](const winrt::Microsoft::ReactNative::ComponentView &view,`
`171`	`171`	`const winrt::Microsoft::ReactNative::IComponentState &newState) noexcept {`
`172`	`172`	`auto userData = view.UserData().as<TUserData>();`
`173`		`- userData->member(view, newState);`
	`173`	`+ userData->UpdateState(view, newState);`
`174`	`174`	`});`
`175`	`175`	`}`
`176`	`176`
Original file line number	Diff line number	Diff line change
`@@ -150,7 +150,7 @@ void RegisterDrawingIslandNativeComponent(`
`150`	`150`	`builder.SetUpdateStateHandler([](const winrt::Microsoft::ReactNative::ComponentView &view,`
`151`	`151`	`const winrt::Microsoft::ReactNative::IComponentState &newState) noexcept {`
`152`	`152`	`auto userData = view.UserData().as<TUserData>();`
`153`		`- userData->member(view, newState);`
	`153`	`+ userData->UpdateState(view, newState);`
`154`	`154`	`});`
`155`	`155`	`}`
`156`	`156`
Original file line number	Diff line number	Diff line change
`@@ -203,7 +203,7 @@ void RegisterMovingLightNativeComponent(`
`203`	`203`	`builder.SetUpdateStateHandler([](const winrt::Microsoft::ReactNative::ComponentView &view,`
`204`	`204`	`const winrt::Microsoft::ReactNative::IComponentState &newState) noexcept {`
`205`	`205`	`auto userData = view.UserData().as<TUserData>();`
`206`		`- userData->member(view, newState);`
	`206`	`+ userData->UpdateState(view, newState);`
`207`	`207`	`});`
`208`	`208`	`}`
`209`	`209`