From 5a1939b36f9769f3810a5ed98426009512c064fc Mon Sep 17 00:00:00 2001 From: bang9 Date: Sat, 8 Oct 2022 12:10:41 +0900 Subject: [PATCH] chore: apply review --- React/Base/RCTConvert.m | 37 ++++++++++++------------------------- 1 file changed, 12 insertions(+), 25 deletions(-) diff --git a/React/Base/RCTConvert.m b/React/Base/RCTConvert.m index 1bbd8c97bf7d47..bbb1e8f21c1ec8 100644 --- a/React/Base/RCTConvert.m +++ b/React/Base/RCTConvert.m @@ -377,34 +377,21 @@ + (NSLocale *)NSLocale:(id)json + (NSLineBreakStrategy)NSLineBreakStrategy:(id)json RCT_DYNAMIC { - static NSDictionary *mapping; - static dispatch_once_t onceToken; - dispatch_once(&onceToken, ^{ if (@available(iOS 14.0, *)) { - mapping = @{ - @"none" : @(NSLineBreakStrategyNone), -#if defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 140000 - @"standard" : @(NSLineBreakStrategyStandard), - @"hangul-word" : @(NSLineBreakStrategyHangulWordPriority), - @"push-out": @(NSLineBreakStrategyPushOut) -#else - @"standard" : @(NSLineBreakStrategyNone), - @"hangul-word" : @(NSLineBreakStrategyNone), - @"push-out": @(NSLineBreakStrategyNone) -#endif - }; + static NSDictionary *mapping; + static dispatch_once_t onceToken; + dispatch_once(&onceToken, ^{ + mapping = @{ + @"none" : @(NSLineBreakStrategyNone), + @"standard" : @(NSLineBreakStrategyStandard), + @"hangul-word" : @(NSLineBreakStrategyHangulWordPriority), + @"push-out": @(NSLineBreakStrategyPushOut) + }; + }); + return RCTConvertEnumValue("NSLineBreakStrategy", mapping, @(NSLineBreakStrategyNone), json).integerValue; } else { - mapping = @{ - @"none" : @(NSLineBreakStrategyNone), - @"standard" : @(NSLineBreakStrategyNone), - @"hangul-word" : @(NSLineBreakStrategyNone), - @"push-out": @(NSLineBreakStrategyNone) - }; + return NSLineBreakStrategyNone; } - }); - - NSLineBreakStrategy type = RCTConvertEnumValue("NSLineBreakStrategy", mapping, @(NSLineBreakStrategyNone), json).integerValue; - return type; } RCT_ENUM_CONVERTER(