@coolon/angular-ui-powerups 16.1.0-alpha.294 → 16.1.0-alpha.295

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.
@@ -44,29 +44,36 @@ export class DialogInteractionContext extends AbstractInteractionContext {
44
44
  }
45
45
  };
46
46
  const matDialogRef = this.dialogService.open(ActivityContainerComponent, config);
47
+ // Everything below works on this dialog's own container, never the activityContainer field.
48
+ // The field tracks the *current* dialog, and the next one can claim it while this one is still
49
+ // closing: MatDialog's exit animation (75ms) is shorter than its enter (150ms), so a dialog
50
+ // opened as this one closes sees this one's afterClosed land before its own afterOpened.
47
51
  const activityContainer = this.activityContainer = matDialogRef.componentInstance;
48
- this.activityContainer.initialise(this.identifier, this.api);
49
- const activityResult = this.activityContainer.startActivity(activityType, data);
52
+ activityContainer.initialise(this.identifier, this.api);
53
+ const activityResult = activityContainer.startActivity(activityType, data);
50
54
  // Tear the overlay down the moment the activity completes — decoupled from route sync. The
51
55
  // route sync still runs (via activityResult / waitActivitiesSynchronised) but can wedge under
52
56
  // some browser/extension combinations; gating close() on it would leave a stranded backdrop.
53
57
  activityContainer.onceInactive(() => matDialogRef.close());
54
58
  // Backstop: also close when the (route-synced) result settles, in case the inactive signal is
55
59
  // ever missed. MatDialogRef.close() is idempotent, so a second call is a harmless no-op.
56
- activityResult.finally(() => matDialogRef.close());
60
+ // then(close, close), not finally(close): finally's promise re-rejects on a cancel and nothing
61
+ // holds it. zone.js 0.13 happens not to report that, but native promises (zoneless) would.
62
+ const close = () => matDialogRef.close();
63
+ activityResult.then(close, close);
57
64
  // we need to check if our onDone/onCancel methods above we called or if we were
58
65
  // closed by the user clicking the backdrop. If the later then we need to cancel our
59
66
  // activity.
