Skip to content

fix: measureInWindow calculations for Modal with formSheet presentation #59098

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
kirillzyusko wants to merge 3 commits into
base: main
Choose a base branch
from
+34 −4
Open

fix: measureInWindow calculations for Modal with formSheet presentation #59098

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
85835a8
fix: `useWindowDimensions` calculations for `Modal` with `formSheet` …
kirillzyusko Mar 11, 2026
a41cfc7
fix: Android crash
kirillzyusko Mar 11, 2026
eb9d254
fix: formatting and C++ API snapshots
kirillzyusko Oct 15, 2026
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
9 changes: 8 additions & 1 deletion .../react-native/React/Fabric/Mounting/ComponentViews/Modal/RCTModalHostViewComponentView.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,14 @@ - (void)boundsDidChange:(CGRect)newBounds
}

if (_state != nullptr) {
auto newState = ModalHostViewState{RCTSizeFromCGSize(newBounds.size)};
CGPoint viewportOffset = CGPointZero;
UIView *modalView = _viewController.view;
if (modalView && modalView.window) {
CGRect frameInWindow = [modalView convertRect:modalView.bounds toView:nil];
viewportOffset = frameInWindow.origin;
}
auto newState = ModalHostViewState{
RCTSizeFromCGSize(newBounds.size), facebook::react::Point{(Float)viewportOffset.x, (Float)viewportOffset.y}};
_state->updateState(std::move(newState));
}
}
Expand Down
5 changes: 5 additions & 0 deletions ...ages/react-native/ReactCommon/react/renderer/components/modal/ModalHostViewShadowNode.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,9 @@ namespace facebook::react {

extern const char ModalHostViewComponentName[] = "ModalHostView";

Transform ModalHostViewShadowNode::getTransform() const {
auto viewportOffset = getStateData().viewportOffset;
return Transform::Translate(viewportOffset.x, viewportOffset.y, 0);
}

} // namespace facebook::react
2 changes: 2 additions & 0 deletions packages/react-native/ReactCommon/react/renderer/components/modal/ModalHostViewShadowNode.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@ class ModalHostViewShadowNode final : public ConcreteViewShadowNode<
traits.set(ShadowNodeTraits::Trait::Unstable_uncullableView);
return traits;
}

Transform getTransform() const override;
};

} // namespace facebook::react
3 changes: 2 additions & 1 deletion packages/react-native/ReactCommon/react/renderer/components/modal/ModalHostViewState.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@ ModalHostViewState::ModalHostViewState()
#ifdef RN_SERIALIZABLE_STATE
folly::dynamic ModalHostViewState::getDynamic() const {
return folly::dynamic::object("screenWidth", screenSize.width)(
"screenHeight", screenSize.height);
"screenHeight", screenSize.height)("viewportOffsetX", viewportOffset.x)(
"viewportOffsetY", viewportOffset.y);
}
#endif

Expand Down
10 changes: 8 additions & 2 deletions packages/react-native/ReactCommon/react/renderer/components/modal/ModalHostViewState.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,21 @@ class ModalHostViewState final {

ModalHostViewState();
ModalHostViewState(Size screenSize_) : screenSize(screenSize_) {};
ModalHostViewState(Size screenSize_, Point viewportOffset_)
: screenSize(screenSize_), viewportOffset(viewportOffset_) {};

#ifdef RN_SERIALIZABLE_STATE
ModalHostViewState(const ModalHostViewState &previousState, folly::dynamic data)
: screenSize(
Size{.width = (Float)data["screenWidth"].getDouble(), .height = (Float)data["screenHeight"].getDouble()}) {
};
Size{.width = (Float)data["screenWidth"].getDouble(), .height = (Float)data["screenHeight"].getDouble()}),
viewportOffset(
Point{
.x = data.count("viewportOffsetX") ? (Float)data["viewportOffsetX"].getDouble() : 0.0f,
.y = data.count("viewportOffsetY") ? (Float)data["viewportOffsetY"].getDouble() : 0.0f}) {};
#endif

