@realsee/dnalogel 2.14.2 → 2.14.3

package/libs/PanoTagPlugin/controller/TagRender.js

@@ -1,31 +1,31 @@
 var j = Object.defineProperty;
-var w = (l, m, t) => m in l ? j(l, m, { enumerable: !0, configurable: !0, writable: !0, value: t }) : l[m] = t;
-var d = (l, m, t) => (w(l, typeof m != "symbol" ? m + "" : m, t), t);
-var T = (l, m, t) => new Promise((e, i) => {
-  var o = (r) => {
+var w = (l, p, t) => p in l ? j(l, p, { enumerable: !0, configurable: !0, writable: !0, value: t }) : l[p] = t;
+var d = (l, p, t) => (w(l, typeof p != "symbol" ? p + "" : p, t), t);
+var D = (l, p, t) => new Promise((e, i) => {
+  var o = (s) => {
     try {
-      a(t.next(r));
-    } catch (s) {
-      i(s);
+      n(t.next(s));
+    } catch (r) {
+      i(r);
     }
-  }, n = (r) => {
+  }, a = (s) => {
     try {
-      a(t.throw(r));
-    } catch (s) {
-      i(s);
+      n(t.throw(s));
+    } catch (r) {
+      i(r);
     }
-  }, a = (r) => r.done ? e(r.value) : Promise.resolve(r.value).then(o, n);
-  a((t = t.apply(l, m)).next());
+  }, n = (s) => s.done ? e(s.value) : Promise.resolve(s.value).then(o, a);
+  n((t = t.apply(l, p)).next());
 });
 import { TagComputer as O } from "./TagComputer.js";
-import { Group as D, Quaternion as x, Vector3 as h, Matrix4 as u } from "three";
+import { Group as P, Quaternion as x, Vector3 as f, Matrix4 as T } from "three";
 import G from "../Components/TagContainer.js";
 import k from "../Components/Tag/index.js";
-import { arrayPositionToVector3 as P } from "../../CSS3DRenderPlugin/utils/positionToVector3.js";
+import { arrayPositionToVector3 as b } from "../../CSS3DRenderPlugin/utils/positionToVector3.js";
 import { centerPoint as A } from "../../shared-utils/three/centerPoint.js";
 import "@realsee/five/gltf-loader";
 import R from "../utils/model/imagePlane.js";
-import { isMediaModelTag as b } from "../utils/tag/tagCheck.js";
+import { isMediaModelTag as S } from "../utils/tag/tagCheck.js";
 import { CSS3DRenderPlugin as E } from "../../CSS3DRenderPlugin/index.js";
 import { loadGLTF as V } from "../../shared-utils/three/GLTFLoader.js";
 import "@realsee/five";
@@ -134,30 +134,30 @@ import "../../CSS3DRenderPlugin/utils/waitFiveModelLoaded.js";
 class Ue extends O {
   constructor(t) {
     super(t);
-    d(this, "group", new D());
-    d(this, "imagePlaneGroup", new D());
-    d(this, "gltfObjectGroup", new D());
+    d(this, "group", new P());
+    d(this, "imagePlaneGroup", new P());
+    d(this, "gltfObjectGroup", new P());
     d(this, "enabledModelTagSet", /* @__PURE__ */ new Set());
     d(this, "temporaryState", { visible: !0 });
     d(this, "TagContainerSvelte");
-    d(this, "loadModel", (t) => T(this, null, function* () {
-      var r;
+    d(this, "loadModel", (t) => D(this, null, function* () {
+      var s;
       const e = t.data.modelUrl;
       if (!e)
         return;
-      const i = V(e).then((s) => Object.assign(s.scene, { customID: t.id, isTagModel: !0 }));
+      const i = V(e).then((r) => Object.assign(r.scene, { customID: t.id, isTagModel: !0 }));
       t.model = { promise: i };
       const o = yield i;
-      if (((r = t.model) == null ? void 0 : r.promise) !== i || (t.model.object = o, !this.tags.includes(t)))
+      if (((s = t.model) == null ? void 0 : s.promise) !== i || (t.model.object = o, !this.tags.includes(t)))
         return;
-      o.visible = this.getCurrentVisibleState(t), new u().fromArray(t.matrix).decompose(o.position, o.quaternion, o.scale), o.updateWorldMatrix(!0, !0), o.visible = this.getVisibleByFloorIndex(t);
-      const a = this.gltfObjectGroup.children.find((s) => s.customID === t.id);
-      if (a && this.gltfObjectGroup.remove(a), this.can("renderByMesh", t)) {
+      o.visible = this.getCurrentVisibleState(t), new T().fromArray(t.matrix).decompose(o.position, o.quaternion, o.scale), o.updateWorldMatrix(!0, !0), o.visible = this.getVisibleByFloorIndex(t);
+      const n = this.gltfObjectGroup.children.find((r) => r.customID === t.id);
+      if (n && this.gltfObjectGroup.remove(n), this.getRenderType(t) === "Mesh") {
         if (!t.imagePlane) {
-          const s = t.data.mediaPosition.map(P);
-          t.imagePlane = new R(t.data.mediaData[0].url, t.data.mediaPosition.map(P));
-          const p = new h().addVectors(s[0], s[2]).divideScalar(2);
-          t.imagePlane.position.copy(p), o.add(t.imagePlane);
+          const r = t.data.mediaPosition.map(b);
+          t.imagePlane = new R(t.data.mediaData[0].url, t.data.mediaPosition.map(b));
+          const m = new f().addVectors(r[0], r[2]).divideScalar(2);
+          t.imagePlane.position.copy(m), o.add(t.imagePlane);
         }
       } else
         this.updateTagCss3DObjectMatrix(t, o);
@@ -176,22 +176,22 @@ class Ue extends O {
   }
   updateRenderImagePlane() {
     this.sort(this.filterImagePlane).forEach((e) => {
-      var n, a, r, s;
-      const i = (n = e.data.mediaData[0]) == null ? void 0 : n.url;
-      if (!i || (e.imagePlane && (e.imagePlane.visible = (r = (a = e.state) == null ? void 0 : a.visible) != null ? r : !0), ((s = e.imagePlane) == null ? void 0 : s.imageSrc) === i))
+      var a, n, s, r;
+      const i = (a = e.data.mediaData[0]) == null ? void 0 : a.url;
+      if (!i || (e.imagePlane && (e.imagePlane.visible = (s = (n = e.state) == null ? void 0 : n.visible) != null ? s : !0), ((r = e.imagePlane) == null ? void 0 : r.imageSrc) === i))
         return;
-      const o = e.position.map(P);
+      const o = e.position.map(b);
       e.imagePlane = new R(i, o), e.imagePlane.setMatrixByCornerPoints(o), this.imagePlaneGroup.add(e.imagePlane);
     });
   }
   updateRender3DDomTag() {
-    this.sort([...this.filter3DTag]).forEach((e) => {
-      var i;
+    this.sort([...this.filterCSS3DTag]).forEach((e) => {
+      var i, o;
       if (e.tag3DContentSvelte) {
-        const { svelteApp: o, domContainer: n, initialNormal: a, currentNormal: r } = e.tag3DContentSvelte;
-        if (o.$set({ tag: e, hooks: this.hooks, state: this.state, temporaryState: this.temporaryState }), !a.equals(r)) {
-          const s = new x().setFromUnitVectors(a, r);
-          n.css3DObject.setRotationFromQuaternion(s);
+        const { svelteApp: a, domContainer: n, initialNormal: s, currentNormal: r } = e.tag3DContentSvelte;
+        if (a.$set({ tag: e, hooks: this.hooks, state: this.state, temporaryState: this.temporaryState }), !s.equals(r)) {
+          const m = new x().setFromUnitVectors(s, r);
+          n.css3DObject.setRotationFromQuaternion(m);
         }
         return;
       } else {
@@ -199,32 +199,32 @@ class Ue extends O {
           return;
         if (this.css3DRenderPlugin || (this.css3DRenderPlugin = E(this.five)), e.stickType === "3DPoint" && !e.normal)
           return console.error("updateRenderPlaneTag: \u4E09\u7EF4\u70B9\u6807\u7B7E\u7F3A\u5C11\u6CD5\u5411\u91CF\uFF01");
-        const o = this.getPositions(e);
-        if (!o)
+        const a = this.getPositions(e);
+        if (!a)
           return;
         const n = this.getTagNormal(e);
         if (!n)
           return;
-        const a = this.getTagConfig(e), r = a.tag3DConfig;
-        if (a.renderType === "Mesh" && r) {
+        const r = (o = this.getTagConfig(e).tag3DConfig) != null ? o : {};
+        if (this.getRenderType(e) === "BehindDom") {
           r.mode = "behind", r.container = document.createElement("div");
-          const p = "black";
-          r.container.style.backgroundColor = p, r.container.style.border = `3px solid ${p}`;
+          const h = "black";
+          r.container.style.backgroundColor = h, r.container.style.border = `3px solid ${h}`, this.css3DRenderPlugin.hooks.on("render", () => {
+            var u;
+            if (m.css3DObject.opacityMesh) {
+              const g = this.addObjectClickHandler(e, m.css3DObject.opacityMesh, (c) => {
+                console.log(e), this.hooks.emit("click", { event: c, target: "TagContent", tag: e });
+              });
+              (u = this.store.css3DRenderDisposer.get(e.id)) == null || u.push(g);
+            }
+          });
         }
-        const s = this.css3DRenderPlugin.create3DDomContainer(o, r);
-        if (!s)
+        const m = this.css3DRenderPlugin.create3DDomContainer(a, r);
+        if (!m)
           return;
-        this.store.css3DRenderDisposer.set(e.id, [s.dispose]), this.css3DRenderPlugin.hooks.on("render", () => {
-          var p;
-          if (s.css3DObject.opacityMesh) {
-            const g = this.addObjectClickHandler(e, s.css3DObject.opacityMesh, (f) => {
-              this.hooks.emit("click", { event: f, target: "TagContent", tag: e });
-            });
-            (p = this.store.css3DRenderDisposer.get(e.id)) == null || p.push(g);
-          }
-        }), e.tag3DContentSvelte = {
+        this.store.css3DRenderDisposer.set(e.id, [m.dispose]), e.tag3DContentSvelte = {
           svelteApp: new k({
-            target: s.container,
+            target: m.container,
             props: {
               tag: e,
               hooks: this.hooks,
@@ -233,7 +233,7 @@ class Ue extends O {
               temporaryState: this.temporaryState
             }
           }),
-          domContainer: s,
+          domContainer: m,
           initialNormal: n,
           currentNormal: n
         };
@@ -242,10 +242,10 @@ class Ue extends O {
   }
   updateRenderModelTag() {
     const t = (i) => !this.enabledModelTagSet.has(i.customID);
-    this.gltfObjectGroup.remove(...this.gltfObjectGroup.children.filter(t)), this.tags.filter(b).forEach((i) => {
+    this.gltfObjectGroup.remove(...this.gltfObjectGroup.children.filter(t)), this.tags.filter(S).forEach((i) => {
       var o;
-      (o = i.model) == null || o.promise.then((n) => {
-        n.visible = this.getCurrentVisibleState(i);
+      (o = i.model) == null || o.promise.then((a) => {
+        a.visible = this.getCurrentVisibleState(i);
       });
     });
   }
@@ -256,20 +256,20 @@ class Ue extends O {
     });
   }
   updateTagCss3DObjectMatrix(t, e) {
-    var S, v, M, y;
-    const i = (M = (v = (S = t.mergedConfig) == null ? void 0 : S.tag3DConfig) == null ? void 0 : v.ratio) != null ? M : 216e-5, o = (y = t.tag3DContentSvelte) == null ? void 0 : y.domContainer.css3DObject;
+    var C, v, M, y;
+    const i = (M = (v = (C = t.mergedConfig) == null ? void 0 : C.tag3DConfig) == null ? void 0 : v.ratio) != null ? M : 216e-5, o = (y = t.tag3DContentSvelte) == null ? void 0 : y.domContainer.css3DObject;
     if (!o)
       return;
-    const n = b(t) ? t.data.mediaPosition : t.position;
+    const a = S(t) ? t.data.mediaPosition : t.position;
     e.updateWorldMatrix(!1, !1);
-    const a = e.matrixWorld, r = new h().fromArray(n[0]), s = new h().fromArray(n[2]), p = A(r, s).add(new h(0, 0, 5e-4)), g = new u().setPosition(p), f = new u().makeScale(i, i, i), C = new u().multiply(a).multiply(g).multiply(f);
-    C.decompose(o.position, o.quaternion, o.scale);
+    const n = e.matrixWorld, s = new f().fromArray(a[0]), r = new f().fromArray(a[2]), m = A(s, r).add(new f(0, 0, 5e-4)), h = new T().setPosition(m), u = new T().makeScale(i, i, i), g = new T().multiply(n).multiply(h).multiply(u);
+    g.decompose(o.position, o.quaternion, o.scale);
     const c = o.opacityMesh;
-    c && C.decompose(c.position, c.quaternion, c.scale);
+    c && g.decompose(c.position, c.quaternion, c.scale);
   }
   addMediaModelTag(t) {
-    return T(this, null, function* () {
-      const e = t.filter(b).map((i) => this.loadModel(i));
+    return D(this, null, function* () {
+      const e = t.filter(S).map((i) => this.loadModel(i));
       yield Promise.all(e), this.setModelMedialVisible(), this.updateRenderAllTags();
     });
   }
@@ -294,9 +294,9 @@ class Ue extends O {
       state: this.state,
       temporaryState: this.temporaryState,
       withAnimation: this.store.visibleWithAnimation
-    }), this.filter3DTag.forEach((e) => {
-      var i, o, n, a, r;
-      (a = (o = (i = e.tag3DContentSvelte) == null ? void 0 : i.domContainer) == null ? void 0 : o.css3DObject) == null || a.setVisible((this.state.visible && ((n = e.state) == null ? void 0 : n.visible)) !== !1), (r = e.tag3DContentSvelte) == null || r.svelteApp.$set({
+    }), this.filterCSS3DTag.forEach((e) => {
+      var i, o, a, n, s;
+      (n = (o = (i = e.tag3DContentSvelte) == null ? void 0 : i.domContainer) == null ? void 0 : o.css3DObject) == null || n.setVisible((this.state.visible && ((a = e.state) == null ? void 0 : a.visible)) !== !1), (s = e.tag3DContentSvelte) == null || s.svelteApp.$set({
         state: this.state,
         temporaryState: this.temporaryState,
         withAnimation: this.store.visibleWithAnimation

package/libs/PanoTagPlugin/controller/TagUtil.d.ts

@@ -36,7 +36,8 @@ export declare abstract class TagUtil extends TagCache {
     protected updateTagConfig(params?: {
         force?: boolean;
     }): void;
-    protected can<T extends TagElement<any, any>>(action: 'show' | 'hide' | 'fold' | 'unfold' | 'renderByMesh' | 'renderByMeshDom', paramsTag: T): boolean;
+    protected can<T extends TagElement<any, any>>(action: 'show' | 'hide' | 'fold' | 'unfold', paramsTag: T): boolean;
+    protected getRenderType(tag: TagElement<any, any>): 'Dom' | 'Mesh' | 'BehindDom';
     /**
      * @description: 获取角度
      */
@@ -55,7 +56,7 @@ export declare abstract class TagUtil extends TagCache {
     protected get filterImagePlane(): PlaneTagElement<"MediaPlane">[];
     protected get filterMediaModel(): ModelElement<"MediaModel">[];
     protected get filterModelTag(): ModelElement<"Image" | "Link" | "Audio" | "Text" | "ImageText" | "Video" | "Sticker" | "VRLink" | "PanoLink" | "Marketing" | "MediaPlane" | "MediaModel" | "Custom" | "Unknown">[];
-    protected get filter3DTag(): (TagElement<any, "Plane"> | TagElement<any, "Model"> | TagElement<any, "3DPoint">)[];
+    protected get filterCSS3DTag(): (TagElement<any, "Plane"> | TagElement<any, "Model"> | TagElement<any, "3DPoint">)[];
     /**
      * @description 检查是否已经销毁
      * @returns isDisposed; 已经销毁返回 true，否则返回 false

package/libs/PanoTagPlugin/controller/TagUtil.js

@@ -1,6 +1,6 @@
 var T = Object.defineProperty;
 var y = (c, u, e) => u in c ? T(c, u, { enumerable: !0, configurable: !0, writable: !0, value: e }) : c[u] = e;
-var l = (c, u, e) => (y(c, typeof u != "symbol" ? u + "" : u, e), e);
+var a = (c, u, e) => (y(c, typeof u != "symbol" ? u + "" : u, e), e);
 import D from "object-assign-deep";
 import * as C from "three";
 import { DefaultConfig as w } from "../tag.config.js";
@@ -14,8 +14,8 @@ import { isIOSWX as A } from "../utils/device.js";
 import "../../CSS3DRenderPlugin/utils/three/CSS3DRender.js";
 import "../../CSS3DRenderPlugin/utils/generateBehindFiveElement.js";
 import "@realsee/five";
-import { isMediaPlaneTag as x, isMediaModelTag as v, isPlaneTag as L } from "../utils/tag/tagCheck.js";
-import { DomEvents as V } from "../../shared-utils/threex/domevents/index.js";
+import { isMediaPlaneTag as x, isMediaModelTag as v, isPlaneTag as V } from "../utils/tag/tagCheck.js";
+import { DomEvents as L } from "../../shared-utils/threex/domevents/index.js";
 import "@realsee/five/gltf-loader";
 import "../../shared-utils/three/loadTexture.js";
 import "../../shared-utils/three/centerPoint.js";
@@ -31,30 +31,30 @@ import "../../CSS3DRenderPlugin/utils/three/CSS3DObject.js";
 import "../../CSS3DRenderPlugin/utils/three/OpacityMesh.js";
 import "../../CSS3DRenderPlugin/utils/three/CSS3DScene.js";
 import "../../CSS3DRenderPlugin/utils/three/CSS3DGroup.js";
-class ae extends b {
+class le extends b {
   constructor(e) {
     super(e);
-    l(this, "tags", []);
-    l(this, "config", w);
-    l(this, "mediaStore", I({
+    a(this, "tags", []);
+    a(this, "config", w);
+    a(this, "mediaStore", I({
       currentMediaElement: null
     }));
-    l(this, "css3DRenderPlugin");
-    l(this, "store", {
+    a(this, "css3DRenderPlugin");
+    a(this, "store", {
       disposers: [],
       disposed: !1,
       resizeObserverDisposerAdding: !1,
       css3DRenderDisposer: /* @__PURE__ */ new Map()
     });
-    l(this, "domEvents");
-    l(this, "mouseInfo");
-    l(this, "preventWhenMouseDown", () => {
+    a(this, "domEvents");
+    a(this, "mouseInfo");
+    a(this, "preventWhenMouseDown", () => {
       var e;
       if ((e = this.mouseInfo) != null && e.isDown)
         return !1;
     });
     const i = this.five.getElement();
-    i && (this.domEvents = new V(this.five.camera, i)), this.five.on("wantsMoveToPano", this.preventWhenMouseDown), this.five.on("wantsTapGesture", this.preventWhenMouseDown), this.store.disposers.push(() => {
+    i && (this.domEvents = new L(this.five.camera, i)), this.five.on("wantsMoveToPano", this.preventWhenMouseDown), this.five.on("wantsTapGesture", this.preventWhenMouseDown), this.store.disposers.push(() => {
       this.five.off("wantsMoveToPano", this.preventWhenMouseDown), this.five.off("wantsTapGesture", this.preventWhenMouseDown);
     });
   }
@@ -77,8 +77,8 @@ class ae extends b {
     if (!e)
       return (t = this.config.globalConfig) != null ? t : {};
     const i = {};
-    this.config.contentTypeConfig && Object.keys(this.config.contentTypeConfig).forEach((a) => {
-      const r = a;
+    this.config.contentTypeConfig && Object.keys(this.config.contentTypeConfig).forEach((l) => {
+      const r = l;
       if (i[r])
         return;
       const f = r.split("-");
@@ -91,10 +91,10 @@ class ae extends b {
         (e.stickType === s || s === "Any") && (e.contentType === n || n === "Any") && (i[r] = this.config.contentTypeConfig[r]);
       }
       if (f.length === 3) {
-        const [s = "Any", n, m] = f;
+        const [s = "Any", n, h] = f;
         if (n === "Audio" && e.contentType === "Audio") {
-          const h = e;
-          (h.stickType === s || s === "Any") && h.data.appearance === m && (i[r] = this.config.contentTypeConfig[r]);
+          const m = e;
+          (m.stickType === s || s === "Any") && m.data.appearance === h && (i[r] = this.config.contentTypeConfig[r]);
         }
       }
     });
@@ -126,16 +126,31 @@ class ae extends b {
       if (e === "fold" && t.unfoldedConfig.keep === "unfolded" || e === "unfold" && t.unfoldedConfig.keep === "folded")
         return !1;
     }
-    if (e === "renderByMesh")
-      if (x(o) || v(o)) {
-        const d = o.data.mediaData;
-        return d.length === 1 && d[0].type === "Image" && t.renderType === "Mesh";
-      } else
-        return !1;
     return !0;
   }
+  getRenderType(e) {
+    const i = this.getTagConfig(e);
+    if (!i || typeof i != "object" || !i.renderType)
+      return "Dom";
+    const o = e.data.mediaData;
+    if (!o || o.length === 0)
+      return "Dom";
+    if (i.renderType === "Mesh") {
+      if (x(e))
+        if (o.length === 1) {
+          if (o[0].type === "Image")
+            return "Mesh";
+          if (o[0].type === "Video")
+            return "BehindDom";
+        } else
+          return "Dom";
+      else if (v(e))
+        return o.length === 1 && o[0].type === "Image" ? "Mesh" : "BehindDom";
+    } else
+      return "Dom";
+  }
   getAngle(e, i) {
-    var d, a, r;
+    var d, l, r;
     const o = (d = this.five.panoIndex) != null ? d : i;
     if (o === void 0)
       throw new Error(`getDistance(): fivePanoIndex is ${o}`);
@@ -143,7 +158,7 @@ class ae extends b {
     if (t.angle !== void 0)
       return t.angle;
     {
-      const f = (r = (a = this.five.work) == null ? void 0 : a.observers[o]) == null ? void 0 : r.position;
+      const f = (r = (l = this.five.work) == null ? void 0 : l.observers[o]) == null ? void 0 : r.position;
       if (f === void 0)
         throw new Error(`getAngleRange(): observerPosition is ${f}`);
       const s = (() => e.stickType === "3DPoint" ? E(e.normal) : g(e.position))();
@@ -152,12 +167,12 @@ class ae extends b {
       const n = P(e.position);
       if (!n)
         return;
-      const m = new C.Vector3().copy(f).sub(n), h = s.angleTo(m) * 180 / Math.PI;
-      return t.angle = h, t.angle;
+      const h = new C.Vector3().copy(f).sub(n), m = s.angleTo(h) * 180 / Math.PI;
+      return t.angle = m, t.angle;
     }
   }
   getDistance(e, i) {
-    var d, a, r;
+    var d, l, r;
     const o = (d = this.five.panoIndex) != null ? d : i;
     if (o === void 0)
       throw new Error(`getDistance(): fivePanoIndex is ${o}`);
@@ -165,7 +180,7 @@ class ae extends b {
     if (t.distance !== void 0)
       return t.distance;
     {
-      const f = (r = (a = this.five.work) == null ? void 0 : a.observers[o]) == null ? void 0 : r.position;
+      const f = (r = (l = this.five.work) == null ? void 0 : l.observers[o]) == null ? void 0 : r.position;
       if (f === void 0)
         throw new Error(`getDistance(): observerPosition is ${f}`);
       const s = k(e);
@@ -176,7 +191,7 @@ class ae extends b {
     }
   }
   getPositions(e) {
-    if (L(e))
+    if (V(e))
       return e.position;
     if (v(e))
       return e.data.mediaPosition;
@@ -203,7 +218,7 @@ class ae extends b {
         isDown: !0,
         mouseDownTimestamp: Date.now()
       };
-    }, a = (s) => {
+    }, l = (s) => {
       if (!t()) {
         this.mouseInfo = void 0;
         return;
@@ -230,8 +245,8 @@ class ae extends b {
       const n = s.origDomEvent;
       !this.mouseInfo || (this.mouseInfo.isDown && this.mouseInfo.x === Math.floor(n.changedTouches[n.changedTouches.length - 1].clientX) && this.mouseInfo.y === Math.floor(n.changedTouches[n.changedTouches.length - 1].clientY) && Date.now() - this.mouseInfo.mouseDownTimestamp < 400 && o(n), this.mouseInfo = void 0);
     };
-    return this.domEvents.addEventListener(i, "mousedown", d, !1), this.domEvents.addEventListener(i, "mouseup", a, !1), this.domEvents.addEventListener(i, "touchstart", r, !1), this.domEvents.addEventListener(i, "touchend", f, !1), () => {
-      !this.domEvents || (this.mouseInfo = void 0, this.domEvents.removeEventListener(i, "mousedown", d), this.domEvents.removeEventListener(i, "mouseup", a), this.domEvents.removeEventListener(i, "touchstart", r), this.domEvents.removeEventListener(i, "touchend", f));
+    return this.domEvents.addEventListener(i, "mousedown", d, !1), this.domEvents.addEventListener(i, "mouseup", l, !1), this.domEvents.addEventListener(i, "touchstart", r, !1), this.domEvents.addEventListener(i, "touchend", f, !1), () => {
+      !this.domEvents || (this.mouseInfo = void 0, this.domEvents.removeEventListener(i, "mousedown", d), this.domEvents.removeEventListener(i, "mouseup", l), this.domEvents.removeEventListener(i, "touchstart", r), this.domEvents.removeEventListener(i, "touchend", f));
     };
   }
   getTagNormal(e) {
@@ -253,7 +268,7 @@ class ae extends b {
   }
   get filterImagePlane() {
     return this.tags.filter(
-      (e) => e.contentType === "MediaPlane" && e.stickType === "Plane" && this.can("renderByMesh", e)
+      (e) => e.contentType === "MediaPlane" && e.stickType === "Plane" && this.getRenderType(e) === "Mesh"
     );
   }
   get filterMediaModel() {
@@ -262,13 +277,16 @@ class ae extends b {
   get filterModelTag() {
     return this.tags.filter((e) => e.stickType === "Model");
   }
-  get filter3DTag() {
-    return this.tags.filter((e) => e.stickType === "3DPoint" || e.stickType === "Plane" || e.stickType === "Model").filter((e) => !this.can("renderByMesh", e));
+  get filterCSS3DTag() {
+    return this.tags.filter((i) => i.stickType === "3DPoint" || i.stickType === "Plane" || i.stickType === "Model").filter((i) => {
+      const o = this.getRenderType(i);
+      return o === "BehindDom" || o === "Dom";
+    });
   }
   checkDisposed() {
     return this.store.disposed ? (console.error("PanoTagPluginController has been disposed"), !0) : !1;
   }
 }
 export {
-  ae as TagUtil
+  le as TagUtil
 };

package/libs/PanoTagPlugin/controller/index.js

@@ -29,14 +29,14 @@ var f = (d, a, e) => new Promise((t, i) => {
 });
 import { Subscribe as w } from "@realsee/five";
 import c from "object-assign-deep";
-import { arrayPositionToVector3 as A } from "../../CSS3DRenderPlugin/utils/positionToVector3.js";
+import { arrayPositionToVector3 as C } from "../../CSS3DRenderPlugin/utils/positionToVector3.js";
 import { addDebugPoints as M } from "../utils/addDebugPoints.js";
 import "three";
 import "@realsee/five/gltf-loader";
 import "../../shared-utils/three/loadTexture.js";
 import { isMediaModelTag as v } from "../utils/tag/tagCheck.js";
 import { waitFiveModelLoaded as I } from "../utils/actionAfterFiveModelLoad.js";
-import { debounce as C } from "../utils/debounce.js";
+import { debounce as A } from "../utils/debounce.js";
 import { throttle as B } from "../utils/throttle.js";
 import { resizeObserver as y } from "../utils/resizeObserver.js";
 import R from "../utils/tag/format.js";
@@ -262,7 +262,7 @@ class Yt extends k {
   }
   dispose() {
     var e, t, i, s, o, r;
-    this.pauseCurrentMedia(), this.disposeAllCSS3DContainer(), (e = this.TagContainerSvelte) == null || e.$destroy(), this.filter3DTag.forEach((n) => {
+    this.pauseCurrentMedia(), this.disposeAllCSS3DContainer(), (e = this.TagContainerSvelte) == null || e.$destroy(), this.filterCSS3DTag.forEach((n) => {
       var h;
       return (h = n.tag3DContentSvelte) == null ? void 0 : h.svelteApp.$destroy();
     }), this.tags = [], (t = this.store.disposers) == null || t.forEach((n) => n == null ? void 0 : n()), this.store.disposers = [], (s = (i = this.store).eventListenerDisposer) == null || s.call(i), this.store.eventListenerDisposer = void 0, (r = (o = this.store).resizeObserverDisposer) == null || r.call(o), this.store.resizeObserverDisposer = void 0, this.store.resizeObserverDisposerAdding = !1, this.five.scene.remove(this.group), this.group.remove(...this.group.children), this.gltfObjectGroup.remove(...this.gltfObjectGroup.children), this.clearCache(), this.five.needsRender = !0, this.store.disposed = !0, this.hooks.emit("dispose");
@@ -286,7 +286,7 @@ class Yt extends k {
   }
   changeTagNormalById(e, t) {
     const i = this.getTagById(e);
-    !i || !i.tag3DContentSvelte || (i.tag3DContentSvelte.currentNormal = A(t));
+    !i || !i.tag3DContentSvelte || (i.tag3DContentSvelte.currentNormal = C(t));
   }
   changeDataById(e, t, i = !0) {
     const s = this.getTagById(e);
@@ -297,7 +297,7 @@ class Yt extends k {
   }
   changeTagById(e, t, i = !0) {
     const s = this.getTagById(e);
-    !t || (i ? c(s, t) : Object.assign(s, t), (s == null ? void 0 : s.tag3DContentSvelte) && (t == null ? void 0 : t.normal) && (s.tag3DContentSvelte.currentNormal = A(t.normal)), this.updateRenderAllTags(), this.clearUnusedPanelTag());
+    !t || (i ? c(s, t) : Object.assign(s, t), (s == null ? void 0 : s.tag3DContentSvelte) && (t == null ? void 0 : t.normal) && (s.tag3DContentSvelte.currentNormal = C(t.normal)), this.updateRenderAllTags(), this.clearUnusedPanelTag());
   }
   destroyTagById(e) {
     (Array.isArray(e) ? e : [e]).forEach((i) => {
@@ -326,7 +326,7 @@ class Yt extends k {
   }
   handleDisable() {
     var e, t, i;
-    this.pauseCurrentMedia(), this.state.enabled = !1, (t = (e = this.store).eventListenerDisposer) == null || t.call(e), this.five.scene.remove(this.group), (i = this.TagContainerSvelte) == null || i.$set({ tags: [] }), this.filter3DTag.forEach((s) => {
+    this.pauseCurrentMedia(), this.state.enabled = !1, (t = (e = this.store).eventListenerDisposer) == null || t.call(e), this.five.scene.remove(this.group), (i = this.TagContainerSvelte) == null || i.$set({ tags: [] }), this.filterCSS3DTag.forEach((s) => {
       var o;
       (o = s.tag3DContentSvelte) == null || o.svelteApp.$destroy(), s.tag3DContentSvelte = void 0;
     }), this.five.needsRender = !0;
@@ -358,7 +358,7 @@ class Yt extends k {
       }, 500),
       e
     ), { observe: r, unobserve: n } = y(
-      C(() => t(), 400),
+      A(() => t(), 400),
       e
     );
     return s(), r(), () => {
@@ -387,7 +387,7 @@ class Yt extends k {
     }), this.updateRenderAllTags());
   }
   handleFiveCameraUpdateDebounce() {
-    return C(() => {
+    return A(() => {
       this.setUnfoldedByCamera(), this.updateRenderAllTags();
     }, 100);
   }

package/libs/PanoTagPlugin/index.d.ts

@@ -2,7 +2,7 @@ import type { FivePlugin } from '@realsee/five';
 import PanoTagPluginController from './controller';
 export * from './controller';
 export * from './typings';
-export type PanoTagPluginExportInterface = InstanceType<typeof PanoTagPluginController>;
-export type PanoTagPluginParamsInterface = ConstructorParameters<typeof PanoTagPluginController>[1];
+export declare type PanoTagPluginExportInterface = InstanceType<typeof PanoTagPluginController>;
+export declare type PanoTagPluginParamsInterface = ConstructorParameters<typeof PanoTagPluginController>[1];
 export declare const PanoTagPlugin: FivePlugin<PanoTagPluginParamsInterface, PanoTagPluginExportInterface>;
 export default PanoTagPlugin;

package/libs/PanoTagPlugin/typings/controller.d.ts

@@ -9,14 +9,14 @@ import type { TagId, StickType, TagGLTFObject } from './tag/Utils';
 import type { TagContentType } from './tag/TagData';
 import type { Tag } from './tag/Tag';
 import type ImagePlane from '../utils/model/imagePlane';
-type NonNullable<T> = T extends null | undefined | void ? never : T;
-export type TagHooks = InstanceType<typeof PanoTagPluginController>['hooks'];
+declare type NonNullable<T> = T extends null | undefined | void ? never : T;
+export declare type TagHooks = InstanceType<typeof PanoTagPluginController>['hooks'];
 export interface State extends BasePlugin.State {
 }
 export interface AddTagConfig {
     withAnimation?: boolean;
 }
-export type LoadTagConfig = AddTagConfig;
+export declare type LoadTagConfig = AddTagConfig;
 export interface TemporaryState {
     visible?: boolean;
 }
@@ -60,7 +60,7 @@ export interface EventMap extends BasePlugin.EventMap<State> {
     }) => void;
     loadVideoFirstFrame: () => void;
 }
-export type TagEvents = {
+export declare type TagEvents = {
     unfolded: () => void;
     folded: () => void;
     show: () => void;
@@ -79,7 +79,7 @@ export interface TagCacheInterface {
         reason?: string;
     };
 }
-export type TagElement<C extends TagContentType = TagContentType, S extends StickType = StickType> = Tag<C, S> & Partial<{
+export declare type TagElement<C extends TagContentType = TagContentType, S extends StickType = StickType> = Tag<C, S> & Partial<{
     pointTagStyle: {
         leftPercent: number;
         topPercent: number;
@@ -114,12 +114,12 @@ export type TagElement<C extends TagContentType = TagContentType, S extends Stic
     disable: () => void;
     destroy: () => void;
 };
-export type MediaStore = Writable<{
+export declare type MediaStore = Writable<{
     currentMediaElement: HTMLMediaElement | null;
 }>;
-export type PointTagElement<C extends TagContentType = TagContentType> = TagElement<C, '3DPoint' | '2DPoint'>;
-export type PlaneTagElement<C extends TagContentType = TagContentType> = TagElement<C, 'Plane'>;
-export type Point2DElement<C extends TagContentType = TagContentType> = TagElement<C, '2DPoint'>;
-export type Point3DElement<C extends TagContentType = TagContentType> = TagElement<C, '3DPoint'>;
-export type ModelElement<C extends TagContentType = TagContentType> = TagElement<C, 'Model'>;
+export declare type PointTagElement<C extends TagContentType = TagContentType> = TagElement<C, '3DPoint' | '2DPoint'>;
+export declare type PlaneTagElement<C extends TagContentType = TagContentType> = TagElement<C, 'Plane'>;
+export declare type Point2DElement<C extends TagContentType = TagContentType> = TagElement<C, '2DPoint'>;
+export declare type Point3DElement<C extends TagContentType = TagContentType> = TagElement<C, '3DPoint'>;
+export declare type ModelElement<C extends TagContentType = TagContentType> = TagElement<C, 'Model'>;
 export {};

package/libs/PanoTagPlugin/typings/tag/Tag.d.ts

@@ -5,7 +5,7 @@ import type { ContentTypeConfigKey, Position, TagId, StickType, TagStyle } from
 export type { ContentTypeMap, TagContentType };
 export { ContentType };
 /** 返回一个销毁函数 */
-type ElementRenderer = (container: HTMLElement) => () => void;
+declare type ElementRenderer = (container: HTMLElement) => () => void;
 export interface Tags {
     version?: string;
     /** tag配置 > 按type配置 > 全局配置 */
@@ -16,7 +16,7 @@ export interface Tags {
     /** 标签列表配置 */
     tagList: Tag[];
 }
-export type Tag<C extends TagContentType = TagContentType, S extends StickType = StickType> = {
+export declare type Tag<C extends TagContentType = TagContentType, S extends StickType = StickType> = {
     /** 开启/禁用 */
     enabled?: boolean;
     /** 唯一标识 */