fix(ios): fix text rendering issue

Tencent · Oct 17, 2023 · a968697 · a968697
1 parent ed206ed
commit a968697
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 3 deletions.
diff --git a/renderer/native/ios/renderer/component/text/NativeRenderObjectText.mm b/renderer/native/ios/renderer/component/text/NativeRenderObjectText.mm
@@ -238,7 +238,7 @@ - (void)amendLayoutBeforeMount:(NSMutableSet<NativeRenderApplierBlock> *)blocks
         [textStorage enumerateAttribute:NativeRenderRenderObjectAttributeName inRange:characterRange options:0 usingBlock:^(
             NativeRenderObjectView *child, NSRange range, __unused BOOL *_) {
             if (child) {
-                float width = child.frame.size.width, height = child.frame.size.height;
+                float width = child.width, height = child.height;
                 if (isnan(width) || isnan(height)) {
                     HPLogError(@"Views nested within a <Text> must have a width and height");
                 }
@@ -254,8 +254,8 @@ - (void)amendLayoutBeforeMount:(NSMutableSet<NativeRenderApplierBlock> *)blocks
 
                 // take margin into account
                 // FIXME: margin currently not working, may have some bug in layout process
-                float left = child.nodeLayoutResult.left;
-                float top = child.nodeLayoutResult.top;
+                float left = 0;
+                float top = 0;
                 float marginV = child.nodeLayoutResult.marginTop + child.nodeLayoutResult.marginBottom;
                 CGFloat roundedHeightWithMargin = NativeRenderRoundPixelValue(height + marginV);
 

diff --git a/renderer/native/ios/renderer/component/view/NativeRenderObjectView.h b/renderer/native/ios/renderer/component/view/NativeRenderObjectView.h
@@ -119,6 +119,23 @@ extern NSString *const NativeRenderShadowViewDiffTag;
  */
 @property (nonatomic, assign, getter=isHidden) BOOL hidden;
 
+/**
+ * Position and dimensions.
+ * Defaults to 0
+ */
+@property (nonatomic, assign) CGFloat top;
+@property (nonatomic, assign) CGFloat left;
+@property (nonatomic, assign) CGFloat bottom;
+@property (nonatomic, assign) CGFloat right;
+
+@property (nonatomic, assign) CGFloat width;
+@property (nonatomic, assign) CGFloat height;
+
+@property (nonatomic, assign) CGFloat minWidth;
+@property (nonatomic, assign) CGFloat maxWidth;
+@property (nonatomic, assign) CGFloat minHeight;
+@property (nonatomic, assign) CGFloat maxHeight;
+
 /**
  * Get frame set by layout system
  */