q2-tecton-elements 1.23.0 → 1.25.0

package/dist/collection/components/q2-option-list/index.js

@@ -1,58 +1,136 @@
 import { h, Host, } from '@stencil/core';
-import { isEventFromElement, overrideFocus } from 'src/utils';
+import { isEventFromElement, nextPaint, overrideFocus } from 'src/utils';
 export class Q2OptionList {
   constructor() {
     this.scheduledAfterRender = [];
     /// Event Handlers ///
     /* tslint:disable:cyclomatic-complexity */
-    this.keydownHandler = (event, ignoreSelectionEvents) => {
+    this.externalKeydownHandler = (event) => {
+      event.stopPropagation();
+      const { activeIndex, customSearch, allOptions } = this;
+      const { key } = event;
+      let nextIndex;
+      switch (key) {
+        case ' ':
+          if (this.searchString) {
+            if (customSearch)
+              break;
+            this.searchOptions(key, true);
+            break;
+          }
+          this.setDefaultActiveElement();
+          break;
+        case 'Enter':
+          this.setDefaultActiveElement();
+          break;
+        case 'ArrowUp':
+          event.preventDefault();
+          this.activeIndex = 0;
+          nextIndex = !!this.selectedOptions.length ? this.getDefaultActiveIndex() : this.getNextVisibleIndex(-1);
+          if (nextIndex === -1)
+            break;
+          this.openDropdownWithActiveElement(nextIndex);
+          break;
+        case 'ArrowDown':
+          event.preventDefault();
+          this.activeIndex = 0;
+          nextIndex = !!this.selectedOptions.length ? this.getDefaultActiveIndex() : this.getNextVisibleIndex(0);
+          if (nextIndex === -1)
+            break;
+          this.openDropdownWithActiveElement(nextIndex);
+          break;
+        case 'Home':
+          event.preventDefault();
+          this.openDropdownWithActiveElement(0);
+          break;
+        case 'End':
+          event.preventDefault();
+          this.openDropdownWithActiveElement(allOptions.length - 1);
+          break;
+        case 'PageUp':
+          event.preventDefault();
+          this.openDropdownWithActiveElement(Math.max((activeIndex || 0) - 10, 0));
+          break;
+        case 'PageDown':
+          event.preventDefault();
+          this.openDropdownWithActiveElement(Math.min((activeIndex || 0) + 10, allOptions.length - 1));
+          break;
+        case 'Tab':
+          this.popoverState.emit({ open: false, action: 'close' });
+          break;
+        case 'Esc':
+        case 'Escape':
+          if (this.noSelect)
+            this.setActiveElement(null);
+          this.popoverState.emit({ open: false, action: 'close' });
+          break;
+        default:
+          if (customSearch)
+            break;
+          if (!key.match(/^[\w]$/))
+            break;
+          this.searchOptions(key, true);
+          break;
+      }
+    };
+    this.internalKeydownHandler = (event) => {
       event.stopPropagation();
       const { activeIndex, customSearch, allOptions } = this;
       const { key, shiftKey } = event;
       let newOption;
       switch (key) {
         case ' ':
-        case 'Enter':
-          if (ignoreSelectionEvents) {
-            this.setDefaultActiveElement();
+          if (this.searchString) {
+            if (customSearch)
+              break;
+            this.searchOptions(key, false);
             break;
           }
           event.preventDefault();
           newOption = allOptions.find(element => element.active);
           if (!newOption || newOption.disabled)
             break;
-          this.selectOption(newOption.value);
+          this.selectOption(newOption);
+          break;
+        case 'Enter':
+          event.preventDefault();
+          newOption = allOptions.find(element => element.active);
+          if (!newOption || newOption.disabled)
+            break;
+          this.selectOption(newOption);
           break;
         case 'ArrowUp':
           event.preventDefault();
-          const isFirstOption = activeIndex === 0;
-          if (isFirstOption)
+          const isFirstOptionActive = activeIndex === 0;
+          if (isFirstOptionActive)
             break;
           if (activeIndex === undefined) {
             this.setDefaultActiveElement();
+            break;
           }
           else {
             const nextIndex = this.getNextVisibleIndex(-1);
             if (nextIndex === -1)
               break;
             this.adjustActiveOptionAndScroll(nextIndex - activeIndex);
+            break;
           }
-          break;
         case 'ArrowDown':
           event.preventDefault();
-          const isLastOption = activeIndex === allOptions.length - 1;
-          if (isLastOption)
+          const isLastOptionActive = activeIndex === allOptions.length - 1;
+          if (isLastOptionActive)
             break;
           if (activeIndex === undefined) {
             this.setDefaultActiveElement();
+            break;
           }
           else {
             const nextIndex = this.getNextVisibleIndex(1);
             if (nextIndex === -1)
               break;
             this.adjustActiveOptionAndScroll(nextIndex - activeIndex);
+            break;
           }
-          break;
         case 'Home':
           event.preventDefault();
           this.openDropdownWithActiveElement(0);
@@ -70,28 +148,25 @@ export class Q2OptionList {
           this.openDropdownWithActiveElement(Math.min(activeIndex + 10, allOptions.length - 1));
           break;
         case 'Tab':
-          if (ignoreSelectionEvents)
-            break;
           if (shiftKey)
             break;
           newOption = allOptions.find(element => element.active);
           if (!newOption || newOption.disabled)
             return;
-          this.selectOption(newOption.value);
+          this.selectOption(newOption);
           break;
         case 'Esc':
         case 'Escape':
           if (this.noSelect)
             this.setActiveElement(null);
-          this.popoverState.emit({ open: false });
+          this.popoverState.emit({ open: false, action: 'close' });
           break;
         default:
           if (customSearch)
             break;
-          if (!key.match(/^[A-Za-z0-9]$/))
+          if (!key.match(/^[\w]$/))
             break;
-          // search in non-searchable select: alpha-numeric only
-          this.searchAndFocus(key);
+          this.searchOptions(key, false);
           break;
       }
     };
@@ -106,19 +181,17 @@ export class Q2OptionList {
     };
     this.clickHandler = (event) => {
       const target = event.target;
-      if (target.localName !== 'q2-option' || target.disabled) {
-        return;
-      }
-      this.selectOption(target.value);
+      const option = target.closest('q2-option');
+      this.selectOption(option);
     };
     this.role = 'listbox';
-    this.direction = 'down';
     this.customSearch = undefined;
     this.noSelect = undefined;
     this.align = undefined;
     this.selectedOptions = [];
     this.multiple = undefined;
     this.disabled = undefined;
+    this.showSelected = undefined;
     this.type = undefined;
     this.hasOptions = undefined;
   }
@@ -130,26 +203,47 @@ export class Q2OptionList {
     overrideFocus(this.hostElement);
     this.checkOptions();
     this.selectedOptionsUpdated();
+    this.ready.emit();
   }
   componentDidRender() {
     this.scheduledAfterRender.forEach(fn => fn());
     this.scheduledAfterRender = [];
   }
   /// Getters ///
+  get allContents() {
+    const rootSlot = this.getRootSlot(this.hostElement);
+    const acceptedTags = ['Q2-OPTGROUP', 'Q2-OPTION'];
+    return rootSlot.filter(element => acceptedTags.includes(element.tagName));
+  }
   get allOptions() {
-    return this.getRootSlot(this.hostElement);
+    const contents = this.allContents;
+    const extractOptions = (elements) => {
+      return elements.reduce((acc, element) => {
+        if (element.tagName === 'Q2-OPTGROUP') {
+          return [...acc, ...extractOptions(Array.from(element.children))];
+        }
+        else if (element.tagName === 'Q2-OPTION') {
+          return [...acc, element];
+        }
+        else {
+          return acc;
+        }
+      }, []);
+    };
+    return extractOptions(contents);
+  }
+  get allVisibleOptions() {
+    return this.allOptions.filter(option => !option.hidden && !option._multiSelectHidden && !option.disabled && !option.disabledGroup);
   }
   /// Helpers ///
-  checkOptions() {
-    const { noSelect, type, allOptions } = this;
-    if (!noSelect && !type)
+  async checkOptions() {
+    const { type } = this;
+    const options = await this.getOptions();
+    if (!type)
       return;
     const optionRole = type === 'menu' ? 'menuitem' : 'option';
-    allOptions.forEach(option => {
-      if (noSelect)
-        option.noSelect = true;
-      if (type)
-        option.role = optionRole;
+    options.forEach(option => {
+      option.role = optionRole;
     });
   }
   getRootSlot(element) {
@@ -168,20 +262,15 @@ export class Q2OptionList {
     const activeOption = this.allOptions[this.activeIndex];
     activeOption === null || activeOption === void 0 ? void 0 : activeOption.scrollIntoView({ block: 'nearest' });
   }
-  resizeIframe() {
-    var _a, _b;
-    return (_b = (_a = window.TectonElements) === null || _a === void 0 ? void 0 : _a.resizeIframe) === null || _b === void 0 ? void 0 : _b.call(_a);
-  }
   openDropdownWithActiveElement(activeIndex) {
     if (this.disabled)
       return;
     this.activeIndex = activeIndex;
-    this.popoverState.emit({ open: true });
+    this.popoverState.emit({ open: true, action: 'open' });
     this.setActiveOption();
     this.setFocusedOption();
-    this.scheduledAfterRender.push(() => {
+    nextPaint(() => {
       this.scrollToActiveOption();
-      this.resizeIframe();
     });
   }
   getDefaultActiveIndex() {
@@ -195,16 +284,16 @@ export class Q2OptionList {
     return 0;
   }
   updateSingleOptionAttrs() {
-    var _a, _b;
+    var _a;
     const { allOptions, selectedOptions } = this;
-    const singleValue = (_b = (_a = selectedOptions[0]) === null || _a === void 0 ? void 0 : _a.value) !== null && _b !== void 0 ? _b : undefined;
+    const selectedValue = ((_a = selectedOptions[0]) === null || _a === void 0 ? void 0 : _a.value) || undefined;
     allOptions.forEach(element => {
-      element.selected = element.value === singleValue;
+      element.selected = element.value === selectedValue;
     });
   }
   updateMultipleOptionAttrs() {
     const { allOptions, selectedOptions } = this;
-    const selectedValues = selectedOptions.map(option => option.value);
+    const selectedValues = selectedOptions.map(({ value }) => value);
     allOptions.forEach(element => {
       element.selected = selectedValues.includes(element.value);
     });
@@ -219,38 +308,66 @@ export class Q2OptionList {
     const option = this.allOptions[this.activeIndex];
     if (!option)
       return;
-    setTimeout(() => {
+    const isHostElementVisible = !!this.hostElement.offsetParent;
+    if (isHostElementVisible)
       option.focus();
-    }, 25);
+    else
+      nextPaint(() => option.focus());
   }
   getNextVisibleIndex(direction) {
-    let index = this.activeIndex + direction;
-    while (index >= 0 && index <= this.allOptions.length - 1) {
-      const { display, visibility } = window.getComputedStyle(this.allOptions[index]);
-      if (display !== 'none' && visibility !== 'hidden') {
-        return index;
-      }
-      index = index + direction;
+    const { allVisibleOptions, allOptions, activeIndex } = this;
+    const activeOption = allOptions[activeIndex];
+    const visibleActiveOptionIndex = allVisibleOptions.indexOf(activeOption);
+    let nextVisibleOptionIndex = visibleActiveOptionIndex + direction;
+    if (nextVisibleOptionIndex < 0) {
+      nextVisibleOptionIndex = allVisibleOptions.length - 1;
     }
-    return -1;
+    else if (nextVisibleOptionIndex > allVisibleOptions.length - 1) {
+      nextVisibleOptionIndex = 0;
+    }
+    const nextVisibleOption = allVisibleOptions[nextVisibleOptionIndex];
+    return allOptions.indexOf(nextVisibleOption);
+  }
+  focusSelectedSibling(option) {
+    const { allVisibleOptions, allOptions } = this;
+    const hasNoSiblings = allVisibleOptions.length < 2;
+    if (hasNoSiblings) {
+      this.showSelected = false;
+      return;
+    }
+    const selectedOptionVisibleIndex = allVisibleOptions.indexOf(option);
+    const nextVisibleSiblingIndex = selectedOptionVisibleIndex
+      ? selectedOptionVisibleIndex - 1
+      : selectedOptionVisibleIndex + 1;
+    const nextVisibleSibling = allVisibleOptions[nextVisibleSiblingIndex];
+    const nextSiblingIndex = allOptions.indexOf(nextVisibleSibling);
+    this.activeIndex = nextSiblingIndex;
+    this.setFocusedOption();
+    this.scheduledAfterRender.push(() => {
+      option._multiSelectHidden = !option.selected;
+    });
   }
-  selectOption(selectedValue) {
-    const option = this.allOptions.find(({ value }) => value === selectedValue);
+  selectOption(selectedOption) {
+    const { multiple, noSelect, showSelected } = this;
+    if (!selectedOption || selectedOption.disabled || selectedOption.disabledGroup)
+      return;
+    const selectedValue = selectedOption.value;
     const valueObject = {
       value: selectedValue,
-      display: option.display || option.innerText.trim(),
+      display: selectedOption.display || selectedOption.innerText.trim(),
     };
-    const { multiple, noSelect } = this;
-    let values;
+    let values = [];
     if (multiple) {
-      const { selectedOptions = [] } = this;
-      const isAlreadySelected = !!selectedOptions.find(({ value }) => value === selectedValue);
+      const { selectedOptions } = this;
+      const isAlreadySelected = selectedOptions.find(option => option.value === selectedValue);
       if (isAlreadySelected) {
         values = selectedOptions.filter(({ value }) => value !== selectedValue);
       }
       else {
         values = [...selectedOptions, valueObject];
       }
+      if (showSelected)
+        this.focusSelectedSibling(selectedOption);
     }
     else {
       values = [valueObject];
@@ -262,7 +379,7 @@ export class Q2OptionList {
     this.change.emit({ value: selectedValue, values });
     if (multiple)
       return;
-    this.popoverState.emit({ open: false });
+    this.popoverState.emit({ open: false, action: 'select' });
   }
   adjustActiveOptionAndScroll(numToAdd) {
     this.activeIndex += numToAdd;
@@ -278,18 +395,29 @@ export class Q2OptionList {
       this.searchString = null;
     }, 2000);
   }
-  searchAndFocus(key) {
+  searchOptions(key, shouldSelect) {
     this.resetTimer();
     let searchString = this.searchString ? `${this.searchString}${key}` : key;
-    searchString = searchString.replace(/[^0-9a-z]/gi, '');
+    searchString = searchString.replace(/[^\w\s]/gi, '');
     this.searchString = searchString;
-    const searchRegEx = new RegExp(searchString, 'i');
-    const foundIndex = this.allOptions.findIndex(option => option.value === searchString || option.textContent.match(searchRegEx));
+    const searchRegEx = new RegExp(`^${searchString}`, 'i');
+    const { allOptions } = this;
+    const foundIndex = allOptions.findIndex(option => option.value === searchString || option.textContent.trim().match(searchRegEx));
     if (foundIndex === -1)
       return;
-    this.setActiveElement(foundIndex);
+    if (shouldSelect)
+      this.selectOption(this.allOptions[foundIndex]);
+    else
+      this.setActiveElement(foundIndex);
   }
   /// Watchers ///
+  showSelectedUpdated(showSelected) {
+    if (showSelected && this.selectedOptions.length === 0) {
+      this.showSelected = false;
+      return;
+    }
+    this.allOptions.forEach(option => (option._multiSelectHidden = showSelected ? !option.selected : false));
+  }
   selectedOptionsUpdated() {
     if (this.multiple) {
       this.updateMultipleOptionAttrs();
@@ -302,8 +430,15 @@ export class Q2OptionList {
   delegateFocus(event) {
     if (!isEventFromElement(event, this.hostElement))
       return;
-    this.popoverState.emit({ open: true });
-    this.setDefaultActiveElement();
+    this.popoverState.emit({ open: true, action: 'open' });
+    const { activeIndex } = this;
+    if (typeof activeIndex === 'number' && activeIndex > -1) {
+      this.setActiveOption();
+      this.setFocusedOption();
+    }
+    else {
+      this.setDefaultActiveElement();
+    }
   }
   handleClick(event) {
     event.stopPropagation();
@@ -320,22 +455,17 @@ export class Q2OptionList {
     this.setFocusedOption();
   }
   async handleExternalKeydown(event) {
-    const keysThatTriggerOpen = ['ArrowDown', 'ArrowUp', 'PageDown', 'PageUp', 'Home', 'End'];
-    if (keysThatTriggerOpen.includes(event.key)) {
-      this.popoverState.emit({ open: true });
-    }
-    const keysThatTriggerDefault = ['ArrowDown', 'ArrowUp'];
-    if (keysThatTriggerDefault.includes(event.key)) {
-      event.preventDefault();
-      this.setDefaultActiveElement();
-    }
-    else {
-      this.keydownHandler(event, true);
-    }
+    this.externalKeydownHandler(event);
+  }
+  async getContents() {
+    return this.allContents;
+  }
+  async getOptions() {
+    return this.allOptions;
   }
   /// DOM ///
   render() {
-    return (h(Host, null, h("div", { class: "content", ref: el => (this.contentElement = el), onFocusout: this.focusoutHandler }, h("div", { class: "options", role: this.type || 'listbox', onKeyDown: this.keydownHandler, onClick: this.clickHandler }, h("slot", null)))));
+    return (h(Host, null, h("div", { class: "content", ref: el => (this.contentElement = el), onFocusout: this.focusoutHandler }, h("div", { class: "options", role: this.type || 'listbox', onKeyDown: this.internalKeydownHandler, onClick: this.clickHandler }, h("slot", null)))));
   }
   static get is() { return "q2-option-list"; }
   static get encapsulation() { return "shadow"; }
@@ -369,24 +499,6 @@ export class Q2OptionList {
         "reflect": true,
         "defaultValue": "'listbox'"
       },
-      "direction": {
-        "type": "string",
-        "mutable": false,
-        "complexType": {
-          "original": "'up' | 'down'",
-          "resolved": "\"down\" | \"up\"",
-          "references": {}
-        },
-        "required": false,
-        "optional": false,
-        "docs": {
-          "tags": [],
-          "text": ""
-        },
-        "attribute": "direction",
-        "reflect": true,
-        "defaultValue": "'down'"
-      },
       "customSearch": {
         "type": "boolean",
         "mutable": false,
@@ -492,6 +604,23 @@ export class Q2OptionList {
         "attribute": "disabled",
         "reflect": true
       },
+      "showSelected": {
+        "type": "boolean",
+        "mutable": true,
+        "complexType": {
+          "original": "boolean",
+          "resolved": "boolean",
+          "references": {}
+        },
+        "required": false,
+        "optional": false,
+        "docs": {
+          "tags": [],
+          "text": ""
+        },
+        "attribute": "show-selected",
+        "reflect": true
+      },
       "type": {
         "type": "string",
         "mutable": false,
@@ -547,8 +676,23 @@ export class Q2OptionList {
           "text": ""
         },
         "complexType": {
-          "original": "{ open: boolean }",
-          "resolved": "{ open: boolean; }",
+          "original": "{ open: boolean; action: 'close' | 'select' | 'open' }",
+          "resolved": "{ open: boolean; action: \"select\" | \"open\" | \"close\"; }",
+          "references": {}
+        }
+      }, {
+        "method": "ready",
+        "name": "ready",
+        "bubbles": false,
+        "cancelable": true,
+        "composed": true,
+        "docs": {
+          "tags": [],
+          "text": ""
+        },
+        "complexType": {
+          "original": "any",
+          "resolved": "any",
           "references": {}
         }
       }];
@@ -611,12 +755,56 @@ export class Q2OptionList {
           "text": "",
           "tags": []
         }
+      },
+      "getContents": {
+        "complexType": {
+          "signature": "() => Promise<(HTMLQ2OptgroupElement | HTMLQ2OptionElement)[]>",
+          "parameters": [],
+          "references": {
+            "Promise": {
+              "location": "global"
+            },
+            "HTMLQ2OptgroupElement": {
+              "location": "global"
+            },
+            "HTMLQ2OptionElement": {
+              "location": "global"
+            }
+          },
+          "return": "Promise<(HTMLQ2OptgroupElement | HTMLQ2OptionElement)[]>"
+        },
+        "docs": {
+          "text": "",
+          "tags": []
+        }
+      },
+      "getOptions": {
+        "complexType": {
+          "signature": "() => Promise<HTMLQ2OptionElement[]>",
+          "parameters": [],
+          "references": {
+            "Promise": {
+              "location": "global"
+            },
+            "HTMLQ2OptionElement": {
+              "location": "global"
+            }
+          },
+          "return": "Promise<HTMLQ2OptionElement[]>"
+        },
+        "docs": {
+          "text": "",
+          "tags": []
+        }
       }
     };
   }
   static get elementRef() { return "hostElement"; }
   static get watchers() {
     return [{
+        "propName": "showSelected",
+        "methodName": "showSelectedUpdated"
+      }, {
         "propName": "selectedOptions",
         "methodName": "selectedOptionsUpdated"
       }];