@baleada/logic 0.24.9 → 0.24.11

package/lib/index.cjs

@@ -434,7 +434,14 @@ class Recognizeable {
       effects: {}
     };
     this.maxSequenceLength = options?.maxSequenceLength || defaultOptions.maxSequenceLength;
-    this.effects = options?.effects || defaultOptions.effects;
+    this.effects = options.effects || defaultOptions.effects;
+    const stops = {};
+    for (const effect in this.effects) {
+      const effectOrConfig = this.effects[effect];
+      stops[effect] = isEffectConfig(effectOrConfig) ? effectOrConfig.stop : () => {
+      };
+    }
+    this.computedStops = stops;
     this.resetComputedMetadata();
     this.setSequence(sequence);
     this.effectApi = {
@@ -467,6 +474,10 @@ class Recognizeable {
   set sequence(sequence) {
     this.setSequence(sequence);
   }
+  computedStops;
+  get stops() {
+    return this.computedStops;
+  }
   get status() {
     return this.computedStatus;
   }
@@ -482,13 +493,11 @@ class Recognizeable {
     this.recognizing();
     const type = this.toType(sequenceItem), pushSequence = (sequenceItem2) => {
       newSequence.push(sequenceItem2);
-      if (this.maxSequenceLength !== true && newSequence.length > this.maxSequenceLength) {
+      if (this.maxSequenceLength !== true && newSequence.length > this.maxSequenceLength)
         newSequence.shift();
-      }
     }, newSequence = [];
-    for (const sequenceItem2 of this.sequence) {
-      pushSequence(sequenceItem2);
-    }
+    for (const previousSequenceItem of this.sequence)
+      pushSequence(previousSequenceItem);
     pushSequence(sequenceItem);
     this.effectApi.getSequence = () => newSequence;
     this.effectApi.pushSequence = pushSequence;
@@ -497,7 +506,14 @@ class Recognizeable {
       }),
       optionsByType: options.listenInjection?.optionsByType || {}
     };
-    this.effects[type]?.(sequenceItem, { ...this.effectApi });
+    switch (typeof this.effects[type]) {
+      case "function":
+        this.effects[type](sequenceItem, { ...this.effectApi });
+        break;
+      case "object":
+        this.effects[type].effect(sequenceItem, { ...this.effectApi });
+        break;
+    }
     switch (this.status) {
       case "ready":
       case "denied":
@@ -536,6 +552,9 @@ class Recognizeable {
     }
   }
 }
