@syncfusion/ej2-treegrid 20.3.56 → 20.3.58

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');
@@ -1123,9 +1123,15 @@ class Selection {
                 this.filteredList = this.searchingRecords;
             }
         }
-        let data = (!isNullOrUndefined(this.parent.filterModule) &&
-            (this.filteredList.length > 0)) ? this.filteredList :
-            this.parent.flatData;
+        let data;
+        if (this.parent.filterModule.filteredResult.length === 0 && this.parent.getCurrentViewRecords().length === 0 &&
+            this.parent.filterSettings.columns.length > 0) {
+            data = this.filteredList;
+        }
+        else {
+            data = (!isNullOrUndefined(this.parent.filterModule) &&
+                (this.filteredList.length > 0)) ? this.filteredList : this.parent.flatData;
+        }
         data = isRemoteData(this.parent) ? this.parent.getCurrentViewRecords() : data;
         if (!isNullOrUndefined(checkAll)) {
             for (let i = 0; i < data.length; i++) {
@@ -1182,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];
@@ -1233,6 +1239,9 @@ class Selection {
         if (recordIndex > -1) {
             if (!isNullOrUndefined(checkbox)) {
                 checkbox.classList.add(checkBoxclass);
+                let 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);
             }
         }
     }
@@ -1559,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) {
@@ -3738,13 +3748,8 @@ 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'))) {
             args.cancel = true;
             return;
         }
@@ -5880,6 +5885,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);
@@ -5889,6 +5895,10 @@ let TreeGrid = TreeGrid_1 = class TreeGrid extends Component {
                     this.localExpand(action, row, record);
                 }
             }
+            if (!isNullOrUndefined(targetEle) && targetEle.closest('.e-treerowcell').classList.contains('e-cellselectionbackground')) {
+                targetEle.closest('.e-treerowcell').classList.remove('e-cellselectionbackground');
+                targetEle.closest('.e-treerowcell').removeAttribute('aria-selected');
+            }
             if (this.isPixelHeight() && !row.cells[0].classList.contains('e-lastrowcell')) {
                 let totalRows = this.getRows();
                 const rows = this.getContentTable().rows;