Merge branch 'master' into master

carbon-design-system · Dec 11, 2020 · abf7996 · abf7996
2 parents 95d67cc + 68a18d5
commit abf7996
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/packages/core/src/components/cv-data-table/cv-data-table.vue b/packages/core/src/components/cv-data-table/cv-data-table.vue
@@ -49,7 +49,6 @@
                 @keydown.enter.prevent="checkSearchExpand(true)"
                 @keydown.space.prevent
                 @keyup.space.prevent="checkSearchExpand(true)"
-                @blur="checkSearchFocus"
                 ref="magnifier"
               >
                 <Search16 :class="`${carbonPrefix}--toolbar-action__icon`" />
@@ -65,7 +64,6 @@
                 ref="search"
                 v-model="searchValue"
                 @input="onSearch"
-                @blur="checkSearchFocus"
                 @keydown.esc.prevent="checkSearchExpand(false)"
               />
               <button
@@ -271,9 +269,19 @@ export default {
     this.$on('cv:sort', (srcComponent, value) => this.onSort(srcComponent, value));
   },
   mounted() {
+    if (this.$refs.searchContainer) {
+      this.$refs.magnifier.addEventListener('blur', this.checkSearchFocus);
+      this.$refs.search.addEventListener('blur', this.checkSearchFocus);
+    }
     this.updateRowsSelected();
     this.checkSlots();
   },
+  beforeDestroy() {
+    if (this.$refs.searchContainer) {
+      this.$refs.magnifier.removeEventListener('blur', this.checkSearchFocus);
+      this.$refs.search.removeEventListener('blur', this.checkSearchFocus);
+    }
+  },
   updated() {
     this.checkSlots();
   },