Cancel takes a behavior again

rymdkraftverk · Nov 28, 2022 · 48f9bfd · 48f9bfd
1 parent 993c857
commit 48f9bfd
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 5 deletions.
diff --git a/src/index.ts b/src/index.ts
@@ -143,15 +143,14 @@ export default function createInstance(): Instance {
   /**
    * Cancel a behavior
    */
-  const cancel = (behaviorId: string): void => {
-    const behaviorObject = get(behaviorId)
+  const cancel = (behavior: string | Behavior): void => {
+    const behaviorObject =
+      typeof behavior === 'string' ? get(behavior) : behavior
 
     if (behaviorObject) {
       behaviorsToRemove.push(behaviorObject)
     } else {
-      console.warn(
-        `level1: Tried to cancel non-existent behavior: ${behaviorId}`,
-      )
+      console.warn(`level1: Tried to cancel non-existent behavior: ${behavior}`)
     }
   }
 

diff --git a/test.ts b/test.ts
@@ -226,3 +226,22 @@ test('cancel - id', (t) => {
   t.is(get(id), undefined)
   t.deepEqual(getByLabel(label), [])
 })
+
+test('cancel - object', (t) => {
+  const { delay, update, get, cancel } = createInstance()
+
+  const id = 'An id'
+
+  delay(10, { id })
+
+  update(deltaTime)
+
+  t.is(get(id)?.id, id)
+
+  update(deltaTime)
+  cancel(get(id)!)
+
+  update(deltaTime)
+
+  t.is(get(id), undefined)
+})