@coolon/angular-ui-powerups 0.0.58 → 0.0.60

package/fesm2015/coolon-angular-ui-powerups.js

@@ -5,11 +5,10 @@ import { MatDialog, MatButtonModule, MatDialogModule, MatTabsModule, MatProgress
 import { MatTabsModule as MatTabsModule$1 } from '@angular/material/tabs';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { __decorate, __metadata, __awaiter } from 'tslib';
-import { GarbageCollector, DelegatingFormValueModel, UseDelegate, ValueModel, ListModel, StoreInListModel, assert, UnaryCommand, lang, Dsl, Logger, EventListenerList, DelegatingValueModel, MutableListModel, StoreInValueModel, Binding, MutableValueModel, Guard, OptionsHelper, ValueHolder } from '@coolon/pectin';
+import { GarbageCollector, DelegatingFormValueModel, UseDelegate, ValueModel, ListModel, StoreInListModel, assert, UnaryCommand, lang, Dsl, Logger, Trace, DelegatingValueModel, MutableListModel, StoreInValueModel, Binding, MutableValueModel, Guard, OptionsHelper, ValueHolder } from '@coolon/pectin';
 import { PortalModule } from '@angular/cdk/portal';
-import { Deferred } from '@coolon/pectin/lib/promise/deferred.class';
-import { MatDialogConfig, MAT_DIALOG_DEFAULT_OPTIONS, MatDialog as MatDialog$1 } from '@angular/material/dialog';
 import { assert as assert$1, Klass, Opts } from '@coolon/typescript-utilities';
+import { MatDialogConfig, MAT_DIALOG_DEFAULT_OPTIONS, MatDialog as MatDialog$1 } from '@angular/material/dialog';
 import { MatIconModule } from '@angular/material/icon';
 import { MatListModule } from '@angular/material/list';
 import { MatTooltipModule } from '@angular/material/tooltip';
@@ -697,15 +696,10 @@ if (false) {
     /** @type {?} */
     Activity.prototype.busy;
     /**
-     * @param {?} callback
-     * @return {?}
-     */
-    Activity.prototype.onDone = function (callback) { };
-    /**
-     * @param {?} callback
+     * @param {?} activityContext
      * @return {?}
      */
-    Activity.prototype.onCancel = function (callback) { };
+    Activity.prototype.initialise = function (activityContext) { };
 }
 
 /**
@@ -764,8 +758,7 @@ class ActivityOutletComponent {
         const componentFactory = this.componentFactoryResolver.resolveComponentFactory(activityContext.activityClass);
         this.viewContainerRef.clear();
         this.activityComponentRef = this.viewContainerRef.createComponent(componentFactory, 0, injector);
-        this.activityComponentRef.instance.onDone(activityContext.onDone);
-        this.activityComponentRef.instance.onCancel(activityContext.onCancel);
+        this.activityComponentRef.instance.initialise(activityContext);
     }
     /**
      * @param {?} alert
@@ -816,6 +809,12 @@ ActivityOutletComponent.propDecorators = {
     interactionContext: [{ type: Input }],
     activityContext: [{ type: Input }]
 };
+__decorate([
+    Trace(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object]),
+    __metadata("design:returntype", void 0)
+], ActivityOutletComponent.prototype, "loadActivity", null);
 if (false) {
     /** @type {?} */
     ActivityOutletComponent.prototype.interactionContext;
@@ -896,56 +895,29 @@ if (false) {
 class AbstractActivity extends DisposableComponent {
     constructor() {
         super(...arguments);
-        this._doneListeners = new EventListenerList();
-        this._cancelListeners = new EventListenerList();
-        this._finishListeners = new EventListenerList();
         this._busyModel = new DelegatingValueModel().withDefault(false);
     }
     /**
-     * @param {?} callback
-     * @return {?}
-     */
-    onDone(callback) {
-        this._doneListeners.add(callback);
-    }
-    /**
-     * @param {?} callback
+     * @param {?} activityContext
      * @return {?}
      */
-    onCancel(callback) {
-        this._cancelListeners.add(callback);
+    initialise(activityContext) {
+        assert$1.isNil(this.activityContext);
+        this.activityContext = activityContext;
     }
     /**
      * @param {?=} result
      * @return {?}
      */
     done(result) {
-        return this._doneListeners
-            .fireAndWait((/**
-         * @param {?} l
-         * @return {?}
-         */
-        l => l(result)))
-            .finally((/**
-         * @return {?}
-         */
-        () => this.finalizeAndDispose()));
+        return this.activityContext.onDone(result);
     }
     /**
      * @param {?=} error
      * @return {?}
      */
     cancel(error) {
-        return this._cancelListeners
-            .fireAndWait((/**
-         * @param {?} l
-         * @return {?}
-         */
-        l => l(error)))
-            .finally((/**
-         * @return {?}
-         */
-        () => this.finalizeAndDispose()));
+        this.activityContext.onCancel(error);
     }
     // @Trace()
     /**
@@ -953,29 +925,6 @@ class AbstractActivity extends DisposableComponent {
      */
     onActivityReady() {
     }
-    /**
-     * @private
-     * @return {?}
-     */
-    finalizeAndDispose() {
-        // this._activeModel.value = false;
-        this._finishListeners.fire((/**
-         * @param {?} l
-         * @return {?}
-         */
-        l => l()));
-        // this._interactionContext = null;
-        // this._initialized = false;
-        [
-            this._finishListeners,
-            this._doneListeners,
-            this._cancelListeners
-        ].forEach((/**
-         * @param {?} l
-         * @return {?}
-         */
-        l => l.dispose()));
-    }
     /**
      * @return {?}
      */
@@ -996,27 +945,23 @@ class AbstractActivity extends DisposableComponent {
         return this._busyModel.value;
     }
 }
+__decorate([
+    Trace(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object]),
+    __metadata("design:returntype", void 0)
+], AbstractActivity.prototype, "initialise", null);
 if (false) {
     /**
      * @type {?}
      * @private
      */
-    AbstractActivity.prototype._doneListeners;
-    /**
-     * @type {?}
-     * @private
-     */
-    AbstractActivity.prototype._cancelListeners;
-    /**
-     * @type {?}
-     * @private
-     */
-    AbstractActivity.prototype._finishListeners;
+    AbstractActivity.prototype._busyModel;
     /**
      * @type {?}
      * @private
      */
-    AbstractActivity.prototype._busyModel;
+    AbstractActivity.prototype.activityContext;
 }
 
 /**
@@ -1081,7 +1026,7 @@ class ConfirmationDialogComponent extends AbstractActivity {
 ConfirmationDialogComponent.decorators = [
     { type: Component, args: [{
                 selector: 'angular-ui-powerups-confirmation-dialog',
-                template: "<h3 matDialogTitle *ngIf=\"confirm.title\">{{confirm.title()}}</h3>\n<div matDialogContent>\n  <p *ngFor=\"let line of confirm.content()\">{{line}}</p>\n</div>\n<p matDialogActions>\n  <button mat-button (click)=\"cancel()\">{{confirm.cancel()}}</button>\n  <button mat-raised-button [color]=\"isDestructive() ? 'warn' : 'primary'\"\n          (click)=\"done(true)\">{{confirm.ok()}}</button>\n</p>\n\n",
+                template: "<h3 matDialogTitle *ngIf=\"confirm.title\">{{confirm.title()}}</h3>\n<div matDialogContent>\n  <p *ngFor=\"let line of confirm.content()\">{{line}}</p>\n</div>\n<p matDialogActions>\n  <button mat-button (click)=\"cancel()\">{{confirm.cancel()}}</button>\n  <button mat-raised-button [color]=\"isDestructive() ? 'warn' : 'primary'\"\n          (click)=\"done()\">{{confirm.ok()}}</button>\n</p>\n\n",
                 styles: [":host{display:block;padding:var(--angular-ui-powerups-default-padding)}.mat-dialog-actions{justify-content:flex-end}"]
             }] }
 ];
@@ -1103,8 +1048,7 @@ class ActivityContainerComponent extends DisposableComponent {
         super();
         this.activityOutletTabs = new MutableListModel();
         this.obsoleteTabs = [];
-        const { chain, valueOf, before, when, after, observe, switchOn } = Dsl.disposeWith(this);
-        this.lastActivityTab = chain(this.activityOutletTabs).last().otherwise(this.initialActivityOutlet);
+        this.finished = false;
     }
     /**
      * @return {?}
@@ -1123,11 +1067,33 @@ class ActivityContainerComponent extends DisposableComponent {
     }
     /**
      * @template D, R, E
-     * @param {?} options
+     * @param {?} initialContext
      * @return {?}
      */
-    initialise(options) {
-        this.initialActivityOutlet = Object.assign({}, options, { interactionContext: this });
+    initialise(initialContext) {
+        /** @type {?} */
+        const self = this;
+        this.initialActivityOutletContext = {
+            activityClass: initialContext.activityClass,
+            activityData: initialContext.activityData,
+            onDone: (/**
+             * @param {?} result
+             * @return {?}
+             */
+            function (result) {
+                self.finished = true;
+                return initialContext.onDone(result);
+            }),
+            onCancel: (/**
+             * @param {?} error
+             * @return {?}
+             */
+            function (error) {
+                self.finished = true;
+                return initialContext.onCancel(error);
+            }),
+            interactionContext: this
+        };
     }
     /**
      * @template D, R, E
@@ -1137,23 +1103,49 @@ class ActivityContainerComponent extends DisposableComponent {
      */
     startActivity(activityType, data) {
         /** @type {?} */
-        const deferred = Deferred.defer();
-        /** @type {?} */
-        const context = {
-            interactionContext: this,
-            activityClass: activityType,
-            activityData: data,
-            onDone: deferred.resolve,
-            onCancel: deferred.reject
-        };
-        this.activityOutletTabs.push(context);
-        this.tabs.selectedIndex = this.activityOutletTabs.length;
-        return deferred.promise.finally((/**
+        const self = this;
+        return new Promise((/**
+         * @param {?} resolve
+         * @param {?} reject
          * @return {?}
          */
-        () => {
-            this.obsoleteTabs.push(context);
-            this.tabs.selectedIndex = this.activityOutletTabs.length - 1;
+        (resolve, reject) => {
+            /** @type {?} */
+            const context = {
+                interactionContext: self,
+                activityClass: activityType,
+                activityData: data,
+                onDone: (/**
+                 * @param {?} result
+                 * @return {?}
+                 */
+                function (result) {
+                    self.obsoleteTabs.push(context);
+                    // animating on the next tick gives chained done's a chance to
+                    // finished before we start an animations
+                    resolve(result);
+                    setTimeout((/**
+                     * @return {?}
+                     */
+                    () => self.animateTabs()));
+                }),
+                onCancel: (/**
+                 * @param {?} error
+                 * @return {?}
+                 */
+                function (error) {
+                    self.obsoleteTabs.push(context);
+                    // finished before we start an animations
+                    reject(error);
+                    // animating on the next tick gives chained done's a chance to complete before we animate
+                    setTimeout((/**
+                     * @return {?}
+                     */
+                    () => self.animateTabs()));
+                })
+            };
+            self.activityOutletTabs.push(context);
+            self.tabs.selectedIndex = this.activityOutletTabs.length;
         }));
     }
     /**
@@ -1182,13 +1174,23 @@ class ActivityContainerComponent extends DisposableComponent {
         tab => {
             return !this.obsoleteTabs.includes(tab);
         }));
+        this.obsoleteTabs = [];
         this.outlets.toArray()[this.tabs.selectedIndex].notifyReady();
     }
+    /**
+     * @private
+     * @return {?}
+     */
+    animateTabs() {
+        if (!this.finished) {
+            this.tabs.selectedIndex = this.activityOutletTabs.length - this.obsoleteTabs.length;
+        }
+    }
 }
 ActivityContainerComponent.decorators = [
     { type: Component, args: [{
                 selector: 'angular-ui-powerups-activity-container',
-                template: "<mat-tab-group #tabs no-tab-header [dynamicHeight]=\"true\">\n  <mat-tab>\n    <angular-ui-powerups-activity-outlet [interactionContext]=\"this\"\n                                         [activityContext]=\"initialActivityOutlet\"></angular-ui-powerups-activity-outlet>\n  </mat-tab>\n  <mat-tab *ngFor=\"let tab of activityOutletTabs.value\">\n    <angular-ui-powerups-activity-outlet [interactionContext]=\"this\"\n                                         [activityContext]=\"tab\"></angular-ui-powerups-activity-outlet>\n  </mat-tab>\n</mat-tab-group>\n",
+                template: "<mat-tab-group #tabs no-tab-header [dynamicHeight]=\"true\">\n  <mat-tab>\n    <angular-ui-powerups-activity-outlet [interactionContext]=\"this\"\n                                         [activityContext]=\"initialActivityOutletContext\"></angular-ui-powerups-activity-outlet>\n  </mat-tab>\n  <mat-tab *ngFor=\"let tab of activityOutletTabs.value\">\n    <angular-ui-powerups-activity-outlet [interactionContext]=\"this\"\n                                         [activityContext]=\"tab\"></angular-ui-powerups-activity-outlet>\n  </mat-tab>\n</mat-tab-group>\n",
                 styles: [":host{display:block}"]
             }] }
 ];
@@ -1196,7 +1198,7 @@ ActivityContainerComponent.decorators = [
 ActivityContainerComponent.ctorParameters = () => [];
 ActivityContainerComponent.propDecorators = {
     parentInteractionContext: [{ type: Input }],
-    initialActivityOutlet: [{ type: Input }],
+    initialActivityOutletContext: [{ type: Input }],
     tabs: [{ type: ViewChild, args: ['tabs', { static: true },] }],
     outlets: [{ type: ViewChildren, args: [ActivityOutletComponent,] }]
 };
@@ -1204,7 +1206,7 @@ if (false) {
     /** @type {?} */
     ActivityContainerComponent.prototype.parentInteractionContext;
     /** @type {?} */
-    ActivityContainerComponent.prototype.initialActivityOutlet;
+    ActivityContainerComponent.prototype.initialActivityOutletContext;
     /** @type {?} */
     ActivityContainerComponent.prototype.tabs;
     /** @type {?} */
@@ -1220,7 +1222,7 @@ if (false) {
      * @type {?}
      * @private
      */
-    ActivityContainerComponent.prototype.lastActivityTab;
+    ActivityContainerComponent.prototype.finished;
 }
 (function (ActivityContainerComponent) {
     /**
@@ -1250,13 +1252,13 @@ const DIALOG_INTERACTION_SERVICE_DEFAULTS = new InjectionToken('DIALOG_INTERACTI
 class DialogInteractionService extends InteractionContext {
     /**
      * @param {?} dialogService
-     * @param {?} dialogDefaults
+     * @param {?} dialogServiceDefaults
      * @param {?} matDialogDefaultConfig
      */
-    constructor(dialogService, dialogDefaults, matDialogDefaultConfig) {
+    constructor(dialogService, dialogServiceDefaults, matDialogDefaultConfig) {
         super();
         this.dialogService = dialogService;
-        this.dialogDefaults = dialogDefaults;
+        this.dialogServiceDefaults = dialogServiceDefaults;
         this.matDialogDefaultConfig = matDialogDefaultConfig;
         assert$1.notNil(dialogService);
     }
@@ -1279,7 +1281,7 @@ class DialogInteractionService extends InteractionContext {
      */
     _startActivity(activityType, data, disableClose = true) {
         /** @type {?} */
-        const config = Object.assign({ autoFocus: false }, this.matDialogDefaultConfig, this.dialogDefaults, {
+        const config = Object.assign({ autoFocus: false, hasBackdrop: true }, this.matDialogDefaultConfig, this.dialogServiceDefaults, {
             data,
             disableClose,
             panelClass: 'dialog-interaction-service'
@@ -1354,7 +1356,7 @@ if (false) {
      */
     DialogInteractionService.prototype.dialogService;
     /** @type {?} */
-    DialogInteractionService.prototype.dialogDefaults;
+    DialogInteractionService.prototype.dialogServiceDefaults;
     /** @type {?} */
     DialogInteractionService.prototype.matDialogDefaultConfig;
 }