@coolon/angular-ui-powerups 0.0.98 → 0.0.102

package/lib/interaction/components/activity-container/activity-container.component.d.ts

@@ -25,6 +25,7 @@ declare class TabContext<D, R, E> implements ActivityOutletContext<D, R, E> {
     readonly component: Activity<D, R, E>;
     onDone(result: R): void;
     onCancel(error: E): void;
+    dispose(): void;
 }
 export declare class ActivityContainerComponent<D, R, E> extends InteractionContextBase implements OnInit, AfterViewInit {
     private readonly throttledNestedActivityFinishEvents;

package/lib/interaction/components/inplace-interaction-context/inplace-interaction-context.component.d.ts

@@ -2,13 +2,15 @@ import { AfterViewInit } from '@angular/core';
 import { Constructable } from '@coolon/pectin';
 import { Activity } from '../../activity';
 import { InteractionContextBase } from '../../interaction-context-base';
+import { InteractionService } from '../../services/interaction.service';
 import { ActivityContainerComponent } from '../activity-container/activity-container.component';
 import { ActivityOutletContext } from '../activity-outlet/activity-outlet-context';
 export declare class InplaceInteractionContextComponent<D, R, E> extends InteractionContextBase implements AfterViewInit {
+    readonly interactionService: InteractionService;
     interactionContext: ActivityContainerComponent<any, any, any>;
     initialActivityContext: ActivityOutletContext<D, R, E>;
     private _active;
-    constructor();
+    constructor(interactionService: InteractionService);
     ngAfterViewInit(): void;
     readonly active: import("@coolon/pectin").ValueModel<boolean>;
     protected _startActivity<D1, R1, E1>(activityType: Constructable<Activity<D1, R1, E1>>, data?: D1): Promise<R1>;

package/lib/interaction/index.d.ts

@@ -17,6 +17,7 @@ export * from "./components/confirm-then-dialog/confirm-then-dialog.component";
 export * from "./components/confirmation-dialog/confirmation-dialog.component";
 export * from "./components/inplace-interaction-context/inplace-interaction-context.component";
 export * from "./components/interaction-outlet/interaction-outlet.component";
-export * from "./services/dialog-interaction-context";
-export * from "./services/dialog-interaction.service";
-export * from "./services/modal-interaction.service";
+export * from "./services/interaction.service";
+export * from "./services/modal-interaction-context.factory";
+export * from "./services/mat-dialog-interaction/dialog-interaction-context-factory";
+export * from "./services/mat-dialog-interaction/dialog-interaction-context";

package/lib/interaction/interaction-context-base.d.ts

@@ -1,4 +1,4 @@
-import { Constructable, ListModel } from '@coolon/pectin';
+import { Constructable, ListModel, ValueModel } from '@coolon/pectin';
 import { Activity } from './activity';
 import { Alert } from './alert';
 import { Confirm } from './confirm';
@@ -10,9 +10,11 @@ export declare abstract class InteractionContextBase extends InteractionContext
      */
     private readonly _activityListDelegate;
     private deferredGetCurrentActivity;
+    private _currentActivity;
     protected constructor();
     protected setActivityList(activityList: ListModel<Activity<any, any>>): void;
     readonly activityList: ListModel<Activity<any, any, any>>;
+    readonly activeActivity: ValueModel<Activity<any, any, any>>;
     /**
      * Returns the activity that is currently active.
      * This model is only updated in the next tick after the view has been updated.

package/lib/interaction/interaction-context.d.ts

@@ -1,23 +1,26 @@
-import { Constructable, Disposable, GarbageCollector, ListModel, ValueModel } from '@coolon/pectin';
+import { Constructable, GarbageCollector, ListModel, ValueModel } from '@coolon/pectin';
 import { Activity } from './activity';
 import { Alert } from './alert';
 import { Confirm } from './confirm';
 export declare abstract class InteractionContext extends GarbageCollector {
-    private readonly activityListeners;
-    abstract readonly activityList: ListModel<Activity<any, any, any>>;
     abstract readonly active: ValueModel<boolean>;
+    abstract readonly activityList: ListModel<Activity<any, any, any>>;
+    abstract readonly activeActivity: ValueModel<Activity<any, any, any>>;
     /**
      * Returns true if an activity is currently running.
      */
     isActive(): boolean;
-    addActivityListener(listener: InteractionContext.Listener): Disposable;
-    protected notifyActivityStarted(): void;
-    protected notifyActivityFinished(): void;
+    dispose(): void;
+    /**
+     * Cancels the current activity and returns true the context is no longer active, false if
+     * there is still another activity running.
+     */
+    cancelCurrentActivity(): Promise<boolean>;
     /**
      * Returns the activity that is currently active.
      * This model is only updated in the next tick after the view has been updated.
      */
-    abstract getCurrentActivity(): Promise<Activity<any, any>>;
+    protected abstract getCurrentActivity(): Promise<Activity<any, any>>;
     abstract startActivity<D, R, E>(activityType: Constructable<Activity<D, R, E>>, data?: D): Promise<R>;
     abstract alert(alert: Alert): Promise<void>;
     abstract confirm(confirm: Confirm): Promise<boolean>;
@@ -29,10 +32,5 @@ export declare abstract class InteractionContext extends GarbageCollector {
      * @param data the activity data.
      */
     abstract confirmThen<D, R, E>(confirm: Confirm, activityType: Constructable<Activity<D, R, E>>, data?: D): Promise<R>;
-}
-export declare namespace InteractionContext {
-    interface Listener {
-        onActivityStarted(): void;
-        onActivityFinished(): void;
-    }
+    abort(): Promise<void>;
 }

package/lib/interaction/services/interaction.service.d.ts

@@ -0,0 +1,46 @@
+import { BooleanValueModelChain, Disposable, GarbageCollector, ListModelChain, MutableValueModel, ValueModel } from '@coolon/pectin';
+import { InteractionContext } from '../interaction-context';
+import { ModalInteractionContextFactory } from './modal-interaction-context.factory';
+export declare class InteractionService {
+    readonly modelInteractionContextFactory: ModalInteractionContextFactory;
+    private readonly garbage;
+    readonly active: BooleanValueModelChain;
+    private readonly exclusiveContext;
+    private readonly _activeModalInteractionContextModel;
+    private readonly _activeInlineInteractionContextModel;
+    private readonly _activeInteractionContext;
+    readonly activeInteractionContextIds: ListModelChain<string>;
+    readonly modelInteractionActive: BooleanValueModelChain;
+    readonly inlineInteractionActive: BooleanValueModelChain;
+    constructor(modelInteractionContextFactory: ModalInteractionContextFactory);
+    isActive(): boolean;
+    isModalActive(): boolean;
+    createModalInteractionContextFor(disposable: Disposable.Collector): InteractionContext;
+    _registerInplaceInteractionContext(interactionContext: InteractionContext): void;
+    getActiveContext(): InteractionContext;
+    /**
+     * Creates an interaction context that will prevent any other contexts from starting an
+     * activity until it is disposed.  This is intended for use by the router for passing
+     * to PlaceComponent.canDeactivate(interactionContext).  This ensures components don't
+     * try and interact in a way that we can't track and synchronise with the browser back
+     * button.
+     */
+    _createExclusiveModalInteractionContext(): InteractionContext;
+}
+export declare namespace InteractionService {
+    interface Callback {
+        onStarted(monitor: Monitor): any;
+        onFinished(monitor: Monitor): any;
+    }
+    class Monitor extends GarbageCollector {
+        readonly id: string;
+        readonly interactionContext: InteractionContext;
+        readonly currentActiveMonitor: MutableValueModel<Monitor>;
+        readonly exclusiveContext: ValueModel<InteractionContext>;
+        constructor(id: string, interactionContext: InteractionContext, currentActiveMonitor: MutableValueModel<Monitor>, exclusiveContext: ValueModel<InteractionContext>);
+        protected onStarted(): void;
+        private assertCanStart;
+        protected onFinished(): void;
+        private assertCurrentlyActive;
+    }
+}

package/lib/interaction/services/mat-dialog-interaction/dialog-interaction-context-factory.d.ts

@@ -0,0 +1,15 @@
+import { InjectionToken } from '@angular/core';
+import { MatDialog } from '@angular/material';
+import { MatDialogConfig } from '@angular/material/dialog';
+import { BooleanValueModelChain } from '@coolon/pectin';
+import { InteractionContext } from '../../interaction-context';
+import { ModalInteractionContextFactory } from '../modal-interaction-context.factory';
+export declare const DIALOG_INTERACTION_SERVICE_DEFAULTS: InjectionToken<MatDialogConfig<any>>;
+export declare class DialogInteractionContextFactory extends ModalInteractionContextFactory {
+    private readonly dialogService;
+    readonly dialogServiceDefaults: MatDialogConfig<any>;
+    readonly matDialogDefaultConfig: MatDialogConfig<any>;
+    readonly active: BooleanValueModelChain;
+    constructor(dialogService: MatDialog, dialogServiceDefaults: MatDialogConfig<any>, matDialogDefaultConfig: MatDialogConfig<any>);
+    createInteractionContext(): InteractionContext;
+}

package/lib/interaction/services/{dialog-interaction-context.d.ts → mat-dialog-interaction/dialog-interaction-context.d.ts}

@@ -1,8 +1,8 @@
 import { MatDialog } from '@angular/material';
 import { MatDialogConfig } from '@angular/material/dialog';
 import { Constructable, ListModel, ValueModel } from '@coolon/pectin';
-import { Activity } from '../activity';
-import { InteractionContextBase } from '../interaction-context-base';
+import { Activity } from '../../activity';
+import { InteractionContextBase } from '../../interaction-context-base';
 export declare class DialogInteractionContext extends InteractionContextBase {
     private readonly dialogService;
     readonly config: MatDialogConfig<any>;

package/lib/interaction/services/modal-interaction-context.factory.d.ts

@@ -0,0 +1,4 @@
+import { InteractionContext } from '../interaction-context';
+export declare abstract class ModalInteractionContextFactory {
+    abstract createInteractionContext(): InteractionContext;
+}

package/lib/place/guards/navigation-state.d.ts

@@ -1,95 +1,129 @@
-import { Location } from '@angular/common';
-import { NavigationCancel, NavigationEnd, NavigationError, NavigationStart, Router, RouterEvent } from '@angular/router';
+import { NavigationCancel, NavigationEnd, NavigationError, NavigationStart, RouterEvent } from '@angular/router';
 import { GarbageCollector } from '@coolon/pectin';
 import { InteractionContext } from '../../interaction/interaction-context';
-import { ModalInteractionService } from '../../interaction/services/modal-interaction.service';
+import { InteractionService } from '../../interaction/services/interaction.service';
 import { PlaceComponent } from '../place-component';
 import { PlaceDefinition } from '../place-definition';
+import { PlaceRouter } from '../place-router';
 import { UrlSnapshot } from '../url-snapshot';
 import { Visit } from '../visit';
 export declare abstract class NavigationState extends GarbageCollector {
     protected readonly context: NavigationState.Context;
     private _visits;
-    abstract readonly isPopState: boolean;
-    abstract readonly active: boolean;
+    abstract readonly isTransitional: boolean;
     abstract readonly startingUrl: string;
+    abstract readonly isPopState: boolean;
     constructor(context: NavigationState.Context);
+    readonly name: string;
+    readonly idle: boolean;
+    readonly placeRouter: PlaceRouter;
+    readonly interactionService: InteractionService;
     readonly interactionContext: InteractionContext;
     storeVisit(visit: Visit): void;
     getVisitFor(placeDef: PlaceDefinition): Visit;
-    abstract onStart(event: NavigationStart): NavigationState;
-    abstract onCancel(event: NavigationCancel): NavigationState;
-    abstract onError(event: NavigationError): NavigationState;
-    abstract onEnd(event: NavigationEnd): NavigationState;
+    onPlaceNavigationStart(visit: Visit, initialUrl: string): NavigationState;
+    onPopState(event: NavigationStart): NavigationState;
+    onRouterStarted(event: NavigationStart): NavigationState;
+    onRouterCancelled(event: NavigationCancel): NavigationState;
+    onRouterError(event: NavigationError): NavigationState;
+    onRouterEnd(event: NavigationEnd): NavigationState;
     onBackClickedDuringNavigationInteraction(newUrl: string): NavigationState;
-    abstract canDeactivatePlace(component: PlaceComponent, nextState: UrlSnapshot): Promise<boolean>;
+    canDeactivatePlace(component: PlaceComponent, currentUrl: UrlSnapshot, nextUrl: UrlSnapshot): Promise<boolean | UrlSnapshot>;
     getVisits(): Visit[];
     protected illegalTransition<R>(message: string | RouterEvent): R;
     protected currentRouterUrl(): string;
-    protected createActiveSession(event: NavigationStart): NavigationState.Active;
-    protected updateLocation(url: any): void;
+    protected createTransitionStateFor(event: NavigationStart): any;
+    protected createIdleState(): any;
+    resetBrowserLocation(url: any): void;
     toString(): string;
 }
 export declare namespace NavigationState {
     class Context {
-        readonly router: Router;
-        readonly modalInteractionService: ModalInteractionService;
-        readonly angularLocation: Location;
+        readonly placeRouter: PlaceRouter;
+        readonly interactionService: InteractionService;
         readonly notifySuccess: (success: NavigationState) => void;
-        constructor(router: Router, modalInteractionService: ModalInteractionService, angularLocation: Location, notifySuccess: (success: NavigationState) => void);
+        constructor(placeRouter: PlaceRouter, interactionService: InteractionService, notifySuccess: (success: NavigationState) => void);
     }
     class Idle extends NavigationState {
-        readonly isPopState: boolean;
-        readonly active = false;
+        readonly isTransitional = false;
         readonly startingUrl: any;
+        readonly isPopState = false;
         constructor(context: Context);
-        canDeactivatePlace(component: PlaceComponent, nextState: UrlSnapshot): Promise<boolean>;
-        onStart(event: NavigationStart): NavigationState;
-        onCancel(event: NavigationCancel): NavigationState;
-        onEnd(event: NavigationEnd): NavigationState;
-        onError(event: NavigationError): NavigationState;
+        onPlaceNavigationStart(visit: Visit, initialUrl: string): NavigationState;
+        onRouterStarted(event: NavigationStart): NavigationState;
+        onPopState(event: NavigationStart): NavigationState;
     }
-    class Active extends NavigationState {
-        readonly isPopState: boolean;
+    abstract class AbstractNavigationTransition extends NavigationState {
         readonly startingUrl: string;
-        readonly active = true;
+        readonly isTransitional = true;
         private componentDeactivationHandlers;
         private _interactionContext;
-        constructor(context: Context, isPopState: boolean, startingUrl: string);
+        constructor(context: Context, startingUrl: string);
         readonly interactionContext: InteractionContext;
-        onStart(event: NavigationStart): NavigationState;
-        onEnd(event: NavigationEnd): NavigationState;
-        onCancel(event: NavigationCancel): NavigationState;
-        onError(event: NavigationError): NavigationState;
+        onRouterStarted(event: NavigationStart): NavigationState;
+        onRouterEnd(event: NavigationEnd): NavigationState;
         onBackClickedDuringNavigationInteraction(locationTriggerUrl: string): NavigationState;
-        canDeactivatePlace(component: PlaceComponent, nextState: UrlSnapshot): Promise<boolean>;
+        canDeactivatePlace(component: PlaceComponent, currentUrl: UrlSnapshot, nextUrl: UrlSnapshot): Promise<boolean | UrlSnapshot>;
         private detachInteractionContext;
+    }
+    class NavigationTransition extends AbstractNavigationTransition {
+        readonly isPopState = false;
+        onRouterCancelled(event: NavigationCancel): NavigationState;
+        onRouterError(event: NavigationError): NavigationState;
         toString(): string;
     }
-    class ModalInteractionSession extends NavigationState {
+    class PopStateTransition extends AbstractNavigationTransition {
+        readonly isPopState = true;
+        onRouterCancelled(event: NavigationCancel): NavigationState;
+        onRouterError(event: NavigationError): NavigationState;
+    }
+    class IdleDuringInteraction extends NavigationState {
         readonly startingUrl: string;
-        readonly active = false;
+        readonly isTransitional = false;
         readonly isPopState = false;
-        static hasInteraction(url: string): boolean;
         constructor(context: Context, startingUrl: string);
-        onStart(event: NavigationStart): NavigationState;
-        onCancel(event: NavigationCancel): NavigationState;
-        onEnd(event: NavigationEnd): NavigationState;
-        onError(event: NavigationError): NavigationState;
-        canDeactivatePlace(component: PlaceComponent, nextState: UrlSnapshot): Promise<boolean>;
+        onPlaceNavigationStart(visit: Visit, initialUrl: string): NavigationState;
+        onRouterStarted(event: NavigationStart): NavigationState;
+        onPopState(event: NavigationStart): NavigationState;
+    }
+    abstract class AbstractInteractionTransition extends AbstractNavigationTransition {
+        readonly startingUrl: string;
+        readonly isTransitional = true;
+        constructor(context: Context, startingUrl: string);
+    }
+    /**
+     * This state exists to handle all events while any kind of navigation is in progress.  That way all other states can
+     * happily ignore interaction contexts.
+     */
+    class InteractionTransition extends AbstractInteractionTransition {
+        readonly isPopState = false;
+        onRouterCancelled(event: NavigationCancel): NavigationState;
+        onRouterError(event: NavigationError): NavigationState;
+        onRouterEnd(event: NavigationEnd): NavigationState;
+    }
+    /**
+     * This state exists to handle all events while any kind of navigation is in progress.  That way all other states can
+     * happily ignore interaction contexts.
+     */
+    class InteractionPopStateTransition extends AbstractInteractionTransition {
+        readonly isPopState = true;
+        onRouterCancelled(event: NavigationCancel): NavigationState;
+        onRouterEnd(event: NavigationEnd): NavigationState;
     }
     class CancelledDuringNavigationInteraction extends NavigationState {
         readonly startingUrl: string;
+        readonly startingEventWasAPopState: boolean;
         readonly locationChangeTriggerUrl: string;
-        readonly active = false;
-        readonly isPopState: boolean;
-        private capturedFauxRouterStart;
-        constructor(context: Context, startingUrl: string, locationChangeTriggerUrl: string);
-        canDeactivatePlace(component: PlaceComponent, nextState: UrlSnapshot): Promise<boolean>;
-        onCancel(event: NavigationCancel): NavigationState;
-        onEnd(event: NavigationEnd): NavigationState;
-        onError(event: NavigationError): NavigationState;
-        onStart(event: NavigationStart): NavigationState;
+        readonly isPopState = false;
+        private gotPopStateWithLeavingUrl;
+        constructor(context: Context, startingUrl: string, startingEventWasAPopState: boolean, locationChangeTriggerUrl: string);
+        readonly isTransitional: boolean;
+        onRouterStarted(event: NavigationStart): NavigationState;
+        onRouterCancelled(event: NavigationCancel): NavigationState;
+        onRouterEnd(event: NavigationEnd): NavigationState;
+        onRouterError(event: NavigationError): NavigationState;
+        onPopState(event: NavigationStart): NavigationState;
+        canDeactivatePlace(component: PlaceComponent, currentUrl: UrlSnapshot, nextUrl: UrlSnapshot): Promise<boolean | UrlSnapshot>;
         ignore(event: RouterEvent, reason?: string): NavigationState;
         toString(): string;
     }

package/lib/place/guards/place-component-deactivation-handler.d.ts

@@ -3,10 +3,13 @@ import { UrlSnapshot } from '../url-snapshot';
 import { NavigationState } from './navigation-state';
 export declare class PlaceComponentDeactivationHandler {
     readonly component: PlaceComponent;
-    readonly navigationSession: NavigationState;
+    readonly navigationState: NavigationState;
+    readonly isPrimaryComponent: boolean;
     private canDeactivatePromise;
-    constructor(component: PlaceComponent, navigationSession: NavigationState);
-    canDeactivate(nextState: UrlSnapshot): Promise<boolean>;
-    protected canDeactivateComponent(nextState: UrlSnapshot): Promise<boolean>;
+    constructor(component: PlaceComponent, navigationState: NavigationState, isPrimaryComponent: boolean);
+    readonly interactionService: import("../../interaction").InteractionService;
+    readonly placeRouter: import("..").PlaceRouter;
+    canDeactivate(currentUrl: UrlSnapshot, nextState: UrlSnapshot): Promise<boolean | UrlSnapshot>;
+    protected canDeactivateComponent(currentUrl: UrlSnapshot, nextState: UrlSnapshot): Promise<UrlSnapshot | boolean>;
     protected isNotJustAChangeInRouteId(nextState: UrlSnapshot): boolean;
 }

package/lib/place/guards/{abstract-place.guard.d.ts → place.guard.d.ts}

@@ -1,19 +1,24 @@
 import { Injector } from '@angular/core';
 import { ActivatedRouteSnapshot, CanActivate, CanDeactivate, Router, RouterStateSnapshot, UrlSerializer, UrlTree } from '@angular/router';
+import { InteractionService } from '../../interaction/services/interaction.service';
 import { PlaceComponent } from '../place-component';
 import { PlaceDefinition } from '../place-definition';
 import { PlaceHistory } from '../place-history';
 import { PlaceRouter } from '../place-router';
-export declare abstract class AbstractPlaceGuard implements CanActivate, CanDeactivate<PlaceComponent> {
+import { UrlSnapshot } from '../url-snapshot';
+export declare abstract class PlaceGuard implements CanActivate, CanDeactivate<PlaceComponent> {
     private readonly router;
     private urlSerializer;
     private readonly placeRouter;
     private readonly placeHistory;
+    private readonly interactionService;
     private readonly injector;
-    constructor(router: Router, urlSerializer: UrlSerializer, placeRouter: PlaceRouter, placeHistory: PlaceHistory, injector: Injector);
+    constructor(router: Router, urlSerializer: UrlSerializer, placeRouter: PlaceRouter, placeHistory: PlaceHistory, interactionService: InteractionService, injector: Injector);
     canActivate(activatedRoute: ActivatedRouteSnapshot, state: RouterStateSnapshot): Promise<boolean | UrlTree>;
-    canDeactivate(component: PlaceComponent, currentRoute: ActivatedRouteSnapshot, currentState: RouterStateSnapshot, nextState?: RouterStateSnapshot): Promise<boolean>;
-    protected authorisePlaceThen(activatedRoute: ActivatedRouteSnapshot, state: RouterStateSnapshot, canActivate: (placeDefinition: PlaceDefinition) => Promise<boolean | UrlTree>): Promise<boolean | UrlTree>;
+    canDeactivate(component: PlaceComponent, currentRoute: ActivatedRouteSnapshot, currentState: RouterStateSnapshot, nextState?: RouterStateSnapshot): Promise<boolean | UrlTree>;
+    private handleGuardResult;
+    protected authorisePlaceThen(activatedRoute: ActivatedRouteSnapshot, state: RouterStateSnapshot, runPlaceGuards: (placeDefinition: PlaceDefinition) => Promise<boolean | UrlTree>): Promise<boolean | UrlTree>;
     isAuthorised(activatedRoute: ActivatedRouteSnapshot, state: RouterStateSnapshot): Promise<boolean | UrlTree>;
     abstract getAuthGuard(injector: Injector): CanActivate;
+    cleanInteractionState(route: ActivatedRouteSnapshot, state: RouterStateSnapshot, then: () => Promise<boolean | UrlSnapshot>): Promise<boolean | UrlSnapshot>;
 }

package/lib/place/index.d.ts

@@ -18,12 +18,11 @@ export * from "./components/list-place-nav/list-place-nav.component";
 export * from "./components/place-outlet/place-outlet.component";
 export * from "./components/place-outlet/route-animations";
 export * from "./components/tabbed-place-navigation/tabbed-place-navigation.component";
-export * from "./guards/abstract-place.guard";
 export * from "./guards/consolidated-param-map";
-export * from "./guards/interaction.guard";
 export * from "./guards/navigation-state";
 export * from "./guards/noop-auth-guard.service";
 export * from "./guards/place-component-deactivation-handler";
+export * from "./guards/place.guard";
 export * from "./route/formatter";
 export * from "./route/json-types";
 export * from "./route/parameter-decorators";

package/lib/place/place-router.d.ts

@@ -1,8 +1,7 @@
 import { Location } from '@angular/common';
-import { ActivatedRoute, ActivatedRouteSnapshot, Router, RouterStateSnapshot, UrlSerializer } from '@angular/router';
+import { ActivatedRoute, ActivatedRouteSnapshot, Router, UrlSerializer } from '@angular/router';
 import { GarbageCollector, HasOneIndexChain, ListModel, ValueModel } from '@coolon/pectin';
-import { InteractionContext } from '../interaction/interaction-context';
-import { ModalInteractionService } from '../interaction/services/modal-interaction.service';
+import { InteractionService } from '../interaction/services/interaction.service';
 import { NavigationState } from './guards/navigation-state';
 import { PlaceHistory } from './place-history';
 import { UrlSnapshot } from './url-snapshot';
@@ -12,17 +11,17 @@ export declare class PlaceRouter extends GarbageCollector {
     private readonly urlSerializer;
     private readonly angularLocation;
     private readonly placeHistory;
-    private readonly modalInteractionService;
-    private firstRoute;
-    private readonly _navigationSessionModel;
+    private readonly interactionService;
+    private readonly _navigationStateModel;
     private readonly _activeVisits;
-    readonly navigationSessionActive: ValueModel<boolean>;
+    readonly navigationInProgress: ValueModel<boolean>;
     readonly activeVisitIndex: HasOneIndexChain<'placeDefinition', Visit>;
     private _navigationSessionContext;
-    constructor(router: Router, urlSerializer: UrlSerializer, angularLocation: Location, placeHistory: PlaceHistory, modalInteractionService: ModalInteractionService);
+    private _navigationStateTypeModel;
+    constructor(router: Router, urlSerializer: UrlSerializer, angularLocation: Location, placeHistory: PlaceHistory, interactionService: InteractionService);
     private processNavigationSuccess;
-    readonly navigationSession: NavigationState;
-    readonly navigationSessionModel: ValueModel<NavigationState>;
+    readonly navigationState: NavigationState;
+    readonly navigationStateModel: ValueModel<NavigationState>;
     readonly activeVisits: ListModel<Visit>;
     /**
      *  placeRouter.navigate(placeDestinations.somePlace.createVisit(routeId, ...visitParams));
@@ -36,16 +35,12 @@ export declare class PlaceRouter extends GarbageCollector {
     protected runStateTransition(transition: (navigationSession: NavigationState) => NavigationState): void;
     private createRouteParameters;
     extractChildPath(activatedRoute: ActivatedRouteSnapshot): any[];
-    parseUrl(snapshot: RouterStateSnapshot): UrlSnapshot;
-}
-export declare namespace PlaceRouter {
-    const INTERACTION_ROUTER_OUTLET = "aup-interaction";
-    class InteractionRouteMediator implements InteractionContext.Listener {
-        readonly navigationSessionModelActive: ValueModel<boolean>;
-        readonly router: Router;
-        constructor(navigationSessionModelActive: ValueModel<boolean>, router: Router);
-        readonly isNavigating: boolean;
-        onActivityStarted(): void;
-        onActivityFinished(): void;
-    }
+    parseUrl(url: string): UrlSnapshot;
+    resetBrowserLocation(url: string): void;
+    getCurrentRouterUrl(): string;
+    getCurrentRouteSnapshot(): UrlSnapshot;
+    getActiveInteractionIdsFromUrl(url: string): string[];
+    hasActiveInteractionIds(url: string): boolean;
+    navigateByUrl(urlSnapshot: UrlSnapshot): void;
+    syncInteractionIdsWithRouter(): void;
 }

package/lib/place/url-snapshot.d.ts

@@ -1,16 +1,33 @@
-import { UrlSegment, UrlTree } from '@angular/router';
+import { NavigationExtras, UrlSegment, UrlSerializer, UrlTree } from '@angular/router';
 import { PlaceDefinition } from './place-definition';
 import { Visit } from './visit';
 export declare class UrlSnapshot {
+    readonly urlSerializer: UrlSerializer;
+    readonly url: string;
+    private readonly options;
     readonly urlTree: UrlTree;
-    constructor(urlTree: UrlTree);
-    cloneUrlSegmentList(): UrlSegment[];
-    updateVisitSegments(visit: Visit): UrlSegment[];
+    constructor(urlSerializer: UrlSerializer, url: string, options: NavigationExtras);
+    updateVisitSegments(visit: Visit): UrlSnapshot;
+    private getPrimarySegments;
     /**
      * Converts the visit into segments.  Please not that these segments are not e
      * @param visit
      */
-    convertToUrlSegments(visit: Visit): UrlSegment[];
-    createRedirectCommandsFor(visit: Visit): any[];
+    protected getSegmentsFor(visit: Visit): UrlSegment[];
     includesPathOf(placeDef: PlaceDefinition): UrlSegment;
+    getInteractionIds(): string[];
+    hasInteractionIds(): boolean;
+    updateInteractionIds(ids: string[]): UrlSnapshot;
+    removeInteractionIds(): UrlSnapshot;
+    withOptions(options: NavigationExtras): UrlSnapshot;
+    getNavigationExtras(): NavigationExtras;
+}
+export declare namespace UrlSnapshot {
+    const INTERACTION_QUERY_PARAM = "aup-interactions";
+    const INTERACTION_ID_SEPARATOR = "--";
+    function parseInteractionIds(path: string): string[];
+    function createPathIdFor(interactionIds: string[]): string;
+    interface NavigationOptions {
+        replaceUrl?: boolean;
+    }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@coolon/angular-ui-powerups",
-  "version": "0.0.98",
+  "version": "0.0.102",
   "schematics": "./schematics/collection.json",
   "dependencies": {
     "ts-morph": "^3.1.3",

package/schematics/place-routes/place-def.js

@@ -98,6 +98,7 @@ class PlaceDef {
     component: ${this.componentClass},
     canActivate: [PlaceGuard],
     canDeactivate: [PlaceGuard],
+    runGuardsAndResolvers: "paramsOrQueryParamsChange",
     children:[
       ${this.getChildRouteTemplates().join(', ')}
     ]

package/schematics/place-routes/place-def.js.map

@@ -1 +1 @@
-{"version":3,"file":"place-def.js","sourceRoot":"","sources":["../../../../../libs/angular-ui-powerups/schematics/place-routes/place-def.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"place-def.js","sourceRoot":"","sources":["../../../../../libs/angular-ui-powerups/schematics/place-routes/place-def.ts"],"names":[],"mappings":";;;;;;;;AACA,2CAAsC;AACtC,0EAA2E;AAE3E,+DAA0D;AAE1D,MAAa,QAAQ;IAInB,YACW,cAAsB,EACtB,UAAkB,EAClB,cAAsB,EACtB,UAA4B,EAC5B,QAA4B,EAC5B,eAAqC,EACrC,SAA8B,EAC9B,0BAAkC;QAPlC,mBAAc,GAAd,cAAc,CAAQ;QACtB,eAAU,GAAV,UAAU,CAAQ;QAClB,mBAAc,GAAd,cAAc,CAAQ;QACtB,eAAU,GAAV,UAAU,CAAkB;QAC5B,aAAQ,GAAR,QAAQ,CAAoB;QAC5B,oBAAe,GAAf,eAAe,CAAsB;QACrC,cAAS,GAAT,SAAS,CAAqB;QAC9B,+BAA0B,GAA1B,0BAA0B,CAAQ;IAE7C,CAAC;IAGD,IAAI,IAAI;QACN,OAAO,QAAQ,CAAC,oBAAoB,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;IAC7D,CAAC;IAED,IAAI,eAAe;QACjB,OAAO,IAAI,CAAC,QAAQ,CAAC;IACvB,CAAC;IAED,IAAI,QAAQ;QACV,OAAO,CAAC,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;YAC7B,GAAG,IAAI,CAAC,IAAI,KAAK,IAAI,CAAC,eAAe,CAAC,aAAa,EAAE,CAAC,CAAC;YACvD,IAAI,CAAC,IAAI,CAAC;IACd,CAAC;IAED,+BAA+B,CAAC,IAAY;QAC1C,MAAM,IAAI,GAAa,EAAE,CAAC;QAC1B,IAAI,IAAI,CAAC,eAAe,EAAE;YACxB,IAAI,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,eAAe,CAAC,aAAa,IAAI,IAAI,CAAC,eAAe,CAAC,QAAQ,EAAE,CAAC,CAAC;SACrF;QACD,IAAI,IAAI,CAAC,eAAe,IAAI,IAAI,CAAC,eAAe,CAAC,MAAM,GAAG,CAAC,EAAE;YAC3D,MAAM,UAAU,GAAG,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,aAAa,MAAM,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC;YACvF,IAAI,CAAC,IAAI,CAAC,GAAG,IAAI,QAAQ,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;SACrD;QACD,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACzB,CAAC;IAED,oCAAoC;QAClC,MAAM,cAAc,GAAa,EAAE,CAAC;QAEpC,IAAI,IAAI,CAAC,eAAe,EAAE;YACxB,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,aAAa,CAAC,CAAC;SACzD;QACD,IAAI,IAAI,CAAC,eAAe,IAAI,IAAI,CAAC,eAAe,CAAC,MAAM,GAAG,CAAC,EAAE;YAC3D,cAAc,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;SACpC;QAED,OAAO,eAAe,IAAI,CAAC,+BAA+B,CAAC,aAAa,CAAC;mBAC1D,IAAI,CAAC,cAAc,SAAS,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC;MAClE,CAAC;IACL,CAAC;IAED,mCAAmC;QACjC,MAAM,cAAc,GAAa,EAAE,CAAC;QAEpC,IAAI,IAAI,CAAC,eAAe,EAAE;YACxB,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,aAAa,CAAC,CAAC;SACzD;QAED,IAAI,IAAI,CAAC,eAAe,IAAI,IAAI,CAAC,eAAe,CAAC,MAAM,GAAG,CAAC,EAAE;YAC3D,cAAc,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;SACvC;QAED,OAAO,eAAe,IAAI,CAAC,+BAA+B,CAAC,aAAa,CAAC;2CAClC,IAAI,CAAC,cAAc,OAAO,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC;MACxF,CAAC;IACL,CAAC;IAGD,IAAI,SAAS;QACX,MAAM,CAAC,GAAG,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,YAAY,EAAE,EAAE,CAAC,CAAC;QACxD,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IAChD,CAAC;IAED,SAAS,CAAC,QAAkB;QAC1B,IAAI,CAAC,MAAM,GAAG,QAAQ,CAAC;IACzB,CAAC;IAED,OAAO;QACL,OAAO,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC;IACvB,CAAC;IAGO,kBAAkB;QACxB,OAAO,IAAI,CAAC,eAAe,IAAI,IAAI,CAAC,eAAe,CAAC,MAAM,GAAG,CAAC,CAAC;IACjE,CAAC;IAGD,IAAI,cAAc;QAChB,OAAO,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC;IACxD,CAAC;IAED,IAAI,YAAY;QACd,OAAO,IAAI,CAAC,UAAU,CAAC,YAAY,KAAK,MAAM,CAAC;IACjD,CAAC;IAED,IAAI,QAAQ;QACV,OAAO,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC;IAC/C,CAAC;IAED,gBAAgB;QACd,MAAM,IAAI,GAAG,EAAE,CAAC;QAChB,IAAI,IAAI,CAAC,eAAe,EAAE;YACxB,IAAI,CAAC,IAAI,CAAC,WAAW,IAAI,CAAC,IAAI,mBAAmB,IAAI,CAAC,IAAI,MAAM,CAAC,CAAC;SACnE;QACD,IAAI,CAAC,IAAI,CAAC;aACD,IAAI,CAAC,QAAQ;iBACT,IAAI,CAAC,cAAc;;;;;QAK5B,IAAI,CAAC,sBAAsB,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC;;IAE5C,CAAC,CAAC;QACF,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACzB,CAAC;IAED,sBAAsB;QACpB,IAAI,IAAI,CAAC,eAAe,EAAE;YACxB,MAAM,UAAU,GAAG,IAAI,CAAC,eAAe,CAAC,eAAe,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,eAAe,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC;YACtH,OAAO;gBACL,yBAAyB,UAAU,sBAAsB;gBACzD,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,gBAAgB,EAAE,CAAC;aAChD,CAAC;SACH;aAAM;YACL,OAAO,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,gBAAgB,EAAE,CAAC,CAAC;SACrD;IACH,CAAC;IAGD,IAAI,eAAe;QACjB,IAAI,IAAI,CAAC,0BAA0B,EAAE;YACnC,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,cAAc,KAAK,IAAI,CAAC,0BAA0B,CAAC,CAAC;YAC/F,IAAI,CAAC,QAAQ,EAAE;gBACb,aAAI,CAAC,YAAY,CAAC,qEAAqE,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,cAAc,CAAC,SAAS,IAAI,CAAC,0BAA0B,EAAE,CAAC,CAAC;aAC5K;YACD,OAAO,QAAQ,CAAC;SACjB;QACD,OAAO,IAAI,CAAC;IACd,CAAC;CAEF;AAnIC;IADC,aAAO,EAAE;oCAGT;AAwDD;IADC,aAAO,EAAE;yCAIT;AAgBD;IADC,aAAO,EAAE;8CAGT;AAyCD;IADC,aAAO,EAAE;+CAUT;AAlJH,4BAoJC;AAED,WAAiB,QAAQ;IAcvB,SAAgB,IAAI,CAAC,UAAsB,EAAE,SAA2B,EAAE,OAAyB;QACjG,OAAO,IAAI,uCAAiB,CAAC,UAAU,EAAE,SAAS,EAAE,OAAO,CAAC,CAAC;IAC/D,CAAC;IAFe,aAAI,OAEnB,CAAA;IAED,SAAgB,oBAAoB,CAAC,KAAa;QAChD,MAAM,MAAM,GAAG,KAAK,CAAC,OAAO,CAAC,kBAAkB,EAAE,EAAE,CAAC,CAAC;QACrD,+CAA+C;QAC/C,OAAO,MAAM,CAAC;IAChB,CAAC;IAJe,6BAAoB,uBAInC,CAAA;IAED,MAAa,QAAQ;QAGnB,YAAqB,QAAgB,EAAW,cAAsB;YAAjD,aAAQ,GAAR,QAAQ,CAAQ;YAAW,mBAAc,GAAd,cAAc,CAAQ;QACtE,CAAC;QAED,IAAI,QAAQ;YACV,OAAO,IAAI,CAAC,SAAS,CAAC;QACxB,CAAC;QAED,OAAO,CAAC,SAAqB;YAC3B,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,cAAc,KAAK,IAAI,CAAC,QAAQ,IAAI,CAAC,CAAC,cAAc,KAAK,IAAI,CAAC,cAAc,CAAC,CAAC;YACrH,OAAO,IAAI,CAAC,SAAS,CAAC;QACxB,CAAC;KACF;IAdY,iBAAQ,WAcpB,CAAA;AAGH,CAAC,EAzCgB,QAAQ,GAAR,gBAAQ,KAAR,gBAAQ,QAyCxB"}

package/schematics/place-routes/templates/place-routes.ts.template

@@ -12,8 +12,13 @@
 
 
 import { Injectable, Injector } from '@angular/core';
-import { Router, UrlSerializer } from '@angular/router';
-import { AbstractPlaceGuard, PlaceHistory, PlaceRouter, InteractionGuard, NoopComponent } from '@coolon/angular-ui-powerups';
+import { Routes, Router, UrlSerializer } from '@angular/router';
+import {
+  InteractionService,
+  PlaceGuard as AbstractPlaceGuard,
+  PlaceHistory,
+  PlaceRouter
+} from '@coolon/angular-ui-powerups';
 import { <%= config.authGuard.className %> } from '<%= config.authGuard.importPath %>';
 
 <% placeDefs.forEach(def => { %>import {<%= def.componentClass %>} from "<%= def.importPath %>";
@@ -28,8 +33,9 @@ export class PlaceGuard extends AbstractPlaceGuard {
               urlSerializer: UrlSerializer,
               placeRouter: PlaceRouter,
               placeHistory: PlaceHistory,
+              interactionService:InteractionService,
               injector: Injector) {
-    super(router, urlSerializer, placeRouter, placeHistory, injector);
+    super(router, urlSerializer, placeRouter, placeHistory,interactionService, injector);
   }
 
   getAuthGuard(injector:Injector) {
@@ -37,14 +43,7 @@ export class PlaceGuard extends AbstractPlaceGuard {
   }
 }
 
-export const placeRoutes = [<% placeDefs.filter(def=> !def.isChild()).forEach(def => { %>
+export const placeRoutes:Routes = [<% placeDefs.filter(def=> !def.isChild()).forEach(def => { %>
     <%= def.getRouteTemplate() %>,
 <% }) %>
- {
-   path: "modal",
-   outlet:PlaceRouter.INTERACTION_ROUTER_OUTLET,
-   component: NoopComponent,
-   canDeactivate: [InteractionGuard],
-   canActivate: [InteractionGuard]
- }
 ];

package/styles/styles.scss

@@ -2,7 +2,7 @@
   --aup-default-padding: var(--default-padding, 18px);
 }
 
-.dialog-interaction-service {
+.dialog-interaction-context {
   max-width: 95vw !important;
   max-height: 95vh !important;