@ngutil/floating 0.0.48 → 0.0.50
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/floating/floating-ref.mjs +25 -21
- package/esm2022/floating/traits/animation.mjs +4 -4
- package/esm2022/floating/traits/backdrop.mjs +7 -13
- package/esm2022/floating/traits/dim-contraint.mjs +3 -3
- package/esm2022/floating/traits/focus.mjs +7 -9
- package/esm2022/floating/traits/position.mjs +3 -3
- package/esm2022/layer/backdrop-ref.mjs +9 -9
- package/esm2022/layer/child-ref.mjs +24 -12
- package/esm2022/layer/container-ref.mjs +3 -3
- package/esm2022/layer/index.mjs +2 -1
- package/esm2022/layer/layer.service.mjs +23 -2
- package/fesm2022/ngutil-floating.mjs +90 -63
- package/fesm2022/ngutil-floating.mjs.map +1 -1
- package/floating/floating-ref.d.ts +8 -5
- package/layer/backdrop-ref.d.ts +1 -2
- package/layer/child-ref.d.ts +13 -5
- package/layer/container-ref.d.ts +2 -2
- package/layer/index.d.ts +1 -0
- package/package.json +4 -4
|
@@ -1,6 +1,14 @@
|
|
|
1
1
|
import { ElementRef } from "@angular/core";
|
|
2
|
-
import { of } from "rxjs";
|
|
3
|
-
import {
|
|
2
|
+
import { filter, of, share, take } from "rxjs";
|
|
3
|
+
import { Lifecycle } from "@ngutil/common";
|
|
4
|
+
export var AlwaysOnTop;
|
|
5
|
+
(function (AlwaysOnTop) {
|
|
6
|
+
AlwaysOnTop[AlwaysOnTop["None"] = 0] = "None";
|
|
7
|
+
AlwaysOnTop[AlwaysOnTop["Normal"] = 1] = "Normal";
|
|
8
|
+
AlwaysOnTop[AlwaysOnTop["Modal"] = 2] = "Modal";
|
|
9
|
+
AlwaysOnTop[AlwaysOnTop["Toast"] = 3] = "Toast";
|
|
10
|
+
AlwaysOnTop[AlwaysOnTop["UAC"] = 100] = "UAC";
|
|
11
|
+
})(AlwaysOnTop || (AlwaysOnTop = {}));
|
|
4
12
|
// TODO: disposing, disposed
|
|
5
13
|
export class ChildRef extends ElementRef {
|
|
6
14
|
/**
|
|
@@ -15,30 +23,34 @@ export class ChildRef extends ElementRef {
|
|
|
15
23
|
get zIndex() {
|
|
16
24
|
return this._zIndex;
|
|
17
25
|
}
|
|
18
|
-
constructor(nativeElement) {
|
|
26
|
+
constructor(nativeElement, alwaysOnTop = AlwaysOnTop.None) {
|
|
19
27
|
super(nativeElement);
|
|
20
|
-
this.
|
|
28
|
+
this.alwaysOnTop = alwaysOnTop;
|
|
29
|
+
this.state = new Lifecycle({
|
|
21
30
|
showing: {},
|
|
22
31
|
shown: {},
|
|
23
32
|
disposing: { cancellable: false },
|
|
24
33
|
disposed: { cancellable: false, order: "sequential" }
|
|
25
34
|
});
|
|
26
35
|
this._zIndex = -1;
|
|
27
|
-
this.state.
|
|
36
|
+
this.disposed$ = this.state.current$.pipe(filter(state => state === "disposed"), take(1), share());
|
|
37
|
+
this.state.on("disposed", () => {
|
|
38
|
+
this.nativeElement.parentElement?.removeChild(this.nativeElement);
|
|
39
|
+
this.state.destroy();
|
|
40
|
+
delete this.state;
|
|
41
|
+
});
|
|
28
42
|
// this.state.current$.subscribe(state => {
|
|
29
43
|
// console.log(this, state)
|
|
30
44
|
// })
|
|
45
|
+
// this.state.status$.subscribe(status => {
|
|
46
|
+
// console.log(this.nativeElement, status)
|
|
47
|
+
// })
|
|
31
48
|
}
|
|
32
49
|
dispose() {
|
|
33
50
|
if (this.state == null) {
|
|
34
|
-
return of(
|
|
51
|
+
return of();
|
|
35
52
|
}
|
|
36
53
|
return this.state.run(["disposing", "disposed"]);
|
|
37
54
|
}
|
|
38
|
-
destroy() {
|
|
39
|
-
this.nativeElement.parentElement?.removeChild(this.nativeElement);
|
|
40
|
-
this.state.destroy();
|
|
41
|
-
delete this.state;
|
|
42
|
-
}
|
|
43
55
|
}
|
|
44
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
56
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2hpbGQtcmVmLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vcGFja2FnZXMvZmxvYXRpbmcvc3JjL2xheWVyL2NoaWxkLXJlZi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sZUFBZSxDQUFBO0FBRTFDLE9BQU8sRUFBRSxNQUFNLEVBQWMsRUFBRSxFQUFFLEtBQUssRUFBRSxJQUFJLEVBQUUsTUFBTSxNQUFNLENBQUE7QUFFMUQsT0FBTyxFQUFFLFNBQVMsRUFBRSxNQUFNLGdCQUFnQixDQUFBO0FBSTFDLE1BQU0sQ0FBTixJQUFZLFdBTVg7QUFORCxXQUFZLFdBQVc7SUFDbkIsNkNBQVEsQ0FBQTtJQUNSLGlEQUFVLENBQUE7SUFDViwrQ0FBUyxDQUFBO0lBQ1QsK0NBQVMsQ0FBQTtJQUNULDZDQUFTLENBQUE7QUFDYixDQUFDLEVBTlcsV0FBVyxLQUFYLFdBQVcsUUFNdEI7QUFFRCw0QkFBNEI7QUFFNUIsTUFBTSxPQUFnQixRQUE4QyxTQUFRLFVBQWE7SUFRckY7O09BRUc7SUFDSCxJQUFJLE1BQU0sQ0FBQyxHQUFXO1FBQ2xCLElBQUksSUFBSSxDQUFDLE9BQU8sS0FBSyxHQUFHLEVBQUUsQ0FBQztZQUN2QixJQUFJLENBQUMsT0FBTyxHQUFHLEdBQUcsQ0FBQTtZQUNsQixJQUFJLENBQUMsYUFBYSxDQUFDLEtBQUssQ0FBQyxNQUFNLEdBQUcsTUFBTSxDQUFDLEdBQUcsQ0FBQyxDQUFBO1FBQ2pELENBQUM7SUFDTCxDQUFDO0lBQ0QsSUFBSSxNQUFNO1FBQ04sT0FBTyxJQUFJLENBQUMsT0FBTyxDQUFBO0lBQ3ZCLENBQUM7SUFTRCxZQUNJLGFBQWdCLEVBQ0EsY0FBMkIsV0FBVyxDQUFDLElBQUk7UUFFM0QsS0FBSyxDQUFDLGFBQWEsQ0FBQyxDQUFBO1FBRkosZ0JBQVcsR0FBWCxXQUFXLENBQWdDO1FBN0J0RCxVQUFLLEdBQUcsSUFBSSxTQUFTLENBQUM7WUFDM0IsT0FBTyxFQUFFLEVBQUU7WUFDWCxLQUFLLEVBQUUsRUFBRTtZQUNULFNBQVMsRUFBRSxFQUFFLFdBQVcsRUFBRSxLQUFLLEVBQUU7WUFDakMsUUFBUSxFQUFFLEVBQUUsV0FBVyxFQUFFLEtBQUssRUFBRSxLQUFLLEVBQUUsWUFBWSxFQUFFO1NBQ3hELENBQUMsQ0FBQTtRQWNNLFlBQU8sR0FBVyxDQUFDLENBQUMsQ0FBQTtRQUVULGNBQVMsR0FBRyxJQUFJLENBQUMsS0FBSyxDQUFDLFFBQVEsQ0FBQyxJQUFJLENBQ25ELE1BQU0sQ0FBQyxLQUFLLENBQUMsRUFBRSxDQUFDLEtBQUssS0FBSyxVQUFVLENBQUMsRUFDckMsSUFBSSxDQUFDLENBQUMsQ0FBQyxFQUNQLEtBQUssRUFBRSxDQUNWLENBQUE7UUFPRyxJQUFJLENBQUMsS0FBSyxDQUFDLEVBQUUsQ0FBQyxVQUFVLEVBQUUsR0FBRyxFQUFFO1lBQzNCLElBQUksQ0FBQyxhQUFhLENBQUMsYUFBYSxFQUFFLFdBQVcsQ0FBQyxJQUFJLENBQUMsYUFBYSxDQUFDLENBQUE7WUFDakUsSUFBSSxDQUFDLEtBQUssQ0FBQyxPQUFPLEVBQUUsQ0FBQTtZQUNwQixPQUFRLElBQVksQ0FBQyxLQUFLLENBQUE7UUFDOUIsQ0FBQyxDQUFDLENBQUE7UUFFRiwyQ0FBMkM7UUFDM0MsK0JBQStCO1FBQy9CLEtBQUs7UUFDTCwyQ0FBMkM7UUFDM0MsOENBQThDO1FBQzlDLEtBQUs7SUFDVCxDQUFDO0lBRUQsT0FBTztRQUNILElBQUksSUFBSSxDQUFDLEtBQUssSUFBSSxJQUFJLEVBQUUsQ0FBQztZQUNyQixPQUFPLEVBQUUsRUFBRSxDQUFBO1FBQ2YsQ0FBQztRQUNELE9BQU8sSUFBSSxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsQ0FBQyxXQUFXLEVBQUUsVUFBVSxDQUFDLENBQUMsQ0FBQTtJQUNwRCxDQUFDO0NBQ0oiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBFbGVtZW50UmVmIH0gZnJvbSBcIkBhbmd1bGFyL2NvcmVcIlxuXG5pbXBvcnQgeyBmaWx0ZXIsIE9ic2VydmFibGUsIG9mLCBzaGFyZSwgdGFrZSB9IGZyb20gXCJyeGpzXCJcblxuaW1wb3J0IHsgTGlmZWN5Y2xlIH0gZnJvbSBcIkBuZ3V0aWwvY29tbW9uXCJcblxuZXhwb3J0IHR5cGUgRGlzcG9zZUhhbmRsZXI8VD4gPSAocmVmOiBUKSA9PiBPYnNlcnZhYmxlPHZvaWQ+XG5cbmV4cG9ydCBlbnVtIEFsd2F5c09uVG9wIHtcbiAgICBOb25lID0gMCxcbiAgICBOb3JtYWwgPSAxLFxuICAgIE1vZGFsID0gMixcbiAgICBUb2FzdCA9IDMsXG4gICAgVUFDID0gMTAwXG59XG5cbi8vIFRPRE86IGRpc3Bvc2luZywgZGlzcG9zZWRcblxuZXhwb3J0IGFic3RyYWN0IGNsYXNzIENoaWxkUmVmPFQgZXh0ZW5kcyBIVE1MRWxlbWVudCA9IEhUTUxFbGVtZW50PiBleHRlbmRzIEVsZW1lbnRSZWY8VD4ge1xuICAgIHJlYWRvbmx5IHN0YXRlID0gbmV3IExpZmVjeWNsZSh7XG4gICAgICAgIHNob3dpbmc6IHt9LFxuICAgICAgICBzaG93bjoge30sXG4gICAgICAgIGRpc3Bvc2luZzogeyBjYW5jZWxsYWJsZTogZmFsc2UgfSxcbiAgICAgICAgZGlzcG9zZWQ6IHsgY2FuY2VsbGFibGU6IGZhbHNlLCBvcmRlcjogXCJzZXF1ZW50aWFsXCIgfVxuICAgIH0pXG5cbiAgICAvKipcbiAgICAgKiBAaW50ZXJuYWxcbiAgICAgKi9cbiAgICBzZXQgekluZGV4KHZhbDogbnVtYmVyKSB7XG4gICAgICAgIGlmICh0aGlzLl96SW5kZXggIT09IHZhbCkge1xuICAgICAgICAgICAgdGhpcy5fekluZGV4ID0gdmFsXG4gICAgICAgICAgICB0aGlzLm5hdGl2ZUVsZW1lbnQuc3R5bGUuekluZGV4ID0gU3RyaW5nKHZhbClcbiAgICAgICAgfVxuICAgIH1cbiAgICBnZXQgekluZGV4KCk6IG51bWJlciB7XG4gICAgICAgIHJldHVybiB0aGlzLl96SW5kZXhcbiAgICB9XG4gICAgcHJpdmF0ZSBfekluZGV4OiBudW1iZXIgPSAtMVxuXG4gICAgcHJvdGVjdGVkIHJlYWRvbmx5IGRpc3Bvc2VkJCA9IHRoaXMuc3RhdGUuY3VycmVudCQucGlwZShcbiAgICAgICAgZmlsdGVyKHN0YXRlID0+IHN0YXRlID09PSBcImRpc3Bvc2VkXCIpLFxuICAgICAgICB0YWtlKDEpLFxuICAgICAgICBzaGFyZSgpXG4gICAgKVxuXG4gICAgY29uc3RydWN0b3IoXG4gICAgICAgIG5hdGl2ZUVsZW1lbnQ6IFQsXG4gICAgICAgIHB1YmxpYyByZWFkb25seSBhbHdheXNPblRvcDogQWx3YXlzT25Ub3AgPSBBbHdheXNPblRvcC5Ob25lXG4gICAgKSB7XG4gICAgICAgIHN1cGVyKG5hdGl2ZUVsZW1lbnQpXG4gICAgICAgIHRoaXMuc3RhdGUub24oXCJkaXNwb3NlZFwiLCAoKSA9PiB7XG4gICAgICAgICAgICB0aGlzLm5hdGl2ZUVsZW1lbnQucGFyZW50RWxlbWVudD8ucmVtb3ZlQ2hpbGQodGhpcy5uYXRpdmVFbGVtZW50KVxuICAgICAgICAgICAgdGhpcy5zdGF0ZS5kZXN0cm95KClcbiAgICAgICAgICAgIGRlbGV0ZSAodGhpcyBhcyBhbnkpLnN0YXRlXG4gICAgICAgIH0pXG5cbiAgICAgICAgLy8gdGhpcy5zdGF0ZS5jdXJyZW50JC5zdWJzY3JpYmUoc3RhdGUgPT4ge1xuICAgICAgICAvLyAgICAgY29uc29sZS5sb2codGhpcywgc3RhdGUpXG4gICAgICAgIC8vIH0pXG4gICAgICAgIC8vIHRoaXMuc3RhdGUuc3RhdHVzJC5zdWJzY3JpYmUoc3RhdHVzID0+IHtcbiAgICAgICAgLy8gICAgIGNvbnNvbGUubG9nKHRoaXMubmF0aXZlRWxlbWVudCwgc3RhdHVzKVxuICAgICAgICAvLyB9KVxuICAgIH1cblxuICAgIGRpc3Bvc2UoKSB7XG4gICAgICAgIGlmICh0aGlzLnN0YXRlID09IG51bGwpIHtcbiAgICAgICAgICAgIHJldHVybiBvZigpXG4gICAgICAgIH1cbiAgICAgICAgcmV0dXJuIHRoaXMuc3RhdGUucnVuKFtcImRpc3Bvc2luZ1wiLCBcImRpc3Bvc2VkXCJdKVxuICAgIH1cbn1cbiJdfQ==
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import { Injector } from "@angular/core";
|
|
2
|
-
import { ChildRef } from "./child-ref";
|
|
2
|
+
import { AlwaysOnTop, ChildRef } from "./child-ref";
|
|
3
3
|
export class ContainerRef extends ChildRef {
|
|
4
4
|
constructor(options) {
|
|
5
|
-
super(createElement(options));
|
|
5
|
+
super(createElement(options), options.alwaysOnTop || AlwaysOnTop.None);
|
|
6
6
|
this.options = options;
|
|
7
7
|
this.injectorName = "ContainerRef";
|
|
8
8
|
const providers = options.providers || [];
|
|
@@ -38,4 +38,4 @@ function createElement(options) {
|
|
|
38
38
|
}
|
|
39
39
|
return div;
|
|
40
40
|
}
|
|
41
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
41
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29udGFpbmVyLXJlZi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uL3BhY2thZ2VzL2Zsb2F0aW5nL3NyYy9sYXllci9jb250YWluZXItcmVmLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxRQUFRLEVBQVksTUFBTSxlQUFlLENBQUE7QUFFbEQsT0FBTyxFQUFFLFdBQVcsRUFBRSxRQUFRLEVBQUUsTUFBTSxhQUFhLENBQUE7QUFXbkQsTUFBTSxPQUFPLFlBQWEsU0FBUSxRQUFRO0lBS3RDLFlBQTRCLE9BQXlCO1FBQ2pELEtBQUssQ0FBQyxhQUFhLENBQUMsT0FBTyxDQUFDLEVBQUUsT0FBTyxDQUFDLFdBQVcsSUFBSSxXQUFXLENBQUMsSUFBSSxDQUFDLENBQUE7UUFEOUMsWUFBTyxHQUFQLE9BQU8sQ0FBa0I7UUFGM0MsaUJBQVksR0FBRyxjQUFjLENBQUE7UUFLbkMsTUFBTSxTQUFTLEdBQUcsT0FBTyxDQUFDLFNBQVMsSUFBSSxFQUFFLENBQUE7UUFDekMsSUFBSSxDQUFDLFFBQVEsR0FBRyxRQUFRLENBQUMsTUFBTSxDQUFDO1lBQzVCLFNBQVMsRUFBRSxDQUFDLEdBQUcsSUFBSSxDQUFDLFlBQVksRUFBRSxFQUFFLEdBQUcsU0FBUyxDQUFDO1lBQ2pELE1BQU0sRUFBRSxPQUFPLENBQUMsUUFBUTtZQUN4QixJQUFJLEVBQUUsSUFBSSxDQUFDLFlBQVk7U0FDMUIsQ0FBQyxDQUFBO1FBRUYsSUFBSSxDQUFDLEtBQUssQ0FBQyxFQUFFLENBQUMsVUFBVSxFQUFFLEdBQUcsRUFBRTtZQUMzQixPQUFRLElBQVksQ0FBQyxPQUFPLENBQUE7WUFDNUIsT0FBUSxJQUFZLENBQUMsUUFBUSxDQUFBO1FBQ2pDLENBQUMsQ0FBQyxDQUFBO0lBQ04sQ0FBQztJQUVTLFlBQVk7UUFDbEIsT0FBTztZQUNILEVBQUUsT0FBTyxFQUFFLFFBQVEsRUFBRSxRQUFRLEVBQUUsSUFBSSxFQUFFO1lBQ3JDLEVBQUUsT0FBTyxFQUFFLFlBQVksRUFBRSxRQUFRLEVBQUUsSUFBSSxFQUFFO1NBQzVDLENBQUE7SUFDTCxDQUFDO0NBQ0o7QUFFRCxTQUFTLGFBQWEsQ0FBQyxPQUF5QjtJQUM1QyxNQUFNLEdBQUcsR0FBRyxRQUFRLENBQUMsYUFBYSxDQUFDLEtBQUssQ0FBQyxDQUFBO0lBQ3pDLEdBQUcsQ0FBQyxLQUFLLENBQUMsUUFBUSxHQUFHLFVBQVUsQ0FBQTtJQUMvQixHQUFHLENBQUMsS0FBSyxDQUFDLEdBQUcsR0FBRyxHQUFHLENBQUE7SUFDbkIsR0FBRyxDQUFDLEtBQUssQ0FBQyxJQUFJLEdBQUcsR0FBRyxDQUFBO0lBQ3BCLEdBQUcsQ0FBQyxLQUFLLENBQUMsS0FBSyxHQUFHLGFBQWEsQ0FBQTtJQUMvQixHQUFHLENBQUMsS0FBSyxDQUFDLE9BQU8sR0FBRyxhQUFhLENBQUE7SUFDakMsR0FBRyxDQUFDLEtBQUssQ0FBQyxhQUFhLEdBQUcsUUFBUSxDQUFBO0lBQ2xDLEdBQUcsQ0FBQyxLQUFLLENBQUMsVUFBVSxHQUFHLFNBQVMsQ0FBQTtJQUNoQyxHQUFHLENBQUMsS0FBSyxDQUFDLGNBQWMsR0FBRyxTQUFTLENBQUE7SUFFcEMsSUFBSSxPQUFPLENBQUMsT0FBTyxFQUFFLENBQUM7UUFDbEIsR0FBRyxDQUFDLFNBQVMsQ0FBQyxHQUFHLENBQUMsR0FBRyxPQUFPLENBQUMsT0FBTyxDQUFDLENBQUE7SUFDekMsQ0FBQztJQUVELE9BQU8sR0FBRyxDQUFBO0FBQ2QsQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IEluamVjdG9yLCBQcm92aWRlciB9IGZyb20gXCJAYW5ndWxhci9jb3JlXCJcblxuaW1wb3J0IHsgQWx3YXlzT25Ub3AsIENoaWxkUmVmIH0gZnJvbSBcIi4vY2hpbGQtcmVmXCJcblxuZXhwb3J0IGludGVyZmFjZSBDb250YWluZXJPcHRpb25zIHtcbiAgICBhbHdheXNPblRvcD86IEFsd2F5c09uVG9wXG4gICAgZWxldmF0aW9uPzogbnVtYmVyXG4gICAgY2xhc3Nlcz86IHN0cmluZ1tdXG4gICAgYXR0cmlidXRlcz86IFJlY29yZDxzdHJpbmcsIHN0cmluZz5cbiAgICBpbmplY3Rvcj86IEluamVjdG9yXG4gICAgcHJvdmlkZXJzPzogUHJvdmlkZXJbXVxufVxuXG5leHBvcnQgY2xhc3MgQ29udGFpbmVyUmVmIGV4dGVuZHMgQ2hpbGRSZWYge1xuICAgIHB1YmxpYyByZWFkb25seSBpbmplY3RvcjogSW5qZWN0b3JcblxuICAgIHByb3RlY3RlZCBpbmplY3Rvck5hbWUgPSBcIkNvbnRhaW5lclJlZlwiXG5cbiAgICBjb25zdHJ1Y3RvcihwdWJsaWMgcmVhZG9ubHkgb3B0aW9uczogQ29udGFpbmVyT3B0aW9ucykge1xuICAgICAgICBzdXBlcihjcmVhdGVFbGVtZW50KG9wdGlvbnMpLCBvcHRpb25zLmFsd2F5c09uVG9wIHx8IEFsd2F5c09uVG9wLk5vbmUpXG5cbiAgICAgICAgY29uc3QgcHJvdmlkZXJzID0gb3B0aW9ucy5wcm92aWRlcnMgfHwgW11cbiAgICAgICAgdGhpcy5pbmplY3RvciA9IEluamVjdG9yLmNyZWF0ZSh7XG4gICAgICAgICAgICBwcm92aWRlcnM6IFsuLi50aGlzLmdldFByb3ZpZGVycygpLCAuLi5wcm92aWRlcnNdLFxuICAgICAgICAgICAgcGFyZW50OiBvcHRpb25zLmluamVjdG9yLFxuICAgICAgICAgICAgbmFtZTogdGhpcy5pbmplY3Rvck5hbWVcbiAgICAgICAgfSlcblxuICAgICAgICB0aGlzLnN0YXRlLm9uKFwiZGlzcG9zZWRcIiwgKCkgPT4ge1xuICAgICAgICAgICAgZGVsZXRlICh0aGlzIGFzIGFueSkub3B0aW9uc1xuICAgICAgICAgICAgZGVsZXRlICh0aGlzIGFzIGFueSkuaW5qZWN0b3JcbiAgICAgICAgfSlcbiAgICB9XG5cbiAgICBwcm90ZWN0ZWQgZ2V0UHJvdmlkZXJzKCk6IFByb3ZpZGVyW10ge1xuICAgICAgICByZXR1cm4gW1xuICAgICAgICAgICAgeyBwcm92aWRlOiBDaGlsZFJlZiwgdXNlVmFsdWU6IHRoaXMgfSxcbiAgICAgICAgICAgIHsgcHJvdmlkZTogQ29udGFpbmVyUmVmLCB1c2VWYWx1ZTogdGhpcyB9XG4gICAgICAgIF1cbiAgICB9XG59XG5cbmZ1bmN0aW9uIGNyZWF0ZUVsZW1lbnQob3B0aW9uczogQ29udGFpbmVyT3B0aW9ucyk6IEhUTUxEaXZFbGVtZW50IHtcbiAgICBjb25zdCBkaXYgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KFwiZGl2XCIpXG4gICAgZGl2LnN0eWxlLnBvc2l0aW9uID0gXCJhYnNvbHV0ZVwiXG4gICAgZGl2LnN0eWxlLnRvcCA9IFwiMFwiXG4gICAgZGl2LnN0eWxlLmxlZnQgPSBcIjBcIlxuICAgIGRpdi5zdHlsZS53aWR0aCA9IFwibWF4LWNvbnRlbnRcIlxuICAgIGRpdi5zdHlsZS5kaXNwbGF5ID0gXCJpbmxpbmUtZmxleFwiXG4gICAgZGl2LnN0eWxlLmZsZXhEaXJlY3Rpb24gPSBcImNvbHVtblwiXG4gICAgZGl2LnN0eWxlLmFsaWduSXRlbXMgPSBcInN0cmV0Y2hcIlxuICAgIGRpdi5zdHlsZS5qdXN0aWZ5Q29udGVudCA9IFwic3RyZXRjaFwiXG5cbiAgICBpZiAob3B0aW9ucy5jbGFzc2VzKSB7XG4gICAgICAgIGRpdi5jbGFzc0xpc3QuYWRkKC4uLm9wdGlvbnMuY2xhc3NlcylcbiAgICB9XG5cbiAgICByZXR1cm4gZGl2XG59XG4iXX0=
|
package/esm2022/layer/index.mjs
CHANGED
|
@@ -2,4 +2,5 @@ export * from "./backdrop-ref";
|
|
|
2
2
|
export * from "./child-ref";
|
|
3
3
|
export * from "./layer.service";
|
|
4
4
|
export * from "./portal-ref";
|
|
5
|
-
|
|
5
|
+
export * from "./container-ref";
|
|
6
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi9wYWNrYWdlcy9mbG9hdGluZy9zcmMvbGF5ZXIvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsY0FBYyxnQkFBZ0IsQ0FBQTtBQUM5QixjQUFjLGFBQWEsQ0FBQTtBQUMzQixjQUFjLGlCQUFpQixDQUFBO0FBQy9CLGNBQWMsY0FBYyxDQUFBO0FBQzVCLGNBQWMsaUJBQWlCLENBQUEiLCJzb3VyY2VzQ29udGVudCI6WyJleHBvcnQgKiBmcm9tIFwiLi9iYWNrZHJvcC1yZWZcIlxuZXhwb3J0ICogZnJvbSBcIi4vY2hpbGQtcmVmXCJcbmV4cG9ydCAqIGZyb20gXCIuL2xheWVyLnNlcnZpY2VcIlxuZXhwb3J0ICogZnJvbSBcIi4vcG9ydGFsLXJlZlwiXG5leHBvcnQgKiBmcm9tIFwiLi9jb250YWluZXItcmVmXCJcbiJdfQ==
|
|
@@ -2,6 +2,7 @@ import { Directive, ElementRef, inject, Inject, InjectionToken, Injector, Option
|
|
|
2
2
|
import { toSorted } from "@ngutil/common";
|
|
3
3
|
import { CoverService } from "@ngutil/graphics";
|
|
4
4
|
import { BackdropRef } from "./backdrop-ref";
|
|
5
|
+
import { AlwaysOnTop } from "./child-ref";
|
|
5
6
|
import { ContainerRef } from "./container-ref";
|
|
6
7
|
import { ComponentPortalRef, TemplatePortalRef } from "./portal-ref";
|
|
7
8
|
import * as i0 from "@angular/core";
|
|
@@ -66,7 +67,7 @@ export class LayerService {
|
|
|
66
67
|
}
|
|
67
68
|
}
|
|
68
69
|
#update() {
|
|
69
|
-
const children = toSorted(this.#children,
|
|
70
|
+
const children = toSorted(this.#children, sortChildren2);
|
|
70
71
|
let zIndex = this.#zIndexStart;
|
|
71
72
|
for (const child of children) {
|
|
72
73
|
child.zIndex = zIndex;
|
|
@@ -115,6 +116,15 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.6", ngImpor
|
|
|
115
116
|
providers: [{ provide: LayerService, useExisting: IndividualLayer }]
|
|
116
117
|
}]
|
|
117
118
|
}] });
|
|
119
|
+
function sortChildren2(a, b) {
|
|
120
|
+
const alwaysOnTop = sortByAlwaysOnTop(a, b);
|
|
121
|
+
if (alwaysOnTop === 0) {
|
|
122
|
+
return sortByBackdrop(a, b);
|
|
123
|
+
}
|
|
124
|
+
else {
|
|
125
|
+
return alwaysOnTop;
|
|
126
|
+
}
|
|
127
|
+
}
|
|
118
128
|
function sortByBackdrop(a, b) {
|
|
119
129
|
if (a instanceof BackdropRef && a.under === b) {
|
|
120
130
|
return -1;
|
|
@@ -127,4 +137,15 @@ function sortByBackdrop(a, b) {
|
|
|
127
137
|
function sortByZIndexDesc(a, b) {
|
|
128
138
|
return b.zIndex - a.zIndex;
|
|
129
139
|
}
|
|
130
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"layer.service.js","sourceRoot":"","sources":["../../../../../packages/floating/src/layer/layer.service.ts"],"names":[],"mappings":"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","sourcesContent":["import { ComponentType } from \"@angular/cdk/portal\"\nimport { Directive, ElementRef, inject, Inject, InjectionToken, Injector, Optional, TemplateRef } from \"@angular/core\"\n\nimport { toSorted } from \"@ngutil/common\"\nimport { CoverService } from \"@ngutil/graphics\"\n\nimport { BackdropOptions, BackdropRef } from \"./backdrop-ref\"\nimport { ChildRef } from \"./child-ref\"\nimport { ContainerOptions, ContainerRef } from \"./container-ref\"\nimport { ComponentPortalOptions, ComponentPortalRef, TemplatePortalOptions, TemplatePortalRef } from \"./portal-ref\"\n\nexport const LAYER_ZINDEX_START = new InjectionToken<number>(\"LAYER_ZINDEX_START\")\n\n// TODO: ELEVATION_STEP config with injection\n// TODO: ELEVATION_START config with injection\n\n@Directive()\nexport abstract class LayerService {\n    readonly #cover = inject(CoverService)\n    readonly #injector = inject(Injector)\n\n    readonly root = inject<ElementRef<HTMLElement>>(ElementRef)\n    // readonly #el = this.root.nativeElement\n\n    readonly #children: Array<ChildRef> = []\n    readonly #zIndexStart: number\n    // readonly #backdrop: Map<>\n\n    constructor(@Inject(LAYER_ZINDEX_START) @Optional() zIndexStart?: number) {\n        if (zIndexStart != null) {\n            this.#zIndexStart = zIndexStart\n        } else {\n            this.#zIndexStart = 10000\n        }\n    }\n\n    newComponentPortal<T>(component: ComponentType<T>, options: ComponentPortalOptions<T>): ComponentPortalRef<T> {\n        if (!options.injector) {\n            options = { ...options, injector: this.#injector }\n        }\n        return this.append(new ComponentPortalRef(component, options))\n    }\n\n    newTemplatePortal<T>(tpl: TemplateRef<T>, options: TemplatePortalOptions<T>): TemplatePortalRef<T> {\n        if (!options.injector) {\n            options = { ...options, injector: this.#injector }\n        }\n        return this.append(new TemplatePortalRef(tpl, options))\n    }\n\n    newContainer(options: ContainerOptions): ContainerRef {\n        if (!options.injector) {\n            options = { ...options, injector: this.#injector }\n        }\n        return this.append(new ContainerRef(options))\n    }\n\n    newBackdrop(options: BackdropOptions): BackdropRef {\n        return this.append(BackdropRef.from(this.#cover, this.#injector, options))\n    }\n\n    append<T extends ChildRef>(ref: T): T {\n        if (!this.#children.includes(ref)) {\n            this.#children.push(ref)\n            this.#update()\n            this.root.nativeElement.appendChild(ref.nativeElement)\n            ref.state.on(\"disposed\", () => this.#remove(ref))\n        }\n        return ref\n    }\n\n    #remove(ref: ChildRef) {\n        const idx = this.#children.indexOf(ref)\n        if (idx > -1) {\n            this.#children.splice(idx, 1)\n            this.#update()\n        }\n    }\n\n    #update() {\n        const children = toSorted(this.#children, sortByBackdrop)\n\n        let zIndex = this.#zIndexStart\n        for (const child of children) {\n            child.zIndex = zIndex\n            zIndex += 1\n        }\n\n        children.sort(sortByZIndexDesc)\n\n        let hasBackdrop = false\n        for (const child of children) {\n            if (child instanceof BackdropRef && child.options.type === \"solid\") {\n                child.visible = !hasBackdrop\n                hasBackdrop = true\n            }\n        }\n    }\n}\n\n@Directive({\n    selector: \"body\",\n    standalone: true,\n    providers: [{ provide: LayerService, useExisting: RootLayer }]\n})\nexport class RootLayer extends LayerService {}\n\n@Directive({\n    standalone: true,\n    providers: [{ provide: LayerService, useExisting: IndividualLayer }]\n})\nexport class IndividualLayer extends LayerService {}\n\nfunction sortByBackdrop(a: ChildRef, b: ChildRef) {\n    if (a instanceof BackdropRef && a.under === b) {\n        return -1\n    } else if (b instanceof BackdropRef && b.under === a) {\n        return 1\n    }\n    return 0\n}\n\nfunction sortByZIndexDesc(a: ChildRef, b: ChildRef) {\n    return b.zIndex - a.zIndex\n}\n"]}
|
|
140
|
+
function sortByAlwaysOnTop(a, b) {
|
|
141
|
+
return getAlwaysOnTop(a) - getAlwaysOnTop(b);
|
|
142
|
+
}
|
|
143
|
+
function getAlwaysOnTop(child) {
|
|
144
|
+
if (child instanceof BackdropRef) {
|
|
145
|
+
return child.under.alwaysOnTop || AlwaysOnTop.None;
|
|
146
|
+
}
|
|
147
|
+
else {
|
|
148
|
+
return child.alwaysOnTop || AlwaysOnTop.None;
|
|
149
|
+
}
|
|
150
|
+
}
|
|
151
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"layer.service.js","sourceRoot":"","sources":["../../../../../packages/floating/src/layer/layer.service.ts"],"names":[],"mappings":"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","sourcesContent":["import { ComponentType } from \"@angular/cdk/portal\"\nimport { Directive, ElementRef, inject, Inject, InjectionToken, Injector, Optional, TemplateRef } from \"@angular/core\"\n\nimport { toSorted } from \"@ngutil/common\"\nimport { CoverService } from \"@ngutil/graphics\"\n\nimport { BackdropOptions, BackdropRef } from \"./backdrop-ref\"\nimport { AlwaysOnTop, ChildRef } from \"./child-ref\"\nimport { ContainerOptions, ContainerRef } from \"./container-ref\"\nimport { ComponentPortalOptions, ComponentPortalRef, TemplatePortalOptions, TemplatePortalRef } from \"./portal-ref\"\n\nexport const LAYER_ZINDEX_START = new InjectionToken<number>(\"LAYER_ZINDEX_START\")\n\n// TODO: ELEVATION_STEP config with injection\n// TODO: ELEVATION_START config with injection\n\n@Directive()\nexport abstract class LayerService {\n    readonly #cover = inject(CoverService)\n    readonly #injector = inject(Injector)\n\n    readonly root = inject<ElementRef<HTMLElement>>(ElementRef)\n    // readonly #el = this.root.nativeElement\n\n    readonly #children: Array<ChildRef> = []\n    readonly #zIndexStart: number\n    // readonly #backdrop: Map<>\n\n    constructor(@Inject(LAYER_ZINDEX_START) @Optional() zIndexStart?: number) {\n        if (zIndexStart != null) {\n            this.#zIndexStart = zIndexStart\n        } else {\n            this.#zIndexStart = 10000\n        }\n    }\n\n    newComponentPortal<T>(component: ComponentType<T>, options: ComponentPortalOptions<T>): ComponentPortalRef<T> {\n        if (!options.injector) {\n            options = { ...options, injector: this.#injector }\n        }\n        return this.append(new ComponentPortalRef(component, options))\n    }\n\n    newTemplatePortal<T>(tpl: TemplateRef<T>, options: TemplatePortalOptions<T>): TemplatePortalRef<T> {\n        if (!options.injector) {\n            options = { ...options, injector: this.#injector }\n        }\n        return this.append(new TemplatePortalRef(tpl, options))\n    }\n\n    newContainer(options: ContainerOptions): ContainerRef {\n        if (!options.injector) {\n            options = { ...options, injector: this.#injector }\n        }\n        return this.append(new ContainerRef(options))\n    }\n\n    newBackdrop(options: BackdropOptions): BackdropRef {\n        return this.append(BackdropRef.from(this.#cover, this.#injector, options))\n    }\n\n    append<T extends ChildRef>(ref: T): T {\n        if (!this.#children.includes(ref)) {\n            this.#children.push(ref)\n            this.#update()\n            this.root.nativeElement.appendChild(ref.nativeElement)\n            ref.state.on(\"disposed\", () => this.#remove(ref))\n        }\n        return ref\n    }\n\n    #remove(ref: ChildRef) {\n        const idx = this.#children.indexOf(ref)\n        if (idx > -1) {\n            this.#children.splice(idx, 1)\n            this.#update()\n        }\n    }\n\n    #update() {\n        const children = toSorted(this.#children, sortChildren2)\n\n        let zIndex = this.#zIndexStart\n        for (const child of children) {\n            child.zIndex = zIndex\n            zIndex += 1\n        }\n\n        children.sort(sortByZIndexDesc)\n\n        let hasBackdrop = false\n        for (const child of children) {\n            if (child instanceof BackdropRef && child.options.type === \"solid\") {\n                child.visible = !hasBackdrop\n                hasBackdrop = true\n            }\n        }\n    }\n}\n\n@Directive({\n    selector: \"body\",\n    standalone: true,\n    providers: [{ provide: LayerService, useExisting: RootLayer }]\n})\nexport class RootLayer extends LayerService {}\n\n@Directive({\n    standalone: true,\n    providers: [{ provide: LayerService, useExisting: IndividualLayer }]\n})\nexport class IndividualLayer extends LayerService {}\n\nfunction sortChildren2(a: ChildRef, b: ChildRef) {\n    const alwaysOnTop = sortByAlwaysOnTop(a, b)\n    if (alwaysOnTop === 0) {\n        return sortByBackdrop(a, b)\n    } else {\n        return alwaysOnTop\n    }\n}\n\nfunction sortByBackdrop(a: ChildRef, b: ChildRef) {\n    if (a instanceof BackdropRef && a.under === b) {\n        return -1\n    } else if (b instanceof BackdropRef && b.under === a) {\n        return 1\n    }\n    return 0\n}\n\nfunction sortByZIndexDesc(a: ChildRef, b: ChildRef) {\n    return b.zIndex - a.zIndex\n}\n\nfunction sortByAlwaysOnTop(a: ChildRef, b: ChildRef) {\n    return getAlwaysOnTop(a) - getAlwaysOnTop(b)\n}\n\nfunction getAlwaysOnTop(child: ChildRef): number {\n    if (child instanceof BackdropRef) {\n        return child.under.alwaysOnTop || AlwaysOnTop.None\n    } else {\n        return child.alwaysOnTop || AlwaysOnTop.None\n    }\n}\n"]}
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
import { AnimationBuilder, style as style$1, animate } from '@angular/animations';
|
|
2
|
-
import { Observable, Subject, map, exhaustMap, combineLatest, distinctUntilChanged,
|
|
2
|
+
import { Observable, tap, Subject, map, exhaustMap, combineLatest, takeUntil, distinctUntilChanged, of, filter, take, share, ReplaySubject, shareReplay, takeWhile, debounceTime, EMPTY, merge } from 'rxjs';
|
|
3
3
|
import { animationObservable, CoverService } from '@ngutil/graphics';
|
|
4
4
|
import { Duration, Ease, DimensionWatcher, rectExpand, rectOrigin, rectMoveOrigin, rectContract, RectWatcher } from '@ngutil/style';
|
|
5
5
|
import { clamp } from 'lodash';
|
|
6
|
-
import { isElementInput,
|
|
6
|
+
import { isElementInput, Lifecycle, toSorted } from '@ngutil/common';
|
|
7
7
|
import { FocusService, KeystrokeService } from '@ngutil/aria';
|
|
8
8
|
import * as i0 from '@angular/core';
|
|
9
9
|
import { ElementRef, Injector, ComponentFactoryResolver, ViewContainerRef, InjectionToken, inject, Directive, Inject, Optional, Injectable, TemplateRef, NgModule } from '@angular/core';
|
|
@@ -21,7 +21,8 @@ class AnimationTrait {
|
|
|
21
21
|
const builder = floatingRef.container.injector.get(AnimationBuilder);
|
|
22
22
|
const element = floatingRef.container.nativeElement;
|
|
23
23
|
floatingRef.state.on("showing", () => animationObservable({ builder, element, animation: this.animation.show }));
|
|
24
|
-
floatingRef.state.on("disposing", () => animationObservable({ builder, element, animation: this.animation.hide }));
|
|
24
|
+
floatingRef.state.on("disposing", () => animationObservable({ builder, element, animation: this.animation.hide }).pipe(tap(() => (element.style.display = "none"))));
|
|
25
|
+
floatingRef.state.on("disposing", () => dst.complete());
|
|
25
26
|
dst.next();
|
|
26
27
|
});
|
|
27
28
|
}
|
|
@@ -29,7 +30,6 @@ class AnimationTrait {
|
|
|
29
30
|
const FallAnimation = {
|
|
30
31
|
show: [
|
|
31
32
|
style$1({
|
|
32
|
-
// "perspective:": "1300px",
|
|
33
33
|
transform: "scale(1.5)",
|
|
34
34
|
visibility: "visible",
|
|
35
35
|
opacity: "0"
|
|
@@ -84,12 +84,10 @@ class BackdropTrait {
|
|
|
84
84
|
}
|
|
85
85
|
const state = new BackdropState();
|
|
86
86
|
const backdrop = floatingRef.layerSvc.newBackdrop(options);
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
? state.onClick.pipe(exhaustMap(() => floatingRef.close())).subscribe()
|
|
92
|
-
: null;
|
|
87
|
+
if (this.options.closeOnClick) {
|
|
88
|
+
dest.add(this.#installClickHandler(floatingRef, backdrop, state));
|
|
89
|
+
dest.add(state.onClick.pipe(exhaustMap(() => floatingRef.close())).subscribe());
|
|
90
|
+
}
|
|
93
91
|
backdrop.state.on("showing", () => animationObservable({
|
|
94
92
|
builder: animationBuilder,
|
|
95
93
|
element: backdrop.nativeElement,
|
|
@@ -100,14 +98,10 @@ class BackdropTrait {
|
|
|
100
98
|
element: backdrop.nativeElement,
|
|
101
99
|
animation: FadeAnimation.hide
|
|
102
100
|
}));
|
|
101
|
+
backdrop.state.on("disposed", () => dest.complete());
|
|
103
102
|
floatingRef.state.on("disposing", () => backdrop.dispose());
|
|
104
|
-
|
|
103
|
+
dest.add(backdrop.show().subscribe());
|
|
105
104
|
dest.next(state);
|
|
106
|
-
return () => {
|
|
107
|
-
removeOnClick && removeOnClick();
|
|
108
|
-
onClickSub?.unsubscribe();
|
|
109
|
-
backdropShowSub.unsubscribe();
|
|
110
|
-
};
|
|
111
105
|
});
|
|
112
106
|
}
|
|
113
107
|
#installClickHandler(floatingRef, backdrop, state) {
|
|
@@ -173,7 +167,7 @@ class DimensionConstraintTrait {
|
|
|
173
167
|
}
|
|
174
168
|
});
|
|
175
169
|
}
|
|
176
|
-
}).pipe(distinctUntilChanged(), tap(value => {
|
|
170
|
+
}).pipe(takeUntil(floatingRef.state.onExecute("disposing")), distinctUntilChanged(), tap(value => {
|
|
177
171
|
const floatingEl = floatingRef.container.nativeElement;
|
|
178
172
|
floatingEl.style[this.name] = `${value}px`;
|
|
179
173
|
}));
|
|
@@ -198,17 +192,16 @@ class FocusTrait {
|
|
|
198
192
|
this.name = "focus";
|
|
199
193
|
}
|
|
200
194
|
connect(floatingRef) {
|
|
201
|
-
return new Observable(
|
|
202
|
-
const subs = new Subscription();
|
|
195
|
+
return new Observable(dest => {
|
|
203
196
|
const originallyFocused = document.activeElement;
|
|
204
197
|
const svc = floatingRef.container.injector.get(FocusService);
|
|
205
198
|
if (this.options.connect) {
|
|
206
199
|
const tabindex = this.options.tabindex == null ? 0 : this.options.tabindex;
|
|
207
200
|
floatingRef.container.nativeElement.setAttribute("tabindex", tabindex.toString());
|
|
208
|
-
|
|
201
|
+
dest.add(this.options.connect.connect(floatingRef.container).subscribe());
|
|
209
202
|
}
|
|
210
203
|
if (this.options.trap) {
|
|
211
|
-
|
|
204
|
+
dest.add(this.#trap(floatingRef, svc).subscribe());
|
|
212
205
|
}
|
|
213
206
|
floatingRef.state.on("disposing", () => {
|
|
214
207
|
const active = document.activeElement;
|
|
@@ -216,10 +209,9 @@ class FocusTrait {
|
|
|
216
209
|
if (active === floating || floating.contains(active)) {
|
|
217
210
|
originallyFocused && document.contains(originallyFocused) && svc.focus(originallyFocused, "program");
|
|
218
211
|
}
|
|
212
|
+
dest.complete();
|
|
219
213
|
});
|
|
220
|
-
|
|
221
|
-
subs.unsubscribe();
|
|
222
|
-
};
|
|
214
|
+
dest.next();
|
|
223
215
|
});
|
|
224
216
|
}
|
|
225
217
|
#trap(floatingRef, svc) {
|
|
@@ -307,7 +299,7 @@ class PositionTrait {
|
|
|
307
299
|
res.apply(floatingRef);
|
|
308
300
|
dest.next(res);
|
|
309
301
|
});
|
|
310
|
-
});
|
|
302
|
+
}).pipe(takeUntil(floatingRef.state.onExecute("disposing")));
|
|
311
303
|
}
|
|
312
304
|
}
|
|
313
305
|
function refWatcher(rectWatcher, ref, floatingRef) {
|
|
@@ -401,6 +393,14 @@ function attribute(attrs) {
|
|
|
401
393
|
return new AttributeTrait(attrs);
|
|
402
394
|
}
|
|
403
395
|
|
|
396
|
+
var AlwaysOnTop;
|
|
397
|
+
(function (AlwaysOnTop) {
|
|
398
|
+
AlwaysOnTop[AlwaysOnTop["None"] = 0] = "None";
|
|
399
|
+
AlwaysOnTop[AlwaysOnTop["Normal"] = 1] = "Normal";
|
|
400
|
+
AlwaysOnTop[AlwaysOnTop["Modal"] = 2] = "Modal";
|
|
401
|
+
AlwaysOnTop[AlwaysOnTop["Toast"] = 3] = "Toast";
|
|
402
|
+
AlwaysOnTop[AlwaysOnTop["UAC"] = 100] = "UAC";
|
|
403
|
+
})(AlwaysOnTop || (AlwaysOnTop = {}));
|
|
404
404
|
// TODO: disposing, disposed
|
|
405
405
|
class ChildRef extends ElementRef {
|
|
406
406
|
/**
|
|
@@ -415,36 +415,40 @@ class ChildRef extends ElementRef {
|
|
|
415
415
|
get zIndex() {
|
|
416
416
|
return this._zIndex;
|
|
417
417
|
}
|
|
418
|
-
constructor(nativeElement) {
|
|
418
|
+
constructor(nativeElement, alwaysOnTop = AlwaysOnTop.None) {
|
|
419
419
|
super(nativeElement);
|
|
420
|
-
this.
|
|
420
|
+
this.alwaysOnTop = alwaysOnTop;
|
|
421
|
+
this.state = new Lifecycle({
|
|
421
422
|
showing: {},
|
|
422
423
|
shown: {},
|
|
423
424
|
disposing: { cancellable: false },
|
|
424
425
|
disposed: { cancellable: false, order: "sequential" }
|
|
425
426
|
});
|
|
426
427
|
this._zIndex = -1;
|
|
427
|
-
this.state.
|
|
428
|
+
this.disposed$ = this.state.current$.pipe(filter(state => state === "disposed"), take(1), share());
|
|
429
|
+
this.state.on("disposed", () => {
|
|
430
|
+
this.nativeElement.parentElement?.removeChild(this.nativeElement);
|
|
431
|
+
this.state.destroy();
|
|
432
|
+
delete this.state;
|
|
433
|
+
});
|
|
428
434
|
// this.state.current$.subscribe(state => {
|
|
429
435
|
// console.log(this, state)
|
|
430
436
|
// })
|
|
437
|
+
// this.state.status$.subscribe(status => {
|
|
438
|
+
// console.log(this.nativeElement, status)
|
|
439
|
+
// })
|
|
431
440
|
}
|
|
432
441
|
dispose() {
|
|
433
442
|
if (this.state == null) {
|
|
434
|
-
return of(
|
|
443
|
+
return of();
|
|
435
444
|
}
|
|
436
445
|
return this.state.run(["disposing", "disposed"]);
|
|
437
446
|
}
|
|
438
|
-
destroy() {
|
|
439
|
-
this.nativeElement.parentElement?.removeChild(this.nativeElement);
|
|
440
|
-
this.state.destroy();
|
|
441
|
-
delete this.state;
|
|
442
|
-
}
|
|
443
447
|
}
|
|
444
448
|
|
|
445
449
|
class ContainerRef extends ChildRef {
|
|
446
450
|
constructor(options) {
|
|
447
|
-
super(createElement(options));
|
|
451
|
+
super(createElement(options), options.alwaysOnTop || AlwaysOnTop.None);
|
|
448
452
|
this.options = options;
|
|
449
453
|
this.injectorName = "ContainerRef";
|
|
450
454
|
const providers = options.providers || [];
|
|
@@ -488,7 +492,6 @@ class BackdropRef extends ChildRef {
|
|
|
488
492
|
// options.under.state.control(ref.state)
|
|
489
493
|
return ref;
|
|
490
494
|
}
|
|
491
|
-
#coverSub;
|
|
492
495
|
set visible(visible) {
|
|
493
496
|
if (this.#visible !== visible) {
|
|
494
497
|
this.#visible = visible;
|
|
@@ -512,21 +515,21 @@ class BackdropRef extends ChildRef {
|
|
|
512
515
|
"0px";
|
|
513
516
|
this.under = options.under;
|
|
514
517
|
if (options.type === "solid") {
|
|
515
|
-
this
|
|
518
|
+
this.coverSvc
|
|
519
|
+
.solid({ container: nativeElement, color: options.color })
|
|
520
|
+
.pipe(takeUntil(this.disposed$))
|
|
521
|
+
.subscribe();
|
|
516
522
|
this.group = `${options.color === "transparent" ? "transparent" : "solid"}`;
|
|
517
523
|
}
|
|
518
524
|
else if (options.type === "crop") {
|
|
519
|
-
this
|
|
525
|
+
this.coverSvc
|
|
520
526
|
.crop({ container: nativeElement, color: options.color, crop: options.crop })
|
|
527
|
+
.pipe(takeUntil(this.disposed$))
|
|
521
528
|
.subscribe();
|
|
522
529
|
}
|
|
523
530
|
}
|
|
524
531
|
show() {
|
|
525
|
-
return this.state.run(
|
|
526
|
-
}
|
|
527
|
-
destroy() {
|
|
528
|
-
this.#coverSub?.unsubscribe();
|
|
529
|
-
super.destroy();
|
|
532
|
+
return this.state.run("showing", "shown");
|
|
530
533
|
}
|
|
531
534
|
}
|
|
532
535
|
|
|
@@ -640,7 +643,7 @@ class LayerService {
|
|
|
640
643
|
}
|
|
641
644
|
}
|
|
642
645
|
#update() {
|
|
643
|
-
const children = toSorted(this.#children,
|
|
646
|
+
const children = toSorted(this.#children, sortChildren2);
|
|
644
647
|
let zIndex = this.#zIndexStart;
|
|
645
648
|
for (const child of children) {
|
|
646
649
|
child.zIndex = zIndex;
|
|
@@ -689,6 +692,15 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.6", ngImpor
|
|
|
689
692
|
providers: [{ provide: LayerService, useExisting: IndividualLayer }]
|
|
690
693
|
}]
|
|
691
694
|
}] });
|
|
695
|
+
function sortChildren2(a, b) {
|
|
696
|
+
const alwaysOnTop = sortByAlwaysOnTop(a, b);
|
|
697
|
+
if (alwaysOnTop === 0) {
|
|
698
|
+
return sortByBackdrop(a, b);
|
|
699
|
+
}
|
|
700
|
+
else {
|
|
701
|
+
return alwaysOnTop;
|
|
702
|
+
}
|
|
703
|
+
}
|
|
692
704
|
function sortByBackdrop(a, b) {
|
|
693
705
|
if (a instanceof BackdropRef && a.under === b) {
|
|
694
706
|
return -1;
|
|
@@ -701,6 +713,17 @@ function sortByBackdrop(a, b) {
|
|
|
701
713
|
function sortByZIndexDesc(a, b) {
|
|
702
714
|
return b.zIndex - a.zIndex;
|
|
703
715
|
}
|
|
716
|
+
function sortByAlwaysOnTop(a, b) {
|
|
717
|
+
return getAlwaysOnTop(a) - getAlwaysOnTop(b);
|
|
718
|
+
}
|
|
719
|
+
function getAlwaysOnTop(child) {
|
|
720
|
+
if (child instanceof BackdropRef) {
|
|
721
|
+
return child.under.alwaysOnTop || AlwaysOnTop.None;
|
|
722
|
+
}
|
|
723
|
+
else {
|
|
724
|
+
return child.alwaysOnTop || AlwaysOnTop.None;
|
|
725
|
+
}
|
|
726
|
+
}
|
|
704
727
|
|
|
705
728
|
const TRAITS = new InjectionToken("TRAITS");
|
|
706
729
|
class FloatingRef {
|
|
@@ -711,7 +734,7 @@ class FloatingRef {
|
|
|
711
734
|
this.layerSvc = layerSvc;
|
|
712
735
|
this.container = container;
|
|
713
736
|
this.channel = new ReplaySubject(1);
|
|
714
|
-
this.state = new
|
|
737
|
+
this.state = new Lifecycle({
|
|
715
738
|
init: {},
|
|
716
739
|
showing: {},
|
|
717
740
|
shown: {},
|
|
@@ -721,47 +744,51 @@ class FloatingRef {
|
|
|
721
744
|
cleanup: { cancellable: false, order: "sequential" }
|
|
722
745
|
});
|
|
723
746
|
this.#traits = {};
|
|
724
|
-
this.#untilCleanup = this.state.
|
|
725
|
-
this.#untilDisposed = this.state.
|
|
747
|
+
this.#untilCleanup = this.state.onExecute("cleanup");
|
|
748
|
+
this.#untilDisposed = this.state.onExecute("disposed");
|
|
726
749
|
container.nativeElement.style.overflow = "hidden";
|
|
727
750
|
container.nativeElement.style.visibility = "hidden";
|
|
728
751
|
this.#traits = traits;
|
|
729
752
|
this.traitState$ = this.#traitState().pipe(shareReplay(1));
|
|
730
|
-
|
|
753
|
+
this.state.current$.pipe(takeWhile(state => state !== "cleanup", true)).subscribe(state => {
|
|
731
754
|
this.emit({ type: state });
|
|
732
755
|
});
|
|
733
|
-
this.state.on("init", () =>
|
|
734
|
-
// TODO: angular render is stabilized
|
|
735
|
-
this.traitState$.pipe(takeUntil(this.#untilCleanup), debounceTime(5)).subscribe(() => {
|
|
736
|
-
dst.complete();
|
|
737
|
-
});
|
|
738
|
-
}));
|
|
756
|
+
this.state.on("init", () => this.traitState$.pipe(takeUntil(this.#untilCleanup), debounceTime(5), take(1)));
|
|
739
757
|
this.state.on("showing", () => {
|
|
740
758
|
container.nativeElement.style.visibility = "visible";
|
|
741
759
|
});
|
|
742
760
|
this.state.on("disposing", () => {
|
|
743
761
|
container.nativeElement.style.pointerEvents = "none";
|
|
744
762
|
});
|
|
745
|
-
this.state.on("disposed", () => {
|
|
746
|
-
sub.unsubscribe();
|
|
747
|
-
});
|
|
748
763
|
this.state.control(container.state);
|
|
764
|
+
// TODO: remove
|
|
765
|
+
// this.state.status$.subscribe(status => {
|
|
766
|
+
// console.log("floating", status)
|
|
767
|
+
// })
|
|
749
768
|
}
|
|
750
769
|
show() {
|
|
751
|
-
return this.state.run(
|
|
770
|
+
return this.state.run("init", "showing", "shown");
|
|
752
771
|
}
|
|
772
|
+
/**
|
|
773
|
+
* @deprecated
|
|
774
|
+
*/
|
|
753
775
|
hide() {
|
|
754
|
-
return this.
|
|
776
|
+
return this.close(true);
|
|
755
777
|
}
|
|
756
|
-
close() {
|
|
757
|
-
|
|
778
|
+
close(force = false) {
|
|
779
|
+
if (force) {
|
|
780
|
+
return this.state.run("disposing", "disposed", "cleanup");
|
|
781
|
+
}
|
|
782
|
+
else {
|
|
783
|
+
return this.state.run("closing", "disposing", "disposed", "cleanup");
|
|
784
|
+
}
|
|
758
785
|
}
|
|
759
786
|
emit(event) {
|
|
760
787
|
this.channel.next({ ...event, floatingRef: this });
|
|
761
788
|
}
|
|
762
789
|
setResult(data) {
|
|
763
790
|
this.emit({ type: "result", data });
|
|
764
|
-
this.
|
|
791
|
+
this.close(true).subscribe();
|
|
765
792
|
}
|
|
766
793
|
watchTrait(name) {
|
|
767
794
|
return this.traitState$.pipe(takeUntil(this.#untilDisposed), filter(event => event.name === name), map(event => event.data), shareReplay(1));
|
|
@@ -938,5 +965,5 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.6", ngImpor
|
|
|
938
965
|
* Generated bundle index. Do not edit.
|
|
939
966
|
*/
|
|
940
967
|
|
|
941
|
-
export { AnimationTrait, AttributeTrait, BackdropRef, BackdropState, BackdropTrait, ChildRef, ComponentPortalRef, DimensionConstraintTrait, FadeAnimation, FallAnimation, FloatingAnchorRef, FloatingComponentFactory, FloatingFactory, FloatingPlacementRef, FloatingPosition, FloatingRef, FloatingService, FloatingTemplateFactory, FocusTrait, IndividualLayer, KeystrokeTrait, LAYER_ZINDEX_START, LayerService, NuFloating, PortalRef, PositionTrait, RootLayer, StyleTrait, TRAITS, TemplatePortalRef, attribute, backdrop, computePosition, fadeAnimation, fallAnimation, focus, keystroke, maxHeight, maxWidth, minHeight, minWidth, modal, position, style };
|
|
968
|
+
export { AlwaysOnTop, AnimationTrait, AttributeTrait, BackdropRef, BackdropState, BackdropTrait, ChildRef, ComponentPortalRef, ContainerRef, DimensionConstraintTrait, FadeAnimation, FallAnimation, FloatingAnchorRef, FloatingComponentFactory, FloatingFactory, FloatingPlacementRef, FloatingPosition, FloatingRef, FloatingService, FloatingTemplateFactory, FocusTrait, IndividualLayer, KeystrokeTrait, LAYER_ZINDEX_START, LayerService, NuFloating, PortalRef, PositionTrait, RootLayer, StyleTrait, TRAITS, TemplatePortalRef, attribute, backdrop, computePosition, fadeAnimation, fallAnimation, focus, keystroke, maxHeight, maxWidth, minHeight, minWidth, modal, position, style };
|
|
942
969
|
//# sourceMappingURL=ngutil-floating.mjs.map
|