Merge pull request #993 from GatherPress/fix-dropdown

Fix dropdown issue.

build/blocks/dropdown/view.asset.php

@@ -1 +1 @@
-<?php return array('dependencies' => array('@wordpress/interactivity'), 'version' => '6914dbac1bfbed207524', 'type' => 'module');
+<?php return array('dependencies' => array('@wordpress/interactivity'), 'version' => 'a49f590a6fe2fabb03ff', 'type' => 'module');

build/blocks/modal-manager/view.asset.php

@@ -1 +1 @@
-<?php return array('dependencies' => array('@wordpress/interactivity'), 'version' => '66b0f394a1cf075bfc1f', 'type' => 'module');
+<?php return array('dependencies' => array('@wordpress/interactivity'), 'version' => '2e97c0ab749d5158e4db', 'type' => 'module');

src/blocks/dropdown/view.js

@@ -133,7 +133,7 @@ const { actions } = store('gatherpress', {
 				// Set up close handlers
 				element.ref.cleanupCloseHandlers = setupCloseHandlers(
 					'.wp-block-gatherpress-dropdown__menu',
-					'.wp-block-gatherpress-dropdown__menu',
+					null,
 					(dropdown) => {
 						// Close the dropdown and clean up
 						dropdown.classList.remove('gatherpress--is-visible');

src/helpers/interactivity.js

@@ -256,14 +256,19 @@ export function setupCloseHandlers(elementSelector, contentSelector, onClose) {
 			`${elementSelector}.gatherpress--is-visible`
 		);
 		openElements.forEach((element) => {
-			const content = element.querySelector(contentSelector);
-
-			// Close the element if clicked outside its content.
-			if (
-				element.contains(event.target) && // Click is inside the element.
-				!content.contains(event.target) // Click is NOT inside the content.
-			) {
-				handleClose(element);
+			if (contentSelector) {
+				const content = element.querySelector(contentSelector);
+				if (
+					element.contains(event.target) &&
+					!content.contains(event.target)
+				) {
+					handleClose(element);
+				}
+			} else {
+				const parentContainer = element.parentElement;
+				if (!parentContainer.contains(event.target)) {
+					handleClose(element);
+				}
 			}
 		});
 	};