@colijnit/corecomponents_v12 257.1.37 → 257.1.38

package/fesm2015/colijnit-corecomponents_v12.js

@@ -9339,7 +9339,8 @@ SimpleGridColumnDirective.propDecorators = {
 };
 
 class BaseSimpleGridComponent {
-    constructor() {
+    constructor(changeDetection) {
+        this.changeDetection = changeDetection;
         this.MIN_COLUMN_WIDTH = 50;
         this.dataChanged = new Subject();
         this.dragDropEnabled = false;
@@ -9355,6 +9356,7 @@ class BaseSimpleGridComponent {
         this.emitDragDrop = false;
         this.onDrop = new EventEmitter();
         this.selectRow = new EventEmitter();
+        this.deselectRow = new EventEmitter();
         this.dblClickRow = new EventEmitter();
         this.saveRow = new EventEmitter();
         this.deleteRow = new EventEmitter();
@@ -9432,40 +9434,52 @@ class BaseSimpleGridComponent {
         return row.singleColumnIndex;
     }
     prepareDataRow(row, index) {
+        return __awaiter(this, void 0, void 0, function* () {
+        });
     }
     _setColumns(columns) {
         this.columns.push(...columns);
         this.columns.sort((a, b) => a.order < b.order ? -1 : 1);
     }
     _prepareData() {
-        if (this._prepared) {
-            return;
-        }
-        this.disabledRows.length = 0;
-        if (this.columns && this.columns.length > 0) {
-            this.headerColumns = this.columns.filter(c => !c.singleColumn);
-            this.headerColumnsCopy = this.headerColumns;
-            let singleColumnIndex = -1;
-            for (let i = 0; i < this.columns.length; i++) {
-                if (this.columns[i].singleColumn) {
-                    singleColumnIndex = i;
-                    break;
-                }
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this._prepared) {
+                return;
             }
-            // first check if there's single column data
-            if (singleColumnIndex > -1 && this.data && this.data.length > 0) {
-                const field = this.columns[singleColumnIndex].field;
-                for (let i = 0; i < this.data.length; i++) { // then mark row as single column row
-                    if (this.data[i][field] !== undefined && this.data[i][field] !== null && this.data[i][field] !== "") {
-                        // bit nasty to add prop, but cool for now
-                        this.data[i].singleColumnIndex = singleColumnIndex;
+            this.disabledRows.length = 0;
+            if (this.columns && this.columns.length > 0) {
+                this.headerColumns = this.columns.filter(c => !c.singleColumn);
+                this.headerColumnsCopy = this.headerColumns;
+                let singleColumnIndex = -1;
+                for (let i = 0; i < this.columns.length; i++) {
+                    if (this.columns[i].singleColumn) {
+                        singleColumnIndex = i;
+                        break;
+                    }
+                }
+                // first check if there's single column data
+                if (this.data && this.data.length > 0) {
+                    if (singleColumnIndex > -1) {
+                        const field = this.columns[singleColumnIndex].field;
+                        for (let i = 0; i < this.data.length; i++) { // then mark row as single column row
+                            if (this.data[i][field] !== undefined && this.data[i][field] !== null && this.data[i][field] !== "") {
+                                // bit nasty to add prop, but cool for now
+                                this.data[i].singleColumnIndex = singleColumnIndex;
+                            }
+                            yield this.prepareDataRow(this.data[i], i);
+                        }
+                    }
+                    else {
+                        for (let j = 0; j < this.data.length; j++) {
+                            yield this.prepareDataRow(this.data[j], j);
+                        }
                     }
-                    this.prepareDataRow(this.data[i], i);
                 }
+                this._prepared = true;
             }
-            this._prepared = true;
-        }
-        this._resizeColumnsToFit();
+            this._resizeColumnsToFit();
+            this.changeDetection.detectChanges();
+        });
     }
     _resizeColumnsToFit() {
         const calculateColumns = this.columns.filter(c => !c.autoFit && !c.width);
@@ -9485,6 +9499,9 @@ class BaseSimpleGridComponent {
 BaseSimpleGridComponent.decorators = [
     { type: Directive }
 ];
+BaseSimpleGridComponent.ctorParameters = () => [
+    { type: ChangeDetectorRef }
+];
 BaseSimpleGridComponent.propDecorators = {
     content: [{ type: ContentChildren, args: [SimpleGridColumnDirective,] }],
     data: [{ type: Input }],
@@ -9499,6 +9516,7 @@ BaseSimpleGridComponent.propDecorators = {
     extraColumns: [{ type: Input }],
     onDrop: [{ type: Output }],
     selectRow: [{ type: Output }],
+    deselectRow: [{ type: Output }],
     dblClickRow: [{ type: Output }],
     saveRow: [{ type: Output }],
     deleteRow: [{ type: Output }],
@@ -9631,15 +9649,16 @@ ExcelExportService.decorators = [
 ];
 
 class SimpleGridComponent extends BaseSimpleGridComponent {
-    constructor(icons, _changeDetection, _formMaster, excelExportService) {
-        super();
+    constructor(icons, changeDetection, _formMaster, excelExportService) {
+        super(changeDetection);
         this.icons = icons;
-        this._changeDetection = _changeDetection;
+        this.changeDetection = changeDetection;
         this._formMaster = _formMaster;
         this.excelExportService = excelExportService;
         this.defaultTextAlign = ColumnAlign.Left;
         this.showAdd = false;
         this.showDelete = false;
+        this.deselectAllowed = false;
         this.editOnCellClick = true;
         this.rightToolbar = false;
         this.showGridSettings = false;
@@ -9677,7 +9696,7 @@ class SimpleGridComponent extends BaseSimpleGridComponent {
             this._nextAvailableCellToEdit(!event.shiftKey, this.editCellIndex)
                 .then((index) => {
                 this.editCellIndex = index;
-                this._changeDetection.markForCheck();
+                this.changeDetection.markForCheck();
             });
             this._detectChanges();
         }
@@ -9776,9 +9795,16 @@ class SimpleGridComponent extends BaseSimpleGridComponent {
     selectTheRow(index, emit = true) {
         if (this.selectedRowIndex === -1 || (this.selectedRowIndex !== index && ((this.editing && this.validateAndSave()) || !this.editing))) {
             this.selectedRowIndex = index;
+            const absoluteIndex = this.rowsPerPage ? (this.currentPage - 1) * this.rowsPerPage + index : index;
+            if (emit) {
+                this.selectRow.next(this.data[absoluteIndex]);
+            }
         }
-        if (emit) {
-            this.selectRow.next(this.data[this.selectedRowIndex]);
+        else if (this.selectedRowIndex === index && this.deselectAllowed && ((this.editing && this.validateAndSave()) || !this.editing)) {
+            this.selectedRowIndex = -1;
+            if (emit) {
+                this.deselectRow.next();
+            }
         }
         this._detectChanges();
     }
@@ -9959,7 +9985,9 @@ class SimpleGridComponent extends BaseSimpleGridComponent {
         return hasSelectedTrue ? items.filter(item => item.selected === true) : items;
     }
     prepareDataRow(row, index) {
-        this.isRowDisabled(row, index);
+        return __awaiter(this, void 0, void 0, function* () {
+            yield this.isRowDisabled(row, index);
+        });
     }
     _resetDblClick() {
         setTimeout(() => {
@@ -10088,7 +10116,7 @@ class SimpleGridComponent extends BaseSimpleGridComponent {
         this.currentPage = page;
     }
     _detectChanges() {
-        this._changeDetection.detectChanges();
+        this.changeDetection.detectChanges();
     }
     _resetEdit() {
         this._newRow = false;
@@ -10267,6 +10295,7 @@ SimpleGridComponent.propDecorators = {
     headerCells: [{ type: ViewChildren, args: ['headerCell',] }],
     showAdd: [{ type: Input }],
     showDelete: [{ type: Input }],
+    deselectAllowed: [{ type: Input }],
     editOnCellClick: [{ type: Input }],
     rightToolbar: [{ type: Input }],
     showGridSettings: [{ type: Input }],