@mozaic-ds/vue 0.35.0-beta.0 → 0.35.0-beta.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mozaic-ds/vue",
-  "version": "0.35.0-beta.0",
+  "version": "0.35.0-beta.1",
   "description": "Vue.js implementation of Mozaic Design System",
   "author": "Adeo - Mozaic Design System",
   "scripts": {

package/src/components/autocomplete/MAutocomplete.vue

@@ -21,10 +21,10 @@
         :id="id"
         v-model="inputValue"
         :placeholder="placeholder"
-        :is-invalid="invalid"
+        :is-invalid="isInvalid"
         :disabled="disabled"
         :size="size"
-        :root-class="{ 'is-invalid': invalid }"
+        :root-class="getInvalidRootClass"
         text-input-field-class="mc-autocomplete__trigger"
         icon-position="left"
         icon="DisplaySearch48"
@@ -44,6 +44,7 @@
       </button>
     </div>
     <MListBox
+      v-if="!isFiltered"
       v-model="listboxValue"
       :open="openState"
       :items="localItems"
@@ -52,7 +53,6 @@
       :data-key-expr="dataKeyExpr"
       :data-text-expr="dataTextExpr"
       :data-value-expr="dataValueExpr"
-      :is-filtered="isFiltered"
       :max-width="maxWidth"
       @change="onChangeListbox"
     >
@@ -60,6 +60,9 @@
         <slot name="item" :item="item"></slot>
       </template>
     </MListBox>
+    <div v-else class="mc-autocomplete__error">
+      {{ emptySearchLabel }}
+    </div>
   </div>
 </template>
 
@@ -230,6 +233,13 @@ export default {
     hasValues() {
       return this.inputValue?.length > 0;
     },
+    isInvalid() {
+      return this.invalid || this.isFiltered;
+    },
+    getInvalidRootClass() {
+      const invalidClass = this.isInvalid ? 'is-invalid' : '';
+      return invalidClass;
+    },
   },
 
   watch: {
@@ -239,6 +249,13 @@ export default {
       },
       immediate: true,
     },
+    localItems: {
+      handler: function (val) {
+        // this.localItems = val;
+        this.isFiltered = !val.length;
+        this.$emit('list-filtered', val);
+      },
+    },
     input: {
       handler: function (val) {
         this.inputValue = val;
@@ -309,18 +326,24 @@ export default {
     filterList(value) {
       if (value.length && this.filter) {
         this.filter(value);
-      } else if (value.length && this.filterOnType) {
-        this.localItems = this.items.filter((item) =>
-          item[this.dataTextExpr].toUpperCase().includes(value.toUpperCase())
-        );
-
-        this.isFiltered = !this.localItems.length;
       } else {
-        this.localItems = this.items;
-        this.isFiltered = !this.localItems.length;
-      }
+        if (!this.filterOnType) {
+          return;
+        }
 
-      this.$emit('list-filtered', this.localItems);
+        if (value.length) {
+          this.localItems = this.items.filter((item) =>
+            item[this.dataTextExpr].toUpperCase().includes(value.toUpperCase())
+          );
+
+          // this.isFiltered = !this.localItems.length;
+        } else {
+          this.localItems = this.items;
+          // this.isFiltered = !this.localItems.length;
+        }
+
+        // this.$emit('list-filtered', this.localItems);
+      }
     },
     closeListBox() {
       this.openState = false;
@@ -384,6 +407,18 @@ export default {
 @import 'components/c.autocomplete';
 
 .mc-autocomplete {
+  &__main {
+    position: relative;
+  }
+
+  &__error {
+    @include set-font-scale('04', 'm');
+
+    color: $color-fields-error;
+    display: inline-block;
+    margin-top: $mu025;
+  }
+
   .mc-autocomplete__trigger {
     padding-right: $mu300;
   }

package/src/components/listbox/MListBox.vue

@@ -6,37 +6,32 @@
     :class="{ 'is-open': open, 'mc-listbox--multi': multiple }"
     :style="{ '--listbox-width': maxWidth }"
   >
-    <template v-if="!isFiltered">
-      <li
-        v-for="(item, index) in localItems"
-        :key="item.id"
-        class="mc-listbox__item"
-      >
-        <MIcon
-          v-if="item.icon"
-          :name="item.icon"
-          class="mc-listbox__icon"
-          color="#666666"
-        />
-        <input
-          :id="setItemId(index)"
-          v-model="localValue"
-          class="mc-listbox__input"
-          :class="{ 'mc-checkbox__input': multiple }"
-          :type="multiple ? 'checkbox' : 'radio'"
-          :value="item[dataValueExpr]"
-          :name="!multiple ? `listboxradio-${uuid}` : null"
-          @change="onChange"
-        />
-        <label :for="setItemId(index)" class="mc-listbox__label">
-          <slot name="item" :item="item">
-            {{ item[dataTextExpr] }}
-          </slot>
-        </label>
-      </li>
-    </template>
-    <li v-else class="mc-listbox__item">
-      <span class="mc-listbox__empty">{{ emptySearchLabel }}</span>
+    <li
+      v-for="(item, index) in localItems"
+      :key="item.id"
+      class="mc-listbox__item"
+    >
+      <MIcon
+        v-if="item.icon"
+        :name="item.icon"
+        class="mc-listbox__icon"
+        color="#666666"
+      />
+      <input
+        :id="setItemId(index)"
+        v-model="localValue"
+        class="mc-listbox__input"
+        :class="{ 'mc-checkbox__input': multiple }"
+        :type="multiple ? 'checkbox' : 'radio'"
+        :value="item[dataValueExpr]"
+        :name="!multiple ? `listboxradio-${uuid}` : null"
+        @change="onChange"
+      />
+      <label :for="setItemId(index)" class="mc-listbox__label">
+        <slot name="item" :item="item">
+          {{ item[dataTextExpr] }}
+        </slot>
+      </label>
     </li>
   </ul>
 </template>
@@ -64,18 +59,10 @@ export default {
       type: Boolean,
       default: false,
     },
-    isFiltered: {
-      type: Boolean,
-      default: false,
-    },
     multiple: {
       type: Boolean,
       default: false,
     },
-    emptySearchLabel: {
-      type: String,
-      default: 'No item matching your criteria found',
-    },
     dataKeyExpr: {
       type: String,
       default: 'id',