60
67
  if (enableCloseOnBackdropClick) {
61
68
  matDialogRef.backdropClick().subscribe(event => {
62
- if (this.canClose(options)) {
69
+ if (this.canClose(activityContainer, options)) {
63
70
  activityContainer.cancelActiveActivity();
64
71
  }
65
72
  });
66
73
  }
67
74
  matDialogRef.keydownEvents().subscribe(event => {
68
75
  if (event.key === 'Escape') {
69
- if (this.canClose(options)) {
76
+ if (this.canClose(activityContainer, options)) {
70
77
  activityContainer.cancelActiveActivity();
71
78
  }
72
79
  }
@@ -75,18 +82,22 @@ export class DialogInteractionContext extends AbstractInteractionContext {
75
82
  if (activityContainer.isActive()) {
76
83
  activityContainer.cancelActiveActivity();
77
84
  }
78
- this.activityContainer = null;
85
+ // Release the field only if it's still ours: nulling a successor's would orphan the live
86
+ // dialog (isActive() false, its afterOpened and Escape handlers reading null).
87
+ if (this.activityContainer === activityContainer) {
88
+ this.activityContainer = null;
89
+ }
79
90
  });
80
91
  matDialogRef.updateSize();
81
92
  matDialogRef.afterOpened().subscribe(promiseAlreadyFinished => {
82
93
  matDialogRef.updateSize();
83
- this.activityContainer.notifyReady(true);
94
+ activityContainer.notifyReady(true);
84
95
  });
85
96
  return activityResult;
86
97
  }
87
- canClose(options) {
98
+ canClose(activityContainer, options) {
88
99
  const disableClose = Opts.get(options).getOptional('disableClose', false);
89
- return this.activityContainer.isActive() && (!this.activityContainer.disableClose && !disableClose);
100
+ return activityContainer.isActive() && (!activityContainer.disableClose && !disableClose);
90
101
  }
91
102
  }
92
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"dialog-interaction-context.js","sourceRoot":"","sources":["../../../../../../../../libs/angular-ui-powerups/src/lib/interaction/services/mat-dialog-interaction/dialog-interaction-context.ts"],"names":[],"mappings":"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","sourcesContent":["import { MatDialog, MatDialogConfig, MatDialogRef } from '@angular/material/dialog';\nimport { Constructable, Disposable, GarbageCollector, lang } from '@coolon/pectin';\nimport { assert, Opts } from '@coolon/typescript-utilities';\nimport {AbstractInteractionContext} from '../../abstract-interaction-context';\nimport type {Activity} from '../../activity';\nimport type {ActivityRef} from '../../activity-ref';\nimport {ActivityContainerComponent} from '../../components/activity-container/activity-container.component';\nimport type {InteractionContext} from '../../interaction-context';\nimport type {InteractionService} from '../interaction.service';\n\nexport class DialogInteractionContext extends AbstractInteractionContext {\n\n  private garbage = new GarbageCollector();\n  private _currentActivityRef: ActivityRef<unknown, unknown, unknown>;\n  private activityContainer: ActivityContainerComponent<unknown, unknown, unknown>;\n\n  constructor(readonly identifier: string,\n              private readonly api: InteractionService.Api,\n              private readonly dialogService: MatDialog,\n              readonly config: MatDialogConfig) {\n    super();\n    assert.notNil(dialogService);\n  }\n\n  cancelActiveActivity(): Promise<boolean> {\n    return this.activityContainer.cancelActiveActivity();\n  }\n\n  dispose(): void {\n    if (this.isActive()) {\n      lang.illegalState('Dispose called while active.');\n    }\n    this.garbage.dispose();\n  }\n\n  registerDisposable<T extends Disposable>(disposable: T): T {\n    return this.garbage.registerDisposable(disposable);\n  }\n\n  isActive(): boolean {\n    return !!this.activityContainer && this.activityContainer.isActive();\n  }\n\n  protected createAndLaunchActivity<D, R, E>(activityType: Constructable<Activity<D, R, E>>, data: D, options?: InteractionContext.Options): Promise<R> {\n    assert.isNil(this._currentActivityRef);\n\n    const enableCloseOnBackdropClick = Opts.get(options).getOptional('enableCloseOnBackdropClick', false);\n    const config: MatDialogConfig = {\n      ...this.config,\n      ...{\n        disableClose: true, // we'll handle this ourselves\n        panelClass: 'dialog-interaction-context'\n      }\n    };\n    const matDialogRef = this.dialogService.open(ActivityContainerComponent, config) as MatDialogRef<ActivityContainerComponent<D, R, E>>;\n    const activityContainer = this.activityContainer = matDialogRef.componentInstance;\n    this.activityContainer.initialise(this.identifier, this.api);\n    const activityResult = this.activityContainer.startActivity(activityType, data);\n\n    // Tear the overlay down the moment the activity completes — decoupled from route sync. The\n    // route sync still runs (via activityResult / waitActivitiesSynchronised) but can wedge under\n    // some browser/extension combinations; gating close() on it would leave a stranded backdrop.\n    activityContainer.onceInactive(() => matDialogRef.close());\n    // Backstop: also close when the (route-synced) result settles, in case the inactive signal is\n    // ever missed. MatDialogRef.close() is idempotent, so a second call is a harmless no-op.\n    activityResult.finally(() => matDialogRef.close());\n    // we need to check if our onDone/onCancel methods above we called or if we were\n    // closed by the user clicking the backdrop.  If the later then we need to cancel our\n    // activity.\n    if (enableCloseOnBackdropClick) {\n      matDialogRef.backdropClick().subscribe(event => {\n        if (this.canClose(options)) {\n          activityContainer.cancelActiveActivity();\n        }\n      });\n    }\n\n    matDialogRef.keydownEvents().subscribe(event => {\n      if (event.key === 'Escape') {\n        if (this.canClose(options)) {\n          activityContainer.cancelActiveActivity();\n        }\n      }\n    });\n    matDialogRef.afterClosed().subscribe(promiseAlreadyFinished => {\n      if (activityContainer.isActive()) {\n        activityContainer.cancelActiveActivity();\n      }\n      this.activityContainer = null;\n    });\n    matDialogRef.updateSize();\n    matDialogRef.afterOpened().subscribe(promiseAlreadyFinished => {\n      matDialogRef.updateSize();\n      this.activityContainer.notifyReady(true);\n    });\n\n    return activityResult;\n  }\n\n  private canClose(options: InteractionContext.Options) {\n    const disableClose = Opts.get(options).getOptional('disableClose', false);\n    return this.activityContainer.isActive() && (!this.activityContainer.disableClose && !disableClose);\n  }\n}\n"]}
103
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"dialog-interaction-context.js","sourceRoot":"","sources":["../../../../../../../../libs/angular-ui-powerups/src/lib/interaction/services/mat-dialog-interaction/dialog-interaction-context.ts"],"names":[],"mappings":"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","sourcesContent":["import { MatDialog, MatDialogConfig, MatDialogRef } from '@angular/material/dialog';\nimport { Constructable, Disposable, GarbageCollector, lang } from '@coolon/pectin';\nimport { assert, Opts } from '@coolon/typescript-utilities';\nimport {AbstractInteractionContext} from '../../abstract-interaction-context';\nimport type {Activity} from '../../activity';\nimport type {ActivityRef} from '../../activity-ref';\nimport {ActivityContainerComponent} from '../../components/activity-container/activity-container.component';\nimport type {InteractionContext} from '../../interaction-context';\nimport type {InteractionService} from '../interaction.service';\n\nexport class DialogInteractionContext extends AbstractInteractionContext {\n\n  private garbage = new GarbageCollector();\n  private _currentActivityRef: ActivityRef<unknown, unknown, unknown>;\n  private activityContainer: ActivityContainerComponent<unknown, unknown, unknown>;\n\n  constructor(readonly identifier: string,\n              private readonly api: InteractionService.Api,\n              private readonly dialogService: MatDialog,\n              readonly config: MatDialogConfig) {\n    super();\n    assert.notNil(dialogService);\n  }\n\n  cancelActiveActivity(): Promise<boolean> {\n    return this.activityContainer.cancelActiveActivity();\n  }\n\n  dispose(): void {\n    if (this.isActive()) {\n      lang.illegalState('Dispose called while active.');\n    }\n    this.garbage.dispose();\n  }\n\n  registerDisposable<T extends Disposable>(disposable: T): T {\n    return this.garbage.registerDisposable(disposable);\n  }\n\n  isActive(): boolean {\n    return !!this.activityContainer && this.activityContainer.isActive();\n  }\n\n  protected createAndLaunchActivity<D, R, E>(activityType: Constructable<Activity<D, R, E>>, data: D, options?: InteractionContext.Options): Promise<R> {\n    assert.isNil(this._currentActivityRef);\n\n    const enableCloseOnBackdropClick = Opts.get(options).getOptional('enableCloseOnBackdropClick', false);\n    const config: MatDialogConfig = {\n      ...this.config,\n      ...{\n        disableClose: true, // we'll handle this ourselves\n        panelClass: 'dialog-interaction-context'\n      }\n    };\n    const matDialogRef = this.dialogService.open(ActivityContainerComponent, config) as MatDialogRef<ActivityContainerComponent<D, R, E>>;\n    // Everything below works on this dialog's own container, never the activityContainer field.\n    // The field tracks the *current* dialog, and the next one can claim it while this one is still\n    // closing: MatDialog's exit animation (75ms) is shorter than its enter (150ms), so a dialog\n    // opened as this one closes sees this one's afterClosed land before its own afterOpened.\n    const activityContainer = this.activityContainer = matDialogRef.componentInstance;\n    activityContainer.initialise(this.identifier, this.api);\n    const activityResult = activityContainer.startActivity(activityType, data);\n\n    // Tear the overlay down the moment the activity completes — decoupled from route sync. The\n    // route sync still runs (via activityResult / waitActivitiesSynchronised) but can wedge under\n    // some browser/extension combinations; gating close() on it would leave a stranded backdrop.\n    activityContainer.onceInactive(() => matDialogRef.close());\n    // Backstop: also close when the (route-synced) result settles, in case the inactive signal is\n    // ever missed. MatDialogRef.close() is idempotent, so a second call is a harmless no-op.\n    // then(close, close), not finally(close): finally's promise re-rejects on a cancel and nothing\n    // holds it. zone.js 0.13 happens not to report that, but native promises (zoneless) would.\n    const close = () => matDialogRef.close();\n    activityResult.then(close, close);\n    // we need to check if our onDone/onCancel methods above we called or if we were\n    // closed by the user clicking the backdrop.  If the later then we need to cancel our\n    // activity.\n    if (enableCloseOnBackdropClick) {\n      matDialogRef.backdropClick().subscribe(event => {\n        if (this.canClose(activityContainer, options)) {\n          activityContainer.cancelActiveActivity();\n        }\n      });\n    }\n\n    matDialogRef.keydownEvents().subscribe(event => {\n      if (event.key === 'Escape') {\n        if (this.canClose(activityContainer, options)) {\n          activityContainer.cancelActiveActivity();\n        }\n      }\n    });\n    matDialogRef.afterClosed().subscribe(promiseAlreadyFinished => {\n      if (activityContainer.isActive()) {\n        activityContainer.cancelActiveActivity();\n      }\n      // Release the field only if it's still ours: nulling a successor's would orphan the live\n      // dialog (isActive() false, its afterOpened and Escape handlers reading null).\n      if (this.activityContainer === activityContainer) {\n        this.activityContainer = null;\n      }\n    });\n    matDialogRef.updateSize();\n    matDialogRef.afterOpened().subscribe(promiseAlreadyFinished => {\n      matDialogRef.updateSize();\n      activityContainer.notifyReady(true);\n    });\n\n    return activityResult;\n  }\n\n  private canClose(activityContainer: ActivityContainerComponent<unknown, unknown, unknown>, options: InteractionContext.Options) {\n    const disableClose = Opts.get(options).getOptional('disableClose', false);\n    return activityContainer.isActive() && (!activityContainer.disableClose && !disableClose);\n  }\n}\n"]}
@@ -15239,29 +15239,36 @@ class DialogInteractionContext extends AbstractInteractionContext {
15239
15239
  }
