From 435d2e84efb4b819f731e984d6c8e9c51e804f4a Mon Sep 17 00:00:00 2001 From: Yannick Loriot Date: Fri, 9 May 2025 01:45:16 -0700 Subject: [PATCH] Revert D74292949: Expose Unsnapped Dimensions Differential Revision: D74292949 Original commit changeset: 05011c66a9a9 Original Phabricator Diff: D74292949 fbshipit-source-id: c6ca51c7b882950d54b6a43e206973774db40429 --- .../ReactCommon/yoga/yoga/YGNodeLayout.cpp | 8 -------- .../ReactCommon/yoga/yoga/YGNodeLayout.h | 10 ---------- .../ReactCommon/yoga/yoga/algorithm/PixelGrid.cpp | 12 ++++++------ .../ReactCommon/yoga/yoga/node/LayoutResults.h | 9 --------- .../react-native/ReactCommon/yoga/yoga/node/Node.cpp | 1 - 5 files changed, 6 insertions(+), 34 deletions(-) diff --git a/packages/react-native/ReactCommon/yoga/yoga/YGNodeLayout.cpp b/packages/react-native/ReactCommon/yoga/yoga/YGNodeLayout.cpp index 50c8766ebdb..93fcf0ad005 100644 --- a/packages/react-native/ReactCommon/yoga/yoga/YGNodeLayout.cpp +++ b/packages/react-native/ReactCommon/yoga/yoga/YGNodeLayout.cpp @@ -90,11 +90,3 @@ float YGNodeLayoutGetPadding(YGNodeConstRef node, YGEdge edge) { return getResolvedLayoutProperty<&LayoutResults::padding>( node, scopedEnum(edge)); } - -float YGNodeLayoutGetRawHeight(YGNodeConstRef node) { - return resolveRef(node)->getLayout().rawDimension(Dimension::Height); -} - -float YGNodeLayoutGetRawWidth(YGNodeConstRef node) { - return resolveRef(node)->getLayout().rawDimension(Dimension::Width); -} diff --git a/packages/react-native/ReactCommon/yoga/yoga/YGNodeLayout.h b/packages/react-native/ReactCommon/yoga/yoga/YGNodeLayout.h index 4f25af21377..02ead5883bb 100644 --- a/packages/react-native/ReactCommon/yoga/yoga/YGNodeLayout.h +++ b/packages/react-native/ReactCommon/yoga/yoga/YGNodeLayout.h @@ -32,14 +32,4 @@ YG_EXPORT float YGNodeLayoutGetMargin(YGNodeConstRef node, YGEdge edge); YG_EXPORT float YGNodeLayoutGetBorder(YGNodeConstRef node, YGEdge edge); YG_EXPORT float YGNodeLayoutGetPadding(YGNodeConstRef node, YGEdge edge); -/** - * Return the measured height of the node, before layout rounding - */ -YG_EXPORT float YGNodeLayoutGetRawHeight(YGNodeConstRef node); - -/** - * Return the measured width of the node, before layout rounding - */ -YG_EXPORT float YGNodeLayoutGetRawWidth(YGNodeConstRef node); - YG_EXTERN_C_END diff --git a/packages/react-native/ReactCommon/yoga/yoga/algorithm/PixelGrid.cpp b/packages/react-native/ReactCommon/yoga/yoga/algorithm/PixelGrid.cpp index 61de2be2e8f..6083f0f2646 100644 --- a/packages/react-native/ReactCommon/yoga/yoga/algorithm/PixelGrid.cpp +++ b/packages/react-native/ReactCommon/yoga/yoga/algorithm/PixelGrid.cpp @@ -106,25 +106,25 @@ void roundLayoutResultsToPixelGrid( const bool hasFractionalHeight = !yoga::inexactEquals(round(scaledNodeHeight), scaledNodeHeight); - node->getLayout().setDimension( - Dimension::Width, + node->setLayoutDimension( roundValueToPixelGrid( absoluteNodeRight, pointScaleFactor, (textRounding && hasFractionalWidth), (textRounding && !hasFractionalWidth)) - roundValueToPixelGrid( - absoluteNodeLeft, pointScaleFactor, false, textRounding)); + absoluteNodeLeft, pointScaleFactor, false, textRounding), + Dimension::Width); - node->getLayout().setDimension( - Dimension::Height, + node->setLayoutDimension( roundValueToPixelGrid( absoluteNodeBottom, pointScaleFactor, (textRounding && hasFractionalHeight), (textRounding && !hasFractionalHeight)) - roundValueToPixelGrid( - absoluteNodeTop, pointScaleFactor, false, textRounding)); + absoluteNodeTop, pointScaleFactor, false, textRounding), + Dimension::Height); } for (yoga::Node* child : node->getChildren()) { diff --git a/packages/react-native/ReactCommon/yoga/yoga/node/LayoutResults.h b/packages/react-native/ReactCommon/yoga/yoga/node/LayoutResults.h index 6776a423409..9f0aeaf7843 100644 --- a/packages/react-native/ReactCommon/yoga/yoga/node/LayoutResults.h +++ b/packages/react-native/ReactCommon/yoga/yoga/node/LayoutResults.h @@ -66,18 +66,10 @@ struct LayoutResults { return measuredDimensions_[yoga::to_underlying(axis)]; } - float rawDimension(Dimension axis) const { - return rawDimensions_[yoga::to_underlying(axis)]; - } - void setMeasuredDimension(Dimension axis, float dimension) { measuredDimensions_[yoga::to_underlying(axis)] = dimension; } - void setRawDimension(Dimension axis, float dimension) { - rawDimensions_[yoga::to_underlying(axis)] = dimension; - } - float position(PhysicalEdge physicalEdge) const { return position_[yoga::to_underlying(physicalEdge)]; } @@ -121,7 +113,6 @@ struct LayoutResults { std::array dimensions_ = {{YGUndefined, YGUndefined}}; std::array measuredDimensions_ = {{YGUndefined, YGUndefined}}; - std::array rawDimensions_ = {{YGUndefined, YGUndefined}}; std::array position_ = {}; std::array margin_ = {}; std::array border_ = {}; diff --git a/packages/react-native/ReactCommon/yoga/yoga/node/Node.cpp b/packages/react-native/ReactCommon/yoga/yoga/node/Node.cpp index fbdf5c1bff7..dce42fb1658 100644 --- a/packages/react-native/ReactCommon/yoga/yoga/node/Node.cpp +++ b/packages/react-native/ReactCommon/yoga/yoga/node/Node.cpp @@ -247,7 +247,6 @@ void Node::setLayoutHadOverflow(bool hadOverflow) { void Node::setLayoutDimension(float lengthValue, Dimension dimension) { layout_.setDimension(dimension, lengthValue); - layout_.setRawDimension(dimension, lengthValue); } // If both left and right are defined, then use left. Otherwise return +left or