From d38c756529d4c1076d0646dc75643b78ba2bcaaa Mon Sep 17 00:00:00 2001 From: Kamil Paradowski Date: Fri, 27 Mar 2026 13:34:56 -0700 Subject: [PATCH] feat: add viewport size to LayoutContext class (#56209) Summary: Add viewport size to `LayoutContext` and wire it through Android and iOS layout setup so viewport dimensions are available during layout. This was extracted from the larger `calc()` work in PR https://github.com/facebook/react-native/pull/56162. ## Changelog: [GENERAL] [ADDED] - Add viewport size to LayoutContext Pull Request resolved: https://github.com/facebook/react-native/pull/56209 Test Plan: - This change is limited to internal layout plumbing in React Native core and does not alter external behavior on its own. - Validation for the actual `calc()` use cases will be covered in the follow-up work that consumes this plumbing. Reviewed By: christophpurrer Differential Revision: D98004758 Pulled By: NickGerleman fbshipit-source-id: 3fd6257b2c280442a41308af3e6eff30b51a3397 --- .../React/Fabric/Surface/RCTFabricSurface.mm | 3 +++ .../main/jni/react/fabric/SurfaceHandlerBinding.cpp | 1 + .../ReactCommon/react/renderer/core/LayoutContext.h | 11 +++++++++-- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/packages/react-native/React/Fabric/Surface/RCTFabricSurface.mm b/packages/react-native/React/Fabric/Surface/RCTFabricSurface.mm index 2a5a3a66346..1a96fef72ae 100644 --- a/packages/react-native/React/Fabric/Surface/RCTFabricSurface.mm +++ b/packages/react-native/React/Fabric/Surface/RCTFabricSurface.mm @@ -214,6 +214,7 @@ using namespace facebook::react; if (!isnan(viewportOffset.x) && !isnan(viewportOffset.y)) { layoutContext.viewportOffset = RCTPointFromCGPoint(viewportOffset); } + layoutContext.viewportSize = layoutConstraints.maximumSize; _surfaceHandler->constraintLayout(layoutConstraints, layoutContext); } @@ -236,6 +237,8 @@ using namespace facebook::react; layoutConstraints.minimumSize = RCTSizeFromCGSize(minimumSize); layoutConstraints.maximumSize = RCTSizeFromCGSize(maximumSize); + layoutContext.viewportSize = layoutConstraints.maximumSize; + return RCTCGSizeFromSize(_surfaceHandler->measure(layoutConstraints, layoutContext)); } diff --git a/packages/react-native/ReactAndroid/src/main/jni/react/fabric/SurfaceHandlerBinding.cpp b/packages/react-native/ReactAndroid/src/main/jni/react/fabric/SurfaceHandlerBinding.cpp index c0f5df5ccb4..3264f113963 100644 --- a/packages/react-native/ReactAndroid/src/main/jni/react/fabric/SurfaceHandlerBinding.cpp +++ b/packages/react-native/ReactAndroid/src/main/jni/react/fabric/SurfaceHandlerBinding.cpp @@ -60,6 +60,7 @@ void SurfaceHandlerBinding::setLayoutConstraints( context.swapLeftAndRightInRTL = (doLeftAndRightSwapInRTL != 0u); context.pointScaleFactor = pixelDensity; context.viewportOffset = {.x = offsetX, .y = offsetY}; + context.viewportSize = {.width = maxWidth, .height = maxHeight}; context.fontSizeMultiplier = fontScale; surfaceHandler_.constraintLayout(constraints, context); diff --git a/packages/react-native/ReactCommon/react/renderer/core/LayoutContext.h b/packages/react-native/ReactCommon/react/renderer/core/LayoutContext.h index 3709f7902e7..f54f90159d4 100644 --- a/packages/react-native/ReactCommon/react/renderer/core/LayoutContext.h +++ b/packages/react-native/ReactCommon/react/renderer/core/LayoutContext.h @@ -59,6 +59,11 @@ struct LayoutContext { * If React Native takes up entire screen, it will be {0, 0}. */ Point viewportOffset{}; + + /* + * Viewport size is size of the React Native's root view. + */ + Size viewportSize{}; }; inline bool operator==(const LayoutContext &lhs, const LayoutContext &rhs) @@ -68,13 +73,15 @@ inline bool operator==(const LayoutContext &lhs, const LayoutContext &rhs) lhs.affectedNodes, lhs.swapLeftAndRightInRTL, lhs.fontSizeMultiplier, - lhs.viewportOffset) == + lhs.viewportOffset, + lhs.viewportSize) == std::tie( rhs.pointScaleFactor, rhs.affectedNodes, rhs.swapLeftAndRightInRTL, rhs.fontSizeMultiplier, - rhs.viewportOffset); + rhs.viewportOffset, + rhs.viewportSize); } } // namespace facebook::react