@dereekb/dbx-web 9.23.11 → 9.23.12

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.
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@dereekb/dbx-web/calendar",
3
- "version": "9.23.11",
3
+ "version": "9.23.12",
4
4
  "peerDependencies": {
5
5
  "@angular/common": "^14.2.0",
6
6
  "@angular/core": "^14.2.0",
@@ -8,7 +8,7 @@
8
8
  "rxjs": "^7.5.0",
9
9
  "@angular/material": "^14.2.0",
10
10
  "angular-calendar": "^0.30.1",
11
- "@dereekb/dbx-web": "9.23.11"
11
+ "@dereekb/dbx-web": "9.23.12"
12
12
  },
13
13
  "dependencies": {
14
14
  "tslib": "^2.3.0"
@@ -5,6 +5,7 @@ import { Subject, filter, first, map, shareReplay, startWith } from 'rxjs';
5
5
  import { PopoverPositionStrategy } from './popover.position.strategy';
6
6
  import { LockSet } from '@dereekb/rxjs';
7
7
  import { CompactContextStore, CompactMode } from '../../layout/compact';
8
+ import { asPromise } from '@dereekb/util';
8
9
  import { DbxPopoverController } from './popover';
9
10
  import * as i0 from "@angular/core";
10
11
  import * as i1 from "ng-overlay-container";
@@ -43,6 +44,20 @@ export class DbxPopoverComponent extends AbstractTransitionWatcherDirective {
43
44
  originalClose.call(this.popoverRef, x);
44
45
  }
45
46
  };
47
+ // Also intercept the _close function to capture backdropClose, etc.
48
+ const original_close = this.popoverRef._close;
49
+ this.popoverRef._close = (closeType, inputValue) => {
50
+ const closeWithValue = (value) => {
51
+ original_close.call(this.popoverRef, closeType, value);
52
+ };
53
+ if (closeType === 'close' || inputValue != null) {
54
+ closeWithValue(inputValue);
55
+ }
56
+ else {
57
+ // expected to be a backdrop close. Get the closing value then close.
58
+ this._useClosingValue(closeType, (x) => closeWithValue(x));
59
+ }
60
+ };
46
61
  // eslint-disable-next-line
47
62
  const overlay = popoverRef._overlay; // overlay is not publically accessible
48
63
  const elementRef = this.config.origin;
@@ -82,12 +97,8 @@ export class DbxPopoverComponent extends AbstractTransitionWatcherDirective {
82
97
  }
83
98
  // Popover Controls
84
99
  close() {
85
- if (!this._startedClosing && this.getClosingValueFn) {
86
- this.getClosingValueFn().then((x) => {
87
- this.return(x);
88
- }, () => {
89
- this.return();
90
- });
100
+ if (!this._startedClosing && this.getClosingValueFn != null) {
101
+ this._useClosingValue('close', (x) => this.return(x));
91
102
  }
92
103
  else {
93
104
  this.return();
@@ -97,6 +108,18 @@ export class DbxPopoverComponent extends AbstractTransitionWatcherDirective {
97
108
  this._closing.next();
98
109
  this.popoverRef.close(value);
99
110
  }
111
+ _useClosingValue(closeType, useValue) {
112
+ if (this.getClosingValueFn != null) {
113
+ asPromise(this.getClosingValueFn(this.data, closeType)).then((x) => {
114
+ useValue(x);
115
+ }, () => {
116
+ useValue();
117
+ });
118
+ }
119
+ else {
120
+ useValue();
121
+ }
122
+ }
100
123
  // Keypresses
101
124
  handleKeydown() {
102
125
  this.close();
@@ -135,4 +158,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.12", ngImpo
135
158
  ]
136
159
  }]
137
160
  }], ctorParameters: function () { return [{ type: i1.NgPopoverRef }, { type: i2.CompactContextStore }, { type: i3.DbxRouterTransitionService }, { type: i0.NgZone }]; } });
