Merge pull request #167 from tumblr/Fix-iOS18-CellDequeue-Crash

Fix iOS 18 cell dequeue crash
tumblr · Oct 24, 2024 · f0c5515 · f0c5515
2 parents b6f6e3b + 0e8289b
commit f0c5515
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/Classes/Editor/EditorViewController.swift b/Classes/Editor/EditorViewController.swift
@@ -508,14 +508,10 @@ public final class EditorViewController: UIViewController, MediaPlayerController
     // MARK: - GIF Maker Helpers
 
     private func openGIFMaker(animated: Bool) {
-        guard let cell = collectionController.getCell(for: .gif) else {
-            assertionFailure("Failed to open GIF Maker")
-            return
-        }
-        openGIFMaker(cell: cell, animated: animated, permanent: true)
+        openGIFMaker(cell: collectionController.getCell(for: .gif), animated: animated, permanent: true)
     }
 
-    private func openGIFMaker(cell: KanvasEditorMenuCollectionCell, animated: Bool, permanent: Bool) {
+    private func openGIFMaker(cell: KanvasEditorMenuCollectionCell?, animated: Bool, permanent: Bool) {
         let editionOption = EditionOption.gif
         onBeforeShowingEditionMenu(editionOption, cell: cell)
         showMainUI(false)

diff --git a/Classes/Editor/Menu/EditionMenu/EditionMenuCollectionController.swift b/Classes/Editor/Menu/EditionMenu/EditionMenuCollectionController.swift
@@ -112,7 +112,7 @@ final class EditionMenuCollectionController: UIViewController, KanvasEditorMenuC
             return nil
         }
         let indexPath = IndexPath(item: index, section: Constants.section)
-        return self.collectionView(collectionView, cellForItemAt: indexPath) as? EditionMenuCollectionCell
+        return collectionView.cellForItem(at: indexPath) as? EditionMenuCollectionCell
     }
 
     // MARK: - UICollectionViewDataSource