From 17ba00c3950eb0a78dd510f3618f8e7be2d448fc Mon Sep 17 00:00:00 2001
From: Penar Musaraj <pmusaraj@gmail.com>
Date: Tue, 4 Apr 2023 09:49:55 -0400
Subject: [PATCH] FIX: icon toggles saerch menu display on click (#20950)

Using the `mouseDownOutside` event was problematic here because two
events were being triggered consecutively: `mouseDown`
would toggle the menu off and `click` would then toggle it back on. This
switches the logic to use `clickOutside` again, but with two changes:
- it limits the action to the `search-menu` key (so that theme component
overrides can do their own handling)
- it does not trigger the event when there is an active text selection
 (this was the original reason for switching to `mouseDownOutside`, see
https://github.com/discourse/discourse/pull/14788)
---
 app/assets/javascripts/discourse/app/widgets/search-menu.js | 6 ++++--
 .../javascripts/discourse/tests/acceptance/search-test.js   | 5 ++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/widgets/search-menu.js b/app/assets/javascripts/discourse/app/widgets/search-menu.js
index ca44e882354..00f98ada54a 100644
--- a/app/assets/javascripts/discourse/app/widgets/search-menu.js
+++ b/app/assets/javascripts/discourse/app/widgets/search-menu.js
@@ -348,8 +348,10 @@ export default createWidget("search-menu", {
     });
   },
 
-  mouseDownOutside() {
-    this.sendWidgetAction("toggleSearchMenu");
+  clickOutside() {
+    if (this.key === "search-menu" && !window.getSelection().toString()) {
+      this.sendWidgetAction("toggleSearchMenu");
+    }
   },
 
   clearTopicContext() {
diff --git a/app/assets/javascripts/discourse/tests/acceptance/search-test.js b/app/assets/javascripts/discourse/tests/acceptance/search-test.js
index 90573f61eb0..af531e0aec4 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/search-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/search-test.js
@@ -15,7 +15,7 @@ import {
 import I18n from "I18n";
 import searchFixtures from "discourse/tests/fixtures/search-fixtures";
 import selectKit from "discourse/tests/helpers/select-kit-helper";
-import { skip, test } from "qunit";
+import { test } from "qunit";
 import { DEFAULT_TYPE_FILTER } from "discourse/widgets/search-menu";
 
 acceptance("Search - Anonymous", function (needs) {
@@ -114,8 +114,7 @@ acceptance("Search - Anonymous", function (needs) {
     );
   });
 
-  // TODO: This feature doesn't work currently (/t/69760)
-  skip("search button toggles search menu", async function (assert) {
+  test("search button toggles search menu", async function (assert) {
     await visit("/");
 
     await click("#search-button");