fix(ios): fix mixed type text word order bug

Tencent · Mar 8, 2022 · 6ed4df3 · 6ed4df3
1 parent a81e2a3
commit 6ed4df3
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/ios/sdk/component/text/HippyShadowText.mm b/ios/sdk/component/text/HippyShadowText.mm
@@ -388,6 +388,11 @@ - (NSAttributedString *)_attributedStringWithFontFamily:(NSString *)fontFamily
 
     CGFloat heightOfTallestSubview = 0.0;
     NSMutableAttributedString *attributedString = [[NSMutableAttributedString alloc] initWithString:self.text ?: @""];
+    NSWritingDirection direction = [[HippyI18nUtils sharedInstance] writingDirectionForCurrentAppLanguage];
+    if (NSWritingDirectionRightToLeft == direction) {
+        NSDictionary *dic = @{NSWritingDirectionAttributeName: @[@(NSWritingDirectionRightToLeft | NSWritingDirectionEmbedding)]};
+        [attributedString addAttributes:dic range:NSMakeRange(0, [self.text length])];
+    }
     for (HippyShadowView *child in [self hippySubviews]) {
         if ([child isKindOfClass:[HippyShadowText class]]) {
             HippyShadowText *shadowText = (HippyShadowText *)child;
@@ -401,7 +406,6 @@ - (NSAttributedString *)_attributedStringWithFontFamily:(NSString *)fontFamily
             [child setTextComputed];
         } else {
             // MTTlayout
-            NSWritingDirection direction = [[HippyI18nUtils sharedInstance] writingDirectionForCurrentAppLanguage];
             MTTDirection nodeDirection = (NSWritingDirectionRightToLeft == direction) ? DirectionRTL : DirectionLTR;
             nodeDirection = self.layoutDirection != DirectionInherit ? self.layoutDirection : nodeDirection;
             MTTNodeDoLayout(child.nodeRef, NAN, NAN, nodeDirection);