@syncfusion/ej2-multicolumn-combobox 26.1.38 → 26.2.4

package/dist/es6/ej2-multicolumn-combobox.es2015.js

@@ -325,6 +325,10 @@ let MultiColumnComboBox = class MultiColumnComboBox extends Component {
     // eslint-enable @typescript-eslint/no-explicit-any
     getGridColumns() {
         return this.columns.map((column) => {
+            let changeType;
+            if (column.displayAsCheckBox && !column.format) {
+                changeType = 'boolean';
+            }
             return {
                 field: column.field,
                 headerText: column.header,
@@ -335,7 +339,7 @@ let MultiColumnComboBox = class MultiColumnComboBox extends Component {
                 template: column.template,
                 headerTemplate: column.headerTemplate,
                 customAttributes: column.customAttributes,
-                type: column.displayAsCheckBox ? 'boolean' : 'string'
+                type: changeType
             };
         });
     }
@@ -374,6 +378,13 @@ let MultiColumnComboBox = class MultiColumnComboBox extends Component {
                 this.popupDiv.removeChild(noRecordEle);
             }
         }
+        if (this.isInitialRender) {
+            const rowHeight = !this.popupDiv.classList.contains(NODATA) ? this.popupDiv.querySelector('.e-gridcontent tr').getBoundingClientRect().height : this.popupDiv.getBoundingClientRect().height;
+            this.popupRowHeight = rowHeight;
+            this.popupObj.hide();
+            this.popupEle.style.visibility = 'unset';
+            this.isInitialRender = false;
+        }
     }
     onActionFailure(args) {
         this.trigger('actionFailure', args);
@@ -392,6 +403,9 @@ let MultiColumnComboBox = class MultiColumnComboBox extends Component {
             this.inputEle.setAttribute('aria-expanded', 'false');
             this.inputEle.setAttribute('aria-readOnly', this.readonly.toString());
             this.inputEle.setAttribute('aria-disabled', this.disabled.toString());
+            this.inputEle.setAttribute('autocomplete', 'off');
+            this.inputEle.setAttribute('autocapitalize', 'off');
+            this.inputEle.setAttribute('spellcheck', 'false');
             this.inputEle.setAttribute('tabindex', '0');
         }
         else {
@@ -599,9 +613,9 @@ let MultiColumnComboBox = class MultiColumnComboBox extends Component {
             popupHeight = formatUnit(parseInt(popupHeight, 10) - height + 'px');
         }
         this.popupDiv.style.maxHeight = popupHeight;
-        this.popupRowHeight = this.popupDiv.querySelector('.e-gridcontent tr').getBoundingClientRect().height;
         this.updateGridHeight();
-        this.popupObj.hide();
+        this.popupEle.style.visibility = 'hidden';
+        this.isInitialRender = true;
     }
     updateGridHeight(isFilter, autoHeight, dataSourceCount) {
         let height;
@@ -635,6 +649,10 @@ let MultiColumnComboBox = class MultiColumnComboBox extends Component {
                 if (!Browser.isDevice) {
                     this.hidePopup();
                 }
+            },
+            open: () => {
+                this.inputEle.focus();
+                this.updateClearIconState();
             }
         });
     }
@@ -742,8 +760,8 @@ let MultiColumnComboBox = class MultiColumnComboBox extends Component {
             cancel: false
         };
         const selectedRecords = this.gridObj.getSelectedRecords()[0];