15240
15240
  };
15241
15241
  const matDialogRef = this.dialogService.open(ActivityContainerComponent, config);
15242
+ // Everything below works on this dialog's own container, never the activityContainer field.
15243
+ // The field tracks the *current* dialog, and the next one can claim it while this one is still
15244
+ // closing: MatDialog's exit animation (75ms) is shorter than its enter (150ms), so a dialog
15245
+ // opened as this one closes sees this one's afterClosed land before its own afterOpened.
15242
15246
  const activityContainer = this.activityContainer = matDialogRef.componentInstance;
15243
- this.activityContainer.initialise(this.identifier, this.api);
15244
- const activityResult = this.activityContainer.startActivity(activityType, data);
15247
+ activityContainer.initialise(this.identifier, this.api);
15248
+ const activityResult = activityContainer.startActivity(activityType, data);
15245
15249
  // Tear the overlay down the moment the activity completes — decoupled from route sync. The
15246
15250
  // route sync still runs (via activityResult / waitActivitiesSynchronised) but can wedge under
15247
15251
  // some browser/extension combinations; gating close() on it would leave a stranded backdrop.
15248
15252
  activityContainer.onceInactive(() => matDialogRef.close());
15249
15253
  // Backstop: also close when the (route-synced) result settles, in case the inactive signal is
