Catalyst updates

iZettle · Dec 16, 2019 · 7cdc0d3 · 7cdc0d3
1 parent e53284a
commit 7cdc0d3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/Presentation/DualNavigationControllersSplitDelegate.swift b/Presentation/DualNavigationControllersSplitDelegate.swift
@@ -48,7 +48,11 @@ open class DualNavigationControllersSplitDelegate: NSObject, UISplitViewControll
 
     /// Returns a signal that will signal when collapsing or expanding. Current value can be nil if the collapsed state cannot be determined reliably yet.
     public var isCollapsed: ReadSignal<Bool?> {
+        #if targetEnvironment(macCatalyst)
+        return ReadSignal<Bool?>(false)
+        #else
         return isCollapsedProperty.readOnly()
+        #endif
     }
 
     internal func makeMasterNavigationController(_ splitController: UISplitViewController) -> UINavigationController {

diff --git a/Presentation/UISplitViewController+Presenting.swift b/Presentation/UISplitViewController+Presenting.swift
@@ -48,6 +48,7 @@ extension UISplitViewController: PresentingViewController {
             }
             presenter = nc
             viewControllers = [ nc ] + viewControllers.dropFirst()
+            _ = self.delegate?.targetDisplayModeForAction?(in: self)
         default:
             fatalError("Not supported")
         }