@coolon/angular-ui-powerups 13.0.2 → 13.0.4

package/lib/components/forms/abstract-list-input.component.d.ts

@@ -1,9 +1,9 @@
-import { EventEmitter, OnInit } from '@angular/core';
-import { Form, MutableListModel } from '@coolon/pectin';
-import { AbstractInputComponent } from './abstract-input.component';
+import { EventEmitter, OnInit } from "@angular/core";
+import { ConvertedFormListModel, Form, MutableListModel } from "@coolon/pectin";
+import { AbstractInputComponent } from "./abstract-input.component";
 import * as i0 from "@angular/core";
 export declare class AbstractListInputComponent<T> extends AbstractInputComponent<T[]> implements OnInit {
-    listModel: Form.ListModelBase<T> | MutableListModel<T>;
+    listModel: Form.ListModelBase<T> | ConvertedFormListModel<T, any> | MutableListModel<T>;
     /**
      * A backing model for all our @Input() valueModel properties which should be defined as follows.
      *

package/lib/components/forms/abstract-value-input.component.d.ts

@@ -1,9 +1,9 @@
 import { EventEmitter, OnInit } from '@angular/core';
-import { Form, Guard, MutableValueModel } from '@coolon/pectin';
+import { ConvertedFormValueModel, Form, Guard, MutableValueModel } from "@coolon/pectin";
 import { AbstractInputComponent } from './abstract-input.component';
 import * as i0 from "@angular/core";
 export declare class AbstractValueInputComponent<T> extends AbstractInputComponent<T> implements OnInit {
-    valueModel: Form.ValueModelBase<T> | MutableValueModel<T>;
+    valueModel: Form.ValueModelBase<T> | ConvertedFormValueModel<T, any> | MutableValueModel<T>;
     /**
      * A backing model for all our @Input() valueModel properties which should be defined as follows.
      *

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

@@ -1,13 +1,15 @@
-import { AfterViewInit, OnInit, QueryList } from '@angular/core';
-import { MatTabGroup } from '@angular/material/tabs';
-import { Constructable, DelegatingValueModel, Disposable, MutableValueModel } from '@coolon/pectin';
-import { AbstractInteractionContext } from '../../abstract-interaction-context';
-import { Activity } from '../../activity';
-import { ActivityRef } from '../../activity-ref';
-import { InteractionService } from '../../services/interaction.service';
-import { ActivityOutletComponent } from './activity-outlet/activity-outlet.component';
+import { AfterViewInit, OnInit, QueryList } from "@angular/core";
+import { MatTabGroup } from "@angular/material/tabs";
+import { Constructable, DelegatingValueModel, Disposable, MutableValueModel } from "@coolon/pectin";
+import { PlaceRouter } from "../../../place/place-router";
+import { AbstractInteractionContext } from "../../abstract-interaction-context";
+import { Activity } from "../../activity";
+import { ActivityRef } from "../../activity-ref";
+import { InteractionService } from "../../services/interaction.service";
+import { ActivityOutletComponent } from "./activity-outlet/activity-outlet.component";
 import * as i0 from "@angular/core";
 export declare class ActivityContainerComponent<D, R, E> extends AbstractInteractionContext implements OnInit, AfterViewInit {
+    readonly placeRouter: PlaceRouter;
     dynamicHeight: boolean;
     tabs: MatTabGroup;
     activityOutlets: QueryList<ActivityOutletComponent<any, any, any>>;
@@ -20,7 +22,7 @@ export declare class ActivityContainerComponent<D, R, E> extends AbstractInterac
     private onAnimationFinishedJob;
     readonly inAnimation: MutableValueModel<boolean>;
     readonly busy: DelegatingValueModel<boolean>;
-    constructor();
+    constructor(placeRouter: PlaceRouter);
     ngOnInit(): void;
     ngAfterViewInit(): void;
     initialise(identifier: string, api: InteractionService.Api): void;

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

@@ -53,7 +53,7 @@ export declare namespace InteractionService {
         /**
          * Notifies the interaction service that a particular interactionContext has become idle. The interaction
          * services will then push changes to the router to track state.  If the router is idle, the promise will
-         * resolve when the routing has finished updating.  Otherwise it will return immediately.
+         * resolve when the routing has finished updating.  Otherwise, it will return immediately.
          * @param interactionContext
          */
         notifyFinished(interactionContext: InteractionContext): Promise<unknown>;
@@ -75,7 +75,7 @@ export declare namespace InteractionService {
         isActive(): boolean;
         disableWhen(disabled: ValueModel<boolean>): void;
     }
-    class ApiAdapter implements Api {
+    class ApiAdapter extends GarbageCollector implements Api {
         private readonly placeRouter;
         private readonly contextRegistry;
         constructor(placeRouter: PlaceRouter, contextRegistry: ContextRegistry);

package/lib/place/navigation/session/interactions/remove-last-interaction-from-url-navigation-session.d.ts

@@ -13,6 +13,7 @@ export declare class RemoveLastInteractionFromUrlNavigationSession extends Navig
     private finished;
     private gotPopState;
     constructor(context: NavigationContext, startingUrl: string);
+    get isInteractionSync(): boolean;
     onPopState(event: NavigationStart): void;
     onRouterStarted(event: NavigationStart): void;
     onRouterCancelled(event: NavigationCancel): void;

package/lib/place/navigation/session/interactions/synchronise-interaction-context-ids-with-route.d.ts

@@ -5,6 +5,7 @@ export declare class SynchroniseInteractionContextIdsWithRoute extends Navigatio
     readonly wasTriggeredByPopState: boolean;
     readonly isPopState = false;
     constructor(context: NavigationContext, startingUrl: string, wasTriggeredByPopState: boolean);
+    get isInteractionSync(): boolean;
     notifyActive(): void;
     onRouterEnd(event: NavigationEnd): void;
     onRouterCancelled(event: NavigationCancel): void;

package/lib/place/navigation/session/navigation-session.d.ts

@@ -1,13 +1,13 @@
-import { NavigationCancel, NavigationEnd, NavigationError, NavigationStart, RouterEvent } from '@angular/router';
-import { GarbageCollector } from '@coolon/pectin';
-import { InteractionContext } from '../../../interaction/interaction-context';
-import { InteractionServiceRoutingAdapter } from '../../../interaction/services/interaction-service-routing-adapter';
-import { PlaceComponent } from '../../place-component';
-import { PlaceDefinition } from '../../place-definition';
-import { UrlService } from '../../url-service';
-import { UrlSnapshot } from '../../url-snapshot';
-import { Visit } from '../../visit';
-import { NavigationContext } from './navigation-context';
+import { NavigationCancel, NavigationEnd, NavigationError, NavigationStart, RouterEvent } from "@angular/router";
+import { GarbageCollector } from "@coolon/pectin";
+import { InteractionContext } from "../../../interaction/interaction-context";
+import { InteractionServiceRoutingAdapter } from "../../../interaction/services/interaction-service-routing-adapter";
+import { PlaceComponent } from "../../place-component";
+import { PlaceDefinition } from "../../place-definition";
+import { UrlService } from "../../url-service";
+import { UrlSnapshot } from "../../url-snapshot";
+import { Visit } from "../../visit";
+import { NavigationContext } from "./navigation-context";
 /**
  * Transient states
  */
@@ -20,6 +20,7 @@ export declare abstract class NavigationSession extends GarbageCollector {
     abstract readonly isPopState: boolean;
     private _interactionContext;
     constructor(context: NavigationContext, startingUrl: string);
+    get isInteractionSync(): boolean;
     get name(): string;
     get urlService(): UrlService;
     get interactionServiceAdapter(): InteractionServiceRoutingAdapter;

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

@@ -1,14 +1,14 @@
-import { Location } from '@angular/common';
-import { ActivatedRoute, ActivatedRouteSnapshot, NavigationCancel, NavigationEnd, NavigationError, NavigationExtras, NavigationStart, Router, RouterStateSnapshot } from '@angular/router';
-import { GarbageCollector, ListModel, MutableValueModel, ValueModel, ValueModelChain } from '@coolon/pectin';
-import { InteractionService } from '../interaction/services/interaction.service';
-import { NavigationSession } from './navigation/session/navigation-session';
-import { PlaceAccessGuard } from './place-access-guard';
-import { PlaceDefinition } from './place-definition';
-import { PlaceHistory } from './place-history';
-import { UrlService } from './url-service';
-import { UrlSnapshot } from './url-snapshot';
-import { Visit } from './visit';
+import { Location } from "@angular/common";
+import { ActivatedRoute, ActivatedRouteSnapshot, NavigationCancel, NavigationEnd, NavigationError, NavigationExtras, NavigationStart, Router, RouterStateSnapshot } from "@angular/router";
+import { GarbageCollector, ListModel, MutableValueModel, ValueModel, ValueModelChain } from "@coolon/pectin";
+import { InteractionService } from "../interaction/services/interaction.service";
+import { NavigationSession } from "./navigation/session/navigation-session";
+import { PlaceAccessGuard } from "./place-access-guard";
+import { PlaceDefinition } from "./place-definition";
+import { PlaceHistory } from "./place-history";
+import { UrlService } from "./url-service";
+import { UrlSnapshot } from "./url-snapshot";
+import { Visit } from "./visit";
 import * as i0 from "@angular/core";
 export declare class PlaceRouter extends GarbageCollector {
     private readonly angularRouter;
@@ -16,14 +16,15 @@ export declare class PlaceRouter extends GarbageCollector {
     private readonly interactionService;
     private readonly urlService;
     private readonly placeHistory;
-    readonly navigationSessionModel: MutableValueModel<NavigationSession>;
-    readonly navigationInProgress: ValueModelChain<boolean>;
-    readonly navigationSessionName: ValueModelChain<string>;
+    readonly navigationSession$: MutableValueModel<NavigationSession>;
+    readonly navigationInProgress$: ValueModelChain<boolean>;
+    readonly navigationSessionName$: ValueModelChain<string>;
+    readonly interactionSyncInProgress$: ValueModel<boolean>;
     private readonly navigationContext;
-    private readonly _activeVisits;
+    private readonly _activeVisits$;
     private readonly routerInteractionAdapter;
     private sessionFinishedJobs;
-    readonly state: ValueModel<PlaceRouter.State>;
+    readonly state$: ValueModel<PlaceRouter.State>;
     /**
      * An observable model containing the authoriser function.  This allows places to react to changes
      * in permissions when any underlying auth logic changes, e.g. a role being removed from a user.
@@ -38,6 +39,7 @@ export declare class PlaceRouter extends GarbageCollector {
     get currentSession(): NavigationSession;
     isNavigating(): boolean;
     waitUntilIdle(): Promise<this>;
+    waitActivitiesSynchronised(): Promise<this>;
     onPopState(event: NavigationStart): void;
     onRouterStarted(event: NavigationStart): void;
     onUrlChanged(newUrl: string): void;
@@ -49,7 +51,7 @@ export declare class PlaceRouter extends GarbageCollector {
     }): Promise<void>;
     doNavigation(visit: Visit | Visit[], runNavigationCommands: (router: Router) => any): Promise<void>;
     navigateByUrl(urlSnapshot: UrlSnapshot, navigationExtras?: NavigationExtras): Promise<boolean>;
-    get activeVisits(): ListModel<Visit>;
+    get activeVisits$(): ListModel<Visit>;
     pushVisitChangesToRoute(previous: Visit, next: Visit): Promise<void>;
     private createNavigationSession;
     protected transitionTo(next: NavigationSession): void;
@@ -60,7 +62,7 @@ export declare class PlaceRouter extends GarbageCollector {
      * to be able to capture the back button on the first page.  If we don't then the back click will exit
      * the app directly and we don't get to ask.
      */
-    syncInteractionContextIdsWithRouter(): Promise<void>;
+    syncInteractionContextIdsWithRouter(onSyncComplete?: () => void): Promise<void>;
     private createRouteParameters;
     static ɵfac: i0.ɵɵFactoryDeclaration<PlaceRouter, never>;
     static ɵprov: i0.ɵɵInjectableDeclaration<PlaceRouter>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@coolon/angular-ui-powerups",
-  "version": "13.0.2",
+  "version": "13.0.4",
   "schematics": "./schematics/collection.json",
   "peerDependencies": {
     "@angular/common": "^13.2.3",

package/schematics/bootstrap-app/templates/src/app/app.component.ts.template

@@ -9,8 +9,7 @@ import {Dsl} from "@coolon/pectin";
 })
 export class AppComponent extends DisposableComponent {
 
-  readonly places = [
-  ];
+  readonly places: Constructable<PlaceComponent>[] = [];
 
   constructor() {
     super();

package/schematics/bootstrap-app/templates/src/styles.scss.template

@@ -1,13 +1,66 @@
-/* You can add global styles to this file, and also import other style files */
+@use 'sass:map';
+@use '@angular/material' as mat;
+@use '@angular/material/theming';
 
-@use '@angular/material/theming' as ng;
-@use "@coolon/angular-ui-powerups/assets/styles" as aup;
+@use "node_modules/@coolon/angular-ui-powerups/assets/styles" as aup;
 @use "./styles/global-variables";
 
-$primary: ng.mat-palette(ng.$mat-indigo);
-$accent: ng.mat-palette(ng.$mat-pink);
+$success-palette: (
+  50 : #e4feea,
+  100 : #bbfdcc,
+  200 : #8efbaa,
+  300 : #61f987,
+  400 : #3ff86e,
+  500 : #1df754,
+  600 : #1af64d,
+  700 : #15f543,
+  800 : #11f33a,
+  900 : #0af129,
+  A100 : #ffffff,
+  A200 : #e7ffea,
+  A400 : #b4ffbc,
+  A700 : #9bffa5,
+  contrast: (
+    50 : #000000,
+    100 : #000000,
+    200 : #000000,
+    300 : #000000,
+    400 : #000000,
+    500 : #000000,
+    600 : #000000,
+    700 : #000000,
+    800 : #000000,
+    900 : #000000,
+    A100 : #000000,
+    A200 : #000000,
+    A400 : #000000,
+    A700 : #000000,
+  )
+);
+
+$typography: mat.define-typography-config();
+
+$primary: mat.define-palette(mat.$indigo-palette);
+$accent: mat.define-palette(mat.$yellow-palette);
+$warn: mat.define-palette(mat.$red-palette);
+$success: mat.define-palette($success-palette);
+
+$theme: mat.define-light-theme((
+  color: (
+    primary: $primary,
+    accent: $accent,
+    warn: $warn,
+  )
+));
+
+$background: map.get($theme, background);
+$foreground: map.get($theme, foreground);
+
+@include mat.core($typography);
+@include mat.all-component-themes($theme);
+
+@include aup.apply-light-theme($theme, $typography);
 
-@include aup.apply-light-theme($primary, $accent);
 
 @import "./assets/fonts/material-design-icons/material-icons.css";
 
@@ -30,4 +83,3 @@ body {
 body > *:first-child {
   flex: 1;
 }
-