@realsee/dnalogel 3.49.4 → 3.49.6

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

@@ -1,41 +1,46 @@
-var H = Object.defineProperty;
+var x = Object.defineProperty;
 var D = Object.getOwnPropertySymbols;
-var x = Object.prototype.hasOwnProperty, I = Object.prototype.propertyIsEnumerable;
-var M = (u, e, t) => e in u ? H(u, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : u[e] = t, w = (u, e) => {
+var S = Object.prototype.hasOwnProperty, I = Object.prototype.propertyIsEnumerable;
+var M = (u, e, t) => e in u ? x(u, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : u[e] = t, L = (u, e) => {
   for (var t in e || (e = {}))
-    x.call(e, t) && M(u, t, e[t]);
+    S.call(e, t) && M(u, t, e[t]);
   if (D)
     for (var t of D(e))
       I.call(e, t) && M(u, t, e[t]);
   return u;
 };
-var o = (u, e, t) => (M(u, typeof e != "symbol" ? e + "" : e, t), t);
+var r = (u, e, t) => (M(u, typeof e != "symbol" ? e + "" : e, t), t);
 import { getObjectVisible as $ } from "../three/getObjectVisible.js";
-import { calculateThreeMouse as W } from "./calculateThreeMouse.js";
-import { getFiveModel as j } from "./getFiveModel.js";
-import { THREERaycaster as L } from "../three/core/Raycaster.js";
-class B {
+import { calculateThreeMouse as T } from "./calculateThreeMouse.js";
+import { getFiveModel as W } from "./getFiveModel.js";
+import { THREERaycaster as w } from "../three/core/Raycaster.js";
+import { isTouchDevice as H } from "../isTouchDevice.js";
+class G {
   // 事件由five触发时，用来补充 originEvent 属性
   constructor(e, t) {
-    o(this, "five");
+    r(this, "five");
     /**
      * @description: 拖动中
      */
-    o(this, "dragging", !1);
-    o(this, "boundObject", {});
-    o(this, "config");
-    o(this, "lastMouseDownEvent");
-    o(this, "handleWantsGesture", (e, t) => {
+    r(this, "dragging", !1);
+    r(this, "boundObject", {});
+    r(this, "config");
+    r(this, "lastMouseDownEvent");
+    // 事件由five触发时，用来补充 originEvent 属性
+    r(this, "lastTouchEvent");
+    r(this, "handleWantsGesture", (e, t) => {
       if (t.length !== 1)
         return;
       const n = t[0];
       if (n.raycaster) {
-        const i = new L();
+        const i = new w();
         i.ray = n.raycaster.ray, i.near = n.raycaster.near, i.far = n.raycaster.far, i.camera = n.raycaster.camera, i.layers = n.raycaster.layers, i.params = n.raycaster.params, n.raycaster = i;
       }
       if (n) {
         if (e === "mouseMove" && this.onDomEvent("hover", n), e === "tap") {
-          const i = this.lastMouseDownEvent, a = this.onDomEvent("click", n, i), d = this.onDomEvent("wantDblclick", n, i, this.boundObject.dblclick);
+          let i;
+          !i && !H && (i = this.lastMouseDownEvent), !i && H && (i = this.lastTouchEvent), i || (i = new MouseEvent("click", { clientX: n.x, clientY: n.y }));
+          const a = this.onDomEvent("click", n, i), d = this.onDomEvent("wantDblclick", n, i, this.boundObject.dblclick);
           if (a === !1 || d === !1)
             return !1;
         }
@@ -43,17 +48,20 @@ class B {
           return !1;
       }
     });
-    o(this, "handleDomEvent", (e, t, n) => {
+    r(this, "handleDomEvent", (e, t, n) => {
       const i = { x: t.clientX, y: t.clientY };
       this.onDomEvent(e, i, t, n);
     });
-    o(this, "handleMouseEvent", (e) => {
+    r(this, "handleMouseEvent", (e) => {
       this.handleDomEvent(e.type, e);
     });
-    o(this, "handleMousedown", (e) => {
+    r(this, "handleMousedown", (e) => {
       this.lastMouseDownEvent = e, this.handleDomEvent("mousedown", e), this.handleDomEvent("dragstart", e, this.haveDragEventObject);
     });
-    o(this, "handleMouseup", (e) => {
+    r(this, "handleTouchStart", (e) => {
+      this.lastTouchEvent = e;
+    });
+    r(this, "handleMouseup", (e) => {
       var t;
       this.dragging = !1, (t = this.haveDragEventObject) == null || t.forEach((n) => {
         n._dragging && (n._dragging = !1, this.notify({
@@ -64,7 +72,7 @@ class B {
         }));
       }), this.handleDomEvent("mouseup", e);
     });
-    o(this, "handleMousemove", (e) => {
+    r(this, "handleMousemove", (e) => {
       var t;
       this.dragging && ((t = this.boundObject.drag) == null || t.forEach((n) => {
         n._dragging && this.notify({
@@ -76,95 +84,95 @@ class B {
       }));
     });
     // eslint-disable-next-line complexity
-    o(this, "onDomEvent", (e, t, n, i = this.boundObject[e]) => {
-      var m, g, p, r, b;
+    r(this, "onDomEvent", (e, t, n, i = this.boundObject[e]) => {
+      var m, g, p, o, y;
       if (!t || !i || (i == null ? void 0 : i.length) === 0)
         return;
       const a = [];
       ((m = this.config) == null ? void 0 : m.fiveModels) !== null && ((g = this.config) != null && g.fiveModels ? a.push(...this.config.fiveModels) : a.push(this.model));
-      const d = a.filter((v) => v.loaded), f = (p = t.raycaster) != null ? p : this.getRaycaster(t);
-      f.params.Points.threshold = 0.02;
-      const s = f.intersectObjects(i, !0), h = [];
+      const d = a.filter((v) => v.loaded), l = (p = t.raycaster) != null ? p : this.getRaycaster(t);
+      l.params.Points.threshold = 0.02;
+      const s = l.intersectObjects(i, !0), h = [];
       d.forEach((v) => {
-        const _ = v.intersectRaycaster(f);
+        const _ = v.intersectRaycaster(l);
         h.push(..._);
       });
-      const l = 0.01;
-      if (h.length > 0 && s.length > 0 && h[0].distance + l < s[0].distance)
+      const f = 0.01;
+      if (h.length > 0 && s.length > 0 && h[0].distance + f < s[0].distance)
         return;
-      const c = (r = s == null ? void 0 : s[0]) == null ? void 0 : r.object;
+      const c = (o = s == null ? void 0 : s[0]) == null ? void 0 : o.object;
       if (e === "wantDblclick")
         return !1;
       if ((!c || !this.objectIsBound(c)) && e === "hover")
-        for (const v of (b = this.boundObject.hover) != null ? b : [])
+        for (const v of (y = this.boundObject.hover) != null ? y : [])
           v._hovered && this.notify({ eventName: "unHover", object: v });
-      if (c && c && this.notify({ eventName: e, object: c, originEvent: n, raycaster: f, intersects: s }))
+      if (c && c && this.notify({ eventName: e, object: c, originEvent: n, raycaster: l, intersects: s }))
         return !1;
     });
-    o(this, "objectIsBound", (e) => {
+    r(this, "objectIsBound", (e) => {
       let t = e._domEvent, n = e.parent;
       for (; typeof t == "undefined" && n; )
         t = n._domEvent, n = n.parent;
       return !!t;
     });
-    o(this, "notify", (e) => {
+    r(this, "notify", (e) => {
       var m, g, p;
       const { eventName: t, object: n, originEvent: i, raycaster: a, intersects: d } = e;
-      let f = !1, s = [];
+      let l = !1, s = [];
       const h = [];
-      let l = n;
-      for (h.push(l); l.parent; )
-        l = l.parent, h.push(l);
+      let f = n;
+      for (h.push(f); f.parent; )
+        f = f.parent, h.push(f);
       const c = h.at(-1);
       if (!((m = this.config) != null && m.noEmitWhenNotInScene && c.type !== "Scene")) {
-        for (const r of h) {
-          if (f)
+        for (const o of h) {
+          if (l)
             break;
-          r.draggable && (t === "dragstart" && (r._dragging = !0, this.dragging = !0), t === "dragend" && (r._dragging = !1, this.dragging = !1));
-          const b = r._domEvent;
-          if (!b)
+          o.draggable && (t === "dragstart" && (o._dragging = !0, this.dragging = !0), t === "dragend" && (o._dragging = !1, this.dragging = !1));
+          const y = o._domEvent;
+          if (!y)
             continue;
-          const v = b[`${t}Handler`];
+          const v = y[`${t}Handler`];
           if (v)
             for (const [_, E] of v) {
-              if (E != null && E.noEmitWhenNotInScene && c.type !== "Scene" || ((g = this.config) != null && g.noEmitWhenHide || E != null && E.noEmitWhenHide) && !$(r))
+              if (E != null && E.noEmitWhenNotInScene && c.type !== "Scene" || ((g = this.config) != null && g.noEmitWhenHide || E != null && E.noEmitWhenHide) && !$(o))
                 continue;
               if (t === "hover") {
-                if (r._hovered)
+                if (o._hovered)
                   continue;
-                r._hovered = !0;
-                for (const y of (p = this.boundObject.hover) != null ? p : [])
-                  y !== r && y._hovered && this.notify({ eventName: "unHover", object: y });
+                o._hovered = !0;
+                for (const b of (p = this.boundObject.hover) != null ? p : [])
+                  b !== o && b._hovered && this.notify({ eventName: "unHover", object: b });
               }
               if (t === "unHover") {
-                if (!r._hovered)
+                if (!o._hovered)
                   continue;
-                r._hovered = !1;
+                o._hovered = !1;
               }
               const O = _({
                 type: t,
-                target: r,
+                target: o,
                 origDomEvent: i,
                 raycaster: a,
                 intersects: d,
                 stopPropagation: () => {
-                  f = !0;
+                  l = !0;
                 }
               });
               s.push(O != null ? O : !0);
             }
         }
         if (t === "click" || t === "wantDblclick")
-          return s.some((r) => r === !0);
+          return s.some((o) => o === !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);
+    this.five = e, this.config = t, e.on("wantsGesture", this.handleWantsGesture), document.addEventListener("mousedown", this.handleMousedown), document.addEventListener("touchstart", this.handleTouchStart), document.addEventListener("dblclick", this.handleMouseEvent), document.addEventListener("mouseup", this.handleMouseup), document.addEventListener("mousemove", this.handleMousemove);
   }
   get haveDragEventObject() {
     return [...new Set([this.boundObject.dragend, this.boundObject.drag, this.boundObject.dragstart].flat())].filter(Boolean);
   }
   get model() {
-    return j(this.five);
+    return W(this.five);
   }
   /**
    * @description: added 时自动绑定事件，removed时自动解绑事件，也就是说只有物体在场景中的时候才会触发事件
@@ -185,13 +193,13 @@ 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] = []), this.boundObject[t].includes(e) || this.boundObject[t].push(e), e._domEvent[`${t}Handler`].push([n, w({ noEmitWhenHide: !1, noEmitWhenNotInScene: !1 }, i)]);
+    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, L({ noEmitWhenHide: !1, noEmitWhenNotInScene: !1 }, i)]);
   }
   removeEventListener(e, t, n, ...i) {
-    var d, f;
+    var d, l;
     if (!e._domEvent || (t === void 0 && (Object.keys(this.boundObject).forEach((s) => {
-      var l, c;
-      const h = (l = this.boundObject[s]) == null ? void 0 : l.findIndex((m) => m === e);
+      var f, c;
+      const h = (f = this.boundObject[s]) == null ? void 0 : f.findIndex((m) => m === e);
       h !== -1 && ((c = this.boundObject[s]) == null || c.splice(h, 1));
     }), e._domEvent = {}), !e._domEvent[`${t}Handler`]))
       return;
@@ -202,7 +210,7 @@ class B {
     const a = e._domEvent[`${t}Handler`].findIndex((s) => s[0] === n);
     if (a !== -1 && (e._domEvent[`${t}Handler`].splice(a, 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 s = (d = this.boundObject[t]) == null ? void 0 : d.findIndex((h) => h === e);
-      s !== -1 && ((f = this.boundObject[t]) == null || f.splice(s, 1));
+      s !== -1 && ((l = this.boundObject[t]) == null || l.splice(s, 1));
     }
   }
   clear() {
@@ -210,7 +218,7 @@ class B {
   }
   dispose() {
     var e;
-    (e = this.five) == null || e.off("wantsGesture", this.handleWantsGesture), document.removeEventListener("mousedown", this.handleMousedown), document.removeEventListener("mouseup", this.handleMouseup), document.removeEventListener("mousemove", this.handleMousemove), this.boundObject = {};
+    (e = this.five) == null || e.off("wantsGesture", this.handleWantsGesture), document.removeEventListener("mousedown", this.handleMousedown), document.removeEventListener("touchstart", this.handleTouchStart), document.removeEventListener("mouseup", this.handleMouseup), document.removeEventListener("mousemove", this.handleMousemove), this.boundObject = {};
   }
   toJSON() {
     return {
@@ -221,10 +229,10 @@ class B {
     const t = this.five.getElement();
     if (!t)
       return;
-    const n = W(e, t), i = new L();
+    const n = T(e, t), i = new w();
     return i.setFromCamera(n, this.five.camera), i;
   }
 }
 export {
-  B as FiveDomEvents
+  G as FiveDomEvents
 };

package/libs/shared-utils/logger.js

@@ -1,6 +1,6 @@
 function A() {
   console.debug(
-    "%c %c@realsee/dnalogel %cv3.49.4",
+    "%c %c@realsee/dnalogel %cv3.49.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/package.json

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