@tsparticles/interaction-external-repulse 3.0.0-alpha.0 → 3.0.0-beta.0

package/README.md

@@ -2,9 +2,9 @@
 
 # tsParticles External Repulse Interaction
 
-[![jsDelivr](https://data.jsdelivr.com/v1/package/npm/tsparticles-interaction-external-repulse/badge)](https://www.jsdelivr.com/package/npm/tsparticles-interaction-external-repulse)
-[![npmjs](https://badge.fury.io/js/tsparticles-interaction-external-repulse.svg)](https://www.npmjs.com/package/tsparticles-interaction-external-repulse)
-[![npmjs](https://img.shields.io/npm/dt/tsparticles-interaction-external-repulse)](https://www.npmjs.com/package/tsparticles-interaction-external-repulse) [![GitHub Sponsors](https://img.shields.io/github/sponsors/matteobruni)](https://github.com/sponsors/matteobruni)
+[![jsDelivr](https://data.jsdelivr.com/v1/package/npm/@tsparticles/interaction-external-repulse/badge)](https://www.jsdelivr.com/package/npm/@tsparticles/interaction-external-repulse)
+[![npmjs](https://badge.fury.io/js/@tsparticles/interaction-external-repulse.svg)](https://www.npmjs.com/package/@tsparticles/interaction-external-repulse)
+[![npmjs](https://img.shields.io/npm/dt/@tsparticles/interaction-external-repulse)](https://www.npmjs.com/package/@tsparticles/interaction-external-repulse) [![GitHub Sponsors](https://img.shields.io/github/sponsors/matteobruni)](https://github.com/sponsors/matteobruni)
 
 [tsParticles](https://github.com/matteobruni/tsparticles) interaction plugin for repulse effect around mouse or HTML
 elements.
@@ -27,14 +27,16 @@ loadExternalRepulseInteraction;
 Once the scripts are loaded you can set up `tsParticles` and the interaction plugin like this:
 
 ```javascript
-loadExternalRepulseInteraction(tsParticles);
-
-tsParticles.load({
-  id: "tsparticles",
-  options: {
-    /* options */
-  },
-});
+(async () => {
+  await loadExternalRepulseInteraction(tsParticles);
+
+  await tsParticles.load({
+    id: "tsparticles",
+    options: {
+      /* options */
+    },
+  });
+})();
 ```
 
 ### ESM / CommonJS
@@ -42,29 +44,33 @@ tsParticles.load({
 This package is compatible also with ES or CommonJS modules, firstly this needs to be installed, like this:
 
 ```shell
-$ npm install tsparticles-interaction-external-repulse
+$ npm install @tsparticles/interaction-external-repulse
 ```
 
 or
 
 ```shell
-$ yarn add tsparticles-interaction-external-repulse
+$ yarn add @tsparticles/interaction-external-repulse
 ```
 
 Then you need to import it in the app, like this:
 
 ```javascript
-const { tsParticles } = require("tsparticles-engine");
-const { loadExternalRepulseInteraction } = require("tsparticles-interaction-external-repulse");
+const { tsParticles } = require("@tsparticles/engine");
+const { loadExternalRepulseInteraction } = require("@tsparticles/interaction-external-repulse");
 
-loadExternalRepulseInteraction(tsParticles);
+(async () => {
+  await loadExternalRepulseInteraction(tsParticles);
+})();
 ```
 
 or
 
 ```javascript
-import { tsParticles } from "tsparticles-engine";
-import { loadExternalRepulseInteraction } from "tsparticles-interaction-external-repulse";
+import { tsParticles } from "@tsparticles/engine";
+import { loadExternalRepulseInteraction } from "@tsparticles/interaction-external-repulse";
 
-loadExternalRepulseInteraction(tsParticles);
+(async () => {
+  await loadExternalRepulseInteraction(tsParticles);
+})();
 ```

package/browser/Options/Classes/Repulse.js

@@ -1,6 +1,6 @@
+import { executeOnSingleOrMultiple, } from "@tsparticles/engine";
 import { RepulseBase } from "./RepulseBase";
 import { RepulseDiv } from "./RepulseDiv";
-import { executeOnSingleOrMultiple } from "@tsparticles/engine";
 export class Repulse extends RepulseBase {
     load(data) {
         super.load(data);

package/browser/Options/Classes/RepulseDiv.js

@@ -1,24 +1,14 @@
 import { RepulseBase } from "./RepulseBase";
-import { executeOnSingleOrMultiple } from "@tsparticles/engine";
 export class RepulseDiv extends RepulseBase {
     constructor() {
         super();
         this.selectors = [];
     }
-    get ids() {
-        return executeOnSingleOrMultiple(this.selectors, (t) => t.replace("#", ""));
-    }
-    set ids(value) {
-        this.selectors = executeOnSingleOrMultiple(value, (t) => `#${t}`);
-    }
     load(data) {
         super.load(data);
         if (!data) {
             return;
         }
-        if (data.ids !== undefined) {
-            this.ids = data.ids;
-        }
         if (data.selectors !== undefined) {
             this.selectors = data.selectors;
         }

package/browser/Repulser.js

@@ -3,36 +3,113 @@ import { Repulse } from "./Options/Classes/Repulse";
 export class Repulser extends ExternalInteractorBase {
     constructor(engine, container) {
         super(container);
+        this._clickRepulse = () => {
+            const container = this.container, repulseOptions = container.actualOptions.interactivity.modes.repulse;
+            if (!repulseOptions) {
+                return;
+            }
+            const repulse = container.repulse || { particles: [] };
+            if (!repulse.finish) {
+                if (!repulse.count) {
+                    repulse.count = 0;
+                }
+                repulse.count++;
+                if (repulse.count === container.particles.count) {
+                    repulse.finish = true;
+                }
+            }
+            if (repulse.clicking) {
+                const repulseDistance = container.retina.repulseModeDistance;
+                if (!repulseDistance || repulseDistance < 0) {
+                    return;
+                }
+                const repulseRadius = Math.pow(repulseDistance / 6, 3), mouseClickPos = container.interactivity.mouse.clickPosition;
+                if (mouseClickPos === undefined) {
+                    return;
+                }
+                const range = new Circle(mouseClickPos.x, mouseClickPos.y, repulseRadius), query = container.particles.quadTree.query(range, (p) => this.isEnabled(p));
+                for (const particle of query) {
+                    const { dx, dy, distance } = getDistances(mouseClickPos, particle.position), d = distance ** 2, velocity = repulseOptions.speed, force = (-repulseRadius * velocity) / d;
+                    if (d <= repulseRadius) {
+                        repulse.particles.push(particle);
+                        const vect = Vector.create(dx, dy);
+                        vect.length = force;
+                        particle.velocity.setTo(vect);
+                    }
+                }
+            }
+            else if (repulse.clicking === false) {
+                for (const particle of repulse.particles) {
+                    particle.velocity.setTo(particle.initialVelocity);
+                }
+                repulse.particles = [];
+            }
+        };
+        this._hoverRepulse = () => {
+            const container = this.container, mousePos = container.interactivity.mouse.position, repulseRadius = container.retina.repulseModeDistance;
+            if (!repulseRadius || repulseRadius < 0 || !mousePos) {
+                return;
+            }
+            this._processRepulse(mousePos, repulseRadius, new Circle(mousePos.x, mousePos.y, repulseRadius));
+        };
+        this._processRepulse = (position, repulseRadius, area, divRepulse) => {
+            const container = this.container, query = container.particles.quadTree.query(area, (p) => this.isEnabled(p)), repulseOptions = container.actualOptions.interactivity.modes.repulse;
+            if (!repulseOptions) {
+                return;
+            }
+            for (const particle of query) {
+                const { dx, dy, distance } = getDistances(particle.position, position), velocity = (divRepulse?.speed ?? repulseOptions.speed) * repulseOptions.factor, repulseFactor = clamp(getEasing(repulseOptions.easing)(1 - distance / repulseRadius) * velocity, 0, repulseOptions.maxSpeed), normVec = Vector.create(distance === 0 ? velocity : (dx / distance) * repulseFactor, distance === 0 ? velocity : (dy / distance) * repulseFactor);
+                particle.position.addTo(normVec);
+            }
+        };
+        this._singleSelectorRepulse = (selector, div) => {
+            const container = this.container, repulse = container.actualOptions.interactivity.modes.repulse;
+            if (!repulse) {
+                return;
+            }
+            const query = document.querySelectorAll(selector);
+            if (!query.length) {
+                return;
+            }
+            query.forEach((item) => {
+                const elem = item, pxRatio = container.retina.pixelRatio, pos = {
+                    x: (elem.offsetLeft + elem.offsetWidth / 2) * pxRatio,
+                    y: (elem.offsetTop + elem.offsetHeight / 2) * pxRatio,
+                }, repulseRadius = (elem.offsetWidth / 2) * pxRatio, area = div.type === "circle"
+                    ? new Circle(pos.x, pos.y, repulseRadius)
+                    : new Rectangle(elem.offsetLeft * pxRatio, elem.offsetTop * pxRatio, elem.offsetWidth * pxRatio, elem.offsetHeight * pxRatio), divs = repulse.divs, divRepulse = divMode(divs, elem);
+                this._processRepulse(pos, repulseRadius, area, divRepulse);
+            });
+        };
         this._engine = engine;
         if (!container.repulse) {
             container.repulse = { particles: [] };
         }
         this.handleClickMode = (mode) => {
-            const options = this.container.actualOptions, repulse = options.interactivity.modes.repulse;
-            if (!repulse || mode !== "repulse") {
+            const options = this.container.actualOptions, repulseOpts = options.interactivity.modes.repulse;
+            if (!repulseOpts || mode !== "repulse") {
                 return;
             }
             if (!container.repulse) {
                 container.repulse = { particles: [] };
             }
-            container.repulse.clicking = true;
-            container.repulse.count = 0;
+            const repulse = container.repulse;
+            repulse.clicking = true;
+            repulse.count = 0;
             for (const particle of container.repulse.particles) {
                 if (!this.isEnabled(particle)) {
                     continue;
                 }
                 particle.velocity.setTo(particle.initialVelocity);
             }
-            container.repulse.particles = [];
-            container.repulse.finish = false;
+            repulse.particles = [];
+            repulse.finish = false;
             setTimeout(() => {
-                if (!container.destroyed) {
-                    if (!container.repulse) {
-                        container.repulse = { particles: [] };
-                    }
-                    container.repulse.clicking = false;
+                if (container.destroyed) {
+                    return;
                 }
-            }, repulse.duration * 1000);
+                repulse.clicking = false;
+            }, repulseOpts.duration * 1000);
         };
     }
     clear() {
@@ -45,24 +122,23 @@ export class Repulser extends ExternalInteractorBase {
         container.retina.repulseModeDistance = repulse.distance * container.retina.pixelRatio;
     }
     async interact() {
-        const container = this.container, options = container.actualOptions, mouseMoveStatus = container.interactivity.status === mouseMoveEvent, events = options.interactivity.events, hoverEnabled = events.onHover.enable, hoverMode = events.onHover.mode, clickEnabled = events.onClick.enable, clickMode = events.onClick.mode, divs = events.onDiv;
+        const container = this.container, options = container.actualOptions, mouseMoveStatus = container.interactivity.status === mouseMoveEvent, events = options.interactivity.events, hover = events.onHover, hoverEnabled = hover.enable, hoverMode = hover.mode, click = events.onClick, clickEnabled = click.enable, clickMode = click.mode, divs = events.onDiv;
         if (mouseMoveStatus && hoverEnabled && isInArray("repulse", hoverMode)) {
-            this.hoverRepulse();
+            this._hoverRepulse();
         }
         else if (clickEnabled && isInArray("repulse", clickMode)) {
-            this.clickRepulse();
+            this._clickRepulse();
         }
         else {
-            divModeExecute("repulse", divs, (selector, div) => this.singleSelectorRepulse(selector, div));
+            divModeExecute("repulse", divs, (selector, div) => this._singleSelectorRepulse(selector, div));
         }
     }
     isEnabled(particle) {
-        var _a;
-        const container = this.container, options = container.actualOptions, mouse = container.interactivity.mouse, events = ((_a = particle === null || particle === void 0 ? void 0 : particle.interactivity) !== null && _a !== void 0 ? _a : options.interactivity).events, divs = events.onDiv, divRepulse = isDivModeEnabled("repulse", divs);
-        if (!(divRepulse || (events.onHover.enable && mouse.position) || (events.onClick.enable && mouse.clickPosition))) {
+        const container = this.container, options = container.actualOptions, mouse = container.interactivity.mouse, events = (particle?.interactivity ?? options.interactivity).events, divs = events.onDiv, hover = events.onHover, click = events.onClick, divRepulse = isDivModeEnabled("repulse", divs);
+        if (!(divRepulse || (hover.enable && mouse.position) || (click.enable && mouse.clickPosition))) {
             return false;
         }
-        const hoverMode = events.onHover.mode, clickMode = events.onClick.mode;
+        const hoverMode = hover.mode, clickMode = click.mode;
         return isInArray("repulse", hoverMode) || isInArray("repulse", clickMode) || divRepulse;
     }
     loadModeOptions(options, ...sources) {
@@ -70,90 +146,9 @@ export class Repulser extends ExternalInteractorBase {
             options.repulse = new Repulse();
         }
         for (const source of sources) {
-            options.repulse.load(source === null || source === void 0 ? void 0 : source.repulse);
+            options.repulse.load(source?.repulse);
         }
     }
     reset() {
     }
-    clickRepulse() {
-        const container = this.container, repulse = container.actualOptions.interactivity.modes.repulse;
-        if (!repulse) {
-            return;
-        }
-        if (!container.repulse) {
-            container.repulse = { particles: [] };
-        }
-        if (!container.repulse.finish) {
-            if (!container.repulse.count) {
-                container.repulse.count = 0;
-            }
-            container.repulse.count++;
-            if (container.repulse.count === container.particles.count) {
-                container.repulse.finish = true;
-            }
-        }
-        if (container.repulse.clicking) {
-            const repulseDistance = container.retina.repulseModeDistance;
-            if (!repulseDistance || repulseDistance < 0) {
-                return;
-            }
-            const repulseRadius = Math.pow(repulseDistance / 6, 3), mouseClickPos = container.interactivity.mouse.clickPosition;
-            if (mouseClickPos === undefined) {
-                return;
-            }
-            const range = new Circle(mouseClickPos.x, mouseClickPos.y, repulseRadius), query = container.particles.quadTree.query(range, (p) => this.isEnabled(p));
-            for (const particle of query) {
-                const { dx, dy, distance } = getDistances(mouseClickPos, particle.position), d = distance ** 2, velocity = repulse.speed, force = (-repulseRadius * velocity) / d;
-                if (d <= repulseRadius) {
-                    container.repulse.particles.push(particle);
-                    const vect = Vector.create(dx, dy);
-                    vect.length = force;
-                    particle.velocity.setTo(vect);
-                }
-            }
-        }
-        else if (container.repulse.clicking === false) {
-            for (const particle of container.repulse.particles) {
-                particle.velocity.setTo(particle.initialVelocity);
-            }
-            container.repulse.particles = [];
-        }
-    }
-    hoverRepulse() {
-        const container = this.container, mousePos = container.interactivity.mouse.position, repulseRadius = container.retina.repulseModeDistance;
-        if (!repulseRadius || repulseRadius < 0 || !mousePos) {
-            return;
-        }
-        this.processRepulse(mousePos, repulseRadius, new Circle(mousePos.x, mousePos.y, repulseRadius));
-    }
-    processRepulse(position, repulseRadius, area, divRepulse) {
-        var _a;
-        const container = this.container, query = container.particles.quadTree.query(area, (p) => this.isEnabled(p)), repulseOptions = container.actualOptions.interactivity.modes.repulse;
-        if (!repulseOptions) {
-            return;
-        }
-        for (const particle of query) {
-            const { dx, dy, distance } = getDistances(particle.position, position), velocity = ((_a = divRepulse === null || divRepulse === void 0 ? void 0 : divRepulse.speed) !== null && _a !== void 0 ? _a : repulseOptions.speed) * repulseOptions.factor, repulseFactor = clamp(getEasing(repulseOptions.easing)(1 - distance / repulseRadius) * velocity, 0, repulseOptions.maxSpeed), normVec = Vector.create(distance === 0 ? velocity : (dx / distance) * repulseFactor, distance === 0 ? velocity : (dy / distance) * repulseFactor);
-            particle.position.addTo(normVec);
-        }
-    }
-    singleSelectorRepulse(selector, div) {
-        const container = this.container, repulse = container.actualOptions.interactivity.modes.repulse;
-        if (!repulse) {
-            return;
-        }
-        const query = document.querySelectorAll(selector);
-        if (!query.length) {
-            return;
-        }
-        query.forEach((item) => {
-            const elem = item, pxRatio = container.retina.pixelRatio, pos = {
-                x: (elem.offsetLeft + elem.offsetWidth / 2) * pxRatio,
-                y: (elem.offsetTop + elem.offsetHeight / 2) * pxRatio,
-            }, repulseRadius = (elem.offsetWidth / 2) * pxRatio, area = div.type === "circle"
-                ? new Circle(pos.x, pos.y, repulseRadius)
-                : new Rectangle(elem.offsetLeft * pxRatio, elem.offsetTop * pxRatio, elem.offsetWidth * pxRatio, elem.offsetHeight * pxRatio), divs = repulse.divs, divRepulse = divMode(divs, elem);
-            this.processRepulse(pos, repulseRadius, area, divRepulse);
-        });
-    }
 }

package/browser/index.js

@@ -1,6 +1,6 @@
 import { Repulser } from "./Repulser";
-export async function loadExternalRepulseInteraction(engine) {
-    await engine.addInteractor("externalRepulse", (container) => new Repulser(engine, container));
+export async function loadExternalRepulseInteraction(engine, refresh = true) {
+    await engine.addInteractor("externalRepulse", (container) => new Repulser(engine, container), refresh);
 }
 export * from "./Options/Classes/RepulseBase";
 export * from "./Options/Classes/RepulseDiv";

package/cjs/Options/Classes/Repulse.js

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Repulse = void 0;
+const engine_1 = require("@tsparticles/engine");
 const RepulseBase_1 = require("./RepulseBase");
 const RepulseDiv_1 = require("./RepulseDiv");
-const engine_1 = require("@tsparticles/engine");
 class Repulse extends RepulseBase_1.RepulseBase {
     load(data) {
         super.load(data);

package/cjs/Options/Classes/RepulseDiv.js

@@ -2,26 +2,16 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RepulseDiv = void 0;
 const RepulseBase_1 = require("./RepulseBase");
-const engine_1 = require("@tsparticles/engine");
 class RepulseDiv extends RepulseBase_1.RepulseBase {
     constructor() {
         super();
         this.selectors = [];
     }
-    get ids() {
-        return (0, engine_1.executeOnSingleOrMultiple)(this.selectors, (t) => t.replace("#", ""));
-    }
-    set ids(value) {
-        this.selectors = (0, engine_1.executeOnSingleOrMultiple)(value, (t) => `#${t}`);
-    }
     load(data) {
         super.load(data);
         if (!data) {
             return;
         }
-        if (data.ids !== undefined) {
-            this.ids = data.ids;
-        }
         if (data.selectors !== undefined) {
             this.selectors = data.selectors;
         }