@syncfusion/ej2-treegrid 20.3.57 → 20.3.60

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

@@ -958,7 +958,7 @@ class Selection {
         }
     }
     renderColumnCheckbox(args) {
-        const rowChkBox = this.parent.createElement('input', { className: 'e-treecheckselect', attrs: { 'type': 'checkbox' } });
+        const rowChkBox = this.parent.createElement('input', { className: 'e-treecheckselect', attrs: { 'type': 'checkbox', 'aria-label': 'checkbox' } });
         const data = args.data;
         args.cell.classList.add('e-treegridcheckbox');
         args.cell.setAttribute('aria-label', 'checkbox');
@@ -1188,9 +1188,9 @@ class Selection {
         let checkedRecord;
         const recordIndex = this.parent.getCurrentViewRecords().indexOf(record[0]);
         const checkboxRecord = getParentData(this.parent, currentRecord.uniqueID);
+        const tr = this.parent.getRows()[recordIndex];
         let checkbox;
         if (recordIndex > -1) {
-            const tr = this.parent.getRows()[recordIndex];
             let movableTr;
             if (this.parent.frozenRows || this.parent.getFrozenColumns()) {
                 movableTr = this.parent.getMovableDataRows()[recordIndex];
@@ -1239,6 +1239,9 @@ class Selection {
         if (recordIndex > -1) {
             if (!isNullOrUndefined(checkbox)) {
                 checkbox.classList.add(checkBoxclass);
+                const chkstate = checkState === 'check' ? 'checked' : checkState === 'uncheck' ? 'unchecked' : 'mixed';
+                tr.querySelector('.e-treecheckselect').setAttribute('aria-checked', checkState === 'check' ? 'true' : checkState === 'uncheck' ? 'false' : 'mixed');
+                tr.querySelector('.e-frame').setAttribute('title', 'checkbox' + chkstate);
             }
         }
     }
@@ -1565,6 +1568,7 @@ class Render {
             }
             if (iconRequired) {
                 addClass([args.cell], 'e-treerowcell');
+                args.cell.setAttribute('aria-expanded', data.expanded ? 'true' : 'false');
                 const expandIcon = createElement('span', { className: 'e-icons' });
                 let expand;
                 if (this.parent.initialRender) {
@@ -3744,13 +3748,9 @@ let TreeGrid = TreeGrid_1 = class TreeGrid extends Component {
         this.trigger(getObject('name', args), args);
     }
     IsExpandCollapseClicked(args) {
-        if (args['name'] === 'rowSelecting' && !isNullOrUndefined(args.target) && (args.target.classList.contains('e-treegridexpand')
-            || args.target.classList.contains('e-treegridcollapse') || args.target.classList.contains('e-summarycell')) && (isNullOrUndefined(args['previousRowIndex']))) {
-            args.cancel = true;
-            return;
-        }
-        else if (args['name'] === 'rowDeselecting' && !isNullOrUndefined(args.target) && ((!isNullOrUndefined(args.row) && (!args.row.length)) && (args.target.classList.contains('e-treegridexpand')
-            || args.target.classList.contains('e-treegridcollapse') || args.target.classList.contains('e-summarycell')))) {
+        if (!isNullOrUndefined(args.target) && (args.target.classList.contains('e-treegridexpand')
+            || args.target.classList.contains('e-treegridcollapse') || args.target.classList.contains('e-summarycell'))
+            && (!isNullOrUndefined(args.data) && args.data['hasChildRecords'])) {
             args.cancel = true;
             return;
         }
@@ -4408,7 +4408,9 @@ let TreeGrid = TreeGrid_1 = class TreeGrid extends Component {
         }
         let treeGridColumn;
         let gridColumn;
-        index = index === 0 ? -1 : index;
+        if (this.columnModel.length == 0) {
+            index = index === 0 ? -1 : index;
+        }
         const gridColumnCollection = [];
         for (let i = 0; i < column.length; i++) {
             index = index + 1;
@@ -5886,6 +5888,7 @@ let TreeGrid = TreeGrid_1 = class TreeGrid extends Component {
                 }
                 removeClass([targetEle], 'e-treegridexpand');
             }
+            row.querySelectorAll('.e-treerowcell')[0].setAttribute('aria-expanded', action === 'expand' ? 'true' : 'false');
             const detailrows = gridRows.filter((r) => r.classList.contains('e-griddetailrowindex' + record.index + 'level' + (record.level + 1)));
             if (isRemoteData(this) && !isOffline(this)) {
                 this.remoteExpand(action, row, record);
@@ -6067,10 +6070,23 @@ let TreeGrid = TreeGrid_1 = class TreeGrid extends Component {
         if (freeze) {
             freezeRightRows = this.getFrozenRightRows().filter((r) => r.querySelector('.e-gridrowindex' + record.index + 'level' + (record.level + 1)));
         }
+        let gridRowsObject = this.grid.getRowsObject();
+        if (gridRowsObject[record.index].visible !== false) {
+            gridRowsObject[record.index].visible = true;
+        }
+        const detailrows = gridRows.filter((r) => r.classList.contains('e-griddetailrowindex' + record.index + 'level' + (record.level + 1)));
         for (let i = 0; i < rows.length; i++) {
             if (!isNullOrUndefined(rows[i])) {
                 rows[i].style.display = displayAction;
             }
+            if (!isNullOrUndefined(rows[i]) && !this.allowPaging && !(this.enableVirtualization || this.enableInfiniteScrolling || isRemoteData(this) || isCountRequired(this))) {
+                gridRowsObject[rows[i].rowIndex].visible = displayAction != 'none' ? true : false;
+                if ("parentItem" in record) {
+                    if (gridRows[record.parentItem.index].getElementsByClassName('e-treegridcollapse').length) {
+                        gridRowsObject[record.index].visible = false;
+                    }
+                }
+            }
             if (!isNullOrUndefined(movableRows)) {
                 movableRows[i].style.display = displayAction;
             }
@@ -6086,6 +6102,15 @@ let TreeGrid = TreeGrid_1 = class TreeGrid extends Component {
                 }
             }
         }
+        for (let i = 0; i < detailrows.length; i++) {
+            if (!isNullOrUndefined(detailrows[i]) && !this.allowPaging && !(this.enableVirtualization || this.enableInfiniteScrolling || isRemoteData(this) || isCountRequired(this))) {
+                gridRowsObject[detailrows[i].rowIndex].visible = displayAction != 'none' ? true : false;
+                detailrows[i].style.display = displayAction;
+            }
+        }
+        if (!this.allowPaging && !(this.enableVirtualization || this.enableInfiniteScrolling || isRemoteData(this) || isCountRequired(this))) {
+            this.grid.notify('refresh-Expand-and-Collapse', { rows: this.grid.getRowsObject() });
+        }
     }
     updateAltRow(rows) {
         if (this.enableAltRow && !this.rowTemplate) {
@@ -12407,7 +12432,7 @@ class TreeInterSectionObserver extends InterSectionObserver {
         this.lastPos = null;
     }
     virtualScrollHandlers(callback, onEnterCallback, instance) {
-        const delay = Browser.info.name === 'chrome' ? 200 : 100;
+        //const delay: number = Browser.info.name === 'chrome' ? 200 : 100;
         const options = 'options';
         const movableEle = 'movableEle';
         const element = 'element';