@realsee/dnalogel 3.70.0-alpha.2 → 3.70.0-alpha.3

package/dist/index.js

@@ -43,7 +43,7 @@ import { LineGeometry as JA, LineMaterial as KA, THREE_Line2 as $A, Line as eb }
 import { GLTFLoader as tb } from "@realsee/five/gltf-loader";
 function ib() {
   console.debug(
-    "%c %c@realsee/dnalogel %cv3.70.0-alpha.2",
+    "%c %c@realsee/dnalogel %cv3.70.0-alpha.3",
     [
       "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",
@@ -12978,7 +12978,7 @@ let fs = class {
     /**
      * @realsee/dnalogel 版本号
      */
-    d(this, "VERSION", "3.70.0-alpha.2");
+    d(this, "VERSION", "3.70.0-alpha.3");
     d(this, "NAME");
     d(this, "five");
     d(this, "workUtil");
@@ -32483,6 +32483,11 @@ class zu {
     d(this, "contentDom");
     d(this, "initialConfig");
     d(this, "computedConfig");
+    /**
+     * 存储当前的闪烁动画实例
+     * @private
+     */
+    d(this, "_currentBlinkInstance");
     d(this, "cache");
     d(this, "entryFromModel");
     d(this, "_updating", !1);
@@ -32593,43 +32598,52 @@ class zu {
    */
   blink(t) {
     return ie(this, null, function* () {
-      var a, l, c, h;
-      yield this.ready();
-      const e = (a = this.enabled) != null ? a : !0, i = (l = this.state) == null ? void 0 : l.visible, s = e && i;
-      s === !1 && (this.state.visible = !0, this.enabled = !0, this.applyVisible(), this.plugin.render(), this.computeRenderType() !== "Mesh" ? yield new Promise((u) => ie(this, null, function* () {
+      var a, l, c, h, u, f;
+      yield this.ready(), this._currentBlinkInstance && !this._currentBlinkInstance.completed && ((l = (a = this._currentBlinkInstance).preComplete) == null || l.call(a), this._currentBlinkInstance = void 0);
+      const e = (c = this.enabled) != null ? c : !0, i = (h = this.state) == null ? void 0 : h.visible, s = e && i;
+      s === !1 && (this.state.visible = !0, this.enabled = !0, this.applyVisible(), this.plugin.render(), this.computeRenderType() !== "Mesh" ? yield new Promise((p) => {
         if (this.dom || this.contentDom) {
-          u();
+          p();
           return;
         }
-        const f = setInterval(() => {
-          (this.dom || this.contentDom) && (u(), clearInterval(f));
+        const g = setInterval(() => {
+          (this.dom || this.contentDom) && (p(), clearInterval(g));
         }, 16.7);
-      })) : this.stickType === "Model" && !((c = this.model) != null && c.object) ? yield (h = this.model) == null ? void 0 : h.promise : this.stickType === "Plane" && (yield new Promise((u) => ie(this, null, function* () {
+      }) : this.stickType === "Model" && !((u = this.model) != null && u.object) ? yield (f = this.model) == null ? void 0 : f.promise : this.stickType === "Plane" && (yield new Promise((p) => {
         if (this.mediaPlane) {
-          u();
+          p();
           return;
         }
-        const f = setInterval(() => {
-          this.mediaPlane && (u(), clearInterval(f));
+        const g = setInterval(() => {
+          this.mediaPlane && (p(), clearInterval(g));
         }, 16.7);
-      }))), this.dom && (this.dom.style.visibility = "hidden"), this.contentDom && (this.contentDom.style.visibility = "hidden"));
+      })), this.dom && (this.dom.style.visibility = "hidden"), this.contentDom && (this.contentDom.style.visibility = "hidden"));
       const o = (() => {
-        var f, p, g;
-        const u = [];
-        return u.push(this.dom), u.push((p = (f = this.tag3DContentSvelte) == null ? void 0 : f.css3DInstance) == null ? void 0 : p.container), u.push((g = this.model) == null ? void 0 : g.object), u.push(this.mediaPlane), u.filter(Boolean);
+        var g, m, v;
+        const p = [];
+        return p.push(this.dom), p.push((m = (g = this.tag3DContentSvelte) == null ? void 0 : g.css3DInstance) == null ? void 0 : m.container), p.push((v = this.model) == null ? void 0 : v.object), p.push(this.mediaPlane), p.filter(Boolean);
       })();
       if (!o.length) {
         console.warn("tagDom is empty");
         return;
       }
-      yield (s ? Tl : Z0)(o, H({
+      const r = s ? Tl : Z0;
+      this._currentBlinkInstance = r(o, H({
         begin: () => {
           s === !1 && (this.dom && (this.dom.style.visibility = ""), this.contentDom && (this.contentDom.style.visibility = ""));
         },
         updateRender: () => {
           this.five.needsRender = !0;
         }
-      }, t)).finished, e === !1 && (this.enabled = !1, this.updateVisible()), i === !1 && this.updateVisible(), s === !1 && (this.dom && (this.dom.style.visibility = ""), this.contentDom && (this.contentDom.style.visibility = ""));
+      }, t));
+      try {
+        yield this._currentBlinkInstance.finished;
+      } catch (p) {
+        console.debug("Blink animation interrupted:", p);
+      } finally {
+        this._currentBlinkInstance = void 0;
+      }
+      e === !1 && (this.enabled = !1, this.updateVisible()), i === !1 && this.updateVisible(), s === !1 && (this.dom && (this.dom.style.visibility = ""), this.contentDom && (this.contentDom.style.visibility = ""));
     });
   }
   /**
@@ -33047,13 +33061,13 @@ class zu {
    * @description 销毁并移除
    */
   destroy() {
-    var e, i;
-    const t = this.plugin.tags.findIndex((s) => s.id === this.id);
+    var e, i, s, o;
+    const t = this.plugin.tags.findIndex((r) => r.id === this.id);
     if (t === -1) {
       console.warn(`Destroy failed: tag ${this.id} not found`);
       return;
     }
-    this.disable(), (i = (e = this.tag3DContentSvelte) == null ? void 0 : e.dispose) == null || i.call(e), this.hooks.off(), this.cache.clear(), this.plugin.tags.splice(t, 1), this.plugin.tagsLengthWillUpdate = !0, this.plugin.hooks.emit("tagsLengthChange");
+    this._currentBlinkInstance && !this._currentBlinkInstance.completed && ((i = (e = this._currentBlinkInstance).preComplete) == null || i.call(e), this._currentBlinkInstance = void 0), this.disable(), (o = (s = this.tag3DContentSvelte) == null ? void 0 : s.dispose) == null || o.call(s), this.hooks.off(), this.cache.clear(), this.plugin.tags.splice(t, 1), this.plugin.tagsLengthWillUpdate = !0, this.plugin.hooks.emit("tagsLengthChange");
   }
   /**
    * @description 判断 popover 是否在配置上启用（永久配置）