fix(ios): listview and waterfall reload animation bug

Tencent · Oct 16, 2023 · 70fc3ee · 70fc3ee
1 parent 1739716
commit 70fc3ee
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 11 deletions.
diff --git a/renderer/native/ios/renderer/component/listview/NativeRenderBaseListViewDataSource.mm b/renderer/native/ios/renderer/component/listview/NativeRenderBaseListViewDataSource.mm
@@ -210,20 +210,19 @@ - (void)applyDiff:(NativeRenderBaseListViewDataSource *)another
 
     BOOL success = YES;
     if ([batchUpdate count]) {
-        [UIView setAnimationsEnabled:NO];
+        [CATransaction begin];
+        [CATransaction setDisableActions:YES];
         @try {
             [view performBatchUpdates:^{
                 for (NSInvocation *invocation in batchUpdate) {
                     [invocation invoke];
                 }
-            } completion:^(BOOL finished) {
-                [UIView setAnimationsEnabled:YES];
-            }];
+            } completion:nil];
         } @catch (NSException *exception) {
             [view reloadData];
             success = NO;
-            [UIView setAnimationsEnabled:YES];
         }
+        [CATransaction commit];
     }
     completion(success);
 }

diff --git a/renderer/native/ios/renderer/component/waterfalllist/NativeRenderWaterfallViewDataSource.mm b/renderer/native/ios/renderer/component/waterfalllist/NativeRenderWaterfallViewDataSource.mm
@@ -367,20 +367,19 @@ - (void)applyDiff:(NativeRenderWaterfallViewDataSource *)another
     }];
     BOOL success = YES;
     if ([batchUpdate count]) {
-        [UIView setAnimationsEnabled:NO];
+        [CATransaction begin];
+        [CATransaction setDisableActions:YES];
         @try {
             [view performBatchUpdates:^{
                 for (NSInvocation *invocation in batchUpdate) {
                     [invocation invoke];
                 }
-            } completion:^(BOOL finished) {
-                [UIView setAnimationsEnabled:YES];
-            }];
+            } completion:nil];
         } @catch (NSException *exception) {
-            success = NO;
             [view reloadData];
-            [UIView setAnimationsEnabled:YES];
+            success = NO;
         }
+        [CATransaction commit];
     }
     completion(success);
 }