@ngutil/aria 0.0.73 → 0.0.74

package/gestures/gesture-drag.d.ts

@@ -3,11 +3,12 @@ import { Mutable } from "utility-types";
 import { Position } from "@ngutil/style";
 import { Gesture, GestureCaptureState, GestureOptions } from "./gesture";
 import { GestureDetail } from "./gesture-event";
-export interface GestureDragDetail extends GestureDetail<"gesture-drag"> {
+export interface GestureDragDetail extends GestureDetail {
     moveBy: Position;
 }
 export type GestureDragOptions = GestureOptions<GestureDragImpl>;
 export declare class GestureDragImpl<T extends GestureDragDetail = GestureDragDetail> extends Gesture<T> {
+    readonly type = "gesture-drag";
     readonly horizontal?: boolean;
     readonly vertical?: boolean;
     constructor(options?: GestureDragOptions);

package/gestures/gesture-event.d.ts

@@ -1,10 +1,5 @@
 import { Position } from "@ngutil/style";
-export type GestureEvent<T extends GestureDetail> = T extends GestureDetail<infer N> ? CustomEvent<T> & {
-    type: N;
-} : never;
-declare const PHANTOM: unique symbol;
-export interface GestureDetail<T extends string = string> {
-    readonly [PHANTOM]: T;
+export interface GestureDetail {
     readonly origin: GestureOrigin;
     readonly target: HTMLElement;
     readonly pointerType: GesturePointerType;
@@ -43,4 +38,3 @@ export interface GestureListenerConfig {
 export declare const Listeners: {
     [key: string]: GestureListenerConfig;
 };
-export {};

package/gestures/gesture-longtap.d.ts

@@ -1,12 +1,13 @@
 import { Observable } from "rxjs";
 import { Gesture, GestureCaptureState, GestureOptions } from "./gesture";
 import { GestureDetail } from "./gesture-event";
-export type GestureLongTapDetail = GestureDetail<"gesture-longtap">;
+export type GestureLongTapDetail = GestureDetail;
 export type GestureLongTapOptions = GestureOptions<GestureLongTapImpl>;
 export declare class GestureLongTapImpl<T extends GestureLongTapDetail = GestureLongTapDetail> extends Gesture<T> {
+    readonly type = "gesture-longtap";
     constructor(options?: GestureLongTapOptions);
     capture(events: Observable<GestureDetail>): Observable<GestureCaptureState>;
     handle(events: Observable<GestureDetail>): Observable<import("utility-types").Mutable<T>>;
 }
-export declare function gestureLongTap(options?: GestureLongTapOptions): GestureLongTapImpl<GestureLongTapDetail>;
-export declare const GestureLongTap: GestureLongTapImpl<GestureLongTapDetail>;
+export declare function gestureLongTap(options?: GestureLongTapOptions): GestureLongTapImpl<GestureDetail>;
+export declare const GestureLongTap: GestureLongTapImpl<GestureDetail>;

package/gestures/gesture-tap.d.ts

@@ -1,12 +1,12 @@
 import { Observable } from "rxjs";
 import { Gesture, GestureCaptureState, GestureOptions } from "./gesture";
 import { GestureDetail } from "./gesture-event";
-export type GestureTapDetail = GestureDetail<"gesture-tap">;
+export type GestureTapDetail = GestureDetail;
 export type GestureTapOptions = GestureOptions<GestureTapImpl>;
 export declare class GestureTapImpl<T extends GestureTapDetail = GestureTapDetail> extends Gesture<T> {
-    constructor(options?: GestureTapOptions);
+    readonly type = "gesture-tap";
     capture(events: Observable<GestureDetail>): Observable<GestureCaptureState>;
     handle(events: Observable<GestureDetail>): Observable<import("utility-types").Mutable<T>>;
 }
-export declare function gestureTap(options?: GestureTapOptions): GestureTapImpl<GestureTapDetail>;
-export declare const GestureTap: GestureTapImpl<GestureTapDetail>;
+export declare function gestureTap(options?: GestureTapOptions): GestureTapImpl<GestureDetail>;
+export declare const GestureTap: GestureTapImpl<GestureDetail>;

package/gestures/gesture.d.ts

@@ -8,10 +8,18 @@ export declare const enum GestureCaptureState {
     Maybe = 3,
     Instant = 4
 }
-type _GestureOptions = Partial<Omit<Gesture<any>, "originTypes" | "name" | FunctionKeys<Gesture<any>>>>;
+type _GestureOptions = Partial<Omit<Gesture<any>, "originTypes" | "type" | FunctionKeys<Gesture<any>>>>;
 export type GestureOptions<T extends object> = Partial<Omit<T, keyof Gesture<any> | FunctionKeys<T>>> & _GestureOptions;
+export type GestureEvent<G extends Gesture> = G extends Gesture<infer E> & {
+    type: infer T;
+} ? CustomEvent<E> & {
+    type: T;
+} : never;
 export declare abstract class Gesture<T extends GestureDetail = GestureDetail> {
-    readonly name: string;
+    /**
+     * The name of the gesture
+     */
+    abstract readonly type: string;
     /**
      * Gestures that depends on move distance, like drag, use this option
      */
@@ -44,7 +52,7 @@ export declare abstract class Gesture<T extends GestureDetail = GestureDetail> {
      * The event types of the gesture can handle
      */
     readonly originTypes: Array<string>;
-    constructor(name: string, options?: _GestureOptions);
+    constructor(options?: _GestureOptions);
     /**
      * Test if the gesture should be captured.
      * The given events is filterde by {@see Gesture#shouldCapture}

package/gestures/gesture.service.d.ts

@@ -1,16 +1,15 @@
 import { Observable } from "rxjs";
 import { ElementInput } from "@ngutil/common";
-import { Gesture } from "./gesture";
-import { GestureEvent } from "./gesture-event";
+import { Gesture, GestureEvent } from "./gesture";
 import * as i0 from "@angular/core";
-type GesturesToEventsType<T extends Array<Gesture>> = T extends Array<infer G> ? (G extends Gesture<infer E> ? E : never) : never;
+type GesturesToEventsType<T extends Array<Gesture>> = T extends Array<infer G> ? (G extends Gesture ? GestureEvent<G> : never) : never;
 type GestureEventDiscriminator<T> = T extends {
     type: infer N;
 } ? {
     type: N;
 } & T : never;
 export type GestureWatchReturns<T extends Array<Gesture>> = Observable<GestureEventDiscriminator<GesturesToEventsType<T>>>;
-export type GestureListenReturns<T extends Array<Gesture>> = Observable<GestureEvent<GesturesToEventsType<T>>>;
+export type GestureListenReturns<T extends Array<Gesture>> = Observable<GesturesToEventsType<T>>;
 export declare class GestureService {
     #private;
     constructor();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ngutil/aria",
-  "version": "0.0.73",
+  "version": "0.0.74",
   "peerDependencies": {
     "@angular/cdk": "18.2.6",
     "@angular/common": "18.2.6",
@@ -9,8 +9,8 @@
     "rxjs": "^7.8.1",
     "tabbable": "^6.2.0",
     "utility-types": "^3.11.0",
-    "@ngutil/common": "0.0.73",
-    "@ngutil/style": "0.0.73"
+    "@ngutil/common": "0.0.74",
+    "@ngutil/style": "0.0.74"
   },
   "publishConfig": {
     "access": "public",