@realsee/dnalogel 2.19.1 → 2.20.0-alpha.1

package/libs/PanoTagPlugin/controller/TagRender.js

@@ -1,6 +1,6 @@
-var k = Object.defineProperty;
-var E = (f, h, t) => h in f ? k(f, h, { enumerable: !0, configurable: !0, writable: !0, value: t }) : f[h] = t;
-var b = (f, h, t) => (E(f, typeof h != "symbol" ? h + "" : h, t), t);
+var R = Object.defineProperty;
+var k = (f, h, t) => h in f ? R(f, h, { enumerable: !0, configurable: !0, writable: !0, value: t }) : f[h] = t;
+var b = (f, h, t) => (k(f, typeof h != "symbol" ? h + "" : h, t), t);
 var C = (f, h, t) => new Promise((e, o) => {
   var i = (r) => {
     try {
@@ -17,16 +17,16 @@ var C = (f, h, t) => new Promise((e, o) => {
   }, a = (r) => r.done ? e(r.value) : Promise.resolve(r.value).then(i, n);
   a((t = t.apply(f, h)).next());
 });
-import { TagComputer as w } from "./TagComputer.js";
-import { Group as S, Quaternion as O, Vector3 as v, Matrix4 as D } from "three";
-import x from "../Components/TagContainer.js";
+import { TagComputer as E } from "./TagComputer.js";
+import { Group as S, Quaternion as w, Vector3 as v, Matrix4 as D } from "three";
+import O from "../Components/TagContainer.js";
 import A from "../Components/Tag/index.js";
 import { arrayPositionToVector3 as y } from "../../CSS3DRenderPlugin/utils/positionToVector3.js";
-import { centerPoint as G } from "../../shared-utils/three/centerPoint.js";
-import { isMediaModelTag as P, isStickModelTag as I } from "../utils/tag/tagCheck.js";
-import { CSS3DRenderPlugin as V } from "../../CSS3DRenderPlugin/index.js";
-import { loadGLTF as F } from "../../shared-utils/three/GLTFLoader.js";
-import { VideoPlane as j, ImagePlane as R } from "../utils/model/mediaPlane.js";
+import { centerPoint as x } from "../../shared-utils/three/centerPoint.js";
+import { isMediaModelTag as P, isStickModelTag as G } from "../utils/tag/tagCheck.js";
+import { CSS3DRenderPlugin as I } from "../../CSS3DRenderPlugin/index.js";
+import { loadGLTF as V } from "../../shared-utils/three/GLTFLoader.js";
+import { VideoPlane as M, ImagePlane as j } from "../utils/model/mediaPlane.js";
 import "../utils/tagPosition.js";
 import "../utils/checkRange.js";
 import "hammerjs";
@@ -139,8 +139,8 @@ import "../Components/Tag/CustomTag.js";
 import "../../CSS3DRenderPlugin/Controller.js";
 import "../../CSS3DRenderPlugin/utils/waitFiveModelLoaded.js";
 import "@realsee/five/gltf-loader";
-const L = /* @__PURE__ */ new Map(), B = /* @__PURE__ */ new Map();
-class ti extends w {
+const F = /* @__PURE__ */ new Map(), L = /* @__PURE__ */ new Map();
+class ei extends E {
   constructor(t) {
     super(t);
     b(this, "group", new S());
@@ -158,13 +158,13 @@ class ti extends w {
       const e = t.data.modelUrl;
       if (!e)
         return;
-      const o = F(e).then((r) => {
+      const o = V(e).then((r) => {
         var p, m, l, c, d;
         const s = Object.assign(r.scene, {
           customID: t.id,
           isTagModel: !0,
           removeEventListener: this.addObjectClickHandler(t, r.scene, (g) => {
-            console.log("🐶 ==> tag:", t), this.hooks.emit("click", { target: "TagModel", tag: t, event: g });
+            this.hooks.emit("click", { target: "TagModel", tag: t, event: g });
           })
         });
         return s.visible = this.getCurrentVisibleState(t), new D().fromArray(t.matrix).decompose(s.position, s.quaternion, s.scale), s.updateWorldMatrix(!0, !0), s.visible = this.getVisibleByFiveMode(t), (l = (m = (p = this.config) == null ? void 0 : p.globalConfig) == null ? void 0 : m.modelConfig) != null && l.autoLookAtEnabled && ((d = (c = t.config) == null ? void 0 : c.modelConfig) != null && d.autoLookAtEnabled) && s.lookAt(this.five.camera.position.clone().setY(s.position.y)), s;
@@ -178,7 +178,7 @@ class ti extends w {
       if (n && (this.gltfObjectGroup.remove(n), n.removeEventListener()), this.updateRender3DDomTag(), P(t)) {
         if (this.getRenderType(t) === "Mesh" && !t.mediaPlane) {
           const r = t.data.mediaPosition.map(y);
-          t.mediaPlane = new R(t.data.mediaData[0].url, t.data.mediaPosition.map(y), {
+          t.mediaPlane = new j(t.data.mediaData[0].url, t.data.mediaPosition.map(y), {
             objectFit: t.data.objectFit
           });
           const s = new v().addVectors(r[0], r[2]).divideScalar(2);
@@ -212,21 +212,21 @@ class ti extends w {
       if (!o)
         return;
       const { url: i, type: n } = o;
-      if (!i || (e.mediaPlane && (e.mediaPlane.visible = (s = (r = e.state) == null ? void 0 : r.visible) != null ? s : !0, e.mediaPlane.visible || e.mediaPlane instanceof j && ((u = e.data.autoplayConfig) != null && u.autoplayVideo || e.mediaPlane.pause())), ((p = e.mediaPlane) == null ? void 0 : p.src) === i))
+      if (!i || (e.mediaPlane && (e.mediaPlane.visible = (s = (r = e.state) == null ? void 0 : r.visible) != null ? s : !0, e.mediaPlane.visible || e.mediaPlane instanceof M && ((u = e.data.autoplayConfig) != null && u.autoplayVideo || e.mediaPlane.pause())), ((p = e.mediaPlane) == null ? void 0 : p.src) === i))
         return;
       const a = e.position.map(y);
       if (e.mediaPlane && e.mediaPlane.removeFromParent(), n === "Image")
-        e.mediaPlane = new R(i, a, { objectFit: e.data.objectFit }), this.domEvents.addAutoBindEventListener(e.mediaPlane, "click", (l) => {
+        e.mediaPlane = new j(i, a, { objectFit: e.data.objectFit }), this.domEvents.addAutoBindEventListener(e.mediaPlane, "click", (l) => {
           this.hooks.emit("click", { tag: e, target: "TagContent", event: l.origDomEvent });
         });
       else if (n === "Video") {
-        const l = new j(i, a, {
+        const l = new M(i, a, {
           videoCoverSrc: o.videoCoverUrl,
           playButton: e.data.playIcon,
           paused: !((m = e.data.autoplayConfig) != null && m.autoplayVideo),
           objectFit: e.data.objectFit,
-          videoTextureMap: L,
-          ImageTextureMap: B
+          videoTextureMap: F,
+          ImageTextureMap: L
         });
         l.onVideoReady = (d) => {
           d.addEventListener("play", () => this.mediaStore.set({ currentMediaElement: l.videoInstance }));
@@ -246,14 +246,14 @@ class ti extends w {
       if (e.tag3DContentSvelte) {
         const { svelteApp: r, css3DInstance: s, initialNormal: u, currentNormal: p } = e.tag3DContentSvelte;
         if (r.$set({ tag: e, hooks: this.hooks, state: this.state, temporaryState: this.temporaryState }), !u.equals(p)) {
-          const m = new O().setFromUnitVectors(u, p);
+          const m = new w().setFromUnitVectors(u, p);
           s.css3DObject.setRotationFromQuaternion(m);
         }
         return;
       } else {
         if (P(e) && !((o = e.model) != null && o.object) || ((i = e.state) == null ? void 0 : i.visible) === !1 || !this.state.visible || !this.state.enabled)
           return;
-        if (this.css3DRenderPlugin || (this.css3DRenderPlugin = V(this.five)), e.stickType === "3DPoint" && !e.normal)
+        if (this.css3DRenderPlugin || (this.css3DRenderPlugin = I(this.five)), e.stickType === "3DPoint" && !e.normal)
           return console.error("updateRenderPlaneTag: 三维点标签缺少法向量！");
         const r = this.getPositions(e);
         if (!r)
@@ -330,13 +330,15 @@ class ti extends w {
    * @param model 模型
    */
   updateTagCss3DObjectMatrix(t, e) {
-    var d, g, T, M;
-    const o = (T = (g = (d = t.mergedConfig) == null ? void 0 : d.tag3DConfig) == null ? void 0 : g.ratio) != null ? T : 216e-5, i = (M = t.tag3DContentSvelte) == null ? void 0 : M.css3DInstance.css3DObject;
+    var d, g, T;
+    const o = (g = (d = t.config.tag3DConfig) == null ? void 0 : d.ratio) != null ? g : 216e-5, i = (T = t.tag3DContentSvelte) == null ? void 0 : T.css3DInstance.css3DObject;
     if (!i)
       return;
     const n = P(t) ? t.data.mediaPosition : t.position;
+    if (!n || n.length !== 4 || !Array.isArray(n[0]) || !Array.isArray(n[2]))
+      return;
     e.updateWorldMatrix(!1, !1);
-    const a = e.matrixWorld, r = new v().fromArray(n[0]), s = new v().fromArray(n[2]), u = G(r, s).add(new v(0, 0, 5e-4)), p = new D().setPosition(u), m = new D().makeScale(o, o, o), l = new D().multiply(a).multiply(p).multiply(m);
+    const a = e.matrixWorld, r = new v().fromArray(n[0]), s = new v().fromArray(n[2]), u = x(r, s).add(new v(0, 0, 5e-4)), p = new D().setPosition(u), m = new D().makeScale(o, o, o), l = new D().multiply(a).multiply(p).multiply(m);
     l.decompose(i.position, i.quaternion, i.scale);
     const c = i.opacityMesh;
     c && l.decompose(c.position, c.quaternion, c.scale);
@@ -344,7 +346,7 @@ class ti extends w {
   /** 添加模型标签 */
   addMediaModelTag(t) {
     return C(this, null, function* () {
-      const e = t.filter(I).map((o) => this.loadModel(o));
+      const e = t.filter(G).map((o) => this.loadModel(o));
       yield Promise.all(e), this.setModelMedialVisible(), this.updateRenderAllTags();
     });
   }
@@ -360,7 +362,7 @@ class ti extends w {
       const o = (e = this.five.getElement()) == null ? void 0 : e.parentElement;
       if (!o)
         return console.error("updateRenderPlaneTag: tag2DContainer not found");
-      this.TagContainerSvelte = new x({
+      this.TagContainerSvelte = new O({
         target: o,
         props: { hooks: this.hooks, tags: t, state: this.state, temporaryState: this.temporaryState, mediaStore: this.mediaStore }
       });
@@ -382,8 +384,8 @@ class ti extends w {
     });
   }
   disposeAllCSS3DContainer() {
-    for (const [t, e] of this.store.css3DRenderDisposer)
-      e == null || e.forEach((o) => o == null ? void 0 : o());
+    for (const [, t] of this.store.css3DRenderDisposer)
+      t == null || t.forEach((e) => e == null ? void 0 : e());
     this.store.css3DRenderDisposer = /* @__PURE__ */ new Map();
   }
   /**
@@ -401,5 +403,5 @@ class ti extends w {
   }
 }
 export {
-  ti as TagRender
+  ei as TagRender
 };

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

@@ -1,21 +1,21 @@
-import type { TagElement, TagContentType, StickType, TagId, TagConfig, PlaneTag, MediaStore } from '../typings';
+import type { TagInstance, TagContentType, StickType, TagId, TagConfig, PlaneTag, MediaStore } from '../typings';
 import * as THREE from 'three';
-import type { Tag, Tags, Point2DElement, Point3DElement, PlaneTagElement, PointTagElement, Point3DTag, ModelElement } from '../typings';
+import type { Tag, Tags, PointTagInstance, Point3DTag } from '../typings';
 import { TagCache } from './TagCache';
 import type { CSS3DRenderPluginExportType } from '../../CSS3DRenderPlugin';
 import type { Five } from '@realsee/five';
 import { FiveDomEvents } from '../../shared-utils/five/FiveDomEvents';
 export declare abstract class TagUtil extends TagCache {
-    tags: TagElement[];
+    tags: TagInstance[];
     config: Pick<Tags, 'globalConfig' | 'contentTypeConfig'>;
     protected mediaStore: MediaStore;
     /** css3DRenderPlugin */
     protected css3DRenderPlugin?: CSS3DRenderPluginExportType;
     protected store: {
         /** 清理函数数组 */
-        disposers: (() => any)[];
+        disposers: (() => void)[];
         visibleWithAnimation?: boolean;
-        css3DRenderDisposer: Map<TagId, (() => any)[]>;
+        css3DRenderDisposer: Map<TagId, (() => void)[]>;
         eventListenerDisposer?: () => void;
         resizeObserverDisposer?: () => void;
         resizeObserverDisposerAdding: boolean;
@@ -25,20 +25,20 @@ export declare abstract class TagUtil extends TagCache {
     protected domEvents: FiveDomEvents;
     private mouseInfo?;
     protected constructor(five: Five);
-    getTagById<C extends TagContentType = any, S extends StickType = any>(id: TagId): TagElement<C, S> | undefined;
+    getTagById<C extends TagContentType = TagContentType, S extends StickType = StickType>(id: TagId): TagInstance<C, S> | undefined;
     /** 暂停当前标签内进行的所有多媒体 */
     pauseCurrentMedia(): void;
     /**
      * @description: 获取merge后的配置
      * TODO: 缓存
      */
-    getTagConfig(tag: Tag<any, any>): TagConfig<"Model" | "Custom" | "Audio" | "Text" | "ImageText" | "Image" | "Video" | "Link" | "Sticker" | "VRLink" | "PanoLink" | "Marketing" | "MediaPlane" | "MediaModel" | "Unknown", StickType>;
+    getTagConfig(tag: Tag): TagConfig<"Model" | "Custom" | "Audio" | "Text" | "ImageText" | "Image" | "Video" | "Link" | "Sticker" | "VRLink" | "PanoLink" | "Marketing" | "MediaPlane" | "MediaModel" | "Unknown">;
     protected loadVideoFirstFrame(): void;
     protected updateTagConfig(params?: {
         force?: boolean;
     }): void;
-    protected can<T extends TagElement<any, any>>(action: 'show' | 'hide' | 'fold' | 'unfold', paramsTag: T): boolean;
-    protected getRenderType(tag: TagElement<any, any>): 'Dom' | 'Mesh' | 'BehindDom';
+    protected can<T extends Tag>(action: 'show' | 'hide' | 'fold' | 'unfold', paramsTag: T): boolean;
+    protected getRenderType(tag: TagInstance): 'Dom' | 'Mesh' | 'BehindDom';
     /**
      * @description: 获取角度
      */
@@ -46,18 +46,18 @@ export declare abstract class TagUtil extends TagCache {
     /**
      * @description: 获取距离
      */
-    protected getDistance(tag: Tag<any, any>, panoIndex?: number): number;
-    protected getPositions(tag: TagElement<any, any>): any;
+    protected getDistance(tag: TagInstance, panoIndex?: number): number;
+    protected getPositions(tag: TagInstance): [THREE.Vector3, THREE.Vector3, THREE.Vector3, THREE.Vector3] | [import("../typings").ArrayPosition, import("../typings").ArrayPosition, import("../typings").ArrayPosition, import("../typings").ArrayPosition];
     protected preventWhenMouseDown: () => false | void;
-    protected addObjectClickHandler(tag: TagElement<any, any>, object: THREE.Object3D | undefined, handler: (event: Event) => any): () => void;
-    protected getTagNormal(tag: TagElement<any, 'Plane'> | TagElement<any, 'Model'> | TagElement<any, '3DPoint'>): THREE.Vector3;
-    protected get filterPointTag(): PointTagElement[];
-    protected get filter2DPointTag(): Point2DElement[];
-    protected get filter3DPointTag(): Point3DElement[];
-    protected get filterImagePlane(): PlaneTagElement<"MediaPlane">[];
-    protected get filterMediaModel(): ModelElement<"MediaModel">[];
-    protected get filterModelTag(): ModelElement[];
-    protected get filterCSS3DTag(): (TagElement<any, "Plane"> | TagElement<any, "Model"> | TagElement<any, "3DPoint">)[];
+    protected addObjectClickHandler(tag: TagInstance, object: THREE.Object3D | undefined, handler: (event: Event) => any): () => void;
+    protected getTagNormal(tag: TagInstance): THREE.Vector3 | undefined;
+    protected get filterPointTag(): PointTagInstance[];
+    protected get filter2DPointTag(): TagInstance<"Model" | "Custom" | "Audio" | "Text" | "ImageText" | "Image" | "Video" | "Link" | "Sticker" | "VRLink" | "PanoLink" | "Marketing" | "MediaPlane" | "MediaModel" | "Unknown", "2DPoint">[];
+    protected get filter3DPointTag(): TagInstance<"Model" | "Custom" | "Audio" | "Text" | "ImageText" | "Image" | "Video" | "Link" | "Sticker" | "VRLink" | "PanoLink" | "Marketing" | "MediaPlane" | "MediaModel" | "Unknown", "3DPoint">[];
+    protected get filterImagePlane(): TagInstance<"MediaPlane", "Plane">[];
+    protected get filterMediaModel(): TagInstance<"MediaModel", "Model">[];
+    protected get filterModelTag(): TagInstance<"Model" | "Custom" | "Audio" | "Text" | "ImageText" | "Image" | "Video" | "Link" | "Sticker" | "VRLink" | "PanoLink" | "Marketing" | "MediaPlane" | "MediaModel" | "Unknown", "Model">[];
+    protected get filterCSS3DTag(): (TagInstance<"Model" | "Custom" | "Audio" | "Text" | "ImageText" | "Image" | "Video" | "Link" | "Sticker" | "VRLink" | "PanoLink" | "Marketing" | "MediaPlane" | "MediaModel" | "Unknown", "Plane"> | TagInstance<"Model" | "Custom" | "Audio" | "Text" | "ImageText" | "Image" | "Video" | "Link" | "Sticker" | "VRLink" | "PanoLink" | "Marketing" | "MediaPlane" | "MediaModel" | "Unknown", "Model"> | TagInstance<"Model" | "Custom" | "Audio" | "Text" | "ImageText" | "Image" | "Video" | "Link" | "Sticker" | "VRLink" | "PanoLink" | "Marketing" | "MediaPlane" | "MediaModel" | "Unknown", "3DPoint">)[];
     /**
      * @description 检查是否已经销毁
      * @returns isDisposed; 已经销毁返回 true，否则返回 false

package/libs/PanoTagPlugin/controller/TagUtil.js

@@ -2,8 +2,8 @@ var y = Object.defineProperty;
 var D = (c, u, e) => u in c ? y(c, u, { enumerable: !0, configurable: !0, writable: !0, value: e }) : c[u] = e;
 var l = (c, u, e) => (D(c, typeof u != "symbol" ? u + "" : u, e), e);
 import { objectAssignDeepExports as T } from "../../vendor/object-assign-deep/objectAssignDeep.js";
-import * as C from "three";
-import { DefaultConfig as P } from "../tag.config.js";
+import * as P from "three";
+import { DefaultConfig as C } from "../tag.config.js";
 import { anyPositionToVector3 as w, arrayPositionToVector3 as h } from "../../CSS3DRenderPlugin/utils/positionToVector3.js";
 import { planeNormal as p } from "../utils/planeNormal.js";
 import { tagPosition as E, getTagPosition as M } from "../utils/tagPosition.js";
@@ -11,9 +11,9 @@ import { normalPositionToPositions as k } from "../utils/normalPositionToPositio
 import { TagCache as b } from "./TagCache.js";
 import { writable as I } from "../../vendor/svelte/store/index.js";
 import { isIOSWX as A } from "../../shared-utils/device.js";
-import { isMediaPlaneTag as S, isMediaModelTag as g, isPlaneTag as V } from "../utils/tag/tagCheck.js";
-import { VideoPlane as F } from "../utils/model/mediaPlane.js";
-import { FiveDomEvents as L } from "../../shared-utils/five/FiveDomEvents.js";
+import { isMediaPlaneTag as S, isMediaModelTag as g, isPlaneTag as V, isPoint3DTag as F } from "../utils/tag/tagCheck.js";
+import { VideoPlane as L } from "../utils/model/mediaPlane.js";
+import { FiveDomEvents as R } from "../../shared-utils/five/FiveDomEvents.js";
 import "../../shared-utils/three/centerPoint.js";
 import "../../base/BasePlugin.js";
 import "../../shared-utils/Subscribe.js";
@@ -41,11 +41,11 @@ import "../Assets/Icon.js";
 import "../../shared-utils/three/getPositionsByObjectFit.js";
 import "../../shared-utils/three/FragmentTransparencyMaterial.js";
 import "../../shared-utils/threex/domevents/index.js";
-class De extends b {
+class Pe extends b {
   constructor(e) {
     super(e);
     l(this, "tags", []);
-    l(this, "config", P);
+    l(this, "config", C);
     l(this, "mediaStore", I({
       currentMediaElement: null
     }));
@@ -57,7 +57,7 @@ class De extends b {
       resizeObserverDisposerAdding: !1,
       css3DRenderDisposer: /* @__PURE__ */ new Map()
     });
-    l(this, "domEvents", new L(this.five));
+    l(this, "domEvents", new R(this.five));
     l(this, "mouseInfo");
     l(this, "preventWhenMouseDown", () => {
       var e;
@@ -67,7 +67,7 @@ class De extends b {
     this.five.on("wantsMoveToPano", this.preventWhenMouseDown), this.five.on("wantsTapGesture", this.preventWhenMouseDown), this.mediaStore.subscribe(({ currentMediaElement: i }) => {
       this.tags.forEach((t) => {
         var o;
-        if (t.mediaPlane instanceof F && i !== t.mediaPlane.videoInstance) {
+        if (t.mediaPlane instanceof L && i !== t.mediaPlane.videoInstance) {
           if (!((o = t.mediaPlane.videoInstance) != null && o.src) || i === t.mediaPlane.videoInstance)
             return;
           t.mediaPlane.pause();
@@ -131,10 +131,9 @@ class De extends b {
   updateTagConfig(e) {
     e != null && e.force && this.clearCache(), this.tags.forEach((i) => {
       const t = this.getTagConfig(i);
-      i.mergedConfig = t, i.data = T({}, i.data, t.initialData);
+      i.config = t, i.data = T({}, i.data, t.initialData);
     });
   }
-  // eslint-disable-next-line complexity
   can(e, i) {
     const t = i, o = this.getTagConfig(t);
     if (!o || typeof o != "object")
@@ -192,7 +191,7 @@ class De extends b {
       const s = E(e.position);
       if (!s)
         return;
-      const n = new C.Vector3().copy(r).sub(s), m = f.angleTo(n) * 180 / Math.PI;
+      const n = new P.Vector3().copy(r).sub(s), m = f.angleTo(n) * 180 / Math.PI;
       return o.angle = m, o.angle;
     }
   }
@@ -223,12 +222,8 @@ class De extends b {
       return e.position;
     if (g(e))
       return e.data.mediaPosition;
-    const i = e;
-    return k(
-      this.five.camera.position,
-      h(i.position),
-      h(i.normal)
-    );
+    if (F(e))
+      return k(this.five.camera.position, h(e.position), h(e.normal));
   }
   addObjectClickHandler(e, i, t) {
     if (!i || !this.domEvents)
@@ -307,7 +302,9 @@ class De extends b {
     return this.tags.filter((e) => e.stickType === "Model");
   }
   get filterCSS3DTag() {
-    return this.tags.filter((i) => i.stickType === "3DPoint" || i.stickType === "Plane" || i.stickType === "Model" && i.contentType === "MediaModel").filter((i) => {
+    return this.tags.filter(
+      (i) => i.stickType === "3DPoint" || i.stickType === "Plane" || i.stickType === "Model" && i.contentType === "MediaModel"
+    ).filter((i) => {
       const t = this.getRenderType(i);
       return t === "BehindDom" || t === "Dom";
     });
@@ -321,5 +318,5 @@ class De extends b {
   }
 }
 export {
-  De as TagUtil
+  Pe as TagUtil
 };

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

@@ -1,7 +1,7 @@
-import type { Tag, PartialDeep, TagId, Tags, TagElement, State, AddTagConfig, LoadTagConfig, ContentTypeConfigKey, TagConfig } from '../typings';
+import type { Tag, TagId, Tags, TagInstance, State, AddTagConfig, LoadTagConfig, ContentTypeConfigKey, TagConfig, PartialObjectDeep } from '../typings';
 import type { PickTagContentTypeInContentTypeConfigKey, TagContentType } from '..';
 import type { ArrayPosition } from '../typings';
-import { Five } from '@realsee/five';
+import { type Five } from '@realsee/five';
 import { TagRender } from './TagRender';
 export declare const pluginFlag: (name: string) => string;
 declare class PanoTagPluginController extends TagRender {
@@ -25,7 +25,7 @@ declare class PanoTagPluginController extends TagRender {
     /**
      * @description: 添加标签
      */
-    addTag(tag: Tag<any, any> | Tag<any, any>[], paramsConfig?: AddTagConfig): Promise<void>;
+    addTag(tag: Tag | Tag[], paramsConfig?: AddTagConfig): Promise<void>;
     /**
      * @description: 改变配置
      */
@@ -69,23 +69,23 @@ declare class PanoTagPluginController extends TagRender {
     /**
      * @description: 改变data
      */
-    changeDataById<C extends TagContentType = any>(id: TagId, data: PartialDeep<Tag<C>['data']>, deepMerge?: boolean): void;
+    changeDataById<C extends TagContentType = TagContentType>(id: TagId, data: PartialObjectDeep<Tag<C>['data']>, deepMerge?: boolean): void;
     /**
      * @description: 改变tag的stickType
      */
-    changeStickTypeById<C extends TagContentType = any>(id: TagId, data: PartialDeep<{
+    changeStickTypeById<C extends TagContentType = TagContentType>(id: TagId, data: PartialObjectDeep<{
         [P in keyof Pick<Tag<C>, 'stickType' | 'position' | 'normal' | 'data'>]: Tag[P];
     }>, deepMerge?: boolean): void;
     /**
      * @description: 改变tag任意属性
      */
-    changeTagById<C extends TagContentType = any>(id: TagId, tag: PartialDeep<Tag<C>>, deepMerge?: boolean): void;
+    changeTagById<C extends TagContentType = TagContentType>(id: TagId, tag: PartialObjectDeep<Tag<C>>, deepMerge?: boolean): void;
     /**
      * @description: 销毁tag
      */
     destroyTagById(id: TagId | TagId[]): void;
     /** 更改 tag 模型 */
-    changeTagModel: (tag: TagElement<any, 'Model'>, data: PartialDeep<Tag<'MediaModel'>['data']>) => Promise<void>;
+    changeTagModel: (tag: TagInstance<'Model', 'Model'> | TagInstance<'MediaModel', 'Model'>, data: PartialObjectDeep<Tag<'MediaModel'>['data']>) => Promise<void>;
     /**
      * @description: 设置 visible 和 unfolded
      */

package/libs/PanoTagPlugin/controller/index.js

@@ -2,7 +2,7 @@ var E = Object.defineProperty, F = Object.defineProperties;
 var w = Object.getOwnPropertyDescriptors;
 var C = Object.getOwnPropertySymbols;
 var U = Object.prototype.hasOwnProperty, I = Object.prototype.propertyIsEnumerable;
-var v = (h, a, e) => a in h ? E(h, a, { enumerable: !0, configurable: !0, writable: !0, value: e }) : h[a] = e, l = (h, a) => {
+var v = (h, a, e) => a in h ? E(h, a, { enumerable: !0, configurable: !0, writable: !0, value: e }) : h[a] = e, f = (h, a) => {
   for (var e in a || (a = {}))
     U.call(a, e) && v(h, e, a[e]);
   if (C)
@@ -11,7 +11,7 @@ var v = (h, a, e) => a in h ? E(h, a, { enumerable: !0, configurable: !0, writab
   return h;
 }, u = (h, a) => F(h, w(a));
 var g = (h, a, e) => (v(h, typeof a != "symbol" ? a + "" : a, e), e);
-var f = (h, a, e) => new Promise((t, i) => {
+var p = (h, a, e) => new Promise((t, i) => {
   var s = (r) => {
     try {
       n(e.next(r));
@@ -29,7 +29,7 @@ var f = (h, a, e) => new Promise((t, i) => {
 });
 import * as b from "three";
 import { Subscribe as B } from "@realsee/five";
-import { objectAssignDeepExports as p } from "../../vendor/object-assign-deep/objectAssignDeep.js";
+import { objectAssignDeepExports as c } from "../../vendor/object-assign-deep/objectAssignDeep.js";
 import { arrayPositionToVector3 as A } from "../../CSS3DRenderPlugin/utils/positionToVector3.js";
 import { addDebugPoints as R } from "../utils/addDebugPoints.js";
 import { isMediaModelTag as y, isModelTag as O } from "../utils/tag/tagCheck.js";
@@ -169,8 +169,8 @@ class ci extends N {
     /** debug */
     g(this, "debug");
     /** 更改 tag 模型 */
-    g(this, "changeTagModel", (e, t) => f(this, null, function* () {
-      e.data = p({}, e.data, t), yield this.loadModel(e), this.updateRenderAllTags();
+    g(this, "changeTagModel", (e, t) => p(this, null, function* () {
+      e.data = c({}, e.data, t), yield this.loadModel(e), this.updateRenderAllTags();
     }));
     g(this, "handleFiveInitAnimationEnded", () => {
       const e = this.five.getCurrentState().mode;
@@ -186,7 +186,7 @@ class ci extends N {
         typeof t == "object" && ((i = t.visibleFiveMode) != null && i.includes("Floorplan") || (s = t.visibleFiveMode) != null && s.includes("Mapview")) && (e.state.visible = this.getVisibleByFiveMode(e));
       }), this.updateRenderAllTags();
     });
-    this.params = p({}, { debug: !1, config: this.config }, l({}, t)), this.debug = this.params.debug, this.config = this.params.config, G(1, { namespace: V.PlayAudio });
+    this.params = c({}, { debug: !1, config: this.config }, f({}, t)), this.debug = this.params.debug, this.config = this.params.config, G(1, { namespace: V.PlayAudio });
     try {
       const i = window;
       Array.isArray(i.__PANOTAGPLUGIN_DEBUG_LIST__) || (i.__PANOTAGPLUGIN_DEBUG_LIST__ = []), i.__PANOTAGPLUGIN_DEBUG_LIST__.push(this), i.__PANOTAGPLUGIN_DEBUG__ = this;
@@ -197,9 +197,9 @@ class ci extends N {
    * @description: 加载数据
    */
   load(e, t) {
-    return f(this, null, function* () {
+    return p(this, null, function* () {
       var s, o;
-      this.clearTags(), console.info(M, " load:", { data: JSON.parse(JSON.stringify(e)) }), this.config = p({}, this.config, {
+      this.clearTags(), console.debug(M, " load:", { data: JSON.parse(JSON.stringify(e)) }), this.config = c({}, this.config, {
         globalConfig: (s = e.globalConfig) != null ? s : {},
         contentTypeConfig: (o = e.contentTypeConfig) != null ? o : {}
       });
@@ -217,19 +217,21 @@ class ci extends N {
    * @description: 添加标签
    */
   addTag(e, t) {
-    return f(this, null, function* () {
+    return p(this, null, function* () {
       const s = (Array.isArray(e) ? e : [e]).map((o) => {
-        var d;
+        var d, l;
         const n = this.getTagConfig(o);
-        return u(l({}, o), {
-          id: (d = o.id) != null ? d : z(),
-          data: p({}, n.initialData, o.data),
-          state: l({
+        return u(f({}, o), {
+          enabled: (d = o.enabled) != null ? d : !0,
+          id: (l = o.id) != null ? l : z(),
+          data: c({}, n.initialData, o.data),
+          state: f({
             visible: void 0,
             unfolded: !this.can("fold", o)
           }, n.initialState),
           hooks: new B(),
-          mergedConfig: n,
+          initialConfig: o.config,
+          config: n,
           unfold: () => this.changeUnfoldedById(o.id, !0),
           fold: () => this.changeUnfoldedById(o.id, !1),
           enable: () => this.changeEnabledById(o.id, !0),
@@ -237,7 +239,7 @@ class ci extends N {
           destroy: () => this.destroyTagById(o.id)
         });
       }).filter((o) => o.position);
-      return s.forEach(L), this.tags.push(...s), _(this.five).then(() => f(this, null, function* () {
+      return s.forEach(L), this.tags.push(...s), _(this.five).then(() => p(this, null, function* () {
         var o, n, r;
         this.store.eventListenerDisposer && ((n = (o = this.store).eventListenerDisposer) == null || n.call(o)), this.state.enabled && this.handleEnable(), this.addResizeListener(), this.clearUnusedPanelTag(), this.setVisibleAndUnfolded({ withAnimation: (r = t == null ? void 0 : t.withAnimation) != null ? r : !0 }).then(() => this.updateRenderAllTags()), this.updateRenderAllTags(), yield this.addMediaModelTag(s);
       }));
@@ -247,22 +249,22 @@ class ci extends N {
    * @description: 改变配置
    */
   changeConfig(e, t = !0) {
-    t ? this.config = p({}, this.config, e) : this.config = e, this.updateTagConfig({ force: !0 }), this.updateRenderAllTags();
+    t ? this.config = c({}, this.config, e) : this.config = e, this.updateTagConfig({ force: !0 }), this.updateRenderAllTags();
   }
   /**
    * @description: 改变全局配置
    */
   changeGlobalConfig(e, t = !0) {
-    t ? this.config.globalConfig = p({}, this.config.globalConfig, e) : this.config.globalConfig = e, this.updateTagConfig({ force: !0 }), this.updateRenderAllTags();
+    t ? this.config.globalConfig = c({}, this.config.globalConfig, e) : this.config.globalConfig = e, this.updateTagConfig({ force: !0 }), this.updateRenderAllTags();
   }
   /**
    * @description: 改变类型配置
    */
   changeContentTypeConfig(e, t, i = !0) {
-    this.config.contentTypeConfig || (this.config.contentTypeConfig = {}), i ? this.config.contentTypeConfig[e] = p({}, this.config.contentTypeConfig[e], t) : this.config.contentTypeConfig[e] = t, this.updateTagConfig({ force: !0 }), this.updateRenderAllTags();
+    this.config.contentTypeConfig || (this.config.contentTypeConfig = {}), i ? this.config.contentTypeConfig[e] = c({}, this.config.contentTypeConfig[e], t) : this.config.contentTypeConfig[e] = t, this.updateTagConfig({ force: !0 }), this.updateRenderAllTags();
   }
   show(e) {
-    return f(this, null, function* () {
+    return p(this, null, function* () {
       if (this.checkDisposed())
         return;
       const { userAction: t = !0, withAnimation: i = !1 } = e != null ? e : {};
@@ -270,7 +272,7 @@ class ci extends N {
     });
   }
   hide(e) {
-    return f(this, null, function* () {
+    return p(this, null, function* () {
       if (this.checkDisposed())
         return;
       const { userAction: t = !0, withAnimation: i = !1 } = e != null ? e : {};
@@ -292,7 +294,7 @@ class ci extends N {
   setState(e, t) {
     if (this.checkDisposed())
       return;
-    const { userAction: i = !0, visibleWithAnimation: s = !1 } = t, o = l({}, this.state);
+    const { userAction: i = !0, visibleWithAnimation: s = !1 } = t, o = f({}, this.state);
     this.state = Object.assign(this.state, e), this.store.visibleWithAnimation = s, o.visible !== this.state.visible && (e.visible ? this.handleShow() : this.handleHide()), o.enabled !== this.state.enabled && (e.enabled ? this.handleEnable() : this.handleDisable()), this.hooks.emit("stateChange", { state: this.state, prevState: o, userAction: i });
   }
   /**
@@ -334,7 +336,7 @@ class ci extends N {
    */
   changeDataById(e, t, i = !0) {
     const s = this.getTagById(e);
-    s && (i ? s.data = p({}, s.data, t) : s.data = l(l({}, s.data), t), this.clearUnusedPanelTag(), this.updateRenderAllTags());
+    s && (i ? s.data = c({}, s.data, t) : s.data = f(f({}, s.data), t), this.clearUnusedPanelTag(), this.updateRenderAllTags());
   }
   /**
    * @description: 改变tag的stickType
@@ -347,7 +349,7 @@ class ci extends N {
    */
   changeTagById(e, t, i = !0) {
     const s = this.getTagById(e);
-    t && (i ? p(s, t) : Object.assign(s, t), s != null && s.tag3DContentSvelte && (t != null && t.normal) && (s.tag3DContentSvelte.currentNormal = A(t.normal)), this.updateRenderAllTags(), this.clearUnusedPanelTag());
+    t && (i ? c(s, t) : Object.assign(s, t), s != null && s.tag3DContentSvelte && (t != null && t.normal) && (s.tag3DContentSvelte.currentNormal = A(t.normal)), this.updateRenderAllTags(), this.clearUnusedPanelTag());
   }
   /**
    * @description: 销毁tag
@@ -362,7 +364,7 @@ class ci extends N {
    * @description: 设置 visible 和 unfolded
    */
   setVisibleAndUnfolded() {
-    return f(this, arguments, function* ({ withAnimation: e } = { withAnimation: !1 }) {
+    return p(this, arguments, function* ({ withAnimation: e } = { withAnimation: !1 }) {
       if (this.isPanorama)
         return this.setVisible(), e ? new Promise((t) => {
           setTimeout(() => {
@@ -394,9 +396,9 @@ class ci extends N {
    * @description: 添加 cameraUpdate, panoArrived 等事件监听
    */
   addEventListener() {
-    const { five: e, hooks: t } = this, i = this.handleFiveWantsMoveToPano.bind(this), s = this.handleFiveModeChange.bind(this), o = this.handleFiveCameraUpdate.bind(this), n = this.handleFiveCameraUpdateDebounce(), r = this.handleFivePanoArrived.bind(this), d = this.loadVideoFirstFrame.bind(this), c = this.clickhandler.bind(this), m = this.five.currentMode;
-    return m && this.handleFiveModeChange(m), this.handleFivePanoArrived(), e.on("wantsMoveToPano", i), e.on("modeChange", s), e.on("initAnimationEnded", this.handleFiveInitAnimationEnded), e.on("modelShownFloorChange", this.handleFiveModelShownFloorChange), e.on("cameraUpdate", o), e.on("cameraUpdate", n), e.on("panoArrived", r), e.on("panoArrived", d), t.on("click", c), () => {
-      e.off("wantsMoveToPano", i), e.off("modeChange", s), e.off("initAnimationEnded", this.handleFiveInitAnimationEnded), e.off("modelShownFloorChange", this.handleFiveModelShownFloorChange), e.off("cameraUpdate", o), e.off("cameraUpdate", n), e.off("panoArrived", r), e.off("panoArrived", d), t.off("click", c), this.store.eventListenerDisposer = void 0;
+    const { five: e, hooks: t } = this, i = this.handleFiveWantsMoveToPano.bind(this), s = this.handleFiveModeChange.bind(this), o = this.handleFiveCameraUpdate.bind(this), n = this.handleFiveCameraUpdateDebounce(), r = this.handleFivePanoArrived.bind(this), d = this.loadVideoFirstFrame.bind(this), l = this.clickhandler.bind(this), m = this.five.currentMode;
+    return m && this.handleFiveModeChange(m), this.handleFivePanoArrived(), e.on("wantsMoveToPano", i), e.on("modeChange", s), e.on("initAnimationEnded", this.handleFiveInitAnimationEnded), e.on("modelShownFloorChange", this.handleFiveModelShownFloorChange), e.on("cameraUpdate", o), e.on("cameraUpdate", n), e.on("panoArrived", r), e.on("panoArrived", d), t.on("click", l), () => {
+      e.off("wantsMoveToPano", i), e.off("modeChange", s), e.off("initAnimationEnded", this.handleFiveInitAnimationEnded), e.off("modelShownFloorChange", this.handleFiveModelShownFloorChange), e.off("cameraUpdate", o), e.off("cameraUpdate", n), e.off("panoArrived", r), e.off("panoArrived", d), t.off("click", l), this.store.eventListenerDisposer = void 0;
     };
   }
   addResizeListener() {
@@ -438,7 +440,7 @@ class ci extends N {
   handleFiveWantsMoveToPano() {
     this.tags.forEach((e) => {
       const t = this.getTagConfig(e);
-      typeof t.visibleConfig == "object" && (t.visibleConfig.keep ? e.temporaryState = u(l({}, e.temporaryState), { visible: t.visibleConfig.keep === "visible" }) : e.temporaryState = u(l({}, e.temporaryState), { visible: !!t.visibleConfig.alwaysShowWhenMovePano }));
+      typeof t.visibleConfig == "object" && (t.visibleConfig.keep ? e.temporaryState = u(f({}, e.temporaryState), { visible: t.visibleConfig.keep === "visible" }) : e.temporaryState = u(f({}, e.temporaryState), { visible: !!t.visibleConfig.alwaysShowWhenMovePano }));
     }), this.updateTagContainerVisible();
   }
   /**
@@ -476,10 +478,10 @@ class ci extends N {
     this.updateRenderPointTag();
   }
   handleFivePanoArrived() {
-    return f(this, null, function* () {
+    return p(this, null, function* () {
       var e, t, i;
       this.setModelMedialVisible(), yield this.setVisibleAndUnfolded(), this.tags.forEach((s) => {
-        s.temporaryState = u(l({}, s.temporaryState), { visible: !0 });
+        s.temporaryState = u(f({}, s.temporaryState), { visible: !0 });
       }), (i = (t = (e = this.config) == null ? void 0 : e.globalConfig) == null ? void 0 : t.modelConfig) != null && i.autoLookAtEnabled && this.tags.filter(O).filter((s) => {
         var o, n;
         return (n = (o = s.config) == null ? void 0 : o.modelConfig) == null ? void 0 : n.autoLookAtEnabled;
@@ -491,9 +493,9 @@ class ci extends N {
         o.position.copy(n.position), o.quaternion.copy(n.quaternion);
         const r = this.five.camera.position;
         o.lookAt(r.clone().setY(o.position.y));
-        const d = n.quaternion.clone(), c = o.quaternion.clone(), m = x();
+        const d = n.quaternion.clone(), l = o.quaternion.clone(), m = x();
         m.onUpdate(({ progress: P }) => {
-          n.quaternion.copy(d.clone().slerp(c, P));
+          n.quaternion.copy(d.clone().slerp(l, P));
         }), m.play();
       }), this.store.visibleWithAnimation = !0, this.updateTagContainerVisible(), this.updateRenderAllTags();
     });
@@ -510,7 +512,7 @@ class ci extends N {
   }
   changeTagMode(e, t) {
     var i, s, o, n, r, d;
-    ((i = this.getTagConfig(e)) == null ? void 0 : i.renderType) !== "Mesh" && ((n = (o = (s = e.tag3DContentSvelte) == null ? void 0 : s.css3DInstance) == null ? void 0 : o.css3DObject) == null ? void 0 : n.mode) !== t && ((r = e.config) != null && r.tag3DConfig ? e.config.tag3DConfig.mode = t : e.config ? e.config.tag3DConfig = { mode: t } : e.config = { tag3DConfig: { mode: t } }, (d = this.store.css3DRenderDisposer.get(e.id)) == null || d.forEach((c) => c == null ? void 0 : c()), e.tag3DContentSvelte = void 0);
+    ((i = this.getTagConfig(e)) == null ? void 0 : i.renderType) !== "Mesh" && ((n = (o = (s = e.tag3DContentSvelte) == null ? void 0 : s.css3DInstance) == null ? void 0 : o.css3DObject) == null ? void 0 : n.mode) !== t && ((r = e.config) != null && r.tag3DConfig ? e.config.tag3DConfig.mode = t : e.config ? e.config.tag3DConfig = { mode: t } : e.config = { tag3DConfig: { mode: t } }, (d = this.store.css3DRenderDisposer.get(e.id)) == null || d.forEach((l) => l == null ? void 0 : l()), e.tag3DContentSvelte = void 0);
   }
 }
 export {