@realsee/dnalogel 3.30.4 → 3.30.6

package/libs/shared-utils/five/FiveDomEvents.js

@@ -1,52 +1,52 @@
 var w = Object.defineProperty;
 var L = Object.getOwnPropertySymbols;
-var M = Object.prototype.hasOwnProperty, $ = Object.prototype.propertyIsEnumerable;
-var _ = (h, e, t) => e in h ? w(h, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : h[e] = t, D = (h, e) => {
+var M = Object.prototype.hasOwnProperty, x = Object.prototype.propertyIsEnumerable;
+var b = (f, e, t) => e in f ? w(f, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : f[e] = t, D = (f, e) => {
   for (var t in e || (e = {}))
-    M.call(e, t) && _(h, t, e[t]);
+    M.call(e, t) && b(f, t, e[t]);
   if (L)
     for (var t of L(e))
-      $.call(e, t) && _(h, t, e[t]);
-  return h;
+      x.call(e, t) && b(f, t, e[t]);
+  return f;
 };
-var s = (h, e, t) => (_(h, typeof e != "symbol" ? e + "" : e, t), t);
-import * as x from "three";
-import { getObjectVisible as I } from "../three/getObjectVisible.js";
+var d = (f, e, t) => (b(f, typeof e != "symbol" ? e + "" : e, t), t);
+import * as I from "three";
+import { getObjectVisible as $ } from "../three/getObjectVisible.js";
 import { calculateThreeMouse as W } from "./calculateThreeMouse.js";
-class B {
+class j {
   constructor(e, t) {
-    s(this, "five");
+    d(this, "five");
     /**
      * @description: 拖动中
      */
-    s(this, "dragging", !1);
-    s(this, "boundObject", {});
-    s(this, "config");
-    s(this, "handleWantsGesture", (e, t) => {
+    d(this, "dragging", !1);
+    d(this, "boundObject", {});
+    d(this, "config");
+    d(this, "handleWantsGesture", (e, t) => {
       if (t.length !== 1)
         return;
       const n = t[0];
       if (n) {
         if (e === "mouseMove" && this.onDomEvent("hover", n), e === "tap") {
-          const i = this.onDomEvent("click", n), o = this.onDomEvent("wantDblclick", n, void 0, this.boundObject.dblclick);
-          if (i === !1 || o === !1)
+          const i = this.onDomEvent("click", n), r = this.onDomEvent("wantDblclick", n, void 0, this.boundObject.dblclick);
+          if (i === !1 || r === !1)
             return !1;
         }
         if (this.dragging)
           return !1;
       }
     });
-    s(this, "handleDomEvent", (e, t, n) => {
+    d(this, "handleDomEvent", (e, t, n) => {
       const i = { x: t.clientX, y: t.clientY };
       this.onDomEvent(e, i, t, n);
     });
-    s(this, "handleMouseEvent", (e) => {
+    d(this, "handleMouseEvent", (e) => {
       this.handleDomEvent(e.type, e);
     });
-    s(this, "handleMousedown", (e) => {
+    d(this, "handleMousedown", (e) => {
       this.handleDomEvent("mousedown", e), this.handleDomEvent("dragstart", e, this.haveDragEventObject);
     });
-    s(this, "handleMouseup", (e) => {
+    d(this, "handleMouseup", (e) => {
       var t;
       this.dragging = !1, (t = this.haveDragEventObject) == null || t.forEach((n) => {
         n._dragging && (n._dragging = !1, this.notify({
@@ -57,7 +57,7 @@ class B {
         }));
       }), this.handleDomEvent("mouseup", e);
     });
-    s(this, "handleMousemove", (e) => {
+    d(this, "handleMousemove", (e) => {
       var t;
       this.dragging && ((t = this.boundObject.drag) == null || t.forEach((n) => {
         n._dragging && this.notify({
@@ -69,79 +69,79 @@ class B {
       }));
     });
     // eslint-disable-next-line complexity
-    s(this, "onDomEvent", (e, t, n, i = this.boundObject[e]) => {
-      var l, m, E;
+    d(this, "onDomEvent", (e, t, n, i = this.boundObject[e]) => {
+      var u, c, v;
       if (!t || !i || (i == null ? void 0 : i.length) === 0 || !this.five.model.loaded)
         return;
-      const o = (l = t.raycaster) != null ? l : this.getRaycaster(t);
-      o.params.Points.threshold = 0.02;
-      const r = o.intersectObjects(i, !0), f = this.five.model.intersectRaycaster(o), u = 0.01;
-      if (f.length > 0 && r.length > 0 && f[0].distance + u < r[0].distance)
+      const r = (u = t.raycaster) != null ? u : this.getRaycaster(t);
+      r.params.Points.threshold = 0.02;
+      const s = r.intersectObjects(i, !0), l = this.five.model.intersectRaycaster(r), h = 0.01;
+      if (l.length > 0 && s.length > 0 && l[0].distance + h < s[0].distance)
         return;
-      const a = (m = r == null ? void 0 : r[0]) == null ? void 0 : m.object;
+      const o = (c = s == null ? void 0 : s[0]) == null ? void 0 : c.object;
       if (e === "wantDblclick")
         return !1;
-      if ((!a || !this.objectIsBound(a)) && e === "hover")
-        for (const v of (E = this.boundObject.hover) != null ? E : [])
-          v._hovered && this.notify({ eventName: "unHover", object: v });
-      if (a && a && this.notify({ eventName: e, object: a, originEvent: n, raycaster: o, intersects: r }))
+      if ((!o || !this.objectIsBound(o)) && e === "hover")
+        for (const m of (v = this.boundObject.hover) != null ? v : [])
+          m._hovered && this.notify({ eventName: "unHover", object: m });
+      if (o && o && this.notify({ eventName: e, object: o, originEvent: n, raycaster: r, intersects: s }))
         return !1;
     });
-    s(this, "objectIsBound", (e) => {
+    d(this, "objectIsBound", (e) => {
       let t = e._domEvent, n = e.parent;
       for (; typeof t == "undefined" && n; )
         t = n._domEvent, n = n.parent;
       return !!t;
     });
-    s(this, "notify", (e) => {
-      var E, v, b;
-      const { eventName: t, object: n, originEvent: i, raycaster: o, intersects: r } = e;
-      let f = !1, u = [];
-      const a = [];
-      let l = n;
-      for (a.push(l); l.parent; )
-        l = l.parent, a.push(l);
-      const m = a.at(-1);
-      if (!((E = this.config) != null && E.noEmitWhenNotInScene && m.type !== "Scene")) {
-        for (const d of a) {
-          if (f)
+    d(this, "notify", (e) => {
+      var v, m, _;
+      const { eventName: t, object: n, originEvent: i, raycaster: r, intersects: s } = e;
+      let l = !1, h = [];
+      const o = [];
+      let u = n;
+      for (o.push(u); u.parent; )
+        u = u.parent, o.push(u);
+      const c = o.at(-1);
+      if (!((v = this.config) != null && v.noEmitWhenNotInScene && c.type !== "Scene")) {
+        for (const a of o) {
+          if (l)
             break;
-          d.draggable && (t === "dragstart" && (d._dragging = !0, this.dragging = !0), t === "dragend" && (d._dragging = !1, this.dragging = !1));
-          const y = d._domEvent;
-          if (!y)
+          a.draggable && (t === "dragstart" && (a._dragging = !0, this.dragging = !0), t === "dragend" && (a._dragging = !1, this.dragging = !1));
+          const O = a._domEvent;
+          if (!O)
             continue;
-          const O = y[`${t}Handler`];
-          if (O)
-            for (const [H, c] of O) {
-              if (c != null && c.noEmitWhenNotInScene && m.type !== "Scene" || ((v = this.config) != null && v.noEmitWhenHide || c != null && c.noEmitWhenHide) && !I(d))
+          const y = O[`${t}Handler`];
+          if (y)
+            for (const [H, E] of y) {
+              if (E != null && E.noEmitWhenNotInScene && c.type !== "Scene" || ((m = this.config) != null && m.noEmitWhenHide || E != null && E.noEmitWhenHide) && !$(a))
                 continue;
               if (t === "hover") {
-                if (d._hovered)
+                if (a._hovered)
                   continue;
-                d._hovered = !0;
-                for (const g of (b = this.boundObject.hover) != null ? b : [])
-                  g !== d && g._hovered && this.notify({ eventName: "unHover", object: g });
+                a._hovered = !0;
+                for (const g of (_ = this.boundObject.hover) != null ? _ : [])
+                  g !== a && g._hovered && this.notify({ eventName: "unHover", object: g });
               }
               if (t === "unHover") {
-                if (!d._hovered)
+                if (!a._hovered)
                   continue;
-                d._hovered = !1;
+                a._hovered = !1;
               }
               const p = H({
                 type: t,
-                target: d,
+                target: a,
                 origDomEvent: i,
-                raycaster: o,
-                intersects: r,
+                raycaster: r,
+                intersects: s,
                 stopPropagation: () => {
-                  f = !0;
+                  l = !0;
                 }
               });
-              u.push(p != null ? p : !0);
+              h.push(p != null ? p : !0);
             }
         }
         if (t === "click" || t === "wantDblclick")
-          return u.some((d) => d === !0);
+          return h.some((a) => a === !0);
       }
     });
     this.five = e, this.config = t, e.on("wantsGesture", this.handleWantsGesture), document.addEventListener("mousedown", this.handleMousedown), document.addEventListener("dblclick", this.handleMouseEvent), document.addEventListener("mouseup", this.handleMouseup), document.addEventListener("mousemove", this.handleMousemove);
@@ -155,9 +155,9 @@ class B {
    * @todo: added 和 removed 还是不太智能
    */
   addAutoBindEventListener(e, t, n, i) {
-    const o = () => this.addEventListener(e, t, n, i), r = () => this.removeEventListener(e, t, n, i);
-    return e.addEventListener("added", o), e.addEventListener("removed", r), e.addEventListener("dispose", r), () => {
-      e.removeEventListener("added", o), e.removeEventListener("removed", r), e.removeEventListener("dispose", r);
+    const r = () => this.addEventListener(e, t, n, i), s = () => this.removeEventListener(e, t, n, i);
+    return e.addEventListener("added", r), e.addEventListener("removed", s), e.addEventListener("dispose", s), () => {
+      e.removeEventListener("added", r), e.removeEventListener("removed", s), e.removeEventListener("dispose", s);
     };
   }
   /**
@@ -168,20 +168,24 @@ class B {
    * @return {void}
    */
   addEventListener(e, t, n, i) {
-    e._domEvent || (e._domEvent = {}), e._domEvent[`${t}Handler`] || (e._domEvent[`${t}Handler`] = []), this.boundObject[t] || (this.boundObject[t] = []), e._domEvent[`${t}Handler`].push([n, D({ noEmitWhenHide: !1, noEmitWhenNotInScene: !1 }, i)]), this.boundObject[t].push(e);
+    e._domEvent || (e._domEvent = {}), e._domEvent[`${t}Handler`] || (e._domEvent[`${t}Handler`] = []), this.boundObject[t] || (this.boundObject[t] = []), this.boundObject[t].includes(e) || this.boundObject[t].push(e), e._domEvent[`${t}Handler`].push([n, D({ noEmitWhenHide: !1, noEmitWhenNotInScene: !1 }, i)]);
   }
   removeEventListener(e, t, n, ...i) {
-    var r, f;
-    if (!e._domEvent || (t === void 0 && (e._domEvent = {}), !e._domEvent[`${t}Handler`]))
+    var s, l;
+    if (!e._domEvent || (t === void 0 && (Object.keys(this.boundObject).forEach((h) => {
+      var u, c;
+      const o = (u = this.boundObject[h]) == null ? void 0 : u.findIndex((v) => v === e);
+      o !== -1 && ((c = this.boundObject[h]) == null || c.splice(o, 1));
+    }), e._domEvent = {}), !e._domEvent[`${t}Handler`]))
       return;
     if (n === void 0) {
       delete e._domEvent[`${t}Handler`];
       return;
     }
-    const o = e._domEvent[`${t}Handler`].findIndex((u) => u[0] === n);
-    if (o !== -1 && (e._domEvent[`${t}Handler`].splice(o, 1), e._domEvent[`${t}Handler`].length === 0 && delete e._domEvent[`${t}Handler`], e._domEvent && Object.keys(e._domEvent).length === 0 && delete e._domEvent, !e._domEvent)) {
-      const u = (r = this.boundObject[t]) == null ? void 0 : r.findIndex((a) => a === e);
-      u !== -1 && ((f = this.boundObject[t]) == null || f.splice(u, 1));
+    const r = e._domEvent[`${t}Handler`].findIndex((h) => h[0] === n);
+    if (r !== -1 && (e._domEvent[`${t}Handler`].splice(r, 1), e._domEvent[`${t}Handler`].length === 0 && delete e._domEvent[`${t}Handler`], e._domEvent && Object.keys(e._domEvent).length === 0 && delete e._domEvent, !e._domEvent)) {
+      const h = (s = this.boundObject[t]) == null ? void 0 : s.findIndex((o) => o === e);
+      h !== -1 && ((l = this.boundObject[t]) == null || l.splice(h, 1));
     }
   }
   dispose() {
@@ -192,10 +196,10 @@ class B {
     const t = this.five.getElement();
     if (!t)
       return;
-    const n = W(e, t), i = new x.Raycaster();
+    const n = W(e, t), i = new I.Raycaster();
     return i.setFromCamera(n, this.five.camera), i;
   }
 }
 export {
-  B as FiveDomEvents
+  j as FiveDomEvents
 };

package/libs/shared-utils/logger.js

@@ -1,6 +1,6 @@
 function A() {
   console.debug(
-    "%c %c@realsee/dnalogel %cv3.30.4",
+    "%c %c@realsee/dnalogel %cv3.30.6",
     [
       "background: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAkAAAAMCAMAAACHgmeRAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAABLFBMVEUAAAAapPoap/oaqvkbrfkbr/gZnfwZoPsaqfnD4v/E4/8Ylv0clPm93/+/4P/B4f8Yj/683/8Wif+33P8Uhv+x2f8ShP+s1v8Pgf+n0/8Nf/+h0f8Lff8Lff8Nf/9dl/+czv8KfP8KfP+Lxf+Uyv+Xy/+Hwv+Jw/+Mxf+Oxv+RyP8aovsapfoap/oZmfwZm/wZnvsYnPsYkf4YlP0NePsDYfgYcfi43f+63v8Xiv8Xjf4EWfwCV/sWZ/qz2v+02/8Vh/8WiP8EUf8CTf4WXv2u1/+v2P8Thf8Thv8ETf8CR/8VV/+o1f+q1f8Qgv8Rg/8DSv8BRf8UVP+j0v+k0v8OgP8Pgf8DR/8DQv9Nhf+dzv+fz/+Kv/+Vyv+Xy/+azf+Oxv+Qx/+SyP////8MUhLdAAAAK3RSTlMACEWQ2bd98uQECPXxqO7c+Pb49vj2+Pb49vj23Oul8fMHA+TwerXXjEIG2P+bHgAAAAFiS0dEY1y+LaoAAAB+SURBVAjXY2BgZGJmYWVgYGBgY9fW0eVg4ORi4NbTNzDk4eXjZxAwMjYxNTO3EGQQsrSytrG1sxdmEHFwdHJ2cXUTZRBz9/D08vbxFWeQ8PMPCAwKDpFkkAoNC4+IjIqWZpCRlZOPiY2LV2BQVGJQTkhMUlEFWaOmrqGpxQAAyg0S9Dq+VPYAAAAASUVORK5CYII=')",
       "background-repeat: no-repeat",

package/libs/shared-utils/three/blink.js

@@ -16,28 +16,28 @@ var E = (e, a, t) => new Promise((r, s) => {
     } catch (i) {
       s(i);
     }
-  }, f = (y) => {
+  }, c = (y) => {
     try {
       d(t.throw(y));
     } catch (i) {
       s(i);
     }
-  }, d = (y) => y.done ? r(y.value) : Promise.resolve(y.value).then(l, f);
+  }, d = (y) => y.done ? r(y.value) : Promise.resolve(y.value).then(l, c);
   d((t = t.apply(e, a)).next());
 });
 import D from "animejs";
 import { toArray as v } from "../util.js";
-const c = /* @__PURE__ */ new Map(), T = /* @__PURE__ */ new Map();
+const f = /* @__PURE__ */ new Map(), T = /* @__PURE__ */ new Map();
 function b(e) {
   v(e).forEach((t) => {
     var r, s;
-    c.has(t) || (t instanceof HTMLElement ? c.set(t, {
+    f.has(t) || (t instanceof HTMLElement ? f.set(t, {
       opacity: t.style.opacity === "" ? void 0 : t.style.opacity,
       visible: {
         display: t.style.display,
         visibility: t.style.visibility
       }
-    }) : t.isObject3D && c.set(t, {
+    }) : t.isObject3D && f.set(t, {
       opacity: (r = t.material) == null ? void 0 : r.opacity,
       transparent: (s = t.material) == null ? void 0 : s.transparent,
       visible: t.visible
@@ -46,11 +46,11 @@ function b(e) {
 }
 function k(e) {
   v(e).forEach((t) => {
-    const r = c.get(t);
-    r && (t instanceof HTMLElement && (t.style.opacity = r.opacity, t.style.display = r.visible.display, t.style.visibility = r.visible.visibility, t.style.display = r.visible.display), t.isObject3D && (t.visible = r.visible, t.material && (t.material.opacity = r.opacity, t.material.transparent = r.transparent)), c.delete(t));
+    const r = f.get(t);
+    r && (t instanceof HTMLElement && (t.style.opacity = r.opacity === void 0 ? "" : r.opacity, t.style.display = r.visible.display, t.style.visibility = r.visible.visibility, t.style.display = r.visible.display), t.isObject3D && (t.visible = r.visible, t.material && (t.material.opacity = r.opacity, t.material.transparent = r.transparent)), f.delete(t));
   });
 }
-function N(e, a) {
+function o(e, a) {
   return E(this, null, function* () {
     var d, y;
     const t = (d = a == null ? void 0 : a.traverseTHREEObject) != null ? d : !0;
@@ -73,27 +73,27 @@ function N(e, a) {
         i.animatables.forEach((L) => {
           var M;
           const p = L.target;
-          if (!c.has(p))
+          if (!f.has(p))
             return;
-          const h = Number((M = c.get(p).opacity) != null ? M : 1) * (100 - i.progress) / 100;
+          const h = Number((M = f.get(p).opacity) != null ? M : 1) * (100 - i.progress) / 100;
           p instanceof HTMLElement ? p.style.opacity = String(h) : p.material && (p.material.opacity = h, p.material.transparent = !0);
         }), (u = a == null ? void 0 : a.updateRender) == null || u.call(a);
       }
-    }, a)), f = T.get(e);
-    f == null || f.pause(), f == null || f.seek(0), T.set(e, l), l.play(), yield l.finished, k(r), (y = a == null ? void 0 : a.updateRender) == null || y.call(a);
+    }, a)), c = T.get(e);
+    c == null || c.pause(), c == null || c.seek(0), T.set(e, l), l.play(), yield l.finished, k(r), (y = a == null ? void 0 : a.updateRender) == null || y.call(a);
   });
 }
 function C(e, a) {
   return E(this, null, function* () {
-    return N(e, g({
+    return o(e, g({
       update: (t) => {
         var r;
         t.animatables.forEach((s) => {
           var i, u;
           const l = s.target;
-          if (!c.has(l))
+          if (!f.has(l))
             return;
-          const f = c.get(l), y = ((u = (i = f == null ? void 0 : f.opacity) != null ? i : a == null ? void 0 : a.maxOpacity) != null ? u : 1) * (t.progress / 100);
+          const c = f.get(l), y = ((u = (i = c == null ? void 0 : c.opacity) != null ? i : a == null ? void 0 : a.maxOpacity) != null ? u : 1) * (t.progress / 100);
           l instanceof HTMLElement ? (l.style.opacity = String(y), l.style.visibility = "visible") : l.isObject3D && (v(e).includes(l) && (l.visible = !0), l.material && (l.material.opacity = y, l.material.transparent = !0));
         }), (r = a == null ? void 0 : a.updateRender) == null || r.call(a);
       }
@@ -101,6 +101,6 @@ function C(e, a) {
   });
 }
 export {
-  N as blink,
+  o as blink,
   C as reblink
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@realsee/dnalogel",
-  "version": "3.30.4",
+  "version": "3.30.6",
   "main": "./dist/index.js",
   "module": "./libs/index.js",
   "types": "./libs/index.d.ts",