138
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"popover.component.js","sourceRoot":"","sources":["../../../../../../../packages/dbx-web/src/lib/interaction/popover/popover.component.ts"],"names":[],"mappings":"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","sourcesContent":["import { Component, NgZone, Type, OnInit, OnDestroy, ElementRef } from '@angular/core';\nimport { NgOverlayContainerConfiguration, NgPopoverRef } from 'ng-overlay-container';\nimport { AbstractTransitionWatcherDirective, DbxRouterTransitionService, DbxInjectionComponentConfig } from '@dereekb/dbx-core';\nimport { Subject, filter, first, map, shareReplay, startWith } from 'rxjs';\nimport { PopoverPositionStrategy } from './popover.position.strategy';\nimport { Overlay } from '@angular/cdk/overlay';\nimport { LockSet } from '@dereekb/rxjs';\nimport { CompactContextStore, CompactMode } from '../../layout/compact';\nimport { Maybe } from '@dereekb/util';\nimport { DbxPopoverController, DbxPopoverKey } from './popover';\n\nexport abstract class DbxPopoverComponentController<O, I> extends DbxPopoverController<O, I> {\n  getClosingValueFn?: (value?: I) => Promise<O>;\n}\n\nexport interface DbxPopoverComponentConfig<O, I, T> {\n  /**\n   * Key used for uniquely identifying a limited instance.\n   *\n   * Only one popover should exist at a time given a certain key.\n   */\n  key: DbxPopoverKey;\n  /**\n   * Origin element to position on.\n   */\n  origin: ElementRef;\n  /**\n   * Whether or not to close if a transition occurs.\n   */\n  closeOnTransition?: boolean;\n  /**\n   * Whether or not to dismiss when the escape button is pressed.\n   *\n   * False by default.\n   */\n  closeOnEscape?: boolean;\n  /**\n   * Component to inject into the popover.\n   */\n  componentClass: Type<T>;\n  /**\n   * Data available to the popover.\n   */\n  data?: Maybe<I>;\n  init?: (component: T, controller: DbxPopoverController<O, I>) => void;\n}\n\nexport interface FullDbxPopoverComponentConfig<O, I, T> extends DbxPopoverComponentConfig<O, I, T> {\n  configuration: NgOverlayContainerConfiguration;\n}\n\n/**\n * Popover component.\n */\n@Component({\n  template: `\n    <dbx-popover-coordinator (dbxWindowKeyDownListener)=\"handleKeydown()\" [appWindowKeyDownFilter]=\"triggerCloseKeys\">\n      <div dbxStyle class=\"dbx-popover-component\" dbx-injection [config]=\"contentConfig\"></div>\n    </dbx-popover-coordinator>\n  `,\n  providers: [\n    {\n      provide: DbxPopoverController,\n      useExisting: DbxPopoverComponent\n    },\n    {\n      provide: CompactContextStore\n    }\n  ]\n})\nexport class DbxPopoverComponent<O = unknown, I = unknown, T = unknown> extends AbstractTransitionWatcherDirective implements DbxPopoverController<O, I>, OnInit, OnDestroy {\n  readonly lockSet = new LockSet();\n\n  readonly contentConfig: DbxInjectionComponentConfig = {\n    componentClass: this.config.componentClass,\n    init: this.config.init ? (instance) => (this.config as Required<FullDbxPopoverComponentConfig<O, I, T>>).init(instance as T, this) : undefined\n  };\n\n  private _startedClosing = false;\n  private readonly _closing = new Subject<void>();\n\n  private _triggerCloseKeys: string[] = [];\n\n  readonly isClosing$ = this._closing.pipe(\n    first(),\n    map(() => true),\n    startWith(false),\n    shareReplay(1)\n  );\n  readonly closing$ = this.isClosing$.pipe(filter((x) => x));\n\n  getClosingValueFn?: (value?: I) => Promise<O>;\n\n  constructor(private popoverRef: NgPopoverRef<FullDbxPopoverComponentConfig<O, I, T>, O>, private compactContextState: CompactContextStore, dbxRouterTransitionService: DbxRouterTransitionService, ngZone: NgZone) {\n    super(dbxRouterTransitionService, ngZone);\n\n    // Override Close to properly signal to listeners when a close is occuring.\n    const originalClose = this.popoverRef.close;\n    this.popoverRef.close = (x) => {\n      if (!this._startedClosing) {\n        this.lockSet.lockForSeconds(1);\n        this._startedClosing = true;\n        this.close();\n        originalClose.call(this.popoverRef, x);\n      }\n    };\n\n    // eslint-disable-next-line\n    const overlay = (popoverRef as any)._overlay as Overlay; // overlay is not publically accessible\n    const elementRef = this.config.origin;\n    const configuration = this.config.configuration;\n\n    this.compactContextState.setMode(CompactMode.COMPACT);\n    const position = PopoverPositionStrategy.make(overlay, elementRef, configuration);\n    this.popoverRef.overlay.updatePositionStrategy(position);\n  }\n\n  get config(): FullDbxPopoverComponentConfig<O, I, T> {\n    return this.popoverRef.data;\n  }\n\n  get key(): DbxPopoverKey {\n    return this.config.key;\n  }\n\n  get data(): Maybe<I> {\n    return this.config.data;\n  }\n\n  get triggerCloseKeys(): string[] {\n    return this._triggerCloseKeys;\n  }\n\n  override ngOnInit(): void {\n    super.ngOnInit();\n\n    if (this.config.closeOnEscape) {\n      this._triggerCloseKeys = ['Escape'];\n    }\n  }\n\n  override ngOnDestroy(): void {\n    this.lockSet.destroyOnNextUnlock(() => {\n      super.ngOnDestroy();\n      this._closing.complete();\n    });\n  }\n\n  protected updateForSuccessfulTransition(): void {\n    if (this.config.closeOnTransition !== false) {\n      this.close();\n    }\n  }\n\n  // Popover Controls\n  public close(): void {\n    if (!this._startedClosing && this.getClosingValueFn) {\n      this.getClosingValueFn().then(\n        (x) => {\n          this.return(x);\n        },\n        () => {\n          this.return();\n        }\n      );\n    } else {\n      this.return();\n    }\n  }\n\n  public return(value?: O): void {\n    this._closing.next();\n    this.popoverRef.close(value);\n  }\n\n  // Keypresses\n  handleKeydown() {\n    this.close();\n  }\n}\n"]}
161
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"popover.component.js","sourceRoot":"","sources":["../../../../../../../packages/dbx-web/src/lib/interaction/popover/popover.component.ts"],"names":[],"mappings":"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","sourcesContent":["import { Component, NgZone, Type, OnInit, OnDestroy, ElementRef } from '@angular/core';\nimport { NgOverlayContainerConfiguration, NgPopoverCloseType, NgPopoverRef } from 'ng-overlay-container';\nimport { AbstractTransitionWatcherDirective, DbxRouterTransitionService, DbxInjectionComponentConfig } from '@dereekb/dbx-core';\nimport { Subject, filter, first, map, shareReplay, startWith } from 'rxjs';\nimport { PopoverPositionStrategy } from './popover.position.strategy';\nimport { Overlay } from '@angular/cdk/overlay';\nimport { LockSet } from '@dereekb/rxjs';\nimport { CompactContextStore, CompactMode } from '../../layout/compact';\nimport { asPromise, Maybe, PromiseOrValue } from '@dereekb/util';\nimport { DbxPopoverController, DbxPopoverKey } from './popover';\n\nexport abstract class DbxPopoverComponentController<O, I> extends DbxPopoverController<O, I> {\n  getClosingValueFn?: (value?: I) => Promise<O>;\n}\n\nexport interface DbxPopoverComponentConfig<O, I, T> {\n  /**\n   * Key used for uniquely identifying a limited instance.\n   *\n   * Only one popover should exist at a time given a certain key.\n   */\n  key: DbxPopoverKey;\n  /**\n   * Origin element to position on.\n   */\n  origin: ElementRef;\n  /**\n   * Whether or not to close if a transition occurs.\n   */\n  closeOnTransition?: boolean;\n  /**\n   * Whether or not to dismiss when the escape button is pressed.\n   *\n   * False by default.\n   */\n  closeOnEscape?: boolean;\n  /**\n   * Component to inject into the popover.\n   */\n  componentClass: Type<T>;\n  /**\n   * Data available to the popover.\n   */\n  data?: Maybe<I>;\n  init?: (component: T, controller: DbxPopoverController<O, I>) => void;\n}\n\nexport interface FullDbxPopoverComponentConfig<O, I, T> extends DbxPopoverComponentConfig<O, I, T> {\n  configuration: NgOverlayContainerConfiguration;\n}\n\n/**\n * Popover component.\n */\n@Component({\n  template: `\n    <dbx-popover-coordinator (dbxWindowKeyDownListener)=\"handleKeydown()\" [appWindowKeyDownFilter]=\"triggerCloseKeys\">\n      <div dbxStyle class=\"dbx-popover-component\" dbx-injection [config]=\"contentConfig\"></div>\n    </dbx-popover-coordinator>\n  `,\n  providers: [\n    {\n      provide: DbxPopoverController,\n      useExisting: DbxPopoverComponent\n    },\n    {\n      provide: CompactContextStore\n    }\n  ]\n})\nexport class DbxPopoverComponent<O = unknown, I = unknown, T = unknown> extends AbstractTransitionWatcherDirective implements DbxPopoverController<O, I>, OnInit, OnDestroy {\n  readonly lockSet = new LockSet();\n\n  readonly contentConfig: DbxInjectionComponentConfig = {\n    componentClass: this.config.componentClass,\n    init: this.config.init ? (instance) => (this.config as Required<FullDbxPopoverComponentConfig<O, I, T>>).init(instance as T, this) : undefined\n  };\n\n  private _startedClosing = false;\n  private readonly _closing = new Subject<void>();\n\n  private _triggerCloseKeys: string[] = [];\n\n  readonly isClosing$ = this._closing.pipe(\n    first(),\n    map(() => true),\n    startWith(false),\n    shareReplay(1)\n  );\n  readonly closing$ = this.isClosing$.pipe(filter((x) => x));\n\n  getClosingValueFn?: (value: Maybe<I>, closeType: NgPopoverCloseType) => PromiseOrValue<O | undefined>;\n\n  constructor(private popoverRef: NgPopoverRef<FullDbxPopoverComponentConfig<O, I, T>, O>, private compactContextState: CompactContextStore, dbxRouterTransitionService: DbxRouterTransitionService, ngZone: NgZone) {\n    super(dbxRouterTransitionService, ngZone);\n\n    // Override Close to properly signal to listeners when a close is occuring.\n    const originalClose = this.popoverRef.close;\n    this.popoverRef.close = (x) => {\n      if (!this._startedClosing) {\n        this.lockSet.lockForSeconds(1);\n        this._startedClosing = true;\n        this.close();\n        originalClose.call(this.popoverRef, x);\n      }\n    };\n\n    // Also intercept the _close function to capture backdropClose, etc.\n    const original_close = (this.popoverRef as any)._close;\n    (this.popoverRef as any)._close = (closeType: NgPopoverCloseType, inputValue: O | undefined) => {\n      const closeWithValue = (value?: O | undefined) => {\n        original_close.call(this.popoverRef, closeType, value);\n      };\n\n      if (closeType === 'close' || inputValue != null) {\n        closeWithValue(inputValue);\n      } else {\n        // expected to be a backdrop close. Get the closing value then close.\n        this._useClosingValue(closeType, (x) => closeWithValue(x));\n      }\n    };\n\n    // eslint-disable-next-line\n    const overlay = (popoverRef as any)._overlay as Overlay; // overlay is not publically accessible\n    const elementRef = this.config.origin;\n    const configuration = this.config.configuration;\n\n    this.compactContextState.setMode(CompactMode.COMPACT);\n    const position = PopoverPositionStrategy.make(overlay, elementRef, configuration);\n    this.popoverRef.overlay.updatePositionStrategy(position);\n  }\n\n  get config(): FullDbxPopoverComponentConfig<O, I, T> {\n    return this.popoverRef.data;\n  }\n\n  get key(): DbxPopoverKey {\n    return this.config.key;\n  }\n\n  get data(): Maybe<I> {\n    return this.config.data;\n  }\n\n  get triggerCloseKeys(): string[] {\n    return this._triggerCloseKeys;\n  }\n\n  override ngOnInit(): void {\n    super.ngOnInit();\n\n    if (this.config.closeOnEscape) {\n      this._triggerCloseKeys = ['Escape'];\n    }\n  }\n\n  override ngOnDestroy(): void {\n    this.lockSet.destroyOnNextUnlock(() => {\n      super.ngOnDestroy();\n      this._closing.complete();\n    });\n  }\n\n  protected updateForSuccessfulTransition(): void {\n    if (this.config.closeOnTransition !== false) {\n      this.close();\n    }\n  }\n\n  // Popover Controls\n  public close(): void {\n    if (!this._startedClosing && this.getClosingValueFn != null) {\n      this._useClosingValue('close', (x) => this.return(x));\n    } else {\n      this.return();\n    }\n  }\n\n  public return(value?: O | undefined): void {\n    this._closing.next();\n    this.popoverRef.close(value);\n  }\n\n  private _useClosingValue(closeType: NgPopoverCloseType, useValue: (value?: O | undefined) => void) {\n    if (this.getClosingValueFn != null) {\n      asPromise(this.getClosingValueFn(this.data, closeType)).then(\n        (x) => {\n          useValue(x);\n        },\n        () => {\n          useValue();\n        }\n      );\n    } else {\n      useValue();\n    }\n  }\n\n  // Keypresses\n  handleKeydown() {\n    this.close();\n  }\n}\n"]}
@@ -15,7 +15,7 @@ import * as i3 from '@angular/material/progress-spinner';
15
15
  import { MatProgressSpinnerModule } from '@angular/material/progress-spinner';
