fix esm destroy function

tholman · Nov 15, 2022 · 6f530ff · 6f530ff
1 parent b1ae89d
commit 6f530ff
Show file tree

Hide file tree

Showing 11 changed files with 63 additions and 22 deletions.
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "cursor-effects",
   "type": "module",
   "description": "Old-school cursor effects for your browser built in modern JavaScript.",
-  "version": "1.0.6",
+  "version": "1.0.7",
   "main": "./dist/cjs.cjs",
   "module": "./dist/esm.js",
   "exports": {

diff --git a/src/bubbleCursor.js b/src/bubbleCursor.js
@@ -17,7 +17,7 @@ export function bubbleCursor(options) {
   // Re-initialise or destroy the cursor when the prefers-reduced-motion setting changes
   prefersReducedMotion.onchange = () => {
     if (prefersReducedMotion.matches) {
-      this.destroy();
+      destroy();
     } else {
       init();
     }
@@ -126,7 +126,7 @@ export function bubbleCursor(options) {
     animationFrame = requestAnimationFrame(loop);
   }
 
-  this.destroy = () => {
+  function destroy() {
     canvas.remove();
     cancelAnimationFrame(animationFrame);
     element.removeEventListener("mousemove", onMouseMove);
@@ -177,4 +177,9 @@ export function bubbleCursor(options) {
   }
 
   init();
+
+
+  return {
+    destroy: destroy
+  }
 }
diff --git a/src/clockCursor.js b/src/clockCursor.js
@@ -116,7 +116,7 @@ export function clockCursor(options) {
   // Re-initialise or destroy the cursor when the prefers-reduced-motion setting changes
   prefersReducedMotion.onchange = () => {
     if (prefersReducedMotion.matches) {
-      this.destroy();
+      destroy();
     } else {
       init();
     }
@@ -343,14 +343,18 @@ export function clockCursor(options) {
     animationFrame = requestAnimationFrame(loop);
   }
 
-  this.destroy = () => {
+  function destroy() {
     canvas.remove();
     cancelAnimationFrame(animationFrame);
     element.removeEventListener("mousemove", onMouseMove);
     element.removeEventListener("touchmove", onTouchMove);
     element.removeEventListener("touchstart", onTouchMove);
     window.addEventListener("resize", onWindowResize);
-  };
+  }
 
   init();
+
+  return {
+    destroy: destroy,
+  };
 }
diff --git a/src/emojiCursor.js b/src/emojiCursor.js
@@ -19,7 +19,7 @@ export function emojiCursor(options) {
   // Re-initialise or destroy the cursor when the prefers-reduced-motion setting changes
   prefersReducedMotion.onchange = () => {
     if (prefersReducedMotion.matches) {
-      this.destroy();
+      destroy();
     } else {
       init();
     }
@@ -174,7 +174,7 @@ export function emojiCursor(options) {
     animationFrame = requestAnimationFrame(loop);
   }
 
-  this.destroy = () => {
+  function destroy() {
     canvas.remove();
     cancelAnimationFrame(animationFrame);
     element.removeEventListener("mousemove", onMouseMove);
@@ -218,4 +218,8 @@ export function emojiCursor(options) {
   }
 
   init();
+
+  return {
+    destroy: destroy
+  }
 }
diff --git a/src/fairyDustCursor.js b/src/fairyDustCursor.js
@@ -24,7 +24,7 @@ export function fairyDustCursor(options) {
   // Re-initialise or destroy the cursor when the prefers-reduced-motion setting changes
   prefersReducedMotion.onchange = () => {
     if (prefersReducedMotion.matches) {
-      this.destroy();
+      destroy();
     } else {
       init();
     }
@@ -175,7 +175,7 @@ export function fairyDustCursor(options) {
     animationFrame = requestAnimationFrame(loop);
   }
 
-  this.destroy = () => {
+  function destroy() {
     canvas.remove();
     cancelAnimationFrame(animationFrame);
     element.removeEventListener("mousemove", onMouseMove);
@@ -215,4 +215,8 @@ export function fairyDustCursor(options) {
   }
 
   init();
+
+  return {
+    destroy: destroy
+  }
 }
diff --git a/src/followingDotCursor.js b/src/followingDotCursor.js
@@ -16,7 +16,7 @@ export function followingDotCursor(options) {
   // Re-initialise or destroy the cursor when the prefers-reduced-motion setting changes
   prefersReducedMotion.onchange = () => {
     if (prefersReducedMotion.matches) {
-      this.destroy();
+      destroy();
     } else {
       init();
     }
@@ -94,7 +94,7 @@ export function followingDotCursor(options) {
     animationFrame = requestAnimationFrame(loop);
   }
 
-  this.destroy = () => {
+  function destroy() {
     canvas.remove();
     cancelAnimationFrame(loop);
     element.removeEventListener("mousemove", onMouseMove);
@@ -119,4 +119,8 @@ export function followingDotCursor(options) {
   }
 
   init();
+
+  return {
+    destroy: destroy
+  }
 }
diff --git a/src/ghostCursor.js b/src/ghostCursor.js
@@ -19,7 +19,7 @@ export function ghostCursor(options) {
   // Re-initialise or destroy the cursor when the prefers-reduced-motion setting changes
   prefersReducedMotion.onchange = () => {
     if (prefersReducedMotion.matches) {
-      this.destroy();
+      destroy();
     } else {
       init();
     }
@@ -123,7 +123,7 @@ export function ghostCursor(options) {
     animationFrame = requestAnimationFrame(loop);
   }
 
-  this.destroy = () => {
+  function destroy() {
     canvas.remove();
     cancelAnimationFrame(animationFrame);
     element.removeEventListener("mousemove", onMouseMove);
@@ -158,4 +158,8 @@ export function ghostCursor(options) {
   }
 
   init();
+
+  return {
+    destroy: destroy
+  }
 }
diff --git a/src/rainbowCursor.js b/src/rainbowCursor.js
@@ -28,7 +28,7 @@ export function rainbowCursor(options) {
   // Re-initialise or destroy the cursor when the prefers-reduced-motion setting changes
   prefersReducedMotion.onchange = () => {
     if (prefersReducedMotion.matches) {
-      this.destroy();
+      destroy();
     } else {
       init();
     }
@@ -155,7 +155,7 @@ export function rainbowCursor(options) {
     animationFrame = requestAnimationFrame(loop);
   }
 
-  this.destroy = () => {
+  function destroy() {
     canvas.remove();
     cancelAnimationFrame(animationFrame);
     element.removeEventListener("mousemove", onMouseMove);
@@ -167,4 +167,8 @@ export function rainbowCursor(options) {
   }
 
   init();
+
+  return {
+    destroy: destroy
+  }
 }
diff --git a/src/snowflakeCursor.js b/src/snowflakeCursor.js
@@ -18,7 +18,7 @@ export function snowflakeCursor(options) {
   // Re-initialise or destroy the cursor when the prefers-reduced-motion setting changes
   prefersReducedMotion.onchange = () => {
     if (prefersReducedMotion.matches) {
-      this.destroy();
+      destroy();
     } else {
       init();
     }
@@ -155,7 +155,7 @@ export function snowflakeCursor(options) {
     animationFrame = requestAnimationFrame(loop);
   }
 
-  this.destroy = () => {
+  function destroy() {
     canvas.remove();
     cancelAnimationFrame(animationFrame);
     element.removeEventListener("mousemove", onMouseMove);
@@ -209,4 +209,8 @@ export function snowflakeCursor(options) {
   }
 
   init();
+
+  return {
+    destroy: destroy
+  }
 }
diff --git a/src/springyEmojiCursor.js b/src/springyEmojiCursor.js
@@ -33,7 +33,7 @@ export function springyEmojiCursor(options) {
   // Re-initialise or destroy the cursor when the prefers-reduced-motion setting changes
   prefersReducedMotion.onchange = () => {
     if (prefersReducedMotion.matches) {
-      this.destroy();
+      destroy();
     } else {
       init();
     }
@@ -222,7 +222,7 @@ export function springyEmojiCursor(options) {
     animationFrame = requestAnimationFrame(loop);
   }
 
-  this.destroy = () => {
+  function destroy() {
     canvas.remove();
     cancelAnimationFrame(animationFrame);
     element.removeEventListener("mousemove", onMouseMove);
@@ -268,4 +268,8 @@ export function springyEmojiCursor(options) {
   }
 
   init();
+
+  return {
+    destroy: destroy
+  }
 }
diff --git a/src/trailingCursor.js b/src/trailingCursor.js
@@ -25,7 +25,7 @@ export function trailingCursor(options) {
   // Re-initialise or destroy the cursor when the prefers-reduced-motion setting changes
   prefersReducedMotion.onchange = () => {
     if (prefersReducedMotion.matches) {
-      this.destroy();
+      destroy();
     } else {
       init();
     }
@@ -125,7 +125,7 @@ export function trailingCursor(options) {
     animationFrame = requestAnimationFrame(loop);
   }
 
-  this.destroy = () => {
+  function destroy() {
     canvas.remove();
     cancelAnimationFrame(animationFrame);
     element.removeEventListener("mousemove", onMouseMove);
@@ -150,4 +150,8 @@ export function trailingCursor(options) {
   }
 
   init();
+
+  return {
+    destroy: destroy
+  }
 }