@syncfusion/ej2-dropdowns 28.2.5 → 28.2.6

package/dist/es6/ej2-dropdowns.es2015.js

@@ -1212,7 +1212,8 @@ let DropDownBase = class DropDownBase extends Component {
     }
     getSkeletonCount(retainSkeleton) {
         this.virtualListHeight = this.listContainerHeight != null ? parseInt(this.listContainerHeight, 10) : this.virtualListHeight;
-        const actualCount = this.virtualListHeight > 0 ? Math.floor(this.virtualListHeight / this.listItemHeight) : 0;
+        const actualCount = this.virtualListHeight > 0 && this.listItemHeight > 0 ?
+            Math.floor(this.virtualListHeight / this.listItemHeight) : 0;
         this.skeletonCount = actualCount * 4 < this.itemCount ? this.itemCount : actualCount * 4;
         this.itemCount = retainSkeleton ? this.itemCount : this.skeletonCount;
         this.virtualItemCount = this.itemCount;
@@ -8858,11 +8859,9 @@ let DropDownTree = class DropDownTree extends Component {
                 removeClass([this.popupEle], DDTHIDEICON);
                 this.updatePopupHeight();
                 this.popupObj.refreshPosition();
-                if (this.showSelectAll && !this.allowFiltering) {
-                    this.checkAllParent.focus();
-                }
-                if ((!this.popupDiv.classList.contains(NODATA) && this.treeItems.length > 0)) {
-                    let focusedElement = this.value != null || this.text != null ? this.treeObj.element.querySelector('[data-uid="' + this.value[0] + '"]') : null;
+                if (!(this.showSelectAll || this.allowFiltering) && (!this.popupDiv.classList.contains(NODATA)
+                    && this.treeItems.length > 0)) {
+                    let focusedElement = this.value != null && this.text != null ? this.treeObj.element.querySelector('[data-uid="' + this.value[0] + '"]') : null;
                     if (focusedElement) {
                         this.treeObj.element.querySelector('li').setAttribute('tabindex', '-1');
                         focusedElement.setAttribute('tabindex', '0');
@@ -8871,17 +8870,9 @@ let DropDownTree = class DropDownTree extends Component {
                         const oldFocussedNode = this.treeObj.element.querySelector('.e-node-focus');
                         focusedElement = this.treeObj.element.querySelector('li[tabindex="0"]:not(.e-disable)') ||
                             this.treeObj.element.querySelector('li:not(.e-disable)');
-                        if (oldFocussedNode && oldFocussedNode !== focusedElement) {
-                            oldFocussedNode.setAttribute('tabindex', '-1');
-                            removeClass([oldFocussedNode], 'e-node-focus');
-                        }
-                    }
-                    if (!isNullOrUndefined(focusedElement)) {
-                        if (!this.allowFiltering) {
-                            focusedElement.focus();
-                        }
-                        addClass([focusedElement], ['e-node-focus']);
+                        this.removeFocus(focusedElement, oldFocussedNode);
                     }
+                    this.updateFocus(focusedElement);
                 }
                 if (this.treeObj.checkedNodes.length > 0 && !this.isFilterRestore) {
                     const nodes = this.treeObj.element.querySelectorAll('li');
@@ -8892,6 +8883,12 @@ let DropDownTree = class DropDownTree extends Component {
                         this.checkSelectAll = false;
                     }
                 }
+                if (this.showSelectAll && !this.allowFiltering) {
+                    const oldFocussedNode = this.treeObj.element.querySelector('.e-node-focus');
+                    const focusedElement = this.popupEle.querySelector('.e-selectall-parent');
+                    this.removeFocus(focusedElement, oldFocussedNode);
+                    this.updateFocus(focusedElement);
+                }
                 if (this.allowFiltering) {
                     removeClass([this.inputWrapper], [INPUTFOCUS]);
                     this.filterObj.element.focus();
@@ -8901,6 +8898,18 @@ let DropDownTree = class DropDownTree extends Component {
             }
         });
     }
+    removeFocus(focusedElement, oldFocusedElement) {
+        if (oldFocusedElement && oldFocusedElement !== focusedElement) {
+            oldFocusedElement.setAttribute('tabindex', '-1');
+            removeClass([oldFocusedElement], 'e-node-focus');
+        }
+    }
+    updateFocus(focusedElement) {
+        if (!isNullOrUndefined(focusedElement)) {
+            focusedElement.focus();
+            addClass([focusedElement], ['e-node-focus']);
+        }
+    }
     reactCallBack() {
         if (!isNullOrUndefined(this.popupObj)) {
             this.updatePopupHeight();
@@ -16236,7 +16245,7 @@ let MultiSelect = class MultiSelect extends DropDownBase {
                             (this.mode === 'Box' || this.mode === 'Default'))) ||
                         (this.enableVirtualization && value != null && text != null && !isCustomData)) {
                         const currentText = [];
-                        const textValues = this.isDynamicRemoteVirtualData && text != null && text !== '' ? text : this.text != null && this.text !== '' ? this.text + this.delimiterChar + text : text;
+                        const textValues = this.isDynamicRemoteVirtualData && text != null && text !== '' ? text : this.text != null && this.text !== '' && !this.text.includes(text) ? this.text + this.delimiterChar + text : text;
                         currentText.push(textValues);
                         this.setProperties({ text: currentText.toString() }, true);
                         this.addChip(text, value);