fix(ios): dead loops generated by nested text layouts

Tencent · Dec 6, 2023 · 14da8fe · 14da8fe
1 parent 49d8a58
commit 14da8fe
Showing 1 changed file with 13 additions and 4 deletions.
diff --git a/renderer/native/ios/renderer/component/text/NativeRenderObjectText.mm b/renderer/native/ios/renderer/component/text/NativeRenderObjectText.mm
@@ -297,10 +297,19 @@ - (void)amendLayoutBeforeMount:(NSMutableSet<NativeRenderApplierBlock> *)blocks
                 }
             }
         }];
-        [super amendLayoutBeforeMount:blocks];
-    }
-    @catch (NSException *exception) {
-        [super amendLayoutBeforeMount:blocks];
+
+        // Nested <Text> inside <Text> should not call amendLayoutBeforeMount again,
+        // so only call amendXxx when subcomponent is not a <Text>.
+        if (NativeRenderUpdateLifecycleComputed != _propagationLifecycle) {
+            _propagationLifecycle = NativeRenderUpdateLifecycleComputed;
+            for (HippyShadowView *shadowView in self.subcomponents) {
+                if (![shadowView isKindOfClass:NativeRenderObjectText.class]) {
+                    [shadowView amendLayoutBeforeMount:blocks];
+                }
+            }
+        }
+    } @catch (NSException *exception) {
+        HippyLogError(@"Exception while doing %s: %@, %@", __func__, exception.description, self);
     }
     [self processUpdatedProperties:blocks parentProperties:nil];
 }