@ngutil/floating 0.0.34 → 0.0.36

package/floating/traits/animation.d.ts

@@ -6,9 +6,9 @@ export type AnimationSet = {
     show: AnimationMetadata[];
     hide: AnimationMetadata[];
 };
-export declare class AnimationTrait extends FloatingTrait<unknown> {
+export declare class AnimationTrait implements FloatingTrait<unknown> {
     readonly animation: AnimationSet;
-    name: string;
+    readonly name = "animation";
     constructor(animation: AnimationSet);
     connect(floatingRef: FloatingRef): Observable<unknown>;
 }

package/floating/traits/attribute.d.ts

@@ -9,9 +9,9 @@ export type Attributes = {
         [key: string]: Primitive;
     };
 };
-export declare class AttributeTrait extends FloatingTrait<Attributes> {
+export declare class AttributeTrait implements FloatingTrait<Attributes> {
     readonly attrs: Attributes;
-    name: string;
+    readonly name = "attribute";
     constructor(attrs: Attributes);
     connect(floatingRef: FloatingRef): Observable<Attributes>;
 }

package/floating/traits/backdrop.d.ts

@@ -10,10 +10,10 @@ export interface BackdropTraitOptions {
 export declare class BackdropState {
     onClick: Observable<void>;
 }
-export declare class BackdropTrait extends FloatingTrait<BackdropState> {
+export declare class BackdropTrait implements FloatingTrait<BackdropState> {
     #private;
     readonly options: BackdropTraitOptions;
-    name: string;
+    readonly name = "backdrop";
     constructor(options: BackdropTraitOptions);
     connect(floatingRef: FloatingRef<any>): Observable<BackdropState>;
 }

package/floating/traits/dim-contraint.d.ts

@@ -11,7 +11,7 @@ interface DimMapEntry {
 declare const DIM_MAP: {
     [key: string]: DimMapEntry;
 };
-export declare class DimensionConstraintTrait extends FloatingTrait<number> {
+export declare class DimensionConstraintTrait implements FloatingTrait<number> {
     #private;
     readonly value: DimensionConstraintInput;
     readonly name: string;

package/floating/traits/focus.d.ts

@@ -0,0 +1,19 @@
+import { Observable } from "rxjs";
+import { Focusable, FocusState } from "@ngutil/aria";
+import { ElementInput } from "@ngutil/common";
+import { FloatingRef } from "../floating-ref";
+import { FloatingTrait } from "./_base";
+export interface FocusOptions {
+    trap?: boolean;
+    connect?: Focusable | FocusState;
+    tabindex?: number;
+    focusOnClose?: ElementInput;
+}
+export declare class FocusTrait implements FloatingTrait<unknown> {
+    #private;
+    readonly options: FocusOptions;
+    readonly name = "focus";
+    constructor(options: FocusOptions);
+    connect(floatingRef: FloatingRef): Observable<unknown>;
+}
+export declare function focus(options: FocusOptions): FocusTrait;

package/floating/traits/index.d.ts

@@ -2,7 +2,7 @@ export * from "./_base";
 export * from "./animation";
 export * from "./backdrop";
 export * from "./dim-contraint";
-export * from "./focus-trap";
+export * from "./focus";
 export * from "./keystroke";
 export * from "./modal";
 export * from "./position-calc";

package/floating/traits/keystroke.d.ts

@@ -1,7 +1,7 @@
 import { Observable } from "rxjs";
 import { FloatingRef } from "../floating-ref";
 import { FloatingTrait } from "./_base";
-export declare class KeystrokeTrait extends FloatingTrait<unknown> {
+export declare class KeystrokeTrait implements FloatingTrait<unknown> {
     name: string;
     connect(floatingRef: FloatingRef): Observable<unknown>;
 }

package/floating/traits/modal.d.ts

@@ -1,4 +1,4 @@
 export interface ModalOptions {
     closeOnBackdropClick?: boolean;
 }
-export declare function modal(options?: ModalOptions): (import("./animation").AnimationTrait | import("./position").PositionTrait | import("./backdrop").BackdropTrait | import("./focus-trap").FocusTrapTrait | import("./keystroke").KeystrokeTrait)[];
+export declare function modal(options?: ModalOptions): (import("./animation").AnimationTrait | (import("@ngutil/floating").DimensionConstraintTrait | import("./position").PositionTrait)[] | import("./backdrop").BackdropTrait | import("./focus").FocusTrait | import("./keystroke").KeystrokeTrait)[];

package/floating/traits/position.d.ts

@@ -41,13 +41,13 @@ export type FloatingPositionOptionsNormalized = FloatingPositionOptions & {
     content: FloatingContent;
     placement: FloatingPlacement;
 };
-export declare class PositionTrait extends FloatingTrait<FloatingPosition> {
-    name: string;
+export declare class PositionTrait implements FloatingTrait<FloatingPosition> {
+    readonly name = "position";
     readonly options: FloatingPositionOptionsNormalized;
     constructor(options: FloatingPositionOptions);
     connect(floatingRef: FloatingRef<any>): Observable<FloatingPosition>;
 }
-export declare function position(options: FloatingPositionOptions): PositionTrait;
+export declare function position(options: FloatingPositionOptions): (import("./dim-contraint").DimensionConstraintTrait | PositionTrait)[];
 export declare class FloatingPosition {
     readonly options: FloatingPositionOptionsNormalized;
     readonly floating: Dimension;

package/floating/traits/style.d.ts

@@ -1,9 +1,9 @@
 import { Observable } from "rxjs";
 import { FloatingRef } from "../floating-ref";
 import { FloatingTrait } from "./_base";
-export declare class StyleTrait extends FloatingTrait<Partial<CSSStyleDeclaration>> {
+export declare class StyleTrait implements FloatingTrait<Partial<CSSStyleDeclaration>> {
     readonly styles: Partial<CSSStyleDeclaration>;
-    name: string;
+    readonly name = "style";
     constructor(styles: Partial<CSSStyleDeclaration>);
     connect(floatingRef: FloatingRef): Observable<Partial<CSSStyleDeclaration>>;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ngutil/floating",
-  "version": "0.0.34",
+  "version": "0.0.36",
   "dependencies": {
     "tslib": "^2.6.2"
   },
@@ -8,9 +8,9 @@
     "@angular/cdk": "^17.3.6",
     "@angular/common": "^17.3.6",
     "@angular/core": "^17.3.6",
-    "@ngutil/aria": "0.0.34",
-    "@ngutil/common": "0.0.34",
-    "@ngutil/style": "0.0.34"
+    "@ngutil/common": "0.0.36",
+    "@ngutil/aria": "0.0.36",
+    "@ngutil/style": "0.0.36"
   },
   "publishConfig": {
     "access": "public",

package/esm2022/floating/traits/focus-trap.mjs

@@ -1,27 +0,0 @@
-import { Observable } from "rxjs";
-import { FocusService } from "@ngutil/aria";
-import { FloatingTrait } from "./_base";
-export class FocusTrapTrait extends FloatingTrait {
-    constructor() {
-        super(...arguments);
-        this.name = "focus-trap";
-    }
-    connect(floatingRef) {
-        return new Observable(() => {
-            const svc = floatingRef.container.injector.get(FocusService);
-            const trap = svc.focusTrap(floatingRef.container.nativeElement);
-            const originallyFocused = document.activeElement;
-            floatingRef.state.on("shown", () => {
-                trap.focusInitialElement();
-            });
-            return () => {
-                trap.destroy();
-                originallyFocused && svc.focus(originallyFocused, "program");
-            };
-        });
-    }
-}
-export function focusTrap() {
-    return new FocusTrapTrait();
-}
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZm9jdXMtdHJhcC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uL3BhY2thZ2VzL2Zsb2F0aW5nL3NyYy9mbG9hdGluZy90cmFpdHMvZm9jdXMtdHJhcC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sTUFBTSxDQUFBO0FBRWpDLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSxjQUFjLENBQUE7QUFHM0MsT0FBTyxFQUFFLGFBQWEsRUFBRSxNQUFNLFNBQVMsQ0FBQTtBQUV2QyxNQUFNLE9BQU8sY0FBZSxTQUFRLGFBQXNCO0lBQTFEOztRQUNhLFNBQUksR0FBRyxZQUFZLENBQUE7SUFpQmhDLENBQUM7SUFoQlksT0FBTyxDQUFDLFdBQXdCO1FBQ3JDLE9BQU8sSUFBSSxVQUFVLENBQUMsR0FBRyxFQUFFO1lBQ3ZCLE1BQU0sR0FBRyxHQUFHLFdBQVcsQ0FBQyxTQUFTLENBQUMsUUFBUSxDQUFDLEdBQUcsQ0FBQyxZQUFZLENBQUMsQ0FBQTtZQUM1RCxNQUFNLElBQUksR0FBRyxHQUFHLENBQUMsU0FBUyxDQUFDLFdBQVcsQ0FBQyxTQUFTLENBQUMsYUFBYSxDQUFDLENBQUE7WUFDL0QsTUFBTSxpQkFBaUIsR0FBRyxRQUFRLENBQUMsYUFBNEIsQ0FBQTtZQUUvRCxXQUFXLENBQUMsS0FBSyxDQUFDLEVBQUUsQ0FBQyxPQUFPLEVBQUUsR0FBRyxFQUFFO2dCQUMvQixJQUFJLENBQUMsbUJBQW1CLEVBQUUsQ0FBQTtZQUM5QixDQUFDLENBQUMsQ0FBQTtZQUVGLE9BQU8sR0FBRyxFQUFFO2dCQUNSLElBQUksQ0FBQyxPQUFPLEVBQUUsQ0FBQTtnQkFDZCxpQkFBaUIsSUFBSSxHQUFHLENBQUMsS0FBSyxDQUFDLGlCQUFpQixFQUFFLFNBQVMsQ0FBQyxDQUFBO1lBQ2hFLENBQUMsQ0FBQTtRQUNMLENBQUMsQ0FBQyxDQUFBO0lBQ04sQ0FBQztDQUNKO0FBRUQsTUFBTSxVQUFVLFNBQVM7SUFDckIsT0FBTyxJQUFJLGNBQWMsRUFBRSxDQUFBO0FBQy9CLENBQUMiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBPYnNlcnZhYmxlIH0gZnJvbSBcInJ4anNcIlxuXG5pbXBvcnQgeyBGb2N1c1NlcnZpY2UgfSBmcm9tIFwiQG5ndXRpbC9hcmlhXCJcblxuaW1wb3J0IHsgRmxvYXRpbmdSZWYgfSBmcm9tIFwiLi4vZmxvYXRpbmctcmVmXCJcbmltcG9ydCB7IEZsb2F0aW5nVHJhaXQgfSBmcm9tIFwiLi9fYmFzZVwiXG5cbmV4cG9ydCBjbGFzcyBGb2N1c1RyYXBUcmFpdCBleHRlbmRzIEZsb2F0aW5nVHJhaXQ8dW5rbm93bj4ge1xuICAgIG92ZXJyaWRlIG5hbWUgPSBcImZvY3VzLXRyYXBcIlxuICAgIG92ZXJyaWRlIGNvbm5lY3QoZmxvYXRpbmdSZWY6IEZsb2F0aW5nUmVmKTogT2JzZXJ2YWJsZTx1bmtub3duPiB7XG4gICAgICAgIHJldHVybiBuZXcgT2JzZXJ2YWJsZSgoKSA9PiB7XG4gICAgICAgICAgICBjb25zdCBzdmMgPSBmbG9hdGluZ1JlZi5jb250YWluZXIuaW5qZWN0b3IuZ2V0KEZvY3VzU2VydmljZSlcbiAgICAgICAgICAgIGNvbnN0IHRyYXAgPSBzdmMuZm9jdXNUcmFwKGZsb2F0aW5nUmVmLmNvbnRhaW5lci5uYXRpdmVFbGVtZW50KVxuICAgICAgICAgICAgY29uc3Qgb3JpZ2luYWxseUZvY3VzZWQgPSBkb2N1bWVudC5hY3RpdmVFbGVtZW50IGFzIEhUTUxFbGVtZW50XG5cbiAgICAgICAgICAgIGZsb2F0aW5nUmVmLnN0YXRlLm9uKFwic2hvd25cIiwgKCkgPT4ge1xuICAgICAgICAgICAgICAgIHRyYXAuZm9jdXNJbml0aWFsRWxlbWVudCgpXG4gICAgICAgICAgICB9KVxuXG4gICAgICAgICAgICByZXR1cm4gKCkgPT4ge1xuICAgICAgICAgICAgICAgIHRyYXAuZGVzdHJveSgpXG4gICAgICAgICAgICAgICAgb3JpZ2luYWxseUZvY3VzZWQgJiYgc3ZjLmZvY3VzKG9yaWdpbmFsbHlGb2N1c2VkLCBcInByb2dyYW1cIilcbiAgICAgICAgICAgIH1cbiAgICAgICAgfSlcbiAgICB9XG59XG5cbmV4cG9ydCBmdW5jdGlvbiBmb2N1c1RyYXAoKSB7XG4gICAgcmV0dXJuIG5ldyBGb2N1c1RyYXBUcmFpdCgpXG59XG4iXX0=

package/floating/traits/focus-trap.d.ts

@@ -1,8 +0,0 @@
-import { Observable } from "rxjs";
-import { FloatingRef } from "../floating-ref";
-import { FloatingTrait } from "./_base";
-export declare class FocusTrapTrait extends FloatingTrait<unknown> {
-    name: string;
-    connect(floatingRef: FloatingRef): Observable<unknown>;
-}
-export declare function focusTrap(): FocusTrapTrait;