+function isEffectConfig(effectOrConfig) {
+  return typeof effectOrConfig === "object";
+}
 
 class Listenable {
   computedRecognizeable;
@@ -659,7 +678,11 @@ class Listenable {
     for (const type of this.recognizeableEffectsKeys) {
       const listenable = new Listenable(type);
       listenable.listen(guardedEffect, options);
-      this.active.add({ id: listenable });
+      this.active.add({
+        id: listenable,
+        target: "target" in options ? options.target : void 0,
+        stopExtension: this.recognizeable.stops[type]
+      });
     }
   }
   documentEventListen(effect, options) {
@@ -690,14 +713,15 @@ class Listenable {
       case void 0:
         break;
       default:
-        const stoppables = [...this.active].filter((active) => !target || ("target" in active ? active.target === target : false)), shouldUpdateStatus = stoppables.length === this.active.size;
+        const stoppables = createFilter(
+          (active) => !target || ("target" in active ? active.target === target : false)
+        )([...this.active]), shouldUpdateStatus = stoppables.length === this.active.size;
         for (const stoppable of stoppables) {
           stop(stoppable);
           this.active.delete(stoppable);
         }
-        if (shouldUpdateStatus) {
+        if (shouldUpdateStatus)
           this.stopped();
-        }
         break;
     }
     return this;
@@ -746,7 +770,9 @@ class Listenable {
 }
 function stop(stoppable) {
   if (stoppable.id instanceof Listenable) {
-    stoppable.id.stop();
+    const { id: id2, target: target2, stopExtension } = stoppable;
+    id2.stop();
+    stopExtension(target2);
     return;
   }
   if (lazyCollections.some((type) => observerAssertionsByType[type](stoppable.id))(["intersect", "mutate", "resize"])) {
@@ -854,7 +880,7 @@ function createKeypress(keycomboOrKeycombos, options = {}) {
     matchPredicatesByKeycombo,
     getDownCombos,
     predicateValid,
-    cleanup,
+    stop,
     statuses,
     toStatus,
     setStatus,
@@ -898,7 +924,7 @@ function createKeypress(keycomboOrKeycombos, options = {}) {
     const { getMetadata } = api, metadata = getMetadata();
     metadata.keycombo = downCombos[0];
     localStatus = "recognizing";
-    cleanup();
+    stop();
     storeKeyboardTimeMetadata({
       event,
       api,
@@ -943,14 +969,14 @@ function createKeypress(keycomboOrKeycombos, options = {}) {
       return;
     }
     denied();
-    cleanup();
+    stop();
     onUp?.(toHookApi(api));
   };
   const visibilitychange = (event, api) => {
     if (document.visibilityState === "hidden") {
       clearStatuses();
       localStatus = "recognizing";
-      cleanup();
+      stop();
     }
     onVisibilitychange?.(toHookApi(api));
   };
@@ -996,7 +1022,7 @@ function createKeyrelease(keycomboOrKeycombos, options = {}) {
     matchPredicatesByKeycombo,
     getDownCombos,
     predicateValid,
-    cleanup,
+    stop,
     statuses,
     toStatus,
     setStatus,
@@ -1038,7 +1064,7 @@ function createKeyrelease(keycomboOrKeycombos, options = {}) {
       event.preventDefault();
     const { getMetadata } = api;
     localStatus = "recognizing";
-    cleanup();
+    stop();
     storeKeyboardTimeMetadata({
       event,
       api,
@@ -1094,7 +1120,7 @@ function createKeyrelease(keycomboOrKeycombos, options = {}) {
     if (document.visibilityState === "hidden") {
       clearStatuses();
       localStatus = "recognizing";
-      cleanup();
+      stop();
     }
     onVisibilitychange?.(toHookApi(api));
   };
@@ -1186,7 +1212,7 @@ function createKeychord(keycombos, options = {}) {
     if (preventsDefaultUnlessDenied)
       event.preventDefault();
     localStatuses[playedIndex] = "recognizing";
-    keyStates[playedIndex].cleanup();
+    keyStates[playedIndex].stop();
     storeKeyboardTimeMetadata({
       event,
       api,
@@ -1269,7 +1295,7 @@ function createKeychord(keycombos, options = {}) {
       for (const { clearStatuses } of keyStates)
         clearStatuses();
       localStatuses[playedIndex] = "recognizing";
-      keyStates[playedIndex].cleanup();
+      keyStates[playedIndex].stop();
       playedIndex = 0;
     }
     onVisibilitychange?.(toHookApi(api));
@@ -1327,7 +1353,7 @@ function createMousepress(options = {}) {
     onLeave,
     onMove,
     onUp
-  } = { ...defaultOptions$h, ...options }, cleanup = (target) => {
+  } = { ...defaultOptions$h, ...options }, stop = (target) => {
     window.cancelAnimationFrame(request);
     target.removeEventListener("mousemove", mousemoveEffect);
   };
@@ -1368,7 +1394,7 @@ function createMousepress(options = {}) {
     const { denied, listenInjection: { optionsByType: { mouseleave: { target } } } } = api;
     if (mouseStatus === "down") {
       denied();
-      cleanup(target);
+      stop(target);
       mouseStatus = "leave";
     }
     onLeave?.(toHookApi(api));
@@ -1378,12 +1404,15 @@ function createMousepress(options = {}) {
     if (mouseStatus !== "down")
       return;
     denied();
-    cleanup(target);
+    stop(target);
     mouseStatus = "up";
     onUp?.(toHookApi(api));
   };
   return {
-    mousedown,
+    mousedown: {
+      effect: mousedown,
+      stop
+    },
     mouseleave,
     mouseup
   };
@@ -1418,7 +1447,7 @@ function createMouserelease(options = {}) {
     onLeave,
     onMove,
     onUp
-  } = { ...defaultOptions$g, ...options }, cleanup = (target) => {
+  } = { ...defaultOptions$g, ...options }, stop = (target) => {
     window.cancelAnimationFrame(request);
     target.removeEventListener("mousemove", mousemoveEffect);
   };
@@ -1448,7 +1477,7 @@ function createMouserelease(options = {}) {
     const { denied, listenInjection: { optionsByType: { mouseleave: { target } } } } = api;
     if (mouseStatus === "down") {
       denied();
-      cleanup(target);
+      stop(target);
       mouseStatus = "leave";
     }
     onLeave?.(toHookApi(api));
@@ -1458,7 +1487,7 @@ function createMouserelease(options = {}) {
       return;
     storePointerMoveMetadata(event, api);
     const { listenInjection: { optionsByType: { mouseup: { target } } } } = api;
-    cleanup(target);
+    stop(target);
     mouseStatus = "up";
     recognize(event, api);
     onUp?.(toHookApi(api));
@@ -1472,7 +1501,10 @@ function createMouserelease(options = {}) {
     }
   };
   return {
-    mousedown,
+    mousedown: {
+      effect: mousedown,
+      stop
+    },
     mouseleave,
     mouseup
   };
@@ -1505,7 +1537,7 @@ function createTouchpress(options = {}) {
     onCancel,
     onMove,
     onEnd
-  } = { ...defaultOptions$f, ...options }, cleanup = () => {
+  } = { ...defaultOptions$f, ...options }, stop = () => {
     window.cancelAnimationFrame(request);
   };
   let request;
@@ -1514,7 +1546,7 @@ function createTouchpress(options = {}) {
     const { denied } = api;
     totalTouches++;
     if (totalTouches > 1) {
-      cleanup();
+      stop();
       denied();
       onStart?.(toHookApi(api));
       return;
@@ -1547,14 +1579,14 @@ function createTouchpress(options = {}) {
   };
   const touchcancel = (event, api) => {
     const { denied } = api;
-    cleanup();
+    stop();
     denied();
     totalTouches--;
     onCancel?.(toHookApi(api));
   };
   const touchend = (event, api) => {
     const { denied } = api;
-    cleanup();
+    stop();
     denied();
     totalTouches--;
     onEnd?.(toHookApi(api));
@@ -1596,7 +1628,7 @@ function createTouchrelease(options = {}) {
     onCancel,
     onMove,
     onEnd
-  } = { ...defaultOptions$e, ...options }, cleanup = () => {
+  } = { ...defaultOptions$e, ...options }, stop = () => {
     window.cancelAnimationFrame(request);
   };
   let request;
@@ -1605,7 +1637,7 @@ function createTouchrelease(options = {}) {
     const { denied } = api;
     totalTouches++;
     if (totalTouches > 1) {
-      cleanup();
+      stop();
       denied();
       onStart?.(toHookApi(api));
       return;
@@ -1628,7 +1660,7 @@ function createTouchrelease(options = {}) {
   };
   const touchcancel = (event, api) => {
     const { denied } = api;
-    cleanup();
+    stop();
     denied();
     totalTouches--;
     onCancel?.(toHookApi(api));
@@ -1636,13 +1668,13 @@ function createTouchrelease(options = {}) {
   const touchend = (event, api) => {
     const { denied } = api;
     if (totalTouches !== 1) {
-      cleanup();
+      stop();
       denied();
       onEnd?.(toHookApi(api));
       return;
     }
     storePointerMoveMetadata(event, api);
-    cleanup();
+    stop();
     totalTouches--;
     recognize(event, api);
     onEnd?.(toHookApi(api));
@@ -2180,26 +2212,61 @@ const defaultOptions$d = {
 };
 function createFocusable(order, options = {}) {
   const { predicatesElement, tabbableSelector } = { ...defaultOptions$d, ...options }, predicateFocusable = (element) => element.matches(tabbableSelector);
-  return (element) => {
-    if (predicatesElement && predicateFocusable(element))
-      return element;
-    switch (order) {
-      case "first":
+  switch (order) {
+    case "first":
+      return (element) => {
+        if (predicatesElement && predicateFocusable(element))
+          return element;
         for (let i = 0; i < element.children.length; i++) {
           const focusable = createFocusable(order, { predicatesElement: true })(element.children[i]);
           if (focusable)
             return focusable;
         }
-        break;
-      case "last":
+      };
+    case "last":
+      return (element) => {
+        if (predicatesElement && predicateFocusable(element))
+          return element;
         for (let i = element.children.length - 1; i > -1; i--) {
           const focusable = createFocusable(order, { predicatesElement: true })(element.children[i]);
           if (focusable)
             return focusable;
         }
-        break;
-    }
-  };
+      };
+    case "next":
+      return (element) => {
+        if (predicatesElement && predicateFocusable(element))
+          return element;
+        const focusable = createFocusable("first")(element);
+        if (focusable)
+          return focusable;
+        let current = element;
+        while (current && current !== document.documentElement) {
+          const nextSibling = current.nextElementSibling;
+          if (nextSibling) {
+            const focusable2 = createFocusable("first", { predicatesElement: true })(nextSibling);
+            if (focusable2)
+              return focusable2;
+          }
+          current = current.parentElement;
+        }
+      };
+    case "previous":
+      return (element) => {
+        if (predicatesElement && predicateFocusable(element))
+          return element;
+        let current = element;
+        while (current && current !== document.documentElement) {
+          const previousSibling = current.previousElementSibling;
+          if (previousSibling) {
+            const focusable = createFocusable("last", { predicatesElement: true })(previousSibling);
+            if (focusable)
+              return focusable;
+          }
+          current = current.parentElement;
+        }
+      };
+  }
 }
 function createComputedStyle(pseudoElement) {
   return (element) => getComputedStyle(element, pseudoElement);
@@ -2626,7 +2693,7 @@ function createKeyState({
     return lazyCollections.some(
       (validAlias) => lazyCollections.includes(validAlias)(aliases)
     )(validAliases);
-  }, cleanup = () => {
+  }, stop = () => {
     window.cancelAnimationFrame(getRequest());
   }, statuses = [], toStatus = (...params) => createValue(...params)(statuses), setStatus = (...params) => createSet(...params)(statuses), clearStatuses = (...params) => createClear(...params)(statuses), deleteStatus = (...params) => createDelete(...params)(statuses);
   return {
@@ -2638,7 +2705,7 @@ function createKeyState({
     validAliases,
     getDownCombos,
     predicateValid,
-    cleanup,
+    stop,
     statuses,
     toStatus,
     setStatus,
@@ -2764,6 +2831,11 @@ function storeKeyboardTimeMetadata({
         effect(event);
     }
   }, storeDuration = () => {
+    const sequence = api.getSequence();
+    if (!document.body.contains(
+      lazyCollections.at(-1)(sequence).target
+    ))
+      return;
     const request = requestAnimationFrame((timestamp) => {
       if (!getShouldStore())
         return;
@@ -2883,6 +2955,11 @@ function storePointerTimeMetadata(event, api, getShouldStore, setRequest, recogn
     if (getStatus() === "recognized")
       effect(event2);
   }, storeDuration = () => {
+    const sequence = api.getSequence();
+    if (!document.body.contains(
+      lazyCollections.at(-1)(sequence).target
+    ))
+      return;
     const request = requestAnimationFrame((timestamp) => {
       if (!getShouldStore())
         return;

package/lib/index.d.ts

@@ -253,9 +253,13 @@ type GraphAsyncEdge<Id extends string, StateValue> = {
 type RecognizeableOptions<Type extends ListenableSupportedType, Metadata extends Record<any, any>> = {
     maxSequenceLength?: true | number;
     effects?: {
-        [type in Type]?: RecognizeableEffect<type, Metadata>;
+        [type in Type]?: RecognizeableEffect<type, Metadata> | RecognizeableEffectConfig<type, Metadata>;
     };
 };
+type RecognizeableEffectConfig<Type extends ListenableSupportedType, Metadata extends Record<any, any>> = {
+    effect: RecognizeableEffect<Type, Metadata>;
+    stop: (target: RecognizeableStopTarget<Type>) => void;
+};
 type RecognizeableEffect<Type extends ListenableSupportedType, Metadata extends Record<any, any>> = (sequenceItem: ListenEffectParam<Type>, api: RecognizeableEffectApi<Type, Metadata>) => void;
 type RecognizeableEffectApi<Type extends ListenableSupportedType, Metadata extends Record<any, any>> = {
     getStatus: () => RecognizeableStatus;
@@ -274,6 +278,10 @@ type RecognizeOptions<Type extends ListenableSupportedType> = {
         optionsByType: Record<Type, ListenOptions<Type>>;
     };
 };
+type RecognizeableStops<Type extends ListenableSupportedType> = {
+    [type in Type]?: (target: RecognizeableStopTarget<type>) => void;
+};
+type RecognizeableStopTarget<Type extends ListenableSupportedType> = ('target' extends keyof ListenOptions<Type> ? ListenOptions<Type>['target'] : never);
 /**
  * [Docs](https://baleada.dev/docs/logic/classes/recognizeable)
  */
@@ -290,6 +298,8 @@ declare class Recognizeable<Type extends ListenableSupportedType, Metadata exten
     private ready;
     get sequence(): ListenEffectParam<Type>[];
     set sequence(sequence: ListenEffectParam<Type>[]);
+    private computedStops;
+    get stops(): RecognizeableStops<Type>;
     get status(): RecognizeableStatus;
     get metadata(): Metadata;
     private computedSequence;
@@ -359,6 +369,8 @@ type ListenableActive<Type extends ListenableSupportedType, RecognizeableMetadat
     id: ListenableActiveEventId<Type>;
 } : {
     id: Listenable<Type, RecognizeableMetadata>;
+    target: RecognizeableStopTarget<Type>;
+    stopExtension: (target: RecognizeableStopTarget<Type>) => void;
 };
 type ListenableActiveEventId<Type extends ListenableSupportedEventType> = [
     type: Type,
@@ -626,7 +638,7 @@ type CreateFocusableOptions = {
 /**
  * [Docs](https://baleada.dev/docs/logic/pipes/focusable)
  */
-declare function createFocusable(order: 'first' | 'last', options?: CreateFocusableOptions): ElementTransform<HTMLElement, HTMLElement | undefined>;
+declare function createFocusable(order: 'first' | 'last' | 'next' | 'previous', options?: CreateFocusableOptions): ElementTransform<HTMLElement, HTMLElement | undefined>;
 /**
  * [Docs](https://baleada.dev/docs/logic/pipes/computed-style)
  */
@@ -1524,7 +1536,10 @@ type MousepressHookApi = HookApi<MousepressType, MousepressMetadata>;
  * [Docs](https://baleada.dev/docs/logic/factories/mousepress)
  */
 declare function createMousepress(options?: MousepressOptions): {
-    mousedown: RecognizeableEffect<"mousedown", MousepressMetadata>;
+    mousedown: {
+        effect: RecognizeableEffect<"mousedown", MousepressMetadata>;
+        stop: (target: RecognizeableStopTarget<MousepressType>) => void;
+    };
     mouseleave: RecognizeableEffect<"mouseleave", MousepressMetadata>;
     mouseup: RecognizeableEffect<"mouseup", MousepressMetadata>;
 };
@@ -1550,7 +1565,10 @@ type MousereleaseHookApi = HookApi<MousereleaseType, MousereleaseMetadata>;
  * [Docs](https://baleada.dev/docs/logic/factories/mouserelease)
  */
 declare function createMouserelease(options?: MousereleaseOptions): {
-    mousedown: RecognizeableEffect<"mousedown", MousereleaseMetadata>;
+    mousedown: {
+        effect: RecognizeableEffect<"mousedown", MousereleaseMetadata>;
+        stop: (target: RecognizeableStopTarget<MousereleaseType>) => void;
+    };
     mouseleave: RecognizeableEffect<"mouseleave", MousereleaseMetadata>;
     mouseup: RecognizeableEffect<"mouseup", MousereleaseMetadata>;
 };
@@ -1606,4 +1624,4 @@ declare class Touchrelease extends Listenable<TouchreleaseType, TouchreleaseMeta
     get metadata(): TouchreleaseMetadata;
 }
 
-export { AnimateFrame, AnimateFrameEffect, AnimateOptions, Animateable, AnimateableKeyframe, AnimateableOptions, AnimateableStatus, Broadcastable, BroadcastableOptions, BroadcastableStatus, ColorInterpolationMethod, Compareable, CompareableOptions, CompareableStatus, CompleteOptions, Completeable, CompleteableOptions, CompleteableStatus, Copyable, CopyableOptions, CopyableStatus, CreateStepsOptions$1 as CreateDirectedAcyclicStepsOptions, CreateFocusableOptions, CreateGraphOptions, CreateKeycomboMatchOptions, CreateMixOptions, CreatePathConfig, CreateResultsOptions, Delayable, DelayableEffect, DelayableOptions, DelayableStatus, Drawable, DrawableOptions, DrawableStatus, DrawableStroke, Fetchable, FetchableOptions, FetchableStatus, Fullscreenable, FullscreenableGetElement, FullscreenableOptions, FullscreenableStatus, Grantable, GrantableOptions, GrantableStatus, Keychord, KeychordHook, KeychordHookApi, KeychordMetadata, KeychordOptions, KeychordType, Keypress, KeypressHook, KeypressHookApi, KeypressMetadata, KeypressOptions, KeypressType, Keyrelease, KeyreleaseHook, KeyreleaseHookApi, KeyreleaseMetadata, KeyreleaseOptions, KeyreleaseType, Konami, KonamiHook, KonamiHookApi, KonamiMetadata, KonamiOptions, KonamiType, ListenEffect, ListenEffectParam, ListenOptions, Listenable, ListenableActive, ListenableKeycombo, ListenableMousecombo, ListenableOptions, ListenablePointercombo, ListenableStatus, ListenableSupportedEventType, ListenableSupportedType, MixColor, Mousepress, MousepressHook, MousepressHookApi, MousepressMetadata, MousepressOptions, MousepressType, Mouserelease, MousereleaseHook, MousereleaseHookApi, MousereleaseMetadata, MousereleaseOptions, MousereleaseType, Navigateable, NavigateableOptions, NavigateableStatus, PickOptions, Pickable, PickableOptions, PickableStatus, Potentiality, RecognizeOptions, Recognizeable, RecognizeableEffect, RecognizeableOptions, RecognizeableStatus, Resolveable, ResolveableOptions, ResolveableStatus, Shareable, ShareableOptions, ShareableStatus, Storeable, StoreableOptions, StoreableStatus, ToGraphYielded, Touchpress, TouchpressHook, TouchpressHookApi, TouchpressMetadata, TouchpressOptions, TouchpressType, Touchrelease, TouchreleaseHook, TouchreleaseHookApi, TouchreleaseMetadata, TouchreleaseOptions, TouchreleaseType, createClear$1 as createAssociativeArrayClear, createDelete$1 as createAssociativeArrayDelete, createHas$1 as createAssociativeArrayHas, createKeys$1 as createAssociativeArrayKeys, createSet$1 as createAssociativeArraySet, createValue$1 as createAssociativeArrayValue, createValues as createAssociativeArrayValues, createBreadthPathConfig, createChildren, createClamp, createClear, createClip, createClone, createComputedStyle, createConcat, createAncestor$1 as createDecisionTreeAncestor, createCommonAncestors$1 as createDecisionTreeCommonAncestors, createNodeDepthFirstSteps$1 as createDecisionTreeNodeDepthFirstSteps, createPath$1 as createDecisionTreePath, createDepthFirstSteps$1 as createDecisionTreeSteps, createTree$1 as createDecisionTreeTree, createDeepEqual, createDeepMerge, createDelete, createDepthPathConfig, createDetermine, createAncestor$2 as createDirectedAcyclicAncestor, createAncestor as createDirectedAcyclicAsyncAncestor, createCommonAncestors as createDirectedAcyclicAsyncCommonAncestors, createDepthFirstSteps as createDirectedAcyclicAsyncDepthFirstSteps, createLayers as createDirectedAcyclicAsyncLayers, createNodeDepthFirstSteps as createDirectedAcyclicAsyncNodeDepthFirstSteps, createPath as createDirectedAcyclicAsyncPath, createTree as createDirectedAcyclicAsyncTree, createCommonAncestors$2 as createDirectedAcyclicCommonAncestors, createDepthFirstSteps$2 as createDirectedAcyclicDepthFirstSteps, createLayers$1 as createDirectedAcyclicLayers, createNodeDepthFirstSteps$2 as createDirectedAcyclicNodeDepthFirstSteps, createPath$2 as createDirectedAcyclicPath, createRoots as createDirectedAcyclicRoots, createTree$2 as createDirectedAcyclicTree, createEntries, createEqual, createEvery, createFilter, createFilterAsync, createFindAsync, createFindIndexAsync, createFocusable, createForEachAsync, createGraph, createGreater, createGreaterOrEqual, createHas, createIncoming, createIndegree, createInsert, createKeychord, createKeycomboMatch, createKeypress, createKeyrelease, createKeys, createKonami, createLess, createLessOrEqual, createList, createMap, createMapAsync, createMix, createMousepress, createMouserelease, createNumber, createOmit, createOnlyChild, createOutdegree, createOutgoing, createPick, createReduce, createReduceAsync, createRemove, createReorder, createReplace, createResults, createReverse, createRoot, createSanitize, createSet, createShuffle, createSiblings, createSlice, createSlug, createSome, createSort, createSwap, createTerminal, createTotalSiblings, createTouchpress, createTouchrelease, createFind as createTreeFind, createUnique, createValue, easingsNetInBack, easingsNetInCirc, easingsNetInCubic, easingsNetInExpo, easingsNetInOutBack, easingsNetInOutCirc, easingsNetInOutCubic, easingsNetInOutExpo, easingsNetInOutQuad, easingsNetInOutQuint, easingsNetInOutSine, easingsNetInQuad, easingsNetInQuart, easingsNetInQuint, easingsNetInSine, easingsNetOutBack, easingsNetOutCirc, easingsNetOutCubic, easingsNetOutExpo, easingsNetOutQuad, easingsNetOutQuint, easingsNetOutSine, linear, materialAccelerated, materialDecelerated, materialStandard, toD, toFlattenedD, toMessageListenParams, verouEase, verouEaseIn, verouEaseInOut, verouEaseOut };
+export { AnimateFrame, AnimateFrameEffect, AnimateOptions, Animateable, AnimateableKeyframe, AnimateableOptions, AnimateableStatus, Broadcastable, BroadcastableOptions, BroadcastableStatus, ColorInterpolationMethod, Compareable, CompareableOptions, CompareableStatus, CompleteOptions, Completeable, CompleteableOptions, CompleteableStatus, Copyable, CopyableOptions, CopyableStatus, CreateStepsOptions$1 as CreateDirectedAcyclicStepsOptions, CreateFocusableOptions, CreateGraphOptions, CreateKeycomboMatchOptions, CreateMixOptions, CreatePathConfig, CreateResultsOptions, Delayable, DelayableEffect, DelayableOptions, DelayableStatus, Drawable, DrawableOptions, DrawableStatus, DrawableStroke, Fetchable, FetchableOptions, FetchableStatus, Fullscreenable, FullscreenableGetElement, FullscreenableOptions, FullscreenableStatus, Grantable, GrantableOptions, GrantableStatus, Keychord, KeychordHook, KeychordHookApi, KeychordMetadata, KeychordOptions, KeychordType, Keypress, KeypressHook, KeypressHookApi, KeypressMetadata, KeypressOptions, KeypressType, Keyrelease, KeyreleaseHook, KeyreleaseHookApi, KeyreleaseMetadata, KeyreleaseOptions, KeyreleaseType, Konami, KonamiHook, KonamiHookApi, KonamiMetadata, KonamiOptions, KonamiType, ListenEffect, ListenEffectParam, ListenOptions, Listenable, ListenableActive, ListenableKeycombo, ListenableMousecombo, ListenableOptions, ListenablePointercombo, ListenableStatus, ListenableSupportedEventType, ListenableSupportedType, MixColor, Mousepress, MousepressHook, MousepressHookApi, MousepressMetadata, MousepressOptions, MousepressType, Mouserelease, MousereleaseHook, MousereleaseHookApi, MousereleaseMetadata, MousereleaseOptions, MousereleaseType, Navigateable, NavigateableOptions, NavigateableStatus, PickOptions, Pickable, PickableOptions, PickableStatus, Potentiality, RecognizeOptions, Recognizeable, RecognizeableEffect, RecognizeableEffectConfig, RecognizeableOptions, RecognizeableStatus, RecognizeableStopTarget, Resolveable, ResolveableOptions, ResolveableStatus, Shareable, ShareableOptions, ShareableStatus, Storeable, StoreableOptions, StoreableStatus, ToGraphYielded, Touchpress, TouchpressHook, TouchpressHookApi, TouchpressMetadata, TouchpressOptions, TouchpressType, Touchrelease, TouchreleaseHook, TouchreleaseHookApi, TouchreleaseMetadata, TouchreleaseOptions, TouchreleaseType, createClear$1 as createAssociativeArrayClear, createDelete$1 as createAssociativeArrayDelete, createHas$1 as createAssociativeArrayHas, createKeys$1 as createAssociativeArrayKeys, createSet$1 as createAssociativeArraySet, createValue$1 as createAssociativeArrayValue, createValues as createAssociativeArrayValues, createBreadthPathConfig, createChildren, createClamp, createClear, createClip, createClone, createComputedStyle, createConcat, createAncestor$1 as createDecisionTreeAncestor, createCommonAncestors$1 as createDecisionTreeCommonAncestors, createNodeDepthFirstSteps$1 as createDecisionTreeNodeDepthFirstSteps, createPath$1 as createDecisionTreePath, createDepthFirstSteps$1 as createDecisionTreeSteps, createTree$1 as createDecisionTreeTree, createDeepEqual, createDeepMerge, createDelete, createDepthPathConfig, createDetermine, createAncestor$2 as createDirectedAcyclicAncestor, createAncestor as createDirectedAcyclicAsyncAncestor, createCommonAncestors as createDirectedAcyclicAsyncCommonAncestors, createDepthFirstSteps as createDirectedAcyclicAsyncDepthFirstSteps, createLayers as createDirectedAcyclicAsyncLayers, createNodeDepthFirstSteps as createDirectedAcyclicAsyncNodeDepthFirstSteps, createPath as createDirectedAcyclicAsyncPath, createTree as createDirectedAcyclicAsyncTree, createCommonAncestors$2 as createDirectedAcyclicCommonAncestors, createDepthFirstSteps$2 as createDirectedAcyclicDepthFirstSteps, createLayers$1 as createDirectedAcyclicLayers, createNodeDepthFirstSteps$2 as createDirectedAcyclicNodeDepthFirstSteps, createPath$2 as createDirectedAcyclicPath, createRoots as createDirectedAcyclicRoots, createTree$2 as createDirectedAcyclicTree, createEntries, createEqual, createEvery, createFilter, createFilterAsync, createFindAsync, createFindIndexAsync, createFocusable, createForEachAsync, createGraph, createGreater, createGreaterOrEqual, createHas, createIncoming, createIndegree, createInsert, createKeychord, createKeycomboMatch, createKeypress, createKeyrelease, createKeys, createKonami, createLess, createLessOrEqual, createList, createMap, createMapAsync, createMix, createMousepress, createMouserelease, createNumber, createOmit, createOnlyChild, createOutdegree, createOutgoing, createPick, createReduce, createReduceAsync, createRemove, createReorder, createReplace, createResults, createReverse, createRoot, createSanitize, createSet, createShuffle, createSiblings, createSlice, createSlug, createSome, createSort, createSwap, createTerminal, createTotalSiblings, createTouchpress, createTouchrelease, createFind as createTreeFind, createUnique, createValue, easingsNetInBack, easingsNetInCirc, easingsNetInCubic, easingsNetInExpo, easingsNetInOutBack, easingsNetInOutCirc, easingsNetInOutCubic, easingsNetInOutExpo, easingsNetInOutQuad, easingsNetInOutQuint, easingsNetInOutSine, easingsNetInQuad, easingsNetInQuart, easingsNetInQuint, easingsNetInSine, easingsNetOutBack, easingsNetOutCirc, easingsNetOutCubic, easingsNetOutExpo, easingsNetOutQuad, easingsNetOutQuint, easingsNetOutSine, linear, materialAccelerated, materialDecelerated, materialStandard, toD, toFlattenedD, toMessageListenParams, verouEase, verouEaseIn, verouEaseInOut, verouEaseOut };

package/lib/index.js

@@ -432,7 +432,14 @@ class Recognizeable {
       effects: {}
     };
     this.maxSequenceLength = options?.maxSequenceLength || defaultOptions.maxSequenceLength;
-    this.effects = options?.effects || defaultOptions.effects;
+    this.effects = options.effects || defaultOptions.effects;
+    const stops = {};
+    for (const effect in this.effects) {
+      const effectOrConfig = this.effects[effect];
+      stops[effect] = isEffectConfig(effectOrConfig) ? effectOrConfig.stop : () => {
+      };
+    }
+    this.computedStops = stops;
     this.resetComputedMetadata();
     this.setSequence(sequence);
     this.effectApi = {
@@ -465,6 +472,10 @@ class Recognizeable {
   set sequence(sequence) {
     this.setSequence(sequence);
   }
+  computedStops;
+  get stops() {
+    return this.computedStops;
+  }
   get status() {
     return this.computedStatus;
   }
@@ -480,13 +491,11 @@ class Recognizeable {
     this.recognizing();
     const type = this.toType(sequenceItem), pushSequence = (sequenceItem2) => {
       newSequence.push(sequenceItem2);
-      if (this.maxSequenceLength !== true && newSequence.length > this.maxSequenceLength) {
+      if (this.maxSequenceLength !== true && newSequence.length > this.maxSequenceLength)
         newSequence.shift();
-      }
     }, newSequence = [];
-    for (const sequenceItem2 of this.sequence) {
-      pushSequence(sequenceItem2);
-    }
+    for (const previousSequenceItem of this.sequence)
+      pushSequence(previousSequenceItem);
     pushSequence(sequenceItem);
     this.effectApi.getSequence = () => newSequence;
     this.effectApi.pushSequence = pushSequence;
@@ -495,7 +504,14 @@ class Recognizeable {
       }),
       optionsByType: options.listenInjection?.optionsByType || {}
     };
-    this.effects[type]?.(sequenceItem, { ...this.effectApi });
+    switch (typeof this.effects[type]) {
+      case "function":
+        this.effects[type](sequenceItem, { ...this.effectApi });
+        break;
+      case "object":
+        this.effects[type].effect(sequenceItem, { ...this.effectApi });
+        break;
+    }
     switch (this.status) {
       case "ready":
       case "denied":
@@ -534,6 +550,9 @@ class Recognizeable {
     }
   }
 }
+function isEffectConfig(effectOrConfig) {
+  return typeof effectOrConfig === "object";
+}
 
 class Listenable {
   computedRecognizeable;
@@ -657,7 +676,11 @@ class Listenable {
     for (const type of this.recognizeableEffectsKeys) {
       const listenable = new Listenable(type);
       listenable.listen(guardedEffect, options);
-      this.active.add({ id: listenable });
+      this.active.add({
+        id: listenable,
+        target: "target" in options ? options.target : void 0,
+        stopExtension: this.recognizeable.stops[type]
+      });
     }
   }
   documentEventListen(effect, options) {
@@ -688,14 +711,15 @@ class Listenable {
       case void 0:
         break;
       default:
-        const stoppables = [...this.active].filter((active) => !target || ("target" in active ? active.target === target : false)), shouldUpdateStatus = stoppables.length === this.active.size;
+        const stoppables = createFilter(
+          (active) => !target || ("target" in active ? active.target === target : false)
+        )([...this.active]), shouldUpdateStatus = stoppables.length === this.active.size;
         for (const stoppable of stoppables) {
           stop(stoppable);
           this.active.delete(stoppable);
         }
-        if (shouldUpdateStatus) {
+        if (shouldUpdateStatus)
           this.stopped();
-        }
         break;
     }
     return this;
@@ -744,7 +768,9 @@ class Listenable {
 }
 function stop(stoppable) {
   if (stoppable.id instanceof Listenable) {
-    stoppable.id.stop();
+    const { id: id2, target: target2, stopExtension } = stoppable;
+    id2.stop();
+    stopExtension(target2);
     return;
   }
   if (some((type) => observerAssertionsByType[type](stoppable.id))(["intersect", "mutate", "resize"])) {
@@ -852,7 +878,7 @@ function createKeypress(keycomboOrKeycombos, options = {}) {
     matchPredicatesByKeycombo,
     getDownCombos,
     predicateValid,
-    cleanup,
+    stop,
     statuses,
     toStatus,
     setStatus,
@@ -896,7 +922,7 @@ function createKeypress(keycomboOrKeycombos, options = {}) {
     const { getMetadata } = api, metadata = getMetadata();
     metadata.keycombo = downCombos[0];
     localStatus = "recognizing";
-    cleanup();
+    stop();
     storeKeyboardTimeMetadata({
       event,
       api,
@@ -941,14 +967,14 @@ function createKeypress(keycomboOrKeycombos, options = {}) {
       return;
     }
     denied();
-    cleanup();
+    stop();
     onUp?.(toHookApi(api));
   };
   const visibilitychange = (event, api) => {
     if (document.visibilityState === "hidden") {
       clearStatuses();
       localStatus = "recognizing";
-      cleanup();
+      stop();
     }
     onVisibilitychange?.(toHookApi(api));
   };
@@ -994,7 +1020,7 @@ function createKeyrelease(keycomboOrKeycombos, options = {}) {
     matchPredicatesByKeycombo,
     getDownCombos,
     predicateValid,
-    cleanup,
+    stop,
     statuses,
     toStatus,
     setStatus,
@@ -1036,7 +1062,7 @@ function createKeyrelease(keycomboOrKeycombos, options = {}) {
       event.preventDefault();
     const { getMetadata } = api;
     localStatus = "recognizing";
-    cleanup();
+    stop();
     storeKeyboardTimeMetadata({
       event,
       api,
@@ -1092,7 +1118,7 @@ function createKeyrelease(keycomboOrKeycombos, options = {}) {
     if (document.visibilityState === "hidden") {
       clearStatuses();
       localStatus = "recognizing";
-      cleanup();
+      stop();
     }
     onVisibilitychange?.(toHookApi(api));
   };
@@ -1184,7 +1210,7 @@ function createKeychord(keycombos, options = {}) {
     if (preventsDefaultUnlessDenied)
       event.preventDefault();
     localStatuses[playedIndex] = "recognizing";
-    keyStates[playedIndex].cleanup();
+    keyStates[playedIndex].stop();
     storeKeyboardTimeMetadata({
       event,
       api,
@@ -1267,7 +1293,7 @@ function createKeychord(keycombos, options = {}) {
       for (const { clearStatuses } of keyStates)
         clearStatuses();
       localStatuses[playedIndex] = "recognizing";
-      keyStates[playedIndex].cleanup();
+      keyStates[playedIndex].stop();
       playedIndex = 0;
     }
     onVisibilitychange?.(toHookApi(api));
@@ -1325,7 +1351,7 @@ function createMousepress(options = {}) {
     onLeave,
     onMove,
     onUp
-  } = { ...defaultOptions$h, ...options }, cleanup = (target) => {
+  } = { ...defaultOptions$h, ...options }, stop = (target) => {
     window.cancelAnimationFrame(request);
     target.removeEventListener("mousemove", mousemoveEffect);
   };
@@ -1366,7 +1392,7 @@ function createMousepress(options = {}) {
     const { denied, listenInjection: { optionsByType: { mouseleave: { target } } } } = api;
     if (mouseStatus === "down") {
       denied();
-      cleanup(target);
+      stop(target);
       mouseStatus = "leave";
     }
     onLeave?.(toHookApi(api));
@@ -1376,12 +1402,15 @@ function createMousepress(options = {}) {
     if (mouseStatus !== "down")
       return;
     denied();
-    cleanup(target);
+    stop(target);
     mouseStatus = "up";
     onUp?.(toHookApi(api));
   };
   return {
-    mousedown,
+    mousedown: {
+      effect: mousedown,
+      stop
+    },
     mouseleave,
     mouseup
   };
@@ -1416,7 +1445,7 @@ function createMouserelease(options = {}) {
     onLeave,
     onMove,
     onUp
-  } = { ...defaultOptions$g, ...options }, cleanup = (target) => {
+  } = { ...defaultOptions$g, ...options }, stop = (target) => {
     window.cancelAnimationFrame(request);
     target.removeEventListener("mousemove", mousemoveEffect);
   };
@@ -1446,7 +1475,7 @@ function createMouserelease(options = {}) {
     const { denied, listenInjection: { optionsByType: { mouseleave: { target } } } } = api;
     if (mouseStatus === "down") {
       denied();
-      cleanup(target);
+      stop(target);
       mouseStatus = "leave";
     }
     onLeave?.(toHookApi(api));
@@ -1456,7 +1485,7 @@ function createMouserelease(options = {}) {
       return;
     storePointerMoveMetadata(event, api);
     const { listenInjection: { optionsByType: { mouseup: { target } } } } = api;
-    cleanup(target);
+    stop(target);
     mouseStatus = "up";
     recognize(event, api);
     onUp?.(toHookApi(api));
@@ -1470,7 +1499,10 @@ function createMouserelease(options = {}) {
     }
   };
   return {
-    mousedown,
+    mousedown: {
+      effect: mousedown,
+      stop
+    },
     mouseleave,
     mouseup
   };
@@ -1503,7 +1535,7 @@ function createTouchpress(options = {}) {
     onCancel,
     onMove,
     onEnd
-  } = { ...defaultOptions$f, ...options }, cleanup = () => {
+  } = { ...defaultOptions$f, ...options }, stop = () => {
     window.cancelAnimationFrame(request);
   };
   let request;
@@ -1512,7 +1544,7 @@ function createTouchpress(options = {}) {
     const { denied } = api;
     totalTouches++;
     if (totalTouches > 1) {
-      cleanup();
+      stop();
       denied();
       onStart?.(toHookApi(api));
       return;
@@ -1545,14 +1577,14 @@ function createTouchpress(options = {}) {
   };
   const touchcancel = (event, api) => {
     const { denied } = api;
-    cleanup();
+    stop();
     denied();
     totalTouches--;
     onCancel?.(toHookApi(api));
   };
   const touchend = (event, api) => {
     const { denied } = api;
-    cleanup();
+    stop();
     denied();
     totalTouches--;
     onEnd?.(toHookApi(api));
@@ -1594,7 +1626,7 @@ function createTouchrelease(options = {}) {
     onCancel,
     onMove,
     onEnd
-  } = { ...defaultOptions$e, ...options }, cleanup = () => {
+  } = { ...defaultOptions$e, ...options }, stop = () => {
     window.cancelAnimationFrame(request);
   };
   let request;
@@ -1603,7 +1635,7 @@ function createTouchrelease(options = {}) {
     const { denied } = api;
     totalTouches++;
     if (totalTouches > 1) {
-      cleanup();
+      stop();
       denied();
       onStart?.(toHookApi(api));
       return;
@@ -1626,7 +1658,7 @@ function createTouchrelease(options = {}) {
   };
   const touchcancel = (event, api) => {
     const { denied } = api;
-    cleanup();
+    stop();
     denied();
     totalTouches--;
     onCancel?.(toHookApi(api));
@@ -1634,13 +1666,13 @@ function createTouchrelease(options = {}) {
   const touchend = (event, api) => {
     const { denied } = api;
     if (totalTouches !== 1) {
-      cleanup();
+      stop();
       denied();
       onEnd?.(toHookApi(api));
       return;
     }
     storePointerMoveMetadata(event, api);
-    cleanup();
+    stop();
     totalTouches--;
     recognize(event, api);
     onEnd?.(toHookApi(api));
@@ -2178,26 +2210,61 @@ const defaultOptions$d = {
 };
 function createFocusable(order, options = {}) {
   const { predicatesElement, tabbableSelector } = { ...defaultOptions$d, ...options }, predicateFocusable = (element) => element.matches(tabbableSelector);
-  return (element) => {
-    if (predicatesElement && predicateFocusable(element))
-      return element;
-    switch (order) {
-      case "first":
+  switch (order) {
+    case "first":
+      return (element) => {
+        if (predicatesElement && predicateFocusable(element))
+          return element;
         for (let i = 0; i < element.children.length; i++) {
           const focusable = createFocusable(order, { predicatesElement: true })(element.children[i]);
           if (focusable)
             return focusable;
         }
-        break;
-      case "last":
+      };
+    case "last":
+      return (element) => {
+        if (predicatesElement && predicateFocusable(element))
+          return element;
         for (let i = element.children.length - 1; i > -1; i--) {
           const focusable = createFocusable(order, { predicatesElement: true })(element.children[i]);
           if (focusable)
             return focusable;
         }
-        break;
-    }
-  };
+      };
+    case "next":
+      return (element) => {
+        if (predicatesElement && predicateFocusable(element))
+          return element;
+        const focusable = createFocusable("first")(element);
+        if (focusable)
+          return focusable;
+        let current = element;
+        while (current && current !== document.documentElement) {
+          const nextSibling = current.nextElementSibling;
+          if (nextSibling) {
+            const focusable2 = createFocusable("first", { predicatesElement: true })(nextSibling);
+            if (focusable2)
+              return focusable2;
+          }
+          current = current.parentElement;
+        }
+      };
+    case "previous":
+      return (element) => {
+        if (predicatesElement && predicateFocusable(element))
+          return element;
+        let current = element;
+        while (current && current !== document.documentElement) {
+          const previousSibling = current.previousElementSibling;
+          if (previousSibling) {
+            const focusable = createFocusable("last", { predicatesElement: true })(previousSibling);
+            if (focusable)
+              return focusable;
+          }
+          current = current.parentElement;
+        }
+      };
+  }
 }
 function createComputedStyle(pseudoElement) {
   return (element) => getComputedStyle(element, pseudoElement);
@@ -2624,7 +2691,7 @@ function createKeyState({
     return some(
       (validAlias) => includes(validAlias)(aliases)
     )(validAliases);
-  }, cleanup = () => {
+  }, stop = () => {
     window.cancelAnimationFrame(getRequest());
   }, statuses = [], toStatus = (...params) => createValue(...params)(statuses), setStatus = (...params) => createSet(...params)(statuses), clearStatuses = (...params) => createClear(...params)(statuses), deleteStatus = (...params) => createDelete(...params)(statuses);
   return {
@@ -2636,7 +2703,7 @@ function createKeyState({
     validAliases,
     getDownCombos,
     predicateValid,
-    cleanup,
+    stop,
     statuses,
     toStatus,
     setStatus,
@@ -2762,6 +2829,11 @@ function storeKeyboardTimeMetadata({
         effect(event);
     }
   }, storeDuration = () => {
+    const sequence = api.getSequence();
+    if (!document.body.contains(
+      at(-1)(sequence).target
+    ))
+      return;
     const request = requestAnimationFrame((timestamp) => {
       if (!getShouldStore())
         return;
@@ -2881,6 +2953,11 @@ function storePointerTimeMetadata(event, api, getShouldStore, setRequest, recogn
     if (getStatus() === "recognized")
       effect(event2);
   }, storeDuration = () => {
+    const sequence = api.getSequence();
+    if (!document.body.contains(
+      at(-1)(sequence).target
+    ))
+      return;
     const request = requestAnimationFrame((timestamp) => {
       if (!getShouldStore())
         return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@baleada/logic",
-  "version": "0.24.9",
+  "version": "0.24.11",
   "description": "UI logic for the Baleada toolkit",
   "main": "lib/index.cjs",
   "module": "lib/index.js",