-        const fieldText = selectedRecords ? selectedRecords[this.fields.text].toString() : "";
-        const fieldValue = selectedRecords ? selectedRecords[this.fields.value].toString() : "";
+        const fieldText = selectedRecords ? selectedRecords[this.fields.text].toString() : '';
+        const fieldValue = selectedRecords ? selectedRecords[this.fields.value].toString() : '';
         const ChangeEventArgs = {
             isInteracted: e ? true : false,
             item: selectedRecords,
@@ -758,11 +776,13 @@ let MultiColumnComboBox = class MultiColumnComboBox extends Component {
         this.trigger('select', eventArgs, (eventArgs) => {
             if (!eventArgs.cancel && eventArgs.itemData) {
                 const selectedRecord = eventArgs.itemData;
-                if (!isKeyNav || (isKeyNav && e.key === 'Enter')) {
+                const event = e;
+                const isUpdateVal = event.key === 'Enter' || event.key === 'Tab' || event.shiftKey && event.key === 'Tab' || event.altKey && event.key === 'ArrowUp';
+                if (!isKeyNav || (isKeyNav && isUpdateVal)) {
                     this.updateValues(selectedRecord[this.fields.value], selectedRecord[this.fields.text], this.gridObj.selectedRowIndex, ChangeEventArgs);
                 }
                 Input.setValue(selectedRecord[this.fields.text], this.inputEle, this.floatLabelType, this.showClearButton);
-                if (!isKeyNav || (isKeyNav && e.key === 'Enter')) {
+                if (!isKeyNav || (isKeyNav && isUpdateVal)) {
                     this.hidePopup(e);
                 }
             }
@@ -789,6 +809,7 @@ let MultiColumnComboBox = class MultiColumnComboBox extends Component {
     }
     inputHandler(e) {
         this.showPopup(null, true);
+        this.updateClearIconState();
         if (this.allowFiltering) {
             const inputValue = e.target.value.toLowerCase();
             let customFiltering = false;
@@ -901,15 +922,16 @@ let MultiColumnComboBox = class MultiColumnComboBox extends Component {
         this.updateGridHeight(true, autoHeight, dataSource.length);
     }
     wireEvents() {
-        const ddbIcon = this.inputWrapper.querySelector('.e-input-group-icon');
-        const clearIcon = this.inputWrapper.querySelector('.e-clear-icon');
-        EventHandler.add(ddbIcon, 'mousedown', this.dropDownClick, this);
+        if (!isNullOrUndefined(this.inputObj.buttons[0])) {
+            EventHandler.add(this.inputObj.buttons[0], 'mousedown', this.preventBlur, this);
+            EventHandler.add(this.inputObj.buttons[0], 'mousedown', this.dropDownClick, this);
+        }
         EventHandler.add(document, 'mousedown', this.onDocumentClick, this);
         EventHandler.add(this.gridEle, 'click', this.onMouseClick, this);
         EventHandler.add(this.inputEle, 'input', this.inputHandler, this);
-        EventHandler.add(this.inputWrapper, 'focus', this.focusIn, this);
-        if (clearIcon) {
-            EventHandler.add(clearIcon, 'click', this.clearText, this);
+        EventHandler.add(this.inputEle, 'focus', this.focusIn, this);
+        if (this.showClearButton) {
+            EventHandler.add(this.inputObj.clearButton, 'mousedown', this.clearText, this);
         }
         EventHandler.add(window, 'resize', this.windowResize, this);
         this.keyboardModule = new KeyboardEvents(this.inputWrapper, {
@@ -924,21 +946,25 @@ let MultiColumnComboBox = class MultiColumnComboBox extends Component {
         });
     }
     unWireEvents() {
-        const ddbIcon = this.inputWrapper.querySelector('.e-input-group-icon');
-        const clearIcon = this.inputWrapper.querySelector('.e-clear-icon');
-        EventHandler.remove(ddbIcon, 'mousedown', this.dropDownClick);
+        if (!isNullOrUndefined(this.inputObj.buttons[0])) {
+            EventHandler.remove(this.inputObj.buttons[0], 'mousedown', this.preventBlur);
+            EventHandler.remove(this.inputObj.buttons[0], 'mousedown', this.dropDownClick);
+        }
         EventHandler.remove(document, 'mousedown', this.onDocumentClick);
         EventHandler.remove(this.inputEle, 'input', this.inputHandler);
         EventHandler.remove(this.inputWrapper, 'focus', this.focusIn);
         EventHandler.remove(window, 'resize', this.windowResize);
         EventHandler.remove(this.gridEle, 'click', this.onMouseClick);
-        if (clearIcon) {
-            EventHandler.remove(clearIcon, 'click', this.clearText);
+        if (this.showClearButton) {
+            EventHandler.remove(this.inputObj.clearButton, 'mousedown', this.clearText);
         }
         if (this.keyboardModule) {
             this.keyboardModule.destroy();
         }
     }
+    preventBlur(e) {
+        e.preventDefault();
+    }
     dropDownClick(e) {
         if (this.disabled || this.readonly) {
             return;
@@ -985,9 +1011,6 @@ let MultiColumnComboBox = class MultiColumnComboBox extends Component {
                 this.updateValuesOnInput(e);
             }
         }
-        if (!closest(target, '.e-multicolumn-list')) {
-            this.inputWrapper.tabIndex = -1;
-        }
     }
     updateValuesOnInput(mouseEvent, keyEvent, isClearValues) {
         const e = mouseEvent ? mouseEvent : keyEvent;
@@ -1061,6 +1084,9 @@ let MultiColumnComboBox = class MultiColumnComboBox extends Component {
                 if (this.isPopupOpen) {
                     this.hidePopup(e);
                 }
+                else {
+                    this.focusOut();
+                }
                 break;
             case 'altDown':
                 if (!this.isPopupOpen) {
@@ -1070,7 +1096,7 @@ let MultiColumnComboBox = class MultiColumnComboBox extends Component {
                 break;
             case 'moveDown':
             case 'moveUp':
-                this.updateSelectedItem(e);
+                this.updateSelectedItem(e, true, true);
                 break;
             case 'enter':
                 this.updateValuesOnInput(null, e);
@@ -1096,6 +1122,15 @@ let MultiColumnComboBox = class MultiColumnComboBox extends Component {
             else if (e.key === 'Home') {
                 e.action = 'home';
             }
+            else if (e.key === 'Tab') {
+                e.action = 'tab';
+            }
+            else if (e.key === 'Escape') {
+                e.action = 'escape';
+            }
+            if (e.shiftKey && e.key === 'Tab') {
+                e.action = 'shiftTab';
+            }
             if (e.altKey && e.key === 'ArrowUp') {
                 e.action = 'altUp';
             }
@@ -1107,6 +1142,9 @@ let MultiColumnComboBox = class MultiColumnComboBox extends Component {
             case 'altUp':
                 if (this.isPopupOpen) {
                     e.preventDefault();
+                    if (e.action !== 'escape') {
+                        this.updateSelectedItem(e);
+                    }
                     this.hidePopup(e);
                 }
                 break;
@@ -1118,7 +1156,7 @@ let MultiColumnComboBox = class MultiColumnComboBox extends Component {
                 break;
         }
     }
-    updateSelectedItem(e, isUpdateIndex = true) {
+    updateSelectedItem(e, isUpdateIndex = true, isInputTarget) {
         if (this.isPopupOpen) {
             let index = !this.fields.groupBy ? this.gridObj.selectedRowIndex : this.gridObj.selectedRowIndex ? this.gridObj.selectedRowIndex : 0;
             if ((index === -1 && (e.action === 'moveDown' || e.action === 'moveUp')) || (e.action === 'home')) {
@@ -1127,10 +1165,10 @@ let MultiColumnComboBox = class MultiColumnComboBox extends Component {
             else if ((index >= this.gridObj.getRows().length && e.action === 'moveDown') || (e.action === 'end')) {
                 index = this.gridObj.getRows().length - 1;
             }
-            else if (e.action === 'moveDown' && (index >= 0 && index <= this.gridObj.getRows().length) && this.fields.groupBy) {
+            else if (e.action === 'moveDown' && (index >= 0 && index <= this.gridObj.getRows().length) && (this.fields.groupBy || isInputTarget)) {
                 index += 1;
             }
-            else if (e.action === 'moveUp' && index > 0 && this.fields.groupBy) {
+            else if (e.action === 'moveUp' && index > 0 && (this.fields.groupBy) || isInputTarget) {
                 index -= 1;
             }
             this.gridObj.selectRow(index);
@@ -1144,6 +1182,12 @@ let MultiColumnComboBox = class MultiColumnComboBox extends Component {
             }
         }
     }
+    updateClearIconState() {
+        const clearIconEle = this.inputWrapper.querySelector('.e-clear-icon');
+        if (clearIconEle) {
+            clearIconEle.style.display = this.inputEle.value === '' ? 'none' : 'flex';
+        }
+    }
     /**
      * Sets the focus to the component for interaction.component for interaction.
      *
@@ -1155,12 +1199,8 @@ let MultiColumnComboBox = class MultiColumnComboBox extends Component {
             return;
         }
         addClass([this.inputWrapper], [INPUTFOCUS]);
-        this.inputWrapper.tabIndex = 0;
-        this.inputWrapper.focus();
-        const clearIconEle = this.inputWrapper.querySelector('.e-clear-icon');
-        if (clearIconEle && (this.value && this.value.toString() !== '' || this.text && this.text !== '')) {
-            clearIconEle.classList.remove('e-clear-icon-hide');
-        }
+        this.inputEle.focus();
+        this.updateClearIconState();
         this.trigger('focus', e);
         if (this.floatLabelType !== 'Never') {
             Input.calculateWidth(this.inputEle, this.inputWrapper);
@@ -1176,12 +1216,13 @@ let MultiColumnComboBox = class MultiColumnComboBox extends Component {
         if (this.disabled || this.readonly) {
             return;
         }
-        this.hidePopup(e);
+        if (this.isPopupOpen) {
+            this.hidePopup(e);
+        }
         removeClass([this.inputWrapper], [INPUTFOCUS]);
-        this.inputWrapper.tabIndex = -1;
         const clearIconEle = this.inputWrapper.querySelector('.e-clear-icon');
         if (clearIconEle) {
-            clearIconEle.classList.add('e-clear-icon-hide');
+            clearIconEle.style.display = 'none';
         }
         if (this.floatLabelType !== 'Never') {
             Input.calculateWidth(this.inputEle, this.inputWrapper);
@@ -1211,6 +1252,16 @@ let MultiColumnComboBox = class MultiColumnComboBox extends Component {
                     }
                     this.focusIn(e);
                 }
+                const contentEle = this.gridObj.getContent();
+                if (contentEle) {
+                    const activeRow = contentEle.querySelector('.e-rowcell.e-active');
+                    if (activeRow) {
+                        this.inputEle.setAttribute('aria-activedescendant', activeRow.parentElement.getAttribute('data-uid'));
+                    }
+                    else if (contentEle.querySelector('.e-row')) {
+                        this.inputEle.setAttribute('aria-activedescendant', contentEle.querySelector('.e-row').getAttribute('data-uid'));
+                    }
+                }
                 this.popupObj.show(new Animation(eventArgs.animation), this.popupEle);
             }
         });
@@ -1233,16 +1284,18 @@ let MultiColumnComboBox = class MultiColumnComboBox extends Component {
                 this.inputEle.value = this.text ? this.text.toString() : '';
                 if (e) {
                     const target = e.target;
-                    if (target.classList.contains('e-multicolumn-list-icon') || target.classList.contains('e-rowcell')) {
+                    if (target && (target.classList.contains('e-multicolumn-list-icon') || target.classList.contains('e-rowcell'))) {
                         if (!this.value) {
                             this.gridObj.refreshColumns();
                         }
-                        this.focusIn(e);
+                        setTimeout(() => { this.focusIn(e); });
                     }
                     else {
                         this.focusOut();
                     }
                 }
+                this.inputEle.removeAttribute('aria-owns');
+                this.inputEle.removeAttribute('aria-activedescendant');
             }
         });
         setTimeout(() => {
@@ -1306,18 +1359,23 @@ let MultiColumnComboBox = class MultiColumnComboBox extends Component {
             this.gridObj.destroy();
             detach(this.gridObj.element);
         }
-        if (this.popupObj) {
-            this.popupObj.destroy();
-            detach(this.popupObj.element);
-        }
         if (this.inputEle) {
-            const attrArray = ['placeholder', 'aria-expanded', 'spellcheck', 'aria-label', 'role', 'tabindex', 'type', 'id', 'aria-owns', 'aria-controls'];
+            const attrArray = ['placeholder', 'aria-expanded', 'spellcheck', 'aria-label', 'role', 'type',
+                'aria-owns', 'aria-controls', 'aria-readonly', 'autocomplete', 'autocapitalize', 'spellcheck', 'aria-activedescendant'];
             for (let i = 0; i < attrArray.length; i++) {
                 this.inputEle.removeAttribute(attrArray[i]);
             }
             this.inputEle.classList.remove('e-input');
             Input.setValue('', this.inputEle, this.floatLabelType, this.showClearButton);
         }
+        if (this.popupEle) {
+            this.popupEle.removeAttribute('aria-label');
+            this.popupEle.removeAttribute('role');
+        }
+        if (this.popupObj) {
+            this.popupObj.destroy();
+            detach(this.popupObj.element);
+        }
         if (this.element.tagName !== this.getDirective()) {
             this.inputWrapper.parentElement.insertBefore(this.element, this.inputWrapper);
         }