mirror of
https://github.com/facebook/react-native.git
synced 2025-11-01 09:14:26 +00:00
Samuel Susla
cd6e2b468d
Summary: This diff reverts a revert of D22456266 (https://github.com/facebook/react-native/commit/0060b5de559cd9c785a2a2a6c66f58088fea4dd2) and fixes the reason why it was reverted. Reverted in D22532594 (https://github.com/facebook/react-native/commit/c0e7e1bd9cf050b4a77a20212603d3468826979c). For reason why it was introduced in the first place, please refer to D22456266 (https://github.com/facebook/react-native/commit/0060b5de559cd9c785a2a2a6c66f58088fea4dd2). Problem: `includeTransform` was not taken into account when calculating offset. I added a unit test covering this specific scenario. Reviewed By: shergin Differential Revision: D22763011 fbshipit-source-id: e7d88fc19608ad1a4c7b5e594a9cc48122a2799b
47 lines
1.2 KiB
C++
47 lines
1.2 KiB
C++
/*
|
|
* Copyright (c) Facebook, Inc. and its affiliates.
|
|
*
|
|
* This source code is licensed under the MIT license found in the
|
|
* LICENSE file in the root directory of this source tree.
|
|
*/
|
|
|
|
#include "ScrollViewShadowNode.h"
|
|
|
|
#include <react/core/LayoutMetrics.h>
|
|
|
|
namespace facebook {
|
|
namespace react {
|
|
|
|
const char ScrollViewComponentName[] = "ScrollView";
|
|
|
|
void ScrollViewShadowNode::updateStateIfNeeded() {
|
|
ensureUnsealed();
|
|
|
|
auto contentBoundingRect = Rect{};
|
|
for (const auto &childNode : getLayoutableChildNodes()) {
|
|
contentBoundingRect.unionInPlace(childNode->getLayoutMetrics().frame);
|
|
}
|
|
|
|
auto state = getStateData();
|
|
|
|
if (state.contentBoundingRect != contentBoundingRect) {
|
|
state.contentBoundingRect = contentBoundingRect;
|
|
setStateData(std::move(state));
|
|
}
|
|
}
|
|
|
|
#pragma mark - LayoutableShadowNode
|
|
|
|
void ScrollViewShadowNode::layout(LayoutContext layoutContext) {
|
|
ConcreteViewShadowNode::layout(layoutContext);
|
|
updateStateIfNeeded();
|
|
}
|
|
|
|
Point ScrollViewShadowNode::getContentOriginOffset() const {
|
|
auto contentOffset = getStateData().contentOffset;
|
|
return {-contentOffset.x, -contentOffset.y};
|
|
}
|
|
|
|
} // namespace react
|
|
} // namespace facebook
|