@coolon/angular-ui-powerups 16.1.0-alpha.298 → 16.1.0-alpha.300
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/assets/commands.scss +18 -0
- package/assets/styles.scss +1 -0
- package/esm2022/lib/directives/command.directive.mjs +16 -5
- package/fesm2022/coolon-angular-ui-powerups.mjs +14 -3
- package/fesm2022/coolon-angular-ui-powerups.mjs.map +1 -1
- package/lib/directives/command.directive.d.ts +4 -3
- package/package.json +1 -1
package/assets/commands.scss
CHANGED
|
@@ -1,3 +1,21 @@
|
|
|
1
|
+
@use 'sass:map';
|
|
2
|
+
@use '@angular/material' as mat;
|
|
3
|
+
|
|
1
4
|
:root {
|
|
2
5
|
--aup-command-face-icon-gap: 8px;
|
|
3
6
|
}
|
|
7
|
+
|
|
8
|
+
// A face's colour applies in a menu as it does on a button, so a Delete face with `color: warn`
|
|
9
|
+
// reads as warn wherever it is shown. Keyed on the colour attribute aup-command-face sets on itself,
|
|
10
|
+
// which covers aup's own menus and hand-built mat-menus alike. A disabled item keeps Material's
|
|
11
|
+
// faded look.
|
|
12
|
+
@mixin apply-theme($color-config, $typography-config) {
|
|
13
|
+
@each $palette in (primary, accent, warn) {
|
|
14
|
+
$color: mat.get-color-from-palette(map.get($color-config, $palette));
|
|
15
|
+
|
|
16
|
+
.mat-mdc-menu-item:not([disabled]) aup-command-face[color=#{$palette}] {
|
|
17
|
+
color: $color;
|
|
18
|
+
--mat-menu-item-icon-color: #{$color};
|
|
19
|
+
}
|
|
20
|
+
}
|
|
21
|
+
}
|
package/assets/styles.scss
CHANGED
|
@@ -26,6 +26,7 @@
|
|
|
26
26
|
@include activities.apply-theme($color-config, $typography);
|
|
27
27
|
@include pills.apply-theme($color-config, $typography);
|
|
28
28
|
@include place.apply-theme($color-config, $typography);
|
|
29
|
+
@include commands.apply-theme($color-config, $typography);
|
|
29
30
|
|
|
30
31
|
:root {
|
|
31
32
|
--aup-default-padding: var(--default-padding, 16px);
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/* eslint-disable @typescript-eslint/no-explicit-any -- command directive accepts arbitrary command shapes */
|
|
2
|
-
import { Directive, ElementRef, Host, HostListener, Inject, Input, Optional } from '@angular/core';
|
|
2
|
+
import { ChangeDetectorRef, Directive, ElementRef, Host, HostListener, Inject, Input, Optional } from '@angular/core';
|
|
3
3
|
import { MatButton } from '@angular/material/button';
|
|
4
4
|
import { MatMenu, MatMenuItem } from '@angular/material/menu';
|
|
5
5
|
import { assert, DelegatingValueModel, Dsl, GarbageCollector, lang, UnaryCommand } from '@coolon/pectin';
|
|
@@ -8,6 +8,7 @@ import * as i1 from "@angular/material/button";
|
|
|
8
8
|
import * as i2 from "@angular/material/menu";
|
|
9
9
|
export class CommandDirective extends GarbageCollector {
|
|
10
10
|
elementRef;
|
|
11
|
+
changeDetector;
|
|
11
12
|
_command;
|
|
12
13
|
_commandEnabled = this.registerDisposable(new DelegatingValueModel().withDefault(false));
|
|
13
14
|
matControl;
|
|
@@ -29,9 +30,10 @@ export class CommandDirective extends GarbageCollector {
|
|
|
29
30
|
return this._commandParameter;
|
|
30
31
|
}
|
|
31
32
|
preventDefault = true;
|
|
32
|
-
constructor(elementRef, matButton, matMenuItem, matMenu) {
|
|
33
|
+
constructor(elementRef, changeDetector, matButton, matMenuItem, matMenu) {
|
|
33
34
|
super();
|
|
34
35
|
this.elementRef = elementRef;
|
|
36
|
+
this.changeDetector = changeDetector;
|
|
35
37
|
// Material buttons and menu items don't respond to the disabled binding so we
|
|
36
38
|
// need to inject them from our host element and handle them manually.
|
|
37
39
|
this.matControl = matButton || matMenuItem;
|
|
@@ -60,9 +62,18 @@ export class CommandDirective extends GarbageCollector {
|
|
|
60
62
|
// for some reason mat-buttons kills the disabled host binding. It works on a regular button but for now
|
|
61
63
|
// we need to do this. The set timeout is required to prevent the button getting a expression changed
|
|
62
64
|
// when it's clicked.
|
|
65
|
+
//
|
|
66
|
+
// The Material control reads `disabled` in its own host bindings, which an OnPush view only reads
|
|
67
|
+
// again when it's checked, so the view is marked for check here. Without that, a check of the view
|
|
68
|
+
// between an earlier timeout and this one (the enabled state changing while a new input is applied)
|
|
69
|
+
// applied the earlier, stale state, and nothing checked it again: the button stayed disabled.
|
|
63
70
|
if (this.matControl) {
|
|
64
71
|
setTimeout(() => {
|
|
72
|
+
if (this.isDisposed()) {
|
|
73
|
+
return;
|
|
74
|
+
}
|
|
65
75
|
this.matControl.disabled = !enabled;
|
|
76
|
+
this.changeDetector.markForCheck();
|
|
66
77
|
}, 0);
|
|
67
78
|
}
|
|
68
79
|
if (!enabled) {
|
|
@@ -103,7 +114,7 @@ export class CommandDirective extends GarbageCollector {
|
|
|
103
114
|
console.warn('disabled command clicked, ignoring.');
|
|
104
115
|
}
|
|
105
116
|
}
|
|
106
|
-
static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.9", ngImport: i0, type: CommandDirective, deps: [{ token: ElementRef }, { token: i1.MatButton, host: true, optional: true }, { token: i2.MatMenuItem, host: true, optional: true }, { token: i2.MatMenu, optional: true }], target: i0.ɵɵFactoryTarget.Directive });
|
|
117
|
+
static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.9", ngImport: i0, type: CommandDirective, deps: [{ token: ElementRef }, { token: i0.ChangeDetectorRef }, { token: i1.MatButton, host: true, optional: true }, { token: i2.MatMenuItem, host: true, optional: true }, { token: i2.MatMenu, optional: true }], target: i0.ɵɵFactoryTarget.Directive });
|
|
107
118
|
static ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "14.0.0", version: "16.2.9", type: CommandDirective, selector: "[pectinCommand]", inputs: { pectinCommand: "pectinCommand", commandParameter: "commandParameter", preventDefault: "preventDefault" }, host: { listeners: { "click": "notifyClick($event)" } }, usesInheritance: true, ngImport: i0 });
|
|
108
119
|
}
|
|
109
120
|
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.9", ngImport: i0, type: CommandDirective, decorators: [{
|
|
@@ -115,7 +126,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.9", ngImpor
|
|
|
115
126
|
}], ctorParameters: function () { return [{ type: i0.ElementRef, decorators: [{
|
|
116
127
|
type: Inject,
|
|
117
128
|
args: [ElementRef]
|
|
118
|
-
}] }, { type: i1.MatButton, decorators: [{
|
|
129
|
+
}] }, { type: i0.ChangeDetectorRef }, { type: i1.MatButton, decorators: [{
|
|
119
130
|
type: Host
|
|
120
131
|
}, {
|
|
121
132
|
type: Optional
|
|
@@ -135,4 +146,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.9", ngImpor
|
|
|
135
146
|
type: HostListener,
|
|
136
147
|
args: ['click', ['$event']]
|
|
137
148
|
}] } });
|
|
138
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"command.directive.js","sourceRoot":"","sources":["../../../../../../libs/angular-ui-powerups/src/lib/directives/command.directive.ts"],"names":[],"mappings":"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","sourcesContent":["/* eslint-disable @typescript-eslint/no-explicit-any -- command directive accepts arbitrary command shapes */\nimport {\n  AfterViewInit,\n  Directive,\n  ElementRef,\n  Host,\n  HostListener,\n  Inject,\n  Input,\n  OnDestroy,\n  OnInit,\n  Optional\n} from '@angular/core';\nimport {MatButton} from '@angular/material/button';\nimport {MatMenu, MatMenuItem} from '@angular/material/menu';\nimport {assert, Command, DelegatingValueModel, Dsl, GarbageCollector, lang, Trace, UnaryCommand} from '@coolon/pectin';\n\n@Directive({\n  // eslint-disable-next-line @angular-eslint/directive-selector\n  selector: '[pectinCommand]'\n})\nexport class CommandDirective<P = any> extends GarbageCollector implements OnInit, OnDestroy, AfterViewInit {\n\n  private _command: Command<any> | UnaryCommand<P>;\n  private _commandEnabled = this.registerDisposable(new DelegatingValueModel<boolean>().withDefault(false));\n  private matControl: MatButton | MatMenuItem;\n  private isInPopupMenu: boolean;\n\n  @Input()\n  set pectinCommand(command: Command<any> | UnaryCommand<P>) {\n    this._command = command;\n    this._commandEnabled.setDelegate(command ? command.enabled$ : null);\n  }\n\n  get pectinCommand(): Command<any> | UnaryCommand<P> {\n    return this._command;\n  }\n\n  private _commandParameter: P;\n  private _commandParameterProvided = false;\n\n  @Input()\n  set commandParameter(value: P) {\n    this._commandParameterProvided = true;\n    this._commandParameter = value;\n  }\n\n  get commandParameter(): P {\n    return this._commandParameter;\n  }\n\n  @Input() preventDefault = true\n\n  constructor(\n    @Inject(ElementRef) private elementRef: ElementRef,\n    @Host() @Optional() matButton: MatButton,\n    @Host() @Optional() matMenuItem: MatMenuItem,\n    @Optional() matMenu?: MatMenu\n  ) {\n    super();\n    // Material buttons and menu items don't respond to the disabled binding so we\n    // need to inject them from our host element and handle them manually.\n    this.matControl = matButton || matMenuItem;\n    this.isInPopupMenu = !!matMenu;\n  }\n\n  ngOnInit(): void {\n    assert.notNil(this.pectinCommand);\n    if (this.pectinCommand instanceof UnaryCommand) {\n      if (!this._commandParameterProvided) {\n        lang.illegalState('UnaryCommands require the command parameter to be specified.');\n      }\n    } else {\n      if (this._commandParameterProvided) {\n        lang.illegalState('command parameters are only supported by UnaryCommands');\n      }\n    }\n  }\n\n  ngAfterViewInit(): void {\n    const {when} = Dsl.disposeWith(this);\n    when(this._commandEnabled).changes(enabled => this.updateEnabledState(enabled), {\n      initialValue: 'triggerChange'\n    });\n  }\n\n  updateEnabledState(enabled: boolean) {\n    // for some reason mat-buttons kills the disabled host binding.  It works on a regular button but for now\n    // we need to do this. The set timeout is required to prevent the button getting a expression changed\n    // when it's clicked.\n    if (this.matControl) {\n      setTimeout(() => {\n        this.matControl.disabled = !enabled;\n      }, 0);\n    }\n    if (!enabled) {\n      // Note:\n      // We can't use a host binding here for disabled as the directive can be used on arbitrary\n      // components (e.g. divs) and the compiler will barf if we use the host binding.\n      this.elementRef.nativeElement.setAttribute('disabled', 'disabled');\n      if (this.elementRef.nativeElement.tagName === 'A') {\n        this.elementRef.nativeElement.removeAttribute('href');\n      }\n    } else {\n      this.elementRef.nativeElement.removeAttribute('disabled');\n      if (this.elementRef.nativeElement.tagName === 'A') {\n        this.elementRef.nativeElement.setAttribute('href', 'javascript:void');\n      }\n    }\n  }\n\n  ngOnDestroy(): void {\n    this.dispose();\n  }\n\n\n  @HostListener('click', ['$event'])\n  notifyClick($event: Event) {\n    if (!this.isInPopupMenu) {\n      // material popup menus use bubbling to close so we need to let it bubble or\n      // the menu won't close\n      $event.preventDefault();\n      $event.stopPropagation();\n    }\n    if (this.pectinCommand.enabled$.value) {\n      if (this.pectinCommand instanceof UnaryCommand) {\n        this.pectinCommand.withContext({event: $event}).execute(this.commandParameter);\n      } else {\n        this.pectinCommand.withContext({event: $event}).execute();\n      }\n    } else {\n      console.warn('disabled command clicked, ignoring.');\n    }\n  }\n}\n"]}
|
|
149
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"command.directive.js","sourceRoot":"","sources":["../../../../../../libs/angular-ui-powerups/src/lib/directives/command.directive.ts"],"names":[],"mappings":"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","sourcesContent":["/* eslint-disable @typescript-eslint/no-explicit-any -- command directive accepts arbitrary command shapes */\nimport {\n  AfterViewInit,\n  ChangeDetectorRef,\n  Directive,\n  ElementRef,\n  Host,\n  HostListener,\n  Inject,\n  Input,\n  OnDestroy,\n  OnInit,\n  Optional\n} from '@angular/core';\nimport {MatButton} from '@angular/material/button';\nimport {MatMenu, MatMenuItem} from '@angular/material/menu';\nimport {assert, Command, DelegatingValueModel, Dsl, GarbageCollector, lang, Trace, UnaryCommand} from '@coolon/pectin';\n\n@Directive({\n  // eslint-disable-next-line @angular-eslint/directive-selector\n  selector: '[pectinCommand]'\n})\nexport class CommandDirective<P = any> extends GarbageCollector implements OnInit, OnDestroy, AfterViewInit {\n\n  private _command: Command<any> | UnaryCommand<P>;\n  private _commandEnabled = this.registerDisposable(new DelegatingValueModel<boolean>().withDefault(false));\n  private matControl: MatButton | MatMenuItem;\n  private isInPopupMenu: boolean;\n\n  @Input()\n  set pectinCommand(command: Command<any> | UnaryCommand<P>) {\n    this._command = command;\n    this._commandEnabled.setDelegate(command ? command.enabled$ : null);\n  }\n\n  get pectinCommand(): Command<any> | UnaryCommand<P> {\n    return this._command;\n  }\n\n  private _commandParameter: P;\n  private _commandParameterProvided = false;\n\n  @Input()\n  set commandParameter(value: P) {\n    this._commandParameterProvided = true;\n    this._commandParameter = value;\n  }\n\n  get commandParameter(): P {\n    return this._commandParameter;\n  }\n\n  @Input() preventDefault = true\n\n  constructor(\n    @Inject(ElementRef) private elementRef: ElementRef,\n    private readonly changeDetector: ChangeDetectorRef,\n    @Host() @Optional() matButton: MatButton,\n    @Host() @Optional() matMenuItem: MatMenuItem,\n    @Optional() matMenu?: MatMenu\n  ) {\n    super();\n    // Material buttons and menu items don't respond to the disabled binding so we\n    // need to inject them from our host element and handle them manually.\n    this.matControl = matButton || matMenuItem;\n    this.isInPopupMenu = !!matMenu;\n  }\n\n  ngOnInit(): void {\n    assert.notNil(this.pectinCommand);\n    if (this.pectinCommand instanceof UnaryCommand) {\n      if (!this._commandParameterProvided) {\n        lang.illegalState('UnaryCommands require the command parameter to be specified.');\n      }\n    } else {\n      if (this._commandParameterProvided) {\n        lang.illegalState('command parameters are only supported by UnaryCommands');\n      }\n    }\n  }\n\n  ngAfterViewInit(): void {\n    const {when} = Dsl.disposeWith(this);\n    when(this._commandEnabled).changes(enabled => this.updateEnabledState(enabled), {\n      initialValue: 'triggerChange'\n    });\n  }\n\n  updateEnabledState(enabled: boolean) {\n    // for some reason mat-buttons kills the disabled host binding.  It works on a regular button but for now\n    // we need to do this. The set timeout is required to prevent the button getting a expression changed\n    // when it's clicked.\n    //\n    // The Material control reads `disabled` in its own host bindings, which an OnPush view only reads\n    // again when it's checked, so the view is marked for check here. Without that, a check of the view\n    // between an earlier timeout and this one (the enabled state changing while a new input is applied)\n    // applied the earlier, stale state, and nothing checked it again: the button stayed disabled.\n    if (this.matControl) {\n      setTimeout(() => {\n        if (this.isDisposed()) {\n          return;\n        }\n        this.matControl.disabled = !enabled;\n        this.changeDetector.markForCheck();\n      }, 0);\n    }\n    if (!enabled) {\n      // Note:\n      // We can't use a host binding here for disabled as the directive can be used on arbitrary\n      // components (e.g. divs) and the compiler will barf if we use the host binding.\n      this.elementRef.nativeElement.setAttribute('disabled', 'disabled');\n      if (this.elementRef.nativeElement.tagName === 'A') {\n        this.elementRef.nativeElement.removeAttribute('href');\n      }\n    } else {\n      this.elementRef.nativeElement.removeAttribute('disabled');\n      if (this.elementRef.nativeElement.tagName === 'A') {\n        this.elementRef.nativeElement.setAttribute('href', 'javascript:void');\n      }\n    }\n  }\n\n  ngOnDestroy(): void {\n    this.dispose();\n  }\n\n\n  @HostListener('click', ['$event'])\n  notifyClick($event: Event) {\n    if (!this.isInPopupMenu) {\n      // material popup menus use bubbling to close so we need to let it bubble or\n      // the menu won't close\n      $event.preventDefault();\n      $event.stopPropagation();\n    }\n    if (this.pectinCommand.enabled$.value) {\n      if (this.pectinCommand instanceof UnaryCommand) {\n        this.pectinCommand.withContext({event: $event}).execute(this.commandParameter);\n      } else {\n        this.pectinCommand.withContext({event: $event}).execute();\n      }\n    } else {\n      console.warn('disabled command clicked, ignoring.');\n    }\n  }\n}\n"]}
|
|
@@ -163,6 +163,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.9", ngImpor
|
|
|
163
163
|
/* eslint-disable @typescript-eslint/no-explicit-any -- command directive accepts arbitrary command shapes */
|
|
164
164
|
class CommandDirective extends GarbageCollector {
|
|
165
165
|
elementRef;
|
|
166
|
+
changeDetector;
|
|
166
167
|
_command;
|
|
167
168
|
_commandEnabled = this.registerDisposable(new DelegatingValueModel().withDefault(false));
|
|
168
169
|
matControl;
|
|
@@ -184,9 +185,10 @@ class CommandDirective extends GarbageCollector {
|
|
|
184
185
|
return this._commandParameter;
|
|
185
186
|
}
|
|
186
187
|
preventDefault = true;
|
|
187
|
-
constructor(elementRef, matButton, matMenuItem, matMenu) {
|
|
188
|
+
constructor(elementRef, changeDetector, matButton, matMenuItem, matMenu) {
|
|
188
189
|
super();
|
|
189
190
|
this.elementRef = elementRef;
|
|
191
|
+
this.changeDetector = changeDetector;
|
|
190
192
|
// Material buttons and menu items don't respond to the disabled binding so we
|
|
191
193
|
// need to inject them from our host element and handle them manually.
|
|
192
194
|
this.matControl = matButton || matMenuItem;
|
|
@@ -215,9 +217,18 @@ class CommandDirective extends GarbageCollector {
|
|
|
215
217
|
// for some reason mat-buttons kills the disabled host binding. It works on a regular button but for now
|
|
216
218
|
// we need to do this. The set timeout is required to prevent the button getting a expression changed
|
|
217
219
|
// when it's clicked.
|
|
220
|
+
//
|
|
221
|
+
// The Material control reads `disabled` in its own host bindings, which an OnPush view only reads
|
|
222
|
+
// again when it's checked, so the view is marked for check here. Without that, a check of the view
|
|
223
|
+
// between an earlier timeout and this one (the enabled state changing while a new input is applied)
|
|
224
|
+
// applied the earlier, stale state, and nothing checked it again: the button stayed disabled.
|
|
218
225
|
if (this.matControl) {
|
|
219
226
|
setTimeout(() => {
|
|
227
|
+
if (this.isDisposed()) {
|
|
228
|
+
return;
|
|
229
|
+
}
|
|
220
230
|
this.matControl.disabled = !enabled;
|
|
231
|
+
this.changeDetector.markForCheck();
|
|
221
232
|
}, 0);
|
|
222
233
|
}
|
|
223
234
|
if (!enabled) {
|
|
@@ -258,7 +269,7 @@ class CommandDirective extends GarbageCollector {
|
|
|
258
269
|
console.warn('disabled command clicked, ignoring.');
|
|
259
270
|
}
|
|
260
271
|
}
|
|
261
|
-
static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.9", ngImport: i0, type: CommandDirective, deps: [{ token: ElementRef }, { token: i2.MatButton, host: true, optional: true }, { token: i2$1.MatMenuItem, host: true, optional: true }, { token: i2$1.MatMenu, optional: true }], target: i0.ɵɵFactoryTarget.Directive });
|
|
272
|
+
static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.9", ngImport: i0, type: CommandDirective, deps: [{ token: ElementRef }, { token: i0.ChangeDetectorRef }, { token: i2.MatButton, host: true, optional: true }, { token: i2$1.MatMenuItem, host: true, optional: true }, { token: i2$1.MatMenu, optional: true }], target: i0.ɵɵFactoryTarget.Directive });
|
|
262
273
|
static ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "14.0.0", version: "16.2.9", type: CommandDirective, selector: "[pectinCommand]", inputs: { pectinCommand: "pectinCommand", commandParameter: "commandParameter", preventDefault: "preventDefault" }, host: { listeners: { "click": "notifyClick($event)" } }, usesInheritance: true, ngImport: i0 });
|
|
263
274
|
}
|
|
264
275
|
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.9", ngImport: i0, type: CommandDirective, decorators: [{
|
|
@@ -270,7 +281,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.9", ngImpor
|
|
|
270
281
|
}], ctorParameters: function () { return [{ type: i0.ElementRef, decorators: [{
|
|
271
282
|
type: Inject,
|
|
272
283
|
args: [ElementRef]
|
|
273
|
-
}] }, { type: i2.MatButton, decorators: [{
|
|
284
|
+
}] }, { type: i0.ChangeDetectorRef }, { type: i2.MatButton, decorators: [{
|
|
274
285
|
type: Host
|
|
275
286
|
}, {
|
|
276
287
|
type: Optional
|