fix(ios): remove invalid if statement at cell reuse

Tencent · Aug 7, 2024 · 22c99ec · 22c99ec
1 parent 4b2506e
commit 22c99ec
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 19 deletions.
diff --git a/renderer/native/ios/renderer/component/listview/HippyNextBaseListView.mm b/renderer/native/ios/renderer/component/listview/HippyNextBaseListView.mm
@@ -269,9 +269,7 @@ - (UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cell
 
     UIView *cellView = nil;
     UIView *cachedVisibleCellView = [_cachedWeakCellViews objectForKey:shadowView.hippyTag];
-    if (cachedVisibleCellView &&
-        [shadowView isKindOfClass:HippyShadowWaterfallItem.class] &&
-        !((HippyShadowWaterfallItem *)shadowView).layoutDirty) {
+    if (cachedVisibleCellView) {
         cellView = cachedVisibleCellView;
         HippyLogTrace(@"🟢 use cached visible cellView at %@ for %@", indexPath, shadowView.hippyTag);
     } else {

diff --git a/renderer/native/ios/renderer/component/waterfalllist/HippyShadowWaterfallItem.h b/renderer/native/ios/renderer/component/waterfalllist/HippyShadowWaterfallItem.h
@@ -38,8 +38,6 @@ NS_ASSUME_NONNULL_BEGIN
 /// Waterfall item's shadowView
 @interface HippyShadowWaterfallItem : HippyShadowView
 
-@property (nonatomic, assign, getter=isLayoutDirty) BOOL layoutDirty;
-
 /// frame change observer, usually is shadowListView
 @property (nonatomic, weak) id<HippyShadowWaterfallItemFrameChangedProtocol> observer;
 

diff --git a/renderer/native/ios/renderer/component/waterfalllist/HippyShadowWaterfallItem.m b/renderer/native/ios/renderer/component/waterfalllist/HippyShadowWaterfallItem.m
@@ -46,17 +46,7 @@ - (void)amendLayoutBeforeMount:(NSMutableSet<NativeRenderApplierBlock> *)blocks
         // If item has not yet been created, then no need to collect blocks.
         return;
     }
-    _layoutDirty = NO;
-    if (NativeRenderUpdateLifecycleComputed == _propagationLifecycle) {
-        return;
-    }
-    if (NativeRenderUpdateLifecycleLayoutDirtied == _propagationLifecycle) {
-        _layoutDirty = YES;
-    }
-    _propagationLifecycle = NativeRenderUpdateLifecycleComputed;
-    for (HippyShadowView *renderObjectView in self.hippySubviews) {
-        [renderObjectView amendLayoutBeforeMount:blocks];
-    }
+    [super amendLayoutBeforeMount:blocks];
 }
 
 @end
diff --git a/renderer/native/ios/renderer/component/waterfalllist/HippyWaterfallView.mm b/renderer/native/ios/renderer/component/waterfalllist/HippyWaterfallView.mm
@@ -263,9 +263,7 @@ - (UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cell
 
     UIView *cellView = nil;
     UIView *cachedCellView = [_cachedWeakCellViews objectForKey:shadowView.hippyTag];
-    if (cachedCellView &&
-        [shadowView isKindOfClass:HippyShadowWaterfallItem.class] &&
-        !((HippyShadowWaterfallItem *)shadowView).layoutDirty) {
+    if (cachedCellView) {
         cellView = cachedCellView;
     } else {
         cellView = [self.uiManager createViewForShadowListItem:shadowView];