Fixed MenuControllerMonitor implementation (#73)

eBardX · Jun 1, 2018 · 4a53882 · 4a53882
1 parent 5d0f603
commit 4a53882
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/Sources/Core/UIKit/Other/MenuControllerMonitor.swift b/Sources/Core/UIKit/Other/MenuControllerMonitor.swift
@@ -121,39 +121,44 @@ public class MenuControllerMonitor: BaseNotificationMonitor {
         super.addNotificationObservers()
 
         if options.contains(.didHideMenu) {
-            observe(.UIMenuControllerDidHideMenu) { [unowned self] in
+            observe(.UIMenuControllerDidHideMenu,
+                    object: UIMenuController.shared) { [unowned self] in
                 if let menu = $0.object as? UIMenuController {
                     self.handler(.didHideMenu(menu))
                 }
             }
         }
 
         if options.contains(.didShowMenu) {
-            observe(.UIMenuControllerDidShowMenu) { [unowned self] in
+            observe(.UIMenuControllerDidShowMenu,
+                    object: UIMenuController.shared) { [unowned self] in
                 if let menu = $0.object as? UIMenuController {
                     self.handler(.didShowMenu(menu))
                 }
             }
         }
 
         if options.contains(.menuFrameDidChange) {
-            observe(.UIMenuControllerMenuFrameDidChange) { [unowned self] in
+            observe(.UIMenuControllerMenuFrameDidChange,
+                    object: UIMenuController.shared) { [unowned self] in
                 if let menu = $0.object as? UIMenuController {
                     self.handler(.menuFrameDidChange(menu))
                 }
             }
         }
 
         if options.contains(.willHideMenu) {
-            observe(.UIMenuControllerWillHideMenu) { [unowned self] in
+            observe(.UIMenuControllerWillHideMenu,
+                    object: UIMenuController.shared) { [unowned self] in
                 if let menu = $0.object as? UIMenuController {
                     self.handler(.willHideMenu(menu))
                 }
             }
         }
 
         if options.contains(.willShowMenu) {
-            observe(.UIMenuControllerWillShowMenu) { [unowned self] in
+            observe(.UIMenuControllerWillShowMenu,
+                    object: UIMenuController.shared) { [unowned self] in
                 if let menu = $0.object as? UIMenuController {
                     self.handler(.willShowMenu(menu))
                 }

diff --git a/Tests/UIKit/Other/MenuControllerMonitorTests.swift b/Tests/UIKit/Other/MenuControllerMonitorTests.swift
@@ -13,7 +13,7 @@ import XCTest
 
 internal class MenuControllerMonitorTests: XCTestCase {
     let notificationCenter = MockNotificationCenter()
-    let menuController = UIMenuController()
+    let menuController = UIMenuController.shared
 
     override func setUp() {
         super.setUp()