@coolon/angular-ui-powerups 2.0.0-alpha.36 → 2.0.0-alpha.38

package/CHANGELOG.md

@@ -2,6 +2,20 @@
 
 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.
 
+## [2.0.0-alpha.38](https://bitbucket.org/coolon/angular-ui-powerups/compare/v2.0.0-alpha.37...v2.0.0-alpha.38) (2020-08-31)
+
+
+### Bug Fixes
+
+* command face adapter not handling nil faces for some properties ([7c764b1](https://bitbucket.org/coolon/angular-ui-powerups/commit/7c764b10f3632cbc010411bd2fd6ba9d8e420c20))
+
+## [2.0.0-alpha.37](https://bitbucket.org/coolon/angular-ui-powerups/compare/v2.0.0-alpha.36...v2.0.0-alpha.37) (2020-08-31)
+
+
+### Features
+
+* added busyFace support to aup-command ([a0cf247](https://bitbucket.org/coolon/angular-ui-powerups/commit/a0cf247c5b543e78b6204a61fcba1059e0c68197))
+
 ## [2.0.0-alpha.36](https://bitbucket.org/coolon/angular-ui-powerups/compare/v2.0.0-alpha.35...v2.0.0-alpha.36) (2020-08-31)
 
 

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

@@ -614,6 +614,10 @@
             return ___default__default.isFunction(face === null || face === void 0 ? void 0 : face.icon) ? face.icon() : undefined;
         }
         CommandFace.getIconOf = getIconOf;
+        function getIconPositionOf(face) {
+            return ___default__default.isFunction(face === null || face === void 0 ? void 0 : face.iconPosition) ? face.iconPosition() : undefined;
+        }
+        CommandFace.getIconPositionOf = getIconPositionOf;
         function getTooltipOf(face) {
             return ___default__default.isFunction(face === null || face === void 0 ? void 0 : face.tooltip) ? face.tooltip() : undefined;
         }
@@ -628,7 +632,7 @@
             }
             Object.defineProperty(Adapter.prototype, "text", {
                 get: function () {
-                    return ___default__default.isFunction(this.face.text) ? this.face.text() : undefined;
+                    return CommandFace.getTextOf(this.face);
                 },
                 enumerable: true,
                 configurable: true
@@ -642,14 +646,14 @@
             });
             Object.defineProperty(Adapter.prototype, "iconPosition", {
                 get: function () {
-                    return ___default__default.isFunction(this.face.iconPosition) ? this.face.iconPosition() : undefined;
+                    return CommandFace.getIconPositionOf(this.face);
                 },
                 enumerable: true,
                 configurable: true
             });
             Object.defineProperty(Adapter.prototype, "tooltip", {
                 get: function () {
-                    return ___default__default.isFunction(this.face.tooltip) ? this.face.tooltip() : undefined;
+                    return CommandFace.getTooltipOf(this.face);
                 },
                 enumerable: true,
                 configurable: true
@@ -1022,16 +1026,7 @@
             _this.parent = parent;
             _this._rootTemplate = new pectin.MutableValueModel();
             _this._registrations = new pectin.MutableListModel();
-            _this._childFaceModels = new pectin.MutableListModel();
-            _this._faceChangeCount = new pectin.MutableValueModel(0);
             var _a = pectin.Dsl.disposeWith(_this), chain = _a.chain, valueOf = _a.valueOf, before = _a.before, when = _a.when, after = _a.after, observe = _a.observe, switchOn = _a.switchOn;
-            var childFaces = chain(_this._childFaceModels)
-                .map(function (m) { return m.value; }, { dependsOn: _this._faceChangeCount })
-                .rejectNil();
-            var iconCount = childFaces
-                .select(function (face) { return !!exports.CommandFace.getIconOf(face); })
-                .count();
-            _this.hasMixedIcons = valueOf.all(iconCount.isGreaterThan(0), iconCount.doesNotEqual(childFaces.length)).areTruthy();
             _this.childTemplates = chain(_this._rootTemplate).pluckList('children');
             _this.initialised = chain(_this._rootTemplate).isNotNil();
             return _this;
@@ -1093,12 +1088,10 @@
             var _this = this;
             this._registrations.push(registration);
             if (registration instanceof exports.Registration.FaceRegistration) {
-                this._childFaceModels.push(registration.faceModel);
                 var when = pectin.Dsl.disposeWith(registration).when;
                 when(registration.faceModel).changes(function (is, was) {
-                    _this.notifyChildFaceChanged(new exports.CommandFace.Adapter(is), new exports.CommandFace.Adapter(was));
+                    _this.notifyChildFaceChanged(is, was);
                 }, { asLongAs: this.initialised });
-                registration.onDispose(function () { return _this._childFaceModels.remove(registration.faceModel); });
             }
             registration.onDispose(function () { return _this._registrations.remove(registration); });
             return registration;
@@ -1314,10 +1307,15 @@
             var _this = _super.call(this) || this;
             _this.parent = parent;
             _this.CommandFace = exports.CommandFace;
-            var _a = pectin.Dsl.disposeWith(_this), chain = _a.chain, valueOf = _a.valueOf, before = _a.before, when = _a.when, after = _a.after, observe = _a.observe, switchOn = _a.switchOn;
-            _this.buttonStyle = chain(_this.faceModel).map(function (f) { return exports.CommandFace.getStyleOf(f); });
+            var _a = pectin.Dsl.disposeWith(_this), chain = _a.chain, switchOn = _a.switchOn;
+            _this.activeFaceModel = switchOn(_this.command.busy).toValue(function (when) {
+                when.equalTo(true, _this.busyFaceModel);
+                when.otherwise(_this.faceModel);
+            }).otherwise(_this.faceModel);
+            _this.buttonStyle = chain(_this.activeFaceModel).map(function (f) { return exports.CommandFace.getStyleOf(f); });
+            _this.colorModel = chain(_this.activeFaceModel).map(function (f) { return exports.CommandFace.getColorOf(f); });
             if (parent) {
-                _this.registerDisposable(_this.parent.registerCommand(_this.command, _this.faceModel));
+                _this.registerDisposable(_this.parent.registerCommand(_this.command, _this.activeFaceModel));
             }
             return _this;
         }
@@ -1338,10 +1336,18 @@
             core.Input(), pectin.StoreInValueModel('faceModel'),
             __metadata("design:type", Object)
         ], CommandComponent.prototype, "face", void 0);
+        __decorate([
+            core.Input(), pectin.TrackExternal(),
+            __metadata("design:type", pectin.ValueModel)
+        ], CommandComponent.prototype, "busyFaceModel", void 0);
+        __decorate([
+            core.Input(), pectin.StoreInValueModel('busyFaceModel'),
+            __metadata("design:type", Object)
+        ], CommandComponent.prototype, "busyFace", void 0);
         CommandComponent = __decorate([
             core.Component({
                 selector: 'aup-command',
-                template: "<ng-container *ngIf=\"!parent\">\n  <ng-container [ngSwitch]=\"buttonStyle.value\">\n    <button *ngSwitchCase=\"CommandFace.Style.STROKED\" mat-stroked-button [pectinCommand]=\"command\" [color]=\"CommandFace.getColorOf(face)\">\n      <aup-command-face [face]=\"face\"></aup-command-face>\n    </button>\n    <button *ngSwitchCase=\"CommandFace.Style.RAISED\" mat-raised-button [pectinCommand]=\"command\" [color]=\"CommandFace.getColorOf(face)\">\n      <aup-command-face [face]=\"face\"></aup-command-face>\n    </button>\n    <button *ngSwitchDefault mat-button [pectinCommand]=\"command\" [color]=\"CommandFace.getColorOf(face)\">\n      <aup-command-face [face]=\"face\"></aup-command-face>\n    </button>\n  </ng-container>\n</ng-container>\n"
+                template: "<ng-container *ngIf=\"!parent\">\n  <ng-container [ngSwitch]=\"buttonStyle.value\">\n    <button *ngSwitchCase=\"CommandFace.Style.STROKED\" mat-stroked-button [pectinCommand]=\"command\" [color]=\"colorModel.value\">\n      <aup-command-face [face]=\"activeFaceModel.value\"></aup-command-face>\n    </button>\n    <button *ngSwitchCase=\"CommandFace.Style.RAISED\" mat-raised-button [pectinCommand]=\"command\" [color]=\"colorModel.value\">\n      <aup-command-face [face]=\"activeFaceModel.value\"></aup-command-face>\n    </button>\n    <button *ngSwitchDefault mat-button [pectinCommand]=\"command\" [color]=\"colorModel.value\">\n      <aup-command-face [face]=\"activeFaceModel.value\"></aup-command-face>\n    </button>\n  </ng-container>\n</ng-container>\n"
             }),
             __param(0, core.Optional()),
             __metadata("design:paramtypes", [exports.ɵbo])