Handle blur directly in input component instead global

cibernox · Dec 8, 2024 · d1264e1 · d1264e1
1 parent 41b6bb8
commit d1264e1
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/ember-power-select/src/components/power-select.ts b/ember-power-select/src/components/power-select.ts
@@ -515,9 +515,6 @@ export default class PowerSelectComponent extends Component<PowerSelectSignature
     if (!this.isDestroying) {
       scheduleTask(this, 'actions', this._updateIsActive, false);
     }
-    if (this.searchFieldPosition === 'trigger') {
-      this.searchText = '';
-    }
     if (this.args.onBlur) {
       this.args.onBlur(this.storedAPI, event);
     }

diff --git a/ember-power-select/src/components/power-select/input.hbs b/ember-power-select/src/components/power-select/input.hbs
@@ -20,7 +20,7 @@
     aria-describedby={{@ariaDescribedBy}}
     {{on "input" this.handleInput}}
     {{on "focus" @onFocus}}
-    {{on "blur" @onBlur}}
+    {{on "blur" this.handleBlur}}
     {{on "keydown" this.handleKeydown}}
     {{this.setupInput}}
   >

diff --git a/ember-power-select/src/components/power-select/input.ts b/ember-power-select/src/components/power-select/input.ts
@@ -45,6 +45,17 @@ export default class PowerSelectInput extends Component<PowerSelectInputSignatur
     }
   }
 
+  @action
+  handleBlur(event: Event) {
+    if (this.args.searchFieldPosition === 'trigger') {
+      this.args.select.searchText = '';
+    }
+
+    if (this.args.onBlur(event)) {
+      return false;
+    }
+  }
+
   setupInput = modifier(
     (el: HTMLElement) => {
       if (this.didSetup) {