fix(component): fix circular call for methods

iliyaZelenko · Mar 29, 2019 · 03053bd · 03053bd
1 parent 3f892e0
commit 03053bd
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 10 deletions.
diff --git a/gh-pages-src/pages/dev/Example5.vue b/gh-pages-src/pages/dev/Example5.vue
@@ -23,7 +23,7 @@
         v-model="selected"
         :items="items"
         :error-message="errorMessage"
-        :successful="!errorMessage && selected"
+        :successful="!!(!errorMessage && selected)"
         :disabled="disabled"
         :readonly="readonly"
         :disable-search="disableSearch"

diff --git a/src/component.vue b/src/component.vue
@@ -9,7 +9,7 @@
     @keydown.enter="onEnter"
     @keydown.tab.esc="setBlured"
     @mousedown="onClick"
-    @focus="onFocus"
+    @focus="setFocused"
   >
     <div class="IZ-select__input-wrap">
       <slot
@@ -56,7 +56,7 @@
           @keyup="onSearchKeyUp"
           @keydown="onSearchKeyDown"
           @input="onSearch"
-          @focus="onFocus"
+          @focus="setFocused(true)"
         >
 
         <slot
@@ -237,11 +237,11 @@ export default {
     setInputFocused () {
       this.$refs['IZ-select__input-for-text'].focus()
     },
-    setFocused () {
+    setFocused (byInput = false) {
       if (this.focused || this.disabled || this.readonly) return
 
       // if search enabled
-      if (!this.disableSearch) {
+      if (!this.disableSearch && !byInput) {
         // focus text input
         this.setInputFocused()
       }
@@ -253,7 +253,7 @@ export default {
       //   block: this.isMobile ? 'start' : 'end'
       // })
 
-      if (this.allowMobileScroll && this.isMobile) {
+      if (window.scrollTo && this.allowMobileScroll && this.isMobile) {
         const { top } = getOffsetSum(this.$refs['IZ-select__input'])
 
         // scroll to component input el

diff --git a/src/eventsListeners.js b/src/eventsListeners.js
@@ -1,9 +1,6 @@
 import { scrollIfNeeded } from '~/helpers'
 
 export default {
-  onFocus () {
-    this.setFocused()
-  },
   onSelectByArrow (e) {
     e.preventDefault()
 
@@ -85,7 +82,6 @@ export default {
     if (this.disabled || this.readonly) return
 
     this.setFocused()
-    this.showMenu()
   },
   // on click on item
   onClickSelectItem (item) {

diff --git a/tests/unit/eventsListeners.spec.ts b/tests/unit/eventsListeners.spec.ts
@@ -58,6 +58,7 @@ describe('eventsListeners', () => {
 
     wrapper.vm.onClick()
 
+    expect(wrapper.vm.wishShowMenu).toBeTruthy()
     expect(wrapper.vm.hasMenu).toBeTruthy()
 
     const selectMenu = wrapper.find({