16
16
  import * as i2$1 from '@angular/material/icon';
17
17
  import { MatIconModule } from '@angular/material/icon';
18
- import { getValueFromGetter, mergeObjects, splitCommaSeparatedStringToSet, objectHasNoKeys, modifier, combineMaps, addModifiers, removeModifiers, applyBestFit, isMaybeNot, isNotNullOrEmptyString, filterMaybeValues, mapIterable, toReadableError, isDefaultReadableError, build, ServerErrorResponse, UnauthorizedServerErrorResponse, maybeModifierMapToFunction, ModelRelationUtility, encodeModelKeyTypePair, useIterableOrValue } from '@dereekb/util';
18
+ import { getValueFromGetter, mergeObjects, splitCommaSeparatedStringToSet, asPromise, objectHasNoKeys, modifier, combineMaps, addModifiers, removeModifiers, applyBestFit, isMaybeNot, isNotNullOrEmptyString, filterMaybeValues, mapIterable, toReadableError, isDefaultReadableError, build, ServerErrorResponse, UnauthorizedServerErrorResponse, maybeModifierMapToFunction, ModelRelationUtility, encodeModelKeyTypePair, useIterableOrValue } from '@dereekb/util';
19
19
  import * as i3$1 from '@angular/material/progress-bar';
20
20
  import { MatProgressBarModule } from '@angular/material/progress-bar';
