gesturx 1.8.5 → 1.8.8

package/dist/index.d.ts

@@ -2,6 +2,11 @@ import { BehaviorSubject } from 'rxjs';
 import { Observable } from 'rxjs';
 import { ObservedValueOf } from 'rxjs';
 
+export declare interface FailWith {
+    start$: Observable<unknown>;
+    end$: Observable<unknown>;
+}
+
 declare type PanConfig = {
     posThreshold?: number;
     delay?: number;
@@ -165,10 +170,7 @@ export declare type RecognizerConfig<Options> = {
     container?: HTMLElement;
     afterEventReceived?: (event: PointerEvent) => PointerEvent;
     options?: Options;
-    failWith?: {
-        start$: Observable<unknown>;
-        end$: Observable<unknown>;
-    }[];
+    failWith?: FailWith[];
 };
 
 declare interface RecognizerEvent {

package/dist/index.js

@@ -1,7 +1,7 @@
 var ie = Object.defineProperty;
 var se = (t, n, e) => n in t ? ie(t, n, { enumerable: !0, configurable: !0, writable: !0, value: e }) : t[n] = e;
 var $ = (t, n, e) => se(t, typeof n != "symbol" ? n + "" : n, e);
-import { filter as c, fromEvent as S, mergeMap as b, defer as pe, of as I, merge as g, takeWhile as V, scan as U, map as h, BehaviorSubject as q, switchMap as v, share as P, distinctUntilChanged as oe, startWith as re, shareReplay as M, combineLatest as j, exhaustMap as H, first as R, timer as J, withLatestFrom as z, takeUntil as T, skip as ae, tap as K, ignoreElements as le, buffer as he, debounceTime as ce, NEVER as $e, defaultIfEmpty as ue } from "rxjs";
+import { filter as h, fromEvent as S, mergeMap as b, defer as pe, of as T, merge as g, takeWhile as V, scan as L, map as c, BehaviorSubject as q, switchMap as v, share as P, distinctUntilChanged as oe, startWith as re, shareReplay as M, combineLatest as j, exhaustMap as H, first as z, timer as J, withLatestFrom as C, takeUntil as I, skip as ae, tap as K, ignoreElements as le, buffer as he, debounceTime as ce, NEVER as $e, defaultIfEmpty as ue } from "rxjs";
 function de(t, n) {
   return Math.sqrt(
     Math.pow(n.x - t.x, 2) + Math.pow(n.y - t.y, 2)
@@ -52,7 +52,7 @@ function ye(t, n) {
 function fe(t) {
   return t != null;
 }
-const me = (t) => t.length > 0, Ae = (t) => t.pipe(c(me));
+const me = (t) => t.length > 0, Ae = (t) => t.pipe(h(me));
 function Q(t, n, e) {
   const i = k([t]), o = k([n]);
   return Math.abs(o.x - i.x) >= e || Math.abs(o.y - i.y) >= e;
@@ -64,33 +64,33 @@ const De = (t, n, e) => {
     velocityY: o
   };
 };
-function W(t) {
+function U(t) {
   return (n) => n.pipe(
-    c((e) => e.pointerId === t.pointerId)
+    h((e) => e.pointerId === t.pointerId)
   );
 }
 const Z = (t) => t.type === "pointerleave" || t.type === "pointercancel" || t.type === "pointerup", Pe = ({
   container: t,
   afterEventReceived: n = (e) => e
 }) => S(t, "pointerdown").pipe(
-  h(n)
+  c(n)
 ), ee = ({
   pointerEvent$: t
 }) => (n) => {
   const e = t.pipe(
-    c((r) => r.type === "pointerup")
+    h((r) => r.type === "pointerup")
   ), i = t.pipe(
-    c((r) => r.type === "pointerleave")
+    h((r) => r.type === "pointerleave")
   ), o = t.pipe(
-    c((r) => r.type === "pointercancel")
+    h((r) => r.type === "pointercancel")
   ), p = t.pipe(
-    c((r) => r.type === "pointermove")
+    h((r) => r.type === "pointermove")
   ), a = S(window, "contextmenu"), s = (r) => ["pointercancel", "pointerleave", "pointerup", "contextmenu"].includes(
     r.type
   );
   return n.pipe(
     b((r) => {
-      const l = pe(() => I(r));
+      const l = pe(() => T(r));
       return g(
         l,
         g(
@@ -101,11 +101,11 @@ const Z = (t) => t.type === "pointerleave" || t.type === "pointercancel" || t.ty
           a
         )
       ).pipe(
-        W(r),
+        U(r),
         V((m) => !s(m), !0)
       );
     }),
-    U((r, l) => {
+    L((r, l) => {
       if (s(l)) {
         const { [l.pointerId]: u, ...m } = (r == null ? void 0 : r.pointers) ?? {};
         return {
@@ -121,7 +121,7 @@ const Z = (t) => t.type === "pointerleave" || t.type === "pointercancel" || t.ty
         }
       };
     }, void 0),
-    h(({ event: r, pointers: l }) => ({
+    c(({ event: r, pointers: l }) => ({
       event: r,
       pointers: Object.values(l).filter(fe)
     }))
@@ -137,7 +137,7 @@ const Z = (t) => t.type === "pointerleave" || t.type === "pointercancel" || t.ty
     e.latestActivePointers.length ? e.latestActivePointers : [e.event]
   );
   return t.pipe(
-    U((e, i) => {
+    L((e, i) => {
       var f, E;
       const o = n(i), p = (e == null ? void 0 : e.center) ?? o, a = (e == null ? void 0 : e.deltaX) ?? 0, s = (e == null ? void 0 : e.deltaY) ?? 0, r = ((f = e == null ? void 0 : e.latestActivePointers) == null ? void 0 : f.length) ?? 1, l = ((E = i.latestActivePointers) == null ? void 0 : E.length) ?? 1, u = ["pointerdown", "pointercancel", "pointerleave", "pointerup"].includes(
         i.event.type
@@ -155,7 +155,7 @@ const Z = (t) => t.type === "pointerleave" || t.type === "pointercancel" || t.ty
         deltaPointersAngle: D
       };
     }, void 0),
-    h((e) => {
+    c((e) => {
       const {
         deltaX: i,
         deltaY: o,
@@ -181,23 +181,23 @@ const Z = (t) => t.type === "pointerleave" || t.type === "pointercancel" || t.ty
     })
   );
 }, G = (t) => t.pipe(
-  c(
+  h(
     (n) => !!n.container
   )
-), ne = (t) => t.pipe(c(Z)), Ee = ({
+), ne = (t) => t.pipe(h(Z)), Ee = ({
   container: t,
   afterEventReceived: n = (e) => e
 }) => {
   const e = Pe({ afterEventReceived: n, container: t }), i = S(t, "pointerup").pipe(
-    h(n)
+    c(n)
   ), o = S(t, "pointermove").pipe(
-    h(n)
+    c(n)
   ), p = S(t, "pointerleave").pipe(
-    h(n)
+    c(n)
   ), a = S(
     t,
     "pointercancel"
-  ).pipe(h(n));
+  ).pipe(c(n));
   return {
     pointerEvents$: g(
       e,
@@ -244,30 +244,30 @@ class F {
       ),
       P()
     ), this.pointerDown$ = this.pointerEvent$.pipe(
-      c((p) => p.type === "pointerdown")
+      h((p) => p.type === "pointerdown")
     ), this.pointerUp$ = this.pointerEvent$.pipe(
-      c((p) => p.type === "pointerup")
+      h((p) => p.type === "pointerup")
     ), this.pointerMove$ = this.pointerEvent$.pipe(
-      c((p) => p.type === "pointermove")
+      h((p) => p.type === "pointermove")
     ), this.pointerCancel$ = this.pointerEvent$.pipe(
-      c((p) => p.type === "pointercancel")
+      h((p) => p.type === "pointercancel")
     ), this.pointerOff$ = this.pointerEvent$.pipe(ne);
     const o = this.config$.pipe(
-      h(({ failWith: p }) => p),
+      c(({ failWith: p }) => p),
       oe()
     );
     this.failWithActive$ = o.pipe(
       v((p) => {
         const a = p == null ? void 0 : p.map((s) => {
-          const r = s.start$.pipe(h(() => !0)), l = s.end$.pipe(h(() => !1));
+          const r = s.start$.pipe(c(() => !0)), l = s.end$.pipe(c(() => !1));
           return g(r, l).pipe(
             re(!1),
             M(1)
           );
         });
-        return a != null && a.length ? j(a) : j([I(!1)]);
+        return a != null && a.length ? j(a) : j([T(!1)]);
       }),
-      h((p) => p.some((a) => a)),
+      c((p) => p.some((a) => a)),
       M(1)
     ), this.pan$ = this.configSubject.pipe(
       G,
@@ -280,25 +280,25 @@ class F {
           }),
           M(1)
         ), u = (f) => f.pipe(
-          c(
+          h(
             (E) => E.pointers.length >= a
           )
-        ), m = (f) => f.pipe(c((E) => E.pointers.length < a));
+        ), m = (f) => f.pipe(h((E) => E.pointers.length < a));
         return l.pipe(
           u,
           H(({ pointers: f }) => {
             const E = l.pipe(
               m,
-              R(),
+              z(),
               P()
-            ), X = J(r), C = g(
-              ...f.map((d) => I(d)),
+            ), X = J(r), R = g(
+              ...f.map((d) => T(d)),
               this.pointerDown$
             ).pipe(
               b(
-                (d) => g(this.pointerMove$, I(d)).pipe(
-                  W(d),
-                  c(
+                (d) => g(this.pointerMove$, T(d)).pipe(
+                  U(d),
+                  h(
                     (x) => Q(
                       d,
                       x,
@@ -307,11 +307,11 @@ class F {
                   )
                 )
               ),
-              R()
+              z()
             ).pipe(
               v(() => X),
-              z(l),
-              h(([, { event: d, pointers: x }]) => ({
+              C(l),
+              c(([, { event: d, pointers: x }]) => ({
                 type: "start",
                 event: d,
                 latestActivePointers: x
@@ -320,36 +320,36 @@ class F {
                 bufferSize: 1,
                 refCount: !1
               }),
-              T(E)
-            ), O = C.pipe(
+              I(E)
+            ), O = R.pipe(
               b(
                 () => l.pipe(
                   ae(1),
-                  h(({ event: d, pointers: x }) => ({
+                  c(({ event: d, pointers: x }) => ({
                     type: "move",
                     event: d,
                     latestActivePointers: x
                   }))
                 )
               ),
-              T(E)
-            ), w = C.pipe(
+              I(E)
+            ), w = R.pipe(
               b(
                 () => E.pipe(
-                  h(({ event: d, pointers: x }) => ({
+                  c(({ event: d, pointers: x }) => ({
                     type: "end",
                     event: d,
                     latestActivePointers: x
                   }))
                 )
               )
-            ), L = g(C, O, w).pipe(
+            ), W = g(R, O, w).pipe(
               M(1)
             );
-            return L.pipe(
+            return W.pipe(
               te,
-              z(L),
-              h(([d, { type: x }]) => ({
+              C(W),
+              c(([d, { type: x }]) => ({
                 ...d,
                 type: x
               }))
@@ -364,14 +364,14 @@ class F {
       }),
       P()
     ), this.panStart$ = this.pan$.pipe(
-      c((p) => p.type === "start"),
-      h(({ type: p, ...a }) => a)
+      h((p) => p.type === "start"),
+      c(({ type: p, ...a }) => a)
     ), this.panMove$ = this.pan$.pipe(
-      c((p) => p.type === "move"),
-      h(({ type: p, ...a }) => a)
+      h((p) => p.type === "move"),
+      c(({ type: p, ...a }) => a)
     ), this.panEnd$ = this.pan$.pipe(
-      c((p) => p.type === "end"),
-      h(({ type: p, ...a }) => a)
+      h((p) => p.type === "end"),
+      c(({ type: p, ...a }) => a)
     ), this.state$ = i.asObservable(), this.updateInternal(n ?? {}, e);
   }
   updateInternal(n, e) {
@@ -403,22 +403,22 @@ class Se extends F {
     $(this, "start$");
     $(this, "end$");
     const i = this.panStart$.pipe(
-      h((s) => ({
+      c((s) => ({
         type: "panStart",
         ...s
       })),
-      z(this.failWithActive$),
-      c(([, s]) => !s),
-      h(([s]) => s),
+      C(this.failWithActive$),
+      h(([, s]) => !s),
+      c(([s]) => s),
       P()
     ), o = this.panEnd$.pipe(
-      h((s) => ({
+      c((s) => ({
         type: "panEnd",
         ...s
       })),
       P()
     ), p = this.panMove$.pipe(
-      h((s) => ({
+      c((s) => ({
         type: "panMove",
         ...s
       }))
@@ -426,34 +426,34 @@ class Se extends F {
     this.events$ = i.pipe(
       v((s) => {
         let r = s;
-        const l = I(s), u = this.failWithActive$.pipe(
-          c((A) => A),
-          R()
+        const l = T(s), u = this.failWithActive$.pipe(
+          h((A) => A),
+          z()
         ), m = g(l, p, o).pipe(
           K((A) => {
             r = A;
           }),
-          T(u)
+          I(u)
         ), y = u.pipe(
-          h(() => ({
+          c(() => ({
             ...r,
             type: "panEnd"
           })),
-          T(o)
+          I(o)
         );
         return g(m, y);
       }),
       P()
     ), this.start$ = this.events$.pipe(
-      c((s) => s.type === "panStart")
-    ), this.end$ = this.events$.pipe(c((s) => s.type === "panEnd"));
+      h((s) => s.type === "panStart")
+    ), this.end$ = this.events$.pipe(h((s) => s.type === "panEnd"));
   }
   update(e) {
     super.update(e, e.options);
   }
 }
 const we = (t) => (n) => n.pipe(
-  c((e) => Math.abs(e.velocityX) >= t || Math.abs(e.velocityY) >= t)
+  h((e) => Math.abs(e.velocityX) >= t || Math.abs(e.velocityY) >= t)
 );
 class be extends F {
   constructor(e) {
@@ -466,16 +466,21 @@ class be extends F {
       v((i) => {
         const { escapeVelocity: o = 0.9 } = i.options ?? {};
         return this.panStart$.pipe(
-          v((p) => this.panEnd$.pipe(
+          C(this.failWithActive$),
+          h(([, p]) => !p),
+          v(([p]) => this.panEnd$.pipe(
             we(o),
-            h((a) => ({
+            c((a) => ({
               type: "swipe",
               angle: ge(
                 p.event,
                 a.event
               ),
               ...a
-            }))
+            })),
+            I(
+              this.failWithActive$.pipe(h((a) => a))
+            )
           )),
           P()
         );
@@ -492,8 +497,8 @@ const Me = ({
 }) => (e) => e.pipe(
   b(
     (i) => J(t).pipe(
-      T(
-        n.pipe(ne, W(i))
+      I(
+        n.pipe(ne, U(i))
       )
     )
   )
@@ -504,9 +509,9 @@ const Me = ({
 }) => (i) => i.pipe(
   b(
     (o) => n.pipe(
-      W(o),
+      U(o),
       V((p) => !Z(p), !0),
-      c(
+      h(
         (p) => Q(t, p, e)
       )
     )
@@ -526,10 +531,10 @@ class Ce extends F {
           }),
           M(1)
         ), l = r.pipe(
-          c(({ pointers: D }) => D.length > 1)
+          h(({ pointers: D }) => D.length > 1)
         ), u = (D) => D.pipe(
           he(this.pointerUp$.pipe(ce(p))),
-          R()
+          z()
         );
         return g(
           this.pointerDown$,
@@ -537,7 +542,7 @@ class Ce extends F {
         ).pipe(
           H((D) => {
             const f = g(
-              I(D),
+              T(D),
               this.pointerDown$
             ).pipe(M(1)), E = f.pipe(u), X = f.pipe(
               xe({
@@ -550,16 +555,16 @@ class Ce extends F {
                 pointerEvent$: this.pointerEvent$,
                 timeout: a
               })
-            ), C = g(
-              this.failWithActive$.pipe(c((w) => w)),
+            ), R = g(
+              this.failWithActive$.pipe(h((w) => w)),
               this.pointerCancel$,
               l,
               X,
               B
             ), O = E.pipe(
               Ae,
-              c((w) => w.length <= o),
-              h((w) => ({
+              h((w) => w.length <= o),
+              c((w) => ({
                 type: "tap",
                 taps: w.length,
                 latestActivePointers: w,
@@ -569,13 +574,13 @@ class Ce extends F {
             );
             return O.pipe(
               te,
-              z(O),
-              h(([w, { type: L, taps: d }]) => ({
+              C(O),
+              c(([w, { type: W, taps: d }]) => ({
                 ...w,
-                type: L,
+                type: W,
                 taps: d
               })),
-              T(C)
+              I(R)
             );
           })
         );
@@ -598,7 +603,7 @@ class Re extends F {
     this.events$ = this.config$.pipe(
       v(() => {
         const i = this.panStart$.pipe(
-          h((s) => ({
+          c((s) => ({
             ...s,
             type: "rotateStart",
             angle: 0,
@@ -608,7 +613,7 @@ class Re extends F {
         ), o = i.pipe(
           v(
             () => this.pan$.pipe(
-              U((s, r) => {
+              L((s, r) => {
                 const l = ((s == null ? void 0 : s.angle) ?? 0) + r.deltaPointersAngle;
                 return {
                   ...s,
@@ -621,11 +626,11 @@ class Re extends F {
           ),
           P()
         ), p = o.pipe(
-          c((s) => s.type === "move"),
-          h((s) => ({ ...s, type: "rotateMove" }))
+          h((s) => s.type === "move"),
+          c((s) => ({ ...s, type: "rotateMove" }))
         ), a = o.pipe(
-          c((s) => s.type === "end"),
-          h((s) => ({ ...s, type: "rotateEnd" }))
+          h((s) => s.type === "end"),
+          c((s) => ({ ...s, type: "rotateEnd" }))
         );
         return g(i, p, a);
       }),
@@ -640,7 +645,7 @@ const Y = ({
   type: t,
   initialEvent: n
 }) => (e) => e.pipe(
-  U((i, o) => {
+  L((i, o) => {
     const a = ((i == null ? void 0 : i.pointers.length) ?? 0) !== o.pointers.length, s = (i == null ? void 0 : i.pointersAverageDistance) ?? o.pointersAverageDistance, r = a ? o.pointersAverageDistance : i && "initialPointersAverageDistance" in i ? i.initialPointersAverageDistance : o.pointersAverageDistance, l = r === 0 ? 1 : o.pointersAverageDistance / r, u = o.pointersAverageDistance - r, m = o.pointersAverageDistance - r, y = a || s === 0 ? 1 : o.pointersAverageDistance / s;
     return {
       ...i,
@@ -653,7 +658,7 @@ const Y = ({
       deltaDistanceScale: y
     };
   }, n),
-  h(({ initialPointersAverageDistance: i, ...o }) => o)
+  c(({ initialPointersAverageDistance: i, ...o }) => o)
 );
 class ze extends F {
   constructor(e) {
@@ -667,11 +672,11 @@ class ze extends F {
     this.events$ = this.config$.pipe(
       v(() => {
         const i = this.panStart$.pipe(
-          z(this.failWithActive$),
-          c(([, s]) => !s),
-          h(([s]) => s),
+          C(this.failWithActive$),
+          h(([, s]) => !s),
+          c(([s]) => s),
           v(
-            (s) => I(s).pipe(
+            (s) => T(s).pipe(
               // we don't want a scan on pinch start
               Y({
                 type: "pinchStart",
@@ -681,8 +686,8 @@ class ze extends F {
           ),
           M(1)
         ), o = this.failWithActive$.pipe(
-          c((s) => s),
-          R()
+          h((s) => s),
+          z()
         ), p = i.pipe(
           v((s) => this.pan$.pipe(
             V((r) => r.type !== "end"),
@@ -691,15 +696,15 @@ class ze extends F {
               initialEvent: s
             })
           )),
-          T(o)
+          I(o)
         ), a = i.pipe(
           v((s) => {
             let r = s;
             return this.pan$.pipe(
-              v((l) => l.type === "end" ? I(l) : (r = l, $e)),
-              T(o),
+              v((l) => l.type === "end" ? T(l) : (r = l, $e)),
+              I(o),
               ue(null),
-              h(
+              c(
                 (l) => l || r
               ),
               Y({
@@ -714,8 +719,8 @@ class ze extends F {
       }),
       P()
     ), this.start$ = this.events$.pipe(
-      c((i) => i.type === "pinchStart")
-    ), this.end$ = this.events$.pipe(c((i) => i.type === "pinchEnd"));
+      h((i) => i.type === "pinchStart")
+    ), this.end$ = this.events$.pipe(h((i) => i.type === "pinchEnd"));
   }
   update(e) {
     super.update(e, e.options);
@@ -731,7 +736,7 @@ class ke {
     ).pipe(P()), this.state$ = j(
       this.recognizers.map((e) => e.state$)
     ).pipe(
-      h(
+      c(
         (e) => e.reduce((i, o) => ({
           fingers: Math.max(i.fingers, o.fingers)
         }))