@ngutil/aria 0.0.19 → 0.0.24
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/esm2022/focus/focus-state.directive.mjs +36 -0
- package/esm2022/focus/focus.service.mjs +17 -29
- package/esm2022/focus/focusable.directive.mjs +44 -47
- package/esm2022/focus/index.mjs +2 -1
- package/esm2022/index.mjs +2 -2
- package/fesm2022/ngutil-aria.mjs +88 -71
- package/fesm2022/ngutil-aria.mjs.map +1 -1
- package/focus/focus-state.directive.d.ts +13 -0
- package/focus/focus.service.d.ts +7 -5
- package/focus/focusable.directive.d.ts +7 -11
- package/focus/index.d.ts +1 -0
- package/index.d.ts +1 -1
- package/package.json +3 -3
|
@@ -0,0 +1,36 @@
|
|
|
1
|
+
import { computed, Directive, effect, ElementRef, inject } from "@angular/core";
|
|
2
|
+
import { takeUntilDestroyed, toSignal } from "@angular/core/rxjs-interop";
|
|
3
|
+
import { shareReplay } from "rxjs";
|
|
4
|
+
import { FocusService } from "./focus.service";
|
|
5
|
+
import * as i0 from "@angular/core";
|
|
6
|
+
export class FocusState {
|
|
7
|
+
#focus;
|
|
8
|
+
#el;
|
|
9
|
+
#event;
|
|
10
|
+
constructor() {
|
|
11
|
+
this.#focus = inject(FocusService);
|
|
12
|
+
this.#el = inject(ElementRef);
|
|
13
|
+
this.#event = this.#focus.watch(this.#el.nativeElement).pipe(takeUntilDestroyed(), shareReplay(1));
|
|
14
|
+
this.event = toSignal(this.#event, { rejectErrors: true, manualCleanup: true });
|
|
15
|
+
this.origin = computed(() => this.event()?.origin);
|
|
16
|
+
this.within = computed(() => {
|
|
17
|
+
const event = this.event();
|
|
18
|
+
return event ? (event.element !== this.#el.nativeElement ? event.origin : null) : null;
|
|
19
|
+
});
|
|
20
|
+
// TODO: miért kell ez?, ha nincs itt akkor nem frissül
|
|
21
|
+
effect(() => this.origin(), { allowSignalWrites: false });
|
|
22
|
+
}
|
|
23
|
+
static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.3.6", ngImport: i0, type: FocusState, deps: [], target: i0.ɵɵFactoryTarget.Directive }); }
|
|
24
|
+
static { this.ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "14.0.0", version: "17.3.6", type: FocusState, isStandalone: true, host: { properties: { "attr.focus": "origin()", "attr.focusWithin": "within()" } }, ngImport: i0 }); }
|
|
25
|
+
}
|
|
26
|
+
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.6", ngImport: i0, type: FocusState, decorators: [{
|
|
27
|
+
type: Directive,
|
|
28
|
+
args: [{
|
|
29
|
+
standalone: true,
|
|
30
|
+
host: {
|
|
31
|
+
"[attr.focus]": "origin()",
|
|
32
|
+
"[attr.focusWithin]": "within()"
|
|
33
|
+
}
|
|
34
|
+
}]
|
|
35
|
+
}], ctorParameters: () => [] });
|
|
36
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZm9jdXMtc3RhdGUuZGlyZWN0aXZlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vcGFja2FnZXMvYXJpYS9zcmMvZm9jdXMvZm9jdXMtc3RhdGUuZGlyZWN0aXZlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxRQUFRLEVBQUUsU0FBUyxFQUFFLE1BQU0sRUFBRSxVQUFVLEVBQUUsTUFBTSxFQUFFLE1BQU0sZUFBZSxDQUFBO0FBQy9FLE9BQU8sRUFBRSxrQkFBa0IsRUFBRSxRQUFRLEVBQUUsTUFBTSw0QkFBNEIsQ0FBQTtBQUV6RSxPQUFPLEVBQUUsV0FBVyxFQUFFLE1BQU0sTUFBTSxDQUFBO0FBRWxDLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQTs7QUFTOUMsTUFBTSxPQUFPLFVBQVU7SUFDVixNQUFNLENBQXVCO0lBQzdCLEdBQUcsQ0FBOEM7SUFFakQsTUFBTSxDQUF1RjtJQVV0RztRQWJTLFdBQU0sR0FBRyxNQUFNLENBQUMsWUFBWSxDQUFDLENBQUE7UUFDN0IsUUFBRyxHQUFHLE1BQU0sQ0FBMEIsVUFBVSxDQUFDLENBQUE7UUFFakQsV0FBTSxHQUFHLElBQUksQ0FBQyxNQUFNLENBQUMsS0FBSyxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsYUFBYSxDQUFDLENBQUMsSUFBSSxDQUFDLGtCQUFrQixFQUFFLEVBQUUsV0FBVyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUE7UUFDN0YsVUFBSyxHQUFHLFFBQVEsQ0FBQyxJQUFJLENBQUMsTUFBTSxFQUFFLEVBQUUsWUFBWSxFQUFFLElBQUksRUFBRSxhQUFhLEVBQUUsSUFBSSxFQUFFLENBQUMsQ0FBQTtRQUUxRSxXQUFNLEdBQUcsUUFBUSxDQUFDLEdBQUcsRUFBRSxDQUFDLElBQUksQ0FBQyxLQUFLLEVBQUUsRUFBRSxNQUFNLENBQUMsQ0FBQTtRQUU3QyxXQUFNLEdBQUcsUUFBUSxDQUFDLEdBQUcsRUFBRTtZQUM1QixNQUFNLEtBQUssR0FBRyxJQUFJLENBQUMsS0FBSyxFQUFFLENBQUE7WUFDMUIsT0FBTyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUMsS0FBSyxDQUFDLE9BQU8sS0FBSyxJQUFJLENBQUMsR0FBRyxDQUFDLGFBQWEsQ0FBQyxDQUFDLENBQUMsS0FBSyxDQUFDLE1BQU0sQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQTtRQUMxRixDQUFDLENBQUMsQ0FBQTtRQUdFLHVEQUF1RDtRQUN2RCxNQUFNLENBQUMsR0FBRyxFQUFFLENBQUMsSUFBSSxDQUFDLE1BQU0sRUFBRSxFQUFFLEVBQUUsaUJBQWlCLEVBQUUsS0FBSyxFQUFFLENBQUMsQ0FBQTtJQUM3RCxDQUFDOzhHQWpCUSxVQUFVO2tHQUFWLFVBQVU7OzJGQUFWLFVBQVU7a0JBUHRCLFNBQVM7bUJBQUM7b0JBQ1AsVUFBVSxFQUFFLElBQUk7b0JBQ2hCLElBQUksRUFBRTt3QkFDRixjQUFjLEVBQUUsVUFBVTt3QkFDMUIsb0JBQW9CLEVBQUUsVUFBVTtxQkFDbkM7aUJBQ0oiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBjb21wdXRlZCwgRGlyZWN0aXZlLCBlZmZlY3QsIEVsZW1lbnRSZWYsIGluamVjdCB9IGZyb20gXCJAYW5ndWxhci9jb3JlXCJcbmltcG9ydCB7IHRha2VVbnRpbERlc3Ryb3llZCwgdG9TaWduYWwgfSBmcm9tIFwiQGFuZ3VsYXIvY29yZS9yeGpzLWludGVyb3BcIlxuXG5pbXBvcnQgeyBzaGFyZVJlcGxheSB9IGZyb20gXCJyeGpzXCJcblxuaW1wb3J0IHsgRm9jdXNTZXJ2aWNlIH0gZnJvbSBcIi4vZm9jdXMuc2VydmljZVwiXG5cbkBEaXJlY3RpdmUoe1xuICAgIHN0YW5kYWxvbmU6IHRydWUsXG4gICAgaG9zdDoge1xuICAgICAgICBcIlthdHRyLmZvY3VzXVwiOiBcIm9yaWdpbigpXCIsXG4gICAgICAgIFwiW2F0dHIuZm9jdXNXaXRoaW5dXCI6IFwid2l0aGluKClcIlxuICAgIH1cbn0pXG5leHBvcnQgY2xhc3MgRm9jdXNTdGF0ZSB7XG4gICAgcmVhZG9ubHkgI2ZvY3VzID0gaW5qZWN0KEZvY3VzU2VydmljZSlcbiAgICByZWFkb25seSAjZWwgPSBpbmplY3Q8RWxlbWVudFJlZjxIVE1MRWxlbWVudD4+KEVsZW1lbnRSZWYpXG5cbiAgICByZWFkb25seSAjZXZlbnQgPSB0aGlzLiNmb2N1cy53YXRjaCh0aGlzLiNlbC5uYXRpdmVFbGVtZW50KS5waXBlKHRha2VVbnRpbERlc3Ryb3llZCgpLCBzaGFyZVJlcGxheSgxKSlcbiAgICByZWFkb25seSBldmVudCA9IHRvU2lnbmFsKHRoaXMuI2V2ZW50LCB7IHJlamVjdEVycm9yczogdHJ1ZSwgbWFudWFsQ2xlYW51cDogdHJ1ZSB9KVxuXG4gICAgcmVhZG9ubHkgb3JpZ2luID0gY29tcHV0ZWQoKCkgPT4gdGhpcy5ldmVudCgpPy5vcmlnaW4pXG5cbiAgICByZWFkb25seSB3aXRoaW4gPSBjb21wdXRlZCgoKSA9PiB7XG4gICAgICAgIGNvbnN0IGV2ZW50ID0gdGhpcy5ldmVudCgpXG4gICAgICAgIHJldHVybiBldmVudCA/IChldmVudC5lbGVtZW50ICE9PSB0aGlzLiNlbC5uYXRpdmVFbGVtZW50ID8gZXZlbnQub3JpZ2luIDogbnVsbCkgOiBudWxsXG4gICAgfSlcblxuICAgIGNvbnN0cnVjdG9yKCkge1xuICAgICAgICAvLyBUT0RPOiBtacOpcnQga2VsbCBlej8sIGhhIG5pbmNzIGl0dCBha2tvciBuZW0gZnJpc3PDvGxcbiAgICAgICAgZWZmZWN0KCgpID0+IHRoaXMub3JpZ2luKCksIHsgYWxsb3dTaWduYWxXcml0ZXM6IGZhbHNlIH0pXG4gICAgfVxufVxuIl19
|
|
@@ -1,28 +1,25 @@
|
|
|
1
1
|
import { DOCUMENT } from "@angular/common";
|
|
2
2
|
import { inject, Inject, Injectable, NgZone } from "@angular/core";
|
|
3
|
-
import {
|
|
3
|
+
import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
|
|
4
|
+
import { combineLatest, filter, fromEvent, map, shareReplay, startWith } from "rxjs";
|
|
4
5
|
import { focusable, isFocusable } from "tabbable";
|
|
5
|
-
import { Destructible } from "@ngutil/common";
|
|
6
6
|
import { ActivityService } from "../activity";
|
|
7
7
|
import * as i0 from "@angular/core";
|
|
8
8
|
const EVENT_OPTIONS = {
|
|
9
9
|
capture: true,
|
|
10
10
|
passive: true
|
|
11
11
|
};
|
|
12
|
-
export class FocusService
|
|
12
|
+
export class FocusService {
|
|
13
13
|
#activity = inject(ActivityService);
|
|
14
|
-
#focus = new Subject();
|
|
15
|
-
#blur = new Subject();
|
|
16
14
|
constructor(document, zone) {
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
const blur =
|
|
20
|
-
|
|
21
|
-
const events = combineLatest({
|
|
15
|
+
this.events = zone.runOutsideAngular(() => {
|
|
16
|
+
const focus = fromEvent(document, "focus", EVENT_OPTIONS).pipe(map(e => e.target));
|
|
17
|
+
const blur = fromEvent(document, "blur", EVENT_OPTIONS).pipe(startWith(null), map(e => e?.target || null));
|
|
18
|
+
return combineLatest({
|
|
22
19
|
activity: this.#activity.events,
|
|
23
20
|
focus: focus,
|
|
24
21
|
blur: blur
|
|
25
|
-
}).pipe(map(({ activity, focus, blur }) => {
|
|
22
|
+
}).pipe(takeUntilDestroyed(), map(({ activity, focus, blur }) => {
|
|
26
23
|
// console.log({ activity, focus, blur })
|
|
27
24
|
// If focus in with alt+tab
|
|
28
25
|
if (blur === document && activity.origin === "keyboard") {
|
|
@@ -47,27 +44,18 @@ export class FocusService extends Destructible {
|
|
|
47
44
|
return { origin: "program", element: focus };
|
|
48
45
|
}
|
|
49
46
|
}), filter(v => !!v), shareReplay(1));
|
|
50
|
-
this.events = merge(blur.pipe(map(element => {
|
|
51
|
-
return { origin: null, element };
|
|
52
|
-
})), events).pipe(shareReplay(1));
|
|
53
|
-
document.addEventListener("focus", this.#onFocus, EVENT_OPTIONS);
|
|
54
|
-
document.addEventListener("blur", this.#onBlur, EVENT_OPTIONS);
|
|
55
|
-
this.d.any(() => {
|
|
56
|
-
document.removeEventListener("focus", this.#onFocus, EVENT_OPTIONS);
|
|
57
|
-
document.removeEventListener("blur", this.#onBlur, EVENT_OPTIONS);
|
|
58
|
-
});
|
|
59
47
|
});
|
|
60
48
|
}
|
|
61
|
-
#onFocus = (event) => {
|
|
62
|
-
this.#focus.next(event.target);
|
|
63
|
-
};
|
|
64
|
-
#onBlur = (event) => {
|
|
65
|
-
this.#blur.next(event.target);
|
|
66
|
-
};
|
|
67
49
|
watch(node) {
|
|
68
|
-
return this.events.pipe(
|
|
50
|
+
return this.events.pipe(map(event => {
|
|
51
|
+
if (event.element &&
|
|
52
|
+
(event.element === node || (typeof node.contains === "function" && node.contains(event.element)))) {
|
|
53
|
+
return event;
|
|
54
|
+
}
|
|
55
|
+
return { element: node, origin: null };
|
|
56
|
+
}));
|
|
69
57
|
}
|
|
70
|
-
focus(node,
|
|
58
|
+
focus(node, _origin) {
|
|
71
59
|
// TODO: focus origin
|
|
72
60
|
node.focus();
|
|
73
61
|
}
|
|
@@ -96,4 +84,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.6", ngImpor
|
|
|
96
84
|
function isActivityElement(activityEl, focused) {
|
|
97
85
|
return activityEl != null && focused != null && (activityEl === focused || focused.contains(activityEl));
|
|
98
86
|
}
|
|
99
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"focus.service.js","sourceRoot":"","sources":["../../../../../packages/aria/src/focus/focus.service.ts"],"names":[],"mappings":"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","sourcesContent":["import { DOCUMENT } from \"@angular/common\"\nimport { inject, Inject, Injectable, NgZone } from \"@angular/core\"\n\nimport { combineLatest, filter, map, merge, Observable, shareReplay, startWith, Subject } from \"rxjs\"\n\nimport { focusable, type FocusableElement, isFocusable } from \"tabbable\"\n\nimport { Destructible } from \"@ngutil/common\"\n\nimport { ActivityOrigin, ActivityService } from \"../activity\"\n\nconst EVENT_OPTIONS: AddEventListenerOptions = {\n    capture: true,\n    passive: true\n}\n\nexport type FocusOrigin = ActivityOrigin | null\n// export type FocusTarget = null | \"self\" | \"child\"\n\nexport interface FocusChanges {\n    origin: FocusOrigin\n    element: HTMLElement\n}\n\nexport interface FocusableEvent {\n    origin: FocusOrigin\n    exact: boolean\n    node: Node\n}\n\n@Injectable({ providedIn: \"root\" })\nexport class FocusService extends Destructible {\n    #activity = inject(ActivityService)\n    #focus = new Subject<Node>()\n    #blur = new Subject<Node>()\n    events!: Observable<FocusChanges>\n\n    constructor(@Inject(DOCUMENT) document: Document, @Inject(NgZone) zone: NgZone) {\n        super()\n\n        zone.runOutsideAngular(() => {\n            const blur = this.#blur.pipe(startWith(null), shareReplay(1))\n            const focus = this.#focus.pipe(shareReplay(1))\n\n            const events = combineLatest({\n                activity: this.#activity.events,\n                focus: focus,\n                blur: blur\n            }).pipe(\n                map(({ activity, focus, blur }) => {\n                    // console.log({ activity, focus, blur })\n\n                    // If focus in with alt+tab\n                    if (blur === document && activity.origin === \"keyboard\") {\n                        return { origin: \"program\", element: focus }\n                    }\n\n                    if (focus === document) {\n                        return { origin: \"program\", element: focus }\n                    }\n\n                    // If press tab button, first fire the event in the currently focused element\n                    if (focus === blur) {\n                        return null\n                    }\n\n                    // When press tab, the activity is on the current fucesd element,\n                    // so when blur is changed to it, the focus change is completed\n                    if (activity.origin === \"keyboard\" && isActivityElement(activity.node, blur)) {\n                        return { origin: \"keyboard\", element: focus }\n                    }\n\n                    if (isActivityElement(activity.node, focus)) {\n                        return { origin: activity.origin, element: focus }\n                    } else {\n                        return { origin: \"program\", element: focus }\n                    }\n                }),\n                filter(v => !!v),\n                shareReplay(1)\n            ) as any\n\n            this.events = merge(\n                blur.pipe(\n                    map(element => {\n                        return { origin: null, element }\n                    })\n                ),\n                events\n            ).pipe(shareReplay(1)) as any\n\n            document.addEventListener(\"focus\", this.#onFocus, EVENT_OPTIONS)\n            document.addEventListener(\"blur\", this.#onBlur, EVENT_OPTIONS)\n\n            this.d.any(() => {\n                document.removeEventListener(\"focus\", this.#onFocus, EVENT_OPTIONS)\n                document.removeEventListener(\"blur\", this.#onBlur, EVENT_OPTIONS)\n            })\n        })\n    }\n\n    #onFocus = (event: FocusEvent) => {\n        this.#focus.next(event.target as Node)\n    }\n\n    #onBlur = (event: FocusEvent) => {\n        this.#blur.next(event.target as Node)\n    }\n\n    watch(node: Node) {\n        return this.events.pipe(\n            filter(event => event.element && (event.element === node || node.contains(event.element))),\n            shareReplay(1)\n        )\n    }\n\n    focus(node: HTMLElement, _origon: FocusOrigin | null) {\n        // TODO: focus origin\n        node.focus()\n    }\n\n    queryFocusable(inside: HTMLElement): FocusableElement[] {\n        return focusable(inside, { includeContainer: false })\n    }\n\n    getFirstFocusable(inside: HTMLElement): FocusableElement | undefined {\n        return this.queryFocusable(inside)[0]\n    }\n\n    isFocusable(node: Element): boolean {\n        return isFocusable(node)\n    }\n}\n\nfunction isActivityElement(activityEl?: Node | null, focused?: Node | null): boolean {\n    return activityEl != null && focused != null && (activityEl === focused || focused.contains(activityEl))\n}\n"]}
|
|
87
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"focus.service.js","sourceRoot":"","sources":["../../../../../packages/aria/src/focus/focus.service.ts"],"names":[],"mappings":"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","sourcesContent":["import { DOCUMENT } from \"@angular/common\"\nimport { inject, Inject, Injectable, NgZone } from \"@angular/core\"\nimport { takeUntilDestroyed } from \"@angular/core/rxjs-interop\"\n\nimport { combineLatest, filter, fromEvent, map, Observable, shareReplay, startWith } from \"rxjs\"\n\nimport { focusable, type FocusableElement, isFocusable } from \"tabbable\"\n\nimport { ActivityOrigin, ActivityService } from \"../activity\"\n\nconst EVENT_OPTIONS: AddEventListenerOptions = {\n    capture: true,\n    passive: true\n}\n\nexport type FocusOrigin = ActivityOrigin | null\n\nexport interface FocusChanges {\n    origin: FocusOrigin\n    element: HTMLElement\n}\n\nexport interface FocusableEvent {\n    origin: FocusOrigin\n    exact: boolean\n    node: Node\n}\n\n@Injectable({ providedIn: \"root\" })\nexport class FocusService {\n    readonly #activity = inject(ActivityService)\n    readonly events: Observable<FocusChanges>\n\n    constructor(@Inject(DOCUMENT) document: Document, @Inject(NgZone) zone: NgZone) {\n        this.events = zone.runOutsideAngular(() => {\n            const focus = fromEvent(document, \"focus\", EVENT_OPTIONS).pipe(map(e => e.target as Node))\n            const blur = fromEvent(document, \"blur\", EVENT_OPTIONS).pipe(\n                startWith(null),\n                map(e => (e?.target as Node) || null)\n            )\n\n            return combineLatest({\n                activity: this.#activity.events,\n                focus: focus,\n                blur: blur\n            }).pipe(\n                takeUntilDestroyed(),\n                map(({ activity, focus, blur }) => {\n                    // console.log({ activity, focus, blur })\n\n                    // If focus in with alt+tab\n                    if (blur === document && activity.origin === \"keyboard\") {\n                        return { origin: \"program\", element: focus }\n                    }\n\n                    if (focus === document) {\n                        return { origin: \"program\", element: focus }\n                    }\n\n                    // If press tab button, first fire the event in the currently focused element\n                    if (focus === blur) {\n                        return null\n                    }\n\n                    // When press tab, the activity is on the current fucesd element,\n                    // so when blur is changed to it, the focus change is completed\n                    if (activity.origin === \"keyboard\" && isActivityElement(activity.node, blur)) {\n                        return { origin: \"keyboard\", element: focus }\n                    }\n\n                    if (isActivityElement(activity.node, focus)) {\n                        return { origin: activity.origin, element: focus }\n                    } else {\n                        return { origin: \"program\", element: focus }\n                    }\n                }),\n                filter(v => !!v),\n                shareReplay(1)\n            ) as any\n        })\n    }\n\n    watch(node: Node) {\n        return this.events.pipe(\n            map(event => {\n                if (\n                    event.element &&\n                    (event.element === node || (typeof node.contains === \"function\" && node.contains(event.element)))\n                ) {\n                    return event\n                }\n                return { element: node, origin: null }\n            })\n        )\n    }\n\n    focus(node: HTMLElement, _origin: FocusOrigin | null) {\n        // TODO: focus origin\n        node.focus()\n    }\n\n    queryFocusable(inside: HTMLElement): FocusableElement[] {\n        return focusable(inside, { includeContainer: false })\n    }\n\n    getFirstFocusable(inside: HTMLElement): FocusableElement | undefined {\n        return this.queryFocusable(inside)[0]\n    }\n\n    isFocusable(node: Element): boolean {\n        return isFocusable(node)\n    }\n}\n\nfunction isActivityElement(activityEl?: Node | null, focused?: Node | null): boolean {\n    return activityEl != null && focused != null && (activityEl === focused || focused.contains(activityEl))\n}\n"]}
|
|
@@ -1,53 +1,50 @@
|
|
|
1
|
-
import { Directive,
|
|
2
|
-
import {
|
|
3
|
-
import {
|
|
4
|
-
import { FocusService } from "./focus.service";
|
|
1
|
+
import { Attribute, computed, Directive, effect, inject, input } from "@angular/core";
|
|
2
|
+
import { DisabledState } from "@ngutil/common";
|
|
3
|
+
import { FocusState } from "./focus-state.directive";
|
|
5
4
|
import * as i0 from "@angular/core";
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
#
|
|
10
|
-
#
|
|
11
|
-
constructor(
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
else {
|
|
27
|
-
const attr = focused.getAttribute("focused");
|
|
28
|
-
if (attr && attr.length > 0) {
|
|
29
|
-
exact = false;
|
|
30
|
-
break;
|
|
31
|
-
}
|
|
32
|
-
focused = focused.parentElement;
|
|
33
|
-
}
|
|
34
|
-
}
|
|
35
|
-
return { origin: event.origin, exact, node: event.element };
|
|
36
|
-
}), shareReplay(1));
|
|
37
|
-
this.origin = this.events.pipe(map(event => event.origin), shareReplay(1));
|
|
38
|
-
this.exact = this.events.pipe(map(event => event.exact), shareReplay(1));
|
|
39
|
-
this.d.sub(this.events).subscribe(event => {
|
|
40
|
-
FastDOM.setAttributes(this.#el, {
|
|
41
|
-
focused: event.origin ? `${event.origin} ${event.exact ? "exact" : "child"}` : null
|
|
42
|
-
});
|
|
43
|
-
});
|
|
5
|
+
import * as i1 from "./focus-state.directive";
|
|
6
|
+
// TODO: what happens when disabled is changed
|
|
7
|
+
export class Focusable {
|
|
8
|
+
#disabled;
|
|
9
|
+
#tabindex;
|
|
10
|
+
constructor(tabindex) {
|
|
11
|
+
this.#disabled = inject(DisabledState, { optional: true, self: true });
|
|
12
|
+
this.focusable = input(true, { alias: "nuFocusable" });
|
|
13
|
+
this.tabindex = computed(() => {
|
|
14
|
+
const focusable = this.focusable();
|
|
15
|
+
if (focusable === false || this.#disabled?.isDisabled()) {
|
|
16
|
+
return -1;
|
|
17
|
+
}
|
|
18
|
+
if (typeof focusable === "number") {
|
|
19
|
+
return focusable;
|
|
20
|
+
}
|
|
21
|
+
if (focusable === true && this.#tabindex != null && !isNaN(this.#tabindex)) {
|
|
22
|
+
return this.#tabindex;
|
|
23
|
+
}
|
|
24
|
+
return 0;
|
|
44
25
|
});
|
|
26
|
+
if (tabindex != null) {
|
|
27
|
+
this.#tabindex = Number(tabindex);
|
|
28
|
+
}
|
|
29
|
+
// TODO: miért kell ez?, ha nincs itt akkor nem frissül
|
|
30
|
+
effect(() => this.tabindex(), { allowSignalWrites: false });
|
|
45
31
|
}
|
|
46
|
-
static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.3.6", ngImport: i0, type: Focusable, deps: [{ token:
|
|
47
|
-
static { this.ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "
|
|
32
|
+
static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.3.6", ngImport: i0, type: Focusable, deps: [{ token: "tabindex", attribute: true }], target: i0.ɵɵFactoryTarget.Directive }); }
|
|
33
|
+
static { this.ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "17.1.0", version: "17.3.6", type: Focusable, isStandalone: true, selector: "[nuFocusable]", inputs: { focusable: { classPropertyName: "focusable", publicName: "nuFocusable", isSignal: true, isRequired: false, transformFunction: null } }, host: { properties: { "attr.tabindex": "tabindex()" } }, exportAs: ["nuFocusable"], hostDirectives: [{ directive: i1.FocusState }], ngImport: i0 }); }
|
|
48
34
|
}
|
|
49
35
|
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.6", ngImport: i0, type: Focusable, decorators: [{
|
|
50
36
|
type: Directive,
|
|
51
|
-
args: [{
|
|
52
|
-
|
|
53
|
-
|
|
37
|
+
args: [{
|
|
38
|
+
standalone: true,
|
|
39
|
+
selector: "[nuFocusable]",
|
|
40
|
+
exportAs: "nuFocusable",
|
|
41
|
+
host: {
|
|
42
|
+
"[attr.tabindex]": "tabindex()"
|
|
43
|
+
},
|
|
44
|
+
hostDirectives: [FocusState]
|
|
45
|
+
}]
|
|
46
|
+
}], ctorParameters: () => [{ type: undefined, decorators: [{
|
|
47
|
+
type: Attribute,
|
|
48
|
+
args: ["tabindex"]
|
|
49
|
+
}] }] });
|
|
50
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZm9jdXNhYmxlLmRpcmVjdGl2ZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uL3BhY2thZ2VzL2FyaWEvc3JjL2ZvY3VzL2ZvY3VzYWJsZS5kaXJlY3RpdmUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLFNBQVMsRUFBRSxRQUFRLEVBQUUsU0FBUyxFQUFFLE1BQU0sRUFBRSxNQUFNLEVBQUUsS0FBSyxFQUFFLE1BQU0sZUFBZSxDQUFBO0FBRXJGLE9BQU8sRUFBRSxhQUFhLEVBQUUsTUFBTSxnQkFBZ0IsQ0FBQTtBQUU5QyxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0seUJBQXlCLENBQUE7OztBQUVwRCw4Q0FBOEM7QUFXOUMsTUFBTSxPQUFPLFNBQVM7SUFDVCxTQUFTLENBQXdEO0lBSWpFLFNBQVMsQ0FBUztJQW1CM0IsWUFBbUMsUUFBMEI7UUF2QnBELGNBQVMsR0FBRyxNQUFNLENBQUMsYUFBYSxFQUFFLEVBQUUsUUFBUSxFQUFFLElBQUksRUFBRSxJQUFJLEVBQUUsSUFBSSxFQUFFLENBQUMsQ0FBQTtRQUVqRSxjQUFTLEdBQUcsS0FBSyxDQUFtQixJQUFJLEVBQUUsRUFBRSxLQUFLLEVBQUUsYUFBYSxFQUFFLENBQUMsQ0FBQTtRQUduRSxhQUFRLEdBQUcsUUFBUSxDQUFDLEdBQUcsRUFBRTtZQUM5QixNQUFNLFNBQVMsR0FBRyxJQUFJLENBQUMsU0FBUyxFQUFFLENBQUE7WUFFbEMsSUFBSSxTQUFTLEtBQUssS0FBSyxJQUFJLElBQUksQ0FBQyxTQUFTLEVBQUUsVUFBVSxFQUFFLEVBQUUsQ0FBQztnQkFDdEQsT0FBTyxDQUFDLENBQUMsQ0FBQTtZQUNiLENBQUM7WUFFRCxJQUFJLE9BQU8sU0FBUyxLQUFLLFFBQVEsRUFBRSxDQUFDO2dCQUNoQyxPQUFPLFNBQVMsQ0FBQTtZQUNwQixDQUFDO1lBRUQsSUFBSSxTQUFTLEtBQUssSUFBSSxJQUFJLElBQUksQ0FBQyxTQUFTLElBQUksSUFBSSxJQUFJLENBQUMsS0FBSyxDQUFDLElBQUksQ0FBQyxTQUFTLENBQUMsRUFBRSxDQUFDO2dCQUN6RSxPQUFPLElBQUksQ0FBQyxTQUFTLENBQUE7WUFDekIsQ0FBQztZQUVELE9BQU8sQ0FBQyxDQUFBO1FBQ1osQ0FBQyxDQUFDLENBQUE7UUFHRSxJQUFJLFFBQVEsSUFBSSxJQUFJLEVBQUUsQ0FBQztZQUNuQixJQUFJLENBQUMsU0FBUyxHQUFHLE1BQU0sQ0FBQyxRQUFRLENBQUMsQ0FBQTtRQUNyQyxDQUFDO1FBRUQsdURBQXVEO1FBQ3ZELE1BQU0sQ0FBQyxHQUFHLEVBQUUsQ0FBQyxJQUFJLENBQUMsUUFBUSxFQUFFLEVBQUUsRUFBRSxpQkFBaUIsRUFBRSxLQUFLLEVBQUUsQ0FBQyxDQUFBO0lBQy9ELENBQUM7OEdBL0JRLFNBQVMsa0JBd0JLLFVBQVU7a0dBeEJ4QixTQUFTOzsyRkFBVCxTQUFTO2tCQVRyQixTQUFTO21CQUFDO29CQUNQLFVBQVUsRUFBRSxJQUFJO29CQUNoQixRQUFRLEVBQUUsZUFBZTtvQkFDekIsUUFBUSxFQUFFLGFBQWE7b0JBQ3ZCLElBQUksRUFBRTt3QkFDRixpQkFBaUIsRUFBRSxZQUFZO3FCQUNsQztvQkFDRCxjQUFjLEVBQUUsQ0FBQyxVQUFVLENBQUM7aUJBQy9COzswQkF5QmdCLFNBQVM7MkJBQUMsVUFBVSIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IEF0dHJpYnV0ZSwgY29tcHV0ZWQsIERpcmVjdGl2ZSwgZWZmZWN0LCBpbmplY3QsIGlucHV0IH0gZnJvbSBcIkBhbmd1bGFyL2NvcmVcIlxuXG5pbXBvcnQgeyBEaXNhYmxlZFN0YXRlIH0gZnJvbSBcIkBuZ3V0aWwvY29tbW9uXCJcblxuaW1wb3J0IHsgRm9jdXNTdGF0ZSB9IGZyb20gXCIuL2ZvY3VzLXN0YXRlLmRpcmVjdGl2ZVwiXG5cbi8vIFRPRE86IHdoYXQgaGFwcGVucyB3aGVuIGRpc2FibGVkIGlzIGNoYW5nZWRcblxuQERpcmVjdGl2ZSh7XG4gICAgc3RhbmRhbG9uZTogdHJ1ZSxcbiAgICBzZWxlY3RvcjogXCJbbnVGb2N1c2FibGVdXCIsXG4gICAgZXhwb3J0QXM6IFwibnVGb2N1c2FibGVcIixcbiAgICBob3N0OiB7XG4gICAgICAgIFwiW2F0dHIudGFiaW5kZXhdXCI6IFwidGFiaW5kZXgoKVwiXG4gICAgfSxcbiAgICBob3N0RGlyZWN0aXZlczogW0ZvY3VzU3RhdGVdXG59KVxuZXhwb3J0IGNsYXNzIEZvY3VzYWJsZSB7XG4gICAgcmVhZG9ubHkgI2Rpc2FibGVkID0gaW5qZWN0KERpc2FibGVkU3RhdGUsIHsgb3B0aW9uYWw6IHRydWUsIHNlbGY6IHRydWUgfSlcblxuICAgIHJlYWRvbmx5IGZvY3VzYWJsZSA9IGlucHV0PGJvb2xlYW4gfCBudW1iZXI+KHRydWUsIHsgYWxpYXM6IFwibnVGb2N1c2FibGVcIiB9KVxuXG4gICAgcmVhZG9ubHkgI3RhYmluZGV4PzogbnVtYmVyXG4gICAgcmVhZG9ubHkgdGFiaW5kZXggPSBjb21wdXRlZCgoKSA9PiB7XG4gICAgICAgIGNvbnN0IGZvY3VzYWJsZSA9IHRoaXMuZm9jdXNhYmxlKClcblxuICAgICAgICBpZiAoZm9jdXNhYmxlID09PSBmYWxzZSB8fCB0aGlzLiNkaXNhYmxlZD8uaXNEaXNhYmxlZCgpKSB7XG4gICAgICAgICAgICByZXR1cm4gLTFcbiAgICAgICAgfVxuXG4gICAgICAgIGlmICh0eXBlb2YgZm9jdXNhYmxlID09PSBcIm51bWJlclwiKSB7XG4gICAgICAgICAgICByZXR1cm4gZm9jdXNhYmxlXG4gICAgICAgIH1cblxuICAgICAgICBpZiAoZm9jdXNhYmxlID09PSB0cnVlICYmIHRoaXMuI3RhYmluZGV4ICE9IG51bGwgJiYgIWlzTmFOKHRoaXMuI3RhYmluZGV4KSkge1xuICAgICAgICAgICAgcmV0dXJuIHRoaXMuI3RhYmluZGV4XG4gICAgICAgIH1cblxuICAgICAgICByZXR1cm4gMFxuICAgIH0pXG5cbiAgICBjb25zdHJ1Y3RvcihAQXR0cmlidXRlKFwidGFiaW5kZXhcIikgdGFiaW5kZXg/OiBzdHJpbmcgfCBudW1iZXIpIHtcbiAgICAgICAgaWYgKHRhYmluZGV4ICE9IG51bGwpIHtcbiAgICAgICAgICAgIHRoaXMuI3RhYmluZGV4ID0gTnVtYmVyKHRhYmluZGV4KVxuICAgICAgICB9XG5cbiAgICAgICAgLy8gVE9ETzogbWnDqXJ0IGtlbGwgZXo/LCBoYSBuaW5jcyBpdHQgYWtrb3IgbmVtIGZyaXNzw7xsXG4gICAgICAgIGVmZmVjdCgoKSA9PiB0aGlzLnRhYmluZGV4KCksIHsgYWxsb3dTaWduYWxXcml0ZXM6IGZhbHNlIH0pXG4gICAgfVxufVxuIl19
|
package/esm2022/focus/index.mjs
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
export * from "./focus.service";
|
|
2
2
|
export * from "./focus-trap.directive";
|
|
3
3
|
export * from "./focusable.directive";
|
|
4
|
-
|
|
4
|
+
export * from "./focus-state.directive";
|
|
5
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi9wYWNrYWdlcy9hcmlhL3NyYy9mb2N1cy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxjQUFjLGlCQUFpQixDQUFBO0FBQy9CLGNBQWMsd0JBQXdCLENBQUE7QUFDdEMsY0FBYyx1QkFBdUIsQ0FBQTtBQUNyQyxjQUFjLHlCQUF5QixDQUFBIiwic291cmNlc0NvbnRlbnQiOlsiZXhwb3J0ICogZnJvbSBcIi4vZm9jdXMuc2VydmljZVwiXG5leHBvcnQgKiBmcm9tIFwiLi9mb2N1cy10cmFwLmRpcmVjdGl2ZVwiXG5leHBvcnQgKiBmcm9tIFwiLi9mb2N1c2FibGUuZGlyZWN0aXZlXCJcbmV4cG9ydCAqIGZyb20gXCIuL2ZvY3VzLXN0YXRlLmRpcmVjdGl2ZVwiXG4iXX0=
|
package/esm2022/index.mjs
CHANGED
|
@@ -1,3 +1,3 @@
|
|
|
1
1
|
export { ActivityService } from "./activity";
|
|
2
|
-
export { FocusService, FocusTrap, Focusable } from "./focus";
|
|
3
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
2
|
+
export { FocusService, FocusTrap, Focusable, FocusState } from "./focus";
|
|
3
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9wYWNrYWdlcy9hcmlhL3NyYy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQWlDLGVBQWUsRUFBRSxNQUFNLFlBQVksQ0FBQTtBQUMzRSxPQUFPLEVBQWUsWUFBWSxFQUFFLFNBQVMsRUFBRSxTQUFTLEVBQUUsVUFBVSxFQUFnQyxNQUFNLFNBQVMsQ0FBQSIsInNvdXJjZXNDb250ZW50IjpbImV4cG9ydCB7IEFjdGl2aXR5RXZlbnQsIEFjdGl2aXR5T3JpZ2luLCBBY3Rpdml0eVNlcnZpY2UgfSBmcm9tIFwiLi9hY3Rpdml0eVwiXG5leHBvcnQgeyBGb2N1c09yaWdpbiwgRm9jdXNTZXJ2aWNlLCBGb2N1c1RyYXAsIEZvY3VzYWJsZSwgRm9jdXNTdGF0ZSwgRm9jdXNhYmxlRXZlbnQsIEZvY3VzQ2hhbmdlcyB9IGZyb20gXCIuL2ZvY3VzXCJcbiJdfQ==
|
package/fesm2022/ngutil-aria.mjs
CHANGED
|
@@ -1,8 +1,9 @@
|
|
|
1
1
|
import { DOCUMENT } from '@angular/common';
|
|
2
2
|
import * as i0 from '@angular/core';
|
|
3
|
-
import { NgZone, Injectable, Inject, inject, ElementRef, Directive } from '@angular/core';
|
|
4
|
-
import { Subject, distinctUntilChanged, shareReplay, filter,
|
|
5
|
-
import { Destructible,
|
|
3
|
+
import { NgZone, Injectable, Inject, inject, ElementRef, computed, effect, Directive, input, Attribute } from '@angular/core';
|
|
4
|
+
import { Subject, distinctUntilChanged, shareReplay, filter, fromEvent, map, startWith, combineLatest, BehaviorSubject } from 'rxjs';
|
|
5
|
+
import { Destructible, DisabledState } from '@ngutil/common';
|
|
6
|
+
import { takeUntilDestroyed, toSignal } from '@angular/core/rxjs-interop';
|
|
6
7
|
import { focusable, isFocusable } from 'tabbable';
|
|
7
8
|
|
|
8
9
|
const EVENT_OPTIONS$1 = {
|
|
@@ -77,20 +78,17 @@ const EVENT_OPTIONS = {
|
|
|
77
78
|
capture: true,
|
|
78
79
|
passive: true
|
|
79
80
|
};
|
|
80
|
-
class FocusService
|
|
81
|
+
class FocusService {
|
|
81
82
|
#activity = inject(ActivityService);
|
|
82
|
-
#focus = new Subject();
|
|
83
|
-
#blur = new Subject();
|
|
84
83
|
constructor(document, zone) {
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
const blur =
|
|
88
|
-
|
|
89
|
-
const events = combineLatest({
|
|
84
|
+
this.events = zone.runOutsideAngular(() => {
|
|
85
|
+
const focus = fromEvent(document, "focus", EVENT_OPTIONS).pipe(map(e => e.target));
|
|
86
|
+
const blur = fromEvent(document, "blur", EVENT_OPTIONS).pipe(startWith(null), map(e => e?.target || null));
|
|
87
|
+
return combineLatest({
|
|
90
88
|
activity: this.#activity.events,
|
|
91
89
|
focus: focus,
|
|
92
90
|
blur: blur
|
|
93
|
-
}).pipe(map(({ activity, focus, blur }) => {
|
|
91
|
+
}).pipe(takeUntilDestroyed(), map(({ activity, focus, blur }) => {
|
|
94
92
|
// console.log({ activity, focus, blur })
|
|
95
93
|
// If focus in with alt+tab
|
|
96
94
|
if (blur === document && activity.origin === "keyboard") {
|
|
@@ -115,27 +113,18 @@ class FocusService extends Destructible {
|
|
|
115
113
|
return { origin: "program", element: focus };
|
|
116
114
|
}
|
|
117
115
|
}), filter(v => !!v), shareReplay(1));
|
|
118
|
-
this.events = merge(blur.pipe(map(element => {
|
|
119
|
-
return { origin: null, element };
|
|
120
|
-
})), events).pipe(shareReplay(1));
|
|
121
|
-
document.addEventListener("focus", this.#onFocus, EVENT_OPTIONS);
|
|
122
|
-
document.addEventListener("blur", this.#onBlur, EVENT_OPTIONS);
|
|
123
|
-
this.d.any(() => {
|
|
124
|
-
document.removeEventListener("focus", this.#onFocus, EVENT_OPTIONS);
|
|
125
|
-
document.removeEventListener("blur", this.#onBlur, EVENT_OPTIONS);
|
|
126
|
-
});
|
|
127
116
|
});
|
|
128
117
|
}
|
|
129
|
-
#onFocus = (event) => {
|
|
130
|
-
this.#focus.next(event.target);
|
|
131
|
-
};
|
|
132
|
-
#onBlur = (event) => {
|
|
133
|
-
this.#blur.next(event.target);
|
|
134
|
-
};
|
|
135
118
|
watch(node) {
|
|
136
|
-
return this.events.pipe(
|
|
119
|
+
return this.events.pipe(map(event => {
|
|
120
|
+
if (event.element &&
|
|
121
|
+
(event.element === node || (typeof node.contains === "function" && node.contains(event.element)))) {
|
|
122
|
+
return event;
|
|
123
|
+
}
|
|
124
|
+
return { element: node, origin: null };
|
|
125
|
+
}));
|
|
137
126
|
}
|
|
138
|
-
focus(node,
|
|
127
|
+
focus(node, _origin) {
|
|
139
128
|
// TODO: focus origin
|
|
140
129
|
node.focus();
|
|
141
130
|
}
|
|
@@ -186,57 +175,85 @@ class FocusTrap extends Destructible {
|
|
|
186
175
|
}
|
|
187
176
|
}
|
|
188
177
|
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
#
|
|
192
|
-
#
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
|
|
211
|
-
|
|
212
|
-
|
|
213
|
-
|
|
214
|
-
|
|
215
|
-
|
|
178
|
+
class FocusState {
|
|
179
|
+
#focus;
|
|
180
|
+
#el;
|
|
181
|
+
#event;
|
|
182
|
+
constructor() {
|
|
183
|
+
this.#focus = inject(FocusService);
|
|
184
|
+
this.#el = inject(ElementRef);
|
|
185
|
+
this.#event = this.#focus.watch(this.#el.nativeElement).pipe(takeUntilDestroyed(), shareReplay(1));
|
|
186
|
+
this.event = toSignal(this.#event, { rejectErrors: true, manualCleanup: true });
|
|
187
|
+
this.origin = computed(() => this.event()?.origin);
|
|
188
|
+
this.within = computed(() => {
|
|
189
|
+
const event = this.event();
|
|
190
|
+
return event ? (event.element !== this.#el.nativeElement ? event.origin : null) : null;
|
|
191
|
+
});
|
|
192
|
+
// TODO: miért kell ez?, ha nincs itt akkor nem frissül
|
|
193
|
+
effect(() => this.origin(), { allowSignalWrites: false });
|
|
194
|
+
}
|
|
195
|
+
static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.3.6", ngImport: i0, type: FocusState, deps: [], target: i0.ɵɵFactoryTarget.Directive }); }
|
|
196
|
+
static { this.ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "14.0.0", version: "17.3.6", type: FocusState, isStandalone: true, host: { properties: { "attr.focus": "origin()", "attr.focusWithin": "within()" } }, ngImport: i0 }); }
|
|
197
|
+
}
|
|
198
|
+
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.6", ngImport: i0, type: FocusState, decorators: [{
|
|
199
|
+
type: Directive,
|
|
200
|
+
args: [{
|
|
201
|
+
standalone: true,
|
|
202
|
+
host: {
|
|
203
|
+
"[attr.focus]": "origin()",
|
|
204
|
+
"[attr.focusWithin]": "within()"
|
|
216
205
|
}
|
|
217
|
-
}
|
|
218
|
-
|
|
219
|
-
|
|
220
|
-
|
|
221
|
-
|
|
222
|
-
|
|
223
|
-
|
|
224
|
-
|
|
225
|
-
|
|
226
|
-
|
|
206
|
+
}]
|
|
207
|
+
}], ctorParameters: () => [] });
|
|
208
|
+
|
|
209
|
+
// TODO: what happens when disabled is changed
|
|
210
|
+
class Focusable {
|
|
211
|
+
#disabled;
|
|
212
|
+
#tabindex;
|
|
213
|
+
constructor(tabindex) {
|
|
214
|
+
this.#disabled = inject(DisabledState, { optional: true, self: true });
|
|
215
|
+
this.focusable = input(true, { alias: "nuFocusable" });
|
|
216
|
+
this.tabindex = computed(() => {
|
|
217
|
+
const focusable = this.focusable();
|
|
218
|
+
if (focusable === false || this.#disabled?.isDisabled()) {
|
|
219
|
+
return -1;
|
|
220
|
+
}
|
|
221
|
+
if (typeof focusable === "number") {
|
|
222
|
+
return focusable;
|
|
223
|
+
}
|
|
224
|
+
if (focusable === true && this.#tabindex != null && !isNaN(this.#tabindex)) {
|
|
225
|
+
return this.#tabindex;
|
|
226
|
+
}
|
|
227
|
+
return 0;
|
|
227
228
|
});
|
|
229
|
+
if (tabindex != null) {
|
|
230
|
+
this.#tabindex = Number(tabindex);
|
|
231
|
+
}
|
|
232
|
+
// TODO: miért kell ez?, ha nincs itt akkor nem frissül
|
|
233
|
+
effect(() => this.tabindex(), { allowSignalWrites: false });
|
|
228
234
|
}
|
|
229
|
-
static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.3.6", ngImport: i0, type: Focusable, deps: [{ token:
|
|
230
|
-
static { this.ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "
|
|
235
|
+
static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.3.6", ngImport: i0, type: Focusable, deps: [{ token: "tabindex", attribute: true }], target: i0.ɵɵFactoryTarget.Directive }); }
|
|
236
|
+
static { this.ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "17.1.0", version: "17.3.6", type: Focusable, isStandalone: true, selector: "[nuFocusable]", inputs: { focusable: { classPropertyName: "focusable", publicName: "nuFocusable", isSignal: true, isRequired: false, transformFunction: null } }, host: { properties: { "attr.tabindex": "tabindex()" } }, exportAs: ["nuFocusable"], hostDirectives: [{ directive: FocusState }], ngImport: i0 }); }
|
|
231
237
|
}
|
|
232
238
|
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.6", ngImport: i0, type: Focusable, decorators: [{
|
|
233
239
|
type: Directive,
|
|
234
|
-
args: [{
|
|
235
|
-
|
|
240
|
+
args: [{
|
|
241
|
+
standalone: true,
|
|
242
|
+
selector: "[nuFocusable]",
|
|
243
|
+
exportAs: "nuFocusable",
|
|
244
|
+
host: {
|
|
245
|
+
"[attr.tabindex]": "tabindex()"
|
|
246
|
+
},
|
|
247
|
+
hostDirectives: [FocusState]
|
|
248
|
+
}]
|
|
249
|
+
}], ctorParameters: () => [{ type: undefined, decorators: [{
|
|
250
|
+
type: Attribute,
|
|
251
|
+
args: ["tabindex"]
|
|
252
|
+
}] }] });
|
|
236
253
|
|
|
237
254
|
/**
|
|
238
255
|
* Generated bundle index. Do not edit.
|
|
239
256
|
*/
|
|
240
257
|
|
|
241
|
-
export { ActivityService, FocusService, FocusTrap, Focusable };
|
|
258
|
+
export { ActivityService, FocusService, FocusState, FocusTrap, Focusable };
|
|
242
259
|
//# sourceMappingURL=ngutil-aria.mjs.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ngutil-aria.mjs","sources":["../../../../packages/aria/src/activity/activity.service.ts","../../../../packages/aria/src/focus/focus.service.ts","../../../../packages/aria/src/focus/focus-trap.directive.ts","../../../../packages/aria/src/focus/focusable.directive.ts","../../../../packages/aria/src/ngutil-aria.ts"],"sourcesContent":["import { DOCUMENT } from \"@angular/common\"\nimport { Inject, Injectable, NgZone } from \"@angular/core\"\n\nimport { distinctUntilChanged, filter, Observable, shareReplay, Subject } from \"rxjs\"\n\nimport { Destructible } from \"@ngutil/common\"\n\n// TODO: detect program activity\nexport type ActivityOrigin = \"mouse\" | \"keyboard\" | \"touch\" | \"program\"\n\nexport interface ActivityEvent {\n origin: ActivityOrigin\n node?: Node\n}\n\nconst EVENT_OPTIONS: AddEventListenerOptions = {\n capture: true,\n passive: true\n}\n\n@Injectable({ providedIn: \"root\" })\nexport class ActivityService extends Destructible {\n #activity!: Subject<ActivityEvent>\n\n readonly events!: Observable<ActivityEvent>\n\n constructor(@Inject(DOCUMENT) document: Document, @Inject(NgZone) zone: NgZone) {\n super()\n\n zone.runOutsideAngular(() => {\n this.#activity = new Subject()\n ;(this as { events: Observable<ActivityEvent> }).events = this.#activity.pipe(\n distinctUntilChanged((prev, curr): boolean => {\n if (prev && curr) {\n return prev.origin === curr.origin && prev.node === curr.node\n } else {\n return false\n }\n }),\n shareReplay(1)\n )\n\n document.addEventListener(\"keydown\", this.#onKeydown, EVENT_OPTIONS)\n document.addEventListener(\"mousedown\", this.#onMouseDown, EVENT_OPTIONS)\n document.addEventListener(\"mousemove\", this.#onMouseMove, EVENT_OPTIONS)\n document.addEventListener(\"touchstart\", this.#onTouchStart, EVENT_OPTIONS)\n\n this.d.any(() => {\n document.removeEventListener(\"keydown\", this.#onKeydown, EVENT_OPTIONS)\n document.removeEventListener(\"mousedown\", this.#onMouseDown, EVENT_OPTIONS)\n document.removeEventListener(\"mousemove\", this.#onMouseMove, EVENT_OPTIONS)\n document.removeEventListener(\"touchstart\", this.#onTouchStart, EVENT_OPTIONS)\n })\n })\n }\n\n watchActivity(node?: HTMLElement) {\n if (node) {\n return this.events.pipe(\n filter(\n event =>\n event.node != null &&\n (event.node === node || (event.node instanceof HTMLElement && event.node.contains(node)))\n ),\n shareReplay(1)\n )\n } else {\n return this.events\n }\n }\n\n watchInactvity(timeout: number) {\n throw Error(\"Not implemnted yet\")\n }\n\n #onKeydown = (event: KeyboardEvent) => {\n this.#activity.next({ origin: \"keyboard\", node: event.target as any })\n }\n\n #onMouseDown = (event: MouseEvent) => {\n this.#activity.next({ origin: \"mouse\", node: event.target as any })\n }\n\n #onMouseMove = (event: MouseEvent) => {\n // this.#activity.next({ origin: \"mouse\" })\n }\n\n #onTouchStart = (event: TouchEvent) => {\n this.#activity.next({ origin: \"touch\", node: event.target as any })\n }\n}\n","import { DOCUMENT } from \"@angular/common\"\nimport { inject, Inject, Injectable, NgZone } from \"@angular/core\"\n\nimport { combineLatest, filter, map, merge, Observable, shareReplay, startWith, Subject } from \"rxjs\"\n\nimport { focusable, type FocusableElement, isFocusable } from \"tabbable\"\n\nimport { Destructible } from \"@ngutil/common\"\n\nimport { ActivityOrigin, ActivityService } from \"../activity\"\n\nconst EVENT_OPTIONS: AddEventListenerOptions = {\n capture: true,\n passive: true\n}\n\nexport type FocusOrigin = ActivityOrigin | null\n// export type FocusTarget = null | \"self\" | \"child\"\n\nexport interface FocusChanges {\n origin: FocusOrigin\n element: HTMLElement\n}\n\nexport interface FocusableEvent {\n origin: FocusOrigin\n exact: boolean\n node: Node\n}\n\n@Injectable({ providedIn: \"root\" })\nexport class FocusService extends Destructible {\n #activity = inject(ActivityService)\n #focus = new Subject<Node>()\n #blur = new Subject<Node>()\n events!: Observable<FocusChanges>\n\n constructor(@Inject(DOCUMENT) document: Document, @Inject(NgZone) zone: NgZone) {\n super()\n\n zone.runOutsideAngular(() => {\n const blur = this.#blur.pipe(startWith(null), shareReplay(1))\n const focus = this.#focus.pipe(shareReplay(1))\n\n const events = combineLatest({\n activity: this.#activity.events,\n focus: focus,\n blur: blur\n }).pipe(\n map(({ activity, focus, blur }) => {\n // console.log({ activity, focus, blur })\n\n // If focus in with alt+tab\n if (blur === document && activity.origin === \"keyboard\") {\n return { origin: \"program\", element: focus }\n }\n\n if (focus === document) {\n return { origin: \"program\", element: focus }\n }\n\n // If press tab button, first fire the event in the currently focused element\n if (focus === blur) {\n return null\n }\n\n // When press tab, the activity is on the current fucesd element,\n // so when blur is changed to it, the focus change is completed\n if (activity.origin === \"keyboard\" && isActivityElement(activity.node, blur)) {\n return { origin: \"keyboard\", element: focus }\n }\n\n if (isActivityElement(activity.node, focus)) {\n return { origin: activity.origin, element: focus }\n } else {\n return { origin: \"program\", element: focus }\n }\n }),\n filter(v => !!v),\n shareReplay(1)\n ) as any\n\n this.events = merge(\n blur.pipe(\n map(element => {\n return { origin: null, element }\n })\n ),\n events\n ).pipe(shareReplay(1)) as any\n\n document.addEventListener(\"focus\", this.#onFocus, EVENT_OPTIONS)\n document.addEventListener(\"blur\", this.#onBlur, EVENT_OPTIONS)\n\n this.d.any(() => {\n document.removeEventListener(\"focus\", this.#onFocus, EVENT_OPTIONS)\n document.removeEventListener(\"blur\", this.#onBlur, EVENT_OPTIONS)\n })\n })\n }\n\n #onFocus = (event: FocusEvent) => {\n this.#focus.next(event.target as Node)\n }\n\n #onBlur = (event: FocusEvent) => {\n this.#blur.next(event.target as Node)\n }\n\n watch(node: Node) {\n return this.events.pipe(\n filter(event => event.element && (event.element === node || node.contains(event.element))),\n shareReplay(1)\n )\n }\n\n focus(node: HTMLElement, _origon: FocusOrigin | null) {\n // TODO: focus origin\n node.focus()\n }\n\n queryFocusable(inside: HTMLElement): FocusableElement[] {\n return focusable(inside, { includeContainer: false })\n }\n\n getFirstFocusable(inside: HTMLElement): FocusableElement | undefined {\n return this.queryFocusable(inside)[0]\n }\n\n isFocusable(node: Element): boolean {\n return isFocusable(node)\n }\n}\n\nfunction isActivityElement(activityEl?: Node | null, focused?: Node | null): boolean {\n return activityEl != null && focused != null && (activityEl === focused || focused.contains(activityEl))\n}\n","import { ElementRef, inject } from \"@angular/core\"\n\nimport { BehaviorSubject } from \"rxjs\"\n\nimport { Destructible } from \"@ngutil/common\"\n\nimport { FocusService } from \"./focus.service\"\n\n// TODO: implement\nexport class FocusTrap extends Destructible {\n #manager = inject(FocusService)\n #el = inject(ElementRef<HTMLElement>)\n\n get enabled() {\n return this.#enabled.value\n }\n set enabled(val: boolean) {\n if (this.#enabled.value !== val) {\n this.#enabled.next(val)\n }\n }\n #enabled = new BehaviorSubject<boolean>(true)\n\n enable() {\n this.enabled = true\n }\n\n disable() {\n this.enabled = false\n }\n}\n","import { Directive, ElementRef, inject, NgZone } from \"@angular/core\"\n\nimport { map, Observable, shareReplay } from \"rxjs\"\n\nimport { Destructible, FastDOM } from \"@ngutil/common\"\n\nimport { type FocusableEvent, type FocusOrigin, FocusService } from \"./focus.service\"\n\n// TODO: set [attr.focused]=\"[mouse | keyboard | program] [exact | child]\"\n@Directive({ standalone: true })\nexport class Focusable extends Destructible {\n #service = inject(FocusService)\n #elRef = inject(ElementRef<Node>)\n #el = this.#elRef.nativeElement\n\n readonly events!: Observable<FocusableEvent>\n readonly origin!: Observable<FocusOrigin>\n // readonly origin = new BehaviorSubject<FocusOrigin>(null)\n readonly exact!: Observable<boolean>\n\n constructor(zone: NgZone) {\n super()\n\n zone.runOutsideAngular(() => {\n const events = this.#service.watch(this.#el)\n\n ;(this as { events: Observable<FocusableEvent> }).events = events.pipe(\n map(event => {\n const self = this.#el\n let exact: boolean | null = null\n let focused: HTMLElement | null = event.element\n\n while (focused) {\n if (focused === self) {\n if (exact === null) {\n exact = true\n }\n break\n } else {\n const attr = focused.getAttribute(\"focused\")\n if (attr && attr.length > 0) {\n exact = false\n break\n }\n\n focused = focused.parentElement\n }\n }\n return { origin: event.origin, exact, node: event.element } as FocusableEvent\n }),\n shareReplay(1)\n )\n ;(this as { origin: Observable<FocusOrigin> }).origin = this.events.pipe(\n map(event => event.origin),\n shareReplay(1)\n )\n ;(this as { exact: Observable<boolean> }).exact = this.events.pipe(\n map(event => event.exact),\n shareReplay(1)\n )\n\n this.d.sub(this.events).subscribe(event => {\n FastDOM.setAttributes(this.#el, {\n focused: event.origin ? `${event.origin} ${event.exact ? \"exact\" : \"child\"}` : null\n })\n })\n })\n }\n}\n","/**\n * Generated bundle index. Do not edit.\n */\n\nexport * from './index';\n"],"names":["EVENT_OPTIONS"],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"ngutil-aria.mjs","sources":["../../../../packages/aria/src/activity/activity.service.ts","../../../../packages/aria/src/focus/focus.service.ts","../../../../packages/aria/src/focus/focus-trap.directive.ts","../../../../packages/aria/src/focus/focus-state.directive.ts","../../../../packages/aria/src/focus/focusable.directive.ts","../../../../packages/aria/src/ngutil-aria.ts"],"sourcesContent":["import { DOCUMENT } from \"@angular/common\"\nimport { Inject, Injectable, NgZone } from \"@angular/core\"\n\nimport { distinctUntilChanged, filter, Observable, shareReplay, Subject } from \"rxjs\"\n\nimport { Destructible } from \"@ngutil/common\"\n\n// TODO: detect program activity\nexport type ActivityOrigin = \"mouse\" | \"keyboard\" | \"touch\" | \"program\"\n\nexport interface ActivityEvent {\n origin: ActivityOrigin\n node?: Node\n}\n\nconst EVENT_OPTIONS: AddEventListenerOptions = {\n capture: true,\n passive: true\n}\n\n@Injectable({ providedIn: \"root\" })\nexport class ActivityService extends Destructible {\n #activity!: Subject<ActivityEvent>\n\n readonly events!: Observable<ActivityEvent>\n\n constructor(@Inject(DOCUMENT) document: Document, @Inject(NgZone) zone: NgZone) {\n super()\n\n zone.runOutsideAngular(() => {\n this.#activity = new Subject()\n ;(this as { events: Observable<ActivityEvent> }).events = this.#activity.pipe(\n distinctUntilChanged((prev, curr): boolean => {\n if (prev && curr) {\n return prev.origin === curr.origin && prev.node === curr.node\n } else {\n return false\n }\n }),\n shareReplay(1)\n )\n\n document.addEventListener(\"keydown\", this.#onKeydown, EVENT_OPTIONS)\n document.addEventListener(\"mousedown\", this.#onMouseDown, EVENT_OPTIONS)\n document.addEventListener(\"mousemove\", this.#onMouseMove, EVENT_OPTIONS)\n document.addEventListener(\"touchstart\", this.#onTouchStart, EVENT_OPTIONS)\n\n this.d.any(() => {\n document.removeEventListener(\"keydown\", this.#onKeydown, EVENT_OPTIONS)\n document.removeEventListener(\"mousedown\", this.#onMouseDown, EVENT_OPTIONS)\n document.removeEventListener(\"mousemove\", this.#onMouseMove, EVENT_OPTIONS)\n document.removeEventListener(\"touchstart\", this.#onTouchStart, EVENT_OPTIONS)\n })\n })\n }\n\n watchActivity(node?: HTMLElement) {\n if (node) {\n return this.events.pipe(\n filter(\n event =>\n event.node != null &&\n (event.node === node || (event.node instanceof HTMLElement && event.node.contains(node)))\n ),\n shareReplay(1)\n )\n } else {\n return this.events\n }\n }\n\n watchInactvity(timeout: number) {\n throw Error(\"Not implemnted yet\")\n }\n\n #onKeydown = (event: KeyboardEvent) => {\n this.#activity.next({ origin: \"keyboard\", node: event.target as any })\n }\n\n #onMouseDown = (event: MouseEvent) => {\n this.#activity.next({ origin: \"mouse\", node: event.target as any })\n }\n\n #onMouseMove = (event: MouseEvent) => {\n // this.#activity.next({ origin: \"mouse\" })\n }\n\n #onTouchStart = (event: TouchEvent) => {\n this.#activity.next({ origin: \"touch\", node: event.target as any })\n }\n}\n","import { DOCUMENT } from \"@angular/common\"\nimport { inject, Inject, Injectable, NgZone } from \"@angular/core\"\nimport { takeUntilDestroyed } from \"@angular/core/rxjs-interop\"\n\nimport { combineLatest, filter, fromEvent, map, Observable, shareReplay, startWith } from \"rxjs\"\n\nimport { focusable, type FocusableElement, isFocusable } from \"tabbable\"\n\nimport { ActivityOrigin, ActivityService } from \"../activity\"\n\nconst EVENT_OPTIONS: AddEventListenerOptions = {\n capture: true,\n passive: true\n}\n\nexport type FocusOrigin = ActivityOrigin | null\n\nexport interface FocusChanges {\n origin: FocusOrigin\n element: HTMLElement\n}\n\nexport interface FocusableEvent {\n origin: FocusOrigin\n exact: boolean\n node: Node\n}\n\n@Injectable({ providedIn: \"root\" })\nexport class FocusService {\n readonly #activity = inject(ActivityService)\n readonly events: Observable<FocusChanges>\n\n constructor(@Inject(DOCUMENT) document: Document, @Inject(NgZone) zone: NgZone) {\n this.events = zone.runOutsideAngular(() => {\n const focus = fromEvent(document, \"focus\", EVENT_OPTIONS).pipe(map(e => e.target as Node))\n const blur = fromEvent(document, \"blur\", EVENT_OPTIONS).pipe(\n startWith(null),\n map(e => (e?.target as Node) || null)\n )\n\n return combineLatest({\n activity: this.#activity.events,\n focus: focus,\n blur: blur\n }).pipe(\n takeUntilDestroyed(),\n map(({ activity, focus, blur }) => {\n // console.log({ activity, focus, blur })\n\n // If focus in with alt+tab\n if (blur === document && activity.origin === \"keyboard\") {\n return { origin: \"program\", element: focus }\n }\n\n if (focus === document) {\n return { origin: \"program\", element: focus }\n }\n\n // If press tab button, first fire the event in the currently focused element\n if (focus === blur) {\n return null\n }\n\n // When press tab, the activity is on the current fucesd element,\n // so when blur is changed to it, the focus change is completed\n if (activity.origin === \"keyboard\" && isActivityElement(activity.node, blur)) {\n return { origin: \"keyboard\", element: focus }\n }\n\n if (isActivityElement(activity.node, focus)) {\n return { origin: activity.origin, element: focus }\n } else {\n return { origin: \"program\", element: focus }\n }\n }),\n filter(v => !!v),\n shareReplay(1)\n ) as any\n })\n }\n\n watch(node: Node) {\n return this.events.pipe(\n map(event => {\n if (\n event.element &&\n (event.element === node || (typeof node.contains === \"function\" && node.contains(event.element)))\n ) {\n return event\n }\n return { element: node, origin: null }\n })\n )\n }\n\n focus(node: HTMLElement, _origin: FocusOrigin | null) {\n // TODO: focus origin\n node.focus()\n }\n\n queryFocusable(inside: HTMLElement): FocusableElement[] {\n return focusable(inside, { includeContainer: false })\n }\n\n getFirstFocusable(inside: HTMLElement): FocusableElement | undefined {\n return this.queryFocusable(inside)[0]\n }\n\n isFocusable(node: Element): boolean {\n return isFocusable(node)\n }\n}\n\nfunction isActivityElement(activityEl?: Node | null, focused?: Node | null): boolean {\n return activityEl != null && focused != null && (activityEl === focused || focused.contains(activityEl))\n}\n","import { ElementRef, inject } from \"@angular/core\"\n\nimport { BehaviorSubject } from \"rxjs\"\n\nimport { Destructible } from \"@ngutil/common\"\n\nimport { FocusService } from \"./focus.service\"\n\n// TODO: implement\nexport class FocusTrap extends Destructible {\n #manager = inject(FocusService)\n #el = inject(ElementRef<HTMLElement>)\n\n get enabled() {\n return this.#enabled.value\n }\n set enabled(val: boolean) {\n if (this.#enabled.value !== val) {\n this.#enabled.next(val)\n }\n }\n #enabled = new BehaviorSubject<boolean>(true)\n\n enable() {\n this.enabled = true\n }\n\n disable() {\n this.enabled = false\n }\n}\n","import { computed, Directive, effect, ElementRef, inject } from \"@angular/core\"\nimport { takeUntilDestroyed, toSignal } from \"@angular/core/rxjs-interop\"\n\nimport { shareReplay } from \"rxjs\"\n\nimport { FocusService } from \"./focus.service\"\n\n@Directive({\n standalone: true,\n host: {\n \"[attr.focus]\": \"origin()\",\n \"[attr.focusWithin]\": \"within()\"\n }\n})\nexport class FocusState {\n readonly #focus = inject(FocusService)\n readonly #el = inject<ElementRef<HTMLElement>>(ElementRef)\n\n readonly #event = this.#focus.watch(this.#el.nativeElement).pipe(takeUntilDestroyed(), shareReplay(1))\n readonly event = toSignal(this.#event, { rejectErrors: true, manualCleanup: true })\n\n readonly origin = computed(() => this.event()?.origin)\n\n readonly within = computed(() => {\n const event = this.event()\n return event ? (event.element !== this.#el.nativeElement ? event.origin : null) : null\n })\n\n constructor() {\n // TODO: miért kell ez?, ha nincs itt akkor nem frissül\n effect(() => this.origin(), { allowSignalWrites: false })\n }\n}\n","import { Attribute, computed, Directive, effect, inject, input } from \"@angular/core\"\n\nimport { DisabledState } from \"@ngutil/common\"\n\nimport { FocusState } from \"./focus-state.directive\"\n\n// TODO: what happens when disabled is changed\n\n@Directive({\n standalone: true,\n selector: \"[nuFocusable]\",\n exportAs: \"nuFocusable\",\n host: {\n \"[attr.tabindex]\": \"tabindex()\"\n },\n hostDirectives: [FocusState]\n})\nexport class Focusable {\n readonly #disabled = inject(DisabledState, { optional: true, self: true })\n\n readonly focusable = input<boolean | number>(true, { alias: \"nuFocusable\" })\n\n readonly #tabindex?: number\n readonly tabindex = computed(() => {\n const focusable = this.focusable()\n\n if (focusable === false || this.#disabled?.isDisabled()) {\n return -1\n }\n\n if (typeof focusable === \"number\") {\n return focusable\n }\n\n if (focusable === true && this.#tabindex != null && !isNaN(this.#tabindex)) {\n return this.#tabindex\n }\n\n return 0\n })\n\n constructor(@Attribute(\"tabindex\") tabindex?: string | number) {\n if (tabindex != null) {\n this.#tabindex = Number(tabindex)\n }\n\n // TODO: miért kell ez?, ha nincs itt akkor nem frissül\n effect(() => this.tabindex(), { allowSignalWrites: false })\n }\n}\n","/**\n * Generated bundle index. Do not edit.\n */\n\nexport * from './index';\n"],"names":["EVENT_OPTIONS","i1.FocusState"],"mappings":"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"}
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
import * as i0 from "@angular/core";
|
|
2
|
+
export declare class FocusState {
|
|
3
|
+
#private;
|
|
4
|
+
readonly event: import("@angular/core").Signal<import("./focus.service").FocusChanges | {
|
|
5
|
+
element: Node;
|
|
6
|
+
origin: null;
|
|
7
|
+
} | undefined>;
|
|
8
|
+
readonly origin: import("@angular/core").Signal<import("./focus.service").FocusOrigin | undefined>;
|
|
9
|
+
readonly within: import("@angular/core").Signal<import("./focus.service").FocusOrigin>;
|
|
10
|
+
constructor();
|
|
11
|
+
static ɵfac: i0.ɵɵFactoryDeclaration<FocusState, never>;
|
|
12
|
+
static ɵdir: i0.ɵɵDirectiveDeclaration<FocusState, never, never, {}, {}, never, never, true, never>;
|
|
13
|
+
}
|
package/focus/focus.service.d.ts
CHANGED
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
import { NgZone } from "@angular/core";
|
|
2
2
|
import { Observable } from "rxjs";
|
|
3
3
|
import { type FocusableElement } from "tabbable";
|
|
4
|
-
import { Destructible } from "@ngutil/common";
|
|
5
4
|
import { ActivityOrigin } from "../activity";
|
|
6
5
|
import * as i0 from "@angular/core";
|
|
7
6
|
export type FocusOrigin = ActivityOrigin | null;
|
|
@@ -14,12 +13,15 @@ export interface FocusableEvent {
|
|
|
14
13
|
exact: boolean;
|
|
15
14
|
node: Node;
|
|
16
15
|
}
|
|
17
|
-
export declare class FocusService
|
|
16
|
+
export declare class FocusService {
|
|
18
17
|
#private;
|
|
19
|
-
events: Observable<FocusChanges>;
|
|
18
|
+
readonly events: Observable<FocusChanges>;
|
|
20
19
|
constructor(document: Document, zone: NgZone);
|
|
21
|
-
watch(node: Node): Observable<FocusChanges
|
|
22
|
-
|
|
20
|
+
watch(node: Node): Observable<FocusChanges | {
|
|
21
|
+
element: Node;
|
|
22
|
+
origin: null;
|
|
23
|
+
}>;
|
|
24
|
+
focus(node: HTMLElement, _origin: FocusOrigin | null): void;
|
|
23
25
|
queryFocusable(inside: HTMLElement): FocusableElement[];
|
|
24
26
|
getFirstFocusable(inside: HTMLElement): FocusableElement | undefined;
|
|
25
27
|
isFocusable(node: Element): boolean;
|
|
@@ -1,14 +1,10 @@
|
|
|
1
|
-
import { NgZone } from "@angular/core";
|
|
2
|
-
import { Observable } from "rxjs";
|
|
3
|
-
import { Destructible } from "@ngutil/common";
|
|
4
|
-
import { type FocusableEvent, type FocusOrigin } from "./focus.service";
|
|
5
1
|
import * as i0 from "@angular/core";
|
|
6
|
-
|
|
2
|
+
import * as i1 from "./focus-state.directive";
|
|
3
|
+
export declare class Focusable {
|
|
7
4
|
#private;
|
|
8
|
-
readonly
|
|
9
|
-
readonly
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
static
|
|
13
|
-
static ɵdir: i0.ɵɵDirectiveDeclaration<Focusable, never, never, {}, {}, never, never, true, never>;
|
|
5
|
+
readonly focusable: import("@angular/core").InputSignal<number | boolean>;
|
|
6
|
+
readonly tabindex: import("@angular/core").Signal<number>;
|
|
7
|
+
constructor(tabindex?: string | number);
|
|
8
|
+
static ɵfac: i0.ɵɵFactoryDeclaration<Focusable, [{ attribute: "tabindex"; }]>;
|
|
9
|
+
static ɵdir: i0.ɵɵDirectiveDeclaration<Focusable, "[nuFocusable]", ["nuFocusable"], { "focusable": { "alias": "nuFocusable"; "required": false; "isSignal": true; }; }, {}, never, never, true, [{ directive: typeof i1.FocusState; inputs: {}; outputs: {}; }]>;
|
|
14
10
|
}
|
package/focus/index.d.ts
CHANGED
package/index.d.ts
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
export { ActivityEvent, ActivityOrigin, ActivityService } from "./activity";
|
|
2
|
-
export { FocusOrigin, FocusService, FocusTrap, Focusable, FocusableEvent, FocusChanges } from "./focus";
|
|
2
|
+
export { FocusOrigin, FocusService, FocusTrap, Focusable, FocusState, FocusableEvent, FocusChanges } from "./focus";
|
package/package.json
CHANGED
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@ngutil/aria",
|
|
3
|
-
"version": "0.0.
|
|
3
|
+
"version": "0.0.24",
|
|
4
4
|
"peerDependencies": {
|
|
5
5
|
"@angular/common": "^17.3.6",
|
|
6
6
|
"@angular/core": "^17.3.6",
|
|
7
|
-
"@ngutil/common": "0.0.18",
|
|
8
7
|
"rxjs": "^7.8.1",
|
|
9
|
-
"tabbable": "^6.2.0"
|
|
8
|
+
"tabbable": "^6.2.0",
|
|
9
|
+
"@ngutil/common": "0.0.24"
|
|
10
10
|
},
|
|
11
11
|
"publishConfig": {
|
|
12
12
|
"access": "public",
|