21
21
  import * as i5 from '@angular/material/core';
@@ -1545,6 +1545,20 @@ class DbxPopoverComponent extends AbstractTransitionWatcherDirective {
1545
1545
  originalClose.call(this.popoverRef, x);
1546
1546
  }
1547
1547
  };
1548
+ // Also intercept the _close function to capture backdropClose, etc.
1549
+ const original_close = this.popoverRef._close;
1550
+ this.popoverRef._close = (closeType, inputValue) => {
1551
+ const closeWithValue = (value) => {
1552
+ original_close.call(this.popoverRef, closeType, value);
1553
+ };
1554
+ if (closeType === 'close' || inputValue != null) {
1555
+ closeWithValue(inputValue);
1556
+ }
1557
+ else {
1558
+ // expected to be a backdrop close. Get the closing value then close.
1559
+ this._useClosingValue(closeType, (x) => closeWithValue(x));
1560
+ }
1561
+ };
1548
1562
  // eslint-disable-next-line
1549
1563
  const overlay = popoverRef._overlay; // overlay is not publically accessible
1550
1564
  const elementRef = this.config.origin;
@@ -1584,12 +1598,8 @@ class DbxPopoverComponent extends AbstractTransitionWatcherDirective {
1584
1598
  }
1585
1599
  // Popover Controls
1586
1600
  close() {
1587
- if (!this._startedClosing && this.getClosingValueFn) {
1588
- this.getClosingValueFn().then((x) => {
1589
- this.return(x);
1590
- }, () => {
1591
- this.return();
1592
- });
1601
+ if (!this._startedClosing && this.getClosingValueFn != null) {
1602
+ this._useClosingValue('close', (x) => this.return(x));
1593
1603
  }
1594
1604
  else {
1595
1605
  this.return();
@@ -1599,6 +1609,18 @@ class DbxPopoverComponent extends AbstractTransitionWatcherDirective {
1599
1609
  this._closing.next();
1600
1610
  this.popoverRef.close(value);
1601
1611
  }
1612
+ _useClosingValue(closeType, useValue) {
1613
+ if (this.getClosingValueFn != null) {
1614
+ asPromise(this.getClosingValueFn(this.data, closeType)).then((x) => {
1615
+ useValue(x);
1616
+ }, () => {
1617
+ useValue();
1618
+ });
1619
+ }
1620
+ else {
1621
+ useValue();
1622
+ }
1623
+ }
1602
1624
  // Keypresses
1603
1625
  handleKeydown() {
1604
1626
  this.close();