@fluentui-react-native/callout 0.19.23 → 0.19.24

package/CHANGELOG.json

@@ -2,7 +2,22 @@
   "name": "@fluentui-react-native/callout",
   "entries": [
     {
-      "date": "Wed, 09 Feb 2022 20:13:22 GMT",
+      "date": "Thu, 10 Feb 2022 17:12:39 GMT",
+      "tag": "@fluentui-react-native/callout_v0.19.24",
+      "version": "0.19.24",
+      "comments": {
+        "patch": [
+          {
+            "author": "sanajmi@microsoft.com",
+            "package": "@fluentui-react-native/callout",
+            "commit": "83351e09339212a1bfd1e76bce25251726082372",
+            "comment": "macOS: Add Childwindow support"
+          }
+        ]
+      }
+    },
+    {
+      "date": "Wed, 09 Feb 2022 20:14:50 GMT",
       "tag": "@fluentui-react-native/callout_v0.19.23",
       "version": "0.19.23",
       "comments": {

package/CHANGELOG.md

@@ -1,12 +1,20 @@
 # Change Log - @fluentui-react-native/callout
 
-This log was last generated on Wed, 09 Feb 2022 20:13:22 GMT and should not be manually modified.
+This log was last generated on Thu, 10 Feb 2022 17:12:39 GMT and should not be manually modified.
 
 <!-- Start content -->
 
+## 0.19.24
+
+Thu, 10 Feb 2022 17:12:39 GMT
+
+### Patches
+
+- macOS: Add Childwindow support (sanajmi@microsoft.com)
+
 ## 0.19.23
 
-Wed, 09 Feb 2022 20:13:22 GMT
+Wed, 09 Feb 2022 20:14:50 GMT
 
 ### Patches
 

package/macos/Callout.swift

@@ -304,7 +304,9 @@ class CalloutView: RCTView, CalloutWindowLifeCycleDelegate {
 		}
 
 		contentView.addSubview(proxyView)
-		window.initialFirstResponder = proxyView
+		if let parentWindow = self.window {
+			parentWindow.addChildWindow(window, ordered: .above)
+		}
 
 		return window
 	}()

package/macos/CalloutWindow.swift

@@ -22,11 +22,31 @@ class CalloutWindow: NSWindow {
 		// Dismiss the Callout if the window is no longer active.
 		NotificationCenter.default.addObserver(self, selector: #selector(dismissCallout), name: NSApplication.didResignActiveNotification, object: nil)
 
-		// Dismiss the Callout if the user touched/clicked outside the bounds of the callout.
+		// Dismiss the Callout if the user clicked outside the Callout Window or any of our child windows.
 		mouseEventMonitor = NSEvent.addLocalMonitorForEvents(matching: .leftMouseUp, handler: { [weak self] (event) -> NSEvent? in
-			if (event.window != self) {
+			guard let clickedWindow = event.window else {
+				return event
+			}
+
+			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?.parent as? CalloutWindow)) {
+				shouldDismissCallout = false
+
+			// Did the click happened in any of our child windows (e.g: our submenus)?
+			} else if (self?.childWindows?.contains(clickedWindow) ?? false) {
+				shouldDismissCallout = false
+			}
+
+			if (shouldDismissCallout) {
 				self?.dismissCallout()
 			}
+
 			return event
 		})
 	}
@@ -47,7 +67,12 @@ class CalloutWindow: NSWindow {
 
 	@objc private func dismissCallout() {
 		lifeCycleDelegate?.calloutWillDismiss(window: self)
-		close()
+
+		if let monitor = mouseEventMonitor {
+			NSEvent.removeMonitor(monitor)
+		}
+
+		orderOut(self)
 	}
 
 	private var mouseEventMonitor: Any?

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fluentui-react-native/callout",
-  "version": "0.19.23",
+  "version": "0.19.24",
   "description": "A cross-platform Callout component using the Fluent Design System",
   "license": "MIT",
   "author": "",