From 48fe460ed9643ce17e66389ce3ae58690080e6aa Mon Sep 17 00:00:00 2001 From: Samuel Susla Date: Tue, 17 Mar 2020 14:05:23 -0700 Subject: [PATCH] When resolving borders, respect leading/trailing semantics before left/right Summary: Changelog: [Internal] When resolving borders, leading/trailing semantics should take priority over left/right. Reviewed By: shergin Differential Revision: D20422951 fbshipit-source-id: 7a464c88f881a77732929a155aaa9b2e150bba74 --- ReactCommon/fabric/components/view/primitives.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ReactCommon/fabric/components/view/primitives.h b/ReactCommon/fabric/components/view/primitives.h index 83f09720d04124..b748e35b182834 100644 --- a/ReactCommon/fabric/components/view/primitives.h +++ b/ReactCommon/fabric/components/view/primitives.h @@ -109,9 +109,9 @@ struct CascadedRectangleCorners { /* .topRight = */ topRight.value_or(topTrailing.value_or(all.value_or(defaults))), /* .bottomLeft = */ - bottomLeft.value_or(topLeading.value_or(all.value_or(defaults))), + bottomLeft.value_or(bottomLeading.value_or(all.value_or(defaults))), /* .bottomRight = */ - bottomRight.value_or(topTrailing.value_or(all.value_or(defaults))), + bottomRight.value_or(bottomTrailing.value_or(all.value_or(defaults))), }; }