Merge branch 'main' into feature/update-vue-docs

Tencent · Dec 14, 2023 · 8a3e542 · 8a3e542
2 parents d3c7b79 + dd2320d
commit 8a3e542
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/renderer/native/ios/renderer/component/waterfalllist/NativeRenderWaterfallView.mm b/renderer/native/ios/renderer/component/waterfalllist/NativeRenderWaterfallView.mm
@@ -420,11 +420,17 @@ - (void)addCellViewToCollectionViewCell:(UICollectionViewCell *)cell atIndexPath
 }
 
 #pragma mark - NativeRenderCollectionViewDelegateWaterfallLayout
+
 - (CGSize)collectionView:(UICollectionView *)collectionView
                   layout:(UICollectionViewLayout *)collectionViewLayout
-    sizeForItemAtIndexPath:(NSIndexPath *)indexPath {
-    HippyShadowView *renderObjectView = [_dataSource cellForIndexPath:indexPath];
-    return renderObjectView.frame.size;
+  sizeForItemAtIndexPath:(NSIndexPath *)indexPath {
+    HippyShadowView *shadowView = [_dataSource cellForIndexPath:indexPath];
+    CGSize itemSize = shadowView.frame.size;
+    if (itemSize.width < .0 || itemSize.height < .0) {
+        HippyLogError(@"Negative item size for %@ at %@ of %@", shadowView, indexPath, self);
+        return CGSizeZero;
+    }
+    return shadowView.frame.size;
 }
 
 - (NSInteger)collectionView:(UICollectionView *)collectionView