@dereekb/dbx-web 12.6.17 → 12.6.18
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,4 +1,4 @@
|
|
|
1
|
-
import { Component, computed } from '@angular/core';
|
|
1
|
+
import { ChangeDetectionStrategy, Component, computed, effect, ElementRef, viewChild } from '@angular/core';
|
|
2
2
|
import { AbstractDbxSegueAnchorDirective } from '../../layout/anchor/anchor.segue.directive';
|
|
3
3
|
import { UIRouterModule } from '@uirouter/angular';
|
|
4
4
|
import { DbxInjectionComponent } from '@dereekb/dbx-core';
|
|
@@ -9,15 +9,68 @@ import * as i1 from "@uirouter/angular";
|
|
|
9
9
|
* SegueAnchor implementation for UIRouter.
|
|
10
10
|
*/
|
|
11
11
|
export class DbxUIRouterSegueAnchorComponent extends AbstractDbxSegueAnchorDirective {
|
|
12
|
+
_cleanupClickOverride = null;
|
|
12
13
|
_parentAnchorSignal = toSignal(this.parent.anchor$, { initialValue: undefined });
|
|
14
|
+
anchorElement = viewChild.required('anchor', { read: ElementRef });
|
|
15
|
+
injectionElement = viewChild.required('injection', { read: ElementRef });
|
|
16
|
+
anchorDisabledSignal = computed(() => this.anchorSignal()?.disabled ?? false);
|
|
17
|
+
/**
|
|
18
|
+
* This effect exists to solve the issue of an injected element that utilizes event.stopPropogation() and doesn't also call event.preventDefault().
|
|
19
|
+
*
|
|
20
|
+
* We didn't want to use css's pointer-events: none as that would disable the Angular Material button effects.
|
|
21
|
+
*
|
|
22
|
+
* For example, dbx-button would call event.stopPropagation() on click, which would prevent the uiSref from being triggered, but the default behavior
|
|
23
|
+
* of the anchor element would still be triggered, causing the browser to load/reload the page at the given href instead of navigating to the new state using uiSref.
|
|
24
|
+
*
|
|
25
|
+
* NOTE: Those nested event listeners are still ultimately triggered.
|
|
26
|
+
*/
|
|
27
|
+
_overrideClickElementEffect = effect(() => {
|
|
28
|
+
const anchorElement = this.anchorElement();
|
|
29
|
+
const injectionElement = this.injectionElement();
|
|
30
|
+
const anchorDisabled = this.anchorDisabledSignal();
|
|
31
|
+
if (injectionElement) {
|
|
32
|
+
// cleanup/remove the previous/existing click function
|
|
33
|
+
if (this._cleanupClickOverride) {
|
|
34
|
+
this._cleanupClickOverride();
|
|
35
|
+
}
|
|
36
|
+
if (!anchorDisabled) {
|
|
37
|
+
const clickOverride = (event) => {
|
|
38
|
+
// Allow ctrl+click, cmd+click, shift+click, and middle-click for new tab/window
|
|
39
|
+
// Don't preventDefault or stopPropagation - let browser handle it naturally
|
|
40
|
+
if (event.ctrlKey || event.metaKey || event.shiftKey || event.button === 1) {
|
|
41
|
+
return; // Browser will open in new tab/window
|
|
42
|
+
}
|
|
43
|
+
else {
|
|
44
|
+
// otherwise, also trigger a click on the uiSref anchor element
|
|
45
|
+
anchorElement?.nativeElement.click();
|
|
46
|
+
// Prevents the default behavior of the anchor element's href from being triggered
|
|
47
|
+
event.preventDefault();
|
|
48
|
+
event.stopPropagation();
|
|
49
|
+
}
|
|
50
|
+
};
|
|
51
|
+
this._cleanupClickOverride = () => {
|
|
52
|
+
injectionElement.nativeElement.removeEventListener('click', clickOverride);
|
|
53
|
+
delete this._cleanupClickOverride;
|
|
54
|
+
};
|
|
55
|
+
injectionElement.nativeElement.addEventListener('click', clickOverride, {
|
|
56
|
+
capture: true // Use capture to ensure this event listener is called before any nested child's event listeners
|
|
57
|
+
});
|
|
58
|
+
}
|
|
59
|
+
}
|
|
60
|
+
});
|
|
13
61
|
uiSrefSignal = computed(() => (this._parentAnchorSignal()?.ref ?? ''));
|
|
14
62
|
uiParamsSignal = computed(() => this._parentAnchorSignal()?.refParams);
|
|
15
63
|
uiOptionsSignal = computed(() => this._parentAnchorSignal()?.refOptions ?? {});
|
|
64
|
+
ngOnDestroy() {
|
|
65
|
+
if (this._cleanupClickOverride) {
|
|
66
|
+
this._cleanupClickOverride();
|
|
67
|
+
}
|
|
68
|
+
}
|
|
16
69
|
static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: DbxUIRouterSegueAnchorComponent, deps: null, target: i0.ɵɵFactoryTarget.Component });
|
|
17
|
-
static ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "
|
|
70
|
+
static ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "17.2.0", version: "18.2.13", type: DbxUIRouterSegueAnchorComponent, isStandalone: true, selector: "ng-component", viewQueries: [{ propertyName: "anchorElement", first: true, predicate: ["anchor"], descendants: true, read: ElementRef, isSignal: true }, { propertyName: "injectionElement", first: true, predicate: ["injection"], descendants: true, read: ElementRef, isSignal: true }], usesInheritance: true, ngImport: i0, template: "<a class=\"dbx-anchor-a dbx-anchor-sref\" #anchor [attr.target]=\"targetSignal()\" [uiSref]=\"uiSrefSignal()\" [uiParams]=\"uiParamsSignal()\" [uiOptions]=\"uiOptionsSignal()\" uiSrefActive=\"dbx-anchor-active\" uiSrefActiveEq=\"dbx-anchor-active-eq\">\n <dbx-injection #injection [template]=\"templateConfigSignal()\"></dbx-injection>\n</a>\n", dependencies: [{ kind: "ngmodule", type: UIRouterModule }, { kind: "directive", type: i1.UISref, selector: "[uiSref]", inputs: ["uiSref", "uiParams", "uiOptions"], exportAs: ["uiSref"] }, { kind: "directive", type: i1.AnchorUISref, selector: "a[uiSref]" }, { kind: "directive", type: i1.UISrefActive, selector: "[uiSrefActive],[uiSrefActiveEq]", inputs: ["uiSrefActive", "uiSrefActiveEq"] }, { kind: "component", type: DbxInjectionComponent, selector: "dbx-injection, [dbxInjection], [dbx-injection]", inputs: ["config", "template"] }], changeDetection: i0.ChangeDetectionStrategy.OnPush });
|
|
18
71
|
}
|
|
19
72
|
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: DbxUIRouterSegueAnchorComponent, decorators: [{
|
|
20
73
|
type: Component,
|
|
21
|
-
args: [{ imports: [UIRouterModule, DbxInjectionComponent], standalone: true, template: "<a class=\"dbx-anchor-a dbx-anchor-sref\" [attr.target]=\"targetSignal()\" [uiSref]=\"uiSrefSignal()\" [uiParams]=\"uiParamsSignal()\" [uiOptions]=\"uiOptionsSignal()\" uiSrefActive=\"dbx-anchor-active\" uiSrefActiveEq=\"dbx-anchor-active-eq\">\n <dbx-injection [template]=\"templateConfigSignal()\"></dbx-injection>\n</a>\n" }]
|
|
74
|
+
args: [{ imports: [UIRouterModule, DbxInjectionComponent], changeDetection: ChangeDetectionStrategy.OnPush, standalone: true, template: "<a class=\"dbx-anchor-a dbx-anchor-sref\" #anchor [attr.target]=\"targetSignal()\" [uiSref]=\"uiSrefSignal()\" [uiParams]=\"uiParamsSignal()\" [uiOptions]=\"uiOptionsSignal()\" uiSrefActive=\"dbx-anchor-active\" uiSrefActiveEq=\"dbx-anchor-active-eq\">\n <dbx-injection #injection [template]=\"templateConfigSignal()\"></dbx-injection>\n</a>\n" }]
|
|
22
75
|
}] });
|
|
23
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
76
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"anchor.component.js","sourceRoot":"","sources":["../../../../../../../../packages/dbx-web/src/lib/router/provider/uirouter/anchor.component.ts","../../../../../../../../packages/dbx-web/src/lib/router/provider/uirouter/anchor.component.html"],"names":[],"mappings":"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","sourcesContent":["import { ChangeDetectionStrategy, Component, computed, effect, ElementRef, OnDestroy, viewChild } from '@angular/core';\nimport { AbstractDbxSegueAnchorDirective } from '../../layout/anchor/anchor.segue.directive';\nimport { Obj, StateOrName, TransitionOptions, UIRouterModule } from '@uirouter/angular';\nimport { DbxInjectionComponent } from '@dereekb/dbx-core';\nimport { toSignal } from '@angular/core/rxjs-interop';\nimport { Maybe } from '@dereekb/util';\n\n/**\n * SegueAnchor implementation for UIRouter.\n */\n@Component({\n  templateUrl: './anchor.component.html',\n  imports: [UIRouterModule, DbxInjectionComponent],\n  changeDetection: ChangeDetectionStrategy.OnPush,\n  standalone: true\n})\nexport class DbxUIRouterSegueAnchorComponent extends AbstractDbxSegueAnchorDirective implements OnDestroy {\n  private _cleanupClickOverride: Maybe<() => void> = null;\n\n  private readonly _parentAnchorSignal = toSignal(this.parent.anchor$, { initialValue: undefined });\n\n  readonly anchorElement = viewChild.required<string, ElementRef<HTMLElement>>('anchor', { read: ElementRef });\n  readonly injectionElement = viewChild.required<string, ElementRef<HTMLElement>>('injection', { read: ElementRef });\n  readonly anchorDisabledSignal = computed(() => this.anchorSignal()?.disabled ?? false);\n\n  /**\n   * This effect exists to solve the issue of an injected element that utilizes event.stopPropogation() and doesn't also call event.preventDefault().\n   *\n   * We didn't want to use css's pointer-events: none as that would disable the Angular Material button effects.\n   *\n   * For example, dbx-button would call event.stopPropagation() on click, which would prevent the uiSref from being triggered, but the default behavior\n   * of the anchor element would still be triggered, causing the browser to load/reload the page at the given href instead of navigating to the new state using uiSref.\n   *\n   * NOTE: Those nested event listeners are still ultimately triggered.\n   */\n  protected readonly _overrideClickElementEffect = effect(() => {\n    const anchorElement = this.anchorElement();\n    const injectionElement = this.injectionElement();\n    const anchorDisabled = this.anchorDisabledSignal();\n\n    if (injectionElement) {\n      // cleanup/remove the previous/existing click function\n      if (this._cleanupClickOverride) {\n        this._cleanupClickOverride();\n      }\n\n      if (!anchorDisabled) {\n        const clickOverride = (event: MouseEvent) => {\n          // Allow ctrl+click, cmd+click, shift+click, and middle-click for new tab/window\n          // Don't preventDefault or stopPropagation - let browser handle it naturally\n          if (event.ctrlKey || event.metaKey || event.shiftKey || event.button === 1) {\n            return; // Browser will open in new tab/window\n          } else {\n            // otherwise, also trigger a click on the uiSref anchor element\n            anchorElement?.nativeElement.click();\n            // Prevents the default behavior of the anchor element's href from being triggered\n            event.preventDefault();\n            event.stopPropagation();\n          }\n        };\n\n        this._cleanupClickOverride = () => {\n          injectionElement.nativeElement.removeEventListener('click', clickOverride);\n          delete this._cleanupClickOverride;\n        };\n\n        injectionElement.nativeElement.addEventListener('click', clickOverride, {\n          capture: true // Use capture to ensure this event listener is called before any nested child's event listeners\n        });\n      }\n    }\n  });\n\n  readonly uiSrefSignal = computed<StateOrName>(() => (this._parentAnchorSignal()?.ref ?? '') as StateOrName);\n  readonly uiParamsSignal = computed<Obj | undefined>(() => this._parentAnchorSignal()?.refParams);\n  readonly uiOptionsSignal = computed<TransitionOptions>(() => this._parentAnchorSignal()?.refOptions ?? ({} as TransitionOptions));\n\n  ngOnDestroy(): void {\n    if (this._cleanupClickOverride) {\n      this._cleanupClickOverride();\n    }\n  }\n}\n","<a class=\"dbx-anchor-a dbx-anchor-sref\" #anchor [attr.target]=\"targetSignal()\" [uiSref]=\"uiSrefSignal()\" [uiParams]=\"uiParamsSignal()\" [uiOptions]=\"uiOptionsSignal()\" uiSrefActive=\"dbx-anchor-active\" uiSrefActiveEq=\"dbx-anchor-active-eq\">\n  <dbx-injection #injection [template]=\"templateConfigSignal()\"></dbx-injection>\n</a>\n"]}
|
|
@@ -8284,16 +8284,69 @@ function provideDbxRouterWebAngularRouterProviderConfig() {
|
|
|
8284
8284
|
* SegueAnchor implementation for UIRouter.
|
|
8285
8285
|
*/
|
|
8286
8286
|
class DbxUIRouterSegueAnchorComponent extends AbstractDbxSegueAnchorDirective {
|
|
8287
|
+
_cleanupClickOverride = null;
|
|
8287
8288
|
_parentAnchorSignal = toSignal(this.parent.anchor$, { initialValue: undefined });
|
|
8289
|
+
anchorElement = viewChild.required('anchor', { read: ElementRef });
|
|
8290
|
+
injectionElement = viewChild.required('injection', { read: ElementRef });
|
|
8291
|
+
anchorDisabledSignal = computed(() => this.anchorSignal()?.disabled ?? false);
|
|
8292
|
+
/**
|
|
8293
|
+
* This effect exists to solve the issue of an injected element that utilizes event.stopPropogation() and doesn't also call event.preventDefault().
|
|
8294
|
+
*
|
|
8295
|
+
* We didn't want to use css's pointer-events: none as that would disable the Angular Material button effects.
|
|
8296
|
+
*
|
|
8297
|
+
* For example, dbx-button would call event.stopPropagation() on click, which would prevent the uiSref from being triggered, but the default behavior
|
|
8298
|
+
* of the anchor element would still be triggered, causing the browser to load/reload the page at the given href instead of navigating to the new state using uiSref.
|
|
8299
|
+
*
|
|
8300
|
+
* NOTE: Those nested event listeners are still ultimately triggered.
|
|
8301
|
+
*/
|
|
8302
|
+
_overrideClickElementEffect = effect(() => {
|
|
8303
|
+
const anchorElement = this.anchorElement();
|
|
8304
|
+
const injectionElement = this.injectionElement();
|
|
8305
|
+
const anchorDisabled = this.anchorDisabledSignal();
|
|
8306
|
+
if (injectionElement) {
|
|
8307
|
+
// cleanup/remove the previous/existing click function
|
|
8308
|
+
if (this._cleanupClickOverride) {
|
|
8309
|
+
this._cleanupClickOverride();
|
|
8310
|
+
}
|
|
8311
|
+
if (!anchorDisabled) {
|
|
8312
|
+
const clickOverride = (event) => {
|
|
8313
|
+
// Allow ctrl+click, cmd+click, shift+click, and middle-click for new tab/window
|
|
8314
|
+
// Don't preventDefault or stopPropagation - let browser handle it naturally
|
|
8315
|
+
if (event.ctrlKey || event.metaKey || event.shiftKey || event.button === 1) {
|
|
8316
|
+
return; // Browser will open in new tab/window
|
|
8317
|
+
}
|
|
8318
|
+
else {
|
|
8319
|
+
// otherwise, also trigger a click on the uiSref anchor element
|
|
8320
|
+
anchorElement?.nativeElement.click();
|
|
8321
|
+
// Prevents the default behavior of the anchor element's href from being triggered
|
|
8322
|
+
event.preventDefault();
|
|
8323
|
+
event.stopPropagation();
|
|
8324
|
+
}
|
|
8325
|
+
};
|
|
8326
|
+
this._cleanupClickOverride = () => {
|
|
8327
|
+
injectionElement.nativeElement.removeEventListener('click', clickOverride);
|
|
8328
|
+
delete this._cleanupClickOverride;
|
|
8329
|
+
};
|
|
8330
|
+
injectionElement.nativeElement.addEventListener('click', clickOverride, {
|
|
8331
|
+
capture: true // Use capture to ensure this event listener is called before any nested child's event listeners
|
|
8332
|
+
});
|
|
8333
|
+
}
|
|
8334
|
+
}
|
|
8335
|
+
});
|
|
8288
8336
|
uiSrefSignal = computed(() => (this._parentAnchorSignal()?.ref ?? ''));
|
|
8289
8337
|
uiParamsSignal = computed(() => this._parentAnchorSignal()?.refParams);
|
|
8290
8338
|
uiOptionsSignal = computed(() => this._parentAnchorSignal()?.refOptions ?? {});
|
|
8339
|
+
ngOnDestroy() {
|
|
8340
|
+
if (this._cleanupClickOverride) {
|
|
8341
|
+
this._cleanupClickOverride();
|
|
8342
|
+
}
|
|
8343
|
+
}
|
|
8291
8344
|
static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: DbxUIRouterSegueAnchorComponent, deps: null, target: i0.ɵɵFactoryTarget.Component });
|
|
8292
|
-
static ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "
|
|
8345
|
+
static ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "17.2.0", version: "18.2.13", type: DbxUIRouterSegueAnchorComponent, isStandalone: true, selector: "ng-component", viewQueries: [{ propertyName: "anchorElement", first: true, predicate: ["anchor"], descendants: true, read: ElementRef, isSignal: true }, { propertyName: "injectionElement", first: true, predicate: ["injection"], descendants: true, read: ElementRef, isSignal: true }], usesInheritance: true, ngImport: i0, template: "<a class=\"dbx-anchor-a dbx-anchor-sref\" #anchor [attr.target]=\"targetSignal()\" [uiSref]=\"uiSrefSignal()\" [uiParams]=\"uiParamsSignal()\" [uiOptions]=\"uiOptionsSignal()\" uiSrefActive=\"dbx-anchor-active\" uiSrefActiveEq=\"dbx-anchor-active-eq\">\n <dbx-injection #injection [template]=\"templateConfigSignal()\"></dbx-injection>\n</a>\n", dependencies: [{ kind: "ngmodule", type: UIRouterModule }, { kind: "directive", type: i1$5.UISref, selector: "[uiSref]", inputs: ["uiSref", "uiParams", "uiOptions"], exportAs: ["uiSref"] }, { kind: "directive", type: i1$5.AnchorUISref, selector: "a[uiSref]" }, { kind: "directive", type: i1$5.UISrefActive, selector: "[uiSrefActive],[uiSrefActiveEq]", inputs: ["uiSrefActive", "uiSrefActiveEq"] }, { kind: "component", type: DbxInjectionComponent, selector: "dbx-injection, [dbxInjection], [dbx-injection]", inputs: ["config", "template"] }], changeDetection: i0.ChangeDetectionStrategy.OnPush });
|
|
8293
8346
|
}
|
|
8294
8347
|
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: DbxUIRouterSegueAnchorComponent, decorators: [{
|
|
8295
8348
|
type: Component,
|
|
8296
|
-
args: [{ imports: [UIRouterModule, DbxInjectionComponent], standalone: true, template: "<a class=\"dbx-anchor-a dbx-anchor-sref\" [attr.target]=\"targetSignal()\" [uiSref]=\"uiSrefSignal()\" [uiParams]=\"uiParamsSignal()\" [uiOptions]=\"uiOptionsSignal()\" uiSrefActive=\"dbx-anchor-active\" uiSrefActiveEq=\"dbx-anchor-active-eq\">\n <dbx-injection [template]=\"templateConfigSignal()\"></dbx-injection>\n</a>\n" }]
|
|
8349
|
+
args: [{ imports: [UIRouterModule, DbxInjectionComponent], changeDetection: ChangeDetectionStrategy.OnPush, standalone: true, template: "<a class=\"dbx-anchor-a dbx-anchor-sref\" #anchor [attr.target]=\"targetSignal()\" [uiSref]=\"uiSrefSignal()\" [uiParams]=\"uiParamsSignal()\" [uiOptions]=\"uiOptionsSignal()\" uiSrefActive=\"dbx-anchor-active\" uiSrefActiveEq=\"dbx-anchor-active-eq\">\n <dbx-injection #injection [template]=\"templateConfigSignal()\"></dbx-injection>\n</a>\n" }]
|
|
8297
8350
|
}] });
|
|
8298
8351
|
|
|
8299
8352
|
/**
|