IOS-7128. Context Menu - the context menu is not updated when selecting a different sorting or switching from thumbnail to list view or vice versa

Author: rgmez

Modules/MEGAUIKit/Sources/MEGAUIKit/Extensions/UIMenu+Matchable.swift

@@ -16,7 +16,10 @@ extension UIMenu {
         let oldMenuActionTitles = lhs.decomposeMenuIntoActionTitles()
         let updatedMenuActionTitle = rhs.decomposeMenuIntoActionTitles()
 
-        return oldMenuActionTitles.elementsEqual(updatedMenuActionTitle)
+        let oldMenuActions = lhs.decomposeMenuIntoActions()
+        let updatedMenuActions = rhs.decomposeMenuIntoActions()
+        
+        return oldMenuActionTitles.elementsEqual(updatedMenuActionTitle) && matchActionStates(lhs: oldMenuActions, rhs: updatedMenuActions)
     }
 
     private func decomposeMenuIntoActionTitles() -> [String] {
@@ -29,4 +32,29 @@ extension UIMenu {
             return nil
         }.reduce([], +)
     }
+    
+    private func decomposeMenuIntoActions() -> [UIAction] {
+        children.compactMap {
+            if let action = $0 as? UIAction {
+                return [action]
+            } else if let menu = $0 as? UIMenu {
+                return menu.decomposeMenuIntoActions()
+            }
+            return nil
+        }.reduce([], +)
+    }
+    
+    private static func matchActionStates(lhs: [UIAction]?, rhs: [UIAction]?) -> Bool {
+        guard let lhs, let rhs, lhs.count == rhs.count else { return false }
+        
+        let actions1 = lhs.map { ($0, $0.state) }
+        let actions2 = rhs.map { ($0, $0.state) }
+        
+        for (index, action) in actions1.enumerated() {
+            if action != actions2[index] {
+                return false
+            }
+        }
+        return true
+    }
 }

Modules/MEGAUIKit/Tests/MEGAUIKitTests/UIMenuTests.swift

@@ -81,4 +81,57 @@ final class UIMenuTests: XCTestCase {
 
         XCTAssertFalse(UIMenu.match(lhs: oldMenu, rhs: updatedMenu))
     }
+    
+    func testDoMenuActionMatch_whenMenusHaveSameActionsAndActionStates_returnsTrue() {
+        let action1_ON = UIAction(title: "Action 1", state: .on, handler: {_ in})
+        let action2_OFF = UIAction(title: "Action 2", state: .off, handler: {_ in})
+        
+        let oldMenu = UIMenu(title: "Test Menu", children: [action1_ON, action2_OFF])
+        let updatedMenu = UIMenu(title: "Test Menu", children: [action1_ON, action2_OFF])
+        
+        XCTAssertTrue(UIMenu.match(lhs: oldMenu, rhs: updatedMenu))
+    }
+    
+    func testDoMenuActionMatch_whenMenusAreDifferentButHaveSameActionsAndActionStates_returnsFalse() {
+        let action1_ON = UIAction(title: "Action 1", state: .on, handler: {_ in})
+        let action2_OFF = UIAction(title: "Action 2", state: .off, handler: {_ in})
+        
+        let oldMenu = UIMenu(title: "Old Menu", children: [action1_ON, action2_OFF])
+        let updatedMenu = UIMenu(title: "Updated Menu", children: [action1_ON, action2_OFF])
+        
+        XCTAssertTrue(UIMenu.match(lhs: oldMenu, rhs: updatedMenu))
+    }
+    
+    func testDoMenuActionMatch_whenMenusAreDifferentAndHaveSameActionsButDifferentActionStates_returnsFalse() {
+        let action1_ON = UIAction(title: "Action 1", state: .on, handler: {_ in})
+        let action1_OFF = UIAction(title: "Action 1", state: .off, handler: {_ in})
+        let action2_ON = UIAction(title: "Action 2", state: .on, handler: {_ in})
+        let action2_OFF = UIAction(title: "Action 2", state: .off, handler: {_ in})
+        
+        let oldMenu = UIMenu(title: "Old Menu", children: [action1_ON, action2_OFF])
+        let updatedMenu = UIMenu(title: "Updated Menu", children: [action1_OFF, action2_ON])
+        
+        XCTAssertFalse(UIMenu.match(lhs: oldMenu, rhs: updatedMenu))
+    }
+    
+    func testMatch_sameActionStates_returnsFalse() {
+        let action1_ON = UIAction(title: "Action 1", state: .on, handler: {_ in})
+        let menu1 = UIMenu(title: "Updated Menu", options: [], children: [action1_ON])
+        let menu2 = UIMenu(title: "Updated Menu", options: [], children: [action1_ON])
+        
+        let result = UIMenu.match(lhs: menu1, rhs: menu2)
+       
+        XCTAssertTrue(result)
+   }
+    
+    func testMatch_differentActionStates_returnsFalse() {
+        let action1_ON = UIAction(title: "Action 1", state: .on, handler: {_ in})
+        let menu1 = UIMenu(title: "Updated Menu", options: [], children: [action1_ON])
+        let action1_OFF = UIAction(title: "Action 1", state: .off, handler: {_ in})
+        let menu2 = UIMenu(title: "Updated Menu", options: [], children: [action1_OFF])
+        
+        let result = UIMenu.match(lhs: menu1, rhs: menu2)
+       
+        XCTAssertFalse(result)
+   }
 }