modify SelectizeZone to use BaseSelectize and leave data unmodified

app/src/components/SelectizeZone.vue

@@ -1,63 +1,49 @@
 <template lang="html">
   <div class="selectize-zone">
     <div id="selected-items" v-if="selected.length > 0">
-      <b-button-group size="sm" v-for="(item, index) in selected" :key="index">
+      <b-button-group size="sm" v-for="item in filteredSelected" :key="item">
         <b-button
           :variant="itemVariant" :to="itemRoute ? {name: itemRoute, params: {name: item}} : null"
           @blur="onItemButtonBlur" class="item-btn"
         >
-          <icon :iname="itemIcon" /> {{ item }}
+          <icon :iname="itemIcon" /> {{ item | filter(format) }}
         </b-button>
         <b-button
           class="remove-btn" variant="warning"
-          @click="removeFromSelected(index)" @blur="onItemDeleteBlur"
+          @click="onRemove(item)"
+          @blur="onItemDeleteBlur"
         >
           <icon :title="$t('delete')" iname="minus" />
         </b-button>
       </b-button-group>
     </div>
 
-    <b-input-group>
+    <base-selectize
-      <b-input-group-prepend is-text>
+      :choices="choices"
-        <label class="sr-only" for="selectize">{{ ariaLabel }}</label>
+      :format="format"
-        <icon :iname="searchIcon" v-if="searchIcon" />
+      :aria-label="ariaLabel"
-      </b-input-group-prepend>
+      :search-icon="searchIcon"
-      <b-form-input
+      @selected="$emit('change', { ...$event, action: 'add' })"
-        id="selectize" :class="visible ? null : 'collapsed'"
-        aria-controls="collapse" :aria-expanded="visible ? 'true' : 'false'"
-        @focus="onInputFocus" @blur="onInputBlur" @keydown="onInputKeydown"
-        v-model="search" ref="input"
     />
-    </b-input-group>
-
-    <b-collapse id="collapse" ref="collapse" v-model="visible">
-      <b-list-group tabindex="-1" @mouseover="onChoiceListOver">
-        <b-list-group-item
-          v-for="(choice, index) in filteredChoices" :key="index"
-          tabindex="-1" :active="focusedIndex === index" ref="choiceList"
-          @mousedown.prevent @mouseup.prevent="addToSelected(index)"
-        >
-          {{ choice }}
-        </b-list-group-item>
-      </b-list-group>
-    </b-collapse>
   </div>
 </template>
 
 <script>
-// FIXME add accessibility to ChoiceList
+import BaseSelectize from '@/components/BaseSelectize'
 
 export default {
   name: 'SelectizeZone',
 
   props: {
-    selected: { type: Array, required: true },
-    choices: { type: Array, required: true },
-    searchIcon: { type: String, default: 'search' },
     itemIcon: { type: String, default: null },
     itemRoute: { type: String, default: null },
     itemVariant: { type: String, default: 'secondary' },
-    ariaLabel: { type: String, required: true }
+    selected: { type: Array, required: true },
+    // needed by SelectizeBase
+    choices: { type: Array, required: true },
+    searchIcon: { type: String, default: 'search' },
+    ariaLabel: { type: String, required: true },
+    format: { type: Function, default: null }
   },
 
   data: () => ({
@@ -67,75 +53,15 @@ export default {
   }),
 
   computed: {
-    filteredChoices () {
+    filteredSelected () {
-      const search = this.search.toLowerCase()
+      return [...this.selected].sort()
-      return this.choices.filter(item => {
-        return item.toLowerCase().includes(search)
-      })
     }
   },
 
   methods: {
-    addToSelected (choiceIndex) {
+    onRemove (item) {
-      const [item] = this.choices.splice(choiceIndex, 1)
+      this.$emit('change', { item, index: this.selected.indexOf(item), action: 'remove' })
-      this.selected.push(item)
-      this.focusedIndex = 0
     },
-
-    removeFromSelected (selectedIndex) {
-      const [item] = this.selected.splice(selectedIndex, 1)
-      this.choices.push(item)
-    },
-
-    onInputFocus ({ relatedTarget }) {
-      this.visible = true
-      this.focusedIndex = 0
-      // timeout needed else scrollIntoView won't work
-      if (!this.$refs.choiceList) return
-      setTimeout(() => {
-        this.$refs.choiceList[0].scrollIntoView({ behavior: 'instant', block: 'nearest', inline: 'nearest' })
-      }, 50)
-    },
-
-    onInputBlur ({ relatedTarget }) {
-      if (!this.$refs.collapse.$el.contains(relatedTarget)) {
-        this.visible = false
-      }
-    },
-
-    onInputKeydown (e) {
-      const { key } = e
-      const choices = this.filteredChoices
-      if (choices.length < 1) return
-
-      if (key === 'ArrowDown') {
-        e.preventDefault()
-        if (this.focusedIndex < choices.length - 1) {
-          this.focusedIndex++
-        }
-      } else if (key === 'ArrowUp') {
-        e.preventDefault()
-        if (this.focusedIndex > 0) {
-          this.focusedIndex--
-        }
-      } else if (key === 'Enter') {
-        this.addToSelected(choices.indexOf(choices[this.focusedIndex]))
-      } else {
-        this.focusedIndex = 0
-      }
-      const elemToFocus = this.$refs.choiceList[this.focusedIndex]
-      if (elemToFocus) {
-        elemToFocus.scrollIntoView({ behavior: 'instant', block: 'nearest', inline: 'nearest' })
-      }
-    },
-
-    onChoiceListOver ({ target }) {
-      const index = this.$refs.choiceList.indexOf(target)
-      if (index > -1) {
-        this.focusedIndex = index
-      }
-    },
-
     onItemButtonBlur ({ target, relatedTarget }) {
       if (target.nextElementSibling === relatedTarget) {
         relatedTarget.classList.add('display')
@@ -145,6 +71,17 @@ export default {
     onItemDeleteBlur ({ target }) {
       target.classList.remove('display')
     }
+  },
+
+  filters: {
+    filter: function (text, func) {
+      if (func) return func(text)
+      else return text
+    }
+  },
+
+  components: {
+    BaseSelectize
   }
 }
 </script>
@@ -202,33 +139,4 @@ export default {
   position: relative;
   top: 1px;
 }
-
-// Collapsed list
-.collapse {
-  position: relative;
-  width: 100%;
-}
-// disable collapse animation
-.collapsing {
-    -webkit-transition: none;
-    transition: none;
-    display: none;
-}
-
-.list-group {
-  margin-top: .5rem;
-  max-height: 10rem;
-  overflow-y: auto;
-  position: absolute;
-  z-index: 10;
-  width: 100%;
-}
-
-.list-group-item {
-  padding-top: 0;
-  padding-bottom: 0;
-  min-height: 2rem;
-  line-height: 1.75rem;
-  cursor: pointer;
-}
 </style>