@syncfusion/ej2-dropdowns 27.2.2 → 27.2.3

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

@@ -1349,9 +1349,11 @@ let DropDownBase = class DropDownBase extends Component {
     }
     renderItemsBySelect() {
         const element = this.element;
-        const fields = { value: 'value', text: 'text' };
-        const jsonElement = [];
         const group = element.querySelectorAll('select>optgroup');
+        let fields;
+        const isSelectGroupCheck = this.getModuleName() === 'multiselect' && this.isGroupChecking && group.length > 0;
+        fields = isSelectGroupCheck ? { value: 'value', text: 'text', groupBy: 'categeory' } : fields = { value: 'value', text: 'text' };
+        const jsonElement = [];
         const option = element.querySelectorAll('select>option');
         this.getJSONfromOption(jsonElement, option, fields);
         if (group.length) {
@@ -1361,12 +1363,17 @@ let DropDownBase = class DropDownBase extends Component {
                 optionGroup[fields.text] = item.label;
                 optionGroup.isHeader = true;
                 const child = item.querySelectorAll('option');
-                jsonElement.push(optionGroup);
-                this.getJSONfromOption(jsonElement, child, fields);
+                if (isSelectGroupCheck) {
+                    this.getJSONfromOption(jsonElement, child, fields, item.label);
+                }
+                else {
+                    jsonElement.push(optionGroup);
+                    this.getJSONfromOption(jsonElement, child, fields);
+                }
             }
             element.querySelectorAll('select>option');
         }
-        this.updateFields(fields.text, fields.value, this.fields.groupBy, this.fields.htmlAttributes, this.fields.iconCss, this.fields.disabled);
+        this.updateFields(fields.text, fields.value, isSelectGroupCheck ? fields.groupBy : this.fields.groupBy, this.fields.htmlAttributes, this.fields.iconCss, this.fields.disabled);
         this.resetList(jsonElement, fields);
     }
     updateFields(text, value, groupBy, htmlAttributes, iconCss, disabled) {
@@ -1382,12 +1389,15 @@ let DropDownBase = class DropDownBase extends Component {
         };
         this.setProperties(field, true);
     }
-    getJSONfromOption(items, options, fields) {
+    getJSONfromOption(items, options, fields, category = null) {
         for (const option of options) {
             const json = {};
             json[fields.text] = option.innerText;
             json[fields.value] = !isNullOrUndefined(option.getAttribute(fields.value)) ?
                 option.getAttribute(fields.value) : option.innerText;
+            if (!isNullOrUndefined(category)) {
+                json[fields.groupBy] = category;
+            }
             items.push(json);
         }
     }
@@ -1841,7 +1851,12 @@ let DropDownBase = class DropDownBase extends Component {
                     if (this.sortOrder !== 'None') {
                         dataSource = this.getSortedDataSource(dataSource);
                     }
-                    dataSource = ListBase.groupDataSource(dataSource, fields.properties, this.sortOrder);
+                    if (this.element.querySelector('optgroup') && this.isGroupChecking && this.getModuleName() === 'multiselect') {
+                        dataSource = ListBase.groupDataSource(dataSource, fields, this.sortOrder);
+                    }
+                    else {
+                        dataSource = ListBase.groupDataSource(dataSource, fields.properties, this.sortOrder);
+                    }
                 }
                 addClass([this.list], dropDownBaseClasses.grouping);
             }
@@ -20430,11 +20445,13 @@ let ListBox = ListBox_1 = class ListBox extends DropDownBase {
         if (fListBox.value.length === 1 && fListBox.getSelectedItems().length) {
             fListBox.value[0] = fListBox.getFormattedValue(fListBox.getSelectedItems()[0].getAttribute('data-value'));
         }
-        if (fListBox.liCollections.length === fListBox.ulElement.querySelectorAll('.e-disabled').length) {
+        if (fListBox.liCollections.length === fListBox.ulElement.querySelectorAll('.e-disabled').length && this.toolbarAction) {
             const wrap = this.list.parentElement.getElementsByClassName('e-listbox-tool')[0];
             const toolbarAction = this.toolbarAction === 'moveFrom' ? 'moveAllFrom' : 'moveAllTo';
-            const btn = wrap.querySelector('[data-value="' + toolbarAction + '"]');
-            btn.disabled = true;
+            if (wrap) {
+                const btn = wrap.querySelector('[data-value="' + toolbarAction + '"]');
+                btn.disabled = true;
+            }
         }
     }
     selectNextList(elems, dataLiIdx, dataIdx, inst) {