Skip to content

feat: add viewport size to LayoutContext class #56209

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
paradowstack wants to merge 1 commit into
base: main
Choose a base branch
from
+14 −3
Open

feat: add viewport size to LayoutContext class #56209

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion packages/react-native/React/Fabric/Surface/RCTFabricSurface.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,8 @@ - (void)setMinimumSize:(CGSize)minimumSize maximumSize:(CGSize)maximumSize viewp
if (!isnan(viewportOffset.x) && !isnan(viewportOffset.y)) {
layoutContext.viewportOffset = RCTPointFromCGPoint(viewportOffset);
}

layoutContext.viewportSize = layoutConstraints.maximumSize;

_surfaceHandler->constraintLayout(layoutConstraints, layoutContext);
}

Expand All @@ -236,6 +237,8 @@ - (CGSize)sizeThatFitsMinimumSize:(CGSize)minimumSize maximumSize:(CGSize)maximu
layoutConstraints.minimumSize = RCTSizeFromCGSize(minimumSize);
layoutConstraints.maximumSize = RCTSizeFromCGSize(maximumSize);

layoutContext.viewportSize = layoutConstraints.maximumSize;

return RCTCGSizeFromSize(_surfaceHandler->measure(layoutConstraints, layoutContext));
}

Expand Down
1 change: 1 addition & 0 deletions packages/react-native/ReactAndroid/src/main/jni/react/fabric/SurfaceHandlerBinding.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
11 changes: 9 additions & 2 deletions packages/react-native/ReactCommon/react/renderer/core/LayoutContext.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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