From 83aa5b7e31dcdde724e551bacb7ec99253fa3765 Mon Sep 17 00:00:00 2001 From: Valentin Shergin Date: Fri, 22 Nov 2019 20:05:04 -0800 Subject: [PATCH] Fabric: RCTNSLineBreakModeFromWritingDirection was renamed Summary: ... because the original name made no sense. Changelog: [Internal] Fabric-specific internal change. Reviewed By: sammy-SC Differential Revision: D18607834 fbshipit-source-id: bf32d2b61d1c3deccba0b599b303ede0b82e6dd6 --- .../textlayoutmanager/platform/ios/RCTTextLayoutManager.mm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/ReactCommon/fabric/textlayoutmanager/platform/ios/RCTTextLayoutManager.mm b/ReactCommon/fabric/textlayoutmanager/platform/ios/RCTTextLayoutManager.mm index ad88ef307e5..850613bd7a7 100644 --- a/ReactCommon/fabric/textlayoutmanager/platform/ios/RCTTextLayoutManager.mm +++ b/ReactCommon/fabric/textlayoutmanager/platform/ios/RCTTextLayoutManager.mm @@ -18,8 +18,8 @@ using namespace facebook::react; SimpleThreadSafeCache, 256> _cache; } -static NSLineBreakMode RCTNSLineBreakModeFromWritingDirection( - EllipsizeMode ellipsizeMode) { +static NSLineBreakMode RCTNSLineBreakModeFromEllipsizeMode(EllipsizeMode ellipsizeMode) +{ switch (ellipsizeMode) { case EllipsizeMode::Clip: return NSLineBreakByClipping; @@ -80,8 +80,7 @@ static NSLineBreakMode RCTNSLineBreakModeFromWritingDirection( textContainer.lineFragmentPadding = 0.0; // Note, the default value is 5. textContainer.lineBreakMode = paragraphAttributes.maximumNumberOfLines > 0 - ? RCTNSLineBreakModeFromWritingDirection( - paragraphAttributes.ellipsizeMode) + ? RCTNSLineBreakModeFromEllipsizeMode(paragraphAttributes.ellipsizeMode) : NSLineBreakByClipping; textContainer.maximumNumberOfLines = paragraphAttributes.maximumNumberOfLines;