Facebook/react-native
1
0 Fork 0
mirror of https://github.com/facebook/react-native.git synced 2025-11-01 09:14:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Back out "Back out "[RN][Fabric] Introducing LayoutableShadownode::getContentOriginOffset and use it in ScrollView""

Browse Source 
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
This commit is contained in:
Samuel Susla authored and Facebook GitHub Bot committed 2020-07-27 13:23:53 -07:00
1 parent b08fff6f86
commit cd6e2b468d
7 files changed
+94 -23
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

ReactCommon/fabric/core/tests/FindNodeAtPointTest.cpp
+32 -15
View File
@@ -10,6 +10,25 @@
using namespace facebook::react;
/*
*┌─────────────────────────┐
*│nodeA_ │
*│ │
*│ │
*│ │
*│ │
*│ │
*│ │
*│ ┌────────────────┐ │
*│ │nodeAA_ │ │
*│ │ │ │
*│ │ ┌───────┐ │ │
*│ │ │nodeAA_│ │ │
*│ │ │ │ │ │
*│ │ └───────┘ │ │
*│ └────────────────┘ │
*└─────────────────────────┘
*/
class FindNodeAtPointTest : public ::testing::Test {
protected:
FindNodeAtPointTest()
@@ -102,21 +121,19 @@ TEST_F(FindNodeAtPointTest, withoutTransform) {
LayoutableShadowNode::findNodeAtPoint(nodeA_, {1001, 1001}), nullptr);
}
// Uncomment once T69368852 is resolved.
// TEST_F(FindNodeAtPointTest, viewIsTranslated) {
// nodeA_->_transform =
// Transform::Identity() * Transform::Translate(-100, -100, 0);
TEST_F(FindNodeAtPointTest, viewIsTranslated) {
nodeA_->_contentOriginOffset = {-100, -100};
// EXPECT_EQ(
// LayoutableShadowNode::findNodeAtPoint(nodeA_, {15, 15})->getTag(),
// nodeAAA_->getTag());
// EXPECT_EQ(LayoutableShadowNode::findNodeAtPoint(nodeA_, {5, 5}), nodeAA_);
// }
EXPECT_EQ(
LayoutableShadowNode::findNodeAtPoint(nodeA_, {15, 15})->getTag(),
nodeAAA_->getTag());
EXPECT_EQ(LayoutableShadowNode::findNodeAtPoint(nodeA_, {5, 5}), nodeAA_);
}
// TEST_F(FindNodeAtPointTest, viewIsScaled) {
// nodeAAA_->_transform = Transform::Identity() * Transform::Scale(0.5, 0.5,
// 0);
TEST_F(FindNodeAtPointTest, viewIsScaled) {
nodeAAA_->_transform = Transform::Identity() * Transform::Scale(0.5, 0.5, 0);
// EXPECT_EQ(LayoutableShadowNode::findNodeAtPoint(nodeA_, {119,
// 119})->getTag(), nodeAA_->getTag());
// }
EXPECT_EQ(
LayoutableShadowNode::findNodeAtPoint(nodeA_, {119, 119})->getTag(),
nodeAA_->getTag());
}