const Size screenSize{};
const Point viewportOffset{};

#ifdef RN_SERIALIZABLE_STATE
folly::dynamic getDynamic() const;
Expand Down
3 changes: 3 additions & 0 deletions scripts/cxx-api/api-snapshots/ReactAndroidFrameworksCxx.api
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2758,12 +2758,15 @@ class facebook::react::ModalHostViewShadowNode : public facebook::react::Concret
public ModalHostViewShadowNode(const facebook::react::ShadowNode& sourceShadowNode, const facebook::react::ShadowNodeFragment& fragment);
public ModalHostViewShadowNode(const facebook::react::ShadowNodeFragment& fragment, const facebook::react::ShadowNodeFamily::Shared& family, facebook::react::ShadowNodeTraits traits);
public static facebook::react::ShadowNodeTraits BaseTraits();
public virtual facebook::react::Transform getTransform() const override;
}

class facebook::react::ModalHostViewState {
public ModalHostViewState();
public ModalHostViewState(const facebook::react::ModalHostViewState& previousState, folly::dynamic data);
public ModalHostViewState(facebook::react::Size screenSize_);
public ModalHostViewState(facebook::react::Size screenSize_, facebook::react::Point viewportOffset_);
public const facebook::react::Point viewportOffset;
public const facebook::react::Size screenSize;
public folly::dynamic getDynamic() const;
public using Shared = std::shared_ptr<const facebook::react::ModalHostViewState>;
Expand Down
3 changes: 3 additions & 0 deletions scripts/cxx-api/api-snapshots/ReactAppleFrameworksCxx.api
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4974,11 +4974,14 @@ class facebook::react::ModalHostViewShadowNode : public facebook::react::Concret
public ModalHostViewShadowNode(const facebook::react::ShadowNode& sourceShadowNode, const facebook::react::ShadowNodeFragment& fragment);
public ModalHostViewShadowNode(const facebook::react::ShadowNodeFragment& fragment, const facebook::react::ShadowNodeFamily::Shared& family, facebook::react::ShadowNodeTraits traits);
public static facebook::react::ShadowNodeTraits BaseTraits();
public virtual facebook::react::Transform getTransform() const override;
}

class facebook::react::ModalHostViewState {
public ModalHostViewState();
public ModalHostViewState(facebook::react::Size screenSize_);
public ModalHostViewState(facebook::react::Size screenSize_, facebook::react::Point viewportOffset_);
public const facebook::react::Point viewportOffset;
public const facebook::react::Size screenSize;
public using Shared = std::shared_ptr<const facebook::react::ModalHostViewState>;
}
Expand Down
3 changes: 3 additions & 0 deletions scripts/cxx-api/api-snapshots/ReactCommonFrameworksCxx.api
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1646,11 +1646,14 @@ class facebook::react::ModalHostViewShadowNode : public facebook::react::Concret
public ModalHostViewShadowNode(const facebook::react::ShadowNode& sourceShadowNode, const facebook::react::ShadowNodeFragment& fragment);
public ModalHostViewShadowNode(const facebook::react::ShadowNodeFragment& fragment, const facebook::react::ShadowNodeFamily::Shared& family, facebook::react::ShadowNodeTraits traits);
public static facebook::react::ShadowNodeTraits BaseTraits();
public virtual facebook::react::Transform getTransform() const override;
}

class facebook::react::ModalHostViewState {
public ModalHostViewState();
public ModalHostViewState(facebook::react::Size screenSize_);
public ModalHostViewState(facebook::react::Size screenSize_, facebook::react::Point viewportOffset_);
public const facebook::react::Point viewportOffset;
public const facebook::react::Size screenSize;
public using Shared = std::shared_ptr<const facebook::react::ModalHostViewState>;
}
Expand Down
Loading