From ebcaf144cf9cc4cc576cb4dc1bfcc2c78aa6239b Mon Sep 17 00:00:00 2001 From: Nick Gerleman Date: Mon, 22 Jan 2024 15:11:50 -0800 Subject: [PATCH] Fix flooring of border (#42411) Summary: X-link: https://github.com/facebook/yoga/pull/1562 I added a small regression D52605596, where negative border would not be correctly floored. This fixes that, and starts adding tests specifically targeting the computed style API, now decoupled from the yoga node. Reviewed By: joevilches Differential Revision: D52930827 --- .../ReactCommon/yoga/yoga/style/Style.h | 28 +++++++++++-------- 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/packages/react-native/ReactCommon/yoga/yoga/style/Style.h b/packages/react-native/ReactCommon/yoga/yoga/style/Style.h index 028fcf17c1e500..113a8e1df16570 100644 --- a/packages/react-native/ReactCommon/yoga/yoga/style/Style.h +++ b/packages/react-native/ReactCommon/yoga/yoga/style/Style.h @@ -312,28 +312,32 @@ class YG_EXPORT Style { } float computeFlexStartBorder(FlexDirection axis, Direction direction) const { - return computeBorder(flexStartEdge(axis), direction) - .resolve(0.0f) - .unwrapOrDefault(0.0f); + return maxOrDefined( + computeBorder(flexStartEdge(axis), direction).resolve(0.0f).unwrap(), + 0.0f); } float computeInlineStartBorder(FlexDirection axis, Direction direction) const { - return computeBorder(inlineStartEdge(axis, direction), direction) - .resolve(0.0f) - .unwrapOrDefault(0.0f); + return maxOrDefined( + computeBorder(inlineStartEdge(axis, direction), direction) + .resolve(0.0f) + .unwrap(), + 0.0f); } float computeFlexEndBorder(FlexDirection axis, Direction direction) const { - return computeBorder(flexEndEdge(axis), direction) - .resolve(0.0f) - .unwrapOrDefault(0.0f); + return maxOrDefined( + computeBorder(flexEndEdge(axis), direction).resolve(0.0f).unwrap(), + 0.0f); } float computeInlineEndBorder(FlexDirection axis, Direction direction) const { - return computeBorder(inlineEndEdge(axis, direction), direction) - .resolve(0.0f) - .unwrapOrDefault(0.0f); + return maxOrDefined( + computeBorder(inlineEndEdge(axis, direction), direction) + .resolve(0.0f) + .unwrap(), + 0.0f); } float computeFlexStartPadding(