@coolon/angular-ui-powerups 1.17.0 → 1.18.0

package/CHANGELOG.md

@@ -2,6 +2,18 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [1.18.0](https://bitbucket.org/coolon/angular-ui-powerups/compare/v1.17.0...v1.18.0) (2020-06-23)
+
+
+### Features
+
+* added row click support to table-models with selections ([e12ef2f](https://bitbucket.org/coolon/angular-ui-powerups/commit/e12ef2fa5e58f39cee6945931a9a93ad67b24a2b))
+
+
+### Bug Fixes
+
+* aup-interaction-context-trigger not consuming click events ([86de20c](https://bitbucket.org/coolon/angular-ui-powerups/commit/86de20c50a500cdc803113e01beff38af0a730e9))
+
 ## [1.17.0](https://bitbucket.org/coolon/angular-ui-powerups/compare/v1.16.0...v1.17.0) (2020-06-22)
 
 

package/bundles/coolon-angular-ui-powerups.umd.js

@@ -1548,7 +1548,7 @@
         SelectHeaderCellRendererComponent = __decorate([
             core.Component({
                 selector: 'aup-select-header-cell-renderer',
-                template: "<mat-checkbox [pectinCommand]=\"selectCommand\" [checked]=\"isSelected()\" [indeterminate]=\"this.isIntermediate()\"></mat-checkbox>\n",
+                template: "<mat-checkbox *ngIf=\"enableHeaderControls\" [pectinCommand]=\"selectCommand\" [checked]=\"isSelected()\" [indeterminate]=\"this.isIntermediate()\"></mat-checkbox>\n",
                 styles: [""]
             }),
             __metadata("design:paramtypes", [])
@@ -1763,11 +1763,15 @@
     }(ColumnModel));
     var SelectionColumnModel = /** @class */ (function (_super) {
         __extends(SelectionColumnModel, _super);
-        function SelectionColumnModel(columnId, defaults, selectionModel) {
+        function SelectionColumnModel(columnId, defaults, selectionModel, options) {
             var _this = _super.call(this, columnId, defaults) || this;
+            _this.selectionModel = selectionModel;
+            var opts = pectin.OptionsHelper.for(options);
+            _this.selectOnRowClick = opts.get("selectOnRowClick", false);
             if (selectionModel instanceof pectin.MultipleSelectionModel) {
                 _this.cellHeaderRenderer(SelectHeaderCellRendererComponent, function (component) {
                     component.selectionModel = selectionModel;
+                    component.enableHeaderControls = opts.get("headerControl", true);
                 });
             }
             _this.configureCellRenderer(new ComponentCellRendererPortalRef(SelectCellRendererComponent, function (component, rowData) {
@@ -1779,6 +1783,11 @@
         SelectionColumnModel.prototype.getDefaultHeaderText = function () {
             return '';
         };
+        SelectionColumnModel.prototype.onRowClick = function (row) {
+            if (this.selectOnRowClick) {
+                this.selectionModel.selectCommand.execute(row);
+            }
+        };
         return SelectionColumnModel;
     }(ColumnModel));
 
@@ -1904,8 +1913,10 @@
         TableModel.prototype.pluckList = function (property) {
             return this.addColumn(new ListPropertyColumnModel(property, this));
         };
-        TableModel.prototype.addSelectionColumn = function (selectionModel) {
-            return this.addColumn(new SelectionColumnModel('selection', this, selectionModel));
+        TableModel.prototype.addSelectionColumn = function (selectionModel, options) {
+            pectin.assert.isNil(this.selectionColumnModel);
+            this.selectionColumnModel = new SelectionColumnModel('selection', this, selectionModel, options);
+            return this.addColumn(this.selectionColumnModel);
         };
         TableModel.prototype.addEditControls = function (saveCommand) {
             this.saveCommand = saveCommand;
@@ -1968,6 +1979,13 @@
                 });
             });
         };
+        TableModel.prototype.onRowClicked = function (row) {
+            var _a;
+            (_a = this.selectionColumnModel) === null || _a === void 0 ? void 0 : _a.onRowClick(row);
+        };
+        TableModel.prototype.isRowSelectionEnabled = function () {
+            return this.selectionColumnModel ? this.selectionColumnModel.selectOnRowClick : false;
+        };
         var TableModel_1;
         TableModel.ctorParameters = function () { return [
             { type: pectin.ListModel }
@@ -2026,6 +2044,12 @@
                 column.setTemplate(templateRef, viewContainer, fillCell, padChild);
             }
         };
+        TableComponent.prototype.onRowClicked = function (row) {
+            this.tableModel.onRowClicked(row);
+        };
+        TableComponent.prototype.isRowSelectionEnabled = function () {
+            return this.tableModel.isRowSelectionEnabled();
+        };
         __decorate([
             core.Input(),
             pectin.TrackExternal(),
@@ -2034,8 +2058,8 @@
         TableComponent = __decorate([
             core.Component({
                 selector: 'aup-table',
-                template: "<table mat-table [dataSource]=\"tableModel.dataSource.value\" [trackBy]=\"tableModel.getTrackByFunction()\">\n\n  <ng-container *ngFor=\"let column of columns.value; index as index; first as first; last as last\" matColumnDef=\"{{column.columnId}}\">\n    <th mat-header-cell *matHeaderCellDef>\n      <aup-table-header-cell-renderer [column]=\"column\"\n                                      [attr.column-index]=\"index\"\n                                      [class.first-column]=\"first\"\n                                      [class.last-column]=\"last\"\n      ></aup-table-header-cell-renderer>\n    </th>\n    <td mat-cell *matCellDef=\"let row\">\n      <aup-table-cell-renderer [column]=\"column\"\n                               [row]=\"row\"\n                               [tableModel]=\"tableModel\"\n                               [editSession]=\"tableModel.getEditSessionFor(row)\"\n                               [attr.column-index]=\"index\"\n                               [class.first-column]=\"first\"\n                               [class.last-column]=\"last\"\n      ></aup-table-cell-renderer>\n    </td>\n  </ng-container>\n\n  <tr mat-header-row *matHeaderRowDef=\"columnIds.value\"></tr>\n  <tr mat-row *matRowDef=\"let row; columns: columnIds.value;\"></tr>\n\n</table>\n",
-                styles: [":host{display:flex;flex-direction:column;align-items:stretch}:host table{flex:1}"]
+                template: "<table mat-table [dataSource]=\"tableModel.dataSource.value\" [trackBy]=\"tableModel.getTrackByFunction()\">\n\n  <ng-container *ngFor=\"let column of columns.value; index as index; first as first; last as last\" matColumnDef=\"{{column.columnId}}\">\n    <th mat-header-cell *matHeaderCellDef>\n      <aup-table-header-cell-renderer [column]=\"column\"\n                                      [attr.column-index]=\"index\"\n                                      [class.first-column]=\"first\"\n                                      [class.last-column]=\"last\"\n      ></aup-table-header-cell-renderer>\n    </th>\n    <td mat-cell *matCellDef=\"let row\">\n      <aup-table-cell-renderer [column]=\"column\"\n                               [row]=\"row\"\n                               [tableModel]=\"tableModel\"\n                               [editSession]=\"tableModel.getEditSessionFor(row)\"\n                               [attr.column-index]=\"index\"\n                               [class.first-column]=\"first\"\n                               [class.last-column]=\"last\"\n      ></aup-table-cell-renderer>\n    </td>\n  </ng-container>\n\n  <tr mat-header-row *matHeaderRowDef=\"columnIds.value\"></tr>\n  <tr mat-row *matRowDef=\"let row; columns: columnIds.value;\" (click)=\"onRowClicked(row)\" [class.select-row-on-click]=\"isRowSelectionEnabled()\"></tr>\n\n</table>\n",
+                styles: [":host{display:flex;flex-direction:column;align-items:stretch}:host table{flex:1}:host table tr.select-row-on-click td{cursor:pointer}"]
             }),
             __metadata("design:paramtypes", [])
         ], TableComponent);
@@ -3517,6 +3541,8 @@
             return _this;
         }
         InteractionContextTriggerFor.prototype.onEnter = function (event) {
+            event.preventDefault();
+            event.stopPropagation();
             if (!this.aupInteractionContextTriggerFor.isActive()) {
                 this.startActivity();
             }
@@ -3525,6 +3551,8 @@
             }
         };
         InteractionContextTriggerFor.prototype.onClick = function (event) {
+            event.preventDefault();
+            event.stopPropagation();
             if (!this.aupInteractionContextTriggerFor.isActive()) {
                 this.startActivity();
             }
@@ -3573,13 +3601,13 @@
             __metadata("design:type", Object)
         ], InteractionContextTriggerFor.prototype, "activityCancelled", void 0);
         __decorate([
-            core.HostListener('keyup.enter'),
+            core.HostListener('keyup.enter', ['$event']),
             __metadata("design:type", Function),
             __metadata("design:paramtypes", [KeyboardEvent]),
             __metadata("design:returntype", void 0)
         ], InteractionContextTriggerFor.prototype, "onEnter", null);
         __decorate([
-            core.HostListener('click'),
+            core.HostListener('click', ['$event']),
             __metadata("design:type", Function),
             __metadata("design:paramtypes", [MouseEvent]),
             __metadata("design:returntype", void 0)