Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -64,11 +64,12 @@ void ScrollViewShadowNode::layout(LayoutContext layoutContext) {
}

Point ScrollViewShadowNode::getContentOriginOffset(
bool /*includeTransform*/) const {
auto stateData = getStateData();
bool includeTransform) const {
auto stateData = getStateData();
auto contentOffset = stateData.contentOffset;
auto transform = includeTransform ? getTransform() : Transform::Identity();
auto result = transform * Vector{-contentOffset.x, -contentOffset.y, 0, 1};

return {-contentOffset.x, -contentOffset.y + stateData.scrollAwayPaddingTop};
return {result.x, result.y + stateData.scrollAwayPaddingTop};
}

} // namespace facebook::react
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@ Transform LayoutableShadowNode::getTransform() const {
}

Point LayoutableShadowNode::getContentOriginOffset(
bool /*includeTransform*/) const {
bool includeTransform) const {
return {0, 0};
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,8 @@ class TestShadowNode final : public ConcreteViewShadowNode<
facebook::react::Point _contentOriginOffset{};

facebook::react::Point getContentOriginOffset(
bool /*includeTransform*/) const override {
bool /* includeTransform */) const override {

return _contentOriginOffset;
}
};
Expand Down