From e27452a670c45f4c919c9d46e08145723a2235a0 Mon Sep 17 00:00:00 2001 From: Nick Gerleman Date: Mon, 22 Jan 2024 22:07:49 -0800 Subject: [PATCH] Fix flooring of border (#42411) Summary: Pull Request resolved: https://github.com/facebook/react-native/pull/42411 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 fbshipit-source-id: e165dade705a8de54c92d65f3664c9081137788c --- .../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(