mirror of
https://github.com/status-im/react-native.git
synced 2025-01-25 00:39:03 +00:00
Let measure behave more like on the web
Summary: Nodes with a measure function needs to be measured even so it seems there is no available space. So it behaves more like on the web. Fix facebook/yoga#488 Closes https://github.com/facebook/yoga/pull/499 Reviewed By: astreet Differential Revision: D4954008 Pulled By: emilsjolander fbshipit-source-id: 5b6d9afae0cdebe33f8b82b67620b3b4527d1efc
This commit is contained in:
parent
3c355d3484
commit
925ec01e01
@ -1659,13 +1659,6 @@ static void YGNodeWithMeasureFuncSetMeasuredDimensions(const YGNodeRef node,
|
||||
node, YGFlexDirectionRow, availableWidth - marginAxisRow, parentWidth, parentWidth);
|
||||
node->layout.measuredDimensions[YGDimensionHeight] = YGNodeBoundAxis(
|
||||
node, YGFlexDirectionColumn, availableHeight - marginAxisColumn, parentHeight, parentWidth);
|
||||
} else if (innerWidth <= 0.0f || innerHeight <= 0.0f) {
|
||||
// Don't bother sizing the text if there's no horizontal or vertical
|
||||
// space.
|
||||
node->layout.measuredDimensions[YGDimensionWidth] =
|
||||
YGNodeBoundAxis(node, YGFlexDirectionRow, 0.0f, availableWidth, availableWidth);
|
||||
node->layout.measuredDimensions[YGDimensionHeight] =
|
||||
YGNodeBoundAxis(node, YGFlexDirectionColumn, 0.0f, availableHeight, availableWidth);
|
||||
} else {
|
||||
// Measure the text under the current constraints.
|
||||
const YGSize measuredSize =
|
||||
|
Loading…
x
Reference in New Issue
Block a user