@fluentui-react-native/callout 0.19.33 → 0.19.36

package/CHANGELOG.json

@@ -2,7 +2,58 @@
   "name": "@fluentui-react-native/callout",
   "entries": [
     {
-      "date": "Fri, 18 Mar 2022 07:18:53 GMT",
+      "date": "Mon, 28 Mar 2022 15:01:45 GMT",
+      "tag": "@fluentui-react-native/callout_v0.19.36",
+      "version": "0.19.36",
+      "comments": {
+        "patch": [
+          {
+            "author": "beachball",
+            "package": "@fluentui-react-native/callout",
+            "comment": "Bump @fluentui-react-native/interactive-hooks to v0.14.5",
+            "commit": "c85943cf17fb111a721e006e1619084e27650b39"
+          }
+        ]
+      }
+    },
+    {
+      "date": "Wed, 23 Mar 2022 17:24:05 GMT",
+      "tag": "@fluentui-react-native/callout_v0.19.35",
+      "version": "0.19.35",
+      "comments": {
+        "patch": [
+          {
+            "author": "beachball",
+            "package": "@fluentui-react-native/callout",
+            "comment": "Bump @fluentui-react-native/interactive-hooks to v0.14.4",
+            "commit": "0a18d2f8bb6505c6c6e2445ff3ba62ac79334872"
+          },
+          {
+            "author": "beachball",
+            "package": "@fluentui-react-native/callout",
+            "comment": "Bump @uifabricshared/foundation-compose to v1.11.12",
+            "commit": "0a18d2f8bb6505c6c6e2445ff3ba62ac79334872"
+          }
+        ]
+      }
+    },
+    {
+      "date": "Mon, 21 Mar 2022 01:47:54 GMT",
+      "tag": "@fluentui-react-native/callout_v0.19.34",
+      "version": "0.19.34",
+      "comments": {
+        "patch": [
+          {
+            "author": "sanajmi@microsoft.com",
+            "package": "@fluentui-react-native/callout",
+            "commit": "b772dfe4542b7032f216bf5c2faa807c695fa2a7",
+            "comment": "width -> maxWidth"
+          }
+        ]
+      }
+    },
+    {
+      "date": "Fri, 18 Mar 2022 07:19:17 GMT",
       "tag": "@fluentui-react-native/callout_v0.19.33",
       "version": "0.19.33",
       "comments": {

package/CHANGELOG.md

@@ -1,12 +1,37 @@
 # Change Log - @fluentui-react-native/callout
 
-This log was last generated on Fri, 18 Mar 2022 07:18:53 GMT and should not be manually modified.
+This log was last generated on Mon, 28 Mar 2022 15:01:45 GMT and should not be manually modified.
 
 <!-- Start content -->
 
+## 0.19.36
+
+Mon, 28 Mar 2022 15:01:45 GMT
+
+### Patches
+
+- Bump @fluentui-react-native/interactive-hooks to v0.14.5
+
+## 0.19.35
+
+Wed, 23 Mar 2022 17:24:05 GMT
+
+### Patches
+
+- Bump @fluentui-react-native/interactive-hooks to v0.14.4
+- Bump @uifabricshared/foundation-compose to v1.11.12
+
+## 0.19.34
+
+Mon, 21 Mar 2022 01:47:54 GMT
+
+### Patches
+
+- width -> maxWidth (sanajmi@microsoft.com)
+
 ## 0.19.33
 
-Fri, 18 Mar 2022 07:18:53 GMT
+Fri, 18 Mar 2022 07:19:17 GMT
 
 ### Patches
 

package/macos/Callout.swift

@@ -85,39 +85,47 @@ class CalloutView: RCTView, CalloutWindowLifeCycleDelegate {
 
 		updateCalloutFrameToAnchor()
 		calloutWindow.makeKeyAndOrderFront(self)
-		
+
 		// Dismiss the Callout if the window is no longer active.
 		NotificationCenter.default.addObserver(self, selector: #selector(dismissCallout), name: NSApplication.didResignActiveNotification, object: nil)
 
-		mouseEventMonitor.addLocalMonitorForEvents(matching: .leftMouseUp, handler: { [weak self] (event) -> NSEvent? in
-			guard let clickedWindow = event.window else {
-					return event
+		mouseEventMonitor.addLocalMonitorForEvents(matching: .leftMouseDown, handler: { [weak self] (event) -> NSEvent? in
+			func isClickInsideWindowHierarchy(window: NSWindow?, event: NSEvent) -> Bool {
+				guard let window = window else {
+					return false
+				}
+				guard let clickedWindow = event.window else {
+					return false
 				}
 
-				var shouldDismissCallout = true
-
-				// Did the click happened in our own window?
-				if (clickedWindow.isEqual(to: self) ) {
-					shouldDismissCallout = false
-	
-				// Are we a child window of a Callout (e.g: a ContextualMenu submenu), where the click happened in our parent?
-				} else if (clickedWindow.isEqual(to: self?.calloutWindow.parent as? CalloutWindow)) {
-					shouldDismissCallout = false
+				var isClickInHierarchy = false
 
-				// Did the click happened in any of our child windows (e.g: our submenus)?
-				} else if (self?.calloutWindow.childWindows?.contains(clickedWindow) ?? false) {
-					shouldDismissCallout = false
-				}
-	
-				if (shouldDismissCallout) {
-					self?.dismissCallout()
+				if (window.isEqual(to: clickedWindow)) {
+					isClickInHierarchy = true
+				} else {
+					if let childWindows = window.childWindows {
+						for childWindow in childWindows {
+							isClickInHierarchy = isClickInsideWindowHierarchy(window: childWindow, event: event)
+						}
+					}
 				}
 
-				return event
-			})
-		
+				return isClickInHierarchy
+			}
+
+			var window: NSWindow? = self?.calloutWindow
+			while (window?.parent as? CalloutWindow != nil) {
+				window = window?.parent
+			}
+
+			if (!isClickInsideWindowHierarchy(window: window, event: event)) {
+				self?.dismissCallout()
+			}
+
+			return event
+		})
+
 		isCalloutWindowShown = true
-		
 		onShowCallout()
 	}
 
@@ -139,7 +147,7 @@ class CalloutView: RCTView, CalloutWindowLifeCycleDelegate {
 
 		NotificationCenter.default.removeObserver(self)
 		mouseEventMonitor.removeMonitor()
-		
+
 		isCalloutWindowShown = false
 	}
 
@@ -328,7 +336,7 @@ class CalloutView: RCTView, CalloutWindowLifeCycleDelegate {
 	private var anchorView: NSView?
 
 	/// The  view we forward Callout's Children to. It's hosted within the CalloutWindow's
-	/// view heirarchy, ensuring our React Views are not placed in the main window.
+	/// view hierarchy, ensuring our React Views are not placed in the main window.
 	private lazy var proxyView: NSView = {
 		let visualEffectView = FlippedVisualEffectView()
 		visualEffectView.translatesAutoresizingMaskIntoConstraints = false
@@ -363,9 +371,9 @@ class CalloutView: RCTView, CalloutWindowLifeCycleDelegate {
 		}
 		return window
 	}()
-	
+
 	private var mouseEventMonitor = GuardedEventMonitor()
-	
+
 	private var isCalloutWindowShown = false
 }
 

package/macos/GuardedEventMonitor.swift

@@ -2,28 +2,26 @@
 
 /// NSEvent localMonitors are an _old_ API that requires you to do some  memory management yourself.
 /// You _must_ call `removeMonitor`exactly once per monitor created from. This helper class enforces
-/// that with the use of an extra boolean to track whether we have already allocated/released our monitor.
+/// we set the reference to nil after `removeMonitor` so that subsequent calls don't cause an over release.
+/// One instance should only be used to allocate and manage one NSEvent monitor.
 /// https://developer.apple.com/documentation/appkit/nsevent/1533709-removemonitor
 internal class GuardedEventMonitor: Any {
-	
-	private var isMonitorAllocated = false
+
 	private var allocatedMonitor: Any?
-	
-	
+
 	func addLocalMonitorForEvents(matching mask: NSEvent.EventTypeMask, handler block: @escaping (NSEvent) -> NSEvent?) {
-		if (!isMonitorAllocated) {
+		if (allocatedMonitor == nil) {
 			allocatedMonitor = NSEvent.addLocalMonitorForEvents(matching: mask, handler: block)
-			isMonitorAllocated = true
 		}
 	}
-	
+
 	func removeMonitor() {
-		if (isMonitorAllocated) {
-			NSEvent.removeMonitor(allocatedMonitor as Any)
-			isMonitorAllocated = false
+		if let monitor = allocatedMonitor {
+			NSEvent.removeMonitor(monitor)
+			allocatedMonitor = nil
 		}
 	}
-	
+
 	deinit {
 		removeMonitor()
 	}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fluentui-react-native/callout",
-  "version": "0.19.33",
+  "version": "0.19.36",
   "description": "A cross-platform Callout component using the Fluent Design System",
   "license": "MIT",
   "author": "",
@@ -27,10 +27,10 @@
   "dependencies": {
     "@fluentui-react-native/adapters": "^0.8.4",
     "@fluentui-react-native/component-cache": "^1.3.1",
-    "@fluentui-react-native/interactive-hooks": ">=0.14.3 <1.0.0",
+    "@fluentui-react-native/interactive-hooks": ">=0.14.5 <1.0.0",
     "@fluentui-react-native/tokens": ">=0.11.8 <1.0.0",
     "@uifabricshared/foundation-composable": ">=0.10.2 <1.0.0",
-    "@uifabricshared/foundation-compose": "^1.11.11",
+    "@uifabricshared/foundation-compose": "^1.11.12",
     "@uifabricshared/foundation-settings": ">=0.11.2 <1.0.0"
   },
   "devDependencies": {