component is used elsewhere... change approach

davidtaylorhq · davidtaylorhq · commit 54abdf73f2ba · 2025-05-20T13:31:34.000+01:00
diff --git a/app/assets/javascripts/admin/addon/components/admin-search.gjs b/app/assets/javascripts/admin/addon/components/admin-search.gjs
@@ -183,7 +183,6 @@ export default class AdminSearch extends Component {
             <a
               href={{result.url}}
               {{on "keydown" this.handleResultKeyDown}}
-              {{on "click" @closeModal}}
               class="admin-search__result-link"
               tabindex="0"
             >
diff --git a/app/assets/javascripts/admin/addon/components/modal/admin-search.gjs b/app/assets/javascripts/admin/addon/components/modal/admin-search.gjs
@@ -5,6 +5,17 @@ import AdminSearch from "admin/components/admin-search";
 
 export default class AdminSearchModal extends Component {
   @service currentUser;
+  @service router;
+
+  constructor() {
+    super(...arguments);
+    this.router.on("routeWillChange", this.args.closeModal);
+  }
+
+  willDestroy() {
+    super.willDestroy(...arguments);
+    this.router.off("routeWillChange", this.args.closeModal);
+  }
 
   <template>
     <DModal
@@ -14,7 +25,7 @@ export default class AdminSearchModal extends Component {
       @inline={{@inline}}
       @hideHeader={{true}}
     >
-      <AdminSearch @closeModal={{@closeModal}} />
+      <AdminSearch />
     </DModal>
   </template>
 }

Original file line number	Diff line number	Diff line change
`@@ -183,7 +183,6 @@ export default class AdminSearch extends Component {`
`183`	`183`	`<a`
`184`	`184`	`href={{result.url}}`
`185`	`185`	`{{on "keydown" this.handleResultKeyDown}}`
`186`		`- {{on "click" @closeModal}}`
`187`	`186`	`class="admin-search__result-link"`
`188`	`187`	`tabindex="0"`
`189`	`188`	`>`