@colijnit/corecomponents_v12 258.1.22 → 258.1.23

package/bundles/colijnit-corecomponents_v12.umd.js

@@ -9936,7 +9936,8 @@
     };
 
     var BaseSimpleGridComponent = /** @class */ (function () {
-        function BaseSimpleGridComponent() {
+        function BaseSimpleGridComponent(changeDetection) {
+            this.changeDetection = changeDetection;
             this.MIN_COLUMN_WIDTH = 50;
             this.dataChanged = new rxjs.Subject();
             this.dragDropEnabled = false;
@@ -9952,6 +9953,7 @@
             this.emitDragDrop = false;
             this.onDrop = new i0.EventEmitter();
             this.selectRow = new i0.EventEmitter();
+            this.deselectRow = new i0.EventEmitter();
             this.dblClickRow = new i0.EventEmitter();
             this.saveRow = new i0.EventEmitter();
             this.deleteRow = new i0.EventEmitter();
@@ -10045,6 +10047,11 @@
             return row.singleColumnIndex;
         };
         BaseSimpleGridComponent.prototype.prepareDataRow = function (row, index) {
+            return __awaiter(this, void 0, void 0, function () {
+                return __generator(this, function (_a) {
+                    return [2 /*return*/];
+                });
+            });
         };
         BaseSimpleGridComponent.prototype._setColumns = function (columns) {
             var _a;
@@ -10052,34 +10059,66 @@
             this.columns.sort(function (a, b) { return a.order < b.order ? -1 : 1; });
         };
         BaseSimpleGridComponent.prototype._prepareData = function () {
-            if (this._prepared) {
-                return;
-            }
-            this.disabledRows.length = 0;
-            if (this.columns && this.columns.length > 0) {
-                this.headerColumns = this.columns.filter(function (c) { return !c.singleColumn; });
-                this.headerColumnsCopy = this.headerColumns;
-                var singleColumnIndex = -1;
-                for (var i = 0; i < this.columns.length; i++) {
-                    if (this.columns[i].singleColumn) {
-                        singleColumnIndex = i;
-                        break;
-                    }
-                }
-                // first check if there's single column data
-                if (singleColumnIndex > -1 && this.data && this.data.length > 0) {
-                    var field = this.columns[singleColumnIndex].field;
-                    for (var 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.prepareDataRow(this.data[i], i);
+            return __awaiter(this, void 0, void 0, function () {
+                var singleColumnIndex, i, field, i, j;
+                return __generator(this, function (_a) {
+                    switch (_a.label) {
+                        case 0:
+                            if (this._prepared) {
+                                return [2 /*return*/];
+                            }
+                            this.disabledRows.length = 0;
+                            if (!(this.columns && this.columns.length > 0)) return [3 /*break*/, 10];
+                            this.headerColumns = this.columns.filter(function (c) { return !c.singleColumn; });
+                            this.headerColumnsCopy = this.headerColumns;
+                            singleColumnIndex = -1;
+                            for (i = 0; i < this.columns.length; i++) {
+                                if (this.columns[i].singleColumn) {
+                                    singleColumnIndex = i;
+                                    break;
+                                }
+                            }
+                            if (!(this.data && this.data.length > 0)) return [3 /*break*/, 9];
+                            if (!(singleColumnIndex > -1)) return [3 /*break*/, 5];
+                            field = this.columns[singleColumnIndex].field;
+                            i = 0;
+                            _a.label = 1;
+                        case 1:
+                            if (!(i < this.data.length)) return [3 /*break*/, 4];
+                            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;
+                            }
+                            return [4 /*yield*/, this.prepareDataRow(this.data[i], i)];
+                        case 2:
+                            _a.sent();
+                            _a.label = 3;
+                        case 3:
+                            i++;
+                            return [3 /*break*/, 1];
+                        case 4: return [3 /*break*/, 9];
+                        case 5:
+                            j = 0;
+                            _a.label = 6;
+                        case 6:
+                            if (!(j < this.data.length)) return [3 /*break*/, 9];
+                            return [4 /*yield*/, this.prepareDataRow(this.data[j], j)];
+                        case 7:
+                            _a.sent();
+                            _a.label = 8;
+                        case 8:
+                            j++;
+                            return [3 /*break*/, 6];
+                        case 9:
+                            this._prepared = true;
+                            _a.label = 10;
+                        case 10:
+                            this._resizeColumnsToFit();
+                            this.changeDetection.detectChanges();
+                            return [2 /*return*/];
                     }
-                }
-                this._prepared = true;
-            }
-            this._resizeColumnsToFit();
+                });
+            });
         };
         BaseSimpleGridComponent.prototype._resizeColumnsToFit = function () {
             var calculateColumns = this.columns.filter(function (c) { return !c.autoFit && !c.width; });
@@ -10100,6 +10139,9 @@
     BaseSimpleGridComponent.decorators = [
         { type: i0.Directive }
     ];
+    BaseSimpleGridComponent.ctorParameters = function () { return [
+        { type: i0.ChangeDetectorRef }
+    ]; };
     BaseSimpleGridComponent.propDecorators = {
         content: [{ type: i0.ContentChildren, args: [SimpleGridColumnDirective,] }],
         data: [{ type: i0.Input }],
@@ -10114,6 +10156,7 @@
         extraColumns: [{ type: i0.Input }],
         onDrop: [{ type: i0.Output }],
         selectRow: [{ type: i0.Output }],
+        deselectRow: [{ type: i0.Output }],
         dblClickRow: [{ type: i0.Output }],
         saveRow: [{ type: i0.Output }],
         deleteRow: [{ type: i0.Output }],
@@ -10125,14 +10168,15 @@
 
     var SimpleGridComponent = /** @class */ (function (_super) {
         __extends(SimpleGridComponent, _super);
-        function SimpleGridComponent(icons, _changeDetection, _formMaster) {
-            var _this = _super.call(this) || this;
+        function SimpleGridComponent(icons, changeDetection, _formMaster) {
+            var _this = _super.call(this, changeDetection) || this;
             _this.icons = icons;
-            _this._changeDetection = _changeDetection;
+            _this.changeDetection = changeDetection;
             _this._formMaster = _formMaster;
             _this.defaultTextAlign = exports.ColumnAlign.Left;
             _this.showAdd = false;
             _this.showDelete = false;
+            _this.deselectAllowed = false;
             _this.editOnCellClick = true;
             _this.rightToolbar = false;
             _this.showGridSettings = false;
@@ -10180,7 +10224,7 @@
                 this._nextAvailableCellToEdit(!event.shiftKey, this.editCellIndex)
                     .then(function (index) {
                     _this.editCellIndex = index;
-                    _this._changeDetection.markForCheck();
+                    _this.changeDetection.markForCheck();
                 });
                 this._detectChanges();
             }
@@ -10341,10 +10385,16 @@
             if (emit === void 0) { emit = true; }
             if (this.selectedRowIndex === -1 || (this.selectedRowIndex !== index && ((this.editing && this.validateAndSave()) || !this.editing))) {
                 this.selectedRowIndex = index;
+                var absoluteIndex = this.rowsPerPage ? (this.currentPage - 1) * this.rowsPerPage + index : index;
+                if (emit) {
+                    this.selectRow.next(this.data[absoluteIndex]);
+                }
             }
-            var absoluteIndex = this.rowsPerPage ? (this.currentPage - 1) * this.rowsPerPage + index : index;
-            if (emit) {
-                this.selectRow.next(this.data[absoluteIndex]);
+            else if (this.selectedRowIndex === index && this.deselectAllowed && ((this.editing && this.validateAndSave()) || !this.editing)) {
+                this.selectedRowIndex = -1;
+                if (emit) {
+                    this.deselectRow.next();
+                }
             }
             this._detectChanges();
         };
@@ -10564,7 +10614,16 @@
             return hasSelectedTrue ? items.filter(function (item) { return item.selected === true; }) : items;
         };
         SimpleGridComponent.prototype.prepareDataRow = function (row, index) {
-            this.isRowDisabled(row, index);
+            return __awaiter(this, void 0, void 0, function () {
+                return __generator(this, function (_c) {
+                    switch (_c.label) {
+                        case 0: return [4 /*yield*/, this.isRowDisabled(row, index)];
+                        case 1:
+                            _c.sent();
+                            return [2 /*return*/];
+                    }
+                });
+            });
         };
         SimpleGridComponent.prototype._resetDblClick = function () {
             var _this = this;
@@ -10716,7 +10775,7 @@
             this.currentPage = page;
         };
         SimpleGridComponent.prototype._detectChanges = function () {
-            this._changeDetection.detectChanges();
+            this.changeDetection.detectChanges();
         };
         SimpleGridComponent.prototype._resetEdit = function () {
             this._newRow = false;
@@ -10754,6 +10813,7 @@
         rowElements: [{ type: i0.ViewChildren, args: ['rowElement',] }],
         showAdd: [{ type: i0.Input }],
         showDelete: [{ type: i0.Input }],
+        deselectAllowed: [{ type: i0.Input }],
         editOnCellClick: [{ type: i0.Input }],
         rightToolbar: [{ type: i0.Input }],
         showGridSettings: [{ type: i0.Input }],