@coolon/angular-ui-powerups 16.1.0-aplpha.129 → 16.1.0-aplpha.13

package/fesm2022/coolon-angular-ui-powerups.mjs

@@ -2,27 +2,27 @@ import { ObserversModule } from '@angular/cdk/observers';
 import * as i1$1 from '@angular/common';
 import { DOCUMENT, CommonModule } from '@angular/common';
 import * as i0 from '@angular/core';
-import { ElementRef, Directive, Inject, Host, Optional, Input, HostListener, ChangeDetectorRef, inject, NgZone, Injectable, Pipe, NgModule, Component, ContentChild, HostBinding, ChangeDetectionStrategy, ViewEncapsulation, InjectionToken, ViewChild, ViewChildren, EventEmitter, Output, SkipSelf, Self, ContentChildren, ComponentRef, Injector, PLATFORM_ID } from '@angular/core';
+import { ElementRef, Directive, Inject, Host, Optional, Input, HostListener, inject, NgZone, Injectable, Pipe, NgModule, Component, ContentChild, HostBinding, ViewEncapsulation, InjectionToken, ViewChild, ViewChildren, EventEmitter, Output, SkipSelf, Self, ContentChildren, ComponentRef, Injector, PLATFORM_ID } from '@angular/core';
 import * as i2$4 from '@angular/forms';
 import { FormsModule } from '@angular/forms';
 import * as i4$2 from '@angular/material/form-field';
 import { MatFormFieldModule } from '@angular/material/form-field';
 import * as i3 from '@angular/material/input';
 import { MatInputModule, MatInput } from '@angular/material/input';
-import * as i4$3 from '@angular/material/select';
+import * as i4$4 from '@angular/material/select';
 import { MatSelectModule } from '@angular/material/select';
-import * as i3$2 from '@angular/material/tabs';
+import * as i3$1 from '@angular/material/tabs';
 import { MatTabsModule, MAT_TABS_CONFIG } from '@angular/material/tabs';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
-import * as i1$4 from '@angular/cdk/portal';
+import * as i3$2 from '@angular/cdk/portal';
 import { ComponentPortal, TemplatePortal, PortalModule } from '@angular/cdk/portal';
 import * as i1$2 from '@angular/cdk/scrolling';
-import { CdkVirtualScrollViewport, CdkScrollableModule, ScrollingModule } from '@angular/cdk/scrolling';
+import { CdkScrollableModule } from '@angular/cdk/scrolling';
 import * as i7 from '@angular/material/autocomplete';
 import { MatAutocompleteModule } from '@angular/material/autocomplete';
 import * as i2 from '@angular/material/button';
 import { MatButton, MatButtonModule } from '@angular/material/button';
-import * as i3$1 from '@angular/material/checkbox';
+import * as i4$3 from '@angular/material/checkbox';
 import { MAT_CHECKBOX_DEFAULT_OPTIONS, MatCheckboxModule } from '@angular/material/checkbox';
 import * as i2$3 from '@angular/material/divider';
 import { MatDividerModule } from '@angular/material/divider';
@@ -38,34 +38,35 @@ import * as i2$6 from '@angular/material/table';
 import { MatTableModule } from '@angular/material/table';
 import * as i4$1 from '@angular/material/tooltip';
 import { MatTooltipModule } from '@angular/material/tooltip';
-import * as i4$4 from 'ng-table-virtual-scroll';
-import { TableVirtualScrollDataSource, TableVirtualScrollModule } from 'ng-table-virtual-scroll';
 import * as i1$3 from '@coolon/pectin';
-import { GarbageCollector, DelegatingValueModel, assert, UnaryCommand, lang, Dsl, proxify, ValueModel, Proxify, Logger, StoreInValueModel, Command, MutableListModel, StoreInListModel, Disposable, DelegatingListModel, MutableValueModel, DelegateToValueModel, FocusManager, EventListenerList, Guard, DelegatingFormListModel, Binding, DebugContext, DelegateToListModel, DelegatingFormValueModel, ListModel, Functions, PageController, SelectionModel, CanProxy, MultipleSelectionModel, WatchList, ProxyRegistry, DirtyTrackingForm, DependsOnOptions, DelegatingCommand, ComputedListModel, Deferred, ReducingValueModel, AndValueModel } from '@coolon/pectin';
-import { __decorate, __metadata, __param } from 'tslib';
+import { GarbageCollector, DelegatingValueModel, assert, UnaryCommand, lang, Dsl, MutableValueModel, Logger, proxify, ValueModel, Proxify, StoreInValueModel, Command, MutableListModel, StoreInListModel, Disposable, DelegatingListModel, DelegateToValueModel, FocusManager, EventListenerList, Guard, DelegatingFormListModel, Binding, DebugContext, DelegateToListModel, DelegatingFormValueModel, ListModel, Functions, PageController, SelectionModel, CanProxy, MultipleSelectionModel, AbstractComputedListModel, DirtyTrackingForm, ProxyRegistry, DelegatingCommand, PagedListModel, ComputedListModel, Deferred, ReducingValueModel, AndValueModel } from '@coolon/pectin';
+import { __decorate, __param, __metadata } from 'tslib';
 import * as i1 from '@angular/platform-browser';
 import escapeStringRegexp from 'escape-string-regexp';
-import { escape, isEmpty, isString, isFunction, isNil, isInteger, isObject, isEqual, join, last, first, uniq, findLast, isNumber, isNaN as isNaN$1 } from 'lodash-es';
+import { isEmpty, isString, isFunction, isNil, isInteger, isObject, isEqual, join, first, uniq, last as last$1, isNumber, isNaN as isNaN$1 } from 'lodash';
 import { marked } from 'marked';
-import { MemoizeGet, lang as lang$1, assert as assert$1, Stringy, Klass, Opts } from '@coolon/typescript-utilities';
+import { Memoize } from '@typescript-plus/fast-memoize-decorator';
 import { Enum } from 'typescript-string-enums';
+import { lang as lang$1, assert as assert$1, Stringy, Klass, Opts } from '@coolon/typescript-utilities';
 import * as i5 from '@angular/material/core';
-import { Memoize } from 'fast-typescript-memoize';
 import { produce } from 'immer';
 import ResizeObserver from 'resize-observer-polyfill';
-import { generateKeyBetween } from 'fractional-indexing';
+import { isFunction as isFunction$1, isNil as isNil$1, isEmpty as isEmpty$1, last, findLast } from 'lodash-es';
 import * as i5$1 from '@angular/cdk/a11y';
 import { A11yModule } from '@angular/cdk/a11y';
-import * as i1$7 from '@angular/material/dialog';
+import * as i7$1 from '@angular/flex-layout';
+import { FlexModule, GridModule } from '@angular/flex-layout';
+import * as i1$6 from '@angular/material/dialog';
 import { MatDialogModule, MAT_DIALOG_DEFAULT_OPTIONS } from '@angular/material/dialog';
-import * as i1$5 from '@angular/router';
-import { ActivatedRoute, ActivatedRouteSnapshot, UrlSegment, NavigationStart, NavigationEnd, NavigationError, NavigationCancel, RouterModule } from '@angular/router';
+import * as i1$4 from '@angular/router';
+import { ActivatedRouteSnapshot, UrlSegment, NavigationStart, NavigationEnd, NavigationError, NavigationCancel, RouterModule } from '@angular/router';
+import { Memoize as Memoize$1 } from 'typescript-memoize';
 import 'reflect-metadata';
-import * as i1$6 from '@angular/cdk/overlay';
-import { style, trigger, transition, animate, group, query } from '@angular/animations';
+import * as i1$5 from '@angular/cdk/overlay';
 import { MatCardModule } from '@angular/material/card';
 import * as i3$3 from '@angular/material/list';
 import { MatListModule } from '@angular/material/list';
+import { style, query, group, animate, trigger, transition } from '@angular/animations';
 
 class CommandDirective extends GarbageCollector {
     elementRef;
@@ -186,32 +187,6 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.9", ngImpor
                 args: ['click', ['$event']]
             }] } });
 
-class HighlightTextModelDirective extends GarbageCollector {
-    #aupHighlightTextModel_accessor_storage = proxify((ValueModel));
-    get aupHighlightTextModel() { return this.#aupHighlightTextModel_accessor_storage; }
-    set aupHighlightTextModel(value) { this.#aupHighlightTextModel_accessor_storage = value; }
-    constructor() {
-        super();
-    }
-    ngOnDestroy() {
-        this.dispose();
-    }
-    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.9", ngImport: i0, type: HighlightTextModelDirective, deps: [], target: i0.ɵɵFactoryTarget.Directive });
-    static ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "14.0.0", version: "16.2.9", type: HighlightTextModelDirective, selector: "[aupHighlightTextModel]", inputs: { aupHighlightTextModel: "aupHighlightTextModel" }, usesInheritance: true, ngImport: i0 });
-}
-__decorate([
-    Proxify(),
-    __metadata("design:type", Object)
-], HighlightTextModelDirective.prototype, "aupHighlightTextModel", null);
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.9", ngImport: i0, type: HighlightTextModelDirective, decorators: [{
-            type: Directive,
-            args: [{
-                    selector: '[aupHighlightTextModel]'
-                }]
-        }], ctorParameters: function () { return []; }, propDecorators: { aupHighlightTextModel: [{
-                type: Input
-            }] } });
-
 var Track;
 (function (Track) {
     Track.byIndex = (index, item) => index;
@@ -238,21 +213,11 @@ var Track;
 
 class DisposableComponent extends GarbageCollector {
     trackById = Track.byId();
-    // #_loaded$ = new MutableValueModel<boolean>();
-    // #asyncLoadables: Loadable[] = [];
-    // #awaitedLoadables: Loadable[] = [];
+    #_loaded$ = new MutableValueModel();
+    #asyncLoadables = [];
+    #awaitedLoadables = [];
     #initCallbacks = [];
     #initialised = false;
-    cdr = this.inject(ChangeDetectorRef);
-    highlightContext = this.inject(HighlightTextModelDirective, {
-        optional: true
-    });
-    constructor() {
-        super();
-        if (this.highlightContext) { // the component might be rendered outside a table
-            this.viewStateDependsOn(this.highlightContext.aupHighlightTextModel);
-        }
-    }
     onInit(callback) {
         if (this.#initialised) {
             callback();
@@ -261,36 +226,51 @@ class DisposableComponent extends GarbageCollector {
             this.#initCallbacks.push(callback);
         }
     }
+    get loaded$() {
+        return this.#_loaded$.readonly$;
+    }
     ngOnInit() {
         this.#initCallbacks.forEach(it => it());
+        this.#asyncLoadables.forEach(it => it.ensureLoaded());
+        if (this.#awaitedLoadables.length > 0) {
+            Promise.all(this.#awaitedLoadables.map(it => {
+                return it.ensureLoaded(); //.then(() => console.log(`${it.constructor.name} loaded`));
+            })).then(() => {
+                this.#_loaded$.value = true;
+            });
+        }
+        else {
+            this.#_loaded$.value = true;
+        }
         this.#initialised = true;
     }
-    ngOnDestroy() {
-        this.dispose();
-    }
-    inject(token, options) {
-        return inject(token, options);
+    inject(token) {
+        return inject(token);
     }
-    /**
-     * Monitors the specified models for any change and triggers and angular change detect cycle.  This is intended for use
-     * when the component uses the ON_PUSH change detection strategy or when it is contained within another component that
-     * does (e.g. aup-table, aup-tree-table)
-     * @param models
-     * @protected
-     */
-    viewStateDependsOn(...models) {
-        const { when } = Dsl.disposeWith(this);
-        when.anyOf(...models).changes(() => this.markForCheck());
+    injectLoadable(token, options) {
+        const loadable = inject(token);
+        if (this.loaded$.value) {
+            loadable.ensureLoaded();
+        }
+        else {
+            if (!options || options.wait === true) {
+                this.#awaitedLoadables.push(loadable);
+            }
+            else {
+                this.#asyncLoadables.push(loadable);
+            }
+        }
+        return loadable;
     }
-    markForCheck() {
-        this.cdr.markForCheck();
+    ngOnDestroy() {
+        this.dispose();
     }
-    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.9", ngImport: i0, type: DisposableComponent, deps: [], target: i0.ɵɵFactoryTarget.Directive });
+    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.9", ngImport: i0, type: DisposableComponent, deps: null, target: i0.ɵɵFactoryTarget.Directive });
     static ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "14.0.0", version: "16.2.9", type: DisposableComponent, usesInheritance: true, ngImport: i0 });
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.9", ngImport: i0, type: DisposableComponent, decorators: [{
             type: Directive
-        }], ctorParameters: function () { return []; } });
+        }] });
 
 let FocusBinding = class FocusBinding extends GarbageCollector {
     focusTargetElement;
@@ -486,6 +466,32 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.9", ngImpor
                 }]
         }], ctorParameters: function () { return []; } });
 
+class HighlightTextModelDirective extends GarbageCollector {
+    #aupHighlightTextModel_accessor_storage = proxify((ValueModel));
+    get aupHighlightTextModel() { return this.#aupHighlightTextModel_accessor_storage; }
+    set aupHighlightTextModel(value) { this.#aupHighlightTextModel_accessor_storage = value; }
+    constructor() {
+        super();
+    }
+    ngOnDestroy() {
+        this.dispose();
+    }
+    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.9", ngImport: i0, type: HighlightTextModelDirective, deps: [], target: i0.ɵɵFactoryTarget.Directive });
+    static ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "14.0.0", version: "16.2.9", type: HighlightTextModelDirective, selector: "[aupHighlightTextModel]", inputs: { aupHighlightTextModel: "aupHighlightTextModel" }, usesInheritance: true, ngImport: i0 });
+}
+__decorate([
+    Proxify(),
+    __metadata("design:type", Object)
+], HighlightTextModelDirective.prototype, "aupHighlightTextModel", null);
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.9", ngImport: i0, type: HighlightTextModelDirective, decorators: [{
+            type: Directive,
+            args: [{
+                    selector: '[aupHighlightTextModel]'
+                }]
+        }], ctorParameters: function () { return []; }, propDecorators: { aupHighlightTextModel: [{
+                type: Input
+            }] } });
+
 class HighlightPipe extends GarbageCollector {
     sanitizer;
     highlightContext;
@@ -498,20 +504,19 @@ class HighlightPipe extends GarbageCollector {
         this.dispose();
     }
     transform(value, searchModel) {
-        const sanitisedValue = escape(value);
         const model = searchModel ?? this.highlightContext?.aupHighlightTextModel;
-        const searchText = escape(model?.value);
+        const searchText = model?.value;
         if (isEmpty(searchText) || !isString(value)) {
-            return sanitisedValue;
+            return value;
         }
         // Match in a case insensitive manner
         const re = new RegExp(escapeStringRegexp(searchText), 'gi');
-        const match = sanitisedValue.match(re);
+        const match = value.match(re);
         // If there's no match, just return the original value.
         if (!match) {
-            return sanitisedValue;
+            return value;
         }
-        const result = sanitisedValue.replace(re, '<mark>' + match[0] + '</mark>');
+        const result = value.replace(re, '<mark>' + match[0] + '</mark>');
         return this.sanitizer.bypassSecurityTrustHtml(result);
     }
     static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.9", ngImport: i0, type: HighlightPipe, deps: [{ token: i1.DomSanitizer }, { token: HighlightTextModelDirective, optional: true }], target: i0.ɵɵFactoryTarget.Pipe });
@@ -731,42 +736,42 @@ var CommandFace;
         }
     }
     __decorate([
-        MemoizeGet(),
+        Memoize(),
         __metadata("design:type", Object),
         __metadata("design:paramtypes", [])
     ], Adapter.prototype, "text", null);
     __decorate([
-        MemoizeGet(),
+        Memoize(),
         __metadata("design:type", Object),
         __metadata("design:paramtypes", [])
     ], Adapter.prototype, "icon", null);
     __decorate([
-        MemoizeGet(),
+        Memoize(),
         __metadata("design:type", Object),
         __metadata("design:paramtypes", [])
     ], Adapter.prototype, "iconPosition", null);
     __decorate([
-        MemoizeGet(),
+        Memoize(),
         __metadata("design:type", Object),
         __metadata("design:paramtypes", [])
     ], Adapter.prototype, "tooltip", null);
     __decorate([
-        MemoizeGet(),
+        Memoize(),
         __metadata("design:type", Boolean),
         __metadata("design:paramtypes", [])
     ], Adapter.prototype, "iconPositionStart", null);
     __decorate([
-        MemoizeGet(),
+        Memoize(),
         __metadata("design:type", Boolean),
         __metadata("design:paramtypes", [])
     ], Adapter.prototype, "iconPositionEnd", null);
     __decorate([
-        MemoizeGet(),
+        Memoize(),
         __metadata("design:type", String),
         __metadata("design:paramtypes", [])
     ], Adapter.prototype, "color", null);
     __decorate([
-        MemoizeGet(),
+        Memoize(),
         __metadata("design:type", String),
         __metadata("design:paramtypes", [])
     ], Adapter.prototype, "style", null);
@@ -837,7 +842,6 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.9", ngImpor
                 args: ["class.disable-scroll"]
             }] } });
 
-/* eslint-disable @angular-eslint/no-host-metadata-property */
 class IconComponent {
     _icon;
     prefix;
@@ -869,13 +873,11 @@ class IconComponent {
         return `fa-${this.suffix}`;
     }
     static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.9", ngImport: i0, type: IconComponent, deps: [], target: i0.ɵɵFactoryTarget.Component });
-    static ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "16.2.9", type: IconComponent, selector: "aup-icon", inputs: { icon: "icon" }, host: { properties: { "attr.icon": "this.icon" }, classAttribute: "mat-icon" }, ngImport: i0, template: "<ng-container [ngSwitch]=\"prefix\">\n\n  <mat-icon *ngSwitchCase=\"iconPrefix.SVG\"\n            [svgIcon]=\"suffix\"\n            class=\"svgIcon\">\n  </mat-icon>\n\n  <mat-icon *ngSwitchCase=\"iconPrefix.MATERIAL\">\n    {{suffix}}\n  </mat-icon>\n\n  <div *ngSwitchCase=\"iconPrefix.FONT_AWESOME\" class=\"faIconWrapper\">\n    <i class=\"fa-solid\" [class]=\"faIcon\"></i>\n  </div>\n\n  <mat-icon *ngSwitchDefault\n            [matTooltip]=\"errorMessage\">\n    bug_report\n  </mat-icon>\n\n</ng-container>\n\n", styles: [":host{display:inline-flex;--resolved-size: var(--aup-icon-size, 24px);width:var(--resolved-size)!important;min-width:var(--resolved-size)!important;height:var(--resolved-size)!important;min-height:var(--resolved-size)!important}:host fa-icon{vertical-align:middle}:host .faIconWrapper{display:flex;flex-direction:row;align-items:center;justify-content:center;width:var(--resolved-size)!important;height:var(--resolved-size)!important}:host .svgIcon{width:var(--resolved-size)!important;height:var(--resolved-size)!important}:host :host(.mat-chip-remove){--aup-icon-size: 18px}:host mat-icon{font-size:var(--resolved-size)!important;width:var(--resolved-size)!important;height:var(--resolved-size)!important;margin-right:0!important}\n"], dependencies: [{ kind: "directive", type: i1$1.NgSwitch, selector: "[ngSwitch]", inputs: ["ngSwitch"] }, { kind: "directive", type: i1$1.NgSwitchCase, selector: "[ngSwitchCase]", inputs: ["ngSwitchCase"] }, { kind: "directive", type: i1$1.NgSwitchDefault, selector: "[ngSwitchDefault]" }, { kind: "component", type: i2$2.MatIcon, selector: "mat-icon", inputs: ["color", "inline", "svgIcon", "fontSet", "fontIcon"], exportAs: ["matIcon"] }, { kind: "directive", type: i4$1.MatTooltip, selector: "[matTooltip]", exportAs: ["matTooltip"] }], changeDetection: i0.ChangeDetectionStrategy.OnPush });
+    static ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "16.2.9", type: IconComponent, selector: "aup-icon", inputs: { icon: "icon" }, host: { properties: { "attr.icon": "this.icon" } }, ngImport: i0, template: "<ng-container [ngSwitch]=\"prefix\">\n\n  <mat-icon *ngSwitchCase=\"iconPrefix.SVG\"\n            [svgIcon]=\"suffix\"\n            class=\"svgIcon\">\n  </mat-icon>\n\n  <mat-icon *ngSwitchCase=\"iconPrefix.MATERIAL\">\n    {{suffix}}\n  </mat-icon>\n\n  <div *ngSwitchCase=\"iconPrefix.FONT_AWESOME\" class=\"faIconWrapper\">\n    <i class=\"fa-solid\" [class]=\"faIcon\"></i>\n  </div>\n\n  <mat-icon *ngSwitchDefault\n            [matTooltip]=\"errorMessage\">\n    bug_report\n  </mat-icon>\n\n</ng-container>\n\n", styles: [":host{display:inline-flex;--resolved-size: var(--aup-icon-size, 24px);width:var(--resolved-size) fa-icon;width-vertical-align:middle}:host .faIconWrapper{display:flex;flex-direction:row;align-items:center;justify-content:center;width:var(--resolved-size);height:var(--resolved-size)}:host .svgIcon{width:var(--resolved-size);height:var(--resolved-size)}:host :host(.mat-chip-remove){--aup-icon-size: 18px}:host mat-icon{font-size:var(--resolved-size);width:var(--resolved-size);height:var(--resolved-size);margin-right:0!important}\n"], dependencies: [{ kind: "directive", type: i1$1.NgSwitch, selector: "[ngSwitch]", inputs: ["ngSwitch"] }, { kind: "directive", type: i1$1.NgSwitchCase, selector: "[ngSwitchCase]", inputs: ["ngSwitchCase"] }, { kind: "directive", type: i1$1.NgSwitchDefault, selector: "[ngSwitchDefault]" }, { kind: "component", type: i2$2.MatIcon, selector: "mat-icon", inputs: ["color", "inline", "svgIcon", "fontSet", "fontIcon"], exportAs: ["matIcon"] }, { kind: "directive", type: i4$1.MatTooltip, selector: "[matTooltip]", exportAs: ["matTooltip"] }] });
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.9", ngImport: i0, type: IconComponent, decorators: [{
             type: Component,
-            args: [{ selector: 'aup-icon', changeDetection: ChangeDetectionStrategy.OnPush, host: {
-                        class: "mat-icon" // this ensures angular form styles that target mat icon also work with us
-                    }, template: "<ng-container [ngSwitch]=\"prefix\">\n\n  <mat-icon *ngSwitchCase=\"iconPrefix.SVG\"\n            [svgIcon]=\"suffix\"\n            class=\"svgIcon\">\n  </mat-icon>\n\n  <mat-icon *ngSwitchCase=\"iconPrefix.MATERIAL\">\n    {{suffix}}\n  </mat-icon>\n\n  <div *ngSwitchCase=\"iconPrefix.FONT_AWESOME\" class=\"faIconWrapper\">\n    <i class=\"fa-solid\" [class]=\"faIcon\"></i>\n  </div>\n\n  <mat-icon *ngSwitchDefault\n            [matTooltip]=\"errorMessage\">\n    bug_report\n  </mat-icon>\n\n</ng-container>\n\n", styles: [":host{display:inline-flex;--resolved-size: var(--aup-icon-size, 24px);width:var(--resolved-size)!important;min-width:var(--resolved-size)!important;height:var(--resolved-size)!important;min-height:var(--resolved-size)!important}:host fa-icon{vertical-align:middle}:host .faIconWrapper{display:flex;flex-direction:row;align-items:center;justify-content:center;width:var(--resolved-size)!important;height:var(--resolved-size)!important}:host .svgIcon{width:var(--resolved-size)!important;height:var(--resolved-size)!important}:host :host(.mat-chip-remove){--aup-icon-size: 18px}:host mat-icon{font-size:var(--resolved-size)!important;width:var(--resolved-size)!important;height:var(--resolved-size)!important;margin-right:0!important}\n"] }]
+            args: [{ selector: 'aup-icon', template: "<ng-container [ngSwitch]=\"prefix\">\n\n  <mat-icon *ngSwitchCase=\"iconPrefix.SVG\"\n            [svgIcon]=\"suffix\"\n            class=\"svgIcon\">\n  </mat-icon>\n\n  <mat-icon *ngSwitchCase=\"iconPrefix.MATERIAL\">\n    {{suffix}}\n  </mat-icon>\n\n  <div *ngSwitchCase=\"iconPrefix.FONT_AWESOME\" class=\"faIconWrapper\">\n    <i class=\"fa-solid\" [class]=\"faIcon\"></i>\n  </div>\n\n  <mat-icon *ngSwitchDefault\n            [matTooltip]=\"errorMessage\">\n    bug_report\n  </mat-icon>\n\n</ng-container>\n\n", styles: [":host{display:inline-flex;--resolved-size: var(--aup-icon-size, 24px);width:var(--resolved-size) fa-icon;width-vertical-align:middle}:host .faIconWrapper{display:flex;flex-direction:row;align-items:center;justify-content:center;width:var(--resolved-size);height:var(--resolved-size)}:host .svgIcon{width:var(--resolved-size);height:var(--resolved-size)}:host :host(.mat-chip-remove){--aup-icon-size: 18px}:host mat-icon{font-size:var(--resolved-size);width:var(--resolved-size);height:var(--resolved-size);margin-right:0!important}\n"] }]
         }], propDecorators: { icon: [{
                 type: Input
             }, {
@@ -906,7 +908,6 @@ class CommandFaceComponent extends DisposableComponent {
     // tslint:disable-next-line:no-input-rename
     get _rawFaces() { return this.#_rawFaces_accessor_storage; }
     set _rawFaces(value) { this.#_rawFaces_accessor_storage = value; }
-    hasTextAndLeadingIcon$;
     set face(face) {
         this.faces$.value = [face];
     }
@@ -926,7 +927,6 @@ class CommandFaceComponent extends DisposableComponent {
         const activeFace = this.faceAdapters.first();
         this.activeIcon = activeFace.pluck("icon");
         this.activeColor = activeFace.pluck("color");
-        this.hasTextAndLeadingIcon$ = valueOf.all(this.activeIcon.isNotNil(), activeFace.pluckString('text').isNotBlank(), activeFace.pluck("iconPosition").doesNotEqual(CommandFace.Position.END)).areTruthy();
     }
     shouldIncludeIcon(face) {
         return (!this.ignoreIcon && face.icon) || this.includeMissingIconInLayout;
@@ -940,11 +940,8 @@ class CommandFaceComponent extends DisposableComponent {
     get color() {
         return this.activeColor.value;
     }
-    get hasTextAndIcon() {
-        return this.hasTextAndLeadingIcon$.value;
-    }
     static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.9", ngImport: i0, type: CommandFaceComponent, deps: [], target: i0.ɵɵFactoryTarget.Component });
-    static ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "16.2.9", type: CommandFaceComponent, selector: "aup-command-face", inputs: { _rawFaces: ["faces", "_rawFaces"], face: "face", ignoreIcon: "ignoreIcon", ignoreText: "ignoreText", includeMissingIconInLayout: "includeMissingIconInLayout" }, host: { properties: { "class.hide-icon": "this.requiresMissingIconInLayout", "attr.color": "this.color", "class.has-text-and-leading-icon": "this.hasTextAndIcon" } }, usesInheritance: true, ngImport: i0, template: "<div class=\"face-container\" *ngFor=\"let face of faceAdapters.value\">\n  <aup-icon *ngIf=\"hasIconStart(face)\" [icon]=\"face.icon\"></aup-icon>\n  <span *ngIf=\"face.text\">{{face.text}}</span>\n  <aup-icon *ngIf=\"hasIconEnd(face)\" [icon]=\"face.icon\"></aup-icon>\n</div>\n", styles: ["aup-command-face{--icon-gap: var(--aup-command-face-icon-gap);display:inline-grid}aup-command-face>.face-container{grid-column:1;grid-row:1;display:inline-flex;flex-direction:row;align-items:center}aup-command-face>.face-container>span{white-space:nowrap}aup-command-face>.face-container:not(:first-child){visibility:hidden}aup-command-face>.face-container *+*{margin-left:var(--icon-gap)}aup-command-face.hide-icon aup-icon{visibility:hidden}aup-command-face.centered{justify-items:center}aup-command-face.start{justify-items:self-start}aup-command-face.end{justify-items:self-end}aup-command-face.has-text-and-leading-icon{margin-top:4px}\n"], dependencies: [{ kind: "directive", type: i1$1.NgForOf, selector: "[ngFor][ngForOf]", inputs: ["ngForOf", "ngForTrackBy", "ngForTemplate"] }, { kind: "directive", type: i1$1.NgIf, selector: "[ngIf]", inputs: ["ngIf", "ngIfThen", "ngIfElse"] }, { kind: "component", type: IconComponent, selector: "aup-icon", inputs: ["icon"] }], encapsulation: i0.ViewEncapsulation.None });
+    static ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "16.2.9", type: CommandFaceComponent, selector: "aup-command-face", inputs: { _rawFaces: ["faces", "_rawFaces"], face: "face", ignoreIcon: "ignoreIcon", ignoreText: "ignoreText", includeMissingIconInLayout: "includeMissingIconInLayout" }, host: { properties: { "class.hide-icon": "this.requiresMissingIconInLayout", "attr.color": "this.color" } }, usesInheritance: true, ngImport: i0, template: "<div class=\"face-container\" *ngFor=\"let face of faceAdapters.value\">\n  <aup-icon *ngIf=\"hasIconStart(face)\" [icon]=\"face.icon\"></aup-icon>\n  <span *ngIf=\"face.text\">{{face.text}}</span>\n  <aup-icon *ngIf=\"hasIconEnd(face)\" [icon]=\"face.icon\"></aup-icon>\n</div>\n", styles: ["aup-command-face{--icon-gap: var(--aup-command-face-icon-gap);display:inline-grid}aup-command-face>.face-container{grid-column:1;grid-row:1;display:inline-flex;flex-direction:row;align-items:center}aup-command-face>.face-container:not(:first-child){visibility:hidden}aup-command-face>.face-container *+*{margin-left:var(--icon-gap)}aup-command-face.hide-icon aup-icon{visibility:hidden}aup-command-face.centered{justify-items:center}aup-command-face.start{justify-items:self-start}aup-command-face.end{justify-items:self-end}\n"], dependencies: [{ kind: "directive", type: i1$1.NgForOf, selector: "[ngFor][ngForOf]", inputs: ["ngForOf", "ngForTrackBy", "ngForTemplate"] }, { kind: "directive", type: i1$1.NgIf, selector: "[ngIf]", inputs: ["ngIf", "ngIfThen", "ngIfElse"] }, { kind: "component", type: IconComponent, selector: "aup-icon", inputs: ["icon"] }], encapsulation: i0.ViewEncapsulation.None });
 }
 __decorate([
     StoreInListModel("faces$"),
@@ -952,7 +949,7 @@ __decorate([
 ], CommandFaceComponent.prototype, "_rawFaces", null);
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.9", ngImport: i0, type: CommandFaceComponent, decorators: [{
             type: Component,
-            args: [{ selector: 'aup-command-face', encapsulation: ViewEncapsulation.None, template: "<div class=\"face-container\" *ngFor=\"let face of faceAdapters.value\">\n  <aup-icon *ngIf=\"hasIconStart(face)\" [icon]=\"face.icon\"></aup-icon>\n  <span *ngIf=\"face.text\">{{face.text}}</span>\n  <aup-icon *ngIf=\"hasIconEnd(face)\" [icon]=\"face.icon\"></aup-icon>\n</div>\n", styles: ["aup-command-face{--icon-gap: var(--aup-command-face-icon-gap);display:inline-grid}aup-command-face>.face-container{grid-column:1;grid-row:1;display:inline-flex;flex-direction:row;align-items:center}aup-command-face>.face-container>span{white-space:nowrap}aup-command-face>.face-container:not(:first-child){visibility:hidden}aup-command-face>.face-container *+*{margin-left:var(--icon-gap)}aup-command-face.hide-icon aup-icon{visibility:hidden}aup-command-face.centered{justify-items:center}aup-command-face.start{justify-items:self-start}aup-command-face.end{justify-items:self-end}aup-command-face.has-text-and-leading-icon{margin-top:4px}\n"] }]
+            args: [{ selector: 'aup-command-face', encapsulation: ViewEncapsulation.None, template: "<div class=\"face-container\" *ngFor=\"let face of faceAdapters.value\">\n  <aup-icon *ngIf=\"hasIconStart(face)\" [icon]=\"face.icon\"></aup-icon>\n  <span *ngIf=\"face.text\">{{face.text}}</span>\n  <aup-icon *ngIf=\"hasIconEnd(face)\" [icon]=\"face.icon\"></aup-icon>\n</div>\n", styles: ["aup-command-face{--icon-gap: var(--aup-command-face-icon-gap);display:inline-grid}aup-command-face>.face-container{grid-column:1;grid-row:1;display:inline-flex;flex-direction:row;align-items:center}aup-command-face>.face-container:not(:first-child){visibility:hidden}aup-command-face>.face-container *+*{margin-left:var(--icon-gap)}aup-command-face.hide-icon aup-icon{visibility:hidden}aup-command-face.centered{justify-items:center}aup-command-face.start{justify-items:self-start}aup-command-face.end{justify-items:self-end}\n"] }]
         }], ctorParameters: function () { return []; }, propDecorators: { _rawFaces: [{
                 type: Input,
                 args: ['faces']
@@ -970,9 +967,6 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.9", ngImpor
             }], color: [{
                 type: HostBinding,
                 args: ['attr.color']
-            }], hasTextAndIcon: [{
-                type: HostBinding,
-                args: ['class.has-text-and-leading-icon']
             }] } });
 
 /**
@@ -1076,11 +1070,11 @@ class CardContainerComponent extends AbstractCardContainerComponent {
         }
     }
     static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.9", ngImport: i0, type: CardContainerComponent, deps: [{ token: i0.ElementRef }], target: i0.ɵɵFactoryTarget.Component });
-    static ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "16.2.9", type: CardContainerComponent, selector: "aup-card-container", inputs: { columnCount: "columnCount", enableScroll: "enableScroll" }, host: { properties: { "class.auto-columns": "this.isAutoColumns", "class.single-column": "this.isSingleColumn" } }, usesInheritance: true, ngImport: i0, template: "<div class=\"header-container\">\n  <ng-content select=\"[card-container-header], [slot=header]\"></ng-content>\n</div>\n\n<ng-template #content>\n  <div class=\"card-container\">\n    <ng-content></ng-content>\n\n    <div class=\"add-card-container\" *ngIf=\"addCardCommand.enabled$.value\" [pectinCommand]=\"addCardCommand\">\n      <aup-command-face *ngIf=\"addCardFace\" [faces]=\"[addCardFace]\"></aup-command-face>\n      <aup-icon *ngIf=\"!addCardFace\" icon=\"mat:add\"></aup-icon>\n    </div>\n\n    <div class=\"add-card-template\" *ngIf=\"addCardTemplate\">\n      <ng-container [ngTemplateOutlet]=\"addCardTemplate\"></ng-container>\n    </div>\n  </div>\n</ng-template>\n\n<div class=\"no-scroll-container\" *ngIf=\"!enableScroll\">\n  <ng-container *ngTemplateOutlet=\"content\"></ng-container>\n</div>\n\n<aup-scroll-container *ngIf=\"enableScroll\">\n  <ng-container *ngTemplateOutlet=\"content\"></ng-container>\n</aup-scroll-container>\n\n<div class=\"footer-container\">\n  <ng-content select=\"[card-container-footer], [slot=footer]\"></ng-content>\n</div>\n\n", styles: [":host{--resolved-card-gap: var(--card-gap, 16px);--resolved-card-width: var(--card-width, 300px);--resolved-card-min-width: var(--card-min-width, var(--card-width, var(--card-max-width)));--resolved-card-max-width: var(--card-max-width, var(--card-width, var(--card-min-width)));--resolved-card-height: var(--card-height, auto);--resolved-card-min-height: var(--card-min-height, auto);--resolved-card-background: var(--card-background, var(--aup-card-container-default-background-color));flex:1;display:flex;flex-direction:column;align-items:stretch;background:var(--resolved-card-background)}:host.auto-columns>*>.card-container{grid-template-columns:repeat(auto-fill,minmax(var(--resolved-card-min-width),var(--resolved-card-max-width)))}:host:not(.auto-columns)>*>.card-container{grid-template-columns:repeat(var(--aup-card-container-column-count),1fr)}.card-container{display:grid;box-sizing:border-box;padding:var(--resolved-card-gap);min-height:calc(var(--resolved-card-height) + 2 * var(--resolved-card-gap));max-width:100%;grid-auto-rows:minmax(var(--resolved-card-min-height),var(--resolved-card-height));grid-gap:var(--resolved-card-gap)}aup-scroll-container,.no-scroll-container{flex:1}.add-card-container{height:var(--resolved-card-height);min-height:var(--resolved-card-min-height);display:flex;flex-direction:column;align-items:center;justify-content:center;transition:box-shadow .28s cubic-bezier(.4,0,.2,1);box-sizing:border-box;border:2px dashed rgba(0,0,0,.1);border-radius:6px;font-weight:300;cursor:pointer;color:#0000008a;background-color:#fffc}.add-card-container mat-icon{font-size:200%}.add-card-container:hover{box-shadow:0 3px 1px -2px #0003,0 2px 2px #00000024,0 1px 5px #0000001f}.add-card-container:hover{border-color:transparent;background-color:#fff;color:#0000008a}.add-card-template-container{height:var(--resolved-card-height);min-height:var(--resolved-card-min-height);display:flex;flex-direction:column;align-items:stretch;justify-content:stretch}\n"], dependencies: [{ kind: "directive", type: i1$1.NgIf, selector: "[ngIf]", inputs: ["ngIf", "ngIfThen", "ngIfElse"] }, { kind: "directive", type: i1$1.NgTemplateOutlet, selector: "[ngTemplateOutlet]", inputs: ["ngTemplateOutletContext", "ngTemplateOutlet", "ngTemplateOutletInjector"] }, { kind: "directive", type: CommandDirective, selector: "[pectinCommand]", inputs: ["pectinCommand", "commandParameter"] }, { kind: "component", type: ScrollContainerComponent, selector: "aup-scroll-container", inputs: ["disableScroll$", "disableScroll"] }, { kind: "component", type: IconComponent, selector: "aup-icon", inputs: ["icon"] }, { kind: "component", type: CommandFaceComponent, selector: "aup-command-face", inputs: ["faces", "face", "ignoreIcon", "ignoreText", "includeMissingIconInLayout"] }] });
+    static ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "16.2.9", type: CardContainerComponent, selector: "aup-card-container", inputs: { columnCount: "columnCount", enableScroll: "enableScroll" }, host: { properties: { "class.auto-columns": "this.isAutoColumns", "class.single-column": "this.isSingleColumn" } }, usesInheritance: true, ngImport: i0, template: "<div class=\"header-container\">\n  <ng-content select=\"[card-container-header]\"></ng-content>\n</div>\n\n<ng-template #content>\n  <div class=\"card-container\">\n    <ng-content></ng-content>\n\n    <div class=\"add-card-container\" *ngIf=\"addCardCommand.enabled$.value\" [pectinCommand]=\"addCardCommand\">\n      <aup-command-face *ngIf=\"addCardFace\" [faces]=\"[addCardFace]\"></aup-command-face>\n      <aup-icon *ngIf=\"!addCardFace\" icon=\"mat:add\"></aup-icon>\n    </div>\n\n    <div class=\"add-card-template\" *ngIf=\"addCardTemplate\">\n      <ng-container [ngTemplateOutlet]=\"addCardTemplate\"></ng-container>\n    </div>\n  </div>\n</ng-template>\n\n<div class=\"no-scroll-container\" *ngIf=\"!enableScroll\">\n    <ng-container *ngTemplateOutlet=\"content\"></ng-container>\n</div>\n\n<aup-scroll-container *ngIf=\"enableScroll\">\n    <ng-container *ngTemplateOutlet=\"content\"></ng-container>\n</aup-scroll-container>\n\n<div class=\"footer-container\">\n  <ng-content select=\"[card-container-footer]\"></ng-content>\n</div>\n\n", styles: [":host{--resolved-card-gap: var(--card-gap, 16px);--resolved-card-width: var(--card-width, 300px);--resolved-card-max-width: var(--card-max-width, auto);--resolved-card-height: var(--card-height, auto);--resolved-card-min-height: var(--card-min-height, auto);--resolved-card-background: var(--card-background, var(--aup-card-container-default-background-color));flex:1;display:flex;flex-direction:column;align-items:stretch;background:var(--resolved-card-background)}:host.auto-columns>*>.card-container{grid-template-columns:repeat(auto-fit,minmax(var(--resolved-card-width),var(--resolved-card-max-width)));min-width:calc(var(--resolved-card-width) + 2 * var(--resolved-card-gap));width:calc((var(--resolved-card-width) + var(--resolved-card-gap)) * 2 + var(--grid-gap))}:host:not(.auto-columns)>*>.card-container{grid-template-columns:repeat(var(--aup-card-container-column-count),1fr)}.card-container{display:grid;box-sizing:border-box;padding:var(--resolved-card-gap);min-height:calc(var(--resolved-card-height) + 2 * var(--resolved-card-gap));max-width:100%;grid-auto-rows:minmax(var(--resolved-card-min-height),var(--resolved-card-height));grid-gap:var(--resolved-card-gap)}aup-scroll-container,.no-scroll-container{flex:1}.add-card-container{height:var(--resolved-card-height);min-height:var(--resolved-card-min-height);display:flex;flex-direction:column;align-items:center;justify-content:center;transition:box-shadow .28s cubic-bezier(.4,0,.2,1);box-sizing:border-box;border:2px dashed rgba(0,0,0,.1);border-radius:6px;font-weight:300;cursor:pointer;color:#0000008a;background-color:#fffc}.add-card-container mat-icon{font-size:200%}.add-card-container:hover{box-shadow:0 3px 1px -2px #0003,0 2px 2px #00000024,0 1px 5px #0000001f}.add-card-container:hover{border-color:transparent;background-color:#fff;color:#0000008a}.add-card-template-container{height:var(--resolved-card-height);min-height:var(--resolved-card-min-height);display:flex;flex-direction:column;align-items:stretch;justify-content:stretch}\n"], dependencies: [{ kind: "directive", type: i1$1.NgIf, selector: "[ngIf]", inputs: ["ngIf", "ngIfThen", "ngIfElse"] }, { kind: "directive", type: i1$1.NgTemplateOutlet, selector: "[ngTemplateOutlet]", inputs: ["ngTemplateOutletContext", "ngTemplateOutlet", "ngTemplateOutletInjector"] }, { kind: "directive", type: CommandDirective, selector: "[pectinCommand]", inputs: ["pectinCommand", "commandParameter"] }, { kind: "component", type: ScrollContainerComponent, selector: "aup-scroll-container", inputs: ["disableScroll$", "disableScroll"] }, { kind: "component", type: IconComponent, selector: "aup-icon", inputs: ["icon"] }, { kind: "component", type: CommandFaceComponent, selector: "aup-command-face", inputs: ["faces", "face", "ignoreIcon", "ignoreText", "includeMissingIconInLayout"] }] });
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.9", ngImport: i0, type: CardContainerComponent, decorators: [{
             type: Component,
-            args: [{ selector: 'aup-card-container', template: "<div class=\"header-container\">\n  <ng-content select=\"[card-container-header], [slot=header]\"></ng-content>\n</div>\n\n<ng-template #content>\n  <div class=\"card-container\">\n    <ng-content></ng-content>\n\n    <div class=\"add-card-container\" *ngIf=\"addCardCommand.enabled$.value\" [pectinCommand]=\"addCardCommand\">\n      <aup-command-face *ngIf=\"addCardFace\" [faces]=\"[addCardFace]\"></aup-command-face>\n      <aup-icon *ngIf=\"!addCardFace\" icon=\"mat:add\"></aup-icon>\n    </div>\n\n    <div class=\"add-card-template\" *ngIf=\"addCardTemplate\">\n      <ng-container [ngTemplateOutlet]=\"addCardTemplate\"></ng-container>\n    </div>\n  </div>\n</ng-template>\n\n<div class=\"no-scroll-container\" *ngIf=\"!enableScroll\">\n  <ng-container *ngTemplateOutlet=\"content\"></ng-container>\n</div>\n\n<aup-scroll-container *ngIf=\"enableScroll\">\n  <ng-container *ngTemplateOutlet=\"content\"></ng-container>\n</aup-scroll-container>\n\n<div class=\"footer-container\">\n  <ng-content select=\"[card-container-footer], [slot=footer]\"></ng-content>\n</div>\n\n", styles: [":host{--resolved-card-gap: var(--card-gap, 16px);--resolved-card-width: var(--card-width, 300px);--resolved-card-min-width: var(--card-min-width, var(--card-width, var(--card-max-width)));--resolved-card-max-width: var(--card-max-width, var(--card-width, var(--card-min-width)));--resolved-card-height: var(--card-height, auto);--resolved-card-min-height: var(--card-min-height, auto);--resolved-card-background: var(--card-background, var(--aup-card-container-default-background-color));flex:1;display:flex;flex-direction:column;align-items:stretch;background:var(--resolved-card-background)}:host.auto-columns>*>.card-container{grid-template-columns:repeat(auto-fill,minmax(var(--resolved-card-min-width),var(--resolved-card-max-width)))}:host:not(.auto-columns)>*>.card-container{grid-template-columns:repeat(var(--aup-card-container-column-count),1fr)}.card-container{display:grid;box-sizing:border-box;padding:var(--resolved-card-gap);min-height:calc(var(--resolved-card-height) + 2 * var(--resolved-card-gap));max-width:100%;grid-auto-rows:minmax(var(--resolved-card-min-height),var(--resolved-card-height));grid-gap:var(--resolved-card-gap)}aup-scroll-container,.no-scroll-container{flex:1}.add-card-container{height:var(--resolved-card-height);min-height:var(--resolved-card-min-height);display:flex;flex-direction:column;align-items:center;justify-content:center;transition:box-shadow .28s cubic-bezier(.4,0,.2,1);box-sizing:border-box;border:2px dashed rgba(0,0,0,.1);border-radius:6px;font-weight:300;cursor:pointer;color:#0000008a;background-color:#fffc}.add-card-container mat-icon{font-size:200%}.add-card-container:hover{box-shadow:0 3px 1px -2px #0003,0 2px 2px #00000024,0 1px 5px #0000001f}.add-card-container:hover{border-color:transparent;background-color:#fff;color:#0000008a}.add-card-template-container{height:var(--resolved-card-height);min-height:var(--resolved-card-min-height);display:flex;flex-direction:column;align-items:stretch;justify-content:stretch}\n"] }]
+            args: [{ selector: 'aup-card-container', template: "<div class=\"header-container\">\n  <ng-content select=\"[card-container-header]\"></ng-content>\n</div>\n\n<ng-template #content>\n  <div class=\"card-container\">\n    <ng-content></ng-content>\n\n    <div class=\"add-card-container\" *ngIf=\"addCardCommand.enabled$.value\" [pectinCommand]=\"addCardCommand\">\n      <aup-command-face *ngIf=\"addCardFace\" [faces]=\"[addCardFace]\"></aup-command-face>\n      <aup-icon *ngIf=\"!addCardFace\" icon=\"mat:add\"></aup-icon>\n    </div>\n\n    <div class=\"add-card-template\" *ngIf=\"addCardTemplate\">\n      <ng-container [ngTemplateOutlet]=\"addCardTemplate\"></ng-container>\n    </div>\n  </div>\n</ng-template>\n\n<div class=\"no-scroll-container\" *ngIf=\"!enableScroll\">\n    <ng-container *ngTemplateOutlet=\"content\"></ng-container>\n</div>\n\n<aup-scroll-container *ngIf=\"enableScroll\">\n    <ng-container *ngTemplateOutlet=\"content\"></ng-container>\n</aup-scroll-container>\n\n<div class=\"footer-container\">\n  <ng-content select=\"[card-container-footer]\"></ng-content>\n</div>\n\n", styles: [":host{--resolved-card-gap: var(--card-gap, 16px);--resolved-card-width: var(--card-width, 300px);--resolved-card-max-width: var(--card-max-width, auto);--resolved-card-height: var(--card-height, auto);--resolved-card-min-height: var(--card-min-height, auto);--resolved-card-background: var(--card-background, var(--aup-card-container-default-background-color));flex:1;display:flex;flex-direction:column;align-items:stretch;background:var(--resolved-card-background)}:host.auto-columns>*>.card-container{grid-template-columns:repeat(auto-fit,minmax(var(--resolved-card-width),var(--resolved-card-max-width)));min-width:calc(var(--resolved-card-width) + 2 * var(--resolved-card-gap));width:calc((var(--resolved-card-width) + var(--resolved-card-gap)) * 2 + var(--grid-gap))}:host:not(.auto-columns)>*>.card-container{grid-template-columns:repeat(var(--aup-card-container-column-count),1fr)}.card-container{display:grid;box-sizing:border-box;padding:var(--resolved-card-gap);min-height:calc(var(--resolved-card-height) + 2 * var(--resolved-card-gap));max-width:100%;grid-auto-rows:minmax(var(--resolved-card-min-height),var(--resolved-card-height));grid-gap:var(--resolved-card-gap)}aup-scroll-container,.no-scroll-container{flex:1}.add-card-container{height:var(--resolved-card-height);min-height:var(--resolved-card-min-height);display:flex;flex-direction:column;align-items:center;justify-content:center;transition:box-shadow .28s cubic-bezier(.4,0,.2,1);box-sizing:border-box;border:2px dashed rgba(0,0,0,.1);border-radius:6px;font-weight:300;cursor:pointer;color:#0000008a;background-color:#fffc}.add-card-container mat-icon{font-size:200%}.add-card-container:hover{box-shadow:0 3px 1px -2px #0003,0 2px 2px #00000024,0 1px 5px #0000001f}.add-card-container:hover{border-color:transparent;background-color:#fff;color:#0000008a}.add-card-template-container{height:var(--resolved-card-height);min-height:var(--resolved-card-min-height);display:flex;flex-direction:column;align-items:stretch;justify-content:stretch}\n"] }]
         }], ctorParameters: function () { return [{ type: i0.ElementRef }]; }, propDecorators: { columnCount: [{
                 type: Input
             }], enableScroll: [{
@@ -1156,24 +1150,14 @@ class CommandComponent extends PopupAwareComponent {
     activeFace$;
     iconOnly$;
     tooltip$;
-    visible$;
     constructor(element, parent) {
         super(element, parent);
         const { chain, switchOn } = Dsl.disposeWith(this);
-        this.faces$ = chain(this.command.busy$)
-            .mapToList(busy => {
+        this.faces$ = chain(this.command.busy$).mapToList(busy => {
             return busy ?
-                [this.busyFace$.value ?? this.command.busyFace$.value, this.face$.value ?? this.command.defaultFace$.value] :
-                [this.face$.value ?? this.command.defaultFace$.value, this.busyFace$.value ?? this.command.busyFace$.value];
-        }, {
-            allowNil: true,
-            dependsOn: [
-                this.face$,
-                this.busyFace$,
-                this.command.defaultFace$,
-                this.command.busyFace$
-            ]
-        })
+                [this.busyFace$.value, this.face$.value] :
+                [this.face$.value, this.busyFace$.value];
+        }, { allowNil: true, dependsOn: [this.face$, this.busyFace$] })
             .rejectNil();
         this.activeFace$ = this.faces$.first();
         this.buttonStyle$ = chain(this.activeFace$).map(f => CommandFace.getStyleOf(f));
@@ -1182,19 +1166,18 @@ class CommandComponent extends PopupAwareComponent {
         this.iconOnly$ = this.faces$.select(face => {
             return isEmpty(CommandFace.getTextOf(face)) && !isEmpty(CommandFace.getIconOf(face));
         }).count().equals(this.faces$.count());
-        this.visible$ = chain(this.command.visible$);
-    }
-    get cssDisplayProperty() {
-        return this.visible$.value ? undefined : 'none';
     }
     isActive(face) {
         return this.activeFace$.query().equals(face);
     }
+    getFace() {
+        return this.face;
+    }
     requestFocus() {
         this.button.focus();
     }
     static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.9", ngImport: i0, type: CommandComponent, deps: [{ token: i0.ElementRef }, { token: POPUP_CONTAINER, optional: true }], target: i0.ɵɵFactoryTarget.Component });
-    static ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "16.2.9", type: CommandComponent, selector: "aup-command", inputs: { command: "command", face$: "face$", face: "face", busyFace$: "busyFace$", busyFace: "busyFace", alignFace: "alignFace" }, host: { properties: { "class": "this.alignFace", "style.display": "this.cssDisplayProperty" } }, viewQueries: [{ propertyName: "button", first: true, predicate: MatButton, descendants: true }], usesInheritance: true, ngImport: i0, template: "<ng-container *ngIf=\"iconOnly$.value\">\n  <button mat-icon-button [pectinCommand]=\"command\" [color]=\"color$.value\" [class.busy]=\"command.busy$.value\"\n          [matTooltip]=\"tooltip$.value\">\n    <aup-command-face [class]=\"alignFace\" [faces]=\"faces$.value\"></aup-command-face>\n  </button>\n</ng-container>\n<ng-container *ngIf=\"!iconOnly$.value\">\n  <ng-container [ngSwitch]=\"buttonStyle$.value\">\n    <ng-container *ngSwitchCase=\"CommandFace.Style.STROKED\">\n      <button mat-stroked-button [pectinCommand]=\"command\" [color]=\"color$.value\" [class.busy]=\"command.busy$.value\"\n              [matTooltip]=\"tooltip$.value\">\n        <aup-command-face [class]=\"alignFace\" [faces]=\"faces$.value\"></aup-command-face>\n      </button>\n    </ng-container>\n    <ng-container *ngSwitchCase=\"CommandFace.Style.RAISED\">\n      <button mat-raised-button [pectinCommand]=\"command\" [color]=\"color$.value\" [class.busy]=\"command.busy$.value\"\n              [matTooltip]=\"tooltip$.value\">\n        <aup-command-face [class]=\"alignFace\" [faces]=\"faces$.value\"></aup-command-face>\n      </button>\n    </ng-container>\n    <ng-container *ngSwitchDefault>\n      <button mat-button [pectinCommand]=\"command\" [color]=\"color$.value\" [class.busy]=\"command.busy$.value\"\n              [matTooltip]=\"tooltip$.value\">\n        <aup-command-face [class]=\"alignFace\" [faces]=\"faces$.value\"></aup-command-face>\n      </button>\n    </ng-container>\n  </ng-container>\n</ng-container>\n", styles: [":host{display:inline-flex;flex-direction:row;justify-content:stretch}:host.centered button{text-align:center}:host.start button{text-align:start}:host.end button{text-align:end}button{flex:1}\n"], dependencies: [{ kind: "directive", type: i1$1.NgIf, selector: "[ngIf]", inputs: ["ngIf", "ngIfThen", "ngIfElse"] }, { kind: "directive", type: i1$1.NgSwitch, selector: "[ngSwitch]", inputs: ["ngSwitch"] }, { kind: "directive", type: i1$1.NgSwitchCase, selector: "[ngSwitchCase]", inputs: ["ngSwitchCase"] }, { kind: "directive", type: i1$1.NgSwitchDefault, selector: "[ngSwitchDefault]" }, { kind: "directive", type: CommandDirective, selector: "[pectinCommand]", inputs: ["pectinCommand", "commandParameter"] }, { kind: "component", type: i2.MatButton, selector: "    button[mat-button], button[mat-raised-button], button[mat-flat-button],    button[mat-stroked-button]  ", inputs: ["disabled", "disableRipple", "color"], exportAs: ["matButton"] }, { kind: "component", type: i2.MatIconButton, selector: "button[mat-icon-button]", inputs: ["disabled", "disableRipple", "color"], exportAs: ["matButton"] }, { kind: "directive", type: i4$1.MatTooltip, selector: "[matTooltip]", exportAs: ["matTooltip"] }, { kind: "component", type: CommandFaceComponent, selector: "aup-command-face", inputs: ["faces", "face", "ignoreIcon", "ignoreText", "includeMissingIconInLayout"] }] });
+    static ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "16.2.9", type: CommandComponent, selector: "aup-command", inputs: { command: "command", face$: "face$", face: "face", busyFace$: "busyFace$", busyFace: "busyFace", alignFace: "alignFace" }, host: { properties: { "class": "this.alignFace" } }, viewQueries: [{ propertyName: "button", first: true, predicate: MatButton, descendants: true }], usesInheritance: true, ngImport: i0, template: "<ng-container *ngIf=\"iconOnly$.value\">\n  <button mat-icon-button [pectinCommand]=\"command\" [color]=\"color$.value\" [class.busy]=\"command.busy$.value\"\n          [matTooltip]=\"tooltip$.value\">\n    <aup-command-face [class]=\"alignFace\" [faces]=\"faces$.value\"></aup-command-face>\n  </button>\n</ng-container>\n<ng-container *ngIf=\"!iconOnly$.value\">\n  <ng-container [ngSwitch]=\"buttonStyle$.value\">\n    <ng-container *ngSwitchCase=\"CommandFace.Style.STROKED\">\n      <button mat-stroked-button [pectinCommand]=\"command\" [color]=\"color$.value\" [class.busy]=\"command.busy$.value\"\n              [matTooltip]=\"tooltip$.value\">\n        <aup-command-face [class]=\"alignFace\" [faces]=\"faces$.value\"></aup-command-face>\n      </button>\n    </ng-container>\n    <ng-container *ngSwitchCase=\"CommandFace.Style.RAISED\">\n      <button mat-raised-button [pectinCommand]=\"command\" [color]=\"color$.value\" [class.busy]=\"command.busy$.value\"\n              [matTooltip]=\"tooltip$.value\">\n        <aup-command-face [class]=\"alignFace\" [faces]=\"faces$.value\"></aup-command-face>\n      </button>\n    </ng-container>\n    <ng-container *ngSwitchDefault>\n      <button mat-button [pectinCommand]=\"command\" [color]=\"color$.value\" [class.busy]=\"command.busy$.value\"\n              [matTooltip]=\"tooltip$.value\">\n        <aup-command-face [class]=\"alignFace\" [faces]=\"faces$.value\"></aup-command-face>\n      </button>\n    </ng-container>\n  </ng-container>\n</ng-container>\n", styles: [":host{display:inline-flex;flex-direction:row;justify-content:stretch}:host.centered button{text-align:center}:host.start button{text-align:start}:host.end button{text-align:end}button{flex:1}\n"], dependencies: [{ kind: "directive", type: i1$1.NgIf, selector: "[ngIf]", inputs: ["ngIf", "ngIfThen", "ngIfElse"] }, { kind: "directive", type: i1$1.NgSwitch, selector: "[ngSwitch]", inputs: ["ngSwitch"] }, { kind: "directive", type: i1$1.NgSwitchCase, selector: "[ngSwitchCase]", inputs: ["ngSwitchCase"] }, { kind: "directive", type: i1$1.NgSwitchDefault, selector: "[ngSwitchDefault]" }, { kind: "directive", type: CommandDirective, selector: "[pectinCommand]", inputs: ["pectinCommand", "commandParameter"] }, { kind: "component", type: i2.MatButton, selector: "    button[mat-button], button[mat-raised-button], button[mat-flat-button],    button[mat-stroked-button]  ", inputs: ["disabled", "disableRipple", "color"], exportAs: ["matButton"] }, { kind: "component", type: i2.MatIconButton, selector: "button[mat-icon-button]", inputs: ["disabled", "disableRipple", "color"], exportAs: ["matButton"] }, { kind: "directive", type: i4$1.MatTooltip, selector: "[matTooltip]", exportAs: ["matTooltip"] }, { kind: "component", type: CommandFaceComponent, selector: "aup-command-face", inputs: ["faces", "face", "ignoreIcon", "ignoreText", "includeMissingIconInLayout"] }] });
 }
 __decorate([
     Proxify(),
@@ -1242,9 +1225,6 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.9", ngImpor
             }], button: [{
                 type: ViewChild,
                 args: [MatButton]
-            }], cssDisplayProperty: [{
-                type: HostBinding,
-                args: ["style.display"]
             }] } });
 
 /**
@@ -1272,12 +1252,12 @@ class AbstractPopupMenuComponent extends PopupAwareComponent {
     xPosition = 'after';
     yPosition = 'below';
     triggers;
+    #enabled_accessor_storage;
+    get enabled() { return this.#enabled_accessor_storage; }
+    set enabled(value) { this.#enabled_accessor_storage = value; }
     #enabled$_accessor_storage = proxify((ValueModel));
     get enabled$() { return this.#enabled$_accessor_storage; }
     set enabled$(value) { this.#enabled$_accessor_storage = value; }
-    #enabled_accessor_storage = true;
-    get enabled() { return this.#enabled_accessor_storage; }
-    set enabled(value) { this.#enabled_accessor_storage = value; }
     children;
     faces$;
     constructor(element, parent) {
@@ -1319,16 +1299,16 @@ class AbstractPopupMenuComponent extends PopupAwareComponent {
         return this.faceAdapter.face;
     }
     static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.9", ngImport: i0, type: AbstractPopupMenuComponent, deps: [{ token: i0.ElementRef }, { token: POPUP_CONTAINER }], target: i0.ɵɵFactoryTarget.Component });
-    static ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "16.2.9", type: AbstractPopupMenuComponent, selector: "aup-abstract-popup-menu", inputs: { xPosition: "xPosition", yPosition: "yPosition", enabled$: "enabled$", enabled: "enabled" }, viewQueries: [{ propertyName: "triggers", predicate: MatMenuTrigger, descendants: true }], usesInheritance: true, ngImport: i0, template: '', isInline: true });
+    static ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "16.2.9", type: AbstractPopupMenuComponent, selector: "aup-abstract-popup-menu", inputs: { xPosition: "xPosition", yPosition: "yPosition", enabled: "enabled", enabled$: "enabled$" }, viewQueries: [{ propertyName: "triggers", predicate: MatMenuTrigger, descendants: true }], usesInheritance: true, ngImport: i0, template: '', isInline: true });
 }
+__decorate([
+    StoreInValueModel(),
+    __metadata("design:type", Boolean)
+], AbstractPopupMenuComponent.prototype, "enabled", null);
 __decorate([
     Proxify(),
     __metadata("design:type", Object)
 ], AbstractPopupMenuComponent.prototype, "enabled$", null);
-__decorate([
-    StoreInValueModel(),
-    __metadata("design:type", Object)
-], AbstractPopupMenuComponent.prototype, "enabled", null);
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.9", ngImport: i0, type: AbstractPopupMenuComponent, decorators: [{
             type: Component,
             args: [{ selector: 'aup-abstract-popup-menu', template: '' }]
@@ -1342,10 +1322,10 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.9", ngImpor
             }], triggers: [{
                 type: ViewChildren,
                 args: [MatMenuTrigger]
-            }], enabled$: [{
-                type: Input
             }], enabled: [{
                 type: Input
+            }], enabled$: [{
+                type: Input
             }] } });
 
 class CommandContainer extends GarbageCollector {
@@ -1378,15 +1358,13 @@ class ToolBarComponent extends CommandContainer {
     get orientation() {
         return CommandContainer.Orientation.HORIZONTAL;
     }
-    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.9", ngImport: i0, type: ToolBarComponent, deps: [{ token: CommandContainer, optional: true }], target: i0.ɵɵFactoryTarget.Component });
+    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.9", ngImport: i0, type: ToolBarComponent, deps: [{ token: CommandContainer }], target: i0.ɵɵFactoryTarget.Component });
     static ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "16.2.9", type: ToolBarComponent, selector: "aup-tool-bar", usesInheritance: true, ngImport: i0, template: '<div class="toolbar-content"><ng-content></ng-content></div>', isInline: true, styles: [":host{display:inline-block}.toolbar-content{display:inline-flex;flex-direction:row;align-items:center}.toolbar-content>aup-separator{align-self:stretch;margin:4px 0 4px 8px}.toolbar-content>aup-flex{flex:1}.toolbar-content>*+*{margin-left:8px}\n"], encapsulation: i0.ViewEncapsulation.None });
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.9", ngImport: i0, type: ToolBarComponent, decorators: [{
             type: Component,
             args: [{ selector: 'aup-tool-bar', template: '<div class="toolbar-content"><ng-content></ng-content></div>', encapsulation: ViewEncapsulation.None, styles: [":host{display:inline-block}.toolbar-content{display:inline-flex;flex-direction:row;align-items:center}.toolbar-content>aup-separator{align-self:stretch;margin:4px 0 4px 8px}.toolbar-content>aup-flex{flex:1}.toolbar-content>*+*{margin-left:8px}\n"] }]
-        }], ctorParameters: function () { return [{ type: CommandContainer, decorators: [{
-                    type: Optional
-                }] }]; } });
+        }], ctorParameters: function () { return [{ type: CommandContainer }]; } });
 
 /**
  *
@@ -1697,6 +1675,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.9", ngImpor
                 args: ['blur']
             }] } });
 
+/* tslint:disable:no-input-rename */
 const INPUT_TOKEN_HACK = new InjectionToken("INPUT_TOKEN_HACK");
 class AbstractInputComponent extends DisposableComponent {
     onValueEditedListeners = new EventListenerList();
@@ -1711,16 +1690,11 @@ class AbstractInputComponent extends DisposableComponent {
      * gets told it's an Object and can't scan for a base type annotated with @DelegateUsing(..).
      */
     formValue$;
-    #i18n$_accessor_storage = proxify((MutableValueModel));
-    get i18n$() { return this.#i18n$_accessor_storage; }
-    set i18n$(value) { this.#i18n$_accessor_storage = value; }
-    #i18n_accessor_storage;
-    get i18n() { return this.#i18n_accessor_storage; }
-    set i18n(value) { this.#i18n_accessor_storage = value; }
-    _label;
+    label;
+    // eslint-disable-next-line @angular-eslint/no-input-rename
     userFloatLabel = 'always'; // TODO: make this an injectable default
-    _hint;
-    _placeholder;
+    hint;
+    placeholder;
     dense = false;
     _enabled$ = this.registerDisposable(new DelegatingValueModel());
     set enabled$(condition$) {
@@ -1787,9 +1761,6 @@ class AbstractInputComponent extends DisposableComponent {
     isEnabled() {
         return this.enabled$.value;
     }
-    get disabled() {
-        return !this.isEnabled();
-    }
     hasErrors() {
         return !this.errorList$.query().isEmpty();
     }
@@ -1802,15 +1773,6 @@ class AbstractInputComponent extends DisposableComponent {
     get focusContext() {
         return this.formValue$.focusContext;
     }
-    get label() {
-        return this._label ?? this.i18n?.label();
-    }
-    get hint() {
-        return this._hint ?? this.hackyGetI18n("hint");
-    }
-    get placeholder() {
-        return this._placeholder ?? this.hackyGetI18n("placeholder");
-    }
     get floatLabel() {
         // return this.dense ? 'never' : this.userFloatLabel;
         return this.userFloatLabel;
@@ -1825,45 +1787,24 @@ class AbstractInputComponent extends DisposableComponent {
     onValueEdited(callback) {
         return this.onValueEditedListeners.add(callback);
     }
-    hackyGetI18n(key) {
-        // TODO: update I18n to make it possible to get an optional value with return the missing key message.
-        const i18nFn = this.i18n ? this.i18n[key] : undefined;
-        const i18nValue = i18nFn && i18nFn();
-        return i18nValue?.startsWith("missing key") ? undefined : i18nValue;
-    }
     static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.9", ngImport: i0, type: AbstractInputComponent, deps: [{ token: INPUT_TOKEN_HACK }], target: i0.ɵɵFactoryTarget.Component });
-    static ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "16.2.9", type: AbstractInputComponent, selector: "ng-component", inputs: { i18n$: "i18n$", i18n: "i18n", _label: ["label", "_label"], userFloatLabel: ["floatLabel", "userFloatLabel"], _hint: ["hint", "_hint"], _placeholder: ["placeholder", "_placeholder"], dense: "dense", enabled$: "enabled$", focusCommand: ["command.focus", "focusCommand"], blurCommand: ["command.blur", "blurCommand"], enterCommand: ["command.enter", "enterCommand"], escapeCommand: ["command.escape", "escapeCommand"], clickCommand: ["command.click", "clickCommand"] }, outputs: { focus: "focus", blur: "blur", enterKey: "enterKey", escapeKey: "escapeKey" }, host: { listeners: { "click": "notifyClick()", "focusin": "notifyFocusIn()", "focusout": "notifyFocusOut()" }, properties: { "class.dense": "this.dense", "class": "this.baseClassName", "class.disabled": "this.disabled" } }, usesInheritance: true, ngImport: i0, template: '', isInline: true });
+    static ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "16.2.9", type: AbstractInputComponent, selector: "ng-component", inputs: { label: "label", userFloatLabel: ["floatLabel", "userFloatLabel"], hint: "hint", placeholder: "placeholder", dense: "dense", enabled$: "enabled$", focusCommand: ["command.focus", "focusCommand"], blurCommand: ["command.blur", "blurCommand"], enterCommand: ["command.enter", "enterCommand"], escapeCommand: ["command.escape", "escapeCommand"], clickCommand: ["command.click", "clickCommand"] }, outputs: { focus: "focus", blur: "blur", enterKey: "enterKey", escapeKey: "escapeKey" }, host: { listeners: { "click": "notifyClick()", "focusin": "notifyFocusIn()", "focusout": "notifyFocusOut()" }, properties: { "class.dense": "this.dense", "class": "this.baseClassName" } }, usesInheritance: true, ngImport: i0, template: '', isInline: true });
 }
-__decorate([
-    Proxify(),
-    __metadata("design:type", Object)
-], AbstractInputComponent.prototype, "i18n$", null);
-__decorate([
-    StoreInValueModel(),
-    __metadata("design:type", Object)
-], AbstractInputComponent.prototype, "i18n", null);
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.9", ngImport: i0, type: AbstractInputComponent, decorators: [{
             type: Component,
             args: [{ template: '' }]
         }], ctorParameters: function () { return [{ type: undefined, decorators: [{
                     type: Inject,
                     args: [INPUT_TOKEN_HACK]
-                }] }]; }, propDecorators: { i18n$: [{
-                type: Input
-            }], i18n: [{
+                }] }]; }, propDecorators: { label: [{
                 type: Input
-            }], _label: [{
-                type: Input,
-                args: ["label"]
             }], userFloatLabel: [{
                 type: Input,
                 args: ['floatLabel']
-            }], _hint: [{
-                type: Input,
-                args: ['hint']
-            }], _placeholder: [{
-                type: Input,
-                args: ['placeholder']
+            }], hint: [{
+                type: Input
+            }], placeholder: [{
+                type: Input
             }], dense: [{
                 type: HostBinding,
                 args: ['class.dense']
@@ -1906,9 +1847,6 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.9", ngImpor
             }], notifyFocusOut: [{
                 type: HostListener,
                 args: ['focusout']
-            }], disabled: [{
-                type: HostBinding,
-                args: ["class.disabled"]
             }] } });
 
 class AbstractListInputComponent extends AbstractInputComponent {
@@ -2146,15 +2084,12 @@ class CheckboxInputComponent extends AbstractValueInputComponent {
     constructor() {
         super();
     }
-    select($event) {
-        this.componentValue$.value = $event.checked;
-    }
     static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.9", ngImport: i0, type: CheckboxInputComponent, deps: [], target: i0.ɵɵFactoryTarget.Component });
-    static ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "16.2.9", type: CheckboxInputComponent, selector: "aup-checkbox-input", inputs: { color: "color", labelPosition: "labelPosition" }, usesInheritance: true, ngImport: i0, template: "<!-- TODO: add focus binding -->\n<!-- NOTE: using [(ngModel)] affects how material renders the component and makes it harder to test so we're using [checked] and (change) -->\n<mat-checkbox\n  [checked]=\"componentValue$.value\"\n  (change)=\"select($event)\"\n  [color]=\"color\"\n  [labelPosition]=\"labelPosition\"\n  [disabled]=\"!isEnabled()\"\n>{{ label }}\n</mat-checkbox>\n<ng-container *ngIf=\"!dense\">\n  <mat-hint *ngIf=\"showHint\">{{ hint }}</mat-hint>\n  <mat-error *ngIf=\"hasErrors\">{{ firstError }}</mat-error>\n</ng-container>\n", styles: [":host{display:inline-flex;flex-direction:column;padding:10px 0 0}:host.dense{padding:4px 0 2px}mat-hint,mat-error{margin-top:4px;margin-left:24px;font-size:12px;font-weight:400;line-height:13.5px}\n"], dependencies: [{ kind: "directive", type: i1$1.NgIf, selector: "[ngIf]", inputs: ["ngIf", "ngIfThen", "ngIfElse"] }, { kind: "directive", type: i4$2.MatHint, selector: "mat-hint", inputs: ["align", "id"] }, { kind: "directive", type: i4$2.MatError, selector: "mat-error, [matError]", inputs: ["id"] }, { kind: "component", type: i3$1.MatCheckbox, selector: "mat-checkbox", inputs: ["disableRipple", "color", "tabIndex"], exportAs: ["matCheckbox"] }] });
+    static ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "16.2.9", type: CheckboxInputComponent, selector: "aup-checkbox-input", inputs: { color: "color", labelPosition: "labelPosition" }, usesInheritance: true, ngImport: i0, template: "<!-- TODO: add focus binding -->\n<mat-checkbox\n  [(ngModel)]=\"componentValue$.value\"\n  [color]=\"color\"\n  [labelPosition]=\"labelPosition\"\n  [disabled]=\"!isEnabled()\"\n>{{label}}</mat-checkbox>\n<mat-hint *ngIf=\"showHint\">{{hint}}</mat-hint>\n<mat-error *ngIf=\"hasErrors\">{{firstError}}</mat-error>\n", styles: [":host{display:inline-flex;flex-direction:column;padding:24px 0 16px}:host.dense{padding:6px 0 2px}mat-hint,mat-error{margin-top:4px;margin-left:24px;font-size:12px;font-weight:400;line-height:13.5px}\n"], dependencies: [{ kind: "directive", type: i1$1.NgIf, selector: "[ngIf]", inputs: ["ngIf", "ngIfThen", "ngIfElse"] }, { kind: "directive", type: i2$4.NgControlStatus, selector: "[formControlName],[ngModel],[formControl]" }, { kind: "directive", type: i2$4.NgModel, selector: "[ngModel]:not([formControlName]):not([formControl])", inputs: ["name", "disabled", "ngModel", "ngModelOptions"], outputs: ["ngModelChange"], exportAs: ["ngModel"] }, { kind: "directive", type: i4$2.MatHint, selector: "mat-hint", inputs: ["align", "id"] }, { kind: "directive", type: i4$2.MatError, selector: "mat-error, [matError]", inputs: ["id"] }, { kind: "component", type: i4$3.MatCheckbox, selector: "mat-checkbox", inputs: ["disableRipple", "color", "tabIndex"], exportAs: ["matCheckbox"] }] });
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.9", ngImport: i0, type: CheckboxInputComponent, decorators: [{
             type: Component,
-            args: [{ selector: 'aup-checkbox-input', template: "<!-- TODO: add focus binding -->\n<!-- NOTE: using [(ngModel)] affects how material renders the component and makes it harder to test so we're using [checked] and (change) -->\n<mat-checkbox\n  [checked]=\"componentValue$.value\"\n  (change)=\"select($event)\"\n  [color]=\"color\"\n  [labelPosition]=\"labelPosition\"\n  [disabled]=\"!isEnabled()\"\n>{{ label }}\n</mat-checkbox>\n<ng-container *ngIf=\"!dense\">\n  <mat-hint *ngIf=\"showHint\">{{ hint }}</mat-hint>\n  <mat-error *ngIf=\"hasErrors\">{{ firstError }}</mat-error>\n</ng-container>\n", styles: [":host{display:inline-flex;flex-direction:column;padding:10px 0 0}:host.dense{padding:4px 0 2px}mat-hint,mat-error{margin-top:4px;margin-left:24px;font-size:12px;font-weight:400;line-height:13.5px}\n"] }]
+            args: [{ selector: 'aup-checkbox-input', template: "<!-- TODO: add focus binding -->\n<mat-checkbox\n  [(ngModel)]=\"componentValue$.value\"\n  [color]=\"color\"\n  [labelPosition]=\"labelPosition\"\n  [disabled]=\"!isEnabled()\"\n>{{label}}</mat-checkbox>\n<mat-hint *ngIf=\"showHint\">{{hint}}</mat-hint>\n<mat-error *ngIf=\"hasErrors\">{{firstError}}</mat-error>\n", styles: [":host{display:inline-flex;flex-direction:column;padding:24px 0 16px}:host.dense{padding:6px 0 2px}mat-hint,mat-error{margin-top:4px;margin-left:24px;font-size:12px;font-weight:400;line-height:13.5px}\n"] }]
         }], ctorParameters: function () { return []; }, propDecorators: { color: [{
                 type: Input
             }], labelPosition: [{
@@ -2193,7 +2128,7 @@ class MultipleSelectInputComponent extends AbstractListInputComponent {
         const self = this;
         this.registerDisposable(new Binding(this.componentList$, this.ids$, {
             toLeft(selectedItems, currentLeftValue) {
-                const newValues = selectedItems.map(it => lookup.get(it)).filter(it => !!it);
+                const newValues = selectedItems.map(it => lookup.get(it)).filter(it => !it);
                 // if our lookup didn't find anything then we return the previous values so we don't clobber selections when the options go empty
                 return newValues.length < 1 && selectedItems.length > 0 ? currentLeftValue : newValues;
             },
@@ -2204,7 +2139,7 @@ class MultipleSelectInputComponent extends AbstractListInputComponent {
         })).writeRight();
     }
     static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.9", ngImport: i0, type: MultipleSelectInputComponent, deps: [], target: i0.ɵɵFactoryTarget.Component });
-    static ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "16.2.9", type: MultipleSelectInputComponent, selector: "aup-multiple-select-input", inputs: { options$: "options$", options: "options", optionLabel: "optionLabel", optionLabelFormat: "optionLabelFormat" }, queries: [{ propertyName: "optionTemplateRef", first: true, predicate: ["optionTemplate"], descendants: true }], usesInheritance: true, ngImport: i0, template: "<mat-form-field [floatLabel]=\"floatLabel\">\n  <mat-label *ngIf=\"label\">{{label}}</mat-label>\n  <mat-select placeholder=\"{{placeholder}}\"\n              multiple\n              [ngModel]=\"componentList$.value\"\n              (ngModelChange)=\"selectAll($event)\"\n              [disabled]=\"!enabled$.value\"\n              (keydown.enter)=\"notifyEnterKey()\"\n              (keydown.escape)=\"notifyEscapeKey()\"\n              [pectinFocusBinding]=\"focusContext\"\n              [errorStateMatcher]=\"errorStateMatcher\"\n  >\n    <mat-option *ngFor=\"let option of options$.value; let i = index\" [value]=\"option\">\n      <ng-container *ngIf=\"!optionTemplateRef\">{{optionLabelFormat(option)}}</ng-container>\n      <ng-container *ngIf=\"optionTemplateRef\"\n        [ngTemplateOutlet]=\"optionTemplateRef\"\n        [ngTemplateOutletContext]=\"{ $implicit: option, index: i }\"\n      >\n      </ng-container>\n    </mat-option>\n  </mat-select>\n  <mat-hint *ngIf=\"showHint\">{{hint}}</mat-hint>\n  <mat-error *ngIf=\"hasErrors\">{{firstError}}</mat-error>\n</mat-form-field>\n<div class=\"width-strut\">\n  <mat-label *ngIf=\"label\">{{label}}</mat-label>\n  <div>{{placeholder}}</div>\n  <div class=\"item\" *ngFor=\"let item of options\">{{optionLabelFormat(item)}}</div>\n</div>\n", styles: [":host{display:inline-block}mat-form-field{width:100%}.width-strut{display:block;height:0;max-height:0;width:auto;visibility:hidden;overflow:hidden;padding-right:35px}.width-strut mat-label{font-size:75%}.width-strut>.item{font-size:16px;padding-left:30px}\n"], dependencies: [{ kind: "directive", type: i1$1.NgForOf, selector: "[ngFor][ngForOf]", inputs: ["ngForOf", "ngForTrackBy", "ngForTemplate"] }, { kind: "directive", type: i1$1.NgIf, selector: "[ngIf]", inputs: ["ngIf", "ngIfThen", "ngIfElse"] }, { kind: "directive", type: i1$1.NgTemplateOutlet, selector: "[ngTemplateOutlet]", inputs: ["ngTemplateOutletContext", "ngTemplateOutlet", "ngTemplateOutletInjector"] }, { kind: "directive", type: i2$4.NgControlStatus, selector: "[formControlName],[ngModel],[formControl]" }, { kind: "directive", type: i2$4.NgModel, selector: "[ngModel]:not([formControlName]):not([formControl])", inputs: ["name", "disabled", "ngModel", "ngModelOptions"], outputs: ["ngModelChange"], exportAs: ["ngModel"] }, { kind: "component", type: i4$2.MatFormField, selector: "mat-form-field", inputs: ["hideRequiredMarker", "color", "floatLabel", "appearance", "subscriptSizing", "hintLabel"], exportAs: ["matFormField"] }, { kind: "directive", type: i4$2.MatLabel, selector: "mat-label" }, { kind: "directive", type: i4$2.MatHint, selector: "mat-hint", inputs: ["align", "id"] }, { kind: "directive", type: i4$2.MatError, selector: "mat-error, [matError]", inputs: ["id"] }, { kind: "component", type: i4$3.MatSelect, selector: "mat-select", inputs: ["disabled", "disableRipple", "tabIndex", "panelWidth", "hideSingleSelectionIndicator"], exportAs: ["matSelect"] }, { kind: "component", type: i5.MatOption, selector: "mat-option", exportAs: ["matOption"] }, { kind: "directive", type: FocusBindingDirective, selector: "[pectinFocusBinding]", inputs: ["pectinFocusBinding", "focusBindingTarget"] }] });
+    static ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "16.2.9", type: MultipleSelectInputComponent, selector: "aup-multiple-select-input", inputs: { options$: "options$", options: "options", optionLabel: "optionLabel", optionLabelFormat: "optionLabelFormat" }, queries: [{ propertyName: "optionTemplateRef", first: true, predicate: ["optionTemplate"], descendants: true }], usesInheritance: true, ngImport: i0, template: "<mat-form-field [floatLabel]=\"floatLabel\">\n  <mat-label *ngIf=\"label\">{{label}}</mat-label>\n  <mat-select placeholder=\"{{placeholder}}\"\n              multiple\n              [ngModel]=\"componentList$.value\"\n              (ngModelChange)=\"selectAll($event)\"\n              [disabled]=\"!enabled$.value\"\n              (keydown.enter)=\"notifyEnterKey()\"\n              (keydown.escape)=\"notifyEscapeKey()\"\n              [pectinFocusBinding]=\"focusContext\"\n              [errorStateMatcher]=\"errorStateMatcher\"\n  >\n    <mat-option *ngFor=\"let option of options$.value; let i = index\" [value]=\"option\">\n      <ng-container *ngIf=\"!optionTemplateRef\">{{optionLabelFormat(option)}}</ng-container>\n      <ng-container *ngIf=\"optionTemplateRef\"\n        [ngTemplateOutlet]=\"optionTemplateRef\"\n        [ngTemplateOutletContext]=\"{ $implicit: option, index: i }\"\n      >\n      </ng-container>\n    </mat-option>\n  </mat-select>\n  <mat-hint *ngIf=\"showHint\">{{hint}}</mat-hint>\n  <mat-error *ngIf=\"hasErrors\">{{firstError}}</mat-error>\n</mat-form-field>\n<div class=\"width-strut\">\n  <mat-label *ngIf=\"label\">{{label}}</mat-label>\n  <div>{{placeholder}}</div>\n  <div class=\"item\" *ngFor=\"let item of options\">{{optionLabelFormat(item)}}</div>\n</div>\n", styles: [":host{display:inline-block}mat-form-field{width:100%}.width-strut{display:block;height:0;max-height:0;width:auto;visibility:hidden;overflow:hidden;padding-right:35px}.width-strut mat-label{font-size:75%}.width-strut>.item{font-size:16px;padding-left:30px}\n"], dependencies: [{ kind: "directive", type: i1$1.NgForOf, selector: "[ngFor][ngForOf]", inputs: ["ngForOf", "ngForTrackBy", "ngForTemplate"] }, { kind: "directive", type: i1$1.NgIf, selector: "[ngIf]", inputs: ["ngIf", "ngIfThen", "ngIfElse"] }, { kind: "directive", type: i1$1.NgTemplateOutlet, selector: "[ngTemplateOutlet]", inputs: ["ngTemplateOutletContext", "ngTemplateOutlet", "ngTemplateOutletInjector"] }, { kind: "directive", type: i2$4.NgControlStatus, selector: "[formControlName],[ngModel],[formControl]" }, { kind: "directive", type: i2$4.NgModel, selector: "[ngModel]:not([formControlName]):not([formControl])", inputs: ["name", "disabled", "ngModel", "ngModelOptions"], outputs: ["ngModelChange"], exportAs: ["ngModel"] }, { kind: "component", type: i4$2.MatFormField, selector: "mat-form-field", inputs: ["hideRequiredMarker", "color", "floatLabel", "appearance", "subscriptSizing", "hintLabel"], exportAs: ["matFormField"] }, { kind: "directive", type: i4$2.MatLabel, selector: "mat-label" }, { kind: "directive", type: i4$2.MatHint, selector: "mat-hint", inputs: ["align", "id"] }, { kind: "directive", type: i4$2.MatError, selector: "mat-error, [matError]", inputs: ["id"] }, { kind: "component", type: i4$4.MatSelect, selector: "mat-select", inputs: ["disabled", "disableRipple", "tabIndex", "panelWidth", "hideSingleSelectionIndicator"], exportAs: ["matSelect"] }, { kind: "component", type: i5.MatOption, selector: "mat-option", exportAs: ["matOption"] }, { kind: "directive", type: FocusBindingDirective, selector: "[pectinFocusBinding]", inputs: ["pectinFocusBinding", "focusBindingTarget"] }] });
 }
 __decorate([
     Proxify(),
@@ -2232,178 +2167,48 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.9", ngImpor
 
 class NumberInputComponent extends AbstractValueInputComponent {
     autocomplete;
-    #min$_accessor_storage = proxify((ValueModel));
-    get min$() { return this.#min$_accessor_storage; }
-    set min$(value) { this.#min$_accessor_storage = value; }
-    #min_accessor_storage = Number.MIN_SAFE_INTEGER;
-    get min() { return this.#min_accessor_storage; }
-    set min(value) { this.#min_accessor_storage = value; }
-    #max$_accessor_storage = proxify((ValueModel));
-    get max$() { return this.#max$_accessor_storage; }
-    set max$(value) { this.#max$_accessor_storage = value; }
-    #max_accessor_storage = Number.MAX_SAFE_INTEGER;
-    get max() { return this.#max_accessor_storage; }
-    set max(value) { this.#max_accessor_storage = value; }
-    #significantDigits$_accessor_storage = proxify((ValueModel));
-    get significantDigits$() { return this.#significantDigits$_accessor_storage; }
-    set significantDigits$(value) { this.#significantDigits$_accessor_storage = value; }
-    #significantDigits_accessor_storage;
-    get significantDigits() { return this.#significantDigits_accessor_storage; }
-    set significantDigits(value) { this.#significantDigits_accessor_storage = value; }
-    incrementCommand;
-    decrementCommand;
-    displayValue$;
-    step$;
+    min = Number.MIN_SAFE_INTEGER;
+    max = Number.MAX_SAFE_INTEGER;
+    iconPrefix;
     constructor() {
         super();
-        const { chain } = Dsl.disposeWith(this);
-        this.step$ = chain(this.significantDigits$).map(v => 10 ** (-v)).otherwise(1);
-        this.displayValue$ = chain(this.value$).map(v => this.clampSignificantDigits(v), {
-            dependsOn: this.significantDigits$
-        });
-        const normalisedValue$ = chain(this.value$).otherwise(0);
-        this.incrementCommand = Command.create(() => {
-            this.value$.value = this.increment(this.value$.value);
-        }).enableWhile(chain.numericValue(normalisedValue$).isLessThan(this.max$).and(this.enabled$));
-        this.decrementCommand = Command.create(() => {
-            this.value$.value = this.decrement(this.value$.value);
-        }).enableWhile(chain.numericValue(normalisedValue$).isGreaterThan(this.min$).and(this.enabled$));
-    }
-    increment(value) {
-        return this.clampSignificantDigits((value ?? 0) + this.step$.value);
-    }
-    decrement(value) {
-        return this.clampSignificantDigits((value ?? 0) - this.step$.value);
-    }
-    clampSignificantDigits(value) {
-        return Number(value.toFixed(this.significantDigits));
-    }
-    onValueChange(value) {
-        this.value$.value = value;
     }
     static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.9", ngImport: i0, type: NumberInputComponent, deps: [], target: i0.ɵɵFactoryTarget.Component });
-    static ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "16.2.9", type: NumberInputComponent, selector: "aup-number-input", inputs: { autocomplete: "autocomplete", min$: "min$", min: "min", max$: "max$", max: "max", significantDigits$: "significantDigits$", significantDigits: "significantDigits" }, usesInheritance: true, ngImport: i0, template: "<mat-form-field floatLabel=\"always\">\n  <mat-label *ngIf=\"label\">{{ label }}</mat-label>\n  <input type=\"number\"\n         matInput\n         placeholder=\"{{placeholder}}\"\n         [attr.autocomplete]=\"autocomplete\"\n         [ngModel]=\"displayValue$.value\"\n         (ngModelChange)=\"onValueChange($event)\"\n         [disabled]=\"!enabled$.value\"\n         (keydown.enter)=\"notifyEnterKey()\"\n         (keydown.escape)=\"notifyEscapeKey()\"\n         [pectinFocusBinding]=\"focusContext\"\n         [errorStateMatcher]=\"errorStateMatcher\"\n         [min]=\"min\"\n         [max]=\"max\"\n         [size]=\"4\"\n         [step]=\"step$.value\"\n  >\n  <section matIconSuffix>\n    <button [pectinCommand]=\"decrementCommand\">-</button>\n    <button [pectinCommand]=\"incrementCommand\">+</button>\n  </section>\n  <mat-hint *ngIf=\"hint && !dense\">{{ hint }}</mat-hint>\n  <mat-error *ngIf=\"hasErrors\">{{ firstError }}</mat-error>\n</mat-form-field>\n", styles: [":host{--width: 56px;--height: 42px;--margin-right: 1px;--border-radius: 3px;--border-color:#d5d5d5;--button-background: #fafafa;--button-background-hover: #efefef}:host input[type=number]{appearance:textfield}:host input[type=number]::-webkit-inner-spin-button,:host input[type=number]::-webkit-outer-spin-button{-webkit-appearance:none}:host:focus-within:has(section:not(:focus-within)){--height: 40px;--margin-right: 2px;--border-radius: 2px}:host section[maticonsuffix]{display:flex;flex-direction:row;align-items:stretch;gap:1px;background-color:var(--border-color);border-left:1px solid var(--border-color);width:var(--width);min-width:var(--width);height:var(--height);min-height:var(--height);margin-right:var(--margin-right);border-top-right-radius:var(--border-radius);border-bottom-right-radius:var(--border-radius);overflow:hidden}:host button{flex:1;display:flex;flex-direction:row;align-items:center;justify-content:center;font-weight:600;border-style:none;background-color:var(--button-background)}:host button:hover{background-color:var(--button-background-hover)}\n"], dependencies: [{ kind: "directive", type: i1$1.NgIf, selector: "[ngIf]", inputs: ["ngIf", "ngIfThen", "ngIfElse"] }, { kind: "directive", type: i2$4.DefaultValueAccessor, selector: "input:not([type=checkbox])[formControlName],textarea[formControlName],input:not([type=checkbox])[formControl],textarea[formControl],input:not([type=checkbox])[ngModel],textarea[ngModel],[ngDefaultControl]" }, { kind: "directive", type: i2$4.NumberValueAccessor, selector: "input[type=number][formControlName],input[type=number][formControl],input[type=number][ngModel]" }, { kind: "directive", type: i2$4.NgControlStatus, selector: "[formControlName],[ngModel],[formControl]" }, { kind: "directive", type: i2$4.MinValidator, selector: "input[type=number][min][formControlName],input[type=number][min][formControl],input[type=number][min][ngModel]", inputs: ["min"] }, { kind: "directive", type: i2$4.MaxValidator, selector: "input[type=number][max][formControlName],input[type=number][max][formControl],input[type=number][max][ngModel]", inputs: ["max"] }, { kind: "directive", type: i2$4.NgModel, selector: "[ngModel]:not([formControlName]):not([formControl])", inputs: ["name", "disabled", "ngModel", "ngModelOptions"], outputs: ["ngModelChange"], exportAs: ["ngModel"] }, { kind: "directive", type: i3.MatInput, selector: "input[matInput], textarea[matInput], select[matNativeControl],      input[matNativeControl], textarea[matNativeControl]", inputs: ["disabled", "id", "placeholder", "name", "required", "type", "errorStateMatcher", "aria-describedby", "value", "readonly"], exportAs: ["matInput"] }, { kind: "component", type: i4$2.MatFormField, selector: "mat-form-field", inputs: ["hideRequiredMarker", "color", "floatLabel", "appearance", "subscriptSizing", "hintLabel"], exportAs: ["matFormField"] }, { kind: "directive", type: i4$2.MatLabel, selector: "mat-label" }, { kind: "directive", type: i4$2.MatHint, selector: "mat-hint", inputs: ["align", "id"] }, { kind: "directive", type: i4$2.MatError, selector: "mat-error, [matError]", inputs: ["id"] }, { kind: "directive", type: i4$2.MatSuffix, selector: "[matSuffix], [matIconSuffix], [matTextSuffix]", inputs: ["matTextSuffix"] }, { kind: "directive", type: CommandDirective, selector: "[pectinCommand]", inputs: ["pectinCommand", "commandParameter"] }, { kind: "directive", type: FocusBindingDirective, selector: "[pectinFocusBinding]", inputs: ["pectinFocusBinding", "focusBindingTarget"] }] });
+    static ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "16.2.9", type: NumberInputComponent, selector: "aup-number-input", inputs: { autocomplete: "autocomplete", min: "min", max: "max", iconPrefix: "iconPrefix" }, usesInheritance: true, ngImport: i0, template: "<mat-form-field [floatLabel]=\"floatLabel\">\n  <mat-label *ngIf=\"label\">{{label}}</mat-label>\n  <input type=\"number\"\n         matInput\n         placeholder=\"{{placeholder}}\"\n         [attr.autocomplete]=\"autocomplete\"\n         [(ngModel)]=\"componentValue$.value\"\n         [disabled]=\"!enabled$.value\"\n         (keydown.enter)=\"notifyEnterKey()\"\n         (keydown.escape)=\"notifyEscapeKey()\"\n         [pectinFocusBinding]=\"focusContext\"\n         [errorStateMatcher]=\"errorStateMatcher\"\n         [min]=\"min\"\n         [max]=\"max\"\n  >\n  <mat-hint *ngIf=\"hint && !dense\" >{{hint}}</mat-hint>\n  <mat-error *ngIf=\"hasErrors\">{{firstError}}</mat-error>\n  <aup-icon *ngIf=\"iconPrefix\" matPrefix [icon]=\"iconPrefix\"></aup-icon>\n</mat-form-field>\n", styles: [""], dependencies: [{ kind: "directive", type: i1$1.NgIf, selector: "[ngIf]", inputs: ["ngIf", "ngIfThen", "ngIfElse"] }, { kind: "directive", type: i2$4.DefaultValueAccessor, selector: "input:not([type=checkbox])[formControlName],textarea[formControlName],input:not([type=checkbox])[formControl],textarea[formControl],input:not([type=checkbox])[ngModel],textarea[ngModel],[ngDefaultControl]" }, { kind: "directive", type: i2$4.NumberValueAccessor, selector: "input[type=number][formControlName],input[type=number][formControl],input[type=number][ngModel]" }, { kind: "directive", type: i2$4.NgControlStatus, selector: "[formControlName],[ngModel],[formControl]" }, { kind: "directive", type: i2$4.MinValidator, selector: "input[type=number][min][formControlName],input[type=number][min][formControl],input[type=number][min][ngModel]", inputs: ["min"] }, { kind: "directive", type: i2$4.MaxValidator, selector: "input[type=number][max][formControlName],input[type=number][max][formControl],input[type=number][max][ngModel]", inputs: ["max"] }, { kind: "directive", type: i2$4.NgModel, selector: "[ngModel]:not([formControlName]):not([formControl])", inputs: ["name", "disabled", "ngModel", "ngModelOptions"], outputs: ["ngModelChange"], exportAs: ["ngModel"] }, { kind: "directive", type: i3.MatInput, selector: "input[matInput], textarea[matInput], select[matNativeControl],      input[matNativeControl], textarea[matNativeControl]", inputs: ["disabled", "id", "placeholder", "name", "required", "type", "errorStateMatcher", "aria-describedby", "value", "readonly"], exportAs: ["matInput"] }, { kind: "component", type: i4$2.MatFormField, selector: "mat-form-field", inputs: ["hideRequiredMarker", "color", "floatLabel", "appearance", "subscriptSizing", "hintLabel"], exportAs: ["matFormField"] }, { kind: "directive", type: i4$2.MatLabel, selector: "mat-label" }, { kind: "directive", type: i4$2.MatHint, selector: "mat-hint", inputs: ["align", "id"] }, { kind: "directive", type: i4$2.MatError, selector: "mat-error, [matError]", inputs: ["id"] }, { kind: "directive", type: i4$2.MatPrefix, selector: "[matPrefix], [matIconPrefix], [matTextPrefix]", inputs: ["matTextPrefix"] }, { kind: "directive", type: FocusBindingDirective, selector: "[pectinFocusBinding]", inputs: ["pectinFocusBinding", "focusBindingTarget"] }, { kind: "component", type: IconComponent, selector: "aup-icon", inputs: ["icon"] }] });
 }
-__decorate([
-    Proxify(),
-    __metadata("design:type", ValueModel)
-], NumberInputComponent.prototype, "min$", null);
-__decorate([
-    StoreInValueModel(),
-    __metadata("design:type", Object)
-], NumberInputComponent.prototype, "min", null);
-__decorate([
-    Proxify(),
-    __metadata("design:type", ValueModel)
-], NumberInputComponent.prototype, "max$", null);
-__decorate([
-    StoreInValueModel(),
-    __metadata("design:type", Object)
-], NumberInputComponent.prototype, "max", null);
-__decorate([
-    Proxify(),
-    __metadata("design:type", ValueModel)
-], NumberInputComponent.prototype, "significantDigits$", null);
-__decorate([
-    StoreInValueModel(),
-    __metadata("design:type", Number)
-], NumberInputComponent.prototype, "significantDigits", null);
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.9", ngImport: i0, type: NumberInputComponent, decorators: [{
             type: Component,
-            args: [{ selector: 'aup-number-input', template: "<mat-form-field floatLabel=\"always\">\n  <mat-label *ngIf=\"label\">{{ label }}</mat-label>\n  <input type=\"number\"\n         matInput\n         placeholder=\"{{placeholder}}\"\n         [attr.autocomplete]=\"autocomplete\"\n         [ngModel]=\"displayValue$.value\"\n         (ngModelChange)=\"onValueChange($event)\"\n         [disabled]=\"!enabled$.value\"\n         (keydown.enter)=\"notifyEnterKey()\"\n         (keydown.escape)=\"notifyEscapeKey()\"\n         [pectinFocusBinding]=\"focusContext\"\n         [errorStateMatcher]=\"errorStateMatcher\"\n         [min]=\"min\"\n         [max]=\"max\"\n         [size]=\"4\"\n         [step]=\"step$.value\"\n  >\n  <section matIconSuffix>\n    <button [pectinCommand]=\"decrementCommand\">-</button>\n    <button [pectinCommand]=\"incrementCommand\">+</button>\n  </section>\n  <mat-hint *ngIf=\"hint && !dense\">{{ hint }}</mat-hint>\n  <mat-error *ngIf=\"hasErrors\">{{ firstError }}</mat-error>\n</mat-form-field>\n", styles: [":host{--width: 56px;--height: 42px;--margin-right: 1px;--border-radius: 3px;--border-color:#d5d5d5;--button-background: #fafafa;--button-background-hover: #efefef}:host input[type=number]{appearance:textfield}:host input[type=number]::-webkit-inner-spin-button,:host input[type=number]::-webkit-outer-spin-button{-webkit-appearance:none}:host:focus-within:has(section:not(:focus-within)){--height: 40px;--margin-right: 2px;--border-radius: 2px}:host section[maticonsuffix]{display:flex;flex-direction:row;align-items:stretch;gap:1px;background-color:var(--border-color);border-left:1px solid var(--border-color);width:var(--width);min-width:var(--width);height:var(--height);min-height:var(--height);margin-right:var(--margin-right);border-top-right-radius:var(--border-radius);border-bottom-right-radius:var(--border-radius);overflow:hidden}:host button{flex:1;display:flex;flex-direction:row;align-items:center;justify-content:center;font-weight:600;border-style:none;background-color:var(--button-background)}:host button:hover{background-color:var(--button-background-hover)}\n"] }]
+            args: [{ selector: 'aup-number-input', template: "<mat-form-field [floatLabel]=\"floatLabel\">\n  <mat-label *ngIf=\"label\">{{label}}</mat-label>\n  <input type=\"number\"\n         matInput\n         placeholder=\"{{placeholder}}\"\n         [attr.autocomplete]=\"autocomplete\"\n         [(ngModel)]=\"componentValue$.value\"\n         [disabled]=\"!enabled$.value\"\n         (keydown.enter)=\"notifyEnterKey()\"\n         (keydown.escape)=\"notifyEscapeKey()\"\n         [pectinFocusBinding]=\"focusContext\"\n         [errorStateMatcher]=\"errorStateMatcher\"\n         [min]=\"min\"\n         [max]=\"max\"\n  >\n  <mat-hint *ngIf=\"hint && !dense\" >{{hint}}</mat-hint>\n  <mat-error *ngIf=\"hasErrors\">{{firstError}}</mat-error>\n  <aup-icon *ngIf=\"iconPrefix\" matPrefix [icon]=\"iconPrefix\"></aup-icon>\n</mat-form-field>\n" }]
         }], ctorParameters: function () { return []; }, propDecorators: { autocomplete: [{
                 type: Input
-            }], min$: [{
-                type: Input
             }], min: [{
                 type: Input
-            }], max$: [{
-                type: Input
             }], max: [{
                 type: Input
-            }], significantDigits$: [{
-                type: Input
-            }], significantDigits: [{
+            }], iconPrefix: [{
                 type: Input
             }] } });
 
 class PasswordInputComponent extends AbstractValueInputComponent {
     autocomplete;
-    #enableShowPassword$_accessor_storage = proxify((ValueModel));
-    get enableShowPassword$() { return this.#enableShowPassword$_accessor_storage; }
-    set enableShowPassword$(value) { this.#enableShowPassword$_accessor_storage = value; }
-    #enableShowPassword_accessor_storage = false;
-    get enableShowPassword() { return this.#enableShowPassword_accessor_storage; }
-    set enableShowPassword(value) { this.#enableShowPassword_accessor_storage = value; }
-    showPassword$ = new MutableValueModel(false);
-    toggleShowPasswordCommand;
     constructor() {
         super();
-        const { chain, valueOf } = Dsl.disposeWith(this);
-        const face$ = chain(this.showPassword$).map(show => {
-            return {
-                icon: () => show ? "mat:visibility_off" : "mat:visibility"
-            };
-        });
-        this.toggleShowPasswordCommand = Command.create(() => {
-            this.showPassword$.value = !this.showPassword$.value;
-        })
-            .withFace(face$)
-            .enableWhile(chain.stringValue(this.componentValue$).isNotBlank());
-    }
-    get fieldType() {
-        return this.showPassword$.value ? "text" : "password";
     }
     static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.9", ngImport: i0, type: PasswordInputComponent, deps: [], target: i0.ɵɵFactoryTarget.Component });
-    static ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "16.2.9", type: PasswordInputComponent, selector: "aup-password-input", inputs: { autocomplete: "autocomplete", enableShowPassword$: "enableShowPassword$", enableShowPassword: "enableShowPassword" }, usesInheritance: true, ngImport: i0, template: "<mat-form-field [floatLabel]=\"floatLabel\">\n  <mat-label *ngIf=\"label\">{{label}}</mat-label>\n  <input [type]=\"fieldType\"\n         matInput\n         placeholder=\"{{placeholder}}\"\n         [attr.autocomplete]=\"autocomplete\"\n         [(ngModel)]=\"componentValue$.value\"\n         [disabled]=\"!enabled$.value\"\n         (keydown.enter)=\"notifyEnterKey()\"\n         (keydown.escape)=\"notifyEscapeKey()\"\n         [pectinFocusBinding]=\"focusContext\"\n         [errorStateMatcher]=\"errorStateMatcher\"\n  >\n  <mat-hint *ngIf=\"showHint\">{{hint}}</mat-hint>\n  <mat-error *ngIf=\"hasErrors\">{{firstError}}</mat-error>\n  <span matSuffix *ngIf=\"enableShowPassword$.value\">\n    <aup-command [command]=\"toggleShowPasswordCommand\" data-cy=\"showPassword\"></aup-command>\n  </span>\n</mat-form-field>\n\n", styles: [""], dependencies: [{ kind: "directive", type: i1$1.NgIf, selector: "[ngIf]", inputs: ["ngIf", "ngIfThen", "ngIfElse"] }, { kind: "directive", type: i2$4.DefaultValueAccessor, selector: "input:not([type=checkbox])[formControlName],textarea[formControlName],input:not([type=checkbox])[formControl],textarea[formControl],input:not([type=checkbox])[ngModel],textarea[ngModel],[ngDefaultControl]" }, { kind: "directive", type: i2$4.NgControlStatus, selector: "[formControlName],[ngModel],[formControl]" }, { kind: "directive", type: i2$4.NgModel, selector: "[ngModel]:not([formControlName]):not([formControl])", inputs: ["name", "disabled", "ngModel", "ngModelOptions"], outputs: ["ngModelChange"], exportAs: ["ngModel"] }, { kind: "directive", type: i3.MatInput, selector: "input[matInput], textarea[matInput], select[matNativeControl],      input[matNativeControl], textarea[matNativeControl]", inputs: ["disabled", "id", "placeholder", "name", "required", "type", "errorStateMatcher", "aria-describedby", "value", "readonly"], exportAs: ["matInput"] }, { kind: "component", type: i4$2.MatFormField, selector: "mat-form-field", inputs: ["hideRequiredMarker", "color", "floatLabel", "appearance", "subscriptSizing", "hintLabel"], exportAs: ["matFormField"] }, { kind: "directive", type: i4$2.MatLabel, selector: "mat-label" }, { kind: "directive", type: i4$2.MatHint, selector: "mat-hint", inputs: ["align", "id"] }, { kind: "directive", type: i4$2.MatError, selector: "mat-error, [matError]", inputs: ["id"] }, { kind: "directive", type: i4$2.MatSuffix, selector: "[matSuffix], [matIconSuffix], [matTextSuffix]", inputs: ["matTextSuffix"] }, { kind: "directive", type: FocusBindingDirective, selector: "[pectinFocusBinding]", inputs: ["pectinFocusBinding", "focusBindingTarget"] }, { kind: "component", type: CommandComponent, selector: "aup-command", inputs: ["command", "face$", "face", "busyFace$", "busyFace", "alignFace"] }] });
+    static ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "16.2.9", type: PasswordInputComponent, selector: "aup-password-input", inputs: { autocomplete: "autocomplete" }, usesInheritance: true, ngImport: i0, template: "<mat-form-field [floatLabel]=\"floatLabel\">\n  <mat-label *ngIf=\"label\">{{label}}</mat-label>\n  <input type=\"password\"\n         matInput\n         placeholder=\"{{placeholder}}\"\n         [attr.autocomplete]=\"autocomplete\"\n         [(ngModel)]=\"componentValue$.value\"\n         [disabled]=\"!enabled$.value\"\n         (keydown.enter)=\"notifyEnterKey()\"\n         (keydown.escape)=\"notifyEscapeKey()\"\n         [pectinFocusBinding]=\"focusContext\"\n         [errorStateMatcher]=\"errorStateMatcher\"\n  >\n  <mat-hint *ngIf=\"showHint\">{{hint}}</mat-hint>\n  <mat-error *ngIf=\"hasErrors\">{{firstError}}</mat-error>\n</mat-form-field>\n\n", styles: [""], dependencies: [{ kind: "directive", type: i1$1.NgIf, selector: "[ngIf]", inputs: ["ngIf", "ngIfThen", "ngIfElse"] }, { kind: "directive", type: i2$4.DefaultValueAccessor, selector: "input:not([type=checkbox])[formControlName],textarea[formControlName],input:not([type=checkbox])[formControl],textarea[formControl],input:not([type=checkbox])[ngModel],textarea[ngModel],[ngDefaultControl]" }, { kind: "directive", type: i2$4.NgControlStatus, selector: "[formControlName],[ngModel],[formControl]" }, { kind: "directive", type: i2$4.NgModel, selector: "[ngModel]:not([formControlName]):not([formControl])", inputs: ["name", "disabled", "ngModel", "ngModelOptions"], outputs: ["ngModelChange"], exportAs: ["ngModel"] }, { kind: "directive", type: i3.MatInput, selector: "input[matInput], textarea[matInput], select[matNativeControl],      input[matNativeControl], textarea[matNativeControl]", inputs: ["disabled", "id", "placeholder", "name", "required", "type", "errorStateMatcher", "aria-describedby", "value", "readonly"], exportAs: ["matInput"] }, { kind: "component", type: i4$2.MatFormField, selector: "mat-form-field", inputs: ["hideRequiredMarker", "color", "floatLabel", "appearance", "subscriptSizing", "hintLabel"], exportAs: ["matFormField"] }, { kind: "directive", type: i4$2.MatLabel, selector: "mat-label" }, { kind: "directive", type: i4$2.MatHint, selector: "mat-hint", inputs: ["align", "id"] }, { kind: "directive", type: i4$2.MatError, selector: "mat-error, [matError]", inputs: ["id"] }, { kind: "directive", type: FocusBindingDirective, selector: "[pectinFocusBinding]", inputs: ["pectinFocusBinding", "focusBindingTarget"] }] });
 }
-__decorate([
-    Proxify(),
-    __metadata("design:type", Object)
-], PasswordInputComponent.prototype, "enableShowPassword$", null);
-__decorate([
-    StoreInValueModel(),
-    __metadata("design:type", Object)
-], PasswordInputComponent.prototype, "enableShowPassword", null);
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.9", ngImport: i0, type: PasswordInputComponent, decorators: [{
             type: Component,
-            args: [{ selector: 'aup-password-input', template: "<mat-form-field [floatLabel]=\"floatLabel\">\n  <mat-label *ngIf=\"label\">{{label}}</mat-label>\n  <input [type]=\"fieldType\"\n         matInput\n         placeholder=\"{{placeholder}}\"\n         [attr.autocomplete]=\"autocomplete\"\n         [(ngModel)]=\"componentValue$.value\"\n         [disabled]=\"!enabled$.value\"\n         (keydown.enter)=\"notifyEnterKey()\"\n         (keydown.escape)=\"notifyEscapeKey()\"\n         [pectinFocusBinding]=\"focusContext\"\n         [errorStateMatcher]=\"errorStateMatcher\"\n  >\n  <mat-hint *ngIf=\"showHint\">{{hint}}</mat-hint>\n  <mat-error *ngIf=\"hasErrors\">{{firstError}}</mat-error>\n  <span matSuffix *ngIf=\"enableShowPassword$.value\">\n    <aup-command [command]=\"toggleShowPasswordCommand\" data-cy=\"showPassword\"></aup-command>\n  </span>\n</mat-form-field>\n\n" }]
-        }], ctorParameters: function () { return []; }, propDecorators: { autocomplete: [{
-                type: Input
-            }], enableShowPassword$: [{
-                type: Input
-            }], enableShowPassword: [{
-                type: Input
-            }] } });
-
-class SearchInputComponent extends AbstractValueInputComponent {
-    autocomplete;
-    clearCommand;
-    constructor() {
-        super();
-        this.dense = true;
-        const { chain, valueOf, before, when, after, observe, switchOn } = Dsl.disposeWith(this);
-        this.clearCommand = Command.create(() => {
-            this.componentValue$.value = "";
-        });
-        this.clearCommand.disableWhile(chain.stringValue(this.componentValue$).isBlank());
-    }
-    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.9", ngImport: i0, type: SearchInputComponent, deps: [], target: i0.ɵɵFactoryTarget.Component });
-    static ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "16.2.9", type: SearchInputComponent, selector: "aup-search-input", inputs: { autocomplete: "autocomplete" }, usesInheritance: true, ngImport: i0, template: "<mat-form-field [floatLabel]=\"floatLabel\">\n\n  <input matInput\n         placeholder=\"{{placeholder}}\"\n         [attr.autocomplete]=\"autocomplete\"\n         [(ngModel)]=\"componentValue$.value\"\n         [disabled]=\"!enabled$.value\"\n         (keydown.enter)=\"notifyEnterKey()\"\n         (keydown.escape)=\"notifyEscapeKey()\"\n         [pectinFocusBinding]=\"focusContext\"\n         [errorStateMatcher]=\"errorStateMatcher\"\n  >\n  <aup-icon matPrefix icon=\"mat:search\"></aup-icon>\n  <button mat-icon-button matSuffix [pectinCommand]=\"clearCommand\">\n    <aup-icon icon=\"mat:close\"></aup-icon>\n  </button>\n</mat-form-field>\n\n", styles: ["button[disabled]{visibility:hidden}\n"], dependencies: [{ kind: "directive", type: i2$4.DefaultValueAccessor, selector: "input:not([type=checkbox])[formControlName],textarea[formControlName],input:not([type=checkbox])[formControl],textarea[formControl],input:not([type=checkbox])[ngModel],textarea[ngModel],[ngDefaultControl]" }, { kind: "directive", type: i2$4.NgControlStatus, selector: "[formControlName],[ngModel],[formControl]" }, { kind: "directive", type: i2$4.NgModel, selector: "[ngModel]:not([formControlName]):not([formControl])", inputs: ["name", "disabled", "ngModel", "ngModelOptions"], outputs: ["ngModelChange"], exportAs: ["ngModel"] }, { kind: "directive", type: i3.MatInput, selector: "input[matInput], textarea[matInput], select[matNativeControl],      input[matNativeControl], textarea[matNativeControl]", inputs: ["disabled", "id", "placeholder", "name", "required", "type", "errorStateMatcher", "aria-describedby", "value", "readonly"], exportAs: ["matInput"] }, { kind: "component", type: i4$2.MatFormField, selector: "mat-form-field", inputs: ["hideRequiredMarker", "color", "floatLabel", "appearance", "subscriptSizing", "hintLabel"], exportAs: ["matFormField"] }, { kind: "directive", type: i4$2.MatPrefix, selector: "[matPrefix], [matIconPrefix], [matTextPrefix]", inputs: ["matTextPrefix"] }, { kind: "directive", type: i4$2.MatSuffix, selector: "[matSuffix], [matIconSuffix], [matTextSuffix]", inputs: ["matTextSuffix"] }, { kind: "directive", type: CommandDirective, selector: "[pectinCommand]", inputs: ["pectinCommand", "commandParameter"] }, { kind: "directive", type: FocusBindingDirective, selector: "[pectinFocusBinding]", inputs: ["pectinFocusBinding", "focusBindingTarget"] }, { kind: "component", type: i2.MatIconButton, selector: "button[mat-icon-button]", inputs: ["disabled", "disableRipple", "color"], exportAs: ["matButton"] }, { kind: "component", type: IconComponent, selector: "aup-icon", inputs: ["icon"] }] });
-}
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.9", ngImport: i0, type: SearchInputComponent, decorators: [{
-            type: Component,
-            args: [{ selector: 'aup-search-input', template: "<mat-form-field [floatLabel]=\"floatLabel\">\n\n  <input matInput\n         placeholder=\"{{placeholder}}\"\n         [attr.autocomplete]=\"autocomplete\"\n         [(ngModel)]=\"componentValue$.value\"\n         [disabled]=\"!enabled$.value\"\n         (keydown.enter)=\"notifyEnterKey()\"\n         (keydown.escape)=\"notifyEscapeKey()\"\n         [pectinFocusBinding]=\"focusContext\"\n         [errorStateMatcher]=\"errorStateMatcher\"\n  >\n  <aup-icon matPrefix icon=\"mat:search\"></aup-icon>\n  <button mat-icon-button matSuffix [pectinCommand]=\"clearCommand\">\n    <aup-icon icon=\"mat:close\"></aup-icon>\n  </button>\n</mat-form-field>\n\n", styles: ["button[disabled]{visibility:hidden}\n"] }]
+            args: [{ selector: 'aup-password-input', template: "<mat-form-field [floatLabel]=\"floatLabel\">\n  <mat-label *ngIf=\"label\">{{label}}</mat-label>\n  <input type=\"password\"\n         matInput\n         placeholder=\"{{placeholder}}\"\n         [attr.autocomplete]=\"autocomplete\"\n         [(ngModel)]=\"componentValue$.value\"\n         [disabled]=\"!enabled$.value\"\n         (keydown.enter)=\"notifyEnterKey()\"\n         (keydown.escape)=\"notifyEscapeKey()\"\n         [pectinFocusBinding]=\"focusContext\"\n         [errorStateMatcher]=\"errorStateMatcher\"\n  >\n  <mat-hint *ngIf=\"showHint\">{{hint}}</mat-hint>\n  <mat-error *ngIf=\"hasErrors\">{{firstError}}</mat-error>\n</mat-form-field>\n\n" }]
         }], ctorParameters: function () { return []; }, propDecorators: { autocomplete: [{
                 type: Input
             }] } });
 
 /**
  * Using templates:
- * <aup-select-input [value$]="myModel" [options]="myOptions">
+ * <aup-select-input [valueModel]="myModel" [options]="myOptions">
  *   <ng-template #optionTemplate let-option>{{option.thePropertyYouWant}}</ng-template>
- *   <ng-template #selectedOptionTemplate let-option>{{option.thePropertyYouWant}} note, not used for nils (the placeholder is used)</ng-template>
- *   <ng-template #nilOptionTemplate>Uses the placeholder by default but you can customise it</ng-template>
+ *   <ng-template #nilOptionTemplate let-option>{{option.thePropertyYouWant}}</ng-template>
  * </aup-select_input>
  */
 class SelectInputComponent extends AbstractValueInputComponent {
@@ -2428,7 +2233,7 @@ class SelectInputComponent extends AbstractValueInputComponent {
         super();
         const { chain } = Dsl.disposeWith(this);
         this.cookedOptions$ = chain(this.options$)
-            .mapAll(options => {
+            .reduceToList(options => {
             return options.length < 1 && !isNil(this.componentValue$.value) ? [this.componentValue$.value] : options;
         }, {
             dependsOn: this.componentValue$
@@ -2467,21 +2272,21 @@ class SelectInputComponent extends AbstractValueInputComponent {
             id: this.delegatedIdentityOf(value)
         });
         let lastIdSnapshot = snapshotValueAndId(this.componentValue$.value);
-        // console.log(lastIdSnapshot)
+        console.log(lastIdSnapshot);
         before(this.options$).changes(() => {
             lastIdSnapshot = snapshotValueAndId(this.componentValue$.value);
-            // console.log(lastIdSnapshot)
+            console.log(lastIdSnapshot);
         });
         when(this.options$).changes((is, was) => {
             const newIdSnapshot = snapshotValueAndId(lastIdSnapshot.value);
-            // console.log(lastIdSnapshot, newIdSnapshot)
+            console.log(lastIdSnapshot, newIdSnapshot);
             if (newIdSnapshot !== lastIdSnapshot.id) {
                 this.id$.value = this.delegatedIdentityOf(this.componentValue$.value);
             }
         });
     }
     static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.9", ngImport: i0, type: SelectInputComponent, deps: [], target: i0.ɵɵFactoryTarget.Component });
-    static ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "16.2.9", type: SelectInputComponent, selector: "aup-select-input", inputs: { options$: "options$", options: "options", optionLabel: "optionLabel", allowNil: "allowNil", optionLabelFormat: "optionLabelFormat" }, queries: [{ propertyName: "selectedOptionTemplateRef", first: true, predicate: ["selectedOptionTemplate"], descendants: true }, { propertyName: "optionTemplateRef", first: true, predicate: ["optionTemplate"], descendants: true }, { propertyName: "nilOptionTemplateRef", first: true, predicate: ["nilOptionTemplate"], descendants: true }], usesInheritance: true, ngImport: i0, template: "<mat-form-field [floatLabel]=\"floatLabel\">\n  <mat-label *ngIf=\"label\">{{label}}</mat-label>\n  <mat-select placeholder=\"{{placeholder}}\"\n              [ngModel]=\"componentValue$.value\"\n              (ngModelChange)=\"select($event)\"\n              [disabled]=\"!enabled$.value\"\n              (keydown.enter)=\"notifyEnterKey()\"\n              (keydown.escape)=\"notifyEscapeKey()\"\n              [pectinFocusBinding]=\"focusContext\"\n              [errorStateMatcher]=\"errorStateMatcher\"\n  >\n\n    <!--\n    TODO: dave has a scenario where the selected item isn't rendering that I can't reproduce so we explicity render it..\n          It typically happens because the ngModel value isn't the one contained in the list - this means our source model\n          identifyOf function has changed and our id$/lookup$/componentValue$ are out of sync.\n          We get around this for now by explicity rendering the component value.\n          Please Note: I haven't been able to reproduce this\n    -->\n    <mat-select-trigger *ngIf=\"!selectedOptionTemplateRef\">\n      {{optionLabelFormat(componentValue$.value)}}\n    </mat-select-trigger>\n\n    <mat-select-trigger *ngIf=\"selectedOptionTemplateRef\">\n      <ng-container [ngTemplateOutlet]=\"selectedOptionTemplateRef\"\n                    [ngTemplateOutletContext]=\"{ $implicit: componentValue$.value}\"></ng-container>\n    </mat-select-trigger>\n\n    <mat-option *ngIf=\"allowNil\">\n      <ng-container *ngIf=\"!nilOptionTemplateRef\">{{placeholder}}</ng-container>\n      <ng-container *ngIf=\"nilOptionTemplateRef\" [ngTemplateOutlet]=\"nilOptionTemplateRef\"></ng-container>\n    </mat-option>\n    <mat-option *ngFor=\"let option of cookedOptions$.value; trackBy: trackByIdentity;let i = index\"\n                [value]=\"option\">\n      <ng-container *ngIf=\"!optionTemplateRef\">{{optionLabelFormat(option)}}</ng-container>\n      <ng-container *ngIf=\"optionTemplateRef\"\n                    [ngTemplateOutlet]=\"optionTemplateRef\"\n                    [ngTemplateOutletContext]=\"{ $implicit: option, index: i }\"\n      >\n      </ng-container>\n    </mat-option>\n    <ng-content select=\"[select-option-footer]\"></ng-content>\n  </mat-select>\n  <mat-hint *ngIf=\"showHint\">{{hint}}</mat-hint>\n  <mat-error *ngIf=\"hasErrors\">{{firstError}}</mat-error>\n</mat-form-field>\n<div class=\"width-strut\">\n  <mat-label *ngIf=\"label\">{{label}}</mat-label>\n  <div class=\"item\" *ngFor=\"let item of cookedOptions$.value\">\n    <ng-container *ngIf=\"!optionTemplateRef\">{{optionLabelFormat(item)}}</ng-container>\n    <ng-container *ngIf=\"optionTemplateRef\"\n                  [ngTemplateOutlet]=\"optionTemplateRef\"\n                  [ngTemplateOutletContext]=\"{ $implicit: item, index: 0 }\"\n    >\n    </ng-container>\n  </div>\n</div>\n", styles: [":host{display:inline-block}mat-form-field{width:100%}.width-strut{display:block;height:0;max-height:0;width:auto;visibility:hidden;overflow:hidden;padding-right:35px}.width-strut mat-label{font-size:75%}.width-strut>.item{font-size:16px;padding-left:0}\n"], dependencies: [{ kind: "directive", type: i1$1.NgForOf, selector: "[ngFor][ngForOf]", inputs: ["ngForOf", "ngForTrackBy", "ngForTemplate"] }, { kind: "directive", type: i1$1.NgIf, selector: "[ngIf]", inputs: ["ngIf", "ngIfThen", "ngIfElse"] }, { kind: "directive", type: i1$1.NgTemplateOutlet, selector: "[ngTemplateOutlet]", inputs: ["ngTemplateOutletContext", "ngTemplateOutlet", "ngTemplateOutletInjector"] }, { kind: "directive", type: i2$4.NgControlStatus, selector: "[formControlName],[ngModel],[formControl]" }, { kind: "directive", type: i2$4.NgModel, selector: "[ngModel]:not([formControlName]):not([formControl])", inputs: ["name", "disabled", "ngModel", "ngModelOptions"], outputs: ["ngModelChange"], exportAs: ["ngModel"] }, { kind: "component", type: i4$2.MatFormField, selector: "mat-form-field", inputs: ["hideRequiredMarker", "color", "floatLabel", "appearance", "subscriptSizing", "hintLabel"], exportAs: ["matFormField"] }, { kind: "directive", type: i4$2.MatLabel, selector: "mat-label" }, { kind: "directive", type: i4$2.MatHint, selector: "mat-hint", inputs: ["align", "id"] }, { kind: "directive", type: i4$2.MatError, selector: "mat-error, [matError]", inputs: ["id"] }, { kind: "component", type: i4$3.MatSelect, selector: "mat-select", inputs: ["disabled", "disableRipple", "tabIndex", "panelWidth", "hideSingleSelectionIndicator"], exportAs: ["matSelect"] }, { kind: "directive", type: i4$3.MatSelectTrigger, selector: "mat-select-trigger" }, { kind: "component", type: i5.MatOption, selector: "mat-option", exportAs: ["matOption"] }, { kind: "directive", type: FocusBindingDirective, selector: "[pectinFocusBinding]", inputs: ["pectinFocusBinding", "focusBindingTarget"] }] });
+    static ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "16.2.9", type: SelectInputComponent, selector: "aup-select-input", inputs: { options$: "options$", options: "options", optionLabel: "optionLabel", allowNil: "allowNil", optionLabelFormat: "optionLabelFormat" }, queries: [{ propertyName: "selectedOptionTemplateRef", first: true, predicate: ["selectedOptionTemplate"], descendants: true }, { propertyName: "optionTemplateRef", first: true, predicate: ["optionTemplate"], descendants: true }, { propertyName: "nilOptionTemplateRef", first: true, predicate: ["nilOptionTemplate"], descendants: true }], usesInheritance: true, ngImport: i0, template: "<mat-form-field [floatLabel]=\"floatLabel\">\n  <mat-label *ngIf=\"label\">{{label}}</mat-label>\n  <mat-select placeholder=\"{{placeholder}}\"\n              [ngModel]=\"componentValue$.value\"\n              (ngModelChange)=\"select($event)\"\n              [disabled]=\"!enabled$.value\"\n              (keydown.enter)=\"notifyEnterKey()\"\n              (keydown.escape)=\"notifyEscapeKey()\"\n              [pectinFocusBinding]=\"focusContext\"\n              [errorStateMatcher]=\"errorStateMatcher\"\n  >\n\n    <!--\n    TODO: dave has a scenario where the selected item isn't rendering that I can't reproduce so we explicity render it..\n          It typically happens because the ngModel value isn't the one contained in the list - this means our source model\n          identifyOf function has changed and our id$/lookup$/componentValue$ are out of sync.\n          We get around this for now by explicity rendering the component value.\n          Please Note: I haven't been able to reproduce this\n    -->\n    <mat-select-trigger *ngIf=\"!selectedOptionTemplateRef\">\n      {{optionLabelFormat(componentValue$.value)}}\n    </mat-select-trigger>\n\n    <mat-select-trigger *ngIf=\"selectedOptionTemplateRef\">\n      <ng-container [ngTemplateOutlet]=\"selectedOptionTemplateRef\"\n                    [ngTemplateOutletContext]=\"{ $implicit: componentValue$.value}\"></ng-container>\n    </mat-select-trigger>\n\n    <mat-option *ngIf=\"allowNil\">\n      <ng-container *ngIf=\"!nilOptionTemplateRef\">{{placeholder}}</ng-container>\n      <ng-container *ngIf=\"nilOptionTemplateRef\" [ngTemplateOutlet]=\"nilOptionTemplateRef\"></ng-container>\n    </mat-option>\n    <mat-option *ngFor=\"let option of cookedOptions$.value; trackBy: trackByIdentity;let i = index\"\n                [value]=\"option\">\n      <ng-container *ngIf=\"!optionTemplateRef\">{{optionLabelFormat(option)}}</ng-container>\n      <ng-container *ngIf=\"optionTemplateRef\"\n                    [ngTemplateOutlet]=\"optionTemplateRef\"\n                    [ngTemplateOutletContext]=\"{ $implicit: option, index: i }\"\n      >\n      </ng-container>\n    </mat-option>\n  </mat-select>\n  <mat-hint *ngIf=\"showHint\">{{hint}}</mat-hint>\n  <mat-error *ngIf=\"hasErrors\">{{firstError}}</mat-error>\n</mat-form-field>\n<div class=\"width-strut\">\n  <mat-label *ngIf=\"label\">{{label}}</mat-label>\n  <div class=\"item\" *ngFor=\"let item of cookedOptions$.value\">\n    <ng-container *ngIf=\"!optionTemplateRef\">{{optionLabelFormat(item)}}</ng-container>\n    <ng-container *ngIf=\"optionTemplateRef\"\n                  [ngTemplateOutlet]=\"optionTemplateRef\"\n                  [ngTemplateOutletContext]=\"{ $implicit: item, index: 0 }\"\n    >\n    </ng-container>\n  </div>\n</div>\n", styles: [":host{display:inline-block}mat-form-field{width:100%}.width-strut{display:block;height:0;max-height:0;width:auto;visibility:hidden;overflow:hidden;padding-right:35px}.width-strut mat-label{font-size:75%}.width-strut>.item{font-size:16px;padding-left:0}\n"], dependencies: [{ kind: "directive", type: i1$1.NgForOf, selector: "[ngFor][ngForOf]", inputs: ["ngForOf", "ngForTrackBy", "ngForTemplate"] }, { kind: "directive", type: i1$1.NgIf, selector: "[ngIf]", inputs: ["ngIf", "ngIfThen", "ngIfElse"] }, { kind: "directive", type: i1$1.NgTemplateOutlet, selector: "[ngTemplateOutlet]", inputs: ["ngTemplateOutletContext", "ngTemplateOutlet", "ngTemplateOutletInjector"] }, { kind: "directive", type: i2$4.NgControlStatus, selector: "[formControlName],[ngModel],[formControl]" }, { kind: "directive", type: i2$4.NgModel, selector: "[ngModel]:not([formControlName]):not([formControl])", inputs: ["name", "disabled", "ngModel", "ngModelOptions"], outputs: ["ngModelChange"], exportAs: ["ngModel"] }, { kind: "component", type: i4$2.MatFormField, selector: "mat-form-field", inputs: ["hideRequiredMarker", "color", "floatLabel", "appearance", "subscriptSizing", "hintLabel"], exportAs: ["matFormField"] }, { kind: "directive", type: i4$2.MatLabel, selector: "mat-label" }, { kind: "directive", type: i4$2.MatHint, selector: "mat-hint", inputs: ["align", "id"] }, { kind: "directive", type: i4$2.MatError, selector: "mat-error, [matError]", inputs: ["id"] }, { kind: "component", type: i4$4.MatSelect, selector: "mat-select", inputs: ["disabled", "disableRipple", "tabIndex", "panelWidth", "hideSingleSelectionIndicator"], exportAs: ["matSelect"] }, { kind: "directive", type: i4$4.MatSelectTrigger, selector: "mat-select-trigger" }, { kind: "component", type: i5.MatOption, selector: "mat-option", exportAs: ["matOption"] }, { kind: "directive", type: FocusBindingDirective, selector: "[pectinFocusBinding]", inputs: ["pectinFocusBinding", "focusBindingTarget"] }] });
 }
 __decorate([
     Proxify(),
@@ -2493,7 +2298,7 @@ __decorate([
 ], SelectInputComponent.prototype, "options", null);
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.9", ngImport: i0, type: SelectInputComponent, decorators: [{
             type: Component,
-            args: [{ selector: 'aup-select-input', template: "<mat-form-field [floatLabel]=\"floatLabel\">\n  <mat-label *ngIf=\"label\">{{label}}</mat-label>\n  <mat-select placeholder=\"{{placeholder}}\"\n              [ngModel]=\"componentValue$.value\"\n              (ngModelChange)=\"select($event)\"\n              [disabled]=\"!enabled$.value\"\n              (keydown.enter)=\"notifyEnterKey()\"\n              (keydown.escape)=\"notifyEscapeKey()\"\n              [pectinFocusBinding]=\"focusContext\"\n              [errorStateMatcher]=\"errorStateMatcher\"\n  >\n\n    <!--\n    TODO: dave has a scenario where the selected item isn't rendering that I can't reproduce so we explicity render it..\n          It typically happens because the ngModel value isn't the one contained in the list - this means our source model\n          identifyOf function has changed and our id$/lookup$/componentValue$ are out of sync.\n          We get around this for now by explicity rendering the component value.\n          Please Note: I haven't been able to reproduce this\n    -->\n    <mat-select-trigger *ngIf=\"!selectedOptionTemplateRef\">\n      {{optionLabelFormat(componentValue$.value)}}\n    </mat-select-trigger>\n\n    <mat-select-trigger *ngIf=\"selectedOptionTemplateRef\">\n      <ng-container [ngTemplateOutlet]=\"selectedOptionTemplateRef\"\n                    [ngTemplateOutletContext]=\"{ $implicit: componentValue$.value}\"></ng-container>\n    </mat-select-trigger>\n\n    <mat-option *ngIf=\"allowNil\">\n      <ng-container *ngIf=\"!nilOptionTemplateRef\">{{placeholder}}</ng-container>\n      <ng-container *ngIf=\"nilOptionTemplateRef\" [ngTemplateOutlet]=\"nilOptionTemplateRef\"></ng-container>\n    </mat-option>\n    <mat-option *ngFor=\"let option of cookedOptions$.value; trackBy: trackByIdentity;let i = index\"\n                [value]=\"option\">\n      <ng-container *ngIf=\"!optionTemplateRef\">{{optionLabelFormat(option)}}</ng-container>\n      <ng-container *ngIf=\"optionTemplateRef\"\n                    [ngTemplateOutlet]=\"optionTemplateRef\"\n                    [ngTemplateOutletContext]=\"{ $implicit: option, index: i }\"\n      >\n      </ng-container>\n    </mat-option>\n    <ng-content select=\"[select-option-footer]\"></ng-content>\n  </mat-select>\n  <mat-hint *ngIf=\"showHint\">{{hint}}</mat-hint>\n  <mat-error *ngIf=\"hasErrors\">{{firstError}}</mat-error>\n</mat-form-field>\n<div class=\"width-strut\">\n  <mat-label *ngIf=\"label\">{{label}}</mat-label>\n  <div class=\"item\" *ngFor=\"let item of cookedOptions$.value\">\n    <ng-container *ngIf=\"!optionTemplateRef\">{{optionLabelFormat(item)}}</ng-container>\n    <ng-container *ngIf=\"optionTemplateRef\"\n                  [ngTemplateOutlet]=\"optionTemplateRef\"\n                  [ngTemplateOutletContext]=\"{ $implicit: item, index: 0 }\"\n    >\n    </ng-container>\n  </div>\n</div>\n", styles: [":host{display:inline-block}mat-form-field{width:100%}.width-strut{display:block;height:0;max-height:0;width:auto;visibility:hidden;overflow:hidden;padding-right:35px}.width-strut mat-label{font-size:75%}.width-strut>.item{font-size:16px;padding-left:0}\n"] }]
+            args: [{ selector: 'aup-select-input', template: "<mat-form-field [floatLabel]=\"floatLabel\">\n  <mat-label *ngIf=\"label\">{{label}}</mat-label>\n  <mat-select placeholder=\"{{placeholder}}\"\n              [ngModel]=\"componentValue$.value\"\n              (ngModelChange)=\"select($event)\"\n              [disabled]=\"!enabled$.value\"\n              (keydown.enter)=\"notifyEnterKey()\"\n              (keydown.escape)=\"notifyEscapeKey()\"\n              [pectinFocusBinding]=\"focusContext\"\n              [errorStateMatcher]=\"errorStateMatcher\"\n  >\n\n    <!--\n    TODO: dave has a scenario where the selected item isn't rendering that I can't reproduce so we explicity render it..\n          It typically happens because the ngModel value isn't the one contained in the list - this means our source model\n          identifyOf function has changed and our id$/lookup$/componentValue$ are out of sync.\n          We get around this for now by explicity rendering the component value.\n          Please Note: I haven't been able to reproduce this\n    -->\n    <mat-select-trigger *ngIf=\"!selectedOptionTemplateRef\">\n      {{optionLabelFormat(componentValue$.value)}}\n    </mat-select-trigger>\n\n    <mat-select-trigger *ngIf=\"selectedOptionTemplateRef\">\n      <ng-container [ngTemplateOutlet]=\"selectedOptionTemplateRef\"\n                    [ngTemplateOutletContext]=\"{ $implicit: componentValue$.value}\"></ng-container>\n    </mat-select-trigger>\n\n    <mat-option *ngIf=\"allowNil\">\n      <ng-container *ngIf=\"!nilOptionTemplateRef\">{{placeholder}}</ng-container>\n      <ng-container *ngIf=\"nilOptionTemplateRef\" [ngTemplateOutlet]=\"nilOptionTemplateRef\"></ng-container>\n    </mat-option>\n    <mat-option *ngFor=\"let option of cookedOptions$.value; trackBy: trackByIdentity;let i = index\"\n                [value]=\"option\">\n      <ng-container *ngIf=\"!optionTemplateRef\">{{optionLabelFormat(option)}}</ng-container>\n      <ng-container *ngIf=\"optionTemplateRef\"\n                    [ngTemplateOutlet]=\"optionTemplateRef\"\n                    [ngTemplateOutletContext]=\"{ $implicit: option, index: i }\"\n      >\n      </ng-container>\n    </mat-option>\n  </mat-select>\n  <mat-hint *ngIf=\"showHint\">{{hint}}</mat-hint>\n  <mat-error *ngIf=\"hasErrors\">{{firstError}}</mat-error>\n</mat-form-field>\n<div class=\"width-strut\">\n  <mat-label *ngIf=\"label\">{{label}}</mat-label>\n  <div class=\"item\" *ngFor=\"let item of cookedOptions$.value\">\n    <ng-container *ngIf=\"!optionTemplateRef\">{{optionLabelFormat(item)}}</ng-container>\n    <ng-container *ngIf=\"optionTemplateRef\"\n                  [ngTemplateOutlet]=\"optionTemplateRef\"\n                  [ngTemplateOutletContext]=\"{ $implicit: item, index: 0 }\"\n    >\n    </ng-container>\n  </div>\n</div>\n", styles: [":host{display:inline-block}mat-form-field{width:100%}.width-strut{display:block;height:0;max-height:0;width:auto;visibility:hidden;overflow:hidden;padding-right:35px}.width-strut mat-label{font-size:75%}.width-strut>.item{font-size:16px;padding-left:0}\n"] }]
         }], ctorParameters: function () { return []; }, propDecorators: { options$: [{
                 type: Input
             }], options: [{
@@ -2524,28 +2329,17 @@ class StringInputComponent extends AbstractValueInputComponent {
     get enableClear() { return this.#enableClear_accessor_storage; }
     set enableClear(value) { this.#enableClear_accessor_storage = value; }
     iconPrefix;
-    #suffixCommand_accessor_storage = proxify(Command);
-    get suffixCommand() { return this.#suffixCommand_accessor_storage; }
-    set suffixCommand(value) { this.#suffixCommand_accessor_storage = value; }
     clearCommand;
-    elementRef = this.inject(ElementRef);
     constructor() {
         super();
         const { chain, valueOf, before, when, after, observe, switchOn } = Dsl.disposeWith(this);
         this.clearCommand = Command.create(() => {
             this.componentValue$.value = "";
-        })
-            .withFace({ icon: () => "mat:clear" })
-            .enableWhile(chain.stringValue(this.componentValue$).isNotBlank());
-    }
-    get hasSuffixCommand() {
-        return Proxify.hasTarget(this.suffixCommand);
-    }
-    select() {
-        this.elementRef.nativeElement.querySelector('input').select();
+        });
+        this.clearCommand.disableWhile(chain.stringValue(this.componentValue$).isBlank());
     }
     static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.9", ngImport: i0, type: StringInputComponent, deps: [], target: i0.ɵɵFactoryTarget.Component });
-    static ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "16.2.9", type: StringInputComponent, selector: "aup-string-input", inputs: { autocomplete: "autocomplete", enableClear$: "enableClear$", enableClear: "enableClear", iconPrefix: "iconPrefix", suffixCommand: "suffixCommand" }, usesInheritance: true, ngImport: i0, template: "<mat-form-field [floatLabel]=\"floatLabel\">\n  <mat-label *ngIf=\"label\">{{label}}</mat-label>\n  <input matInput\n         placeholder=\"{{placeholder}}\"\n         [attr.autocomplete]=\"autocomplete\"\n         [(ngModel)]=\"componentValue$.value\"\n         [disabled]=\"!enabled$.value\"\n         (keydown.enter)=\"notifyEnterKey()\"\n         (keydown.escape)=\"notifyEscapeKey()\"\n         [pectinFocusBinding]=\"focusContext\"\n         [errorStateMatcher]=\"errorStateMatcher\"\n  >\n  <mat-hint *ngIf=\"showHint\">{{hint}}</mat-hint>\n  <mat-error *ngIf=\"hasErrors\">{{firstError}}</mat-error>\n  <aup-icon *ngIf=\"iconPrefix\" matPrefix [icon]=\"iconPrefix\"></aup-icon>\n  <span matSuffix>\n    <aup-command *ngIf=\"enableClear\" [command]=\"clearCommand\" data-cy=\"clearCommand\"></aup-command>\n    <aup-command *ngIf=\"hasSuffixCommand\" [command]=\"suffixCommand\" data-cy=\"suffixCommand\"></aup-command>\n  </span>\n</mat-form-field>\n\n", styles: [""], dependencies: [{ kind: "directive", type: i1$1.NgIf, selector: "[ngIf]", inputs: ["ngIf", "ngIfThen", "ngIfElse"] }, { kind: "directive", type: i2$4.DefaultValueAccessor, selector: "input:not([type=checkbox])[formControlName],textarea[formControlName],input:not([type=checkbox])[formControl],textarea[formControl],input:not([type=checkbox])[ngModel],textarea[ngModel],[ngDefaultControl]" }, { kind: "directive", type: i2$4.NgControlStatus, selector: "[formControlName],[ngModel],[formControl]" }, { kind: "directive", type: i2$4.NgModel, selector: "[ngModel]:not([formControlName]):not([formControl])", inputs: ["name", "disabled", "ngModel", "ngModelOptions"], outputs: ["ngModelChange"], exportAs: ["ngModel"] }, { kind: "directive", type: i3.MatInput, selector: "input[matInput], textarea[matInput], select[matNativeControl],      input[matNativeControl], textarea[matNativeControl]", inputs: ["disabled", "id", "placeholder", "name", "required", "type", "errorStateMatcher", "aria-describedby", "value", "readonly"], exportAs: ["matInput"] }, { kind: "component", type: i4$2.MatFormField, selector: "mat-form-field", inputs: ["hideRequiredMarker", "color", "floatLabel", "appearance", "subscriptSizing", "hintLabel"], exportAs: ["matFormField"] }, { kind: "directive", type: i4$2.MatLabel, selector: "mat-label" }, { kind: "directive", type: i4$2.MatHint, selector: "mat-hint", inputs: ["align", "id"] }, { kind: "directive", type: i4$2.MatError, selector: "mat-error, [matError]", inputs: ["id"] }, { kind: "directive", type: i4$2.MatPrefix, selector: "[matPrefix], [matIconPrefix], [matTextPrefix]", inputs: ["matTextPrefix"] }, { kind: "directive", type: i4$2.MatSuffix, selector: "[matSuffix], [matIconSuffix], [matTextSuffix]", inputs: ["matTextSuffix"] }, { kind: "directive", type: FocusBindingDirective, selector: "[pectinFocusBinding]", inputs: ["pectinFocusBinding", "focusBindingTarget"] }, { kind: "component", type: IconComponent, selector: "aup-icon", inputs: ["icon"] }, { kind: "component", type: CommandComponent, selector: "aup-command", inputs: ["command", "face$", "face", "busyFace$", "busyFace", "alignFace"] }] });
+    static ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "16.2.9", type: StringInputComponent, selector: "aup-string-input", inputs: { autocomplete: "autocomplete", enableClear$: "enableClear$", enableClear: "enableClear", iconPrefix: "iconPrefix" }, usesInheritance: true, ngImport: i0, template: "<mat-form-field [floatLabel]=\"floatLabel\">\n  <mat-label *ngIf=\"label\">{{label}}</mat-label>\n  <input matInput\n         placeholder=\"{{placeholder}}\"\n         [attr.autocomplete]=\"autocomplete\"\n         [(ngModel)]=\"componentValue$.value\"\n         [disabled]=\"!enabled$.value\"\n         (keydown.enter)=\"notifyEnterKey()\"\n         (keydown.escape)=\"notifyEscapeKey()\"\n         [pectinFocusBinding]=\"focusContext\"\n         [errorStateMatcher]=\"errorStateMatcher\"\n  >\n  <mat-hint *ngIf=\"showHint\">{{hint}}</mat-hint>\n  <mat-error *ngIf=\"hasErrors\">{{firstError}}</mat-error>\n  <aup-icon *ngIf=\"iconPrefix\" matPrefix [icon]=\"iconPrefix\"></aup-icon>\n  <button mat-icon-button matSuffix *ngIf=\"enableClear\" [pectinCommand]=\"clearCommand\">\n    <aup-icon icon=\"mat:close\"></aup-icon>\n  </button>\n</mat-form-field>\n\n", styles: ["button[disabled]{visibility:hidden}\n"], dependencies: [{ kind: "directive", type: i1$1.NgIf, selector: "[ngIf]", inputs: ["ngIf", "ngIfThen", "ngIfElse"] }, { kind: "directive", type: i2$4.DefaultValueAccessor, selector: "input:not([type=checkbox])[formControlName],textarea[formControlName],input:not([type=checkbox])[formControl],textarea[formControl],input:not([type=checkbox])[ngModel],textarea[ngModel],[ngDefaultControl]" }, { kind: "directive", type: i2$4.NgControlStatus, selector: "[formControlName],[ngModel],[formControl]" }, { kind: "directive", type: i2$4.NgModel, selector: "[ngModel]:not([formControlName]):not([formControl])", inputs: ["name", "disabled", "ngModel", "ngModelOptions"], outputs: ["ngModelChange"], exportAs: ["ngModel"] }, { kind: "directive", type: i3.MatInput, selector: "input[matInput], textarea[matInput], select[matNativeControl],      input[matNativeControl], textarea[matNativeControl]", inputs: ["disabled", "id", "placeholder", "name", "required", "type", "errorStateMatcher", "aria-describedby", "value", "readonly"], exportAs: ["matInput"] }, { kind: "component", type: i4$2.MatFormField, selector: "mat-form-field", inputs: ["hideRequiredMarker", "color", "floatLabel", "appearance", "subscriptSizing", "hintLabel"], exportAs: ["matFormField"] }, { kind: "directive", type: i4$2.MatLabel, selector: "mat-label" }, { kind: "directive", type: i4$2.MatHint, selector: "mat-hint", inputs: ["align", "id"] }, { kind: "directive", type: i4$2.MatError, selector: "mat-error, [matError]", inputs: ["id"] }, { kind: "directive", type: i4$2.MatPrefix, selector: "[matPrefix], [matIconPrefix], [matTextPrefix]", inputs: ["matTextPrefix"] }, { kind: "directive", type: i4$2.MatSuffix, selector: "[matSuffix], [matIconSuffix], [matTextSuffix]", inputs: ["matTextSuffix"] }, { kind: "directive", type: CommandDirective, selector: "[pectinCommand]", inputs: ["pectinCommand", "commandParameter"] }, { kind: "directive", type: FocusBindingDirective, selector: "[pectinFocusBinding]", inputs: ["pectinFocusBinding", "focusBindingTarget"] }, { kind: "component", type: i2.MatIconButton, selector: "button[mat-icon-button]", inputs: ["disabled", "disableRipple", "color"], exportAs: ["matButton"] }, { kind: "component", type: IconComponent, selector: "aup-icon", inputs: ["icon"] }] });
 }
 __decorate([
     Proxify(),
@@ -2555,13 +2349,9 @@ __decorate([
     StoreInValueModel(),
     __metadata("design:type", Object)
 ], StringInputComponent.prototype, "enableClear", null);
-__decorate([
-    Proxify(),
-    __metadata("design:type", Command)
-], StringInputComponent.prototype, "suffixCommand", null);
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.9", ngImport: i0, type: StringInputComponent, decorators: [{
             type: Component,
-            args: [{ selector: 'aup-string-input', template: "<mat-form-field [floatLabel]=\"floatLabel\">\n  <mat-label *ngIf=\"label\">{{label}}</mat-label>\n  <input matInput\n         placeholder=\"{{placeholder}}\"\n         [attr.autocomplete]=\"autocomplete\"\n         [(ngModel)]=\"componentValue$.value\"\n         [disabled]=\"!enabled$.value\"\n         (keydown.enter)=\"notifyEnterKey()\"\n         (keydown.escape)=\"notifyEscapeKey()\"\n         [pectinFocusBinding]=\"focusContext\"\n         [errorStateMatcher]=\"errorStateMatcher\"\n  >\n  <mat-hint *ngIf=\"showHint\">{{hint}}</mat-hint>\n  <mat-error *ngIf=\"hasErrors\">{{firstError}}</mat-error>\n  <aup-icon *ngIf=\"iconPrefix\" matPrefix [icon]=\"iconPrefix\"></aup-icon>\n  <span matSuffix>\n    <aup-command *ngIf=\"enableClear\" [command]=\"clearCommand\" data-cy=\"clearCommand\"></aup-command>\n    <aup-command *ngIf=\"hasSuffixCommand\" [command]=\"suffixCommand\" data-cy=\"suffixCommand\"></aup-command>\n  </span>\n</mat-form-field>\n\n" }]
+            args: [{ selector: 'aup-string-input', template: "<mat-form-field [floatLabel]=\"floatLabel\">\n  <mat-label *ngIf=\"label\">{{label}}</mat-label>\n  <input matInput\n         placeholder=\"{{placeholder}}\"\n         [attr.autocomplete]=\"autocomplete\"\n         [(ngModel)]=\"componentValue$.value\"\n         [disabled]=\"!enabled$.value\"\n         (keydown.enter)=\"notifyEnterKey()\"\n         (keydown.escape)=\"notifyEscapeKey()\"\n         [pectinFocusBinding]=\"focusContext\"\n         [errorStateMatcher]=\"errorStateMatcher\"\n  >\n  <mat-hint *ngIf=\"showHint\">{{hint}}</mat-hint>\n  <mat-error *ngIf=\"hasErrors\">{{firstError}}</mat-error>\n  <aup-icon *ngIf=\"iconPrefix\" matPrefix [icon]=\"iconPrefix\"></aup-icon>\n  <button mat-icon-button matSuffix *ngIf=\"enableClear\" [pectinCommand]=\"clearCommand\">\n    <aup-icon icon=\"mat:close\"></aup-icon>\n  </button>\n</mat-form-field>\n\n", styles: ["button[disabled]{visibility:hidden}\n"] }]
         }], ctorParameters: function () { return []; }, propDecorators: { autocomplete: [{
                 type: Input
             }], enableClear$: [{
@@ -2570,8 +2360,6 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.9", ngImpor
                 type: Input
             }], iconPrefix: [{
                 type: Input
-            }], suffixCommand: [{
-                type: Input
             }] } });
 
 class TextInputComponent extends AbstractValueInputComponent {
@@ -2579,14 +2367,10 @@ class TextInputComponent extends AbstractValueInputComponent {
     // valueModel: Form.ValueModelBase<string> | MutableValueModel<string>;
     rows = 2;
     cols;
-    elementRef = this.inject(ElementRef);
     constructor() {
         super();
         // const { chain, valueOf, before, when, after, observe, switchOn } = Dsl.disposeWith(this);
     }
-    select() {
-        this.elementRef.nativeElement.querySelector('input').select();
-    }
     static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.9", ngImport: i0, type: TextInputComponent, deps: [], target: i0.ɵɵFactoryTarget.Component });
     static ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "16.2.9", type: TextInputComponent, selector: "aup-text-input", inputs: { rows: "rows", cols: "cols" }, usesInheritance: true, ngImport: i0, template: "<mat-form-field [floatLabel]=\"floatLabel\">\n  <mat-label *ngIf=\"label\">{{label}}</mat-label>\n  <textarea matInput\n            placeholder=\"{{placeholder}}\"\n            [(ngModel)]=\"componentValue$.value\"\n            [disabled]=\"!enabled$.value\"\n            (keydown.enter)=\"notifyEnterKey()\"\n            (keydown.escape)=\"notifyEscapeKey()\"\n            [pectinFocusBinding]=\"focusContext\"\n            [errorStateMatcher]=\"errorStateMatcher\"\n            [rows]=\"rows\"\n            [cols]=\"cols\"\n  >\n  </textarea>\n  <mat-hint *ngIf=\"showHint\">{{hint}}</mat-hint>\n  <mat-error *ngIf=\"hasErrors\">{{firstError}}</mat-error>\n</mat-form-field>\n\n", styles: ["button[disabled]{visibility:hidden}textarea{overflow:auto}\n"], dependencies: [{ kind: "directive", type: i1$1.NgIf, selector: "[ngIf]", inputs: ["ngIf", "ngIfThen", "ngIfElse"] }, { kind: "directive", type: i2$4.DefaultValueAccessor, selector: "input:not([type=checkbox])[formControlName],textarea[formControlName],input:not([type=checkbox])[formControl],textarea[formControl],input:not([type=checkbox])[ngModel],textarea[ngModel],[ngDefaultControl]" }, { kind: "directive", type: i2$4.NgControlStatus, selector: "[formControlName],[ngModel],[formControl]" }, { kind: "directive", type: i2$4.NgModel, selector: "[ngModel]:not([formControlName]):not([formControl])", inputs: ["name", "disabled", "ngModel", "ngModelOptions"], outputs: ["ngModelChange"], exportAs: ["ngModel"] }, { kind: "directive", type: i3.MatInput, selector: "input[matInput], textarea[matInput], select[matNativeControl],      input[matNativeControl], textarea[matNativeControl]", inputs: ["disabled", "id", "placeholder", "name", "required", "type", "errorStateMatcher", "aria-describedby", "value", "readonly"], exportAs: ["matInput"] }, { kind: "component", type: i4$2.MatFormField, selector: "mat-form-field", inputs: ["hideRequiredMarker", "color", "floatLabel", "appearance", "subscriptSizing", "hintLabel"], exportAs: ["matFormField"] }, { kind: "directive", type: i4$2.MatLabel, selector: "mat-label" }, { kind: "directive", type: i4$2.MatHint, selector: "mat-hint", inputs: ["align", "id"] }, { kind: "directive", type: i4$2.MatError, selector: "mat-error, [matError]", inputs: ["id"] }, { kind: "directive", type: FocusBindingDirective, selector: "[pectinFocusBinding]", inputs: ["pectinFocusBinding", "focusBindingTarget"] }] });
 }
@@ -2763,6 +2547,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.9", ngImpor
  * </aup-switch-case>
  */
 class SwitchCaseComponent extends DisposableComponent {
+    cdr;
     #switch$_accessor_storage = proxify((ValueModel));
     get switch$() { return this.#switch$_accessor_storage; }
     set switch$(value) { this.#switch$_accessor_storage = value; }
@@ -2771,8 +2556,9 @@ class SwitchCaseComponent extends DisposableComponent {
     set switch(value) { this.#switch_accessor_storage = value; }
     switchCaseOptions;
     selectedIndex = 0;
-    constructor() {
+    constructor(cdr) {
         super();
+        this.cdr = cdr;
     }
     ngAfterContentInit() {
         const subscription = this.switchCaseOptions.changes.subscribe(change => this.updateSelection());
@@ -2809,8 +2595,8 @@ class SwitchCaseComponent extends DisposableComponent {
             this.selectedIndex = -1;
         }
     }
-    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.9", ngImport: i0, type: SwitchCaseComponent, deps: [], target: i0.ɵɵFactoryTarget.Component });
-    static ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "16.2.9", type: SwitchCaseComponent, selector: "aup-switch-case", inputs: { switch$: "switch$", switch: "switch" }, queries: [{ propertyName: "switchCaseOptions", predicate: SwitchCaseOption }], usesInheritance: true, ngImport: i0, template: "<mat-tab-group class=\"content-wrapper\" no-tab-header full-height-tabs [selectedIndex]=\"selectedIndex\">\n  <mat-tab *ngFor=\"let option of switchCaseOptions\">\n    <ng-template [ngTemplateOutlet]=\"option.templateRef\"></ng-template>\n  </mat-tab>\n</mat-tab-group>\n\n\n", styles: [":host{display:flex;flex-direction:column;align-items:stretch}mat-tab-group{flex:1}\n"], dependencies: [{ kind: "directive", type: i1$1.NgForOf, selector: "[ngFor][ngForOf]", inputs: ["ngForOf", "ngForTrackBy", "ngForTemplate"] }, { kind: "directive", type: i1$1.NgTemplateOutlet, selector: "[ngTemplateOutlet]", inputs: ["ngTemplateOutletContext", "ngTemplateOutlet", "ngTemplateOutletInjector"] }, { kind: "component", type: i3$2.MatTab, selector: "mat-tab", inputs: ["disabled"], exportAs: ["matTab"] }, { kind: "component", type: i3$2.MatTabGroup, selector: "mat-tab-group", inputs: ["color", "disableRipple", "fitInkBarToContent", "mat-stretch-tabs"], exportAs: ["matTabGroup"] }] });
+    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.9", ngImport: i0, type: SwitchCaseComponent, deps: [{ token: i0.ChangeDetectorRef }], target: i0.ɵɵFactoryTarget.Component });
+    static ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "16.2.9", type: SwitchCaseComponent, selector: "aup-switch-case", inputs: { switch$: "switch$", switch: "switch" }, queries: [{ propertyName: "switchCaseOptions", predicate: SwitchCaseOption }], usesInheritance: true, ngImport: i0, template: "<mat-tab-group class=\"content-wrapper\" no-tab-header full-height-tabs [selectedIndex]=\"selectedIndex\">\n  <mat-tab *ngFor=\"let option of switchCaseOptions\">\n    <ng-template [ngTemplateOutlet]=\"option.templateRef\"></ng-template>\n  </mat-tab>\n</mat-tab-group>\n\n\n", styles: [":host{display:flex;flex-direction:column;align-items:stretch}mat-tab-group{flex:1}\n"], dependencies: [{ kind: "directive", type: i1$1.NgForOf, selector: "[ngFor][ngForOf]", inputs: ["ngForOf", "ngForTrackBy", "ngForTemplate"] }, { kind: "directive", type: i1$1.NgTemplateOutlet, selector: "[ngTemplateOutlet]", inputs: ["ngTemplateOutletContext", "ngTemplateOutlet", "ngTemplateOutletInjector"] }, { kind: "component", type: i3$1.MatTab, selector: "mat-tab", inputs: ["disabled"], exportAs: ["matTab"] }, { kind: "component", type: i3$1.MatTabGroup, selector: "mat-tab-group", inputs: ["color", "disableRipple", "fitInkBarToContent", "mat-stretch-tabs"], exportAs: ["matTabGroup"] }] });
 }
 __decorate([
     Proxify(),
@@ -2823,7 +2609,7 @@ __decorate([
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.9", ngImport: i0, type: SwitchCaseComponent, decorators: [{
             type: Component,
             args: [{ selector: 'aup-switch-case', template: "<mat-tab-group class=\"content-wrapper\" no-tab-header full-height-tabs [selectedIndex]=\"selectedIndex\">\n  <mat-tab *ngFor=\"let option of switchCaseOptions\">\n    <ng-template [ngTemplateOutlet]=\"option.templateRef\"></ng-template>\n  </mat-tab>\n</mat-tab-group>\n\n\n", styles: [":host{display:flex;flex-direction:column;align-items:stretch}mat-tab-group{flex:1}\n"] }]
-        }], ctorParameters: function () { return []; }, propDecorators: { switch$: [{
+        }], ctorParameters: function () { return [{ type: i0.ChangeDetectorRef }]; }, propDecorators: { switch$: [{
                 type: Input
             }], switch: [{
                 type: Input
@@ -2833,7 +2619,6 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.9", ngImpor
             }] } });
 
 const HEADER_CELL_RENDERER_PORTAL = Symbol('aup-cell-header-renderer-component-ref');
-const FOOTER_CELL_RENDERER_PORTAL = Symbol('aup-cell-footer-renderer-component-ref');
 const CELL_RENDERER_PORTAL = Symbol('aup-cell-renderer-component-ref');
 const CELL_EDITOR_PORTAL = Symbol('aup-cell-editor-component-ref');
 const PORTAL_RENDERER_COMPONENT = Symbol('aup-cell-renderer-portal-component');
@@ -2848,7 +2633,7 @@ class CellHeaderPortalRef extends CellPortalRef {
         this.componentType = componentType;
         this.initialiseHeader = initialiseHeader;
     }
-    initialiseHost(host) {
+    initialiseHost(host, columnModel) {
         assert$1.isTruthy(host);
         host[HEADER_CELL_RENDERER_PORTAL] = new ComponentPortal(this.componentType);
     }
@@ -2867,7 +2652,7 @@ class ComponentCellRendererPortalRef extends CellRendererPortalRef {
         this.componentType = componentType;
         this.updateComponent = updateComponent;
     }
-    initialiseHost(host) {
+    initialiseHost(host, columnModel) {
         host[CELL_RENDERER_PORTAL] = new ComponentPortal(this.componentType);
     }
     // @Trace()
@@ -2890,7 +2675,7 @@ class CellEditorPortalRef extends CellPortalRef {
         this.componentType = componentType;
         this.initialiseEditorSession = initialiseEditorSession;
     }
-    initialiseHost(host) {
+    initialiseHost(host, columnModel) {
         assert$1.isTruthy(host);
         host[CELL_EDITOR_PORTAL] = new ComponentPortal(this.componentType);
     }
@@ -2914,7 +2699,7 @@ class TemplateCellRendererPortalRef extends CellRendererPortalRef {
         this.fillCell = fillCell;
         this.padChild = padChild;
     }
-    initialiseHost(host) {
+    initialiseHost(host, columnModel) {
         assert$1.isTruthy(host);
     }
     // @Trace()
@@ -2931,23 +2716,6 @@ class TemplateCellRendererPortalRef extends CellRendererPortalRef {
         return new TemplatePortal(this.templateRef, this.viewContainer, { ...(data), $implicit: data.row });
     }
 }
-class CellFooterPortalRef extends CellPortalRef {
-    componentType;
-    initialiseHeader;
-    constructor(componentType, initialiseHeader) {
-        super();
-        this.componentType = componentType;
-        this.initialiseHeader = initialiseHeader;
-    }
-    initialiseHost(host) {
-        assert$1.isTruthy(host);
-        host[HEADER_CELL_RENDERER_PORTAL] = new ComponentPortal(this.componentType);
-    }
-    // @Trace()
-    onPortalAttached(host, portalComponent) {
-        this.initialiseHeader(portalComponent, host.column);
-    }
-}
 
 class ColumnTextSearchFormatter {
 }
@@ -3038,7 +2806,6 @@ class ColumnTextSearchWrapper extends ColumnTextSearchFormatter.Delegate {
 }
 class ColumnModel extends GarbageCollector {
     columnId;
-    order;
     textPropertiesProvider;
     _columnTextProperties;
     _columnHeaderPortalRef;
@@ -3052,10 +2819,9 @@ class ColumnModel extends GarbageCollector {
     dasherisedColumnId;
     textSearchDelegate = new ColumnTextSearchWrapper();
     visible$;
-    constructor(columnId, order, textPropertiesProvider) {
+    constructor(columnId, textPropertiesProvider) {
         super();
         this.columnId = columnId;
-        this.order = order;
         this.textPropertiesProvider = textPropertiesProvider;
         const { valueOf } = Dsl.disposeWith(this);
         this.installHeaderRenderer();
@@ -3100,14 +2866,6 @@ class ColumnModel extends GarbageCollector {
         this._columnTextProperties = columnTextProperties;
         return this;
     }
-    positionAfter(column) {
-        this.order.position(this, { after: column });
-        return this;
-    }
-    positionBefore(column) {
-        this.order.position(this, { before: column });
-        return this;
-    }
     getSearchTextFor(row) {
         return this.textSearchDelegate.format(row);
     }
@@ -3140,12 +2898,12 @@ class ColumnModel extends GarbageCollector {
         return !!this._cellEditorPortalRef;
     }
     attachHeaderCell(host) {
-        this._columnHeaderPortalRef.initialiseHost(host);
+        this._columnHeaderPortalRef.initialiseHost(host, this);
     }
     attachCell(host) {
-        this._cellRendererPortalRef.initialiseHost(host);
+        this._cellRendererPortalRef.initialiseHost(host, this);
         if (this.hasEditorPortal()) {
-            this._cellEditorPortalRef.initialiseHost(host);
+            this._cellEditorPortalRef.initialiseHost(host, this);
         }
     }
     onHeaderAttached(host, ref) {
@@ -3209,8 +2967,8 @@ __decorate([
 
 class CustomTemplateColumnModel extends ColumnModel {
     config = new TemplateCellRendererPortalRef();
-    constructor(columnId, order, defaults) {
-        super(columnId, order, defaults);
+    constructor(columnId, defaults) {
+        super(columnId, defaults);
         this.configureCellRenderer(this.config);
     }
     setTemplate(templateRef, viewContainer, fillCell, padChild) {
@@ -3288,17 +3046,12 @@ class AbstractTableComponent extends DisposableComponent {
     #showHeader_accessor_storage = true;
     get showHeader() { return this.#showHeader_accessor_storage; }
     set showHeader(value) { this.#showHeader_accessor_storage = value; }
-    #enableScrolling$_accessor_storage = proxify((ValueModel));
     /**
      * Set to true to enable scrolling.  Once enabled the table will have 0 implicit height.  You will either
      * need to set it explicitly e.g. height: 400px; or by using flex or grid layout to make it fill it's
      * containment area.
      */
-    get enableScrolling$() { return this.#enableScrolling$_accessor_storage; }
-    set enableScrolling$(value) { this.#enableScrolling$_accessor_storage = value; }
-    #enableScrolling_accessor_storage = false;
-    get enableScrolling() { return this.#enableScrolling_accessor_storage; }
-    set enableScrolling(value) { this.#enableScrolling_accessor_storage = value; }
+    enableScrolling = false;
     columns;
     columnIds;
     columnsById;
@@ -3317,6 +3070,7 @@ class AbstractTableComponent extends DisposableComponent {
         super();
         this.injector = injector;
         const { chain, when } = Dsl.disposeWith(this);
+        this._visibleRows$.setDelegate(this._dataSource$);
         when(chain(this._dataSource$).first()).becomesTruthy(it => {
             if (it === this.identityOf(it)) {
                 console.warn("Table model identity function is using reference equality.  This can cause lots of table re-rendering", {
@@ -3335,7 +3089,7 @@ class AbstractTableComponent extends DisposableComponent {
         if (!model) {
             lang$1.illegalState("aup-table tableModel is nil");
         }
-        this.columnsById = chain(model.columns$).indexBy('columnId');
+        this.columnsById = chain(model.columns).indexBy('columnId');
         this._dataSource$.setDelegate(model.dataSource$);
         model.initialise(this.injector, (row) => this.identityOf(row));
     }
@@ -3352,7 +3106,7 @@ class AbstractTableComponent extends DisposableComponent {
         }
     }
     static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.9", ngImport: i0, type: AbstractTableComponent, deps: [{ token: i0.Injector }], target: i0.ɵɵFactoryTarget.Component });
-    static ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "16.2.9", type: AbstractTableComponent, selector: "aup-abstract-table", inputs: { showHeader$: "showHeader$", showHeader: "showHeader", enableScrolling$: "enableScrolling$", enableScrolling: "enableScrolling" }, host: { properties: { "class": "this.baseCssClass" } }, usesInheritance: true, ngImport: i0, template: '', isInline: true });
+    static ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "16.2.9", type: AbstractTableComponent, selector: "aup-abstract-table", inputs: { showHeader$: "showHeader$", showHeader: "showHeader", enableScrolling: "enableScrolling" }, host: { properties: { "class": "this.baseCssClass" } }, usesInheritance: true, ngImport: i0, template: '', isInline: true });
 }
 __decorate([
     Proxify(),
@@ -3362,14 +3116,6 @@ __decorate([
     StoreInValueModel(),
     __metadata("design:type", Object)
 ], AbstractTableComponent.prototype, "showHeader", null);
-__decorate([
-    Proxify(),
-    __metadata("design:type", ValueModel)
-], AbstractTableComponent.prototype, "enableScrolling$", null);
-__decorate([
-    StoreInValueModel(),
-    __metadata("design:type", Boolean)
-], AbstractTableComponent.prototype, "enableScrolling", null);
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.9", ngImport: i0, type: AbstractTableComponent, decorators: [{
             type: Component,
             args: [{
@@ -3380,8 +3126,6 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.9", ngImpor
                 type: Input
             }], showHeader: [{
                 type: Input
-            }], enableScrolling$: [{
-                type: Input
             }], enableScrolling: [{
                 type: Input
             }], baseCssClass: [{
@@ -3442,8 +3186,6 @@ class EditSession extends GarbageCollector {
             //   console.warn()
             // }
             this._liveRowValue$.value = produce(this._liveRowValue$.value, draft => {
-                // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-                // @ts-ignore
                 this.form.writeDirtyStateTo(draft);
             });
         });
@@ -3546,11 +3288,11 @@ class DefaultCellRendererComponent {
         return this._value;
     }
     static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.9", ngImport: i0, type: DefaultCellRendererComponent, deps: [], target: i0.ɵɵFactoryTarget.Component });
-    static ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "16.2.9", type: DefaultCellRendererComponent, selector: "aup-default-cell-renderer", inputs: { value: "value" }, ngImport: i0, template: "<span [innerHTML]=\"value?.toString() | aupHighlight\"></span>\n", styles: [""], dependencies: [{ kind: "pipe", type: HighlightPipe, name: "aupHighlight" }] });
+    static ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "16.2.9", type: DefaultCellRendererComponent, selector: "aup-default-cell-renderer", inputs: { value: "value" }, ngImport: i0, template: "<span [innerHTML]=\"value| aupHighlight\"></span>\n", styles: [""], dependencies: [{ kind: "pipe", type: HighlightPipe, name: "aupHighlight" }] });
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.9", ngImport: i0, type: DefaultCellRendererComponent, decorators: [{
             type: Component,
-            args: [{ selector: "aup-default-cell-renderer", template: "<span [innerHTML]=\"value?.toString() | aupHighlight\"></span>\n" }]
+            args: [{ selector: "aup-default-cell-renderer", template: "<span [innerHTML]=\"value| aupHighlight\"></span>\n" }]
         }], propDecorators: { value: [{
                 type: Input
             }] } });
@@ -3566,8 +3308,7 @@ class SelectionHeaderCellComponent extends DisposableComponent {
         super();
         this.selectCommand = Command.create(() => {
             this.selectionModel.toggleAllCommand.execute();
-        }).visibleWhile(this.selectionModel.toggleAllCommand.visible$)
-            .enableWhile(this.selectionModel.toggleAllCommand.enabled$);
+        });
     }
     isSelected() {
         return this.ifMultiSelectionModel(m => m.allSelected$.value, false);
@@ -3595,7 +3336,7 @@ class SelectionHeaderCellComponent extends DisposableComponent {
     static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.9", ngImport: i0, type: SelectionHeaderCellComponent, deps: [], target: i0.ɵɵFactoryTarget.Component });
     static ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "16.2.9", type: SelectionHeaderCellComponent, selector: "aup-selection-header-cell", providers: [
             { provide: MAT_CHECKBOX_DEFAULT_OPTIONS, useValue: { clickAction: 'noop' } }
-        ], usesInheritance: true, ngImport: i0, template: "<mat-checkbox *ngIf=\"isVisible()\"\n              (click)=\"handleClick($event)\"\n              [checked]=\"isSelected()\"\n              [indeterminate]=\"this.isIntermediate()\"\n              [color]=\"color\"\n></mat-checkbox>\n", styles: [""], dependencies: [{ kind: "directive", type: i1$1.NgIf, selector: "[ngIf]", inputs: ["ngIf", "ngIfThen", "ngIfElse"] }, { kind: "component", type: i3$1.MatCheckbox, selector: "mat-checkbox", inputs: ["disableRipple", "color", "tabIndex"], exportAs: ["matCheckbox"] }] });
+        ], usesInheritance: true, ngImport: i0, template: "<mat-checkbox *ngIf=\"isVisible()\"\n              (click)=\"handleClick($event)\"\n              [checked]=\"isSelected()\"\n              [indeterminate]=\"this.isIntermediate()\"\n              [color]=\"color\"\n></mat-checkbox>\n", styles: [""], dependencies: [{ kind: "directive", type: i1$1.NgIf, selector: "[ngIf]", inputs: ["ngIf", "ngIfThen", "ngIfElse"] }, { kind: "component", type: i4$3.MatCheckbox, selector: "mat-checkbox", inputs: ["disableRipple", "color", "tabIndex"], exportAs: ["matCheckbox"] }] });
 }
 __decorate([
     Proxify(),
@@ -3628,7 +3369,7 @@ class SelectionCellComponent extends DisposableComponent {
     static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.9", ngImport: i0, type: SelectionCellComponent, deps: null, target: i0.ɵɵFactoryTarget.Component });
     static ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "16.2.9", type: SelectionCellComponent, selector: "aup-selection-cell", inputs: { row: "row" }, providers: [
             { provide: MAT_CHECKBOX_DEFAULT_OPTIONS, useValue: { clickAction: 'noop' } }
-        ], usesInheritance: true, ngImport: i0, template: "<mat-checkbox (click)=\"select($event)\" [checked]=\"isSelected()\"  [color]=\"color\"></mat-checkbox>\n", styles: [""], dependencies: [{ kind: "component", type: i3$1.MatCheckbox, selector: "mat-checkbox", inputs: ["disableRipple", "color", "tabIndex"], exportAs: ["matCheckbox"] }] });
+        ], usesInheritance: true, ngImport: i0, template: "<mat-checkbox (click)=\"select($event)\" [checked]=\"isSelected()\"  [color]=\"color\"></mat-checkbox>\n", styles: [""], dependencies: [{ kind: "component", type: i4$3.MatCheckbox, selector: "mat-checkbox", inputs: ["disableRipple", "color", "tabIndex"], exportAs: ["matCheckbox"] }] });
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.9", ngImport: i0, type: SelectionCellComponent, decorators: [{
             type: Component,
@@ -3689,14 +3430,25 @@ class Bounds extends Dimension {
 })(Bounds || (Bounds = {}));
 
 class ResizeAwareComponent extends DisposableComponent {
-    elementRef = this.inject(ElementRef);
-    ngZone = this.inject(NgZone);
-    boundsTracker = new ResizeAwareComponent.ResizeTracker(this.elementRef, this.ngZone);
+    elementRef;
+    ngZone;
+    _bounds$ = new MutableValueModel(new Bounds(0, 0, 0, 0));
+    constructor(elementRef, ngZone) {
+        super();
+        this.elementRef = elementRef;
+        this.ngZone = ngZone;
+    }
     ngAfterViewInit() {
-        this.boundsTracker.notifyViewReady();
+        const element = this.elementRef.nativeElement;
+        const ro = new ResizeObserver((entries, observer) => {
+            this.ngZone.run(() => this._updateBounds());
+        });
+        ro.observe(element);
+        this.onDispose(() => ro.disconnect());
+        setTimeout(() => this._updateBounds());
     }
     get bounds$() {
-        return this.boundsTracker.bounds$;
+        return this._bounds$.readonly$;
     }
     get nativeElement() {
         return this.elementRef.nativeElement;
@@ -3706,160 +3458,57 @@ class ResizeAwareComponent extends DisposableComponent {
         return this.bounds.relativePositionOf(point);
     }
     get bounds() {
-        return this.bounds$.value;
+        return this._bounds$.value;
+    }
+    _updateBounds() {
+        this._bounds$.value = Bounds.ofElement(this.nativeElement);
     }
-    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.9", ngImport: i0, type: ResizeAwareComponent, deps: null, target: i0.ɵɵFactoryTarget.Directive });
+    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.9", ngImport: i0, type: ResizeAwareComponent, deps: [{ token: i0.ElementRef }, { token: i0.NgZone }], target: i0.ɵɵFactoryTarget.Directive });
     static ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "14.0.0", version: "16.2.9", type: ResizeAwareComponent, usesInheritance: true, ngImport: i0 });
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.9", ngImport: i0, type: ResizeAwareComponent, decorators: [{
             type: Directive
-        }] });
-(function (ResizeAwareComponent) {
-    class ResizeTracker extends GarbageCollector {
-        elementRef;
-        ngZone;
-        _bounds$ = new MutableValueModel(new Bounds(0, 0, 0, 0));
-        width$;
-        height$;
-        top$;
-        left$;
-        bottom$;
-        right$;
-        constructor(elementRef, ngZone) {
-            super();
-            this.elementRef = elementRef;
-            this.ngZone = ngZone;
-            const { chain } = Dsl.disposeWith(this);
-            this.width$ = chain(this.bounds$).pluck("width");
-            this.height$ = chain(this.bounds$).pluck("height");
-            this.top$ = chain(this.bounds$).pluck("top");
-            this.left$ = chain(this.bounds$).pluck("left");
-            this.bottom$ = chain.numericValue(this.top$).add(this.height$);
-            this.right$ = chain.numericValue(this.left$).add(this.width$);
-        }
-        notifyViewReady() {
-            const element = this.elementRef.nativeElement;
-            const ro = new ResizeObserver((entries, observer) => {
-                this.ngZone.run(() => this._updateBounds());
-            });
-            ro.observe(element);
-            this.onDispose(() => ro.disconnect());
-            setTimeout(() => this._updateBounds());
-        }
-        get bounds$() {
-            return this._bounds$.readonly$;
-        }
-        get nativeElement() {
-            return this.elementRef.nativeElement;
-        }
-        // TODO: Make this handle body scroll
-        relativePositionOf(point) {
-            return this.bounds.relativePositionOf(point);
-        }
-        get bounds() {
-            return this._bounds$.value;
-        }
-        _updateBounds() {
-            this._bounds$.value = Bounds.ofElement(this.nativeElement);
-        }
-    }
-    ResizeAwareComponent.ResizeTracker = ResizeTracker;
-})(ResizeAwareComponent || (ResizeAwareComponent = {}));
-
-var ColumnOrderManager;
-(function (ColumnOrderManager) {
-    function processPosition(position, callback) {
-        if (position) {
-            const keys = Object.keys(position);
-            if (keys.includes("before")) {
-                return position["before"] ? callback.before(position["before"]) : callback.first();
-            }
-            else {
-                return position["after"] ? callback.after(position["after"]) : callback.last();
-            }
-        }
-        else {
-            return callback.last();
-        }
-    }
-    ColumnOrderManager.processPosition = processPosition;
-})(ColumnOrderManager || (ColumnOrderManager = {}));
+        }], ctorParameters: function () { return [{ type: i0.ElementRef }, { type: i0.NgZone }]; } });
 
-class ColumnRef {
-    column;
-    position;
-    constructor(column, position) {
-        this.column = column;
-        this.position = position;
-    }
-}
-class ColumnManager extends GarbageCollector {
-    _columnRefs$ = new MutableListModel();
-    orderedColumnRefs$;
-    _columnsById$;
-    allColumns$;
-    columnVisibilities$ = new WatchList();
-    visibleColumns$;
+class ColumnListModel extends AbstractComputedListModel {
+    _allColumns$ = new MutableListModel();
+    columnsById$;
     constructor() {
         super();
         const { chain } = Dsl.disposeWith(this);
-        this.orderedColumnRefs$ = chain(this._columnRefs$).orderBy("position", "asc");
-        this.allColumns$ = this.orderedColumnRefs$.pluck("column");
-        this._columnsById$ = chain(this.allColumns$).indexBy('columnId');
-        this.visibleColumns$ = chain(this.allColumns$).select(it => it.visible$.value, {
-            dependsOn: this.columnVisibilities$
-        });
+        this.columnsById$ = chain(this._allColumns$).indexBy('columnId');
     }
-    position(column, newPosition) {
-        const target = this._columnRefs$.query().findMatching(it => it.column === column);
-        const position = this.computePosition(newPosition);
-        this._columnRefs$.replace(target, { with: new ColumnRef(target.column, position) });
+    get allColumns$() {
+        return this._allColumns$.readonly$;
     }
     getColumn(id) {
-        return this._columnsById$.get(id);
+        return this.columnsById$.get(id);
     }
     hasColumn(id) {
-        return !!this._columnsById$.get(id);
+        return !!this.columnsById$.get(id);
     }
     hasMatchingColumn(row, regex) {
         // only search the visible columns
-        return !!this.visibleColumns$.value.find(c => regex.test(c.getSearchTextFor(row)));
+        return !!this.value.find(c => regex.test(c.getSearchTextFor(row)));
     }
-    addColumn(column, position) {
+    addColumn(column, index) {
         if (this.hasColumn(column.columnId)) {
             lang.illegalState(`Column with id=${column.columnId} already exists`);
         }
         this.registerDisposable(column);
-        this._columnRefs$.push(new ColumnRef(column, this.computePosition(position)));
-        this.columnVisibilities$.add(column.visible$);
-        return column;
-    }
-    computePosition(position) {
-        const q = this.orderedColumnRefs$.query();
-        return ColumnOrderManager.processPosition(position, {
-            before(col) {
-                const index = q.findIndex(ref => ref.column === col);
-                const beforeCol = q.value[index];
-                const afterCol = index - 1 >= 0 ? q.value[index - 1] : undefined;
-                return generateKeyBetween(afterCol?.position, beforeCol.position);
-            },
-            after(col) {
-                const index = q.findIndex(ref => ref.column === col);
-                const afterCol = q.value[index];
-                const beforeCol = index + 1 < q.length ? q.value[index + 1] : undefined;
-                return generateKeyBetween(afterCol.position, beforeCol?.position);
-            },
-            first() {
-                return generateKeyBetween(null, q.first()?.position);
-            },
-            last() {
-                // add it to the end of the list
-                return generateKeyBetween(q.last()?.position, null);
+        this.runInTransaction(() => {
+            if (!isNil(index)) {
+                this._allColumns$.insert(index, column);
+            }
+            else {
+                this._allColumns$.push(column);
             }
+            this.registerDisposable(this.trackSource(column.visible$));
         });
+        return column;
     }
     doComputeValue() {
-        return this.allColumns$.value.filter(c => c.visible$.value);
+        return this._allColumns$.value.filter(c => c.visible$.value);
     }
 }
 
@@ -3893,8 +3542,8 @@ function EnableCellTextSearch(options) {
 
 class CustomValueColumnModel extends ColumnModel {
     getValue;
-    constructor(columnId, order, defaults, getValue) {
-        super(columnId, order, defaults);
+    constructor(columnId, defaults, getValue) {
+        super(columnId, defaults);
         this.getValue = getValue;
         this.cellRenderer(DefaultCellRendererComponent);
     }
@@ -3902,17 +3551,17 @@ class CustomValueColumnModel extends ColumnModel {
         this.configureColumnTextSearch(EnableCellTextSearch.getFormatter(componentType, () => new ColumnTextSearchFormatter.Null()), row => this.getValue(row));
         this.configureCellRenderer(new ComponentCellRendererPortalRef(componentType, (component, rowData, firstTime) => {
             if (firstTime) {
-                if (isFunction(onComponentInitOrOptions)) {
+                if (isFunction$1(onComponentInitOrOptions)) {
                     onComponentInitOrOptions(component);
                 }
                 else {
-                    if (isFunction(onComponentInitOrOptions?.onComponentInit)) {
+                    if (isFunction$1(onComponentInitOrOptions?.onComponentInit)) {
                         onComponentInitOrOptions.onComponentInit(component);
                     }
                 }
             }
             component.value = this.getValue(rowData.row);
-            if (!isFunction(onComponentInitOrOptions) && isFunction(onComponentInitOrOptions?.onRowUpdate)) {
+            if (!isFunction$1(onComponentInitOrOptions) && isFunction$1(onComponentInitOrOptions?.onRowUpdate)) {
                 onComponentInitOrOptions.onRowUpdate(component, rowData.row);
             }
         }));
@@ -3924,8 +3573,8 @@ class CustomValueColumnModel extends ColumnModel {
 }
 
 class EditorControlColumnModel extends ColumnModel {
-    constructor(columnId, order, saveCommandFactory, defaults) {
-        super(columnId, order, defaults);
+    constructor(columnId, saveCommandFactory, defaults) {
+        super(columnId, defaults);
         this.cellRenderer(EditRowControlsComponent);
     }
     cellRenderer(componentType) {
@@ -3950,8 +3599,8 @@ class ListPropertyColumnModel extends ColumnModel {
             intermediate.map(v => v?.toString()).join(", ") :
             intermediate?.toString();
     };
-    constructor(id, order, property, defaults) {
-        super(id, order, defaults);
+    constructor(id, property, defaults) {
+        super(id, defaults);
         this.property = property;
         this.cellRenderer(DefaultCellRendererComponent);
     }
@@ -3967,7 +3616,7 @@ class ListPropertyColumnModel extends ColumnModel {
     }
     cellEditor(editor, validatorsOrInitialiser, initialiseComponent) {
         const validators = Array.isArray(validatorsOrInitialiser) ? validatorsOrInitialiser : undefined;
-        const initialiser = isFunction(validatorsOrInitialiser) ? validatorsOrInitialiser : initialiseComponent;
+        const initialiser = isFunction$1(validatorsOrInitialiser) ? validatorsOrInitialiser : initialiseComponent;
         this.configureCellEditor(new CellEditorPortalRef(editor, (component, editSession) => {
             const formListModel = editSession.form.pluckList(this.property);
             if (validators) {
@@ -3996,8 +3645,8 @@ class PropertyColumnModel extends ColumnModel {
     _defaultSearchTextFormatter = (value) => {
         return (this._userFormat ?? Functions.identity)(value)?.toString();
     };
-    constructor(id, order, property, defaults) {
-        super(id, order, defaults);
+    constructor(id, property, defaults) {
+        super(id, defaults);
         this.property = property;
         this.cellRenderer(DefaultCellRendererComponent);
     }
@@ -4005,11 +3654,11 @@ class PropertyColumnModel extends ColumnModel {
         this.configureColumnTextSearch(EnableCellTextSearch.getFormatter(componentType, () => ColumnTextSearchFormatter.forFormatter(this._defaultSearchTextFormatter)), row => row[this.property]);
         this.configureCellRenderer(new ComponentCellRendererPortalRef(componentType, (component, rowData, firstTime) => {
             if (firstTime) {
-                if (isFunction(onComponentInitOrOptions)) {
+                if (isFunction$1(onComponentInitOrOptions)) {
                     onComponentInitOrOptions(component);
                 }
                 else {
-                    if (isFunction(onComponentInitOrOptions?.onComponentInit)) {
+                    if (isFunction$1(onComponentInitOrOptions?.onComponentInit)) {
                         onComponentInitOrOptions.onComponentInit(component);
                     }
                 }
@@ -4034,7 +3683,7 @@ class PropertyColumnModel extends ColumnModel {
             component[ColumnModel.CELL_RENDERER_COMPONENT_ROW_CACHE] = rowData.row;
             let disableEditCallback = false;
             if (firstTime) {
-                if (isFunction(options?.onComponentInit)) {
+                if (isFunction$1(options?.onComponentInit)) {
                     options.onComponentInit(component);
                 }
                 // install our edit callback
@@ -4049,7 +3698,7 @@ class PropertyColumnModel extends ColumnModel {
             disableEditCallback = true;
             component.value = rowData.row[this.property];
             disableEditCallback = false;
-            if (!isFunction(options) && isFunction(options?.onRowUpdate)) {
+            if (!isFunction$1(options) && isFunction$1(options?.onRowUpdate)) {
                 options.onRowUpdate(component, rowData.row);
             }
         }));
@@ -4057,7 +3706,7 @@ class PropertyColumnModel extends ColumnModel {
     }
     cellEditor(editor, validatorsOrInitialiser, onComponentInit) {
         const validators = Array.isArray(validatorsOrInitialiser) ? validatorsOrInitialiser : undefined;
-        const initialiser = isFunction(validatorsOrInitialiser) ? validatorsOrInitialiser : onComponentInit;
+        const initialiser = isFunction$1(validatorsOrInitialiser) ? validatorsOrInitialiser : onComponentInit;
         this.configureCellEditor(new CellEditorPortalRef(editor, (component, editSession) => {
             const formValueModel = editSession.form.pluck(this.property);
             if (validators) {
@@ -4081,37 +3730,29 @@ class PropertyColumnModel extends ColumnModel {
 }
 
 class SelectionColumnModel extends ColumnModel {
+    selectionModel;
     _enableHeaderControls = true;
     _color = "accent";
-    _selectionModelProxy = proxify((SelectionModel));
-    _isUsingTemporarySelection$ = new MutableValueModel(false);
-    _userSelectionModel;
-    constructor(columnId, order, defaults) {
-        super(columnId, order, defaults);
+    constructor(columnId, defaults, selectionModel) {
+        super(columnId, defaults);
+        this.selectionModel = selectionModel;
         const { chain } = Dsl.disposeWith(this);
         this._selectRowOnClick(false);
         this.cellHeaderRenderer(SelectionHeaderCellComponent, (component) => {
-            component.selectionModel = this._selectionModelProxy;
+            component.selectionModel = this.selectionModel;
             component.enableHeaderControls = this._enableHeaderControls;
             component.color = this._color;
         });
         this.configureCellRenderer(new ComponentCellRendererPortalRef(SelectionCellComponent, (component, rowData) => {
             component.row = rowData.row;
-            component.selectionModel = this._selectionModelProxy;
+            component.selectionModel = this.selectionModel;
             component.color = this._color;
         }));
-        this.setMasterVisibility(this._selectionModelProxy.enabled$);
-        this.setDefaultVisibility(chain(this._selectionModelProxy.mode$).equals(SelectionModel.Mode.MULTIPLE));
-    }
-    get selectionModel() {
-        return this._selectionModelProxy;
-    }
-    get isUsingTemporarySelectionModel$() {
-        return this._isUsingTemporarySelection$.readonly$;
+        this.setMasterVisibility(this.selectionModel.enabled$);
+        this.setDefaultVisibility(chain(this.selectionModel.mode$).equals(SelectionModel.Mode.MULTIPLE));
     }
     useSelectionModel(selectionModel) {
-        this._userSelectionModel = selectionModel;
-        this._selectionModelProxy.setProxyTarget(selectionModel);
+        this.selectionModel.setProxyTarget(selectionModel);
     }
     getDefaultHeaderText() {
         return '';
@@ -4127,62 +3768,12 @@ class SelectionColumnModel extends ColumnModel {
         this._color = color;
     }
     selectRow(row) {
-        this._selectionModelProxy.selectCommand.execute(row);
+        this.selectionModel.selectCommand.execute(row);
     }
     isSelected(row) {
-        return this._selectionModelProxy.isSelected(row);
-    }
-    async withTemporarySelectionModel(createSelectionModel, process) {
-        const garbage = new GarbageCollector();
-        this._isUsingTemporarySelection$.value = true;
-        const selectionModel = createSelectionModel(garbage);
-        this._selectionModelProxy.setProxyTarget(selectionModel);
-        try {
-            await process(selectionModel);
-        }
-        finally {
-            this._selectionModelProxy.setProxyTarget(this._userSelectionModel);
-            garbage.dispose();
-            this._isUsingTemporarySelection$.value = false;
-        }
-    }
-}
-
-let RowClass$1 = class RowClass {
-    className;
-    matches;
-    constructor(className, matches) {
-        this.className = className;
-        this.matches = matches;
-    }
-};
-class FooterRowModel {
-    _rowClasses = [];
-    noPadding() {
-        this.addClass("no-padding");
-    }
-    addClass(className, condition) {
-        this._rowClasses.push(new RowClass$1(className, condition ?? (() => true)));
+        return this.selectionModel.isSelected(row);
     }
 }
-(function (FooterRowModel) {
-    class Impl extends FooterRowModel {
-        component;
-        onInit;
-        portal;
-        constructor(component, onInit) {
-            super();
-            this.component = component;
-            this.onInit = onInit;
-            this.portal = new ComponentPortal(component);
-        }
-        getActiveRowClasses() {
-            return this._rowClasses.filter(c => c.matches()).map(c => c.className).join(" ");
-        }
-    }
-    FooterRowModel.Impl = Impl;
-})(FooterRowModel || (FooterRowModel = {}));
-ProxyRegistry.registerOneTimeBinding(FooterRowModel);
 
 class TableMoreMenuComponent extends DisposableComponent {
     value$ = new MutableValueModel();
@@ -4193,15 +3784,13 @@ class TableMoreMenuComponent extends DisposableComponent {
     popupType$ = new MutableValueModel();
     popupComponentPortal$;
     _visible$ = this.registerDisposable(new DelegatingValueModel());
-    initialiseCallback;
     constructor() {
         super();
         const { chain } = Dsl.disposeWith(this);
         this.popupComponentPortal$ = chain(this.popupType$).map(type => new ComponentPortal(type));
     }
-    configurePopupComponentType(popupComponentType, configureCallback) {
+    configurePopupComponentType(popupComponentType) {
         this.popupType$.value = popupComponentType;
-        this.initialiseCallback = configureCallback;
     }
     // Stops tree selection when clicking the menu button
     preventDefault($event) {
@@ -4212,15 +3801,12 @@ class TableMoreMenuComponent extends DisposableComponent {
         const component = $event.instance;
         component.initialise(this.value$, Command.create(() => this.matMenuTrigger.closeMenu()));
         this._visible$.setDelegate(component.visible$);
-        if (this.initialiseCallback) {
-            this.initialiseCallback(component);
-        }
     }
     get visible$() {
         return this._visible$.readonly$;
     }
     static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.9", ngImport: i0, type: TableMoreMenuComponent, deps: [], target: i0.ɵɵFactoryTarget.Component });
-    static ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "16.2.9", type: TableMoreMenuComponent, selector: "aup-table-more-menu", host: { listeners: { "click": "preventDefault($event)" } }, viewQueries: [{ propertyName: "matMenuTrigger", first: true, predicate: MatMenuTrigger, descendants: true }], usesInheritance: true, ngImport: i0, template: "<mat-menu #menu=\"matMenu\" xPosition=\"before\">\n  <ng-template matMenuContent [cdkPortalOutlet]=\"popupComponentPortal$.value\"\n               (attached)=\"initialise($event)\"></ng-template>\n</mat-menu>\n\n<button mat-icon-button [matMenuTriggerFor]=\"menu\" data-cy=\"more-menu-trigger\" *ngIf=\"visible$.value\">\n  <aup-icon icon=\"mat:more_vert\"></aup-icon>\n</button>\n", styles: [":host{display:inline;text-align:end}\n"], dependencies: [{ kind: "directive", type: i1$1.NgIf, selector: "[ngIf]", inputs: ["ngIf", "ngIfThen", "ngIfElse"] }, { kind: "component", type: i2.MatIconButton, selector: "button[mat-icon-button]", inputs: ["disabled", "disableRipple", "color"], exportAs: ["matButton"] }, { kind: "directive", type: i1$4.CdkPortalOutlet, selector: "[cdkPortalOutlet]", inputs: ["cdkPortalOutlet"], outputs: ["attached"], exportAs: ["cdkPortalOutlet"] }, { kind: "component", type: i4.MatMenu, selector: "mat-menu", exportAs: ["matMenu"] }, { kind: "directive", type: i4.MatMenuContent, selector: "ng-template[matMenuContent]" }, { kind: "directive", type: i4.MatMenuTrigger, selector: "[mat-menu-trigger-for], [matMenuTriggerFor]", exportAs: ["matMenuTrigger"] }, { kind: "component", type: IconComponent, selector: "aup-icon", inputs: ["icon"] }] });
+    static ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "16.2.9", type: TableMoreMenuComponent, selector: "aup-table-more-menu", host: { listeners: { "click": "preventDefault($event)" } }, viewQueries: [{ propertyName: "matMenuTrigger", first: true, predicate: MatMenuTrigger, descendants: true }], usesInheritance: true, ngImport: i0, template: "<mat-menu #menu=\"matMenu\" xPosition=\"before\">\n  <ng-template matMenuContent [cdkPortalOutlet]=\"popupComponentPortal$.value\"\n               (attached)=\"initialise($event)\"></ng-template>\n</mat-menu>\n\n<button mat-icon-button [matMenuTriggerFor]=\"menu\" data-cy=\"more-menu-trigger\" *ngIf=\"visible$.value\">\n  <aup-icon icon=\"mat:more_vert\"></aup-icon>\n</button>\n", styles: [":host{display:inline;text-align:end}\n"], dependencies: [{ kind: "directive", type: i1$1.NgIf, selector: "[ngIf]", inputs: ["ngIf", "ngIfThen", "ngIfElse"] }, { kind: "component", type: i2.MatIconButton, selector: "button[mat-icon-button]", inputs: ["disabled", "disableRipple", "color"], exportAs: ["matButton"] }, { kind: "directive", type: i3$2.CdkPortalOutlet, selector: "[cdkPortalOutlet]", inputs: ["cdkPortalOutlet"], outputs: ["attached"], exportAs: ["cdkPortalOutlet"] }, { kind: "component", type: i4.MatMenu, selector: "mat-menu", exportAs: ["matMenu"] }, { kind: "directive", type: i4.MatMenuContent, selector: "ng-template[matMenuContent]" }, { kind: "directive", type: i4.MatMenuTrigger, selector: "[mat-menu-trigger-for], [matMenuTriggerFor]", exportAs: ["matMenuTrigger"] }, { kind: "component", type: IconComponent, selector: "aup-icon", inputs: ["icon"] }] });
 }
 __decorate([
     StoreInValueModel(),
@@ -4249,25 +3835,16 @@ class RowClass {
         this.matches = matches;
     }
 }
-class RowAttribute {
-    attributeName;
-    getValue;
-    constructor(attributeName, getValue) {
-        this.attributeName = attributeName;
-        this.getValue = getValue;
-    }
-}
 class AbstractTableModel extends GarbageCollector {
     _dataSource$ = this.registerDisposable(new DelegatingListModel());
     _filteredRows$ = this.registerDisposable(new DelegatingListModel());
     _visibleRows$ = this.registerDisposable(new DelegatingListModel());
-    columnManager = this.registerDisposable(new ColumnManager());
+    _columnList = this.registerDisposable(new ColumnListModel());
     _editorSessions = new MutableListModel();
     _rowsBeingEdited$;
     saveCommandFactory;
     _editorSessionByRowId;
     rowClassNamePredicates = [];
-    rowAttributeGenerators = [];
     _columnTextPropertiesLookup;
     editing$;
     firstEditableColumn$;
@@ -4280,11 +3857,10 @@ class AbstractTableModel extends GarbageCollector {
     textSearchPredicate$;
     identityOf;
     dataSourceEmpty$;
+    selectionModelProxy = proxify((SelectionModel));
     selectedItems$;
     leadSelection$;
     hasSelection$;
-    footerRowModel;
-    _viewDependencies = new Set();
     constructor() {
         super();
         const { chain } = Dsl.disposeWith(this);
@@ -4293,21 +3869,18 @@ class AbstractTableModel extends GarbageCollector {
         });
         this._editorSessionByRowId = chain(this._editorSessions).indexBy("rowId");
         this.editing$ = chain(this._editorSessions).count().isGreaterThan(0);
-        this.textSearchPredicate$ = chain(this.visibleColumns$).reduceAll(columns => {
+        this.textSearchPredicate$ = chain(this.visibleColumns).reduce(columns => {
             return (row, regex) => {
                 return (!regex || !!columns.find(c => regex.test(c.getSearchTextFor(row))));
             };
         });
-        this.selectionColumnModel = new SelectionColumnModel("selection-column", this.columnManager, () => this.getColumnTextProperties("selection-column"));
-        this.addColumn(this.selectionColumnModel, { before: null }); // first column
-        this.addRowClass("aup-row-selected", row => this.selectionColumnModel.isSelected(row));
-        this.firstEditableColumn$ = chain(this.columns$).select(c => c.hasEditorPortal()).first();
-        this.firstVisibleColumn$ = chain(this.visibleColumns$).first();
-        this.lastVisibleColumn$ = chain(this.visibleColumns$).last();
-        this.rowSelectionDisabledOnAllColumns$ = chain(this.columnManager.visibleColumns$).select(column => column.isRowSelectionEnabled()).count().equals(0);
+        this.firstEditableColumn$ = chain(this.columns).select(c => c.hasEditorPortal()).first();
+        this.firstVisibleColumn$ = chain(this._columnList).first();
+        this.lastVisibleColumn$ = chain(this._columnList).last();
+        this.rowSelectionDisabledOnAllColumns$ = chain(this._columnList).select(column => column.isRowSelectionEnabled()).count().equals(0);
         this.dataSourceEmpty$ = chain(this.dataSource$).isEmpty();
-        this.selectedItems$ = this.selectionColumnModel.selectionModel.selectedItems$;
-        this.leadSelection$ = this.selectionColumnModel.selectionModel.leadSelection$;
+        this.selectedItems$ = this.selectionModelProxy.selectedItems$;
+        this.leadSelection$ = this.selectionModelProxy.leadSelection$;
         this.hasSelection$ = chain(this.selectedItems$).isNotEmpty();
     }
     setDataSource(dataSource$) {
@@ -4328,23 +3901,9 @@ class AbstractTableModel extends GarbageCollector {
             ],
             parent: injector
         });
-        this.columns$.value.forEach(c => c.initialise(customInjector));
+        this.columns.value.forEach(c => c.initialise(customInjector));
         this.identityOf = identityOf;
     }
-    /**
-     * Adds additional models that will trigger a table repaint.  This is required if the table
-     * needs to be redrawn outside of changes to the rows of filters.  i.e. some eternal state is used
-     * to assign row classes etc.
-     *
-     * Note: This function must be called before the table is bound to the model.
-     * @param hasValues
-     */
-    viewStateDependsOn(...hasValues) {
-        hasValues.forEach(it => this._viewDependencies.add(it));
-    }
-    get viewStateDependencies() {
-        return Array.from(this._viewDependencies.values());
-    }
     get dataSource$() {
         return this._dataSource$.readonly$;
     }
@@ -4395,62 +3954,64 @@ class AbstractTableModel extends GarbageCollector {
             });
         });
     }
-    get columns$() {
-        return this.columnManager.allColumns$;
+    get columns() {
+        return this._columnList.allColumns$;
     }
-    get visibleColumns$() {
-        return this.columnManager.visibleColumns$;
+    get visibleColumns() {
+        return this._columnList.readonly$;
     }
     pluck(property, options) {
         const columnId = options?.columnId || property.toString();
-        return this.addColumn(new PropertyColumnModel(columnId, this.columnManager, property, () => this.getColumnTextProperties(columnId)));
+        return this.addColumn(new PropertyColumnModel(columnId, property, () => this.getColumnTextProperties(columnId)));
     }
     pluckList(property, options) {
         const columnId = options?.columnId || property.toString();
-        return this.addColumn(new ListPropertyColumnModel(columnId, this.columnManager, property, () => this.getColumnTextProperties(columnId)));
-    }
-    useSelectionModel(selectionModel) {
+        return this.addColumn(new ListPropertyColumnModel(columnId, property, () => this.getColumnTextProperties(columnId)));
+    }
+    // TODO: clean this up and assign the selection model on teh table directly.
+    //       tableModel.useSelectionModel(model) and have the seleciton column automatically
+    //       added.  Need to look at how we're using the visibility controls as well.
+    //       Should also lazy create the selection column model if someone accesses it.
+    _addSelectionColumn(selectionModel, visible) {
+        assert.isNil(this.selectionColumnModel);
+        const columnId = "selection-column";
+        this.selectionColumnModel = new SelectionColumnModel(columnId, () => this.getColumnTextProperties(columnId), this.selectionModelProxy);
         this.selectionColumnModel.useSelectionModel(selectionModel);
+        this.addRowClass("aup-row-selected", row => this.selectionColumnModel.isSelected(row));
+        const selectionColumnModel = this.addColumn(this.selectionColumnModel, 0);
+        if (!isNil$1(visible)) {
+            selectionColumnModel.visibleWhile(visible instanceof ValueModel ? visible : ValueModel.constant(visible));
+        }
+        return selectionColumnModel;
     }
     addEditControls(saveCommandFactory, formFactory) {
         this.saveCommandFactory = saveCommandFactory;
-        if (isFunction(formFactory)) {
+        if (isFunction$1(formFactory)) {
             this._createForm = formFactory;
         }
         const columnId = "editControls";
-        return this.addColumn(new EditorControlColumnModel(columnId, this.columnManager, saveCommandFactory, () => this.getColumnTextProperties(columnId)));
+        return this.addColumn(new EditorControlColumnModel(columnId, saveCommandFactory, () => this.getColumnTextProperties(columnId)));
     }
     addCustomColumn(columnId, dataAccessor) {
-        return this.addColumn(new CustomValueColumnModel(columnId, this.columnManager, () => this.getColumnTextProperties(columnId), dataAccessor));
+        return this.addColumn(new CustomValueColumnModel(columnId, () => this.getColumnTextProperties(columnId), dataAccessor));
     }
     addComponentColumn(columnId, component, onComponentInitOrOptions) {
-        return this.addColumn(new CustomValueColumnModel(columnId, this.columnManager, () => this.getColumnTextProperties(columnId), row => row)).cellRenderer(component, onComponentInitOrOptions);
+        return this.addColumn(new CustomValueColumnModel(columnId, () => this.getColumnTextProperties(columnId), row => row)).cellRenderer(component, onComponentInitOrOptions);
     }
-    addMoreMenu(componentClass, initialiseCallback) {
+    addMoreMenu(componentClass) {
         return this.addComponentColumn("more-menu", TableMoreMenuComponent, (component) => {
-            component.configurePopupComponentType(componentClass, initialiseCallback);
+            component.configurePopupComponentType(componentClass);
         }).columnTextProperties({
             headerText() {
                 return "";
             }
         });
     }
-    addFooterRow(component, initialiseCallback) {
-        assert.isNil(this.footerRowModel);
-        this.footerRowModel = new FooterRowModel.Impl(component, initialiseCallback);
-        return this.footerRowModel;
-    }
     addTemplateColumn(columnId) {
-        return this.addColumn(new CustomTemplateColumnModel(columnId, this.columnManager, () => this.getColumnTextProperties(columnId)));
+        return this.addColumn(new CustomTemplateColumnModel(columnId, () => this.getColumnTextProperties(columnId)));
     }
-    addRowClass(className, predicate, options) {
+    addRowClass(className, predicate) {
         this.rowClassNamePredicates.push(new RowClass(className, predicate));
-        if (options) {
-            this.viewStateDependsOn(...DependsOnOptions.extract(options));
-        }
-    }
-    addRowAttribute(attributeName, getValue) {
-        this.rowAttributeGenerators.push(new RowAttribute(attributeName, getValue));
     }
     getRowClasses(row) {
         const classNames = [];
@@ -4461,13 +4022,8 @@ class AbstractTableModel extends GarbageCollector {
         });
         return classNames;
     }
-    getRowAttributes(row) {
-        return this.rowAttributeGenerators.reduce((result, generator) => {
-            return { ...result, [generator.attributeName]: generator.getValue(row) };
-        }, {});
-    }
-    addColumn(column, position) {
-        return this.columnManager.addColumn(column, position);
+    addColumn(column, index) {
+        return this._columnList.addColumn(column, index);
     }
     columnTextProperties(columnTextProperties) {
         this._columnTextPropertiesLookup = columnTextProperties;
@@ -4482,10 +4038,11 @@ class AbstractTableModel extends GarbageCollector {
         return this.hasUserSelectionModelThatIsEnabled() && !this.rowSelectionDisabledOnAllColumns$.value;
     }
     hasUserSelectionModelThatIsEnabled() {
-        return this.selectionColumnModel.selectionModel.enabled$.value;
+        const userSelectionModel = this.selectionColumnModel?.selectionModel.getProxyTarget();
+        return !!userSelectionModel && userSelectionModel.enabled$.value;
     }
     getSelectionModel() {
-        return this.selectionColumnModel.selectionModel;
+        return this.selectionColumnModel?.selectionModel;
     }
     isHoverEnabled() {
         return this.isRowSelectionEnabled() || this.rowClickListeners.listenerCount > 0;
@@ -4527,15 +4084,15 @@ class TableCellComponent extends DisposableComponent {
     defaultClassNames = 'aup-cell-renderer';
     fillCell = false;
     padChild = false;
+    firstEditableColumn;
     constructor() {
         super();
         this.editRowCommand = Command.create(() => {
             this.tableModel.startEditSession(this.row);
         });
         this.onInit(() => {
-            // This binding was triggering a memory leak... not sure why.
-            // const { chain} = Dsl.disposeWith(this);
-            // this.firstEditableColumn = chain(this.tableModel.firstEditableColumn$).equals(this.column); // this would break if the column changed.
+            const { chain } = Dsl.disposeWith(this);
+            this.firstEditableColumn = chain(this.tableModel.firstEditableColumn$).equals(this.column); // this would break if the column changed.
             this.column.attachCell(this);
         });
     }
@@ -4547,7 +4104,7 @@ class TableCellComponent extends DisposableComponent {
     }
     initialiseEditor(ref) {
         this.column.onEditorAttached(this, ref);
-        if (this.tableModel.firstEditableColumn$.value === this.column) {
+        if (this.firstEditableColumn.value) {
             // @see https://github.com/angular/components/issues/12070
             setTimeout(() => this.tryAndFocusEditor(ref));
         }
@@ -4583,7 +4140,7 @@ class TableCellComponent extends DisposableComponent {
         };
     }
     static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.9", ngImport: i0, type: TableCellComponent, deps: [], target: i0.ɵɵFactoryTarget.Component });
-    static ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "16.2.9", type: TableCellComponent, selector: "aup-table-cell", inputs: { row: "row", column: "column", editSession: "editSession", tableModel: "tableModel" }, host: { properties: { "class": "this.defaultClassNames", "class.fillCell": "this.fillCell", "class.padChild": "this.padChild" } }, usesInheritance: true, usesOnChanges: true, ngImport: i0, template: "<ng-container *ngIf=\"!hasActiveEditor()\" [cdkPortalOutlet]=\"getRendererPortal()\" (attached)=\"initialiseRenderer($event)\"></ng-container>\n<ng-container *ngIf=\"hasActiveEditor()\" [cdkPortalOutlet]=\"getEditorPortal()\" (attached)=\"initialiseEditor($event)\"></ng-container>\n", styles: [""], dependencies: [{ kind: "directive", type: i1$1.NgIf, selector: "[ngIf]", inputs: ["ngIf", "ngIfThen", "ngIfElse"] }, { kind: "directive", type: i1$4.CdkPortalOutlet, selector: "[cdkPortalOutlet]", inputs: ["cdkPortalOutlet"], outputs: ["attached"], exportAs: ["cdkPortalOutlet"] }] });
+    static ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "16.2.9", type: TableCellComponent, selector: "aup-table-cell", inputs: { row: "row", column: "column", editSession: "editSession", tableModel: "tableModel" }, host: { properties: { "class": "this.defaultClassNames", "class.fillCell": "this.fillCell", "class.padChild": "this.padChild" } }, usesInheritance: true, usesOnChanges: true, ngImport: i0, template: "<ng-container *ngIf=\"!hasActiveEditor()\" [cdkPortalOutlet]=\"getRendererPortal()\" (attached)=\"initialiseRenderer($event)\"></ng-container>\n<ng-container *ngIf=\"hasActiveEditor()\" [cdkPortalOutlet]=\"getEditorPortal()\" (attached)=\"initialiseEditor($event)\"></ng-container>\n", styles: [""], dependencies: [{ kind: "directive", type: i1$1.NgIf, selector: "[ngIf]", inputs: ["ngIf", "ngIfThen", "ngIfElse"] }, { kind: "directive", type: i3$2.CdkPortalOutlet, selector: "[cdkPortalOutlet]", inputs: ["cdkPortalOutlet"], outputs: ["attached"], exportAs: ["cdkPortalOutlet"] }] });
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.9", ngImport: i0, type: TableCellComponent, decorators: [{
             type: Component,
@@ -4622,7 +4179,7 @@ class TableHeaderCellComponent {
         return this[HEADER_CELL_RENDERER_PORTAL];
     }
     static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.9", ngImport: i0, type: TableHeaderCellComponent, deps: [], target: i0.ɵɵFactoryTarget.Component });
-    static ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "16.2.9", type: TableHeaderCellComponent, selector: "aup-table-header-cell", inputs: { column: "column" }, host: { properties: { "class": "this.defaultClassNames" } }, ngImport: i0, template: "<ng-container [cdkPortalOutlet]=\"getPortal()\" (attached)=\"initialiseHeader($event)\"></ng-container>\n", styles: [":host{display:flex;flex-direction:column;align-items:stretch;justify-content:center;height:100%}\n"], dependencies: [{ kind: "directive", type: i1$4.CdkPortalOutlet, selector: "[cdkPortalOutlet]", inputs: ["cdkPortalOutlet"], outputs: ["attached"], exportAs: ["cdkPortalOutlet"] }] });
+    static ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "16.2.9", type: TableHeaderCellComponent, selector: "aup-table-header-cell", inputs: { column: "column" }, host: { properties: { "class": "this.defaultClassNames" } }, ngImport: i0, template: "<ng-container [cdkPortalOutlet]=\"getPortal()\" (attached)=\"initialiseHeader($event)\"></ng-container>\n", styles: [":host{display:flex;flex-direction:column;align-items:stretch;justify-content:center;height:100%}\n"], dependencies: [{ kind: "directive", type: i3$2.CdkPortalOutlet, selector: "[cdkPortalOutlet]", inputs: ["cdkPortalOutlet"], outputs: ["attached"], exportAs: ["cdkPortalOutlet"] }] });
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.9", ngImport: i0, type: TableHeaderCellComponent, decorators: [{
             type: Component,
@@ -4634,132 +4191,61 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.9", ngImpor
                 args: ['class']
             }] } });
 
-// eslint-disable-next-line @angular-eslint/component-class-suffix
-class TableFooterRow {
-    row;
-    defaultClassNames = 'aup-footer-row-renderer';
-    get rowClasses() {
-        return this.row.getActiveRowClasses();
-    }
-    initialise($event) {
-        this.row.onInit && this.row.onInit($event.instance);
-    }
-    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.9", ngImport: i0, type: TableFooterRow, deps: [], target: i0.ɵɵFactoryTarget.Component });
-    static ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "16.2.9", type: TableFooterRow, selector: "aup-table-footer-row", inputs: { row: "row" }, host: { properties: { "class": "this.rowClasses" } }, ngImport: i0, template: "<ng-container [cdkPortalOutlet]=\"row.portal\" (attached)=\"initialise($event)\"></ng-container>\n", styles: [":host{display:flex;flex-direction:column;align-items:stretch;justify-content:center;height:100%}\n"], dependencies: [{ kind: "directive", type: i1$4.CdkPortalOutlet, selector: "[cdkPortalOutlet]", inputs: ["cdkPortalOutlet"], outputs: ["attached"], exportAs: ["cdkPortalOutlet"] }] });
-}
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.9", ngImport: i0, type: TableFooterRow, decorators: [{
-            type: Component,
-            args: [{ selector: 'aup-table-footer-row', template: "<ng-container [cdkPortalOutlet]=\"row.portal\" (attached)=\"initialise($event)\"></ng-container>\n", styles: [":host{display:flex;flex-direction:column;align-items:stretch;justify-content:center;height:100%}\n"] }]
-        }], propDecorators: { row: [{
-                type: Input
-            }], defaultClassNames: [{
-                type: HostBinding,
-                args: ['class']
-            }], rowClasses: [{
-                type: HostBinding,
-                args: ['class']
-            }] } });
-
-const AUP_TABLE_VIRTUAL_SCROLL_BUFFER_MULTIPLIER = new InjectionToken("AUP_TABLE_VIRTUAL_SCROLL_BUFFER_MULTIPLIER");
-class TableRowAttributesDirective {
-    elementRef;
-    aupTableRowAttributes;
-    constructor(elementRef) {
-        this.elementRef = elementRef;
-    }
-    ngOnInit() {
-        for (const attr in this.aupTableRowAttributes) {
-            this.elementRef.nativeElement.setAttribute(attr, this.aupTableRowAttributes[attr]);
-        }
-    }
-    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.9", ngImport: i0, type: TableRowAttributesDirective, deps: [{ token: i0.ElementRef }], target: i0.ɵɵFactoryTarget.Directive });
-    static ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "14.0.0", version: "16.2.9", type: TableRowAttributesDirective, selector: "[aupTableRowAttributes]", inputs: { aupTableRowAttributes: "aupTableRowAttributes" }, ngImport: i0 });
-}
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.9", ngImport: i0, type: TableRowAttributesDirective, decorators: [{
-            type: Directive,
-            args: [{
-                    selector: "[aupTableRowAttributes]",
-                }]
-        }], ctorParameters: function () { return [{ type: i0.ElementRef }]; }, propDecorators: { aupTableRowAttributes: [{
-                type: Input
-            }] } });
 class TableBodyComponent extends ResizeAwareComponent {
-    bufferMultiplier;
     #data$_accessor_storage = proxify((ListModel));
     get data$() { return this.#data$_accessor_storage; }
     set data$(value) { this.#data$_accessor_storage = value; }
     #tableModel_accessor_storage = proxify((AbstractTableModel));
     get tableModel() { return this.#tableModel_accessor_storage; }
     set tableModel(value) { this.#tableModel_accessor_storage = value; }
-    #footerRow_accessor_storage = proxify((FooterRowModel.Impl));
-    get footerRow() { return this.#footerRow_accessor_storage; }
-    set footerRow(value) { this.#footerRow_accessor_storage = value; }
     #showHeader$_accessor_storage = proxify((ValueModel));
     get showHeader$() { return this.#showHeader$_accessor_storage; }
     set showHeader$(value) { this.#showHeader$_accessor_storage = value; }
     #showHeader_accessor_storage = true;
     get showHeader() { return this.#showHeader_accessor_storage; }
     set showHeader(value) { this.#showHeader_accessor_storage = value; }
+    visibleRowCount = new EventEmitter();
     trackBy;
-    #scrollMode$_accessor_storage = proxify((ValueModel));
-    get scrollMode$() { return this.#scrollMode$_accessor_storage; }
-    set scrollMode$(value) { this.#scrollMode$_accessor_storage = value; }
-    #scrollMode_accessor_storage = "none";
-    get scrollMode() { return this.#scrollMode_accessor_storage; }
-    set scrollMode(value) { this.#scrollMode_accessor_storage = value; }
-    scrollViewport;
+    /**
+     * Set to true to enable scrolling.  Once enabled the table will have 0 implicit height.  You will either
+     * need to set it explicitly e.g. height: 400px; or by using flex or grid layout to make it fill it's
+     * containment area.
+     */
+    enableScrolling = false;
     columns$;
     columnIds$;
     columnsById$;
+    _visibleRowCount$;
     // TODO: support user defined header and row heights via css vars.
-    headerHeight$ = new MutableValueModel(48);
-    rowHeight$ = new MutableValueModel(44);
+    headerHeight$ = new MutableValueModel(29);
+    rowHeight$ = new MutableValueModel(40);
     baseCssClass = "aup-table-component";
-    virtualScrollDataSource = new TableVirtualScrollDataSource();
-    virtualScrollActive$ = new MutableValueModel(false);
-    scrollTimeout;
-    constructor(bufferMultiplier = 1) {
-        super();
-        this.bufferMultiplier = bufferMultiplier;
-        const { chain, when, observe } = Dsl.disposeWith(this);
+    constructor(elementRef, ngZone) {
+        super(elementRef, ngZone);
+        const { chain, when } = Dsl.disposeWith(this);
         const actualHeaderHeight$ = chain(this.showHeader$).map(show => {
             return show ? this.headerHeight$.value : 0;
         }, { dependsOn: this.headerHeight$ });
-        // performance is terrible if the data changes while we're scrolling, so we postpone updates until
-        // scrolling stops.
-        const delayedDatea$ = chain(this.data$).postponeWhile(this.virtualScrollActive$);
-        when(delayedDatea$).changes(delatedData => {
-            this.virtualScrollDataSource.data = delatedData;
-            this.scheduleTableHeightCheck();
-        }, { initialValue: "evaluate" });
+        this._visibleRowCount$ = chain(this.bounds$).map(bounds => {
+            // TODO: this doesn't take into account any css styling adjustments etc.  Will investigate if it's an issue.
+            const rawRowCount = (bounds.height - actualHeaderHeight$.value) / this.rowHeight$.value;
+            return rawRowCount < 1 ? 0 : Math.floor(rawRowCount);
+        }, {
+            dependsOn: [actualHeaderHeight$, this.rowHeight$],
+            postponeWhile: chain(this.bounds$).pluckNumeric("height").isLessThan(1)
+        });
+        when(this._visibleRowCount$).changes(visibleRows => {
+            this.visibleRowCount.emit(visibleRows);
+        }, { initialValue: "triggerChangeUnlessNil" });
         this.onInit(() => {
-            this.columns$ = chain(this.tableModel.visibleColumns$);
+            this.columns$ = chain(this.tableModel.columns);
             this.columnIds$ = chain(this.columns$).pluck("columnId");
             this.columnsById$ = chain(this.columns$).indexBy('columnId');
         });
-        // const txo = new TransactionObserver({verbose: false}).onEvent(e => console.log(e.name, e.payload));
-        // txo.observe('this.virtualScrollRowRange$', this.virtualScrollRowRange$);
-        // txo.observe('this.virtualScrollSpacerSize$', this.virtualScrollSpacerSize$);
-        // txo.observe('this.virtualRows$', this.virtualRows$);
-        // txo.observe('this.tableBodyHeight$', this.tableBodyHeight$);
-        // txo.observe('this.virtualScrollActive$', this.virtualScrollActive$);
-    }
-    ngAfterViewInit() {
-        super.ngAfterViewInit();
-        if (this.scrollViewport) {
-            const { observe } = Dsl.disposeWith(this);
-            this.scrollViewport.elementScrolled().subscribe(() => this.notifyScrolled());
-        }
     }
     get hideHeader() {
         return !this.showHeader;
     }
-    get headerHeightCssVar() {
-        return `${this.headerHeight$.value}px`;
-    }
-    get rowHeightCssVar() {
-        return `${this.rowHeight$.value}px`;
-    }
     isEditing(row) {
         return !!this.tableModel.getEditSessionFor(row);
     }
@@ -4784,110 +4270,51 @@ class TableBodyComponent extends ResizeAwareComponent {
         }
         return classes;
     }
-    scheduleTableHeightCheck(waitMillis = 50) {
-        setTimeout(() => {
-            const tbody = this.elementRef.nativeElement.querySelector("tbody");
-            const bodyHeight = tbody.offsetHeight;
-            if (this.data$.length > 0 && bodyHeight < this.rowHeight$.value) {
-                // Hacks to get our virtual scroll to repaint
-                // Logger.get(this).log(`rowCount=${this.data$.length}, bodyHeight=${bodyHeight} -> virtual table not rendering, triggering resize to force repaint`)
-                window.dispatchEvent(new Event('resize'));
-                if (waitMillis < 500) {
-                    this.scheduleTableHeightCheck(waitMillis + 50);
-                }
-            }
-        }, waitMillis);
-    }
-    notifyScrolled() {
-        this.virtualScrollActive$.value = true;
-        this.clearScrollTimeout();
-        this.scrollTimeout = setTimeout(() => {
-            return this.virtualScrollActive$.value = false;
-        }, 200);
-    }
-    clearScrollTimeout() {
-        if (this.scrollTimeout) {
-            clearTimeout(this.scrollTimeout);
-        }
-    }
-    initialiseFooter($event) {
-        const portalRef = $event;
-        this.footerRow.onInit(portalRef.instance);
-    }
-    Proxify = Proxify;
-    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.9", ngImport: i0, type: TableBodyComponent, deps: [{ token: AUP_TABLE_VIRTUAL_SCROLL_BUFFER_MULTIPLIER, optional: true }], target: i0.ɵɵFactoryTarget.Component });
-    static ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "16.2.9", type: TableBodyComponent, selector: "aup-table-body", inputs: { data$: "data$", tableModel: "tableModel", footerRow: "footerRow", showHeader$: "showHeader$", showHeader: "showHeader", trackBy: "trackBy", scrollMode$: "scrollMode$", scrollMode: "scrollMode" }, host: { properties: { "attr.scrollMode": "this.scrollMode", "class": "this.baseCssClass", "class.hide-header": "this.hideHeader", "style.--aup-table-header-height": "this.headerHeightCssVar", "style.--aup-table-row-height": "this.rowHeightCssVar" } }, viewQueries: [{ propertyName: "scrollViewport", first: true, predicate: CdkVirtualScrollViewport, descendants: true }], usesInheritance: true, ngImport: i0, template: "\n<div class=\"classic-scroll-container\" *ngIf=\"scrollMode$.value !== 'virtual'\">\n  <table mat-table [dataSource]=\"data$.value\" [trackBy]=\"trackBy\" [multiTemplateDataRows]>\n\n    <ng-container *ngFor=\"let column of columns$.value; index as index; first as first; last as last\"\n                  matColumnDef=\"{{column.columnId}}\">\n      <th mat-header-cell *matHeaderCellDef [class.flex]=\"column.isFlex()\" [class.hide]=\"!column.isVisible()\">\n        <aup-table-header-cell [column]=\"$any(column)\"\n                               [attr.column-index]=\"index\"\n                               [attr.column-id]=\"column.columnId\"\n                               [class]=\"getColumnClasses(column.columnId)\"\n        ></aup-table-header-cell>\n      </th>\n      <td mat-cell *matCellDef=\"let row\" (click)=\"notifyCellClicked(column, row)\"\n          [class.enable-cursor]=\"tableModel.isCursorEnabled(column)\"\n          [class.flex]=\"column.isFlex()\"\n          [class.hide]=\"!column.isVisible()\"\n      >\n        <aup-table-cell [column]=\"$any(column)\"\n                        [row]=\"row\"\n                        [tableModel]=\"$any(tableModel)\"\n                        [editSession]=\"$any(tableModel.getEditSessionFor(row))\"\n                        [attr.column-index]=\"index\"\n                        [attr.column-id]=\"column.columnId\"\n                        [class]=\"getColumnClasses(column.columnId)\"\n        ></aup-table-cell>\n      </td>\n    </ng-container>\n\n    <tr mat-header-row *matHeaderRowDef=\"columnIds$.value; sticky: true\"></tr>\n    <tr mat-row *matRowDef=\"let row; columns: columnIds$.value; let i = index\"\n        [ngClass]=\"tableModel.getRowClasses(row)\"\n        [class.enable-hover]=\"tableModel.isHoverEnabled()\"\n        [aupTableRowAttributes]=\"tableModel.getRowAttributes(row)\"\n        [attr.aup-row-id]=\"trackBy(i, row)\"\n    ></tr>\n\n    <ng-container matColumnDef=\"sticky-footer\" *ngIf=\"Proxify.hasTarget(footerRow)\">\n      <td mat-footer-cell *matFooterCellDef [attr.colspan]=\"columns$.length\" [ngClass]=\"'footer-cell'\">\n        <aup-table-footer-row [row]=\"$any(footerRow)\"></aup-table-footer-row>\n      </td>\n      <tr mat-footer-row *matFooterRowDef=\"['sticky-footer']; sticky: true\"></tr>\n    </ng-container>\n\n  </table>\n</div>\n\n<cdk-virtual-scroll-viewport  *ngIf=\"scrollMode$.value === 'virtual'\"\n                              [tvsItemSize]=\"rowHeight$.value\"\n                              [headerHeight]=\"headerHeight$.value\"\n                              [bufferMultiplier]=\"bufferMultiplier\"\n>\n  <table mat-table [dataSource]=\"virtualScrollDataSource\" [trackBy]=\"trackBy\">\n\n    <ng-container *ngFor=\"let column of columns$.value; index as index; first as first; last as last\"\n                  matColumnDef=\"{{column.columnId}}\">\n      <th mat-header-cell *matHeaderCellDef [class.flex]=\"column.isFlex()\" [class.hide]=\"!column.isVisible()\">\n        <aup-table-header-cell [column]=\"column\"\n                               [attr.column-index]=\"index\"\n                               [attr.column-id]=\"column.columnId\"\n                               [class]=\"getColumnClasses(column.columnId)\"\n        ></aup-table-header-cell>\n      </th>\n      <td mat-cell *matCellDef=\"let row\" (click)=\"notifyCellClicked(column, row)\"\n          [class.enable-cursor]=\"tableModel.isCursorEnabled(column)\"\n          [class.flex]=\"column.isFlex()\"\n          [class.hide]=\"!column.isVisible()\"\n      >\n        <aup-table-cell [column]=\"$any(column)\"\n                        [row]=\"row\"\n                        [tableModel]=\"$any(tableModel)\"\n                        [editSession]=\"$any(tableModel.getEditSessionFor(row))\"\n                        [attr.column-index]=\"index\"\n                        [attr.column-id]=\"column.columnId\"\n                        [class]=\"getColumnClasses(column.columnId)\"\n        ></aup-table-cell>\n      </td>\n    </ng-container>\n\n    <tr mat-header-row *matHeaderRowDef=\"columnIds$.value; sticky: true\"></tr>\n    <tr mat-row *matRowDef=\"let row; columns: columnIds$.value; let i = index\"\n        [ngClass]=\"tableModel.getRowClasses(row)\"\n        [class.enable-hover]=\"tableModel.isHoverEnabled()\"\n        [aupTableRowAttributes]=\"tableModel.getRowAttributes(row)\"\n        [attr.aup-row-id]=\"trackBy(i, row)\"\n    ></tr>\n\n<!--    Layout doesn't work yet - probably needs fixed footer row height -->\n<!--    <ng-container matColumnDef=\"sticky-footer\" *ngIf=\"tableModel.footerRowPortalRef\">-->\n<!--      <td mat-footer-cell *matFooterCellDef [attr.colspan]=\"columns$.length\">-->\n<!--        <ng-container [cdkPortalOutlet]=\"tableModel.footerRowPortalRef.portal\" (attached)=\"initialiseFooter($event)\"></ng-container>-->\n<!--      </td>-->\n<!--      <tr mat-footer-row *matFooterRowDef=\"['sticky-footer']; sticky: true\"></tr>-->\n<!--    </ng-container>-->\n\n\n  </table>\n</cdk-virtual-scroll-viewport>\n\n", styles: [":host{display:flex;flex-direction:column;align-items:stretch}:host table{width:100%}:host[scrollMode=virtual] cdk-virtual-scroll-viewport{flex:1}:host[scrollMode=virtual] table th{height:var(--aup-table-header-height);max-height:var(--aup-table-header-height);min-height:var(--aup-table-header-height)}:host[scrollMode=virtual] table td{height:var(--aup-table-row-height);max-height:var(--aup-table-row-height);min-height:var(--aup-table-row-height)}:host[scrollMode=classic]{min-height:0}:host[scrollMode=classic] .classic-scroll-container{flex:1;flex-basis:0;overflow-y:auto;display:flex;flex-direction:column;align-items:stretch}\n"], dependencies: [{ kind: "directive", type: i1$1.NgClass, selector: "[ngClass]", inputs: ["class", "ngClass"] }, { kind: "directive", type: i1$1.NgForOf, selector: "[ngFor][ngForOf]", inputs: ["ngForOf", "ngForTrackBy", "ngForTemplate"] }, { kind: "directive", type: i1$1.NgIf, selector: "[ngIf]", inputs: ["ngIf", "ngIfThen", "ngIfElse"] }, { kind: "component", type: i2$6.MatTable, selector: "mat-table, table[mat-table]", exportAs: ["matTable"] }, { kind: "directive", type: i2$6.MatHeaderCellDef, selector: "[matHeaderCellDef]" }, { kind: "directive", type: i2$6.MatHeaderRowDef, selector: "[matHeaderRowDef]", inputs: ["matHeaderRowDef", "matHeaderRowDefSticky"] }, { kind: "directive", type: i2$6.MatColumnDef, selector: "[matColumnDef]", inputs: ["sticky", "matColumnDef"] }, { kind: "directive", type: i2$6.MatCellDef, selector: "[matCellDef]" }, { kind: "directive", type: i2$6.MatRowDef, selector: "[matRowDef]", inputs: ["matRowDefColumns", "matRowDefWhen"] }, { kind: "directive", type: i2$6.MatFooterCellDef, selector: "[matFooterCellDef]" }, { kind: "directive", type: i2$6.MatFooterRowDef, selector: "[matFooterRowDef]", inputs: ["matFooterRowDef", "matFooterRowDefSticky"] }, { kind: "directive", type: i2$6.MatHeaderCell, selector: "mat-header-cell, th[mat-header-cell]" }, { kind: "directive", type: i2$6.MatCell, selector: "mat-cell, td[mat-cell]" }, { kind: "directive", type: i2$6.MatFooterCell, selector: "mat-footer-cell, td[mat-footer-cell]" }, { kind: "component", type: i2$6.MatHeaderRow, selector: "mat-header-row, tr[mat-header-row]", exportAs: ["matHeaderRow"] }, { kind: "component", type: i2$6.MatRow, selector: "mat-row, tr[mat-row]", exportAs: ["matRow"] }, { kind: "component", type: i2$6.MatFooterRow, selector: "mat-footer-row, tr[mat-footer-row]", exportAs: ["matFooterRow"] }, { kind: "component", type: i1$2.CdkVirtualScrollViewport, selector: "cdk-virtual-scroll-viewport", inputs: ["orientation", "appendOnly"], outputs: ["scrolledIndexChange"] }, { kind: "directive", type: i4$4.TableItemSizeDirective, selector: "cdk-virtual-scroll-viewport[tvsItemSize]", inputs: ["tvsItemSize", "headerEnabled", "headerHeight", "footerEnabled", "footerHeight", "bufferMultiplier"] }, { kind: "directive", type: TableRowAttributesDirective, selector: "[aupTableRowAttributes]", inputs: ["aupTableRowAttributes"] }, { kind: "component", type: TableCellComponent, selector: "aup-table-cell", inputs: ["row", "column", "editSession", "tableModel"] }, { kind: "component", type: TableHeaderCellComponent, selector: "aup-table-header-cell", inputs: ["column"] }, { kind: "component", type: TableFooterRow, selector: "aup-table-footer-row", inputs: ["row"] }] });
+    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.9", ngImport: i0, type: TableBodyComponent, deps: [{ token: i0.ElementRef }, { token: i0.NgZone }], target: i0.ɵɵFactoryTarget.Component });
+    static ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "16.2.9", type: TableBodyComponent, selector: "aup-table-body", inputs: { data$: "data$", tableModel: "tableModel", showHeader$: "showHeader$", showHeader: "showHeader", trackBy: "trackBy", enableScrolling: "enableScrolling" }, outputs: { visibleRowCount: "visibleRowCount" }, host: { properties: { "class.enable-scrolling": "this.enableScrolling", "class": "this.baseCssClass", "class.hide-header": "this.hideHeader" } }, usesInheritance: true, ngImport: i0, template: "<div class=\"scroll-container\">\n  <table mat-table [dataSource]=\"data$.value\" [trackBy]=\"trackBy\">\n\n    <ng-container *ngFor=\"let column of columns$.value; index as index; first as first; last as last\"\n                  matColumnDef=\"{{column.columnId}}\">\n      <th mat-header-cell *matHeaderCellDef [class.flex]=\"column.isFlex()\" [class.hide]=\"!column.isVisible()\">\n        <aup-table-header-cell [column]=\"column\"\n                               [attr.column-index]=\"index\"\n                               [attr.column-id]=\"column.columnId\"\n                               [class]=\"getColumnClasses(column.columnId)\"\n        ></aup-table-header-cell>\n      </th>\n      <td mat-cell *matCellDef=\"let row\" (click)=\"notifyCellClicked(column, row)\"\n          [class.enable-cursor]=\"tableModel.isCursorEnabled(column)\"\n          [class.flex]=\"column.isFlex()\"\n          [class.hide]=\"!column.isVisible()\"\n      >\n        <aup-table-cell [column]=\"column\"\n                        [row]=\"row\"\n                        [tableModel]=\"tableModel\"\n                        [editSession]=\"tableModel.getEditSessionFor(row)\"\n                        [attr.column-index]=\"index\"\n                        [attr.column-id]=\"column.columnId\"\n                        [class]=\"getColumnClasses(column.columnId)\"\n        ></aup-table-cell>\n      </td>\n    </ng-container>\n\n    <tr mat-header-row *matHeaderRowDef=\"columnIds$.value; sticky: true\"></tr>\n    <tr mat-row *matRowDef=\"let row; columns: columnIds$.value; let i = index\"\n        [ngClass]=\"tableModel.getRowClasses(row)\"\n        [class.enable-hover]=\"tableModel.isHoverEnabled()\"\n        [attr.aup-row-id]=\"trackBy(i, row)\"\n    ></tr>\n\n  </table>\n</div>\n\n", styles: [":host{display:flex;flex-direction:column;align-items:stretch}:host table{width:100%}:host.enable-scrolling{min-height:0}:host.enable-scrolling .scroll-container{flex:1;flex-basis:0;overflow-y:auto;display:flex;flex-direction:column;align-items:stretch}\n"], dependencies: [{ kind: "directive", type: i1$1.NgClass, selector: "[ngClass]", inputs: ["class", "ngClass"] }, { kind: "directive", type: i1$1.NgForOf, selector: "[ngFor][ngForOf]", inputs: ["ngForOf", "ngForTrackBy", "ngForTemplate"] }, { kind: "component", type: i2$6.MatTable, selector: "mat-table, table[mat-table]", exportAs: ["matTable"] }, { kind: "directive", type: i2$6.MatHeaderCellDef, selector: "[matHeaderCellDef]" }, { kind: "directive", type: i2$6.MatHeaderRowDef, selector: "[matHeaderRowDef]", inputs: ["matHeaderRowDef", "matHeaderRowDefSticky"] }, { kind: "directive", type: i2$6.MatColumnDef, selector: "[matColumnDef]", inputs: ["sticky", "matColumnDef"] }, { kind: "directive", type: i2$6.MatCellDef, selector: "[matCellDef]" }, { kind: "directive", type: i2$6.MatRowDef, selector: "[matRowDef]", inputs: ["matRowDefColumns", "matRowDefWhen"] }, { kind: "directive", type: i2$6.MatHeaderCell, selector: "mat-header-cell, th[mat-header-cell]" }, { kind: "directive", type: i2$6.MatCell, selector: "mat-cell, td[mat-cell]" }, { kind: "component", type: i2$6.MatHeaderRow, selector: "mat-header-row, tr[mat-header-row]", exportAs: ["matHeaderRow"] }, { kind: "component", type: i2$6.MatRow, selector: "mat-row, tr[mat-row]", exportAs: ["matRow"] }, { kind: "component", type: TableCellComponent, selector: "aup-table-cell", inputs: ["row", "column", "editSession", "tableModel"] }, { kind: "component", type: TableHeaderCellComponent, selector: "aup-table-header-cell", inputs: ["column"] }] });
 }
 __decorate([
     Proxify(),
-    __metadata("design:type", ListModel)
+    __metadata("design:type", Object)
 ], TableBodyComponent.prototype, "data$", null);
 __decorate([
     Proxify(),
-    __metadata("design:type", AbstractTableModel)
+    __metadata("design:type", Object)
 ], TableBodyComponent.prototype, "tableModel", null);
 __decorate([
     Proxify(),
-    __metadata("design:type", FooterRowModel.Impl)
-], TableBodyComponent.prototype, "footerRow", null);
-__decorate([
-    Proxify(),
-    __metadata("design:type", ValueModel)
+    __metadata("design:type", Object)
 ], TableBodyComponent.prototype, "showHeader$", null);
 __decorate([
     StoreInValueModel(),
     __metadata("design:type", Object)
 ], TableBodyComponent.prototype, "showHeader", null);
-__decorate([
-    Proxify(),
-    __metadata("design:type", ValueModel)
-], TableBodyComponent.prototype, "scrollMode$", null);
-__decorate([
-    StoreInValueModel(),
-    __metadata("design:type", String)
-], TableBodyComponent.prototype, "scrollMode", null);
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.9", ngImport: i0, type: TableBodyComponent, decorators: [{
             type: Component,
-            args: [{ selector: "aup-table-body", template: "\n<div class=\"classic-scroll-container\" *ngIf=\"scrollMode$.value !== 'virtual'\">\n  <table mat-table [dataSource]=\"data$.value\" [trackBy]=\"trackBy\" [multiTemplateDataRows]>\n\n    <ng-container *ngFor=\"let column of columns$.value; index as index; first as first; last as last\"\n                  matColumnDef=\"{{column.columnId}}\">\n      <th mat-header-cell *matHeaderCellDef [class.flex]=\"column.isFlex()\" [class.hide]=\"!column.isVisible()\">\n        <aup-table-header-cell [column]=\"$any(column)\"\n                               [attr.column-index]=\"index\"\n                               [attr.column-id]=\"column.columnId\"\n                               [class]=\"getColumnClasses(column.columnId)\"\n        ></aup-table-header-cell>\n      </th>\n      <td mat-cell *matCellDef=\"let row\" (click)=\"notifyCellClicked(column, row)\"\n          [class.enable-cursor]=\"tableModel.isCursorEnabled(column)\"\n          [class.flex]=\"column.isFlex()\"\n          [class.hide]=\"!column.isVisible()\"\n      >\n        <aup-table-cell [column]=\"$any(column)\"\n                        [row]=\"row\"\n                        [tableModel]=\"$any(tableModel)\"\n                        [editSession]=\"$any(tableModel.getEditSessionFor(row))\"\n                        [attr.column-index]=\"index\"\n                        [attr.column-id]=\"column.columnId\"\n                        [class]=\"getColumnClasses(column.columnId)\"\n        ></aup-table-cell>\n      </td>\n    </ng-container>\n\n    <tr mat-header-row *matHeaderRowDef=\"columnIds$.value; sticky: true\"></tr>\n    <tr mat-row *matRowDef=\"let row; columns: columnIds$.value; let i = index\"\n        [ngClass]=\"tableModel.getRowClasses(row)\"\n        [class.enable-hover]=\"tableModel.isHoverEnabled()\"\n        [aupTableRowAttributes]=\"tableModel.getRowAttributes(row)\"\n        [attr.aup-row-id]=\"trackBy(i, row)\"\n    ></tr>\n\n    <ng-container matColumnDef=\"sticky-footer\" *ngIf=\"Proxify.hasTarget(footerRow)\">\n      <td mat-footer-cell *matFooterCellDef [attr.colspan]=\"columns$.length\" [ngClass]=\"'footer-cell'\">\n        <aup-table-footer-row [row]=\"$any(footerRow)\"></aup-table-footer-row>\n      </td>\n      <tr mat-footer-row *matFooterRowDef=\"['sticky-footer']; sticky: true\"></tr>\n    </ng-container>\n\n  </table>\n</div>\n\n<cdk-virtual-scroll-viewport  *ngIf=\"scrollMode$.value === 'virtual'\"\n                              [tvsItemSize]=\"rowHeight$.value\"\n                              [headerHeight]=\"headerHeight$.value\"\n                              [bufferMultiplier]=\"bufferMultiplier\"\n>\n  <table mat-table [dataSource]=\"virtualScrollDataSource\" [trackBy]=\"trackBy\">\n\n    <ng-container *ngFor=\"let column of columns$.value; index as index; first as first; last as last\"\n                  matColumnDef=\"{{column.columnId}}\">\n      <th mat-header-cell *matHeaderCellDef [class.flex]=\"column.isFlex()\" [class.hide]=\"!column.isVisible()\">\n        <aup-table-header-cell [column]=\"column\"\n                               [attr.column-index]=\"index\"\n                               [attr.column-id]=\"column.columnId\"\n                               [class]=\"getColumnClasses(column.columnId)\"\n        ></aup-table-header-cell>\n      </th>\n      <td mat-cell *matCellDef=\"let row\" (click)=\"notifyCellClicked(column, row)\"\n          [class.enable-cursor]=\"tableModel.isCursorEnabled(column)\"\n          [class.flex]=\"column.isFlex()\"\n          [class.hide]=\"!column.isVisible()\"\n      >\n        <aup-table-cell [column]=\"$any(column)\"\n                        [row]=\"row\"\n                        [tableModel]=\"$any(tableModel)\"\n                        [editSession]=\"$any(tableModel.getEditSessionFor(row))\"\n                        [attr.column-index]=\"index\"\n                        [attr.column-id]=\"column.columnId\"\n                        [class]=\"getColumnClasses(column.columnId)\"\n        ></aup-table-cell>\n      </td>\n    </ng-container>\n\n    <tr mat-header-row *matHeaderRowDef=\"columnIds$.value; sticky: true\"></tr>\n    <tr mat-row *matRowDef=\"let row; columns: columnIds$.value; let i = index\"\n        [ngClass]=\"tableModel.getRowClasses(row)\"\n        [class.enable-hover]=\"tableModel.isHoverEnabled()\"\n        [aupTableRowAttributes]=\"tableModel.getRowAttributes(row)\"\n        [attr.aup-row-id]=\"trackBy(i, row)\"\n    ></tr>\n\n<!--    Layout doesn't work yet - probably needs fixed footer row height -->\n<!--    <ng-container matColumnDef=\"sticky-footer\" *ngIf=\"tableModel.footerRowPortalRef\">-->\n<!--      <td mat-footer-cell *matFooterCellDef [attr.colspan]=\"columns$.length\">-->\n<!--        <ng-container [cdkPortalOutlet]=\"tableModel.footerRowPortalRef.portal\" (attached)=\"initialiseFooter($event)\"></ng-container>-->\n<!--      </td>-->\n<!--      <tr mat-footer-row *matFooterRowDef=\"['sticky-footer']; sticky: true\"></tr>-->\n<!--    </ng-container>-->\n\n\n  </table>\n</cdk-virtual-scroll-viewport>\n\n", styles: [":host{display:flex;flex-direction:column;align-items:stretch}:host table{width:100%}:host[scrollMode=virtual] cdk-virtual-scroll-viewport{flex:1}:host[scrollMode=virtual] table th{height:var(--aup-table-header-height);max-height:var(--aup-table-header-height);min-height:var(--aup-table-header-height)}:host[scrollMode=virtual] table td{height:var(--aup-table-row-height);max-height:var(--aup-table-row-height);min-height:var(--aup-table-row-height)}:host[scrollMode=classic]{min-height:0}:host[scrollMode=classic] .classic-scroll-container{flex:1;flex-basis:0;overflow-y:auto;display:flex;flex-direction:column;align-items:stretch}\n"] }]
-        }], ctorParameters: function () { return [{ type: undefined, decorators: [{
-                    type: Inject,
-                    args: [AUP_TABLE_VIRTUAL_SCROLL_BUFFER_MULTIPLIER]
-                }, {
-                    type: Optional
-                }] }]; }, propDecorators: { data$: [{
+            args: [{ selector: "aup-table-body", template: "<div class=\"scroll-container\">\n  <table mat-table [dataSource]=\"data$.value\" [trackBy]=\"trackBy\">\n\n    <ng-container *ngFor=\"let column of columns$.value; index as index; first as first; last as last\"\n                  matColumnDef=\"{{column.columnId}}\">\n      <th mat-header-cell *matHeaderCellDef [class.flex]=\"column.isFlex()\" [class.hide]=\"!column.isVisible()\">\n        <aup-table-header-cell [column]=\"column\"\n                               [attr.column-index]=\"index\"\n                               [attr.column-id]=\"column.columnId\"\n                               [class]=\"getColumnClasses(column.columnId)\"\n        ></aup-table-header-cell>\n      </th>\n      <td mat-cell *matCellDef=\"let row\" (click)=\"notifyCellClicked(column, row)\"\n          [class.enable-cursor]=\"tableModel.isCursorEnabled(column)\"\n          [class.flex]=\"column.isFlex()\"\n          [class.hide]=\"!column.isVisible()\"\n      >\n        <aup-table-cell [column]=\"column\"\n                        [row]=\"row\"\n                        [tableModel]=\"tableModel\"\n                        [editSession]=\"tableModel.getEditSessionFor(row)\"\n                        [attr.column-index]=\"index\"\n                        [attr.column-id]=\"column.columnId\"\n                        [class]=\"getColumnClasses(column.columnId)\"\n        ></aup-table-cell>\n      </td>\n    </ng-container>\n\n    <tr mat-header-row *matHeaderRowDef=\"columnIds$.value; sticky: true\"></tr>\n    <tr mat-row *matRowDef=\"let row; columns: columnIds$.value; let i = index\"\n        [ngClass]=\"tableModel.getRowClasses(row)\"\n        [class.enable-hover]=\"tableModel.isHoverEnabled()\"\n        [attr.aup-row-id]=\"trackBy(i, row)\"\n    ></tr>\n\n  </table>\n</div>\n\n", styles: [":host{display:flex;flex-direction:column;align-items:stretch}:host table{width:100%}:host.enable-scrolling{min-height:0}:host.enable-scrolling .scroll-container{flex:1;flex-basis:0;overflow-y:auto;display:flex;flex-direction:column;align-items:stretch}\n"] }]
+        }], ctorParameters: function () { return [{ type: i0.ElementRef }, { type: i0.NgZone }]; }, propDecorators: { data$: [{
                 type: Input
             }], tableModel: [{
                 type: Input
-            }], footerRow: [{
-                type: Input
             }], showHeader$: [{
                 type: Input
             }], showHeader: [{
                 type: Input
+            }], visibleRowCount: [{
+                type: Output
             }], trackBy: [{
                 type: Input
-            }], scrollMode$: [{
-                type: Input
-            }], scrollMode: [{
+            }], enableScrolling: [{
                 type: Input
             }, {
                 type: HostBinding,
-                args: ["attr.scrollMode"]
-            }], scrollViewport: [{
-                type: ViewChild,
-                args: [CdkVirtualScrollViewport]
+                args: ["class.enable-scrolling"]
             }], baseCssClass: [{
                 type: HostBinding,
                 args: ["class"]
             }], hideHeader: [{
                 type: HostBinding,
                 args: ["class.hide-header"]
-            }], headerHeightCssVar: [{
-                type: HostBinding,
-                args: ["style.--aup-table-header-height"]
-            }], rowHeightCssVar: [{
-                type: HostBinding,
-                args: ["style.--aup-table-row-height"]
             }] } });
 
 class TableMoreMenuPopupComponent extends DisposableComponent {
@@ -5008,10 +4435,8 @@ class TableFilterModel extends GarbageCollector {
         this.useSearchText(options.searchText$);
         this.useRowPredicate(options.predicate$);
         const { chain } = Dsl.disposeWith(this);
-        const textSearchRegex$ = chain(this._searchText$)
-            .debounce(250)
-            .map(text => {
-            return isEmpty(text) ? undefined : new RegExp(escapeStringRegexp(text), "i");
+        const textSearchRegex$ = chain(this._searchText$).map(text => {
+            return isEmpty$1(text) ? undefined : new RegExp(escapeStringRegexp(text), "i");
         }, { allowNil: true });
         this._rowPredicate = chain(this._rowPredicate$)
             .map(predicate => {
@@ -5147,16 +4572,8 @@ class TableModel extends AbstractTableModel {
         this._filteredRows$.setDelegate(filteredRows$);
         this._visibleRows$.setDelegate(visibleRows$);
     }
-    get isUsingTemporarySelectionModel$() {
-        return this.selectionColumnModel.isUsingTemporarySelectionModel$;
-    }
-    async withTemporaryMultipleSelectionModel(process) {
-        return this.selectionColumnModel.withTemporarySelectionModel(garbage => {
-            return new MultipleSelectionModel(this.filteredRows$, {
-                identifiedWith: this.dataSource$.identityOf,
-                disposedWith: garbage
-            });
-        }, process);
+    addSelectionColumn(selectionModel, showSelectionColumn) {
+        return this._addSelectionColumn(selectionModel, showSelectionColumn);
     }
 }
 
@@ -5227,30 +4644,31 @@ class TableComponent extends AbstractTableComponent {
     #filterModel_accessor_storage = proxify((TableFilterModel));
     get filterModel() { return this.#filterModel_accessor_storage; }
     set filterModel(value) { this.#filterModel_accessor_storage = value; }
-    tableBody;
-    #scrollMode$_accessor_storage = proxify((ValueModel));
-    /**
-     * Set to true to scroll mode to classic or virtual (default).  Virtual scrolll performs better for large data sets but clamps the row height.  Classic scroll
-     * renders all rows but allows row heights to grow.
-     */
-    get scrollMode$() { return this.#scrollMode$_accessor_storage; }
-    set scrollMode$(value) { this.#scrollMode$_accessor_storage = value; }
-    #scrollMode_accessor_storage;
-    get scrollMode() { return this.#scrollMode_accessor_storage; }
-    set scrollMode(value) { this.#scrollMode_accessor_storage = value; }
+    #enablePaging$_accessor_storage = proxify((ValueModel));
+    get enablePaging$() { return this.#enablePaging$_accessor_storage; }
+    set enablePaging$(value) { this.#enablePaging$_accessor_storage = value; }
+    #enablePaging_accessor_storage = false;
+    get enablePaging() { return this.#enablePaging_accessor_storage; }
+    set enablePaging(value) { this.#enablePaging_accessor_storage = value; }
+    // enablePaging() {
+    //   if (isNil(this.pageController)) {
+    //     const pagedListModel = this.registerDisposable(PagedListModel.create(this._visibleRows$.getDelegate(), this._pageSize));
+    //     this._visibleRows$.setDelegate(pagedListModel);
+    //     this._pageController = pagedListModel.pageController;
+    //   }
+    // }
     _footerContentAdded = false;
     _filteredRows$ = this.registerDisposable(new DelegatingListModel());
-    tableBodyScrollMode$;
+    _pageSize = new MutableValueModel();
+    pagedListModel;
     constructor(injector) {
         super(injector);
-        const { chain, when } = Dsl.disposeWith(this);
-        this.tableBodyScrollMode$ = chain(this.enableScrolling$).map(enable => {
-            return enable ? (this.scrollMode$.value ?? "virtual") : 'none';
-        }, { dependsOn: this.scrollMode$ });
+        const { when } = Dsl.disposeWith(this);
+        this.onDispose(() => this.disposeOfPagedListModel());
+        when(this.enablePaging$).changes(enabled => this.configurePaging(enabled));
     }
     ngOnInit() {
         super.ngOnInit();
-        const { when } = Dsl.disposeWith(this);
         if (CanProxy.hasTarget(this.filterModel)) {
             this.registerDisposable(this.filterModel.bindToTable(this._dataSource$, this.getModel().textSearchPredicate$));
             this.highlightText$.setDelegate(this.filterModel.highlightText$);
@@ -5259,27 +4677,50 @@ class TableComponent extends AbstractTableComponent {
         else {
             this._filteredRows$.setDelegate(this._dataSource$);
         }
-        this._visibleRows$.setDelegate(this._filteredRows$);
-        // let users of the model know what the current visible and filtered rows are for selection models and what not
+        this.configurePaging(this.enablePaging$.value);
         this.tableModel.bindToTable(this._filteredRows$, this._visibleRows$);
-        when.anyOf(...this.tableModel.viewStateDependencies).changes(() => this.cdr.markForCheck());
-        this.viewStateDependsOn(this._filteredRows$, this.tableModel.visibleColumns$);
     }
     getModel() {
         return this.tableModel;
     }
+    get pageController() {
+        // TODO: need to support external page controllers if the paging occurs to our primary data source.
+        return this.pagedListModel.pageController;
+    }
+    configurePaging(enable) {
+        if (enable) {
+            if (!this.pagedListModel) {
+                this.pagedListModel = PagedListModel.create(this._filteredRows$, this._pageSize);
+            }
+            this._visibleRows$.setDelegate(this.pagedListModel);
+        }
+        else {
+            this.disposeOfPagedListModel();
+            this._visibleRows$.setDelegate(this._filteredRows$);
+        }
+    }
+    disposeOfPagedListModel() {
+        if (this.pagedListModel) {
+            this.pagedListModel.dispose();
+            this.pagedListModel = null;
+        }
+    }
     footerContentChanged($event) {
         // console.log($event);
         this._footerContentAdded = true;
     }
+    //@Trace()
+    updatePageSize(count) {
+        this._pageSize.value = count;
+    }
     static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.9", ngImport: i0, type: TableComponent, deps: [{ token: i0.Injector }], target: i0.ɵɵFactoryTarget.Component });
-    static ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "16.2.9", type: TableComponent, selector: "aup-table", inputs: { tableModel: "tableModel", filterModel: "filterModel", scrollMode$: "scrollMode$", scrollMode: "scrollMode" }, providers: [
+    static ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "16.2.9", type: TableComponent, selector: "aup-table", inputs: { tableModel: "tableModel", filterModel: "filterModel", enablePaging$: "enablePaging$", enablePaging: "enablePaging" }, providers: [
             { provide: AbstractTableComponent, useExisting: TableComponent }
-        ], viewQueries: [{ propertyName: "tableBody", first: true, predicate: TableBodyComponent, descendants: true }], usesInheritance: true, ngImport: i0, template: "<aup-table-body [data$]=\"visibleRows$\"\n                [tableModel]=\"$any(tableModel)\"\n                [footerRow]=\"tableModel.footerRowModel\"\n                [showHeader$]=\"$any(showHeader$)\"\n                [scrollMode$]=\"tableBodyScrollMode$\"\n                [trackBy]=\"trackBy\"\n                [aupHighlightTextModel]=\"highlightText$\"\n></aup-table-body>\n<section class=\"table-footer\">\n  <div class=\"footer-content\"><ng-content select=\"[footer], [slot=footer]\"></ng-content></div>\n</section>\n", styles: [":host{display:flex;flex-direction:column;align-items:stretch}aup-table-body{flex:1}.table-footer{display:flex;flex-direction:row;align-items:center}.table-footer .footer-content{flex:1}\n"], dependencies: [{ kind: "directive", type: HighlightTextModelDirective, selector: "[aupHighlightTextModel]", inputs: ["aupHighlightTextModel"] }, { kind: "component", type: TableBodyComponent, selector: "aup-table-body", inputs: ["data$", "tableModel", "footerRow", "showHeader$", "showHeader", "trackBy", "scrollMode$", "scrollMode"] }] });
+        ], usesInheritance: true, ngImport: i0, template: "<aup-table-body [data$]=\"visibleRows$\"\n                [tableModel]=\"tableModel\"\n                [showHeader$]=\"showHeader$\"\n                [enableScrolling]=\"enableScrolling\"\n                [trackBy]=\"trackBy\"\n                (visibleRowCount)=\"updatePageSize($event)\"\n                [aupHighlightTextModel]=\"highlightText$\"\n></aup-table-body>\n<section class=\"table-footer\">\n  <div class=\"footer-content\"><ng-content select=\"[footer]\"></ng-content></div>\n  <aup-paginator *ngIf=\"enablePaging$.value\" [pageController]=\"pageController\"></aup-paginator>\n</section>\n", styles: [":host{display:flex;flex-direction:column;align-items:stretch}aup-table-body{flex:1}.table-footer{display:flex;flex-direction:row;align-items:center}.table-footer .footer-content{flex:1}\n"], dependencies: [{ kind: "directive", type: i1$1.NgIf, selector: "[ngIf]", inputs: ["ngIf", "ngIfThen", "ngIfElse"] }, { kind: "directive", type: HighlightTextModelDirective, selector: "[aupHighlightTextModel]", inputs: ["aupHighlightTextModel"] }, { kind: "component", type: PaginatorComponent, selector: "aup-paginator", inputs: ["pageController"] }, { kind: "component", type: TableBodyComponent, selector: "aup-table-body", inputs: ["data$", "tableModel", "showHeader$", "showHeader", "trackBy", "enableScrolling"], outputs: ["visibleRowCount"] }] });
 }
 __decorate([
     Proxify(),
-    __metadata("design:type", TableModel)
+    __metadata("design:type", Object)
 ], TableComponent.prototype, "tableModel", null);
 __decorate([
     Proxify(),
@@ -5287,27 +4728,24 @@ __decorate([
 ], TableComponent.prototype, "filterModel", null);
 __decorate([
     Proxify(),
-    __metadata("design:type", ValueModel)
-], TableComponent.prototype, "scrollMode$", null);
+    __metadata("design:type", Object)
+], TableComponent.prototype, "enablePaging$", null);
 __decorate([
     StoreInValueModel(),
     __metadata("design:type", Object)
-], TableComponent.prototype, "scrollMode", null);
+], TableComponent.prototype, "enablePaging", null);
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.9", ngImport: i0, type: TableComponent, decorators: [{
             type: Component,
             args: [{ selector: 'aup-table', providers: [
                         { provide: AbstractTableComponent, useExisting: TableComponent }
-                    ], template: "<aup-table-body [data$]=\"visibleRows$\"\n                [tableModel]=\"$any(tableModel)\"\n                [footerRow]=\"tableModel.footerRowModel\"\n                [showHeader$]=\"$any(showHeader$)\"\n                [scrollMode$]=\"tableBodyScrollMode$\"\n                [trackBy]=\"trackBy\"\n                [aupHighlightTextModel]=\"highlightText$\"\n></aup-table-body>\n<section class=\"table-footer\">\n  <div class=\"footer-content\"><ng-content select=\"[footer], [slot=footer]\"></ng-content></div>\n</section>\n", styles: [":host{display:flex;flex-direction:column;align-items:stretch}aup-table-body{flex:1}.table-footer{display:flex;flex-direction:row;align-items:center}.table-footer .footer-content{flex:1}\n"] }]
+                    ], template: "<aup-table-body [data$]=\"visibleRows$\"\n                [tableModel]=\"tableModel\"\n                [showHeader$]=\"showHeader$\"\n                [enableScrolling]=\"enableScrolling\"\n                [trackBy]=\"trackBy\"\n                (visibleRowCount)=\"updatePageSize($event)\"\n                [aupHighlightTextModel]=\"highlightText$\"\n></aup-table-body>\n<section class=\"table-footer\">\n  <div class=\"footer-content\"><ng-content select=\"[footer]\"></ng-content></div>\n  <aup-paginator *ngIf=\"enablePaging$.value\" [pageController]=\"pageController\"></aup-paginator>\n</section>\n", styles: [":host{display:flex;flex-direction:column;align-items:stretch}aup-table-body{flex:1}.table-footer{display:flex;flex-direction:row;align-items:center}.table-footer .footer-content{flex:1}\n"] }]
         }], ctorParameters: function () { return [{ type: i0.Injector }]; }, propDecorators: { tableModel: [{
                 type: Input
             }], filterModel: [{
                 type: Input
-            }], tableBody: [{
-                type: ViewChild,
-                args: [TableBodyComponent]
-            }], scrollMode$: [{
+            }], enablePaging$: [{
                 type: Input
-            }], scrollMode: [{
+            }], enablePaging: [{
                 type: Input
             }] } });
 
@@ -5489,7 +4927,7 @@ var DecoratedTreeNode;
         }
     }
     __decorate([
-        MemoizeGet(),
+        Memoize(),
         __metadata("design:type", Array),
         __metadata("design:paramtypes", [])
     ], Decorator.prototype, "children", null);
@@ -5542,7 +4980,7 @@ var DecoratedTreeNode;
         __metadata("design:returntype", Array)
     ], Decorator.prototype, "ancestors", null);
     __decorate([
-        MemoizeGet(),
+        Memoize(),
         __metadata("design:type", Number),
         __metadata("design:paramtypes", [])
     ], Decorator.prototype, "depth", null);
@@ -5553,8 +4991,8 @@ class TreeLabelColumnModel extends ColumnModel {
     expansionModel;
     labelFactory = () => undefined;
     iconFactory;
-    constructor(columnId, order, textPropertiesProvider, expansionModel) {
-        super(columnId, order, textPropertiesProvider);
+    constructor(columnId, textPropertiesProvider, expansionModel) {
+        super(columnId, textPropertiesProvider);
         this.expansionModel = expansionModel;
         this.cellRenderer(TreeLabelCellRendererComponent);
     }
@@ -5613,7 +5051,7 @@ class TreeTableModel extends AbstractTableModel {
     get isExpandedPredicate$() {
         return this._isExpandedPredicate$.readonly$;
     }
-    bindToTable(expansionModel, filteredRows$, visibleRows$, cdr) {
+    bindToTable(expansionModel, filteredRows$, visibleRows$) {
         this.treeExpansionModel = expansionModel;
         // TODO: Move all the expansion model stuff out of here and have things use the expansion model directly
         this._isExpandedPredicate$.setDelegate(this.treeExpansionModel.isExpandedPredicate$);
@@ -5622,7 +5060,7 @@ class TreeTableModel extends AbstractTableModel {
     }
     treeControlColumn(builder) {
         const columnId = 'tree-label';
-        const column = new TreeLabelColumnModel(columnId, this.columnManager, () => this.getColumnTextProperties(columnId), this);
+        const column = new TreeLabelColumnModel(columnId, () => this.getColumnTextProperties(columnId), this);
         builder(column);
         this.addColumn(column);
     }
@@ -5641,6 +5079,9 @@ class TreeTableModel extends AbstractTableModel {
     isExpanded(row) {
         return this.treeExpansionModel.isExpanded(row);
     }
+    addSelectionColumn(selectionModel, showSelectionColumn) {
+        return this._addSelectionColumn(selectionModel, showSelectionColumn);
+    }
 }
 // export class FlattenStrategy<T extends VisitableTree<any>> extends SelfAndDescendantsVisitor<T> {
 //
@@ -5945,15 +5386,11 @@ class TreeTableComponent extends AbstractTableComponent {
     #expansionModel_accessor_storage = proxify((TreeExpansionModel));
     get expansionModel() { return this.#expansionModel_accessor_storage; }
     set expansionModel(value) { this.#expansionModel_accessor_storage = value; }
-    scrollMode$;
     constructor(injector) {
         super(injector);
-        const { chain } = Dsl.disposeWith(this);
-        this.scrollMode$ = chain(this.enableScrolling$).map(enabled => enabled ? "classic" : "none");
     }
     ngOnInit() {
         super.ngOnInit();
-        const { when } = Dsl.disposeWith(this);
         // TODO: clean up all this tightly coupled shit, should the expansion model really be separate from the tree model?
         if (!this.expansionModel) {
             this.expansionModel = new TreeExpansionModel({ disposedWith: this });
@@ -5962,10 +5399,7 @@ class TreeTableComponent extends AbstractTableComponent {
         const visibleRows$ = new FlattenedTreeListModel(this._dataSource$, row => this.treeTableModel.childExtractor(row), this.expansionModel);
         this._visibleRows$.setDelegate(visibleRows$);
         this.expansionModel.bindToTable(this._dataSource$, visibleRows$);
-        this.treeTableModel.bindToTable(this.expansionModel, visibleRows$, this._visibleRows$, this.cdr);
-        this.viewStateDependsOn(this.treeTableModel.visibleRows$);
-        this.viewStateDependsOn(this.treeTableModel.visibleRows$);
-        when.anyOf(...this.treeTableModel.viewStateDependencies).changes(() => this.cdr.markForCheck());
+        this.treeTableModel.bindToTable(this.expansionModel, visibleRows$, this._visibleRows$);
     }
     getModel() {
         return this.treeTableModel;
@@ -5973,7 +5407,7 @@ class TreeTableComponent extends AbstractTableComponent {
     static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.9", ngImport: i0, type: TreeTableComponent, deps: [{ token: i0.Injector }], target: i0.ɵɵFactoryTarget.Component });
     static ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "16.2.9", type: TreeTableComponent, selector: "aup-tree-table", inputs: { treeTableModel: "treeTableModel", expansionModel: "expansionModel" }, providers: [
             { provide: AbstractTableComponent, useExisting: TreeTableComponent }
-        ], usesInheritance: true, ngImport: i0, template: "<aup-table-body [data$]=\"visibleRows$\"\n                [tableModel]=\"treeTableModel\"\n                [showHeader$]=\"showHeader$\"\n                [scrollMode$]=\"scrollMode$\"\n                [aupHighlightTextModel]=\"highlightText$\"\n                [trackBy]=\"trackBy\"\n></aup-table-body>\n", styles: [":host{display:flex;flex-direction:column;align-items:stretch}:host::ng-deep td.mat-mdc-cell{border-top-width:0!important;border-bottom-width:0!important}:host::ng-deep td.mat-column-tree-label{width:1px}:host::ng-deep aup-table-cell-renderer[column-id=tree-label]{padding-left:8px!important}:host::ng-deep aup-tree-label-cell-renderer{flex:1}aup-table-body{flex:1}\n"], dependencies: [{ kind: "directive", type: HighlightTextModelDirective, selector: "[aupHighlightTextModel]", inputs: ["aupHighlightTextModel"] }, { kind: "component", type: TableBodyComponent, selector: "aup-table-body", inputs: ["data$", "tableModel", "footerRow", "showHeader$", "showHeader", "trackBy", "scrollMode$", "scrollMode"] }] });
+        ], usesInheritance: true, ngImport: i0, template: "<aup-table-body [data$]=\"visibleRows$\"\n                [tableModel]=\"treeTableModel\"\n                [showHeader$]=\"showHeader$\"\n                [enableScrolling]=\"enableScrolling\"\n                [aupHighlightTextModel]=\"highlightText$\"\n                [trackBy]=\"trackBy\"\n></aup-table-body>\n", styles: [":host{display:flex;flex-direction:column;align-items:stretch}:host::ng-deep td.mat-mdc-cell{border-top-width:0!important;border-bottom-width:0!important}:host::ng-deep td.mat-column-tree-label{width:1px}:host::ng-deep aup-table-cell-renderer[column-id=tree-label]{padding-left:8px!important}:host::ng-deep aup-tree-label-cell-renderer{flex:1}aup-table-body{flex:1}\n"], dependencies: [{ kind: "directive", type: HighlightTextModelDirective, selector: "[aupHighlightTextModel]", inputs: ["aupHighlightTextModel"] }, { kind: "component", type: TableBodyComponent, selector: "aup-table-body", inputs: ["data$", "tableModel", "showHeader$", "showHeader", "trackBy", "enableScrolling"], outputs: ["visibleRowCount"] }] });
 }
 __decorate([
     Proxify(),
@@ -5987,7 +5421,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.9", ngImpor
             type: Component,
             args: [{ selector: 'aup-tree-table', providers: [
                         { provide: AbstractTableComponent, useExisting: TreeTableComponent }
-                    ], template: "<aup-table-body [data$]=\"visibleRows$\"\n                [tableModel]=\"treeTableModel\"\n                [showHeader$]=\"showHeader$\"\n                [scrollMode$]=\"scrollMode$\"\n                [aupHighlightTextModel]=\"highlightText$\"\n                [trackBy]=\"trackBy\"\n></aup-table-body>\n", styles: [":host{display:flex;flex-direction:column;align-items:stretch}:host::ng-deep td.mat-mdc-cell{border-top-width:0!important;border-bottom-width:0!important}:host::ng-deep td.mat-column-tree-label{width:1px}:host::ng-deep aup-table-cell-renderer[column-id=tree-label]{padding-left:8px!important}:host::ng-deep aup-tree-label-cell-renderer{flex:1}aup-table-body{flex:1}\n"] }]
+                    ], template: "<aup-table-body [data$]=\"visibleRows$\"\n                [tableModel]=\"treeTableModel\"\n                [showHeader$]=\"showHeader$\"\n                [enableScrolling]=\"enableScrolling\"\n                [aupHighlightTextModel]=\"highlightText$\"\n                [trackBy]=\"trackBy\"\n></aup-table-body>\n", styles: [":host{display:flex;flex-direction:column;align-items:stretch}:host::ng-deep td.mat-mdc-cell{border-top-width:0!important;border-bottom-width:0!important}:host::ng-deep td.mat-column-tree-label{width:1px}:host::ng-deep aup-table-cell-renderer[column-id=tree-label]{padding-left:8px!important}:host::ng-deep aup-tree-label-cell-renderer{flex:1}aup-table-body{flex:1}\n"] }]
         }], ctorParameters: function () { return [{ type: i0.Injector }]; }, propDecorators: { treeTableModel: [{
                 type: Input
             }], expansionModel: [{
@@ -6169,7 +5603,6 @@ class ComponentsModule {
             FocusableComponent,
             CardContainerComponent,
             TableComponent,
-            TableRowAttributesDirective,
             EditRowControlsComponent,
             ColumnTemplateDirective,
             DefaultCellRendererComponent,
@@ -6203,9 +5636,7 @@ class ComponentsModule {
             MarkdownComponent,
             TableBodyComponent,
             TableMoreMenuComponent,
-            TableMoreMenuPopupComponent,
-            SearchInputComponent,
-            TableFooterRow], imports: [CommonModule,
+            TableMoreMenuPopupComponent], imports: [CommonModule,
             BrowserAnimationsModule,
             FormsModule,
             MatInputModule,
@@ -6224,10 +5655,7 @@ class ComponentsModule {
             MatMenuModule,
             MatDividerModule,
             MatProgressSpinnerModule,
-            MatProgressBarModule,
-            ScrollingModule,
-            TableVirtualScrollModule], exports: [TableFooterRow,
-            NumberInputComponent,
+            MatProgressBarModule], exports: [NumberInputComponent,
             StringInputComponent,
             TextInputComponent,
             PasswordInputComponent,
@@ -6265,8 +5693,7 @@ class ComponentsModule {
             LoadingContainerComponent,
             MarkdownComponent,
             TableMoreMenuComponent,
-            TableMoreMenuPopupComponent,
-            SearchInputComponent] });
+            TableMoreMenuPopupComponent] });
     static ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "16.2.9", ngImport: i0, type: ComponentsModule, providers: [
             FocusBindingFactory,
             MarkdownService
@@ -6289,9 +5716,7 @@ class ComponentsModule {
             MatMenuModule,
             MatDividerModule,
             MatProgressSpinnerModule,
-            MatProgressBarModule,
-            ScrollingModule,
-            TableVirtualScrollModule] });
+            MatProgressBarModule] });
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.9", ngImport: i0, type: ComponentsModule, decorators: [{
             type: NgModule,
@@ -6316,9 +5741,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.9", ngImpor
                         MatMenuModule,
                         MatDividerModule,
                         MatProgressSpinnerModule,
-                        MatProgressBarModule,
-                        ScrollingModule,
-                        TableVirtualScrollModule
+                        MatProgressBarModule
                     ],
                     declarations: [
                         AbstractInputComponent,
@@ -6342,7 +5765,6 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.9", ngImpor
                         FocusableComponent,
                         CardContainerComponent,
                         TableComponent,
-                        TableRowAttributesDirective,
                         EditRowControlsComponent,
                         ColumnTemplateDirective,
                         DefaultCellRendererComponent,
@@ -6377,11 +5799,8 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.9", ngImpor
                         TableBodyComponent,
                         TableMoreMenuComponent,
                         TableMoreMenuPopupComponent,
-                        SearchInputComponent,
-                        TableFooterRow
                     ],
                     exports: [
-                        TableFooterRow,
                         NumberInputComponent,
                         StringInputComponent,
                         TextInputComponent,
@@ -6421,7 +5840,6 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.9", ngImpor
                         MarkdownComponent,
                         TableMoreMenuComponent,
                         TableMoreMenuPopupComponent,
-                        SearchInputComponent
                     ],
                     providers: [
                         FocusBindingFactory,
@@ -6430,73 +5848,6 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.9", ngImpor
                 }]
         }] });
 
-class LoadableComponent extends DisposableComponent {
-    #_loaded$ = new MutableValueModel();
-    #asyncLoadables = [];
-    #awaitedLoadables = [];
-    get loaded$() {
-        return this.#_loaded$.readonly$;
-    }
-    ngOnInit() {
-        super.ngOnInit();
-        this.#asyncLoadables.forEach(it => it.ensureLoaded());
-        if (this.#awaitedLoadables.length > 0) {
-            Promise.all(this.#awaitedLoadables.map(it => {
-                return it.ensureLoaded(); //.then(() => console.log(`${it.constructor.name} loaded`));
-            })).then(() => {
-                this.#_loaded$.value = true;
-            });
-        }
-        else {
-            this.#_loaded$.value = true;
-        }
-    }
-    injectLoadable(token, options) {
-        return this.registerLoadable(inject(token, options), options);
-    }
-    registerLoadable(loadable, options) {
-        if (this.loaded$.value) {
-            loadable.ensureLoaded();
-        }
-        else {
-            if (!options || options.wait === true) {
-                this.#awaitedLoadables.push(loadable);
-            }
-            else {
-                this.#asyncLoadables.push(loadable);
-            }
-        }
-        return loadable;
-    }
-    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.9", ngImport: i0, type: LoadableComponent, deps: null, target: i0.ɵɵFactoryTarget.Directive });
-    static ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "14.0.0", version: "16.2.9", type: LoadableComponent, usesInheritance: true, ngImport: i0 });
-}
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.9", ngImport: i0, type: LoadableComponent, decorators: [{
-            type: Directive
-        }] });
-
-class TextSearchContext {
-    row;
-    searchText;
-    searchRegex;
-    constructor(row, searchText, searchRegex) {
-        this.row = row;
-        this.searchText = searchText;
-        this.searchRegex = searchRegex;
-    }
-    getOrCreate(type, create) {
-    }
-    matchesText(text) {
-        return this.searchRegex.test(text);
-    }
-}
-
-class AbstractCellRenderer extends LoadableComponent {
-    constructor() {
-        super();
-    }
-}
-
 /**
  * @file Automatically generated by barrelsby.
  */
@@ -6523,6 +5874,7 @@ class AbstractCellRenderer extends LoadableComponent {
  * </aup-activity-actions>
  */
 class ActivityActionsComponent extends DisposableComponent {
+    cdr;
     confirmCommandComponent;
     cancelCommandComponent;
     #confirmCommand_accessor_storage = proxify((Command));
@@ -6551,9 +5903,9 @@ class ActivityActionsComponent extends DisposableComponent {
     }
     layout = ActivityActionsComponent.Layout.BLOCK;
     align = ActivityActionsComponent.Align.STRETCH;
-    alignContent = ActivityActionsComponent.AlignContent.CENTER;
-    constructor() {
+    constructor(cdr) {
         super();
+        this.cdr = cdr;
     }
     hasConfirmFace() {
         return !!this.confirmFace;
@@ -6572,8 +5924,8 @@ class ActivityActionsComponent extends DisposableComponent {
     focusCancel() {
         this.cancelCommandComponent.requestFocus();
     }
-    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.9", ngImport: i0, type: ActivityActionsComponent, deps: [], target: i0.ɵɵFactoryTarget.Component });
-    static ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "16.2.9", type: ActivityActionsComponent, selector: "aup-activity-actions", inputs: { confirmCommand: "confirmCommand", cancelCommand: "cancelCommand", faces: "faces", confirmFace: "confirmFace", cancelFace: "cancelFace", style: "style", layout: "layout", align: "align", alignContent: "alignContent" }, host: { properties: { "attr.layout": "this.layout", "attr.align": "this.align", "attr.align-content": "this.alignContent" } }, viewQueries: [{ propertyName: "confirmCommandComponent", first: true, predicate: ["confirmCommandComponent"], descendants: true }, { propertyName: "cancelCommandComponent", first: true, predicate: ["cancelCommandComponent"], descendants: true }], usesInheritance: true, ngImport: i0, template: "<div class=\"content\">\n  <ng-content></ng-content>\n</div>\n<ng-container *ngIf=\"hasCancelFace()\">\n  <aup-command #cancelCommandComponent class=\"cancel\" [command]=\"cancelCommand\" [face]=\"cancelFace\" data-cy=\"cancel-command\"></aup-command>\n</ng-container>\n<ng-container *ngIf=\"hasConfirmFace()\">\n  <aup-command #confirmCommandComponent class=\"confirm\" [command]=\"confirmCommand\" [face]=\"confirmFace\" data-cy=\"confirm-command\"></aup-command>\n</ng-container>\n", styles: [":host{display:grid;grid-template-rows:auto;align-items:center;justify-content:end;--resolved-activity-actions-gap: var(--activity-actions-gap, 8px);grid-gap:var(--resolved-activity-actions-gap)}:host[layout=block][align=start]{grid-template-areas:\"cancel confirm content\";grid-template-columns:auto auto 1fr}:host[layout=block][align=start] .confirm{margin-left:var(--resolved-activity-actions-gap)}:host[layout=block][align=end]{grid-template-areas:\"content cancel confirm\";grid-template-columns:1fr auto auto}:host[layout=block][align=end] .confirm{margin-left:var(--resolved-activity-actions-gap)}:host[layout=block][align=stretch]{grid-template-areas:\"cancel content confirm\";grid-template-columns:auto 1fr auto}:host[layout=inline]{grid-template-areas:\"confirm cancel content\";grid-template-columns:auto auto 1fr}:host[layout=inline] .cancel{margin-left:var(--resolved-activity-actions-gap)}:host .cancel{grid-area:cancel}:host .confirm{grid-area:confirm}:host .content{display:flex;flex-direction:row;align-items:center}:host[align-content=start] .content{justify-items:start}:host[align-content=end]{justify-items:end}:host[align-content=center]{justify-items:center}\n"], dependencies: [{ kind: "directive", type: i1$1.NgIf, selector: "[ngIf]", inputs: ["ngIf", "ngIfThen", "ngIfElse"] }, { kind: "component", type: CommandComponent, selector: "aup-command", inputs: ["command", "face$", "face", "busyFace$", "busyFace", "alignFace"] }] });
+    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.9", ngImport: i0, type: ActivityActionsComponent, deps: [{ token: i0.ChangeDetectorRef }], target: i0.ɵɵFactoryTarget.Component });
+    static ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "16.2.9", type: ActivityActionsComponent, selector: "aup-activity-actions", inputs: { confirmCommand: "confirmCommand", cancelCommand: "cancelCommand", faces: "faces", confirmFace: "confirmFace", cancelFace: "cancelFace", style: "style", layout: "layout", align: "align" }, host: { properties: { "attr.layout": "this.layout", "attr.align": "this.align" } }, viewQueries: [{ propertyName: "confirmCommandComponent", first: true, predicate: ["confirmCommandComponent"], descendants: true }, { propertyName: "cancelCommandComponent", first: true, predicate: ["cancelCommandComponent"], descendants: true }], usesInheritance: true, ngImport: i0, template: "<div class=\"content\">\n  <ng-content></ng-content>\n</div>\n<ng-container *ngIf=\"hasConfirmFace()\">\n  <aup-command #confirmCommandComponent class=\"confirm\" [command]=\"confirmCommand\" [face]=\"confirmFace\" data-cy=\"confirm-command\"></aup-command>\n</ng-container>\n<ng-container *ngIf=\"hasCancelFace()\">\n  <aup-command #cancelCommandComponent class=\"cancel\" [command]=\"cancelCommand\" [face]=\"cancelFace\" data-cy=\"cancel-command\"></aup-command>\n</ng-container>\n", styles: [":host{display:grid;grid-template-rows:auto;align-items:center;justify-content:end;--resolved-activity-actions-gap: var(--activity-actions-gap, 8px)}:host[layout=block][align=start]{grid-template-areas:\"cancel confirm content\";grid-template-columns:auto auto 1fr}:host[layout=block][align=start] .confirm{margin-left:var(--resolved-activity-actions-gap)}:host[layout=block][align=end]{grid-template-areas:\"content cancel confirm\";grid-template-columns:1fr auto auto}:host[layout=block][align=end] .confirm{margin-left:var(--resolved-activity-actions-gap)}:host[layout=block][align=stretch]{grid-template-areas:\"cancel content confirm\";grid-template-columns:auto 1fr auto}:host[layout=inline]{grid-template-areas:\"confirm cancel content\";grid-template-columns:auto auto 1fr}:host[layout=inline] .cancel{margin-left:var(--resolved-activity-actions-gap)}.cancel{grid-area:cancel}.confirm{grid-area:confirm}.content{grid-area:content;text-align:left}\n"], dependencies: [{ kind: "directive", type: i1$1.NgIf, selector: "[ngIf]", inputs: ["ngIf", "ngIfThen", "ngIfElse"] }, { kind: "component", type: CommandComponent, selector: "aup-command", inputs: ["command", "face$", "face", "busyFace$", "busyFace", "alignFace"] }] });
 }
 __decorate([
     Proxify(),
@@ -6585,8 +5937,8 @@ __decorate([
 ], ActivityActionsComponent.prototype, "cancelCommand", null);
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.9", ngImport: i0, type: ActivityActionsComponent, decorators: [{
             type: Component,
-            args: [{ selector: 'aup-activity-actions', template: "<div class=\"content\">\n  <ng-content></ng-content>\n</div>\n<ng-container *ngIf=\"hasCancelFace()\">\n  <aup-command #cancelCommandComponent class=\"cancel\" [command]=\"cancelCommand\" [face]=\"cancelFace\" data-cy=\"cancel-command\"></aup-command>\n</ng-container>\n<ng-container *ngIf=\"hasConfirmFace()\">\n  <aup-command #confirmCommandComponent class=\"confirm\" [command]=\"confirmCommand\" [face]=\"confirmFace\" data-cy=\"confirm-command\"></aup-command>\n</ng-container>\n", styles: [":host{display:grid;grid-template-rows:auto;align-items:center;justify-content:end;--resolved-activity-actions-gap: var(--activity-actions-gap, 8px);grid-gap:var(--resolved-activity-actions-gap)}:host[layout=block][align=start]{grid-template-areas:\"cancel confirm content\";grid-template-columns:auto auto 1fr}:host[layout=block][align=start] .confirm{margin-left:var(--resolved-activity-actions-gap)}:host[layout=block][align=end]{grid-template-areas:\"content cancel confirm\";grid-template-columns:1fr auto auto}:host[layout=block][align=end] .confirm{margin-left:var(--resolved-activity-actions-gap)}:host[layout=block][align=stretch]{grid-template-areas:\"cancel content confirm\";grid-template-columns:auto 1fr auto}:host[layout=inline]{grid-template-areas:\"confirm cancel content\";grid-template-columns:auto auto 1fr}:host[layout=inline] .cancel{margin-left:var(--resolved-activity-actions-gap)}:host .cancel{grid-area:cancel}:host .confirm{grid-area:confirm}:host .content{display:flex;flex-direction:row;align-items:center}:host[align-content=start] .content{justify-items:start}:host[align-content=end]{justify-items:end}:host[align-content=center]{justify-items:center}\n"] }]
-        }], ctorParameters: function () { return []; }, propDecorators: { confirmCommandComponent: [{
+            args: [{ selector: 'aup-activity-actions', template: "<div class=\"content\">\n  <ng-content></ng-content>\n</div>\n<ng-container *ngIf=\"hasConfirmFace()\">\n  <aup-command #confirmCommandComponent class=\"confirm\" [command]=\"confirmCommand\" [face]=\"confirmFace\" data-cy=\"confirm-command\"></aup-command>\n</ng-container>\n<ng-container *ngIf=\"hasCancelFace()\">\n  <aup-command #cancelCommandComponent class=\"cancel\" [command]=\"cancelCommand\" [face]=\"cancelFace\" data-cy=\"cancel-command\"></aup-command>\n</ng-container>\n", styles: [":host{display:grid;grid-template-rows:auto;align-items:center;justify-content:end;--resolved-activity-actions-gap: var(--activity-actions-gap, 8px)}:host[layout=block][align=start]{grid-template-areas:\"cancel confirm content\";grid-template-columns:auto auto 1fr}:host[layout=block][align=start] .confirm{margin-left:var(--resolved-activity-actions-gap)}:host[layout=block][align=end]{grid-template-areas:\"content cancel confirm\";grid-template-columns:1fr auto auto}:host[layout=block][align=end] .confirm{margin-left:var(--resolved-activity-actions-gap)}:host[layout=block][align=stretch]{grid-template-areas:\"cancel content confirm\";grid-template-columns:auto 1fr auto}:host[layout=inline]{grid-template-areas:\"confirm cancel content\";grid-template-columns:auto auto 1fr}:host[layout=inline] .cancel{margin-left:var(--resolved-activity-actions-gap)}.cancel{grid-area:cancel}.confirm{grid-area:confirm}.content{grid-area:content;text-align:left}\n"] }]
+        }], ctorParameters: function () { return [{ type: i0.ChangeDetectorRef }]; }, propDecorators: { confirmCommandComponent: [{
                 type: ViewChild,
                 args: ["confirmCommandComponent"]
             }], cancelCommandComponent: [{
@@ -6614,11 +5966,6 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.9", ngImpor
             }, {
                 type: HostBinding,
                 args: ['attr.align']
-            }], alignContent: [{
-                type: Input
-            }, {
-                type: HostBinding,
-                args: ['attr.align-content']
             }] } });
 (function (ActivityActionsComponent) {
     ActivityActionsComponent.Layout = Enum({
@@ -6627,19 +5974,14 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.9", ngImpor
     });
     ActivityActionsComponent.Align = Enum({
         START: 'start',
-        STRETCH: 'stretch',
-        END: 'end'
-    });
-    ActivityActionsComponent.AlignContent = Enum({
-        START: 'start',
-        CENTER: 'center',
-        END: 'end'
+        END: 'end',
+        STRETCH: 'stretch'
     });
 })(ActivityActionsComponent || (ActivityActionsComponent = {}));
 
 const ACTIVITY_DATA = new InjectionToken("InteractionActivityData");
 // eslint-disable-next-line @angular-eslint/component-class-suffix
-class Activity extends LoadableComponent {
+class Activity extends DisposableComponent {
     activityData = inject(ACTIVITY_DATA);
     activityReadyListeners = new EventListenerList();
     _busy$ = this.registerDisposable(new DelegatingValueModel().withDefault(false));
@@ -6694,6 +6036,7 @@ class Activity extends LoadableComponent {
     notifyActivityReady() {
         this.activityReadyListeners.fire(l => l(this));
         this._ready$.value = true;
+        console.log("ready");
     }
     onActivityReady(callback) {
         return this.activityReadyListeners.add(callback);
@@ -6813,7 +6156,7 @@ class AbstractDialogComponent extends Activity {
         }
     }
     isDestructive() {
-        return isFunction(this.config['destructive']) && this.config["destructive"]();
+        return isFunction$1(this.config['destructive']) && this.config["destructive"]();
     }
     static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.9", ngImport: i0, type: AbstractDialogComponent, deps: [{ token: ALERT_CONFIG }], target: i0.ɵɵFactoryTarget.Component });
     static ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "16.2.9", type: AbstractDialogComponent, selector: "ng-component", usesInheritance: true, ngImport: i0, template: '', isInline: true });
@@ -6830,7 +6173,6 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.9", ngImpor
 
 class AbstractConfirmDialogComponent extends AbstractDialogComponent {
     cancelFace;
-    confirmClass = "aup-confirm-activity";
     constructor(config) {
         super(config);
         this.cancelFace = {
@@ -6841,7 +6183,7 @@ class AbstractConfirmDialogComponent extends AbstractDialogComponent {
         });
     }
     static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.9", ngImport: i0, type: AbstractConfirmDialogComponent, deps: [{ token: ALERT_CONFIG }], target: i0.ɵɵFactoryTarget.Component });
-    static ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "16.2.9", type: AbstractConfirmDialogComponent, selector: "ng-component", host: { properties: { "class": "this.confirmClass" } }, usesInheritance: true, ngImport: i0, template: '', isInline: true });
+    static ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "16.2.9", type: AbstractConfirmDialogComponent, selector: "ng-component", usesInheritance: true, ngImport: i0, template: '', isInline: true });
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.9", ngImport: i0, type: AbstractConfirmDialogComponent, decorators: [{
             type: Component,
@@ -6851,10 +6193,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.9", ngImpor
         }], ctorParameters: function () { return [{ type: undefined, decorators: [{
                     type: Inject,
                     args: [ALERT_CONFIG]
-                }] }]; }, propDecorators: { confirmClass: [{
-                type: HostBinding,
-                args: ["class"]
-            }] } });
+                }] }]; } });
 
 class ActivityBodyComponent extends DisposableComponent {
     fullWidth = false;
@@ -7184,7 +6523,6 @@ class PlaceDefinition {
     children;
     redirectToFirstChild;
     _parent;
-    name;
     constructor(component, path, authenticate, role, data, routeParameters, children, redirectToFirstChild) {
         this.component = component;
         this.path = path;
@@ -7194,8 +6532,6 @@ class PlaceDefinition {
         this.routeParameters = routeParameters;
         this.children = children;
         this.redirectToFirstChild = redirectToFirstChild;
-        const s = component.name.replace(/Component$/, '');
-        this.name = s.charAt(0).toLowerCase() + s.slice(1);
         this.children.forEach(it => it.setParent(this));
     }
     ancestors() {
@@ -7204,9 +6540,6 @@ class PlaceDefinition {
     ancestorsAndSelf() {
         return this.ancestors().concat(this);
     }
-    get placeId() {
-        return this.ancestorsAndSelf().map(d => Stringy.from(d.name).dasherize().toString()).join('.');
-    }
     setParent(parent) {
         assert.isNil(this._parent);
         this._parent = parent;
@@ -7368,11 +6701,6 @@ __decorate([
     __metadata("design:paramtypes", []),
     __metadata("design:returntype", Array)
 ], PlaceDefinition.prototype, "ancestorsAndSelf", null);
-__decorate([
-    Memoize(),
-    __metadata("design:type", String),
-    __metadata("design:paramtypes", [])
-], PlaceDefinition.prototype, "placeId", null);
 __decorate([
     Memoize(),
     __metadata("design:type", Function),
@@ -7404,38 +6732,31 @@ const ROUTE_PARAMETER_LIST_KEY = Symbol('place:route:parameters');
 //     return true;
 //   }
 // }
-class PlaceComponent extends LoadableComponent {
+class PlaceComponent extends DisposableComponent {
     _placeReadyCallbacks = [];
-    visit$ = new MutableValueModel();
+    visitModel = new MutableValueModel();
     _inVisitUpdate = new Guard();
     _active = new MutableValueModel(false);
     interactionContext;
     childPlaces$;
-    // private readonly _parameterChangeInterceptors: ParameterChangeInterceptor<any>[] = [];
-    placeId;
     placeRouter = inject(PlaceRouter);
-    activatedRoute = inject(ActivatedRoute);
     constructor() {
         super();
         const { chain, valueOf, before, when, after, observe, switchOn } = Dsl.disposeWith(this);
         when(this._active).becomesTruthy(() => this._notifyPlaceReady());
         this.childPlaces$ = ListModel.constant(this.placeDefinition.children.map(d => d.component));
-        this.placeId = this.placeDefinition.placeId;
-        if (isEmpty(this.placeId)) {
-            lang.illegalState("placeId property is missing from the route data parameters");
-        }
     }
     initialiseVisit(visit, notifyVisitChanged) {
-        assert.isNil(this.visit$.value);
+        assert.isNil(this.visitModel.value);
         const { when } = Dsl.disposeWith(this);
-        this.visit$.value = visit;
-        DebugContext.getOrCreate(this.visit$).tag(`${this.placeDefinition.component.name}.visit$`);
+        this.visitModel.value = visit;
+        DebugContext.getOrCreate(this.visitModel).tag(`${this.placeDefinition.component.name}.visitModel`);
         // we track if the any of the bindings updated the route.  If so we remember it and update the
         // route in one go at the end.
         this.placeDefinition
             .getVisitParameterDefs()
             .forEach(parameterDef => this.installAndInitialiseBinding(visit, parameterDef));
-        when(this.visit$).changes((current, previous) => {
+        when(this.visitModel).changes((current, previous) => {
             notifyVisitChanged(current, previous);
         }, { unless: this._inVisitUpdate });
         // TODO: this needs to do a replace url option so that the new url isn't put in the history.... for
@@ -7454,11 +6775,11 @@ class PlaceComponent extends LoadableComponent {
         assert.isTruthy(this.isInitialised());
         assert.notNil(visit);
         this._inVisitUpdate.whileTrue(() => {
-            this.visit$.value = visit;
+            this.visitModel.value = visit;
         });
     }
     isInitialised() {
-        return !!this.visit$.value;
+        return !!this.visitModel.value;
     }
     // @Trace()
     /**
@@ -7468,9 +6789,8 @@ class PlaceComponent extends LoadableComponent {
      */
     installAndInitialiseBinding(initialVisit, parameterDef) {
         const model = this[parameterDef.propertyName];
-        assert.notNil(model);
         DebugContext.tag(model, `${this.placeDefinition.component.name}.${parameterDef.propertyName}`);
-        const binding = this.registerDisposable(new Binding(this.visit$, model, {
+        const binding = this.registerDisposable(new Binding(this.visitModel, model, {
             toRight(visit) {
                 const value = visit.getParameterValue(parameterDef);
                 // console.log('push to component', { name: parameterDef.name, value, visit });
@@ -7550,19 +6870,16 @@ class PlaceComponent extends LoadableComponent {
         this._placeReadyCallbacks.push(callback);
     }
     static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.9", ngImport: i0, type: PlaceComponent, deps: [], target: i0.ɵɵFactoryTarget.Directive });
-    static ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "14.0.0", version: "16.2.9", type: PlaceComponent, host: { properties: { "attr.place-id": "this.placeId" } }, usesInheritance: true, ngImport: i0 });
+    static ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "14.0.0", version: "16.2.9", type: PlaceComponent, usesInheritance: true, ngImport: i0 });
 }
 __decorate([
-    MemoizeGet(),
+    Memoize(),
     __metadata("design:type", PlaceDefinition),
     __metadata("design:paramtypes", [])
 ], PlaceComponent.prototype, "placeDefinition", null);
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.9", ngImport: i0, type: PlaceComponent, decorators: [{
             type: Directive
-        }], ctorParameters: function () { return []; }, propDecorators: { placeId: [{
-                type: HostBinding,
-                args: ["attr.place-id"]
-            }], placeDefinition: [] } });
+        }], ctorParameters: function () { return []; }, propDecorators: { placeDefinition: [] } });
 (function (PlaceComponent) {
     function isPlaceComponentConstructor(target) {
         return lang.constructorChain(target).includes(PlaceComponent);
@@ -7746,7 +7063,7 @@ class Visit {
     getRouterCommands() {
         return this.segments.reduce((result, v) => {
             const path = v.placeDefinition.path;
-            return isEmpty(path) ?
+            return isEmpty$1(path) ?
                 [...result, path] : // Angular doesn't support route params on empty path segments
                 [...result, path, ...v.createRouterCommands()];
         }, []);
@@ -7762,7 +7079,7 @@ class Visit {
     }
 }
 __decorate([
-    Memoize(),
+    Memoize$1(),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [PlaceDefinition]),
     __metadata("design:returntype", VisitSegment)
@@ -8143,7 +7460,10 @@ class SynchroniseInteractionContextIdsWithRoute extends NavigationSession {
         return true;
     }
     notifyActive() {
-        this.syncInteractionIdsWithRouter();
+        // TODO: Do I still need this??
+        setTimeout(() => {
+            this.syncInteractionIdsWithRouter();
+        });
     }
     // @Trace()
     onRouterEnd(event) {
@@ -8682,12 +8002,12 @@ class PlaceAuthService extends GarbageCollector {
         await toPromise(this, this._authZReady$);
         await this.enabledPlaceChecker.waitUntilReady(placeDef);
     }
-    async getAuthenticationFailureRedirect(activatedRoute, state) {
-        const redirect = await this.authNOptions.redirectTo(activatedRoute, state);
+    getAuthenticationFailureRedirect(activatedRoute, state) {
+        const redirect = this.authNOptions.redirectTo(activatedRoute, state);
         return redirect instanceof Visit ? redirect : Visit.goto(redirect);
     }
-    async getAuthorisationFailureRedirectOptions(component) {
-        return (await this.authZOptions.redirectTo(component)).map(it => it instanceof Visit ? it : Visit.goto(it));
+    getAuthorisationFailureRedirectOptions(component) {
+        return this.authZOptions.redirectTo(component).map(it => it instanceof Visit ? it : Visit.goto(it));
     }
     isAuthenticated() {
         return this.accessGuard$.value.isAuthenticated();
@@ -8886,7 +8206,7 @@ class ConsolidatedParameterMap {
     }
 }
 __decorate([
-    MemoizeGet(),
+    Memoize(),
     __metadata("design:type", Array),
     __metadata("design:paramtypes", [])
 ], ConsolidatedParameterMap.prototype, "keys", null);
@@ -8964,7 +8284,7 @@ class UrlSnapshot {
         return this.getPrimaryUrlSegments().find(s => s.path === placeDef.path);
     }
     isLastPlaceInUrl(placeDef) {
-        return last(this.getPrimaryUrlSegments()).path === placeDef.path;
+        return last$1(this.getPrimaryUrlSegments()).path === placeDef.path;
     }
     createVisitSegmentFor(placeDef) {
         return new VisitSegment(placeDef, new ConsolidatedParameterMap(this.getPrimaryUrlSegments()));
@@ -9080,7 +8400,7 @@ class UrlService {
     back() {
         this.angularLocation.back();
     }
-    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.9", ngImport: i0, type: UrlService, deps: [{ token: i1$5.Router }, { token: i1$1.Location }, { token: i1$5.UrlSerializer }], target: i0.ɵɵFactoryTarget.Injectable });
+    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.9", ngImport: i0, type: UrlService, deps: [{ token: i1$4.Router }, { token: i1$1.Location }, { token: i1$4.UrlSerializer }], target: i0.ɵɵFactoryTarget.Injectable });
     static ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.9", ngImport: i0, type: UrlService, providedIn: 'root' });
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.9", ngImport: i0, type: UrlService, decorators: [{
@@ -9088,7 +8408,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.9", ngImpor
             args: [{
                     providedIn: 'root'
                 }]
-        }], ctorParameters: function () { return [{ type: i1$5.Router }, { type: i1$1.Location }, { type: i1$5.UrlSerializer }]; } });
+        }], ctorParameters: function () { return [{ type: i1$4.Router }, { type: i1$1.Location }, { type: i1$4.UrlSerializer }]; } });
 
 // function asArray<T>(item: T | T[]): T[] {
 //   return Array.isArray(item) ? item : [item];
@@ -9108,8 +8428,6 @@ class PlaceRouter extends GarbageCollector {
     routerInteractionAdapter;
     sessionFinishedJobs = [];
     authService = new PlaceAuthService();
-    _ready$ = this.registerDisposable(new DelegatingValueModel().withDefault(true));
-    ready$ = this._ready$.readonly$;
     constructor(angularRouter, angularLocation, interactionService, urlService, placeHistory) {
         super();
         this.angularRouter = angularRouter;
@@ -9131,7 +8449,7 @@ class PlaceRouter extends GarbageCollector {
         });
         const { chain } = Dsl.disposeWith(this);
         this.navigationInProgress$ = chain(this.navigationSession$).isNotNil();
-        this.interactionSyncInProgress$ = chain(this.navigationSession$).pluck("isInteractionSync").otherwise(false);
+        this.interactionSyncInProgress$ = chain(this.navigationSession$).pluck("isInteractionSync");
         const idleStateName = chain(this.interactionService.active).map(active => active ? "IdleDuringInteraction" : "Idle");
         this.navigationSessionName$ = chain(this.navigationSession$)
             .pluck("name")
@@ -9175,13 +8493,10 @@ class PlaceRouter extends GarbageCollector {
         // the back button was clicked.
         angularLocation.onUrlChange(url => this.onUrlChanged(url));
     }
-    postponeRoutingUntil(condition$) {
-        this._ready$.setDelegate(condition$);
-    }
-    async getAuthenticationFailureRedirect(activatedRoute, state) {
+    getAuthenticationFailureRedirect(activatedRoute, state) {
         return this.authService.getAuthenticationFailureRedirect(activatedRoute, state);
     }
-    async getAuthorisationFailureRedirectOptions(component) {
+    getAuthorisationFailureRedirectOptions(component) {
         return this.authService.getAuthorisationFailureRedirectOptions(component);
     }
     get navigationSession() {
@@ -9193,20 +8508,23 @@ class PlaceRouter extends GarbageCollector {
     isNavigating() {
         return this.navigationInProgress$.value;
     }
-    async waitUntilRouterReady() {
-        const { waitUntil } = Dsl.disposeWith(this);
-        await waitUntil(this.ready$).becomesTruthy();
-        return this;
-    }
-    async waitUntilIdle() {
-        const { waitUntil } = Dsl.disposeWith(this);
-        await waitUntil(this.navigationInProgress$).becomesFalsey();
-        return this;
+    waitUntilIdle() {
+        const { when } = Dsl.disposeWith(this);
+        return new Promise(resolve => {
+            when(this.navigationInProgress$).becomesFalsey(() => resolve(this), {
+                initialValue: "evaluate",
+                once: true
+            });
+        });
     }
     async waitActivitiesSynchronised() {
-        const { waitUntil } = Dsl.disposeWith(this);
-        await waitUntil(this.interactionSyncInProgress$).becomesFalsey();
-        return this;
+        const { when } = Dsl.disposeWith(this);
+        return new Promise(resolve => {
+            when(this.interactionSyncInProgress$).becomesFalsey(() => resolve(this), {
+                initialValue: "evaluate",
+                once: true
+            });
+        });
     }
     // @Trace()
     onPopState(event) {
@@ -9392,7 +8710,7 @@ class PlaceRouter extends GarbageCollector {
             return Visit.goto(visitOrPlaceComponent, params);
         }
     }
-    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.9", ngImport: i0, type: PlaceRouter, deps: [{ token: i1$5.Router }, { token: i1$1.Location }, { token: InteractionService }, { token: UrlService }, { token: PlaceHistory }], target: i0.ɵɵFactoryTarget.Injectable });
+    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.9", ngImport: i0, type: PlaceRouter, deps: [{ token: i1$4.Router }, { token: i1$1.Location }, { token: InteractionService }, { token: UrlService }, { token: PlaceHistory }], target: i0.ɵɵFactoryTarget.Injectable });
     static ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.9", ngImport: i0, type: PlaceRouter, providedIn: "root" });
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.9", ngImport: i0, type: PlaceRouter, decorators: [{
@@ -9400,7 +8718,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.9", ngImpor
             args: [{
                     providedIn: "root"
                 }]
-        }], ctorParameters: function () { return [{ type: i1$5.Router }, { type: i1$1.Location }, { type: InteractionService }, { type: UrlService }, { type: PlaceHistory }]; } });
+        }], ctorParameters: function () { return [{ type: i1$4.Router }, { type: i1$1.Location }, { type: InteractionService }, { type: UrlService }, { type: PlaceHistory }]; } });
 
 class ActivityTitleComponent extends DisposableComponent {
     _color;
@@ -9422,11 +8740,11 @@ class ActivityTitleComponent extends DisposableComponent {
         return this._color;
     }
     static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.9", ngImport: i0, type: ActivityTitleComponent, deps: null, target: i0.ɵɵFactoryTarget.Component });
-    static ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "16.2.9", type: ActivityTitleComponent, selector: "aup-activity-title", inputs: { hasTransparentBackground: "hasTransparentBackground", color: "color" }, host: { properties: { "class.transparent-background": "this.hasTransparentBackground", "attr.color": "this.color" } }, usesInheritance: true, ngImport: i0, template: "<ng-content></ng-content>\n<span style=\"flex:1\"></span>\n<ng-content select=\"[slot='title-end']\"></ng-content>\n", styles: [":host{display:flex;flex-direction:row;align-items:center}\n"] });
+    static ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "16.2.9", type: ActivityTitleComponent, selector: "aup-activity-title", inputs: { hasTransparentBackground: "hasTransparentBackground", color: "color" }, host: { properties: { "class.transparent-background": "this.hasTransparentBackground", "attr.color": "this.color" } }, usesInheritance: true, ngImport: i0, template: "<ng-content></ng-content>\n", styles: [":host{display:block}\n"] });
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.9", ngImport: i0, type: ActivityTitleComponent, decorators: [{
             type: Component,
-            args: [{ selector: 'aup-activity-title', template: "<ng-content></ng-content>\n<span style=\"flex:1\"></span>\n<ng-content select=\"[slot='title-end']\"></ng-content>\n", styles: [":host{display:flex;flex-direction:row;align-items:center}\n"] }]
+            args: [{ selector: 'aup-activity-title', template: "<ng-content></ng-content>\n", styles: [":host{display:block}\n"] }]
         }], propDecorators: { hasTransparentBackground: [{
                 type: Input
             }, {
@@ -9447,7 +8765,7 @@ class AlertDialogComponent extends AbstractDialogComponent {
         });
     }
     static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.9", ngImport: i0, type: AlertDialogComponent, deps: [{ token: ACTIVITY_DATA }], target: i0.ɵɵFactoryTarget.Component });
-    static ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "16.2.9", type: AlertDialogComponent, selector: "aup-alert-dialog", usesInheritance: true, ngImport: i0, template: "<aup-activity-title *ngIf=\"title\" [color]=\"color\"><aup-markdown [content]=\"title\" [inline]=\"true\"></aup-markdown></aup-activity-title>\n<aup-activity-body>\n  <aup-markdown *ngFor=\"let line of content\" [content]=\"line\"></aup-markdown>\n</aup-activity-body>\n<aup-activity-actions [confirmFace]=\"confirmFace\"></aup-activity-actions>\n", styles: [":host{display:block}.mat-mdc-dialog-content{margin:0;padding:0}.mat-mdc-dialog-actions{margin-bottom:0!important;padding:0;align-items:flex-end;justify-content:flex-end}\n"], dependencies: [{ kind: "directive", type: i1$1.NgForOf, selector: "[ngFor][ngForOf]", inputs: ["ngForOf", "ngForTrackBy", "ngForTemplate"] }, { kind: "directive", type: i1$1.NgIf, selector: "[ngIf]", inputs: ["ngIf", "ngIfThen", "ngIfElse"] }, { kind: "component", type: MarkdownComponent, selector: "aup-markdown, [aupMarkdown]", inputs: ["content$", "content", "inline"] }, { kind: "component", type: ActivityActionsComponent, selector: "aup-activity-actions", inputs: ["confirmCommand", "cancelCommand", "faces", "confirmFace", "cancelFace", "style", "layout", "align", "alignContent"] }, { kind: "component", type: ActivityTitleComponent, selector: "aup-activity-title", inputs: ["hasTransparentBackground", "color"] }, { kind: "component", type: ActivityBodyComponent, selector: "aup-activity-body", inputs: ["fullWidth"] }] });
+    static ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "16.2.9", type: AlertDialogComponent, selector: "aup-alert-dialog", usesInheritance: true, ngImport: i0, template: "<aup-activity-title *ngIf=\"title\" [color]=\"color\"><aup-markdown [content]=\"title\" [inline]=\"true\"></aup-markdown></aup-activity-title>\n<aup-activity-body>\n  <aup-markdown *ngFor=\"let line of content\" [content]=\"line\"></aup-markdown>\n</aup-activity-body>\n<aup-activity-actions [confirmFace]=\"confirmFace\"></aup-activity-actions>\n", styles: [":host{display:block}.mat-mdc-dialog-content{margin:0;padding:0}.mat-mdc-dialog-actions{margin-bottom:0!important;padding:0;align-items:flex-end;justify-content:flex-end}\n"], dependencies: [{ kind: "directive", type: i1$1.NgForOf, selector: "[ngFor][ngForOf]", inputs: ["ngForOf", "ngForTrackBy", "ngForTemplate"] }, { kind: "directive", type: i1$1.NgIf, selector: "[ngIf]", inputs: ["ngIf", "ngIfThen", "ngIfElse"] }, { kind: "component", type: MarkdownComponent, selector: "aup-markdown, [aupMarkdown]", inputs: ["content$", "content", "inline"] }, { kind: "component", type: ActivityActionsComponent, selector: "aup-activity-actions", inputs: ["confirmCommand", "cancelCommand", "faces", "confirmFace", "cancelFace", "style", "layout", "align"] }, { kind: "component", type: ActivityTitleComponent, selector: "aup-activity-title", inputs: ["hasTransparentBackground", "color"] }, { kind: "component", type: ActivityBodyComponent, selector: "aup-activity-body", inputs: ["fullWidth"] }] });
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.9", ngImport: i0, type: AlertDialogComponent, decorators: [{
             type: Component,
@@ -9467,7 +8785,7 @@ class ConfirmThenDialogComponent extends AbstractConfirmDialogComponent {
         });
     }
     static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.9", ngImport: i0, type: ConfirmThenDialogComponent, deps: [{ token: ACTIVITY_DATA }], target: i0.ɵɵFactoryTarget.Component });
-    static ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "16.2.9", type: ConfirmThenDialogComponent, selector: "aup-confirmation-then-dialog", usesInheritance: true, ngImport: i0, template: "<aup-activity-title *ngIf=\"title\" [color]=\"color\"><aup-markdown [content]=\"title\" [inline]=\"true\"></aup-markdown></aup-activity-title>\n<aup-activity-body>\n  <aup-markdown *ngFor=\"let line of content\" [content]=\"line\"></aup-markdown>\n</aup-activity-body>\n<aup-activity-actions [confirmFace]=\"confirmFace\" [cancelFace]=\"cancelFace\"></aup-activity-actions>\n", styles: [":host{display:block}.mat-mdc-dialog-content{margin:0;padding:0}.mat-mdc-dialog-actions{margin-bottom:0!important;padding:0;align-items:flex-end;justify-content:flex-end}\n"], dependencies: [{ kind: "directive", type: i1$1.NgForOf, selector: "[ngFor][ngForOf]", inputs: ["ngForOf", "ngForTrackBy", "ngForTemplate"] }, { kind: "directive", type: i1$1.NgIf, selector: "[ngIf]", inputs: ["ngIf", "ngIfThen", "ngIfElse"] }, { kind: "component", type: MarkdownComponent, selector: "aup-markdown, [aupMarkdown]", inputs: ["content$", "content", "inline"] }, { kind: "component", type: ActivityActionsComponent, selector: "aup-activity-actions", inputs: ["confirmCommand", "cancelCommand", "faces", "confirmFace", "cancelFace", "style", "layout", "align", "alignContent"] }, { kind: "component", type: ActivityTitleComponent, selector: "aup-activity-title", inputs: ["hasTransparentBackground", "color"] }, { kind: "component", type: ActivityBodyComponent, selector: "aup-activity-body", inputs: ["fullWidth"] }] });
+    static ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "16.2.9", type: ConfirmThenDialogComponent, selector: "aup-confirmation-then-dialog", usesInheritance: true, ngImport: i0, template: "<aup-activity-title *ngIf=\"title\" [color]=\"color\"><aup-markdown [content]=\"title\" [inline]=\"true\"></aup-markdown></aup-activity-title>\n<aup-activity-body>\n  <aup-markdown *ngFor=\"let line of content\" [content]=\"line\"></aup-markdown>\n</aup-activity-body>\n<aup-activity-actions [confirmFace]=\"confirmFace\" [cancelFace]=\"cancelFace\"></aup-activity-actions>\n", styles: [":host{display:block}.mat-mdc-dialog-content{margin:0;padding:0}.mat-mdc-dialog-actions{margin-bottom:0!important;padding:0;align-items:flex-end;justify-content:flex-end}\n"], dependencies: [{ kind: "directive", type: i1$1.NgForOf, selector: "[ngFor][ngForOf]", inputs: ["ngForOf", "ngForTrackBy", "ngForTemplate"] }, { kind: "directive", type: i1$1.NgIf, selector: "[ngIf]", inputs: ["ngIf", "ngIfThen", "ngIfElse"] }, { kind: "component", type: MarkdownComponent, selector: "aup-markdown, [aupMarkdown]", inputs: ["content$", "content", "inline"] }, { kind: "component", type: ActivityActionsComponent, selector: "aup-activity-actions", inputs: ["confirmCommand", "cancelCommand", "faces", "confirmFace", "cancelFace", "style", "layout", "align"] }, { kind: "component", type: ActivityTitleComponent, selector: "aup-activity-title", inputs: ["hasTransparentBackground", "color"] }, { kind: "component", type: ActivityBodyComponent, selector: "aup-activity-body", inputs: ["fullWidth"] }] });
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.9", ngImport: i0, type: ConfirmThenDialogComponent, decorators: [{
             type: Component,
@@ -9491,7 +8809,7 @@ class ConfirmThenExecuteDialogComponent extends AbstractConfirmDialogComponent {
         });
     }
     static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.9", ngImport: i0, type: ConfirmThenExecuteDialogComponent, deps: [{ token: ACTIVITY_DATA }], target: i0.ɵɵFactoryTarget.Component });
-    static ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "16.2.9", type: ConfirmThenExecuteDialogComponent, selector: "aup-confirmation-execute-dialog", usesInheritance: true, ngImport: i0, template: "<aup-activity-title *ngIf=\"title\" [color]=\"color\"><aup-markdown [content]=\"title\" [inline]=\"true\"></aup-markdown></aup-activity-title>\n<aup-activity-body>\n  <aup-markdown *ngFor=\"let line of content\" [content]=\"line\"></aup-markdown>\n</aup-activity-body>\n<aup-activity-actions [confirmFace]=\"confirmFace\" [cancelFace]=\"cancelFace\"></aup-activity-actions>\n", styles: [":host{display:block}.mat-mdc-dialog-content{margin:0;padding:0}.mat-mdc-dialog-actions{margin-bottom:0!important;padding:0;align-items:flex-end;justify-content:flex-end}\n"], dependencies: [{ kind: "directive", type: i1$1.NgForOf, selector: "[ngFor][ngForOf]", inputs: ["ngForOf", "ngForTrackBy", "ngForTemplate"] }, { kind: "directive", type: i1$1.NgIf, selector: "[ngIf]", inputs: ["ngIf", "ngIfThen", "ngIfElse"] }, { kind: "component", type: MarkdownComponent, selector: "aup-markdown, [aupMarkdown]", inputs: ["content$", "content", "inline"] }, { kind: "component", type: ActivityActionsComponent, selector: "aup-activity-actions", inputs: ["confirmCommand", "cancelCommand", "faces", "confirmFace", "cancelFace", "style", "layout", "align", "alignContent"] }, { kind: "component", type: ActivityTitleComponent, selector: "aup-activity-title", inputs: ["hasTransparentBackground", "color"] }, { kind: "component", type: ActivityBodyComponent, selector: "aup-activity-body", inputs: ["fullWidth"] }] });
+    static ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "16.2.9", type: ConfirmThenExecuteDialogComponent, selector: "aup-confirmation-execute-dialog", usesInheritance: true, ngImport: i0, template: "<aup-activity-title *ngIf=\"title\" [color]=\"color\"><aup-markdown [content]=\"title\" [inline]=\"true\"></aup-markdown></aup-activity-title>\n<aup-activity-body>\n  <aup-markdown *ngFor=\"let line of content\" [content]=\"line\"></aup-markdown>\n</aup-activity-body>\n<aup-activity-actions [confirmFace]=\"confirmFace\" [cancelFace]=\"cancelFace\"></aup-activity-actions>\n", styles: [":host{display:block}.mat-mdc-dialog-content{margin:0;padding:0}.mat-mdc-dialog-actions{margin-bottom:0!important;padding:0;align-items:flex-end;justify-content:flex-end}\n"], dependencies: [{ kind: "directive", type: i1$1.NgForOf, selector: "[ngFor][ngForOf]", inputs: ["ngForOf", "ngForTrackBy", "ngForTemplate"] }, { kind: "directive", type: i1$1.NgIf, selector: "[ngIf]", inputs: ["ngIf", "ngIfThen", "ngIfElse"] }, { kind: "component", type: MarkdownComponent, selector: "aup-markdown, [aupMarkdown]", inputs: ["content$", "content", "inline"] }, { kind: "component", type: ActivityActionsComponent, selector: "aup-activity-actions", inputs: ["confirmCommand", "cancelCommand", "faces", "confirmFace", "cancelFace", "style", "layout", "align"] }, { kind: "component", type: ActivityTitleComponent, selector: "aup-activity-title", inputs: ["hasTransparentBackground", "color"] }, { kind: "component", type: ActivityBodyComponent, selector: "aup-activity-body", inputs: ["fullWidth"] }] });
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.9", ngImport: i0, type: ConfirmThenExecuteDialogComponent, decorators: [{
             type: Component,
@@ -9511,7 +8829,7 @@ class ConfirmationDialogComponent extends AbstractConfirmDialogComponent {
         });
     }
     static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.9", ngImport: i0, type: ConfirmationDialogComponent, deps: [{ token: ACTIVITY_DATA }], target: i0.ɵɵFactoryTarget.Component });
-    static ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "16.2.9", type: ConfirmationDialogComponent, selector: "aup-confirmation-dialog", usesInheritance: true, ngImport: i0, template: "<aup-activity-title *ngIf=\"title\" [color]=\"color\"><aup-markdown [content]=\"title\" [inline]=\"true\"></aup-markdown></aup-activity-title>\n<aup-activity-body>\n  <aup-markdown *ngFor=\"let line of content\" [content]=\"line\"></aup-markdown>\n</aup-activity-body>\n<aup-activity-actions [confirmFace]=\"confirmFace\" [cancelFace]=\"cancelFace\"></aup-activity-actions>\n\n", styles: [":host{display:block}.mat-mdc-dialog-content{margin:0;padding:0}.mat-mdc-dialog-actions{margin-bottom:0!important;padding:0;align-items:flex-end;justify-content:flex-end}\n"], dependencies: [{ kind: "directive", type: i1$1.NgForOf, selector: "[ngFor][ngForOf]", inputs: ["ngForOf", "ngForTrackBy", "ngForTemplate"] }, { kind: "directive", type: i1$1.NgIf, selector: "[ngIf]", inputs: ["ngIf", "ngIfThen", "ngIfElse"] }, { kind: "component", type: MarkdownComponent, selector: "aup-markdown, [aupMarkdown]", inputs: ["content$", "content", "inline"] }, { kind: "component", type: ActivityActionsComponent, selector: "aup-activity-actions", inputs: ["confirmCommand", "cancelCommand", "faces", "confirmFace", "cancelFace", "style", "layout", "align", "alignContent"] }, { kind: "component", type: ActivityTitleComponent, selector: "aup-activity-title", inputs: ["hasTransparentBackground", "color"] }, { kind: "component", type: ActivityBodyComponent, selector: "aup-activity-body", inputs: ["fullWidth"] }] });
+    static ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "16.2.9", type: ConfirmationDialogComponent, selector: "aup-confirmation-dialog", usesInheritance: true, ngImport: i0, template: "<aup-activity-title *ngIf=\"title\" [color]=\"color\"><aup-markdown [content]=\"title\" [inline]=\"true\"></aup-markdown></aup-activity-title>\n<aup-activity-body>\n  <aup-markdown *ngFor=\"let line of content\" [content]=\"line\"></aup-markdown>\n</aup-activity-body>\n<aup-activity-actions [confirmFace]=\"confirmFace\" [cancelFace]=\"cancelFace\"></aup-activity-actions>\n\n", styles: [":host{display:block}.mat-mdc-dialog-content{margin:0;padding:0}.mat-mdc-dialog-actions{margin-bottom:0!important;padding:0;align-items:flex-end;justify-content:flex-end}\n"], dependencies: [{ kind: "directive", type: i1$1.NgForOf, selector: "[ngFor][ngForOf]", inputs: ["ngForOf", "ngForTrackBy", "ngForTemplate"] }, { kind: "directive", type: i1$1.NgIf, selector: "[ngIf]", inputs: ["ngIf", "ngIfThen", "ngIfElse"] }, { kind: "component", type: MarkdownComponent, selector: "aup-markdown, [aupMarkdown]", inputs: ["content$", "content", "inline"] }, { kind: "component", type: ActivityActionsComponent, selector: "aup-activity-actions", inputs: ["confirmCommand", "cancelCommand", "faces", "confirmFace", "cancelFace", "style", "layout", "align"] }, { kind: "component", type: ActivityTitleComponent, selector: "aup-activity-title", inputs: ["hasTransparentBackground", "color"] }, { kind: "component", type: ActivityBodyComponent, selector: "aup-activity-body", inputs: ["fullWidth"] }] });
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.9", ngImport: i0, type: ConfirmationDialogComponent, decorators: [{
             type: Component,
@@ -9691,7 +9009,6 @@ class ActivityContainerComponent extends AbstractInteractionContext {
     tabs;
     activityOutlets;
     activityRefs = [];
-    animationDuration = "500ms";
     _identifier;
     _deferredCleanUp;
     interactionServiceApi;
@@ -9704,7 +9021,6 @@ class ActivityContainerComponent extends AbstractInteractionContext {
     busy = this.registerDisposable(new DelegatingValueModel().withDefault(false));
     syncTabsJob = undefined;
     stable$;
-    wasActive = false;
     constructor(placeRouter) {
         super();
         this.placeRouter = placeRouter;
@@ -9741,12 +9057,7 @@ class ActivityContainerComponent extends AbstractInteractionContext {
      * Returns true if an activity is currently running.
      */
     isActive() {
-        const isActive = this.getActiveActivityCount() > 0;
-        // if (this.wasActive !== isActive) {
-        //   console.log({was: this.wasActive, is: isActive});
-        // }
-        // this.wasActive = isActive
-        return isActive;
+        return this.getActiveActivityCount() > 0;
     }
     registerDisposable(disposable) {
         return this.garbage.registerDisposable(disposable);
@@ -9829,7 +9140,7 @@ class ActivityContainerComponent extends AbstractInteractionContext {
             // by activity index)
             setTimeout(() => {
                 this.activityRefs = []; // we have to do it after the animation timeout or the activity disappears before the animatin finsihes
-            }, this.getTabAnimationDurationInMillis());
+            }, this.getTabAnimationDuration());
             const promise = this.interactionServiceApi.notifyFinished(this);
             this._deferredCleanUp = promise
                 .finally(() => {
@@ -9855,6 +9166,7 @@ class ActivityContainerComponent extends AbstractInteractionContext {
     /**
      * Synchronises the selected tab index.
      */
+    // @Trace()
     synchroniseSelectedTabIndex() {
         assert.isTruthy(this.isActive());
         const previousIndex = this.tabs.selectedIndex;
@@ -9866,10 +9178,10 @@ class ActivityContainerComponent extends AbstractInteractionContext {
             activityRef.setFocused(false);
             this.busy.setDelegate(activityRef.activityBusy);
             this.tabs.selectedIndex = newIndex;
-            // if (this.ready$.value) {
-            //   // Note: We're not using the animation done event as it's firing almost immeadiately.
-            //   setTimeout(() => this.finaliseActivityStates(), animate ? this.getTabAnimationDurationInMillis() : 0);
-            // }
+            if (this.ready$.value) {
+                // Note: We're not using the animation done event as it's firing almost immeadiately.
+                setTimeout(() => this.finaliseActivityStates(), animate ? this.getTabAnimationDuration() : 0);
+            }
         }
     }
     finaliseActivityStates() {
@@ -9883,12 +9195,7 @@ class ActivityContainerComponent extends AbstractInteractionContext {
         return this.activityOutlets.toArray()[this.tabs.selectedIndex];
     }
     getTabAnimationDuration() {
-        // const s = this._started$.value ? this.animationDuration : "0";
-        // return s
-        return this.animationDuration;
-    }
-    getTabAnimationDurationInMillis() {
-        const match = this.animationDuration.match(/(\d+)(.*)/);
+        const match = this.tabs.animationDuration.match(/(\d+)(.*)/);
         const numericValue = parseFloat(match[1]);
         switch (match[2].trim()) {
             case "ms":
@@ -9914,16 +9221,12 @@ class ActivityContainerComponent extends AbstractInteractionContext {
             }
         }, 75);
     }
-    onAnimationDone() {
-        this._started$.value = true;
-        this.finaliseActivityStates();
-    }
     static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.9", ngImport: i0, type: ActivityContainerComponent, deps: [{ token: PlaceRouter }], target: i0.ɵɵFactoryTarget.Component });
-    static ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "16.2.9", type: ActivityContainerComponent, selector: "aup-activity-container", inputs: { dynamicHeight: "dynamicHeight", animationDuration: "animationDuration" }, viewQueries: [{ propertyName: "tabs", first: true, predicate: ["tabs"], descendants: true, static: true }, { propertyName: "activityOutlets", predicate: ActivityOutletComponent, descendants: true }], usesInheritance: true, ngImport: i0, template: "<mat-tab-group #tabs no-tab-header\n               [dynamicHeight]=\"dynamicHeight\"\n               [class.full-height-tabs]=\"!dynamicHeight\"\n               [animationDuration]=\"getTabAnimationDuration()\"\n               (animationDone)=\"onAnimationDone()\"\n>\n  <mat-tab *ngFor=\"let activityRef of activityRefs; let i = index; trackBy: activityIndex\">\n    <aup-busy-overlay [busy$]=\"busy\" cdkTrapFocus cdkTrapFocusAutoCapture>\n      <!--\n      We have issues where angular is triggering a leave animation when an\n      new activity is started, but is not running the enter animation\n      when it is scrolled back into view.  So we track the tab changes and\n      disable all animations inside the tab while we're animating.\n      -->\n      <div class=\"activity-outlet-wrapper\" [@.disabled]=\"!activityRef.focused\">\n        <aup-activity-outlet [nestedInteractionContext]=\"this\" [activityRef]=\"activityRef\"></aup-activity-outlet>\n      </div>\n    </aup-busy-overlay>\n  </mat-tab>\n</mat-tab-group>\n", styles: [":host{display:flex;flex-direction:column}mat-tab-group{flex:1}aup-busy-overlay{flex:1}.activity-outlet-wrapper{flex:1}\n"], dependencies: [{ kind: "directive", type: i1$1.NgForOf, selector: "[ngFor][ngForOf]", inputs: ["ngForOf", "ngForTrackBy", "ngForTemplate"] }, { kind: "component", type: i3$2.MatTab, selector: "mat-tab", inputs: ["disabled"], exportAs: ["matTab"] }, { kind: "component", type: i3$2.MatTabGroup, selector: "mat-tab-group", inputs: ["color", "disableRipple", "fitInkBarToContent", "mat-stretch-tabs"], exportAs: ["matTabGroup"] }, { kind: "component", type: BusyOverlayComponent, selector: "aup-busy-overlay", inputs: ["busy$", "busy"] }, { kind: "directive", type: i5$1.CdkTrapFocus, selector: "[cdkTrapFocus]", inputs: ["cdkTrapFocus", "cdkTrapFocusAutoCapture"], exportAs: ["cdkTrapFocus"] }, { kind: "component", type: ActivityOutletComponent, selector: "aup-activity-outlet", inputs: ["nestedInteractionContext", "activityRef"] }] });
+    static ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "16.2.9", type: ActivityContainerComponent, selector: "aup-activity-container", inputs: { dynamicHeight: "dynamicHeight" }, viewQueries: [{ propertyName: "tabs", first: true, predicate: ["tabs"], descendants: true, static: true }, { propertyName: "activityOutlets", predicate: ActivityOutletComponent, descendants: true }], usesInheritance: true, ngImport: i0, template: "<mat-tab-group #tabs no-tab-header\n               [dynamicHeight]=\"dynamicHeight\"\n               [class.full-height-tabs]=\"!dynamicHeight\">\n  <mat-tab *ngFor=\"let activityRef of activityRefs; let i = index; trackBy: activityIndex\">\n    <aup-busy-overlay [busy$]=\"busy\" cdkTrapFocus cdkTrapFocusAutoCapture>\n      <!--\n      We have issues where angular is triggering a leave animation when an\n      new activity is started, but is not running the enter animation\n      when it is scrolled back into view.  So we track the tab changes and\n      disable all animations inside the tab while we're animating.\n      -->\n      <div class=\"activity-outlet-wrapper\" [@.disabled]=\"!activityRef.focused\">\n        <aup-activity-outlet [nestedInteractionContext]=\"this\" [activityRef]=\"activityRef\"></aup-activity-outlet>\n      </div>\n    </aup-busy-overlay>\n  </mat-tab>\n</mat-tab-group>\n", styles: [":host{display:flex;flex-direction:column}mat-tab-group{flex:1}aup-busy-overlay{flex:1}.activity-outlet-wrapper{flex:1}\n"], dependencies: [{ kind: "directive", type: i1$1.NgForOf, selector: "[ngFor][ngForOf]", inputs: ["ngForOf", "ngForTrackBy", "ngForTemplate"] }, { kind: "component", type: i3$1.MatTab, selector: "mat-tab", inputs: ["disabled"], exportAs: ["matTab"] }, { kind: "component", type: i3$1.MatTabGroup, selector: "mat-tab-group", inputs: ["color", "disableRipple", "fitInkBarToContent", "mat-stretch-tabs"], exportAs: ["matTabGroup"] }, { kind: "component", type: BusyOverlayComponent, selector: "aup-busy-overlay", inputs: ["busy$", "busy"] }, { kind: "directive", type: i5$1.CdkTrapFocus, selector: "[cdkTrapFocus]", inputs: ["cdkTrapFocus", "cdkTrapFocusAutoCapture"], exportAs: ["cdkTrapFocus"] }, { kind: "component", type: ActivityOutletComponent, selector: "aup-activity-outlet", inputs: ["nestedInteractionContext", "activityRef"] }] });
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.9", ngImport: i0, type: ActivityContainerComponent, decorators: [{
             type: Component,
-            args: [{ selector: "aup-activity-container", template: "<mat-tab-group #tabs no-tab-header\n               [dynamicHeight]=\"dynamicHeight\"\n               [class.full-height-tabs]=\"!dynamicHeight\"\n               [animationDuration]=\"getTabAnimationDuration()\"\n               (animationDone)=\"onAnimationDone()\"\n>\n  <mat-tab *ngFor=\"let activityRef of activityRefs; let i = index; trackBy: activityIndex\">\n    <aup-busy-overlay [busy$]=\"busy\" cdkTrapFocus cdkTrapFocusAutoCapture>\n      <!--\n      We have issues where angular is triggering a leave animation when an\n      new activity is started, but is not running the enter animation\n      when it is scrolled back into view.  So we track the tab changes and\n      disable all animations inside the tab while we're animating.\n      -->\n      <div class=\"activity-outlet-wrapper\" [@.disabled]=\"!activityRef.focused\">\n        <aup-activity-outlet [nestedInteractionContext]=\"this\" [activityRef]=\"activityRef\"></aup-activity-outlet>\n      </div>\n    </aup-busy-overlay>\n  </mat-tab>\n</mat-tab-group>\n", styles: [":host{display:flex;flex-direction:column}mat-tab-group{flex:1}aup-busy-overlay{flex:1}.activity-outlet-wrapper{flex:1}\n"] }]
+            args: [{ selector: "aup-activity-container", template: "<mat-tab-group #tabs no-tab-header\n               [dynamicHeight]=\"dynamicHeight\"\n               [class.full-height-tabs]=\"!dynamicHeight\">\n  <mat-tab *ngFor=\"let activityRef of activityRefs; let i = index; trackBy: activityIndex\">\n    <aup-busy-overlay [busy$]=\"busy\" cdkTrapFocus cdkTrapFocusAutoCapture>\n      <!--\n      We have issues where angular is triggering a leave animation when an\n      new activity is started, but is not running the enter animation\n      when it is scrolled back into view.  So we track the tab changes and\n      disable all animations inside the tab while we're animating.\n      -->\n      <div class=\"activity-outlet-wrapper\" [@.disabled]=\"!activityRef.focused\">\n        <aup-activity-outlet [nestedInteractionContext]=\"this\" [activityRef]=\"activityRef\"></aup-activity-outlet>\n      </div>\n    </aup-busy-overlay>\n  </mat-tab>\n</mat-tab-group>\n", styles: [":host{display:flex;flex-direction:column}mat-tab-group{flex:1}aup-busy-overlay{flex:1}.activity-outlet-wrapper{flex:1}\n"] }]
         }], ctorParameters: function () { return [{ type: PlaceRouter }]; }, propDecorators: { dynamicHeight: [{
                 type: Input
             }], tabs: [{
@@ -9932,8 +9235,6 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.9", ngImpor
             }], activityOutlets: [{
                 type: ViewChildren,
                 args: [ActivityOutletComponent]
-            }], animationDuration: [{
-                type: Input
             }] } });
 
 class AbstractActivityTriggerComponent extends DisposableComponent {
@@ -10034,16 +9335,14 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.9", ngImpor
                 args: ['class.active']
             }] } });
 
-const INTERACTION_CONTEXT = new InjectionToken('interactionContext');
-
-const cssDurationRegex$1 = /(\d+)(m?s)/;
+const cssDurationRegex = /(\d+)(m?s)/;
 /**
  * @example
  *   <aup-in-place-interaction-context #inPlaceInteractionContext>
  *   </aup-in-place-interaction-context>
  *
  *   in your component
- *     @ViewChild(InPlaceInteractionContextComponent)
+ *     @ViewChild('inPlaceInteractionContext', { static: true })
  *     interactionContext: InteractionContext;
  *
  *
@@ -10062,13 +9361,11 @@ class InPlaceInteractionContextComponent extends DisposableComponent {
      * active interactions.
      */
     syncWithRoutes = true;
-    started = new EventEmitter();
-    finished = new EventEmitter();
     get animationDuration() {
         return this.animateFirstActivity ? (this.tabConfig?.animationDuration || "500ms") : "0ms";
     }
     get animationDurationMillis() {
-        const result = cssDurationRegex$1.exec(this.animationDuration);
+        const result = cssDurationRegex.exec(this.animationDuration);
         if (!result) {
             lang.illegalState(`unsupported css duration: ${this.animationDuration}`);
         }
@@ -10090,16 +9387,11 @@ class InPlaceInteractionContextComponent extends DisposableComponent {
             this.interactionService.registerInplaceInteractionContext(this);
         }
         else {
-            const self = this;
             this.activityContainerComponent.initialise("dont-care", {
                 async notifyActive(interactionContext) {
-                    self.started.emit();
                     return undefined;
                 },
                 async notifyFinished(interactionContext) {
-                    // I've noticed some rendering fails when returning the the transcluded content we'll fire an event
-                    // so components can do stuff if they need to.
-                    self.started.emit();
                     return undefined;
                 }
             });
@@ -10146,15 +9438,11 @@ class InPlaceInteractionContextComponent extends DisposableComponent {
         }
     }
     static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.9", ngImport: i0, type: InPlaceInteractionContextComponent, deps: [{ token: MAT_TABS_CONFIG, optional: true }], target: i0.ɵɵFactoryTarget.Component });
-    static ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "16.2.9", type: InPlaceInteractionContextComponent, selector: "aup-in-place-interaction-context", inputs: { animateFirstActivity: "animateFirstActivity", syncWithRoutes: "syncWithRoutes" }, outputs: { started: "started", finished: "finished" }, host: { properties: { "class.active": "this.active" } }, providers: [
-            { provide: INTERACTION_CONTEXT, useExisting: InPlaceInteractionContextComponent }
-        ], viewQueries: [{ propertyName: "activityContainerComponent", first: true, predicate: ["activityContainer"], descendants: true, static: true }], usesInheritance: true, ngImport: i0, template: "<mat-tab-group no-tab-header [selectedIndex]=\"isActive() ? 1 : 0\" full-height-tabs\n               (selectedTabChange)=\"onTabChanged($event)\"\n               [dynamicHeight]=\"false\"\n               [animationDuration]=\"animationDuration\">\n  <mat-tab>\n    <ng-content></ng-content>\n  </mat-tab>\n  <mat-tab>\n    <aup-activity-container #activityContainer [dynamicHeight]=\"false\"></aup-activity-container>\n  </mat-tab>\n</mat-tab-group>\n\n", styles: [":host{display:flex;flex-direction:column}mat-tab-group{flex:1}aup-activity-container{flex:1}\n"], dependencies: [{ kind: "component", type: i3$2.MatTab, selector: "mat-tab", inputs: ["disabled"], exportAs: ["matTab"] }, { kind: "component", type: i3$2.MatTabGroup, selector: "mat-tab-group", inputs: ["color", "disableRipple", "fitInkBarToContent", "mat-stretch-tabs"], exportAs: ["matTabGroup"] }, { kind: "component", type: ActivityContainerComponent, selector: "aup-activity-container", inputs: ["dynamicHeight", "animationDuration"] }] });
+    static ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "16.2.9", type: InPlaceInteractionContextComponent, selector: "aup-in-place-interaction-context", inputs: { animateFirstActivity: "animateFirstActivity", syncWithRoutes: "syncWithRoutes" }, host: { properties: { "class.active": "this.active" } }, viewQueries: [{ propertyName: "activityContainerComponent", first: true, predicate: ["activityContainer"], descendants: true, static: true }], usesInheritance: true, ngImport: i0, template: "<mat-tab-group no-tab-header [selectedIndex]=\"isActive() ? 1 : 0\" full-height-tabs\n               (selectedTabChange)=\"onTabChanged($event)\"\n               [dynamicHeight]=\"false\"\n               [animationDuration]=\"animationDuration\">\n  <mat-tab>\n    <ng-content></ng-content>\n  </mat-tab>\n  <mat-tab>\n    <aup-activity-container #activityContainer [dynamicHeight]=\"false\"></aup-activity-container>\n  </mat-tab>\n</mat-tab-group>\n\n", styles: [":host{display:flex;flex-direction:column}mat-tab-group{flex:1}aup-activity-container{flex:1}\n"], dependencies: [{ kind: "component", type: i3$1.MatTab, selector: "mat-tab", inputs: ["disabled"], exportAs: ["matTab"] }, { kind: "component", type: i3$1.MatTabGroup, selector: "mat-tab-group", inputs: ["color", "disableRipple", "fitInkBarToContent", "mat-stretch-tabs"], exportAs: ["matTabGroup"] }, { kind: "component", type: ActivityContainerComponent, selector: "aup-activity-container", inputs: ["dynamicHeight"] }] });
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.9", ngImport: i0, type: InPlaceInteractionContextComponent, decorators: [{
             type: Component,
-            args: [{ selector: "aup-in-place-interaction-context", providers: [
-                        { provide: INTERACTION_CONTEXT, useExisting: InPlaceInteractionContextComponent }
-                    ], template: "<mat-tab-group no-tab-header [selectedIndex]=\"isActive() ? 1 : 0\" full-height-tabs\n               (selectedTabChange)=\"onTabChanged($event)\"\n               [dynamicHeight]=\"false\"\n               [animationDuration]=\"animationDuration\">\n  <mat-tab>\n    <ng-content></ng-content>\n  </mat-tab>\n  <mat-tab>\n    <aup-activity-container #activityContainer [dynamicHeight]=\"false\"></aup-activity-container>\n  </mat-tab>\n</mat-tab-group>\n\n", styles: [":host{display:flex;flex-direction:column}mat-tab-group{flex:1}aup-activity-container{flex:1}\n"] }]
+            args: [{ selector: "aup-in-place-interaction-context", template: "<mat-tab-group no-tab-header [selectedIndex]=\"isActive() ? 1 : 0\" full-height-tabs\n               (selectedTabChange)=\"onTabChanged($event)\"\n               [dynamicHeight]=\"false\"\n               [animationDuration]=\"animationDuration\">\n  <mat-tab>\n    <ng-content></ng-content>\n  </mat-tab>\n  <mat-tab>\n    <aup-activity-container #activityContainer [dynamicHeight]=\"false\"></aup-activity-container>\n  </mat-tab>\n</mat-tab-group>\n\n", styles: [":host{display:flex;flex-direction:column}mat-tab-group{flex:1}aup-activity-container{flex:1}\n"] }]
         }], ctorParameters: function () { return [{ type: undefined, decorators: [{
                     type: Inject,
                     args: [MAT_TABS_CONFIG]
@@ -10167,10 +9455,6 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.9", ngImpor
                 type: Input
             }], syncWithRoutes: [{
                 type: Input
-            }], started: [{
-                type: Output
-            }], finished: [{
-                type: Output
             }], active: [{
                 type: HostBinding,
                 args: ["class.active"]
@@ -10185,7 +9469,7 @@ class InlineActivityTriggerComponent extends AbstractActivityTriggerComponent {
         super();
     }
     static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.9", ngImport: i0, type: InlineActivityTriggerComponent, deps: [], target: i0.ɵɵFactoryTarget.Component });
-    static ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "16.2.9", type: InlineActivityTriggerComponent, selector: "aup-inline-activity-trigger", viewQueries: [{ propertyName: "_interactionContext", first: true, predicate: InPlaceInteractionContextComponent, descendants: true, static: true }], usesInheritance: true, ngImport: i0, template: "<aup-in-place-interaction-context #interactionContext [animateFirstActivity]=\"false\">\n  <aup-command [command]=\"startActivityCommand\" [face$]=\"face$\" [alignFace]=\"alignFace\"></aup-command>\n</aup-in-place-interaction-context>\n", styles: [":host{display:inline-block}\n"], dependencies: [{ kind: "component", type: CommandComponent, selector: "aup-command", inputs: ["command", "face$", "face", "busyFace$", "busyFace", "alignFace"] }, { kind: "component", type: InPlaceInteractionContextComponent, selector: "aup-in-place-interaction-context", inputs: ["animateFirstActivity", "syncWithRoutes"], outputs: ["started", "finished"] }] });
+    static ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "16.2.9", type: InlineActivityTriggerComponent, selector: "aup-inline-activity-trigger", viewQueries: [{ propertyName: "_interactionContext", first: true, predicate: InPlaceInteractionContextComponent, descendants: true, static: true }], usesInheritance: true, ngImport: i0, template: "<aup-in-place-interaction-context #interactionContext [animateFirstActivity]=\"false\">\n  <aup-command [command]=\"startActivityCommand\" [face$]=\"face$\" [alignFace]=\"alignFace\"></aup-command>\n</aup-in-place-interaction-context>\n", styles: [":host{display:inline-block}\n"], dependencies: [{ kind: "component", type: CommandComponent, selector: "aup-command", inputs: ["command", "face$", "face", "busyFace$", "busyFace", "alignFace"] }, { kind: "component", type: InPlaceInteractionContextComponent, selector: "aup-in-place-interaction-context", inputs: ["animateFirstActivity", "syncWithRoutes"] }] });
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.9", ngImport: i0, type: InlineActivityTriggerComponent, decorators: [{
             type: Component,
@@ -10309,7 +9593,7 @@ class PopupInteractionContextComponent extends DisposableComponent {
     isActive() {
         return this.interactionContext && this.interactionContext.isActive();
     }
-    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.9", ngImport: i0, type: PopupInteractionContextComponent, deps: [{ token: i0.ElementRef }, { token: i1$6.Overlay }, { token: i1$6.CdkScrollable, optional: true, skipSelf: true }], target: i0.ɵɵFactoryTarget.Component });
+    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.9", ngImport: i0, type: PopupInteractionContextComponent, deps: [{ token: i0.ElementRef }, { token: i1$5.Overlay }, { token: i1$5.CdkScrollable, optional: true, skipSelf: true }], target: i0.ɵɵFactoryTarget.Component });
     static ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "16.2.9", type: PopupInteractionContextComponent, selector: "aup-popup-interaction-context", inputs: { anchorX: "anchorX", anchorY: "anchorY", cancelOnEscape$: "cancelOnEscape$", cancelOnEscape: "cancelOnEscape" }, host: { properties: { "class.interaction-active": "this.active" } }, usesInheritance: true, ngImport: i0, template: "<ng-content></ng-content>\n", styles: [":host{display:inline-block}:host.interaction-active{background:rgba(0,0,0,.05)}:host::ng-deep .popup-interaction-context-backdrop{background-color:#0000}\n"] });
 }
 __decorate([
@@ -10323,7 +9607,7 @@ __decorate([
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.9", ngImport: i0, type: PopupInteractionContextComponent, decorators: [{
             type: Component,
             args: [{ selector: 'aup-popup-interaction-context', template: "<ng-content></ng-content>\n", styles: [":host{display:inline-block}:host.interaction-active{background:rgba(0,0,0,.05)}:host::ng-deep .popup-interaction-context-backdrop{background-color:#0000}\n"] }]
-        }], ctorParameters: function () { return [{ type: i0.ElementRef }, { type: i1$6.Overlay }, { type: i1$6.CdkScrollable, decorators: [{
+        }], ctorParameters: function () { return [{ type: i0.ElementRef }, { type: i1$5.Overlay }, { type: i1$5.CdkScrollable, decorators: [{
                     type: Optional
                 }, {
                     type: SkipSelf
@@ -10408,7 +9692,7 @@ class AddCardActivityComponent extends AbstractActivityTriggerComponent {
         return this.interactionStyle === 'inline';
     }
     static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.9", ngImport: i0, type: AddCardActivityComponent, deps: [{ token: InteractionService }], target: i0.ɵɵFactoryTarget.Component });
-    static ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "16.2.9", type: AddCardActivityComponent, selector: "aup-add-card-activity", inputs: { interactionStyle: "interactionStyle", renderAs: "renderAs" }, host: { properties: { "class": "this.activityTypeClass", "class.not-card": "this.notCard" } }, viewQueries: [{ propertyName: "inlineInteractionContext", first: true, predicate: InPlaceInteractionContextComponent, descendants: true, static: true }], usesInheritance: true, ngImport: i0, template: "<aup-in-place-interaction-context [animateFirstActivity]=\"false\" [pectinCommand]=\"startActivityCommand\">\n  <aup-command *ngIf=\"isRenderAsButton()\" [command]=\"startActivityCommand\" [face$]=\"face$\" [alignFace]=\"alignFace\"></aup-command>\n  <section *ngIf=\"isRenderAsCard()\" class=\"face-wrapper\">\n    <aup-command-face class=\"mat-button\" [faces]=\"faceList.value\"></aup-command-face>\n  </section>\n</aup-in-place-interaction-context>\n", styles: [":host{display:flex;flex-direction:column;align-items:stretch;background-color:#fff}:host[interactionStyle=inline][renderas=card]:not(.active){transition:box-shadow .28s cubic-bezier(.4,0,.2,1);box-sizing:border-box;border:2px dashed rgba(0,0,0,.1);border-radius:6px;font-weight:300;cursor:pointer;color:#0000008a;background-color:#fffc}:host[interactionStyle=inline][renderas=card]:not(.active):hover{box-shadow:0 3px 1px -2px #0003,0 2px 2px #00000024,0 1px 5px #0000001f}:host[interactionStyle=inline][renderas=card]:not(.active):hover{border-color:transparent;background-color:#fff;color:#0000008a}:host[interactionStyle=modal][renderas=card]{transition:box-shadow .28s cubic-bezier(.4,0,.2,1);box-sizing:border-box;border:2px dashed rgba(0,0,0,.1);border-radius:6px;font-weight:300;cursor:pointer;color:#0000008a;background-color:#fffc}:host[interactionStyle=modal][renderas=card]:hover{box-shadow:0 3px 1px -2px #0003,0 2px 2px #00000024,0 1px 5px #0000001f}:host[interactionStyle=modal][renderas=card]:hover{border-color:transparent;background-color:#fff;color:#0000008a}:host-context(aup-card-container)[renderas=button]{align-self:start}section.face-wrapper{flex:1;display:flex;flex-direction:column;align-items:center;justify-content:center}aup-in-place-interaction-context{flex:1}aup-in-place-interaction-context.active{border:3px solid #6273c7;border-radius:4px;overflow:hidden}\n"], dependencies: [{ kind: "directive", type: i1$1.NgIf, selector: "[ngIf]", inputs: ["ngIf", "ngIfThen", "ngIfElse"] }, { kind: "directive", type: CommandDirective, selector: "[pectinCommand]", inputs: ["pectinCommand", "commandParameter"] }, { kind: "component", type: CommandComponent, selector: "aup-command", inputs: ["command", "face$", "face", "busyFace$", "busyFace", "alignFace"] }, { kind: "component", type: CommandFaceComponent, selector: "aup-command-face", inputs: ["faces", "face", "ignoreIcon", "ignoreText", "includeMissingIconInLayout"] }, { kind: "component", type: InPlaceInteractionContextComponent, selector: "aup-in-place-interaction-context", inputs: ["animateFirstActivity", "syncWithRoutes"], outputs: ["started", "finished"] }] });
+    static ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "16.2.9", type: AddCardActivityComponent, selector: "aup-add-card-activity", inputs: { interactionStyle: "interactionStyle", renderAs: "renderAs" }, host: { properties: { "class": "this.activityTypeClass", "class.not-card": "this.notCard" } }, viewQueries: [{ propertyName: "inlineInteractionContext", first: true, predicate: InPlaceInteractionContextComponent, descendants: true, static: true }], usesInheritance: true, ngImport: i0, template: "<aup-in-place-interaction-context [animateFirstActivity]=\"false\" [pectinCommand]=\"startActivityCommand\">\n  <aup-command *ngIf=\"isRenderAsButton()\" [command]=\"startActivityCommand\" [face$]=\"face$\" [alignFace]=\"alignFace\"></aup-command>\n  <section *ngIf=\"isRenderAsCard()\" class=\"face-wrapper\">\n    <aup-command-face class=\"mat-button\" [faces]=\"faceList.value\"></aup-command-face>\n  </section>\n</aup-in-place-interaction-context>\n", styles: [":host{display:flex;flex-direction:column;align-items:stretch;background-color:#fff}:host[interactionStyle=inline][renderas=card]:not(.active){transition:box-shadow .28s cubic-bezier(.4,0,.2,1);box-sizing:border-box;border:2px dashed rgba(0,0,0,.1);border-radius:6px;font-weight:300;cursor:pointer;color:#0000008a;background-color:#fffc}:host[interactionStyle=inline][renderas=card]:not(.active):hover{box-shadow:0 3px 1px -2px #0003,0 2px 2px #00000024,0 1px 5px #0000001f}:host[interactionStyle=inline][renderas=card]:not(.active):hover{border-color:transparent;background-color:#fff;color:#0000008a}:host[interactionStyle=modal][renderas=card]{transition:box-shadow .28s cubic-bezier(.4,0,.2,1);box-sizing:border-box;border:2px dashed rgba(0,0,0,.1);border-radius:6px;font-weight:300;cursor:pointer;color:#0000008a;background-color:#fffc}:host[interactionStyle=modal][renderas=card]:hover{box-shadow:0 3px 1px -2px #0003,0 2px 2px #00000024,0 1px 5px #0000001f}:host[interactionStyle=modal][renderas=card]:hover{border-color:transparent;background-color:#fff;color:#0000008a}:host-context(aup-card-container)[renderas=button]{align-self:start}section.face-wrapper{flex:1;display:flex;flex-direction:column;align-items:center;justify-content:center}aup-in-place-interaction-context{flex:1}aup-in-place-interaction-context.active{border:3px solid #6273c7;border-radius:4px;overflow:hidden}\n"], dependencies: [{ kind: "directive", type: i1$1.NgIf, selector: "[ngIf]", inputs: ["ngIf", "ngIfThen", "ngIfElse"] }, { kind: "directive", type: CommandDirective, selector: "[pectinCommand]", inputs: ["pectinCommand", "commandParameter"] }, { kind: "component", type: CommandComponent, selector: "aup-command", inputs: ["command", "face$", "face", "busyFace$", "busyFace", "alignFace"] }, { kind: "component", type: CommandFaceComponent, selector: "aup-command-face", inputs: ["faces", "face", "ignoreIcon", "ignoreText", "includeMissingIconInLayout"] }, { kind: "component", type: InPlaceInteractionContextComponent, selector: "aup-in-place-interaction-context", inputs: ["animateFirstActivity", "syncWithRoutes"] }] });
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.9", ngImport: i0, type: AddCardActivityComponent, decorators: [{
             type: Component,
@@ -10484,7 +9768,7 @@ class AddItemInteractionContextComponent extends DisposableComponent {
         return this.interactionContext.startActivity(activityType, data);
     }
     static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.9", ngImport: i0, type: AddItemInteractionContextComponent, deps: [], target: i0.ɵɵFactoryTarget.Component });
-    static ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "16.2.9", type: AddItemInteractionContextComponent, selector: "aup-add-item-interaction-context", inputs: { label: "label", icon: "icon", activityClass: "activityClass", activityData: "activityData", addCommand: "addCommand" }, host: { properties: { "class.interaction-active": "this.active", "tabindex": "this.tabindex" } }, viewQueries: [{ propertyName: "interactionContext", first: true, predicate: InPlaceInteractionContextComponent, descendants: true }], usesInheritance: true, ngImport: i0, template: "<aup-in-place-interaction-context [animateFirstActivity]=\"false\">\n    <a part=\"link\" class=\"link\" [pectinCommand]=\"clickCommand\"><aup-icon [icon]=\"icon\"></aup-icon> {{label}}</a>\n</aup-in-place-interaction-context>\n", styles: [":host{--def-link-color: var(--link-color, currentColor);--def-link-color-hover: var(--link-color-hover, currentColor);--def-link-background: var(--link-background, transparent);--def-link-background-hover: var(--link-background-hover, rgba(0, 0, 0, .05));--def-link-border-radius: var(--link-border-radius, 4px);--def-link-padding: var(--link-padding, calc(var(--aup-default-padding) / 2));display:flex;flex-direction:column;border-radius:var(--def-link-border-radius);box-sizing:border-box;outline:none}:host:hover a.link{color:var(--def-link-color-hover);background-color:var(--def-link-background-hover)}aup-in-place-interaction-context{border-radius:var(--def-link-border-radius)}a.link{display:flex;flex-direction:row;align-items:center;border-radius:var(--def-link-border-radius);color:var(--def-link-color);background:var(--def-link-background);padding:var(--def-link-padding);cursor:pointer;text-decoration:none}a.link mat-icon{margin-right:8px}\n"], dependencies: [{ kind: "directive", type: CommandDirective, selector: "[pectinCommand]", inputs: ["pectinCommand", "commandParameter"] }, { kind: "component", type: IconComponent, selector: "aup-icon", inputs: ["icon"] }, { kind: "component", type: InPlaceInteractionContextComponent, selector: "aup-in-place-interaction-context", inputs: ["animateFirstActivity", "syncWithRoutes"], outputs: ["started", "finished"] }] });
+    static ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "16.2.9", type: AddItemInteractionContextComponent, selector: "aup-add-item-interaction-context", inputs: { label: "label", icon: "icon", activityClass: "activityClass", activityData: "activityData", addCommand: "addCommand" }, host: { properties: { "class.interaction-active": "this.active", "tabindex": "this.tabindex" } }, viewQueries: [{ propertyName: "interactionContext", first: true, predicate: InPlaceInteractionContextComponent, descendants: true }], usesInheritance: true, ngImport: i0, template: "<aup-in-place-interaction-context [animateFirstActivity]=\"false\">\n    <a part=\"link\" class=\"link\" [pectinCommand]=\"clickCommand\"><aup-icon [icon]=\"icon\"></aup-icon> {{label}}</a>\n</aup-in-place-interaction-context>\n", styles: [":host{--def-link-color: var(--link-color, currentColor);--def-link-color-hover: var(--link-color-hover, currentColor);--def-link-background: var(--link-background, transparent);--def-link-background-hover: var(--link-background-hover, rgba(0, 0, 0, .05));--def-link-border-radius: var(--link-border-radius, 4px);--def-link-padding: var(--link-padding, calc(var(--aup-default-padding) / 2));display:flex;flex-direction:column;border-radius:var(--def-link-border-radius);box-sizing:border-box;outline:none}:host:hover a.link{color:var(--def-link-color-hover);background-color:var(--def-link-background-hover)}aup-in-place-interaction-context{border-radius:var(--def-link-border-radius)}a.link{display:flex;flex-direction:row;align-items:center;border-radius:var(--def-link-border-radius);color:var(--def-link-color);background:var(--def-link-background);padding:var(--def-link-padding);cursor:pointer;text-decoration:none}a.link mat-icon{margin-right:8px}\n"], dependencies: [{ kind: "directive", type: CommandDirective, selector: "[pectinCommand]", inputs: ["pectinCommand", "commandParameter"] }, { kind: "component", type: IconComponent, selector: "aup-icon", inputs: ["icon"] }, { kind: "component", type: InPlaceInteractionContextComponent, selector: "aup-in-place-interaction-context", inputs: ["animateFirstActivity", "syncWithRoutes"] }] });
 }
 __decorate([
     Proxify(),
@@ -10623,14 +9907,12 @@ class StringInputActivity extends InputActivity {
                         [label]="activityData.label"
                         [placeholder]="activityData.placeholder"
                         [command.enter]="confirmCommand"
-                        [command.escape]="cancelCommand"
-                        [dense]="true"
-      ></aup-string-input>
+                        [command.escape]="cancelCommand"></aup-string-input>
       <aup-activity-actions [layout]="layout" align="end"
                             [confirmFace]="confirmFace"
                             [cancelFace]="cancelFace"
       ></aup-activity-actions>
-  `, isInline: true, dependencies: [{ kind: "component", type: StringInputComponent, selector: "aup-string-input", inputs: ["autocomplete", "enableClear$", "enableClear", "iconPrefix", "suffixCommand"] }, { kind: "component", type: ActivityActionsComponent, selector: "aup-activity-actions", inputs: ["confirmCommand", "cancelCommand", "faces", "confirmFace", "cancelFace", "style", "layout", "align", "alignContent"] }] });
+  `, isInline: true, dependencies: [{ kind: "component", type: StringInputComponent, selector: "aup-string-input", inputs: ["autocomplete", "enableClear$", "enableClear", "iconPrefix"] }, { kind: "component", type: ActivityActionsComponent, selector: "aup-activity-actions", inputs: ["confirmCommand", "cancelCommand", "faces", "confirmFace", "cancelFace", "style", "layout", "align"] }] });
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.9", ngImport: i0, type: StringInputActivity, decorators: [{
             type: Component,
@@ -10641,9 +9923,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.9", ngImpor
                         [label]="activityData.label"
                         [placeholder]="activityData.placeholder"
                         [command.enter]="confirmCommand"
-                        [command.escape]="cancelCommand"
-                        [dense]="true"
-      ></aup-string-input>
+                        [command.escape]="cancelCommand"></aup-string-input>
       <aup-activity-actions [layout]="layout" align="end"
                             [confirmFace]="confirmFace"
                             [cancelFace]="cancelFace"
@@ -10826,7 +10106,7 @@ class InlineStringEditorComponent extends DisposableComponent {
         return !this.editingEnabled$.value;
     }
     static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.9", ngImport: i0, type: InlineStringEditorComponent, deps: [{ token: InteractionService }], target: i0.ɵɵFactoryTarget.Component });
-    static ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "16.2.9", type: InlineStringEditorComponent, selector: "aup-inline-string-editor", inputs: { editorModel: "editorModel", facesModel: "facesModel", faces: "faces", label: "label", placeHolder: "placeHolder", placeHolder$: "placeHolder$" }, host: { properties: { "class.disabled": "this.isDisabled" } }, viewQueries: [{ propertyName: "interactionContext", first: true, predicate: InPlaceInteractionContextComponent, descendants: true }], usesInheritance: true, ngImport: i0, template: "<div class=\"container\" *ngIf=\"!editorModel.isEditing()\">\n  <mat-form-field floatLabel=\"always\" (click)=\"startEdit()\"\n                  [class.editable]=\"editingEnabled$.value\" [class.empty]=\"isEmpty()\">\n    <mat-label *ngIf=\"label\">{{label}}</mat-label>\n    <input matInput\n           placeholder=\"{{placeHolder}}\"\n           [ngModel]=\"editorModel.valueModel.value\"\n           [disabled]=\"true\"\n    >\n    <!--    <mat-hint *ngIf=\"showHint\">{{hint}}</mat-hint>-->\n    <!--    <mat-error *ngIf=\"hasErrors\">{{firstError}}</mat-error>-->\n    <!--    <aup-icon *ngIf=\"iconPrefix\" matPrefix [icon]=\"iconPrefix\"></aup-icon>-->\n  </mat-form-field>\n  <aup-command *ngIf=\"editCommand.enabled$.value\" [command]=\"editCommand\" [face$]=\"editFaceModel\"></aup-command>\n</div>\n<aup-in-place-interaction-context [animateFirstActivity]=\"false\"></aup-in-place-interaction-context>\n", dependencies: [{ kind: "directive", type: i1$1.NgIf, selector: "[ngIf]", inputs: ["ngIf", "ngIfThen", "ngIfElse"] }, { kind: "component", type: CommandComponent, selector: "aup-command", inputs: ["command", "face$", "face", "busyFace$", "busyFace", "alignFace"] }, { kind: "directive", type: i2$4.DefaultValueAccessor, selector: "input:not([type=checkbox])[formControlName],textarea[formControlName],input:not([type=checkbox])[formControl],textarea[formControl],input:not([type=checkbox])[ngModel],textarea[ngModel],[ngDefaultControl]" }, { kind: "directive", type: i2$4.NgControlStatus, selector: "[formControlName],[ngModel],[formControl]" }, { kind: "directive", type: i2$4.NgModel, selector: "[ngModel]:not([formControlName]):not([formControl])", inputs: ["name", "disabled", "ngModel", "ngModelOptions"], outputs: ["ngModelChange"], exportAs: ["ngModel"] }, { kind: "directive", type: i3.MatInput, selector: "input[matInput], textarea[matInput], select[matNativeControl],      input[matNativeControl], textarea[matNativeControl]", inputs: ["disabled", "id", "placeholder", "name", "required", "type", "errorStateMatcher", "aria-describedby", "value", "readonly"], exportAs: ["matInput"] }, { kind: "component", type: i4$2.MatFormField, selector: "mat-form-field", inputs: ["hideRequiredMarker", "color", "floatLabel", "appearance", "subscriptSizing", "hintLabel"], exportAs: ["matFormField"] }, { kind: "directive", type: i4$2.MatLabel, selector: "mat-label" }, { kind: "component", type: InPlaceInteractionContextComponent, selector: "aup-in-place-interaction-context", inputs: ["animateFirstActivity", "syncWithRoutes"], outputs: ["started", "finished"] }] });
+    static ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "16.2.9", type: InlineStringEditorComponent, selector: "aup-inline-string-editor", inputs: { editorModel: "editorModel", facesModel: "facesModel", faces: "faces", label: "label", placeHolder: "placeHolder", placeHolder$: "placeHolder$" }, host: { properties: { "class.disabled": "this.isDisabled" } }, viewQueries: [{ propertyName: "interactionContext", first: true, predicate: InPlaceInteractionContextComponent, descendants: true }], usesInheritance: true, ngImport: i0, template: "<div class=\"container\" *ngIf=\"!editorModel.isEditing()\">\n  <mat-form-field floatLabel=\"always\" (click)=\"startEdit()\"\n                  [class.editable]=\"editingEnabled$.value\" [class.empty]=\"isEmpty()\">\n    <mat-label *ngIf=\"label\">{{label}}</mat-label>\n    <input matInput\n           placeholder=\"{{placeHolder}}\"\n           [ngModel]=\"editorModel.valueModel.value\"\n           [disabled]=\"true\"\n    >\n    <!--    <mat-hint *ngIf=\"showHint\">{{hint}}</mat-hint>-->\n    <!--    <mat-error *ngIf=\"hasErrors\">{{firstError}}</mat-error>-->\n    <!--    <aup-icon *ngIf=\"iconPrefix\" matPrefix [icon]=\"iconPrefix\"></aup-icon>-->\n  </mat-form-field>\n  <aup-command *ngIf=\"editCommand.enabled$.value\" [command]=\"editCommand\" [face$]=\"editFaceModel\"></aup-command>\n</div>\n<aup-in-place-interaction-context [animateFirstActivity]=\"false\"></aup-in-place-interaction-context>\n", dependencies: [{ kind: "directive", type: i1$1.NgIf, selector: "[ngIf]", inputs: ["ngIf", "ngIfThen", "ngIfElse"] }, { kind: "component", type: CommandComponent, selector: "aup-command", inputs: ["command", "face$", "face", "busyFace$", "busyFace", "alignFace"] }, { kind: "directive", type: i2$4.DefaultValueAccessor, selector: "input:not([type=checkbox])[formControlName],textarea[formControlName],input:not([type=checkbox])[formControl],textarea[formControl],input:not([type=checkbox])[ngModel],textarea[ngModel],[ngDefaultControl]" }, { kind: "directive", type: i2$4.NgControlStatus, selector: "[formControlName],[ngModel],[formControl]" }, { kind: "directive", type: i2$4.NgModel, selector: "[ngModel]:not([formControlName]):not([formControl])", inputs: ["name", "disabled", "ngModel", "ngModelOptions"], outputs: ["ngModelChange"], exportAs: ["ngModel"] }, { kind: "directive", type: i3.MatInput, selector: "input[matInput], textarea[matInput], select[matNativeControl],      input[matNativeControl], textarea[matNativeControl]", inputs: ["disabled", "id", "placeholder", "name", "required", "type", "errorStateMatcher", "aria-describedby", "value", "readonly"], exportAs: ["matInput"] }, { kind: "component", type: i4$2.MatFormField, selector: "mat-form-field", inputs: ["hideRequiredMarker", "color", "floatLabel", "appearance", "subscriptSizing", "hintLabel"], exportAs: ["matFormField"] }, { kind: "directive", type: i4$2.MatLabel, selector: "mat-label" }, { kind: "component", type: InPlaceInteractionContextComponent, selector: "aup-in-place-interaction-context", inputs: ["animateFirstActivity", "syncWithRoutes"] }] });
 }
 __decorate([
     Proxify(),
@@ -10909,7 +10189,6 @@ class SelectInputActivity extends InputActivity {
                       [options]="options"
                       [optionLabelFormat]="optionLabelFormat"
                       [allowNil]="activityData.allowNil"
-                      [dense]="true"
     >
       <ng-template #nilOptionTemplate>{{activityData.nilLabel}}</ng-template>
     </aup-select-input>
@@ -10917,7 +10196,7 @@ class SelectInputActivity extends InputActivity {
                           [confirmFace]="confirmFace"
                           [cancelFace]="cancelFace"
     ></aup-activity-actions>
-  `, isInline: true, dependencies: [{ kind: "component", type: SelectInputComponent, selector: "aup-select-input", inputs: ["options$", "options", "optionLabel", "allowNil", "optionLabelFormat"] }, { kind: "component", type: ActivityActionsComponent, selector: "aup-activity-actions", inputs: ["confirmCommand", "cancelCommand", "faces", "confirmFace", "cancelFace", "style", "layout", "align", "alignContent"] }] });
+  `, isInline: true, dependencies: [{ kind: "component", type: SelectInputComponent, selector: "aup-select-input", inputs: ["options$", "options", "optionLabel", "allowNil", "optionLabelFormat"] }, { kind: "component", type: ActivityActionsComponent, selector: "aup-activity-actions", inputs: ["confirmCommand", "cancelCommand", "faces", "confirmFace", "cancelFace", "style", "layout", "align"] }] });
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.9", ngImport: i0, type: SelectInputActivity, decorators: [{
             type: Component,
@@ -10932,7 +10211,6 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.9", ngImpor
                       [options]="options"
                       [optionLabelFormat]="optionLabelFormat"
                       [allowNil]="activityData.allowNil"
-                      [dense]="true"
     >
       <ng-template #nilOptionTemplate>{{activityData.nilLabel}}</ng-template>
     </aup-select-input>
@@ -10944,186 +10222,6 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.9", ngImpor
                 }]
         }] });
 
-const slideDownOnEnterDef = style({
-    opacity: 0,
-    'height': '0',
-    'max-height': '0',
-    paddingTop: '0',
-    paddingBottom: '0'
-});
-const slideLeftOnEnterDef = style({
-    opacity: 0,
-    'width': '0',
-    paddingLeft: '0',
-    paddingRight: '0'
-});
-const ZERO_WIDTH = {
-    opacity: 0,
-    width: '0',
-    paddingLeft: '0',
-    paddingRight: '0',
-};
-const ZERO_HEIGHT = {
-    opacity: 0,
-    height: '0',
-    paddingTop: '0',
-    paddingBottom: '0',
-};
-// TODO: params aren't getting customised in the view.  Need to figure out the correct approach.
-const slideDownOnEnterAnimation = trigger('slideDownOnEnter', [
-    transition(':enter', [slideDownOnEnterDef, animate('{{duration}}')], { params: { duration: '100ms' } }),
-    transition(':leave', [animate('{{duration}}', slideDownOnEnterDef)], { params: { duration: '100ms' } })
-]);
-const slideDownWhenOpenAnimation = trigger('slideDownWhenOpen', [
-    transition('closed => open', [slideDownOnEnterDef, animate('{{duration}}')], { params: { duration: '100ms' } }),
-    transition('open => closed', [animate('{{duration}}', slideDownOnEnterDef)], { params: { duration: '100ms' } })
-]);
-const slideRightOnEnterAnimation = trigger('slideRightOnEnter', [
-    transition(':enter', [slideLeftOnEnterDef, animate('{{duration}}')], { params: { duration: '100ms' } }),
-    transition(':leave', [animate('{{duration}}', slideLeftOnEnterDef)], { params: { duration: '100ms' } })
-]);
-const slideDownAndRightOnEnterAnimation = trigger('slideDownAndRightOnEnter', [
-    transition(':enter', [
-        style({ overflow: "hidden", whiteSpace: "nowrap", ...ZERO_WIDTH, ...ZERO_HEIGHT }),
-        animate('{{duration}}')
-    ], { params: { duration: '100ms' } }),
-    transition(':leave', [
-        style({ overflow: "hidden", whiteSpace: "nowrap" }),
-        group([
-            animate('{{duration}}', style(ZERO_HEIGHT)),
-            // Hack: 100ms is too quick as it animates from * - 0 as we only see it animate the width is greater than the parent.
-            // Not sure how to animate from * to natural new width of parent.  This hack won't work for text that's just a little
-            // bit wider than the parent as it'll fall within the parent bounds very early in the animation cycle.
-            animate('300ms', style(ZERO_WIDTH)),
-        ])
-    ], { params: { duration: '100ms' } })
-]);
-
-const cssDurationRegex = /(\d+)(m?s)/;
-/**
- * This interaction context remains hidden (height: 0) until it is active.
- * @example
- *   <aup-slide-down-interaction-context #inPlaceInteractionContext>
- *   </aup-slide-down-interaction-context>
- *
- *   in your component
- *     @ViewChild(SlideDownInteractionContextComponent)
- *     interactionContext: InteractionContext;
- *
- *
- */
-class SlideDownInteractionContextComponent extends DisposableComponent {
-    tabConfig;
-    activityContainerComponent;
-    // NOTE: disabling this as I'm using the initialise callback to release the hacky height clamp.
-    //       The whole registration thing is a bit naf so I should really clean that up at some point.
-    // /**
-    //  * If true the activity will sync with the router to enable back button support.  This is a work around for
-    //  * deeply nested activities that can't be linked with the root place interactionContext hook for cancelling
-    //  * active interactions.
-    //  */
-    // @Input()
-    // syncWithRoutes = true;
-    dynamicHeight = true;
-    get active() {
-        return this.isActive();
-    }
-    // Horrible hack to stop the div and activity container bouncing back for a bit in after closing.  No idea why it's doing that.
-    clampShut = true;
-    interactionService = this.inject(InteractionService);
-    constructor(tabConfig) {
-        super();
-        this.tabConfig = tabConfig;
-    }
-    ngAfterViewInit() {
-        // NOTE: this is a temp work around to detach inplace contexts from the router until AUP-88 is implemented.
-        // https://coolon.atlassian.net/browse/AUP-88?atlOrigin=eyJpIjoiOTg5YjEzZGUzZjRmNDg0NmExOWU3ZGJmMzJiNTRmNGYiLCJwIjoiaiJ9
-        const self = this;
-        this.activityContainerComponent.initialise("dont-care", {
-            async notifyActive(interactionContext) {
-                self.clampShut = false;
-                return undefined;
-            },
-            async notifyFinished(interactionContext) {
-                return undefined;
-            }
-        });
-        // if (this.syncWithRoutes) {
-        //   this.interactionService.registerInplaceInteractionContext(this);
-        // }
-    }
-    getAnimationState() {
-        return {
-            value: this.isActive() ? "open" : "closed",
-            params: { duration: "200ms" }
-        };
-    }
-    // this is a regsitration callback from the interaction service
-    // @Trace() // webstorm says no usages... but I'm not sure.
-    onInplaceInteractionContextRegistered(id, api) {
-        this.activityContainerComponent.initialise(id, api);
-    }
-    get identifier() {
-        return this.activityContainerComponent.identifier;
-    }
-    alert(alert) {
-        return this.activityContainerComponent.alert(alert);
-    }
-    cancelActiveActivity() {
-        return this.activityContainerComponent.cancelActiveActivity();
-    }
-    confirm(confirm) {
-        return this.activityContainerComponent.confirm(confirm);
-    }
-    confirmOrReject(confirm) {
-        return this.activityContainerComponent.confirmOrReject(confirm);
-    }
-    confirmThen(confirm, activityType, data) {
-        return this.activityContainerComponent.confirmThen(confirm, activityType);
-    }
-    confirmThenExecute(confirm, operation) {
-        return this.activityContainerComponent.confirmThenExecute(confirm, operation);
-    }
-    isActive() {
-        return this.activityContainerComponent.isActive();
-    }
-    startActivity(activityType, data, options) {
-        return this.activityContainerComponent.startActivity(activityType, data, options);
-    }
-    onAnimationDone() {
-        if (!this.isActive()) {
-            this.clampShut = true;
-        }
-    }
-    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.9", ngImport: i0, type: SlideDownInteractionContextComponent, deps: [{ token: MAT_TABS_CONFIG, optional: true }], target: i0.ɵɵFactoryTarget.Component });
-    static ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "16.2.9", type: SlideDownInteractionContextComponent, selector: "aup-slide-down-interaction-context", inputs: { dynamicHeight: "dynamicHeight" }, host: { properties: { "class.active": "this.active" } }, providers: [
-            { provide: INTERACTION_CONTEXT, useExisting: SlideDownInteractionContextComponent }
-        ], viewQueries: [{ propertyName: "activityContainerComponent", first: true, predicate: ["activityContainer"], descendants: true, static: true }], usesInheritance: true, ngImport: i0, template: "<div [@slideDownWhenOpen]=\"getAnimationState()\" (@slideDownWhenOpen.done)=\"onAnimationDone()\" [style.max-height.px]=\"clampShut ? 0 : undefined\">\n  <aup-activity-container #activityContainer  [dynamicHeight]=\"dynamicHeight\"></aup-activity-container>\n</div>\n\n", styles: [":host{display:flex;flex-direction:column}:host>div{overflow:hidden}\n"], dependencies: [{ kind: "component", type: ActivityContainerComponent, selector: "aup-activity-container", inputs: ["dynamicHeight", "animationDuration"] }], animations: [
-            slideDownWhenOpenAnimation
-        ] });
-}
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.9", ngImport: i0, type: SlideDownInteractionContextComponent, decorators: [{
-            type: Component,
-            args: [{ selector: "aup-slide-down-interaction-context", providers: [
-                        { provide: INTERACTION_CONTEXT, useExisting: SlideDownInteractionContextComponent }
-                    ], animations: [
-                        slideDownWhenOpenAnimation
-                    ], template: "<div [@slideDownWhenOpen]=\"getAnimationState()\" (@slideDownWhenOpen.done)=\"onAnimationDone()\" [style.max-height.px]=\"clampShut ? 0 : undefined\">\n  <aup-activity-container #activityContainer  [dynamicHeight]=\"dynamicHeight\"></aup-activity-container>\n</div>\n\n", styles: [":host{display:flex;flex-direction:column}:host>div{overflow:hidden}\n"] }]
-        }], ctorParameters: function () { return [{ type: undefined, decorators: [{
-                    type: Inject,
-                    args: [MAT_TABS_CONFIG]
-                }, {
-                    type: Optional
-                }] }]; }, propDecorators: { activityContainerComponent: [{
-                type: ViewChild,
-                args: ["activityContainer", { static: true }]
-            }], dynamicHeight: [{
-                type: Input
-            }], active: [{
-                type: HostBinding,
-                args: ["class.active"]
-            }] } });
-
 class InteractionContextTriggerForDirective extends GarbageCollector {
     aupInteractionContextTriggerFor;
     activityClass;
@@ -11206,7 +10304,6 @@ class InteractionModule {
             AlertDialogComponent,
             ActivityOutletComponent,
             InPlaceInteractionContextComponent,
-            SlideDownInteractionContextComponent,
             AddItemInteractionContextComponent,
             ActivityActionsComponent,
             PopupInteractionContextComponent,
@@ -11233,6 +10330,8 @@ class InteractionModule {
             RouterModule,
             MatIconModule,
             DirectivesModule,
+            FlexModule,
+            GridModule,
             ComponentsModule,
             FormsModule,
             MatInputModule,
@@ -11252,8 +10351,7 @@ class InteractionModule {
             InlineActivityTriggerComponent,
             ModalActivityTriggerComponent,
             AddCardActivityComponent,
-            InlineStringEditorComponent,
-            SlideDownInteractionContextComponent] });
+            InlineStringEditorComponent] });
     static ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "16.2.9", ngImport: i0, type: InteractionModule, providers: [
             InteractionService
             // {
@@ -11267,6 +10365,8 @@ class InteractionModule {
             RouterModule,
             MatIconModule,
             DirectivesModule,
+            FlexModule,
+            GridModule,
             ComponentsModule,
             FormsModule,
             MatInputModule,
@@ -11285,6 +10385,8 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.9", ngImpor
                         RouterModule,
                         MatIconModule,
                         DirectivesModule,
+                        FlexModule,
+                        GridModule,
                         ComponentsModule,
                         FormsModule,
                         MatInputModule,
@@ -11299,7 +10401,6 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.9", ngImpor
                         AlertDialogComponent,
                         ActivityOutletComponent,
                         InPlaceInteractionContextComponent,
-                        SlideDownInteractionContextComponent,
                         AddItemInteractionContextComponent,
                         ActivityActionsComponent,
                         PopupInteractionContextComponent,
@@ -11337,7 +10438,6 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.9", ngImpor
                         ModalActivityTriggerComponent,
                         AddCardActivityComponent,
                         InlineStringEditorComponent,
-                        SlideDownInteractionContextComponent,
                     ],
                     providers: [
                         InteractionService
@@ -11408,6 +10508,7 @@ class PlaceOutletComponent extends DisposableComponent {
     router;
     placeRouter;
     placeConfig;
+    cdr;
     #animate$_accessor_storage = proxify((ValueModel));
     get animate$() { return this.#animate$_accessor_storage; }
     set animate$(value) { this.#animate$_accessor_storage = value; }
@@ -11441,11 +10542,12 @@ class PlaceOutletComponent extends DisposableComponent {
     animationEnabled;
     authorised;
     notAuthorisedNoticePortal;
-    constructor(router, placeRouter, placeConfig, unauthorisedPlaceNotice, parentOutlet) {
+    constructor(router, placeRouter, placeConfig, unauthorisedPlaceNotice, parentOutlet, cdr) {
         super();
         this.router = router;
         this.placeRouter = placeRouter;
         this.placeConfig = placeConfig;
+        this.cdr = cdr;
         const { chain, valueOf, before, when, after, observe, switchOn } = Dsl.disposeWith(this);
         this.parentOutletModel = new MutableValueModel(parentOutlet);
         const defaultPlaceAnimationOrder = chain(this.parentOutletModel)
@@ -11457,7 +10559,7 @@ class PlaceOutletComponent extends DisposableComponent {
         this.placesInAnimationOrder = chain(this.customPlaceAnimationOrder$)
             .otherwise(defaultPlaceAnimationOrder);
         this.activePlaceAnimationPosition = this.placesInAnimationOrder
-            .reduceAll((placesInOrder) => {
+            .reduce((placesInOrder) => {
             let placeIndex = 0;
             if (activatePlaceType.value) {
                 placeIndex = placesInOrder.indexOf(activatePlaceType.value);
@@ -11611,8 +10713,8 @@ class PlaceOutletComponent extends DisposableComponent {
             this.onAnimationFinishedJob = undefined;
         }
     }
-    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.9", ngImport: i0, type: PlaceOutletComponent, deps: [{ token: i1$5.Router }, { token: PlaceRouter }, { token: AUP_PLACE_CONFIG, optional: true }, { token: AUP_UNAUTHORISED_PLACE_NOTICE_COMPONENT, optional: true }, { token: PlaceOutletComponent, optional: true, skipSelf: true }], target: i0.ɵɵFactoryTarget.Component });
-    static ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "16.2.9", type: PlaceOutletComponent, selector: "aup-place-outlet", inputs: { animate$: "animate$", animate: "animate", customPlaceAnimationOrder$: ["placeAnimationOrderModel", "customPlaceAnimationOrder$"], customPlaceAnimationOrder: ["placeAnimationOrder", "customPlaceAnimationOrder"] }, outputs: { placeChanged: "placeChanged" }, host: { properties: { "class.authorised": "this.isAuthorised" } }, viewQueries: [{ propertyName: "routerOut", first: true, predicate: ["routeOutlet"], descendants: true, static: true }], usesInheritance: true, ngImport: i0, template: "<ng-container *ngIf=\"animationEnabled.value\">\n  <div class=\"router-outlet-container\"\n       cdkScrollable\n       [@routeAnimations]=\"{value: getAnimationOrder(), params:{duration: animationDuration}}\"\n       (@routeAnimations.start)=\"animationStarted()\"\n       (@routeAnimations.done)=\"animationDone()\"\n  >\n    <router-outlet #routerOutlet=\"outlet\"\n                   (activate)=\"onOutletActivated(routerOutlet, $event)\"\n                   (deactivate)=\"onOutletDeactivated()\">\n    </router-outlet>\n  </div>\n</ng-container>\n\n<ng-container *ngIf=\"!animationEnabled.value\">\n  <div class=\"router-outlet-container\"\n       cdkScrollable>\n    <router-outlet #routerOutlet=\"outlet\"\n                   (activate)=\"onOutletActivated(routerOutlet, $event)\"\n                   (deactivate)=\"onOutletDeactivated()\">\n    </router-outlet>\n  </div>\n</ng-container>\n\n<div  class=\"not-authorised-component-container\" *ngIf=\"!authorised.value\">\n  <ng-template [cdkPortalOutlet]=\"notAuthorisedNoticePortal\"></ng-template>\n</div>\n", styles: [":host{display:flex;flex-direction:column;min-height:0}:host:not(.authorised) .router-outlet-container{display:none}.router-outlet-container{flex:1;display:block;position:relative;min-height:0;overflow-x:hidden;overflow-y:auto}router-outlet{display:none}.not-authorised-component-container{flex:1;display:grid;grid-template-columns:1fr;grid-template-rows:1fr}\n"], dependencies: [{ kind: "directive", type: i1$1.NgIf, selector: "[ngIf]", inputs: ["ngIf", "ngIfThen", "ngIfElse"] }, { kind: "directive", type: i1$5.RouterOutlet, selector: "router-outlet", inputs: ["name"], outputs: ["activate", "deactivate", "attach", "detach"], exportAs: ["outlet"] }, { kind: "directive", type: i1$2.CdkScrollable, selector: "[cdk-scrollable], [cdkScrollable]" }, { kind: "directive", type: i1$4.CdkPortalOutlet, selector: "[cdkPortalOutlet]", inputs: ["cdkPortalOutlet"], outputs: ["attached"], exportAs: ["cdkPortalOutlet"] }], animations: [LEFT_RIGHT_PLACE_ANIMATION] });
+    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.9", ngImport: i0, type: PlaceOutletComponent, deps: [{ token: i1$4.Router }, { token: PlaceRouter }, { token: AUP_PLACE_CONFIG, optional: true }, { token: AUP_UNAUTHORISED_PLACE_NOTICE_COMPONENT, optional: true }, { token: PlaceOutletComponent, optional: true, skipSelf: true }, { token: i0.ChangeDetectorRef }], target: i0.ɵɵFactoryTarget.Component });
+    static ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "16.2.9", type: PlaceOutletComponent, selector: "aup-place-outlet", inputs: { animate$: "animate$", animate: "animate", customPlaceAnimationOrder$: ["placeAnimationOrderModel", "customPlaceAnimationOrder$"], customPlaceAnimationOrder: ["placeAnimationOrder", "customPlaceAnimationOrder"] }, outputs: { placeChanged: "placeChanged" }, host: { properties: { "class.authorised": "this.isAuthorised" } }, viewQueries: [{ propertyName: "routerOut", first: true, predicate: ["routeOutlet"], descendants: true, static: true }], usesInheritance: true, ngImport: i0, template: "<ng-container *ngIf=\"animationEnabled.value\">\n  <div class=\"router-outlet-container\"\n       cdkScrollable\n       [@routeAnimations]=\"{value: getAnimationOrder(), params:{duration: animationDuration}}\"\n       (@routeAnimations.start)=\"animationStarted()\"\n       (@routeAnimations.done)=\"animationDone()\"\n  >\n    <router-outlet #routerOutlet=\"outlet\"\n                   (activate)=\"onOutletActivated(routerOutlet, $event)\"\n                   (deactivate)=\"onOutletDeactivated()\">\n    </router-outlet>\n  </div>\n</ng-container>\n\n<ng-container *ngIf=\"!animationEnabled.value\">\n  <div class=\"router-outlet-container\"\n       cdkScrollable>\n    <router-outlet #routerOutlet=\"outlet\"\n                   (activate)=\"onOutletActivated(routerOutlet, $event)\"\n                   (deactivate)=\"onOutletDeactivated()\">\n    </router-outlet>\n  </div>\n</ng-container>\n\n<div  class=\"not-authorised-component-container\" *ngIf=\"!authorised.value\">\n  <ng-template [cdkPortalOutlet]=\"notAuthorisedNoticePortal\"></ng-template>\n</div>\n", styles: [":host{display:flex;flex-direction:column;min-height:0}:host:not(.authorised) .router-outlet-container{display:none}.router-outlet-container{flex:1;display:block;position:relative;min-height:0;overflow-x:hidden;overflow-y:auto}router-outlet{display:none}.not-authorised-component-container{flex:1;display:grid;grid-template-columns:1fr;grid-template-rows:1fr}\n"], dependencies: [{ kind: "directive", type: i1$1.NgIf, selector: "[ngIf]", inputs: ["ngIf", "ngIfThen", "ngIfElse"] }, { kind: "directive", type: i1$4.RouterOutlet, selector: "router-outlet", inputs: ["name"], outputs: ["activate", "deactivate", "attach", "detach"], exportAs: ["outlet"] }, { kind: "directive", type: i1$2.CdkScrollable, selector: "[cdk-scrollable], [cdkScrollable]" }, { kind: "directive", type: i3$2.CdkPortalOutlet, selector: "[cdkPortalOutlet]", inputs: ["cdkPortalOutlet"], outputs: ["attached"], exportAs: ["cdkPortalOutlet"] }], animations: [LEFT_RIGHT_PLACE_ANIMATION] });
 }
 __decorate([
     Proxify(),
@@ -11633,7 +10735,7 @@ __decorate([
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.9", ngImport: i0, type: PlaceOutletComponent, decorators: [{
             type: Component,
             args: [{ selector: 'aup-place-outlet', animations: [LEFT_RIGHT_PLACE_ANIMATION], template: "<ng-container *ngIf=\"animationEnabled.value\">\n  <div class=\"router-outlet-container\"\n       cdkScrollable\n       [@routeAnimations]=\"{value: getAnimationOrder(), params:{duration: animationDuration}}\"\n       (@routeAnimations.start)=\"animationStarted()\"\n       (@routeAnimations.done)=\"animationDone()\"\n  >\n    <router-outlet #routerOutlet=\"outlet\"\n                   (activate)=\"onOutletActivated(routerOutlet, $event)\"\n                   (deactivate)=\"onOutletDeactivated()\">\n    </router-outlet>\n  </div>\n</ng-container>\n\n<ng-container *ngIf=\"!animationEnabled.value\">\n  <div class=\"router-outlet-container\"\n       cdkScrollable>\n    <router-outlet #routerOutlet=\"outlet\"\n                   (activate)=\"onOutletActivated(routerOutlet, $event)\"\n                   (deactivate)=\"onOutletDeactivated()\">\n    </router-outlet>\n  </div>\n</ng-container>\n\n<div  class=\"not-authorised-component-container\" *ngIf=\"!authorised.value\">\n  <ng-template [cdkPortalOutlet]=\"notAuthorisedNoticePortal\"></ng-template>\n</div>\n", styles: [":host{display:flex;flex-direction:column;min-height:0}:host:not(.authorised) .router-outlet-container{display:none}.router-outlet-container{flex:1;display:block;position:relative;min-height:0;overflow-x:hidden;overflow-y:auto}router-outlet{display:none}.not-authorised-component-container{flex:1;display:grid;grid-template-columns:1fr;grid-template-rows:1fr}\n"] }]
-        }], ctorParameters: function () { return [{ type: i1$5.Router }, { type: PlaceRouter }, { type: undefined, decorators: [{
+        }], ctorParameters: function () { return [{ type: i1$4.Router }, { type: PlaceRouter }, { type: undefined, decorators: [{
                     type: Optional
                 }, {
                     type: Inject,
@@ -11647,7 +10749,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.9", ngImpor
                     type: SkipSelf
                 }, {
                     type: Optional
-                }] }]; }, propDecorators: { animate$: [{
+                }] }, { type: i0.ChangeDetectorRef }]; }, propDecorators: { animate$: [{
                 type: Input
             }], animate: [{
                 type: Input
@@ -11780,7 +10882,7 @@ class ListPlaceNavComponent extends AbstractPlaceNavigationComponent {
         super(router);
     }
     static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.9", ngImport: i0, type: ListPlaceNavComponent, deps: [{ token: PlaceRouter }], target: i0.ɵɵFactoryTarget.Component });
-    static ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "16.2.9", type: ListPlaceNavComponent, selector: "aup-list-place-nav", usesInheritance: true, ngImport: i0, template: "<mat-nav-list fxFlex>\n  <a mat-list-item *ngFor=\"let item of menuItems.value; trackBy: trackByPlaceDef\"\n     aup-gc #gc=\"aup-gc\"\n     [pectinCommand]=\"commandFactory.create(item.place, {disposedWith: gc})\"\n     [class.active]=\"item.active\"\n     [matTooltip]=\"getNavigationFace(item.place).tooltip()\">\n    <aup-command-face [faces]=\"[getNavigationFace(item.place)]\"></aup-command-face>\n  </a>\n</mat-nav-list>\n", styles: [":host{display:flex;flex-direction:column;--selected-border-color: #838383;--selected-color: inherit;--selected-background: #f1f1f1}mat-nav-list{padding-top:0}a{border-right:2px solid transparent}a.active{border-right:2px solid var(--selected-border-color);background:var(--selected-background);color:var(--selected-color)}\n"], dependencies: [{ kind: "directive", type: i1$1.NgForOf, selector: "[ngFor][ngForOf]", inputs: ["ngForOf", "ngForTrackBy", "ngForTemplate"] }, { kind: "component", type: i3$3.MatNavList, selector: "mat-nav-list", exportAs: ["matNavList"] }, { kind: "component", type: i3$3.MatListItem, selector: "mat-list-item, a[mat-list-item], button[mat-list-item]", inputs: ["activated"], exportAs: ["matListItem"] }, { kind: "directive", type: i4$1.MatTooltip, selector: "[matTooltip]", exportAs: ["matTooltip"] }, { kind: "directive", type: CommandDirective, selector: "[pectinCommand]", inputs: ["pectinCommand", "commandParameter"] }, { kind: "directive", type: GarbageCollectorDirective, selector: "[aup-gc]", exportAs: ["aup-gc"] }, { kind: "component", type: CommandFaceComponent, selector: "aup-command-face", inputs: ["faces", "face", "ignoreIcon", "ignoreText", "includeMissingIconInLayout"] }] });
+    static ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "16.2.9", type: ListPlaceNavComponent, selector: "aup-list-place-nav", usesInheritance: true, ngImport: i0, template: "<mat-nav-list fxFlex>\n  <a mat-list-item *ngFor=\"let item of menuItems.value; trackBy: trackByPlaceDef\"\n     aup-gc #gc=\"aup-gc\"\n     [pectinCommand]=\"commandFactory.create(item.place, {disposedWith: gc})\"\n     [class.active]=\"item.active\"\n     [matTooltip]=\"getNavigationFace(item.place).tooltip()\">\n    <aup-command-face [faces]=\"[getNavigationFace(item.place)]\"></aup-command-face>\n  </a>\n</mat-nav-list>\n", styles: [":host{display:flex;flex-direction:column;--selected-border-color: #838383;--selected-color: inherit;--selected-background: #f1f1f1}mat-nav-list{padding-top:0}a{border-right:2px solid transparent}a.active{border-right:2px solid var(--selected-border-color);background:var(--selected-background);color:var(--selected-color)}\n"], dependencies: [{ kind: "directive", type: i1$1.NgForOf, selector: "[ngFor][ngForOf]", inputs: ["ngForOf", "ngForTrackBy", "ngForTemplate"] }, { kind: "component", type: i3$3.MatNavList, selector: "mat-nav-list", exportAs: ["matNavList"] }, { kind: "component", type: i3$3.MatListItem, selector: "mat-list-item, a[mat-list-item], button[mat-list-item]", inputs: ["activated"], exportAs: ["matListItem"] }, { kind: "directive", type: i4$1.MatTooltip, selector: "[matTooltip]", exportAs: ["matTooltip"] }, { kind: "directive", type: CommandDirective, selector: "[pectinCommand]", inputs: ["pectinCommand", "commandParameter"] }, { kind: "directive", type: GarbageCollectorDirective, selector: "[aup-gc]", exportAs: ["aup-gc"] }, { kind: "directive", type: i7$1.DefaultFlexDirective, selector: "  [fxFlex], [fxFlex.xs], [fxFlex.sm], [fxFlex.md],  [fxFlex.lg], [fxFlex.xl], [fxFlex.lt-sm], [fxFlex.lt-md],  [fxFlex.lt-lg], [fxFlex.lt-xl], [fxFlex.gt-xs], [fxFlex.gt-sm],  [fxFlex.gt-md], [fxFlex.gt-lg]", inputs: ["fxFlex", "fxFlex.xs", "fxFlex.sm", "fxFlex.md", "fxFlex.lg", "fxFlex.xl", "fxFlex.lt-sm", "fxFlex.lt-md", "fxFlex.lt-lg", "fxFlex.lt-xl", "fxFlex.gt-xs", "fxFlex.gt-sm", "fxFlex.gt-md", "fxFlex.gt-lg"] }, { kind: "component", type: CommandFaceComponent, selector: "aup-command-face", inputs: ["faces", "face", "ignoreIcon", "ignoreText", "includeMissingIconInLayout"] }] });
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.9", ngImport: i0, type: ListPlaceNavComponent, decorators: [{
             type: Component,
@@ -11855,7 +10957,7 @@ class SidePlaceNavigationComponent extends AbstractPlaceNavigationComponent {
         this.expanded = !this.expanded;
     }
     static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.9", ngImport: i0, type: SidePlaceNavigationComponent, deps: [{ token: PlaceRouter }], target: i0.ɵɵFactoryTarget.Component });
-    static ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "16.2.9", type: SidePlaceNavigationComponent, selector: "aup-side-place-navigation", inputs: { expanded$: "expanded$", expanded: "expanded" }, host: { properties: { "class.expanded": "this.expanded" } }, queries: [{ propertyName: "navEndTemplate", first: true, predicate: ["navEndTemplate"], descendants: true }], usesInheritance: true, ngImport: i0, template: "<mat-nav-list>\n  <a mat-list-item (click)=\"toggleMenu()\">\n    <aup-icon matListItemIcon [icon]=\"homeIcon$.value\"></aup-icon>\n    <span matListItemTitle class=\"expanded-only\">Menu</span>\n  </a>\n  <a *ngFor=\"let item of menuItems.value; trackBy: trackByPlaceDef\"\n     mat-list-item\n     [pectinCommand]=\"commandFactory.create(item.place, {disposedWith: gc})\"\n     [activated]=\"item.active\"\n     aup-gc #gc=\"aup-gc\"\n     [matTooltip]=\"getNavigationFace(item.place).tooltip()\"\n  >\n    <aup-icon matListItemIcon *ngIf=\"getNavigationFace(item.place).icon()\" [icon]=\"getNavigationFace(item.place).icon()\"></aup-icon>\n    <span matListItemTitle class=\"expanded-only\">{{getNavigationFace(item.place).text()}}</span>\n  </a>\n  <span [style.flex]=\"1\"></span>\n  <ng-container *ngIf=\"navEndTemplate\" [ngTemplateOutlet]=\"navEndTemplate\"></ng-container>\n</mat-nav-list>\n", styles: [":host{display:flex;flex-direction:column;--resolved-nav-item-width: var(--nav-width, 56px);--resolved-expanded-width: var(--nav-expanded-width, 235px);--resolved-color: var(--nav-color, rgba(255, 255, 255, .9));--resolved-background-color: var(--nav-background-color, #555);color:var(--resolved-color);background-color:var(--resolved-background-color);width:var(--resolved-nav-item-width);transition:width 125ms linear}:host.expanded{width:var(--resolved-expanded-width);max-width:var(--resolved-expanded-width)}:host aup-icon{margin-right:12px}:host>mat-nav-list{flex:1;display:flex;flex-direction:column;padding:0}:host .mat-mdc-list-item,:host .mat-mdc-list-item-icon,:host .mat-mdc-list-item-icon.activated,:host .mdc-list-item--with-leading-icon:hover .mdc-list-item__start,:host .mdc-list-item__primary-text{color:var(--resolved-color)}:host .mdc-list-item--activated .mdc-list-item__primary-text,:host .mdc-list-item--activated .mat-mdc-list-item-icon{color:var(--resolved-color)}:host .mdc-list-item:hover{background-color:#444}:host .mdc-list-item:hover .mdc-list-item__primary-text{color:var(--resolved-color)}:host .mdc-list-item--activated{background-color:#444}:host *.flip-horizontal{transform:scaleX(-1)}\n"], dependencies: [{ kind: "directive", type: i1$1.NgForOf, selector: "[ngFor][ngForOf]", inputs: ["ngForOf", "ngForTrackBy", "ngForTemplate"] }, { kind: "directive", type: i1$1.NgIf, selector: "[ngIf]", inputs: ["ngIf", "ngIfThen", "ngIfElse"] }, { kind: "directive", type: i1$1.NgTemplateOutlet, selector: "[ngTemplateOutlet]", inputs: ["ngTemplateOutletContext", "ngTemplateOutlet", "ngTemplateOutletInjector"] }, { kind: "component", type: i3$3.MatNavList, selector: "mat-nav-list", exportAs: ["matNavList"] }, { kind: "component", type: i3$3.MatListItem, selector: "mat-list-item, a[mat-list-item], button[mat-list-item]", inputs: ["activated"], exportAs: ["matListItem"] }, { kind: "directive", type: i3$3.MatListItemIcon, selector: "[matListItemIcon]" }, { kind: "directive", type: i3$3.MatListItemTitle, selector: "[matListItemTitle]" }, { kind: "directive", type: i4$1.MatTooltip, selector: "[matTooltip]", exportAs: ["matTooltip"] }, { kind: "directive", type: CommandDirective, selector: "[pectinCommand]", inputs: ["pectinCommand", "commandParameter"] }, { kind: "directive", type: GarbageCollectorDirective, selector: "[aup-gc]", exportAs: ["aup-gc"] }, { kind: "component", type: IconComponent, selector: "aup-icon", inputs: ["icon"] }] });
+    static ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "16.2.9", type: SidePlaceNavigationComponent, selector: "aup-side-place-navigation", inputs: { expanded$: "expanded$", expanded: "expanded" }, host: { properties: { "class.expanded": "this.expanded" } }, queries: [{ propertyName: "navEndTemplate", first: true, predicate: ["navEndTemplate"], descendants: true }], usesInheritance: true, ngImport: i0, template: "<mat-nav-list>\n  <a mat-list-item (click)=\"toggleMenu()\">\n    <aup-icon matListItemIcon [icon]=\"homeIcon$.value\"></aup-icon>\n    <span matListItemTitle class=\"expanded-only\">Menu</span>\n  </a>\n  <a *ngFor=\"let item of menuItems.value; trackBy: trackByPlaceDef\"\n     mat-list-item\n     [pectinCommand]=\"commandFactory.create(item.place, {disposedWith: gc})\"\n     [activated]=\"item.active\"\n     aup-gc #gc=\"aup-gc\"\n     [matTooltip]=\"getNavigationFace(item.place).tooltip()\"\n  >\n    <aup-icon matListItemIcon *ngIf=\"getNavigationFace(item.place).icon()\" [icon]=\"getNavigationFace(item.place).icon()\"></aup-icon>\n    <span matListItemTitle class=\"expanded-only\">{{getNavigationFace(item.place).text()}}</span>\n  </a>\n  <span [style.flex]=\"1\"></span>\n  <ng-container *ngIf=\"navEndTemplate\" [ngTemplateOutlet]=\"navEndTemplate\"></ng-container>\n</mat-nav-list>\n", styles: [":host{display:flex;flex-direction:column;--resolved-nav-item-width: var(--nav-width, 56px);--resolved-expanded-width: var(--nav-expanded-width, 235px);--resolved-color: var(--nav-color, rgba(255, 255, 255, .9));--resolved-background-color: var(--nav-background-color, #555);color:var(--resolved-color);background-color:var(--resolved-background-color);width:var(--resolved-nav-item-width);transition:width 125ms linear}:host.expanded{width:var(--resolved-expanded-width);max-width:var(--resolved-expanded-width)}:host aup-icon{margin-right:12px}:host>mat-nav-list{flex:1;display:flex;flex-direction:column;padding:0}:host .mat-mdc-list-item,:host .mat-mdc-list-item-icon,:host .mat-mdc-list-item-icon.activated,:host .mdc-list-item__primary-text{color:var(--resolved-color)}:host .mdc-list-item--activated .mdc-list-item__primary-text,:host .mdc-list-item--activated .mat-mdc-list-item-icon{color:var(--resolved-color)}:host .mdc-list-item--activated{background-color:#444}:host *.flip-horizontal{transform:scaleX(-1)}\n"], dependencies: [{ kind: "directive", type: i1$1.NgForOf, selector: "[ngFor][ngForOf]", inputs: ["ngForOf", "ngForTrackBy", "ngForTemplate"] }, { kind: "directive", type: i1$1.NgIf, selector: "[ngIf]", inputs: ["ngIf", "ngIfThen", "ngIfElse"] }, { kind: "directive", type: i1$1.NgTemplateOutlet, selector: "[ngTemplateOutlet]", inputs: ["ngTemplateOutletContext", "ngTemplateOutlet", "ngTemplateOutletInjector"] }, { kind: "component", type: i3$3.MatNavList, selector: "mat-nav-list", exportAs: ["matNavList"] }, { kind: "component", type: i3$3.MatListItem, selector: "mat-list-item, a[mat-list-item], button[mat-list-item]", inputs: ["activated"], exportAs: ["matListItem"] }, { kind: "directive", type: i3$3.MatListItemIcon, selector: "[matListItemIcon]" }, { kind: "directive", type: i3$3.MatListItemTitle, selector: "[matListItemTitle]" }, { kind: "directive", type: i4$1.MatTooltip, selector: "[matTooltip]", exportAs: ["matTooltip"] }, { kind: "directive", type: CommandDirective, selector: "[pectinCommand]", inputs: ["pectinCommand", "commandParameter"] }, { kind: "directive", type: GarbageCollectorDirective, selector: "[aup-gc]", exportAs: ["aup-gc"] }, { kind: "component", type: IconComponent, selector: "aup-icon", inputs: ["icon"] }] });
 }
 __decorate([
     Proxify(),
@@ -11867,7 +10969,7 @@ __decorate([
 ], SidePlaceNavigationComponent.prototype, "expanded", null);
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.9", ngImport: i0, type: SidePlaceNavigationComponent, decorators: [{
             type: Component,
-            args: [{ selector: 'aup-side-place-navigation', template: "<mat-nav-list>\n  <a mat-list-item (click)=\"toggleMenu()\">\n    <aup-icon matListItemIcon [icon]=\"homeIcon$.value\"></aup-icon>\n    <span matListItemTitle class=\"expanded-only\">Menu</span>\n  </a>\n  <a *ngFor=\"let item of menuItems.value; trackBy: trackByPlaceDef\"\n     mat-list-item\n     [pectinCommand]=\"commandFactory.create(item.place, {disposedWith: gc})\"\n     [activated]=\"item.active\"\n     aup-gc #gc=\"aup-gc\"\n     [matTooltip]=\"getNavigationFace(item.place).tooltip()\"\n  >\n    <aup-icon matListItemIcon *ngIf=\"getNavigationFace(item.place).icon()\" [icon]=\"getNavigationFace(item.place).icon()\"></aup-icon>\n    <span matListItemTitle class=\"expanded-only\">{{getNavigationFace(item.place).text()}}</span>\n  </a>\n  <span [style.flex]=\"1\"></span>\n  <ng-container *ngIf=\"navEndTemplate\" [ngTemplateOutlet]=\"navEndTemplate\"></ng-container>\n</mat-nav-list>\n", styles: [":host{display:flex;flex-direction:column;--resolved-nav-item-width: var(--nav-width, 56px);--resolved-expanded-width: var(--nav-expanded-width, 235px);--resolved-color: var(--nav-color, rgba(255, 255, 255, .9));--resolved-background-color: var(--nav-background-color, #555);color:var(--resolved-color);background-color:var(--resolved-background-color);width:var(--resolved-nav-item-width);transition:width 125ms linear}:host.expanded{width:var(--resolved-expanded-width);max-width:var(--resolved-expanded-width)}:host aup-icon{margin-right:12px}:host>mat-nav-list{flex:1;display:flex;flex-direction:column;padding:0}:host .mat-mdc-list-item,:host .mat-mdc-list-item-icon,:host .mat-mdc-list-item-icon.activated,:host .mdc-list-item--with-leading-icon:hover .mdc-list-item__start,:host .mdc-list-item__primary-text{color:var(--resolved-color)}:host .mdc-list-item--activated .mdc-list-item__primary-text,:host .mdc-list-item--activated .mat-mdc-list-item-icon{color:var(--resolved-color)}:host .mdc-list-item:hover{background-color:#444}:host .mdc-list-item:hover .mdc-list-item__primary-text{color:var(--resolved-color)}:host .mdc-list-item--activated{background-color:#444}:host *.flip-horizontal{transform:scaleX(-1)}\n"] }]
+            args: [{ selector: 'aup-side-place-navigation', template: "<mat-nav-list>\n  <a mat-list-item (click)=\"toggleMenu()\">\n    <aup-icon matListItemIcon [icon]=\"homeIcon$.value\"></aup-icon>\n    <span matListItemTitle class=\"expanded-only\">Menu</span>\n  </a>\n  <a *ngFor=\"let item of menuItems.value; trackBy: trackByPlaceDef\"\n     mat-list-item\n     [pectinCommand]=\"commandFactory.create(item.place, {disposedWith: gc})\"\n     [activated]=\"item.active\"\n     aup-gc #gc=\"aup-gc\"\n     [matTooltip]=\"getNavigationFace(item.place).tooltip()\"\n  >\n    <aup-icon matListItemIcon *ngIf=\"getNavigationFace(item.place).icon()\" [icon]=\"getNavigationFace(item.place).icon()\"></aup-icon>\n    <span matListItemTitle class=\"expanded-only\">{{getNavigationFace(item.place).text()}}</span>\n  </a>\n  <span [style.flex]=\"1\"></span>\n  <ng-container *ngIf=\"navEndTemplate\" [ngTemplateOutlet]=\"navEndTemplate\"></ng-container>\n</mat-nav-list>\n", styles: [":host{display:flex;flex-direction:column;--resolved-nav-item-width: var(--nav-width, 56px);--resolved-expanded-width: var(--nav-expanded-width, 235px);--resolved-color: var(--nav-color, rgba(255, 255, 255, .9));--resolved-background-color: var(--nav-background-color, #555);color:var(--resolved-color);background-color:var(--resolved-background-color);width:var(--resolved-nav-item-width);transition:width 125ms linear}:host.expanded{width:var(--resolved-expanded-width);max-width:var(--resolved-expanded-width)}:host aup-icon{margin-right:12px}:host>mat-nav-list{flex:1;display:flex;flex-direction:column;padding:0}:host .mat-mdc-list-item,:host .mat-mdc-list-item-icon,:host .mat-mdc-list-item-icon.activated,:host .mdc-list-item__primary-text{color:var(--resolved-color)}:host .mdc-list-item--activated .mdc-list-item__primary-text,:host .mdc-list-item--activated .mat-mdc-list-item-icon{color:var(--resolved-color)}:host .mdc-list-item--activated{background-color:#444}:host *.flip-horizontal{transform:scaleX(-1)}\n"] }]
         }], ctorParameters: function () { return [{ type: PlaceRouter }]; }, propDecorators: { expanded$: [{
                 type: Input
             }], expanded: [{
@@ -11885,7 +10987,7 @@ class TabbedPlaceNavigationComponent extends AbstractPlaceNavigationComponent {
         super(router);
     }
     static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.9", ngImport: i0, type: TabbedPlaceNavigationComponent, deps: [{ token: PlaceRouter }], target: i0.ɵɵFactoryTarget.Component });
-    static ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "16.2.9", type: TabbedPlaceNavigationComponent, selector: "aup-tabbed-place-navigation", usesInheritance: true, ngImport: i0, template: "<nav mat-tab-nav-bar [tabPanel]=\"tabPanel\">\n  <ng-content select=\"[nav-start]\"></ng-content>\n  <a mat-tab-link *ngFor=\"let item of menuItems.value; trackBy: trackByPlaceDef\"\n     aup-gc #gc=\"aup-gc\"\n     [pectinCommand]=\"commandFactory.create(item.place, {disposedWith: gc})\"\n     [active]=\"item.active\"\n     [matTooltip]=\"getNavigationFace(item.place).tooltip()\">\n    <aup-command-face [faces]=\"[getNavigationFace(item.place)]\"></aup-command-face>\n  </a>\n  <ng-content select=\"[nav-end]\"></ng-content>\n</nav>\n<mat-tab-nav-panel #tabPanel></mat-tab-nav-panel>\n", styles: [":host{display:block}div.place-holder{border:1px solid green}\n"], dependencies: [{ kind: "directive", type: i1$1.NgForOf, selector: "[ngFor][ngForOf]", inputs: ["ngForOf", "ngForTrackBy", "ngForTemplate"] }, { kind: "component", type: i3$2.MatTabNav, selector: "[mat-tab-nav-bar]", inputs: ["color", "fitInkBarToContent", "mat-stretch-tabs", "animationDuration"], exportAs: ["matTabNavBar", "matTabNav"] }, { kind: "component", type: i3$2.MatTabNavPanel, selector: "mat-tab-nav-panel", inputs: ["id"], exportAs: ["matTabNavPanel"] }, { kind: "component", type: i3$2.MatTabLink, selector: "[mat-tab-link], [matTabLink]", inputs: ["disabled", "disableRipple", "tabIndex", "active", "id"], exportAs: ["matTabLink"] }, { kind: "directive", type: i4$1.MatTooltip, selector: "[matTooltip]", exportAs: ["matTooltip"] }, { kind: "directive", type: CommandDirective, selector: "[pectinCommand]", inputs: ["pectinCommand", "commandParameter"] }, { kind: "directive", type: GarbageCollectorDirective, selector: "[aup-gc]", exportAs: ["aup-gc"] }, { kind: "component", type: CommandFaceComponent, selector: "aup-command-face", inputs: ["faces", "face", "ignoreIcon", "ignoreText", "includeMissingIconInLayout"] }] });
+    static ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "16.2.9", type: TabbedPlaceNavigationComponent, selector: "aup-tabbed-place-navigation", usesInheritance: true, ngImport: i0, template: "<nav mat-tab-nav-bar [tabPanel]=\"tabPanel\">\n  <ng-content select=\"[nav-start]\"></ng-content>\n  <a mat-tab-link *ngFor=\"let item of menuItems.value; trackBy: trackByPlaceDef\"\n     aup-gc #gc=\"aup-gc\"\n     [pectinCommand]=\"commandFactory.create(item.place, {disposedWith: gc})\"\n     [active]=\"item.active\"\n     [matTooltip]=\"getNavigationFace(item.place).tooltip()\">\n    <aup-command-face [faces]=\"[getNavigationFace(item.place)]\"></aup-command-face>\n  </a>\n  <ng-content select=\"[nav-end]\"></ng-content>\n</nav>\n<mat-tab-nav-panel #tabPanel></mat-tab-nav-panel>\n", styles: [":host{display:block}div.place-holder{border:1px solid green}\n"], dependencies: [{ kind: "directive", type: i1$1.NgForOf, selector: "[ngFor][ngForOf]", inputs: ["ngForOf", "ngForTrackBy", "ngForTemplate"] }, { kind: "component", type: i3$1.MatTabNav, selector: "[mat-tab-nav-bar]", inputs: ["color", "fitInkBarToContent", "mat-stretch-tabs", "animationDuration"], exportAs: ["matTabNavBar", "matTabNav"] }, { kind: "component", type: i3$1.MatTabNavPanel, selector: "mat-tab-nav-panel", inputs: ["id"], exportAs: ["matTabNavPanel"] }, { kind: "component", type: i3$1.MatTabLink, selector: "[mat-tab-link], [matTabLink]", inputs: ["disabled", "disableRipple", "tabIndex", "active", "id"], exportAs: ["matTabLink"] }, { kind: "directive", type: i4$1.MatTooltip, selector: "[matTooltip]", exportAs: ["matTooltip"] }, { kind: "directive", type: CommandDirective, selector: "[pectinCommand]", inputs: ["pectinCommand", "commandParameter"] }, { kind: "directive", type: GarbageCollectorDirective, selector: "[aup-gc]", exportAs: ["aup-gc"] }, { kind: "component", type: CommandFaceComponent, selector: "aup-command-face", inputs: ["faces", "face", "ignoreIcon", "ignoreText", "includeMissingIconInLayout"] }] });
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.9", ngImport: i0, type: TabbedPlaceNavigationComponent, decorators: [{
             type: Component,
@@ -11908,6 +11010,7 @@ class PlaceModule {
             MatTooltipModule,
             MatIconModule,
             DirectivesModule,
+            FlexModule,
             ComponentsModule,
             PortalModule,
             MatCardModule], exports: [PlaceOutletComponent,
@@ -11924,6 +11027,7 @@ class PlaceModule {
             MatTooltipModule,
             MatIconModule,
             DirectivesModule,
+            FlexModule,
             ComponentsModule,
             PortalModule,
             MatCardModule] });
@@ -11941,6 +11045,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.9", ngImpor
                         MatTooltipModule,
                         MatIconModule,
                         DirectivesModule,
+                        FlexModule,
                         ComponentsModule,
                         PortalModule,
                         MatCardModule
@@ -12030,44 +11135,60 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.9", ngImpor
                 }]
         }] });
 
+const slideDownOnEnterDef = style({
+    opacity: 0,
+    'height': '0',
+    paddingTop: '0',
+    paddingBottom: '0'
+});
+// TODO: params aren't getting customised in the view.  Need to figure out the correct approach.
+const slideDownOnEnterAnimation = trigger('slideDownOnEnter', [
+    transition(':enter', [slideDownOnEnterDef, animate('{{duration}}')], { params: { duration: '100ms' } }),
+    transition(':leave', [animate('{{duration}}', slideDownOnEnterDef)], { params: { duration: '100ms' } })
+]);
+const slideLeftOnEnterDef = style({
+    opacity: 0,
+    'width': '0',
+    paddingLeft: '0',
+    paddingRight: '0'
+});
+const slideRightOnEnterAnimation = trigger('slideRightOnEnter', [
+    transition(':enter', [slideLeftOnEnterDef, animate('{{duration}}')], { params: { duration: '100ms' } }),
+    transition(':leave', [animate('{{duration}}', slideLeftOnEnterDef)], { params: { duration: '100ms' } })
+]);
+const ZERO_WIDTH = {
+    opacity: 0,
+    width: '0',
+    paddingLeft: '0',
+    paddingRight: '0',
+};
+const ZERO_HEIGHT = {
+    opacity: 0,
+    height: '0',
+    paddingTop: '0',
+    paddingBottom: '0',
+};
+const slideDownAndRightOnEnterAnimation = trigger('slideDownAndRightOnEnter', [
+    transition(':enter', [
+        style({ overflow: "hidden", whiteSpace: "nowrap", ...ZERO_WIDTH, ...ZERO_HEIGHT }),
+        animate('{{duration}}')
+    ], { params: { duration: '100ms' } }),
+    transition(':leave', [
+        style({ overflow: "hidden", whiteSpace: "nowrap" }),
+        group([
+            animate('{{duration}}', style(ZERO_HEIGHT)),
+            // Hack: 100ms is too quick as it animates from * - 0 as we only see it animate the width is greater than the parent.
+            // Not sure how to animate from * to natural new width of parent.  This hack won't work for text that's just a little
+            // bit wider than the parent as it'll fall within the parent bounds very early in the animation cycle.
+            animate('300ms', style(ZERO_WIDTH)),
+        ])
+    ], { params: { duration: '100ms' } })
+]);
+
 /**
  * @file Automatically generated by barrelsby.
  */
 
-class ResizeObserverDirective extends DisposableComponent {
-    aupOnResize = new EventEmitter();
-    elementRef = this.inject(ElementRef);
-    ngZone = this.inject(NgZone);
-    _bounds$ = new MutableValueModel();
-    ngAfterViewInit() {
-        const element = this.elementRef.nativeElement;
-        const ro = new ResizeObserver((entries, observer) => {
-            this.ngZone.run(() => this._updateBounds());
-        });
-        ro.observe(element);
-        this.onDispose(() => ro.disconnect());
-        setTimeout(() => this._updateBounds());
-    }
-    get bounds$() {
-        return this._bounds$.readonly$;
-    }
-    _updateBounds() {
-        this._bounds$.value = Bounds.ofElement(this.elementRef.nativeElement);
-        this.aupOnResize.emit(this._bounds$.value);
-    }
-    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.9", ngImport: i0, type: ResizeObserverDirective, deps: null, target: i0.ɵɵFactoryTarget.Directive });
-    static ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "14.0.0", version: "16.2.9", type: ResizeObserverDirective, isStandalone: true, selector: "[aupOnResize]", outputs: { aupOnResize: "aupOnResize" }, usesInheritance: true, ngImport: i0 });
-}
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.9", ngImport: i0, type: ResizeObserverDirective, decorators: [{
-            type: Directive,
-            args: [{
-                    selector: "[aupOnResize]",
-                    standalone: true
-                }]
-        }], propDecorators: { aupOnResize: [{
-                type: Output
-            }] } });
-
 /**
  * @file Automatically generated by barrelsby.
  */
@@ -12158,7 +11279,7 @@ class DialogInteractionContextFactory extends ModalInteractionContextFactory {
         };
         return new DialogInteractionContext(identifier, api, this.dialogService, config);
     }
-    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.9", ngImport: i0, type: DialogInteractionContextFactory, deps: [{ token: i1$7.MatDialog }, { token: DIALOG_INTERACTION_SERVICE_DEFAULTS, optional: true }, { token: MAT_DIALOG_DEFAULT_OPTIONS, optional: true }], target: i0.ɵɵFactoryTarget.Injectable });
+    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.9", ngImport: i0, type: DialogInteractionContextFactory, deps: [{ token: i1$6.MatDialog }, { token: DIALOG_INTERACTION_SERVICE_DEFAULTS, optional: true }, { token: MAT_DIALOG_DEFAULT_OPTIONS, optional: true }], target: i0.ɵɵFactoryTarget.Injectable });
     static ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.9", ngImport: i0, type: DialogInteractionContextFactory, providedIn: 'root' });
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.9", ngImport: i0, type: DialogInteractionContextFactory, decorators: [{
@@ -12166,12 +11287,12 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.9", ngImpor
             args: [{
                     providedIn: 'root'
                 }]
-        }], ctorParameters: function () { return [{ type: i1$7.MatDialog }, { type: i1$7.MatDialogConfig, decorators: [{
+        }], ctorParameters: function () { return [{ type: i1$6.MatDialog }, { type: i1$6.MatDialogConfig, decorators: [{
                     type: Optional
                 }, {
                     type: Inject,
                     args: [DIALOG_INTERACTION_SERVICE_DEFAULTS]
-                }] }, { type: i1$7.MatDialogConfig, decorators: [{
+                }] }, { type: i1$6.MatDialogConfig, decorators: [{
                     type: Optional
                 }, {
                     type: Inject,
@@ -12291,14 +11412,13 @@ class PlaceGuard {
     }
     // @Trace()
     async canActivate(activatedRoute, state) {
-        await this.placeRouter.waitUntilRouterReady();
         if (PlaceComponent.isPlaceComponentConstructor(activatedRoute.component)) {
             const placeDefinition = PlaceComponent.getDefinition(activatedRoute.component);
             if (placeDefinition.authenticate) {
                 await this.placeRouter.authService.waitUntilAuthenticationReady();
                 const authenticated = this.authService.isAuthenticated();
                 if (!authenticated) {
-                    const redirect = await this.authService.getAuthenticationFailureRedirect(activatedRoute, state);
+                    const redirect = this.authService.getAuthenticationFailureRedirect(activatedRoute, state);
                     // const nextPlaceDef = this.getPlaceDefinition(redirect);
                     if (redirect.requiresAuthentication()) {
                         lang.illegalState(`onAuthenticationFailure hook returned place ${redirect.toDebugString()} that requires authentication.`);
@@ -12307,7 +11427,7 @@ class PlaceGuard {
                 }
                 await this.authService.waitUntilAuthorisationReadyFor(placeDefinition);
                 if (!this.authService.isAuthorised(placeDefinition)) {
-                    const nextRedirect = await this.findBestAuthenticatedAlternative(placeDefinition, activatedRoute);
+                    const nextRedirect = this.findBestAuthenticatedAlternative(placeDefinition, activatedRoute);
                     return this.createUrlTree(nextRedirect);
                 }
             }
@@ -12351,7 +11471,7 @@ class PlaceGuard {
             return lang.illegalState(`expected component to be an instance of PlaceComponent, got ${activatedRoute.component}`);
         }
     }
-    async findBestAuthenticatedAlternative(placeDefinition, activatedRoute) {
+    findBestAuthenticatedAlternative(placeDefinition, activatedRoute) {
         let currentPlace = placeDefinition;
         while (!currentPlace.isRoot()) {
             currentPlace = currentPlace.parent;
@@ -12361,7 +11481,7 @@ class PlaceGuard {
             }
         }
         // Couldn't find an authorised ancestor so we check if there are router level defined alternatives
-        const alternativeRoutes = await this.placeRouter.getAuthorisationFailureRedirectOptions(activatedRoute.component);
+        const alternativeRoutes = this.placeRouter.getAuthorisationFailureRedirectOptions(activatedRoute.component);
         if (alternativeRoutes.length < 1) {
             return lang.illegalState(`onAuthorisationFailure hook didn't return any alternate places`);
         }
@@ -12404,13 +11524,13 @@ class PlaceGuard {
             return next();
         }
     }
-    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.9", ngImport: i0, type: PlaceGuard, deps: [{ token: i1$5.Router }, { token: UrlService }, { token: PlaceRouter }, { token: PlaceHistory }, { token: InteractionService }, { token: i0.Injector }], target: i0.ɵɵFactoryTarget.Injectable });
+    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.9", ngImport: i0, type: PlaceGuard, deps: [{ token: i1$4.Router }, { token: UrlService }, { token: PlaceRouter }, { token: PlaceHistory }, { token: InteractionService }, { token: i0.Injector }], target: i0.ɵɵFactoryTarget.Injectable });
     static ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.9", ngImport: i0, type: PlaceGuard, providedIn: 'root' });
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.9", ngImport: i0, type: PlaceGuard, decorators: [{
             type: Injectable,
             args: [{ providedIn: 'root' }]
-        }], ctorParameters: function () { return [{ type: i1$5.Router }, { type: UrlService }, { type: PlaceRouter }, { type: PlaceHistory }, { type: InteractionService }, { type: i0.Injector }]; } });
+        }], ctorParameters: function () { return [{ type: i1$4.Router }, { type: UrlService }, { type: PlaceRouter }, { type: PlaceHistory }, { type: InteractionService }, { type: i0.Injector }]; } });
 
 var Formatter;
 (function (Formatter) {
@@ -12444,74 +11564,69 @@ var Formatter;
     Formatter.BOOLEAN = new BooleanType();
 })(Formatter || (Formatter = {}));
 
-// function installMechanics<M extends HasValue<any>>(parameterDef: ParameterDefinition<any>, prototype: object, propertyKey: string | symbol, tagPrefix: string) {
-//
-//   Klass.get(prototype).addToOwnMetadataList(ROUTE_PARAMETER_LIST_KEY, parameterDef);
-//
-//   function getMechanics(instance: M, propertyName: string | symbol) {
-//     const key = `__mechanics_${propertyName.toString()}`;
-//     if (!instance[key]) {
-//       const backingModel = parameterDef.createBackingModel();
-//       instance[key] = {
-//         backingModel: backingModel,
-//         binding: null as Binding<any, any>
-//       };
-//       const tag = `${tagPrefix}(${prototype.constructor.name}.${propertyKey.toString()})`;
-//       DebugContext.getOrCreate(instance[key].backingModel).tag(tag);
-//     }
-//     return instance[key];
-//   }
-//
-//   Object.defineProperty(prototype, propertyKey, {
-//     get: function() {
-//       return getMechanics(this, propertyKey).backingModel;
-//     },
-//     set: function(userModel: M) {
-//       const mechanics = getMechanics(this, propertyKey);
-//       // This handles the scenario where we want to push an existing value model (such as a form model)
-//       // to and from the route.
-//       if (mechanics.binding) {
-//         mechanics.binding.dispose();
-//       }
-//       if (userModel) {
-//         mechanics.binding = new Binding(mechanics.backingModel, userModel, {
-//           toLeft: Functions.identity,
-//           toRight: Functions.identity
-//         });
-//         if (parameterDef.isEmptyValue(userModel.value)) {
-//           // console.log(`Push visit to model for ${tag}`, {value: mechanics.backingModel.value});
-//           mechanics.binding.writeRight(); // push the visit into the user model;
-//         } else {
-//           if (!parameterDef.isEmptyValue(mechanics.backingModel.value)) {
-//             console.warn('Assigning a visit model with an existing value to a visit parameter with an existing value.  Visit parameter will be overridden');
-//           }
-//           mechanics.binding.writeLeft(); // push the user model into the visit
-//         }
-//       }
-//     }
-//   });
-// }
+function installMechanics(parameterDef, prototype, propertyKey, tagPrefix) {
+    Klass.get(prototype).addToOwnMetadataList(ROUTE_PARAMETER_LIST_KEY, parameterDef);
+    function getMechanics(instance, propertyName) {
+        const key = `__mechanics_${propertyName.toString()}`;
+        if (!instance[key]) {
+            const backingModel = parameterDef.createBackingModel();
+            instance[key] = {
+                backingModel: backingModel,
+                binding: null
+            };
+            const tag = `${tagPrefix}(${prototype.constructor.name}.${propertyKey.toString()})`;
+            DebugContext.getOrCreate(instance[key].backingModel).tag(tag);
+        }
+        return instance[key];
+    }
+    Object.defineProperty(prototype, propertyKey, {
+        get: function () {
+            return getMechanics(this, propertyKey).backingModel;
+        },
+        set: function (userModel) {
+            const mechanics = getMechanics(this, propertyKey);
+            // This handles the scenario where we want to push an existing value model (such as a form model)
+            // to and from the route.
+            if (mechanics.binding) {
+                mechanics.binding.dispose();
+            }
+            if (userModel) {
+                mechanics.binding = new Binding(mechanics.backingModel, userModel, {
+                    toLeft: Functions.identity,
+                    toRight: Functions.identity
+                });
+                if (parameterDef.isEmptyValue(userModel.value)) {
+                    // console.log(`Push visit to model for ${tag}`, {value: mechanics.backingModel.value});
+                    mechanics.binding.writeRight(); // push the visit into the user model;
+                }
+                else {
+                    if (!parameterDef.isEmptyValue(mechanics.backingModel.value)) {
+                        console.warn('Assigning a visit model with an existing value to a visit parameter with an existing value.  Visit parameter will be overridden');
+                    }
+                    mechanics.binding.writeLeft(); // push the user model into the visit
+                }
+            }
+        }
+    });
+}
 function RouteId(formatter, options) {
     return (prototype, propertyKey) => {
         const parameterDef = new ParameterDefinition.RouteId(propertyKey.toString(), options, formatter);
-        // installMechanics(parameterDef, prototype, propertyKey, '@RouteId');
-        Klass.get(prototype).addToOwnMetadataList(ROUTE_PARAMETER_LIST_KEY, parameterDef);
+        installMechanics(parameterDef, prototype, propertyKey, '@RouteId');
     };
 }
 function VisitParameter(options) {
     const opts = Opts.get(options);
     return (prototype, propertyKey) => {
         const parameterDef = new ParameterDefinition.ValueParameter(propertyKey.toString(), options, opts.getOptional('storeInUrl', null));
-        Klass.get(prototype).addToOwnMetadataList(ROUTE_PARAMETER_LIST_KEY, parameterDef);
-        // installMechanics(parameterDef, prototype, propertyKey, '@VisitParameter');
+        installMechanics(parameterDef, prototype, propertyKey, '@VisitParameter');
     };
 }
 function VisitParameterList(options) {
     const opts = Opts.get(options);
     return (prototype, propertyKey) => {
         const parameterDef = new ParameterDefinition.ArrayParameter(propertyKey.toString(), options, opts.getOptional('storeInUrl', null));
-        Klass.get(prototype).addToOwnMetadataList(ROUTE_PARAMETER_LIST_KEY, parameterDef);
-        // installMechanics(parameterDef, prototype, propertyKey, '@VisitParameterList');
+        installMechanics(parameterDef, prototype, propertyKey, '@VisitParameterList');
     };
 }
 
@@ -12605,5 +11720,5 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.9", ngImpor
  * Generated bundle index. Do not edit.
  */
 
-export { ACTIVITY_DATA, ALERT_CONFIG, AUP_PLACE_CONFIG, AUP_TABLE_VIRTUAL_SCROLL_BUFFER_MULTIPLIER, AUP_UNAUTHORISED_PLACE_NOTICE_COMPONENT, AbstractActivityTriggerComponent, AbstractCardContainerComponent, AbstractCellRenderer, AbstractConfirmDialogComponent, AbstractDialogComponent, AbstractInputComponent, AbstractInteractionContext, AbstractListInputComponent, AbstractPlaceNavigationComponent, AbstractPopStateNavigation, AbstractPopupMenuComponent, AbstractTableComponent, AbstractTableModel, AbstractValueInputComponent, Activity, ActivityActionsComponent, ActivityBodyComponent, ActivityContainerComponent, ActivityOutletComponent, ActivityRef, ActivityTitleComponent, AddCardActivityComponent, AddItemInteractionContextComponent, Alert, AlertDialogComponent, AngularUiPowerupsModule, AutocompleteInputComponent, Bounds, BusyOverlayComponent, CELL_EDITOR_PORTAL, CELL_RENDERER_PORTAL, CardContainerComponent, CellEditorPortalRef, CellFooterPortalRef, CellHeaderPortalRef, CellPortalRef, CellRendererPortalRef, CheckboxInputComponent, ColumnManager, ColumnModel, ColumnOrderManager, ColumnTemplateDirective, ColumnTextSearchFormatter, CommandComponent, CommandContainer, CommandDirective, CommandFace, CommandFaceComponent, ComponentCellRendererPortalRef, ComponentsModule, ConfirmThenDialogComponent, ConfirmThenExecuteDialogComponent, ConfirmationDialogComponent, ConsolidatedParameterMap, CustomTemplateColumnModel, CustomValueColumnModel, DEFINITION_META_DATA_KEY, DIALOG_INTERACTION_SERVICE_DEFAULTS, DecoratedTreeNode, DefaultCellRendererComponent, DefaultHeaderCellRendererComponent, DialogInteractionContext, DialogInteractionContextFactory, Dimension, DirectivesModule, DisposableComponent, EditRowControlsComponent, EditSession, EditorControlColumnModel, EmptyStateComponent, EnableCellTextSearch, EventCleanUpSession, FOOTER_CELL_RENDERER_PORTAL, FlattenedTreeListModel, FlexComponent, FocusBinding, FocusBindingDirective, FocusBindingFactory, FocusContainerComponent, FocusableComponent, FooterRowModel, Formatter, GarbageCollectorDirective, HEADER_CELL_RENDERER_PORTAL, HighlightPipe, HighlightTextModelDirective, HorizontalAlignment, INTERACTION_CONTEXT, IconComponent, InPlaceInteractionContextComponent, InlineActivityTriggerComponent, InlineEditorModel, InlineStringEditorComponent, InputActivity, InteractionContextTriggerForDirective, InteractionModule, InteractionService, InteractionServiceRoutingAdapter, Keys, LEFT_RIGHT_PLACE_ANIMATION, LabelledValueComponent, ListPlaceNavComponent, ListPropertyColumnModel, LoadableComponent, LoadingContainerComponent, MarkdownComponent, MarkdownService, ModalActivityTriggerComponent, ModalInteractionContextFactory, MoreMenuComponent, MultipleSelectInputComponent, Navigating, NavigatingDuringInteraction, NavigationContext, NavigationSession, NoopAuthGuard, NoopComponent, NotAuthorisedNoticeComponent, NumberInputComponent, POPUP_CONTAINER, PORTAL_EDITOR_COMPONENT, PORTAL_RENDERER_COMPONENT, PaginatorComponent, ParameterDefinition, PasswordInputComponent, Place, PlaceAccessGuard, PlaceAuthService, PlaceComponent, PlaceComponentDeactivationHandler, PlaceDefinition, PlaceGuard, PlaceHistory, PlaceModule, PlaceOutletComponent, PlaceRouter, Point, PopStateDuringInteractionNavigation, PopStateNavigation, PopupActivityTriggerComponent, PopupAwareComponent, PopupInteractionContextComponent, PopupMenuComponent, PopupMenuRendererComponent, PropertyColumnModel, ROUTE_PARAMETER_LIST_KEY, RemoveLastInteractionFromUrlNavigationSession, ResizeAwareComponent, ResizeObserverDirective, RouteId, ScrollContainerComponent, SearchInputComponent, SectionHeaderComponent, SelectInputActivity, SelectInputComponent, SelectionCellComponent, SelectionColumnModel, SelectionHeaderCellComponent, SeparatorComponent, SidePlaceNavigationComponent, SlideDownInteractionContextComponent, StringInputActivity, StringInputComponent, SwitchCaseComponent, SwitchCaseDefaultDirective, SwitchCaseOption, SwitchCaseWhenDirective, SynchroniseInteractionContextIdsWithRoute, TabbedPlaceNavigationComponent, TableBodyComponent, TableCellComponent, TableComponent, TableFilterModel, TableFooterRow, TableHeaderCellComponent, TableModel, TableMoreMenuComponent, TableMoreMenuPopupComponent, TableRowAttributesDirective, TableRowMenuComponent, TemplateCellRendererPortalRef, TextInputComponent, TextSearchContext, ToolBarComponent, Track, TreeExpansionModel, TreeInheritanceIconComponent, TreeLabelCellRendererComponent, TreeLabelColumnModel, TreeTableComponent, TreeTableModel, UrlService, UrlSnapshot, VerticalFocusContainerComponent, VisibilityService, Visit, VisitParameter, VisitParameterList, VisitSegment, VisitSegmentSanitiser, WaitUntilLeavingInteractionTransitionCancelled, WaitUntilLinkTriggeredNavigationInteractionCancellationTypeDetermined, WaitUntilPopStateDuringCanDeactivateInteractionFinishes, leftRightPlaceAnimation, markdownPillExtension, slideDownAndRightOnEnterAnimation, slideDownOnEnterAnimation, slideDownWhenOpenAnimation, slideRightOnEnterAnimation, treeNodeDecorator };
+export { ACTIVITY_DATA, ALERT_CONFIG, AUP_PLACE_CONFIG, AUP_UNAUTHORISED_PLACE_NOTICE_COMPONENT, AbstractActivityTriggerComponent, AbstractCardContainerComponent, AbstractConfirmDialogComponent, AbstractDialogComponent, AbstractInputComponent, AbstractInteractionContext, AbstractListInputComponent, AbstractPlaceNavigationComponent, AbstractPopStateNavigation, AbstractPopupMenuComponent, AbstractTableComponent, AbstractTableModel, AbstractValueInputComponent, Activity, ActivityActionsComponent, ActivityBodyComponent, ActivityContainerComponent, ActivityOutletComponent, ActivityRef, ActivityTitleComponent, AddCardActivityComponent, AddItemInteractionContextComponent, Alert, AlertDialogComponent, AngularUiPowerupsModule, AutocompleteInputComponent, Bounds, BusyOverlayComponent, CELL_EDITOR_PORTAL, CELL_RENDERER_PORTAL, CardContainerComponent, CellEditorPortalRef, CellHeaderPortalRef, CellPortalRef, CellRendererPortalRef, CheckboxInputComponent, ColumnListModel, ColumnModel, ColumnTemplateDirective, ColumnTextSearchFormatter, CommandComponent, CommandContainer, CommandDirective, CommandFace, CommandFaceComponent, ComponentCellRendererPortalRef, ComponentsModule, ConfirmThenDialogComponent, ConfirmThenExecuteDialogComponent, ConfirmationDialogComponent, ConsolidatedParameterMap, CustomTemplateColumnModel, CustomValueColumnModel, DEFINITION_META_DATA_KEY, DIALOG_INTERACTION_SERVICE_DEFAULTS, DecoratedTreeNode, DefaultCellRendererComponent, DefaultHeaderCellRendererComponent, DialogInteractionContext, DialogInteractionContextFactory, Dimension, DirectivesModule, DisposableComponent, EditRowControlsComponent, EditSession, EditorControlColumnModel, EmptyStateComponent, EnableCellTextSearch, EventCleanUpSession, FlattenedTreeListModel, FlexComponent, FocusBinding, FocusBindingDirective, FocusBindingFactory, FocusContainerComponent, FocusableComponent, Formatter, GarbageCollectorDirective, HEADER_CELL_RENDERER_PORTAL, HighlightPipe, HighlightTextModelDirective, HorizontalAlignment, IconComponent, InPlaceInteractionContextComponent, InlineActivityTriggerComponent, InlineEditorModel, InlineStringEditorComponent, InputActivity, InteractionContextTriggerForDirective, InteractionModule, InteractionService, InteractionServiceRoutingAdapter, Keys, LEFT_RIGHT_PLACE_ANIMATION, LabelledValueComponent, ListPlaceNavComponent, ListPropertyColumnModel, LoadingContainerComponent, MarkdownComponent, MarkdownService, ModalActivityTriggerComponent, ModalInteractionContextFactory, MoreMenuComponent, MultipleSelectInputComponent, Navigating, NavigatingDuringInteraction, NavigationContext, NavigationSession, NoopAuthGuard, NoopComponent, NotAuthorisedNoticeComponent, NumberInputComponent, POPUP_CONTAINER, PORTAL_EDITOR_COMPONENT, PORTAL_RENDERER_COMPONENT, PaginatorComponent, ParameterDefinition, PasswordInputComponent, Place, PlaceAccessGuard, PlaceAuthService, PlaceComponent, PlaceComponentDeactivationHandler, PlaceDefinition, PlaceGuard, PlaceHistory, PlaceModule, PlaceOutletComponent, PlaceRouter, Point, PopStateDuringInteractionNavigation, PopStateNavigation, PopupActivityTriggerComponent, PopupAwareComponent, PopupInteractionContextComponent, PopupMenuComponent, PopupMenuRendererComponent, PropertyColumnModel, ROUTE_PARAMETER_LIST_KEY, RemoveLastInteractionFromUrlNavigationSession, ResizeAwareComponent, RouteId, ScrollContainerComponent, SectionHeaderComponent, SelectInputActivity, SelectInputComponent, SelectionCellComponent, SelectionColumnModel, SelectionHeaderCellComponent, SeparatorComponent, SidePlaceNavigationComponent, StringInputActivity, StringInputComponent, SwitchCaseComponent, SwitchCaseDefaultDirective, SwitchCaseOption, SwitchCaseWhenDirective, SynchroniseInteractionContextIdsWithRoute, TabbedPlaceNavigationComponent, TableBodyComponent, TableCellComponent, TableComponent, TableFilterModel, TableHeaderCellComponent, TableModel, TableMoreMenuComponent, TableMoreMenuPopupComponent, TableRowMenuComponent, TemplateCellRendererPortalRef, TextInputComponent, ToolBarComponent, Track, TreeExpansionModel, TreeInheritanceIconComponent, TreeLabelCellRendererComponent, TreeLabelColumnModel, TreeTableComponent, TreeTableModel, UrlService, UrlSnapshot, VerticalFocusContainerComponent, VisibilityService, Visit, VisitParameter, VisitParameterList, VisitSegment, VisitSegmentSanitiser, WaitUntilLeavingInteractionTransitionCancelled, WaitUntilLinkTriggeredNavigationInteractionCancellationTypeDetermined, WaitUntilPopStateDuringCanDeactivateInteractionFinishes, leftRightPlaceAnimation, markdownPillExtension, slideDownAndRightOnEnterAnimation, slideDownOnEnterAnimation, slideRightOnEnterAnimation, treeNodeDecorator };
 //# sourceMappingURL=coolon-angular-ui-powerups.mjs.map