From 4743dad5d935bc784fc87d921bd3dc8f951a2473 Mon Sep 17 00:00:00 2001 From: Christopher Hogan Date: Wed, 20 Nov 2019 14:15:16 -0800 Subject: [PATCH] Revert an RTL change we made that FB fixed at a lower level, making this obsolete. This file now aligns with what FB has in their repo --- .../SafeAreaView/RCTSafeAreaShadowView.m | 21 ++++--------------- 1 file changed, 4 insertions(+), 17 deletions(-) diff --git a/React/Views/SafeAreaView/RCTSafeAreaShadowView.m b/React/Views/SafeAreaView/RCTSafeAreaShadowView.m index 52d77e7348e378..52ba5f00ec9452 100644 --- a/React/Views/SafeAreaView/RCTSafeAreaShadowView.m +++ b/React/Views/SafeAreaView/RCTSafeAreaShadowView.m @@ -11,7 +11,6 @@ #import #import "RCTSafeAreaViewLocalData.h" -#import "RCTI18nUtil.h" @implementation RCTSafeAreaShadowView @@ -22,24 +21,12 @@ - (void)setLocalData:(RCTSafeAreaViewLocalData *)localData UIEdgeInsets insets = localData.insets; + super.paddingLeft = (YGValue){insets.left, YGUnitPoint}; + super.paddingRight = (YGValue){insets.right, YGUnitPoint}; super.paddingTop = (YGValue){insets.top, YGUnitPoint}; super.paddingBottom = (YGValue){insets.bottom, YGUnitPoint}; - // [TODO(OSS OC#2726827) - if ([[RCTI18nUtil sharedInstance] doLeftAndRightSwapInRTL]) { - if ([[RCTI18nUtil sharedInstance] isRTL]) { - super.paddingStart = (YGValue){insets.right, YGUnitPoint}; - super.paddingEnd = (YGValue){insets.left, YGUnitPoint}; - } else { - super.paddingStart = (YGValue){insets.left, YGUnitPoint}; - super.paddingEnd = (YGValue){insets.right, YGUnitPoint}; - } - [self didSetProps:@[@"paddingStart", @"paddingEnd", @"paddingTop", @"paddingBottom"]]; - } else { - super.paddingLeft = (YGValue){insets.left, YGUnitPoint}; - super.paddingRight = (YGValue){insets.right, YGUnitPoint}; - [self didSetProps:@[@"paddingLeft", @"paddingRight", @"paddingTop", @"paddingBottom"]]; - } - // ]TODO(OSS OC#2726827) + + [self didSetProps:@[@"paddingLeft", @"paddingRight", @"paddingTop", @"paddingBottom"]]; } /**