15250
15254
  // ever missed. MatDialogRef.close() is idempotent, so a second call is a harmless no-op.
15251
- activityResult.finally(() => matDialogRef.close());
15255
+ // then(close, close), not finally(close): finally's promise re-rejects on a cancel and nothing
15256
+ // holds it. zone.js 0.13 happens not to report that, but native promises (zoneless) would.
15257
+ const close = () => matDialogRef.close();
15258
+ activityResult.then(close, close);
15252
15259
  // we need to check if our onDone/onCancel methods above we called or if we were
15253
15260
  // closed by the user clicking the backdrop. If the later then we need to cancel our
15254
15261
  // activity.
15255
15262
  if (enableCloseOnBackdropClick) {
15256
15263
  matDialogRef.backdropClick().subscribe(event => {
15257
- if (this.canClose(options)) {
15264
+ if (this.canClose(activityContainer, options)) {
15258
15265
  activityContainer.cancelActiveActivity();
15259
15266
  }
15260
15267
  });
15261
15268
  }
15262
15269
  matDialogRef.keydownEvents().subscribe(event => {
15263
15270
  if (event.key === 'Escape') {
15264
- if (this.canClose(options)) {
15271
+ if (this.canClose(activityContainer, options)) {
15265
15272
  activityContainer.cancelActiveActivity();
15266
15273
  }
15267
15274
  }
@@ -15270,18 +15277,22 @@ class DialogInteractionContext extends AbstractInteractionContext {
15270
15277
  if (activityContainer.isActive()) {
15271
15278
  activityContainer.cancelActiveActivity();
15272
15279
  }
15273
- this.activityContainer = null;
15280
+ // Release the field only if it's still ours: nulling a successor's would orphan the live
15281
+ // dialog (isActive() false, its afterOpened and Escape handlers reading null).
15282
+ if (this.activityContainer === activityContainer) {
15283
+ this.activityContainer = null;
15284
+ }
15274
15285
  });
15275
15286
  matDialogRef.updateSize();
15276
15287
  matDialogRef.afterOpened().subscribe(promiseAlreadyFinished => {
15277
15288
  matDialogRef.updateSize();
15278
- this.activityContainer.notifyReady(true);
15289
+ activityContainer.notifyReady(true);
15279
15290
  });
15280
15291
  return activityResult;
15281
15292
  }
15282
- canClose(options) {
15293
+ canClose(activityContainer, options) {
15283
15294
  const disableClose = Opts.get(options).getOptional('disableClose', false);
15284
- return this.activityContainer.isActive() && (!this.activityContainer.disableClose && !disableClose);
15295
+ return activityContainer.isActive() && (!activityContainer.disableClose && !disableClose);
15285
15296
  }
15286
15297
  }
15287
15298