Fix broken animations (#23807)

wordpress-mobile · Nov 15, 2024 · b20381f · b20381f
1 parent d86215d
commit b20381f
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 5 deletions.
diff --git a/WordPress/Classes/Utility/WPTableViewHandler.h b/WordPress/Classes/Utility/WPTableViewHandler.h
@@ -106,6 +106,7 @@
 @property (nonatomic) UITableViewRowAnimation moveRowAnimation;
 @property (nonatomic) UITableViewRowAnimation sectionRowAnimation;
 @property (nonatomic) BOOL listensForContentChanges;
+@property (nonatomic) BOOL disableAnimations;
 
 - (nonnull instancetype)initWithTableView:(nonnull UITableView *)tableView;
 - (void)clearCachedRowHeights;

diff --git a/WordPress/Classes/Utility/WPTableViewHandler.m b/WordPress/Classes/Utility/WPTableViewHandler.m
@@ -635,6 +635,9 @@ - (void)controllerWillChangeContent:(NSFetchedResultsController *)controller
     }
 
     self.indexPathSelectedBeforeUpdates = [self.tableView indexPathForSelectedRow];
+    if (self.disableAnimations) {
+        [UIView setAnimationsEnabled:NO];
+    }
     [self.tableView beginUpdates];
 }
 
@@ -645,6 +648,9 @@ - (void)controllerDidChangeContent:(NSFetchedResultsController *)controller
     NSError *error;
     [WPException objcTryBlock:^{
         [self.tableView endUpdates];
+        if (self.disableAnimations) {
+            [UIView setAnimationsEnabled:YES];
+        }
     } error:&error];
 
     if (error) {
@@ -697,7 +703,7 @@ - (void)controller:(NSFetchedResultsController *)controller
         // It seems in some cases newIndexPath can be nil for updates
         newIndexPath = indexPath;
     }
-    
+
     switch(type) {
         case NSFetchedResultsChangeInsert:
         {

diff --git a/WordPress/Classes/ViewRelated/Reader/Controllers/ReaderTableContent.swift b/WordPress/Classes/ViewRelated/Reader/Controllers/ReaderTableContent.swift
@@ -6,10 +6,14 @@ final class ReaderTableContent {
     private var tableViewHandler: WPTableViewHandler?
 
     func initializeContent(tableView: UITableView, delegate: WPTableViewHandlerDelegate) {
-        tableViewHandler = WPTableViewHandler(tableView: tableView)
-        tableViewHandler?.cacheRowHeights = false
-        tableViewHandler?.updateRowAnimation = .none
-        tableViewHandler?.delegate = delegate
+        let tableViewHandler = WPTableViewHandler(tableView: tableView)
+        tableViewHandler.cacheRowHeights = false
+        tableViewHandler.updateRowAnimation = .none
+        tableViewHandler.moveRowAnimation = .none
+        tableViewHandler.insertRowAnimation = .none
+        tableViewHandler.disableAnimations = true
+        tableViewHandler.delegate = delegate
+        self.tableViewHandler = tableViewHandler
     }
 
     func resetResultsController() {