@six-group/ui-library 0.0.0-insider.9277796 → 0.0.0-insider.d16ec8e

package/dist/esm/six-select.entry.js

@@ -1,8 +1,15 @@
-import { r as registerInstance, c as createEvent, h, g as getElement } from './index-5c0f6628.js';
-import { a as getTextContent, h as hasSlot } from './slot-6f3984c7.js';
-import { F as FormControl } from './form-control-3b440ea1.js';
-import { E as EventListeners } from './event-listeners-570a24ea.js';
-import { D as DEFAULT_DEBOUNCE_FAST, a as debounce } from './execution-control-1a60d709.js';
+import { r as registerInstance, c as createEvent, a as H, h, g as getElement } from './index-371fb9d4.js';
+import { h as hasSlot, a as getTextContent } from './slot-2e64df19.js';
+import { F as FormControl } from './form-control-44a50dd6.js';
+import { E as EventListeners } from './event-listeners-6b434035.js';
+import { D as DEFAULT_DEBOUNCE_FAST, a as debounce } from './execution-control-72cc50f4.js';
+
+function isValueEmpty(value) {
+  if (Array.isArray(value)) {
+    return value.length === 0;
+  }
+  return value === '';
+}
 
 const sixSelectCss = ":host{position:relative;box-sizing:border-box}:host *,:host *:before,:host *:after{box-sizing:inherit}.form-control .form-control__label{display:none}.form-control .form-control__help-text{display:none}.form-control .form-control__error-text{display:none}.form-control--has-label .form-control__label{display:inline-block;color:var(--six-input-label-color);font-weight:var(--six-font-weight-bold);margin-bottom:var(--six-spacing-x-small)}.form-control--has-label .form-control__label__required::after{color:var(--six-color-danger-800);content:\"*\"}.form-control--has-label.form-control--small .form-control__label{font-size:var(--six-input-label-font-size-small)}.form-control--has-label.form-control--medium .form-control__label{font-size:var(--six-input-label-font-size-medium)}.form-control--has-label.form-control--large .form-control_label{font-size:var(--six-input-label-font-size-large)}.form-control--has-help-text .form-control__help-text{display:block;color:var(--six-input-help-text-color);margin-top:var(--six-spacing-x-small)}.form-control--has-help-text .form-control__help-text ::slotted(*){margin-top:var(--six-spacing-xxx-small)}.form-control--has-help-text.form-control--small .form-control__help-text{font-size:var(--six-input-help-text-font-size-small)}.form-control--has-help-text.form-control--medium .form-control__help-text{font-size:var(--six-input-help-text-font-size-medium)}.form-control--has-help-text.form-control--large .form-control__help-text{font-size:var(--six-input-help-text-font-size-large)}.form-control--has-error-text .form-control__error-text{display:block;color:var(--six-color-danger-800);margin-top:var(--six-spacing-xxx-small)}.form-control--has-error-text .form-control__error-text ::slotted(*){margin-top:var(--six-spacing-xxx-small)}.form-control--has-error-text.form-control--small .form-control__error-text{font-size:var(--six-input-help-text-font-size-small)}.form-control--has-error-text.form-control--medium .form-control__error-text{font-size:var(--six-input-help-text-font-size-medium)}.form-control--has-error-text.form-control--large .form-control__error-text{font-size:var(--six-input-help-text-font-size-large)}.form-control--disabled .form-control__help-text{color:var(--six-input-help-text-color-disabled)}.form-control--disabled .form-control__label{color:var(--six-input-label-color-disabled)}.form-control--invalid:not(.form-control--disabled) .form-control__label{color:var(--six-input-label-color)}:host{display:block}.select{display:block}.select__box{display:inline-flex;align-items:center;justify-content:start;position:relative;width:100%;font-family:var(--six-font-family);font-weight:var(--six-input-font-weight);font-size:var(--six-input-font-size-medium);letter-spacing:var(--six-input-letter-spacing);background-color:var(--six-input-background-color);border:solid var(--six-border-width) var(--six-input-border-color);vertical-align:middle;overflow:hidden;transition:var(--six-transition-fast) color, var(--six-transition-fast) border, var(--six-transition-fast) box-shadow;cursor:pointer}.select__box--line{border:none;border-bottom:solid var(--six-border-width) var(--six-input-border-color)}.select__box--autocomplete{border:none;overflow:initial}.select:not(.select--disabled) .select__box:hover{background-color:var(--six-input-background-color-hover);color:var(--six-input-color-hover);border-bottom-color:var(--six-input-border-color-hover)}.select:not(.select--disabled) .select__box:hover:not(.select__box--line){border-color:var(--six-input-border-color-hover)}.select:not(.select--disabled) .select__box:focus{background-color:var(--six-input-background-color-focus);outline:none;color:var(--six-input-color-focus);border-bottom-color:var(--six-input-border-color-focus);box-shadow:0 1px 0 0 var(--six-input-border-color-focus)}.select:not(.select--disabled) .select__box:focus:not(.select__box--line){border-color:var(--six-input-border-color-focus);box-shadow:var(--six-input-focus-shadow)}.select--disabled .select__box{background-color:var(--six-input-background-color-disabled);color:var(--six-input-color-disabled);cursor:not-allowed;outline:none}.select--disabled .select__box:not(.select__box--line){border-color:var(--six-input-border-color-disabled)}.select--disabled .select__tags,.select--disabled .select__clear{pointer-events:none}.select--invalid:not(.select--disabled):not(.select--focused) .select__box{border-bottom-color:var(--six-input-border-color-danger)}.select--invalid:not(.select--disabled):not(.select--focused) .select__box:not(.input--line){border-color:var(--six-input-border-color-danger)}.select__label{flex-shrink:1;flex-grow:1;align-items:center;user-select:none;width:0;scrollbar-width:none;-ms-overflow-style:none;overflow-x:auto;overflow-y:hidden;white-space:nowrap}.select__label::-webkit-scrollbar{width:0;height:0}.select__clear{flex-shrink:0;flex-grow:0;display:inline}.select__icon{flex-shrink:0;flex-grow:0;display:inline;transition:var(--six-transition-medium) transform ease}.select--open .select__icon{transform:rotate(-180deg)}.select--placeholder-visible .select__label{color:var(--six-input-placeholder-color)}.select--disabled.select--placeholder-visible .select__label{color:var(--six-input-placeholder-color-disabled)}.select__tags{display:inline-flex;align-items:center;flex-wrap:wrap;justify-content:left;margin-left:var(--six-spacing-xx-small)}.select__hidden-select{clip:rect(0 0 0 0);clip-path:inset(50%);height:1px;overflow:hidden;position:absolute;white-space:nowrap;width:1px}.select__input{position:absolute;top:0;left:0;width:100%;height:100%}.select--small .select__box{border-radius:var(--six-input-border-radius-small);font-size:var(--six-input-font-size-small);min-height:var(--six-height-small)}.select--small .select__box--line{border:none;border-bottom:solid var(--six-border-width) var(--six-input-border-color)}.select--small .select__label{margin:0 var(--six-input-spacing-small)}.select--small .select__clear{margin-right:var(--six-spacing-xxx-small)}.select--small .select__icon{margin-right:var(--six-spacing-x-small)}.select--small .select__tags{padding-bottom:2px}.select--small .select__tags six-tag{padding-top:2px}.select--small .select__tags six-tag:not(:last-of-type){margin-right:var(--six-spacing-xx-small)}.select--small.select--has-tags .select__label{margin-left:0}.select--medium .select__box{border-radius:var(--six-input-border-radius-medium);font-size:var(--six-input-font-size-medium);min-height:var(--six-height-medium)}.select--medium .select__box--line{border:none;border-bottom:solid var(--six-border-width) var(--six-input-border-color)}.select--medium .select__label{margin:0 var(--six-input-spacing-medium)}.select--medium .select__clear{margin-right:var(--six-spacing-xxx-small)}.select--medium .select__icon{margin-right:var(--six-spacing-x-small)}.select--medium .select__tags{padding-bottom:3px}.select--medium .select__tags six-tag{padding-top:3px}.select--medium .select__tags six-tag:not(:last-of-type){margin-right:var(--six-spacing-xx-small)}.select--medium.select--has-tags .select__label{margin-left:0}.select--large .select__box{border-radius:var(--six-input-border-radius-large);font-size:var(--six-input-font-size-large);min-height:var(--six-height-large)}.select--large .select__box--line{border:none;border-bottom:solid var(--six-border-width) var(--six-input-border-color)}.select--large .select__label{margin:0 var(--six-input-spacing-large)}.select--large .select__clear{margin-right:var(--six-spacing-xxx-small)}.select--large .select__icon{margin-right:var(--six-spacing-x-small)}.select--large .select__tags{padding-bottom:4px}.select--large .select__tags six-tag{padding-top:4px}.select--large .select__tags six-tag:not(:last-of-type){margin-right:var(--six-spacing-xx-small)}.select--large.select--has-tags .select__label{margin-left:0}.select--pill.select--small .select__box{border-radius:var(--six-height-small)}.select--pill.select--medium .select__box{border-radius:var(--six-height-medium)}.select--pill.select--large .select__box{border-radius:var(--six-height-large)}.select__menu{max-width:50vw;width:fit-content}.select__menu--filtered{width:100% !important}.select__menu--hidden{display:none}six-icon-button::part(base){padding-top:0;padding-bottom:0}";
 
@@ -17,9 +24,137 @@ const SixSelect = class {
     this.labelId = `select-label-${id}`;
     this.helpTextId = `select-help-text-${id}`;
     this.errorTextId = `select-error-text-${id}`;
+    this.touched = false;
     this.customErrorText = '';
     this.customValidation = false;
     this.eventListeners = new EventListeners();
+    this.handleBlur = () => {
+      this.hasFocus = false;
+      this.sixBlur.emit();
+    };
+    this.handleFocus = () => {
+      this.hasFocus = true;
+      this.sixFocus.emit();
+    };
+    this.handleInvalid = () => {
+      this.invalid = true;
+    };
+    this.handleClearClick = (event) => {
+      event.stopPropagation();
+      this.clearValues();
+    };
+    this.handleSelectAll = (event) => {
+      const nonFilteredItems = this.getItems().filter((item) => item.style.display !== 'none');
+      const keyName = event.key;
+      const keyCode = event.code;
+      if (keyName === 'Control') {
+        return;
+      }
+      if (this.isOpen && this.multiple && keyCode === 'KeyA' && event.ctrlKey) {
+        event.preventDefault();
+        const hasDeselectedOptions = nonFilteredItems.some((opt) => !opt.disabled && !opt.checked);
+        nonFilteredItems
+          .filter((option) => !option.disabled)
+          .forEach((option) => (option.checked = hasDeselectedOptions));
+        const checkedItems = nonFilteredItems.filter((option) => option.checked).map((option) => option.value);
+        this.value = hasDeselectedOptions ? checkedItems : [];
+      }
+    };
+    this.handleKeyDown = (event) => {
+      var _a, _b, _c, _d;
+      const target = event.target;
+      const items = this.getItems();
+      const firstItem = items[0];
+      const lastItem = items[items.length - 1];
+      // Ignore key presses on tags
+      if (target.tagName.toLowerCase() === 'six-tag') {
+        return;
+      }
+      // Tabbing out of the control closes it
+      if (event.key === 'Tab') {
+        if (this.isOpen) {
+          (_a = this.dropdown) === null || _a === void 0 ? void 0 : _a.hide();
+        }
+        return;
+      }
+      // Up/down opens the menu
+      if (['ArrowDown', 'ArrowUp'].includes(event.key)) {
+        event.preventDefault();
+        // Show the menu if it's not already open
+        if (!this.isOpen) {
+          (_b = this.dropdown) === null || _b === void 0 ? void 0 : _b.show();
+        }
+        // Focus on a menu item
+        if (event.key === 'ArrowDown' && firstItem) {
+          firstItem.setFocus();
+          return;
+        }
+        if (event.key === 'ArrowUp' && lastItem) {
+          lastItem.setFocus();
+          return;
+        }
+      }
+      // All other keys open the menu and initiate type to select
+      if (!this.isOpen) {
+        event.stopPropagation();
+        event.preventDefault();
+        (_c = this.dropdown) === null || _c === void 0 ? void 0 : _c.show();
+        (_d = this.menu) === null || _d === void 0 ? void 0 : _d.typeToSelect(event.key);
+      }
+    };
+    this.handleLabelClick = () => {
+      var _a;
+      (_a = this.box) === null || _a === void 0 ? void 0 : _a.focus();
+    };
+    this.handleMenuSelect = (event) => {
+      const item = event.detail.item;
+      const getValue = () => {
+        if (this.multiple) {
+          return this.value.includes(item.value)
+            ? this.value.filter((v) => v !== item.value)
+            : [...this.value, item.value];
+        }
+        else {
+          return item.value;
+        }
+      };
+      this.value = getValue();
+      this.syncItemsFromValue();
+    };
+    this.handleMenuShow = (event) => {
+      var _a;
+      if (this.disabled) {
+        event.preventDefault();
+        return;
+      }
+      this.resizeMenu();
+      (_a = this.resizeObserver) === null || _a === void 0 ? void 0 : _a.observe(this.host);
+      this.isOpen = true;
+    };
+    this.handleMenuHide = () => {
+      var _a;
+      (_a = this.resizeObserver) === null || _a === void 0 ? void 0 : _a.unobserve(this.host);
+      this.isOpen = false;
+    };
+    this.handleSlotChange = () => {
+      this.hasHelpTextSlot = hasSlot(this.host, 'help-text');
+      this.hasErrorTextSlot = hasSlot(this.host, 'error-text');
+      this.hasLabelSlot = hasSlot(this.host, 'label');
+      this.syncItemsFromValue();
+    };
+    this.handleTagInteraction = (event) => {
+      // Don't toggle the menu when a tag's clear button is activated
+      const path = event.composedPath();
+      const clearButton = path.find((el) => {
+        if (el instanceof H) {
+          const element = el;
+          return element.classList.contains('tag__clear');
+        }
+      });
+      if (clearButton) {
+        event.stopPropagation();
+      }
+    };
     this.hasFocus = false;
     this.hasHelpTextSlot = false;
     this.hasErrorTextSlot = false;
@@ -52,11 +187,12 @@ const SixSelect = class {
     this.inputDebounce = DEFAULT_DEBOUNCE_FAST;
     this.options = null;
     this.virtualScroll = false;
-    this.defaultValue = undefined;
+    this.defaultValue = this.multiple ? [] : '';
   }
   handleDisabledChange() {
+    var _a;
     if (this.disabled && this.isOpen) {
-      this.dropdown.hide();
+      (_a = this.dropdown) === null || _a === void 0 ? void 0 : _a.hide();
     }
   }
   handleLabelChange() {
@@ -69,88 +205,94 @@ const SixSelect = class {
     this.syncItemsFromValue();
   }
   handleValueChange() {
+    if (this.multiple && !Array.isArray(this.value)) {
+      this.value = [];
+    }
+    if (!this.multiple && typeof this.value !== 'string') {
+      this.value = '';
+    }
     this.syncItemsFromValue();
     if (this.input) {
       this.sixChange.emit({ value: this.value, isSelected: true });
     }
   }
   connectedCallback() {
+    var _a;
     if (this.virtualScroll && this.options === null) {
       console.error('Options must be defined when using virtual scrolling');
     }
-    this.handleBlur = this.handleBlur.bind(this);
-    this.handleFocus = this.handleFocus.bind(this);
-    this.handleClearClick = this.handleClearClick.bind(this);
-    this.handleKeyDown = this.handleKeyDown.bind(this);
-    this.handleSelectAll = this.handleSelectAll.bind(this);
-    this.handleLabelClick = this.handleLabelClick.bind(this);
-    this.handleMenuHide = this.handleMenuHide.bind(this);
-    this.handleMenuShow = this.handleMenuShow.bind(this);
-    this.handleMenuSelect = this.handleMenuSelect.bind(this);
-    this.handleSlotChange = this.handleSlotChange.bind(this);
-    this.handleInvalid = this.handleInvalid.bind(this);
-    this.handleTagInteraction = this.handleTagInteraction.bind(this);
-    this.host.shadowRoot.addEventListener('slotchange', this.handleSlotChange);
+    (_a = this.host.shadowRoot) === null || _a === void 0 ? void 0 : _a.addEventListener('slotchange', this.handleSlotChange);
   }
   componentWillLoad() {
     this.handleSlotChange();
-    if (this.multiple && this.value) {
+    if (this.multiple && this.value != null) {
       this.value = this.getValueAsArray();
     }
   }
   componentDidLoad() {
+    if (this.input == null)
+      return;
+    const input = this.input;
     this.resizeObserver = new ResizeObserver(() => this.resizeMenu());
     // We need to do an initial sync after the component has rendered, so this will suppress the re-render warning
     requestAnimationFrame(() => this.syncItemsFromValue());
     this.eventListeners.add(this.input, 'invalid', async (event) => {
-      if (this.customValidation || (!this.hasErrorTextSlot && !this.errorText && !this.customErrorText)) {
-        this.customErrorText = await this.input.getValidationMessage();
+      if (this.customValidation || (!this.hasErrorTextSlot && this.errorText == null && this.customErrorText == null)) {
+        this.customErrorText = await input.getValidationMessage();
       }
       event.preventDefault();
     });
-    this.eventListeners.add(this.input, 'six-input-input', debounce((event) => {
-      const enteredValue = this.input.value;
+    this.eventListeners.add(input, 'six-input-input', debounce((event) => {
+      const enteredValue = input.value;
       this.clearValues();
       this.sixChange.emit({ value: enteredValue, isSelected: false });
       event.stopPropagation();
     }, this.inputDebounce));
-    this.input.value = this.hasSelection() ? this.displayLabel : '';
+    input.value = this.hasSelection() ? this.displayLabel : '';
   }
   disconnectedCallback() {
-    this.host.shadowRoot.removeEventListener('slotchange', this.handleSlotChange);
+    var _a;
+    (_a = this.host.shadowRoot) === null || _a === void 0 ? void 0 : _a.removeEventListener('slotchange', this.handleSlotChange);
     this.eventListeners.removeAll();
   }
   /** Checks for validity and shows the browser's validation message if the control is invalid. */
   async reportValidity() {
-    return this.input.reportValidity();
+    var _a;
+    return (_a = this.input) === null || _a === void 0 ? void 0 : _a.reportValidity();
   }
   /** Checks for validity. */
   async checkValidity() {
-    return this.input.isValid();
+    var _a;
+    return (_a = this.input) === null || _a === void 0 ? void 0 : _a.isValid();
   }
   /** Sets a custom validation message. If `message` is not empty, the field will be considered invalid. */
   async setCustomValidity(message) {
+    if (this.input == null)
+      return;
     this.customErrorText = '';
     this.customValidation = message !== '';
-    this.input.setCustomValidity(message);
-    this.invalid = !this.input.checkValidity();
+    await this.input.setCustomValidity(message);
+    this.invalid = !(await this.input.checkValidity());
   }
   /** Resets the formcontrol */
   async reset() {
-    this.clearValues();
+    if (this.input == null)
+      return;
+    this.value = this.defaultValue;
     this.customErrorText = '';
     this.customValidation = false;
-    this.input.setCustomValidity('');
+    await this.input.setCustomValidity('');
     this.invalid = false;
   }
   getItemLabel(item) {
-    const slot = item.shadowRoot.querySelector('slot:not([name])');
-    if (slot) {
+    var _a, _b;
+    const slot = (_a = item.shadowRoot) === null || _a === void 0 ? void 0 : _a.querySelector('slot:not([name])');
+    if (slot != null) {
       return getTextContent(slot);
     }
     else {
       // bugfix/COMSLI-203-six-select-value-is-not-updated-if-the-slot-is-changed
-      return item.textContent;
+      return (_b = item.textContent) !== null && _b !== void 0 ? _b : '';
     }
   }
   getItems() {
@@ -162,154 +304,27 @@ const SixSelect = class {
   hasMenuItems() {
     return this.getItems().length > 0;
   }
-  getValueAsStringArray() {
-    const values = this.getValueAsArray();
+  getValueAsArray() {
+    const values = Array.isArray(this.value) ? this.value : [this.value];
     // enforce that the values are converted to 'string' before the value is compared
     return values.map(String);
   }
-  getValueAsArray() {
-    return Array.isArray(this.value) ? this.value : [this.value];
-  }
-  handleBlur() {
-    this.hasFocus = false;
-    this.sixBlur.emit();
-  }
-  handleFocus() {
-    this.hasFocus = true;
-    this.sixFocus.emit();
-  }
-  handleInvalid() {
-    this.invalid = true;
-  }
-  handleClearClick(event) {
-    event.stopPropagation();
-    this.clearValues();
-  }
   clearValues() {
     var _a;
     this.value = (_a = this.defaultValue) !== null && _a !== void 0 ? _a : (this.multiple ? [] : '');
     this.syncItemsFromValue();
   }
-  handleSelectAll(event) {
-    const nonFilteredItems = this.getItems().filter((item) => item.style.display !== 'none');
-    const keyName = event.key;
-    const keyCode = event.code;
-    if (keyName === 'Control') {
-      return;
-    }
-    if (this.isOpen && this.multiple && keyCode === 'KeyA' && event.ctrlKey) {
-      event.preventDefault();
-      const hasDeselectedOptions = nonFilteredItems.some((opt) => !opt.disabled && !opt.checked);
-      nonFilteredItems
-        .filter((option) => !option.disabled)
-        .forEach((option) => (option.checked = hasDeselectedOptions));
-      const checkedItems = nonFilteredItems.filter((option) => option.checked).map((option) => option.value);
-      this.value = hasDeselectedOptions ? checkedItems : [];
-    }
-  }
-  handleKeyDown(event) {
-    const target = event.target;
-    const items = this.getItems();
-    const firstItem = items[0];
-    const lastItem = items[items.length - 1];
-    // Ignore key presses on tags
-    if (target.tagName.toLowerCase() === 'six-tag') {
-      return;
-    }
-    // Tabbing out of the control closes it
-    if (event.key === 'Tab') {
-      if (this.isOpen) {
-        this.dropdown.hide();
-      }
-      return;
-    }
-    // Up/down opens the menu
-    if (['ArrowDown', 'ArrowUp'].includes(event.key)) {
-      event.preventDefault();
-      // Show the menu if it's not already open
-      if (!this.isOpen) {
-        this.dropdown.show();
-      }
-      // Focus on a menu item
-      if (event.key === 'ArrowDown' && firstItem) {
-        firstItem.setFocus();
-        return;
-      }
-      if (event.key === 'ArrowUp' && lastItem) {
-        lastItem.setFocus();
-        return;
-      }
-    }
-    // All other keys open the menu and initiate type to select
-    if (!this.isOpen) {
-      event.stopPropagation();
-      event.preventDefault();
-      this.dropdown.show();
-      this.menu.typeToSelect(event.key);
-    }
-  }
-  handleLabelClick() {
-    this.box.focus();
-  }
-  handleMenuSelect(event) {
-    const item = event.detail.item;
-    if (this.multiple) {
-      if (this.value == null || this.value === '') {
-        this.value = [];
-      }
-      else if (!Array.isArray(this.value)) {
-        this.value = [this.value];
-      }
-      this.value = this.value.includes(item.value)
-        ? this.value.filter((v) => v !== item.value)
-        : [...this.value, item.value];
-    }
-    else {
-      this.value = item.value;
-    }
-    this.syncItemsFromValue();
-  }
-  handleMenuShow(event) {
-    if (this.disabled) {
-      event.preventDefault();
-      return;
-    }
-    this.resizeMenu();
-    this.resizeObserver.observe(this.host);
-    this.isOpen = true;
-  }
-  handleMenuHide() {
-    this.resizeObserver.unobserve(this.host);
-    this.isOpen = false;
-  }
-  handleSlotChange() {
-    this.hasHelpTextSlot = hasSlot(this.host, 'help-text');
-    this.hasErrorTextSlot = hasSlot(this.host, 'error-text');
-    this.hasLabelSlot = hasSlot(this.host, 'label');
-    this.syncItemsFromValue();
-  }
-  handleTagInteraction(event) {
-    // Don't toggle the menu when a tag's clear button is activated
-    const path = event.composedPath();
-    const clearButton = path.find((el) => {
-      if (el instanceof HTMLElement) {
-        const element = el;
-        return element.classList.contains('tag__clear');
-      }
-    });
-    if (clearButton) {
-      event.stopPropagation();
-    }
-  }
   resizeMenu() {
+    if (this.menu == null || this.box == null)
+      return;
     this.menu.style.minWidth = `${this.box.clientWidth}px`;
     if (this.dropdown) {
       this.dropdown.reposition();
     }
   }
-  syncItemsFromValue() {
+  async syncItemsFromValue() {
     const items = this.getItems();
-    const value = this.getValueAsStringArray();
+    const value = this.getValueAsArray();
     // Sync checked states
     items.forEach((item) => (item.checked = value.includes(item.value)));
     // Sync display label
@@ -336,18 +351,12 @@ const SixSelect = class {
       this.displayLabel = this.extractLabelForSelectedItem(value, items);
       this.displayTags = [];
     }
-    const hasSelection = this.hasSelection();
-    if (hasSelection) {
+    if (!isValueEmpty(this.value)) {
       this.touched = true;
     }
-    if (this.input && this.touched) {
-      if (!this.autocomplete) {
-        this.input.value = hasSelection ? this.displayLabel : '';
-      }
-      else if (hasSelection) {
-        this.input.value = Array.isArray(this.value) ? this.value.join(',') : this.value;
-      }
-      this.invalid = !this.input.checkValidity();
+    if (this.touched && this.input != null) {
+      this.input.value = Array.isArray(this.value) ? this.value.join(',') : this.value;
+      this.invalid = !(await this.input.checkValidity());
     }
   }
   extractLabelForSelectedItem(value, items) {
@@ -366,7 +375,7 @@ const SixSelect = class {
     const checkedItems = items.filter((item) => item.checked);
     const checkedValues = checkedItems.map((item) => item.value);
     this.value = this.multiple
-      ? this.getValueAsStringArray().filter((val) => checkedValues.includes(val))
+      ? this.getValueAsArray().filter((val) => checkedValues.includes(val))
       : checkedValues.length > 0
         ? checkedValues[0]
         : '';
@@ -377,7 +386,7 @@ const SixSelect = class {
   render() {
     var _a;
     const hasSelection = this.hasSelection();
-    return (h(FormControl, { inputId: this.inputId, label: this.label, labelId: this.labelId, hasLabelSlot: this.hasLabelSlot, helpTextId: this.helpTextId, helpText: this.helpText, hasHelpTextSlot: this.hasHelpTextSlot, errorTextId: this.errorTextId, errorText: this.customErrorText ? this.customErrorText : this.errorText, hasErrorTextSlot: this.hasErrorTextSlot, size: this.size, onLabelClick: this.handleLabelClick, disabled: this.disabled, required: this.required, displayError: this.displayError() }, h("six-dropdown", { part: "base", ref: (el) => (this.dropdown = el), hoist: this.hoist, closeOnSelect: !this.multiple, containingElement: this.host, disableHideOnEnterAndSpace: this.autocomplete, class: {
+    return (h(FormControl, { inputId: this.inputId, label: this.label, labelId: this.labelId, hasLabelSlot: this.hasLabelSlot, helpTextId: this.helpTextId, helpText: this.helpText, hasHelpTextSlot: this.hasHelpTextSlot, errorTextId: this.errorTextId, errorText: this.customErrorText != null && this.customErrorText !== '' ? this.customErrorText : this.errorText, hasErrorTextSlot: this.hasErrorTextSlot, size: this.size, onLabelClick: this.handleLabelClick, disabled: this.disabled, required: this.required, displayError: this.displayError() }, h("six-dropdown", { part: "base", ref: (el) => (this.dropdown = el), hoist: this.hoist, closeOnSelect: !this.multiple, containingElement: this.host, disableHideOnEnterAndSpace: this.autocomplete, class: {
         select: true,
         'select--open': this.isOpen,
         'select--empty': ((_a = this.value) === null || _a === void 0 ? void 0 : _a.length) === 0,
@@ -396,7 +405,7 @@ const SixSelect = class {
         select__box: true,
         'select__box--line': this.line,
         'select__box--autocomplete': this.autocomplete,
-      }, role: "combobox", "aria-labelledby": this.labelId, "aria-describedby": this.helpTextId, "aria-haspopup": "true", "aria-expanded": this.isOpen ? 'true' : 'false', tabIndex: this.disabled ? -1 : 0, onBlur: this.handleBlur, onFocus: this.handleFocus, onKeyDown: this.handleKeyDown }, h("span", { class: "select__label" }, this.displayTags.length ? (h("span", { part: "tags", class: "select__tags" }, this.displayTags)) : (this.displayLabel || this.placeholder)), this.clearable && hasSelection && (h("six-icon-button", { exportparts: "base:clear-button", class: "select__clear", name: "clear", size: "small", onClick: this.handleClearClick, tabindex: "-1" })), this.hasMenuItems() && (h("span", { part: "icon", class: "select__icon" }, h("six-icon", { size: "medium" }, "expand_more"))), h("six-input", { ref: (el) => (this.input = el), class: {
+      }, role: "combobox", "aria-labelledby": this.labelId, "aria-describedby": this.helpTextId, "aria-haspopup": "true", "aria-expanded": this.isOpen ? 'true' : 'false', tabIndex: this.disabled ? -1 : 0, onBlur: this.handleBlur, onFocus: this.handleFocus, onKeyDown: this.handleKeyDown }, h("span", { class: "select__label" }, this.displayTags.length > 0 ? (h("span", { part: "tags", class: "select__tags" }, this.displayTags)) : (this.displayLabel || this.placeholder)), this.clearable && hasSelection && (h("six-icon-button", { exportparts: "base:clear-button", class: "select__clear", name: "clear", size: "small", onClick: this.handleClearClick, tabindex: "-1" })), this.hasMenuItems() && (h("span", { part: "icon", class: "select__icon" }, h("six-icon", { size: "medium" }, "expand_more"))), h("six-input", { ref: (el) => (this.input = el), class: {
         select__input: true,
         'select__hidden-select': !this.autocomplete,
       }, "aria-hidden": "true", required: this.required, onInvalid: this.handleInvalid, onFocus: this.handleFocus, clearable: this.clearable, placeholder: this.placeholder, pill: this.pill, disabled: this.disabled, size: this.size, tabIndex: -1 })), h("six-menu", { ref: (el) => (this.menu = el), part: "menu", class: {
@@ -406,10 +415,7 @@ const SixSelect = class {
       }, "onSix-menu-item-selected": this.handleMenuSelect, items: this.options, virtualScroll: this.virtualScroll, "remove-box-shadow": true }, h("slot", { onSlotchange: this.handleSlotChange })))));
   }
   hasSelection() {
-    if (this.multiple) {
-      return Array.isArray(this.value) ? this.value.length > 0 : false;
-    }
-    return this.value !== '';
+    return this.multiple ? this.value.length > 0 : this.value !== '';
   }
   get host() { return getElement(this); }
   static get watchers() { return {