@realsee/dnalogel 3.23.3 → 3.24.1

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

@@ -11,6 +11,7 @@ import { WorkUtil } from '../../shared-utils/Utils/WorkUtil';
 export declare abstract class TagUtil extends TagCache {
     tags: TagInstance[];
     config: Pick<Tags, 'globalConfig' | 'contentTypeConfig'>;
+    tagsLengthWillUpdate: boolean;
     set workCode(workCode: string);
     get workCode(): string;
     workUtil: WorkUtil;
@@ -28,6 +29,11 @@ export declare abstract class TagUtil extends TagCache {
         disposed: boolean;
     };
     protected domEvents: FiveDomEvents;
+    private _cache_pointTag?;
+    private _cache_2DPointTag?;
+    private _cache_imagePlane?;
+    private _cache_mediaModel?;
+    private _cache_css3DTag?;
     protected constructor(five: Five);
     getTagById<C extends TagContentType = TagContentType, S extends StickType = StickType>(id: TagId): TagInstance<C, S> | undefined;
     /** 暂停当前标签内进行的所有多媒体 */

package/libs/PanoTagPlugin/controller/TagUtil.js

@@ -1,33 +1,33 @@
 var q = Object.defineProperty, K = Object.defineProperties;
 var Q = Object.getOwnPropertyDescriptors;
-var U = Object.getOwnPropertySymbols;
+var I = Object.getOwnPropertySymbols;
 var Y = Object.prototype.hasOwnProperty, Z = Object.prototype.propertyIsEnumerable;
-var w = (l, s, e) => s in l ? q(l, s, { enumerable: !0, configurable: !0, writable: !0, value: e }) : l[s] = e, b = (l, s) => {
+var _ = (c, s, e) => s in c ? q(c, s, { enumerable: !0, configurable: !0, writable: !0, value: e }) : c[s] = e, b = (c, s) => {
   for (var e in s || (s = {}))
-    Y.call(s, e) && w(l, e, s[e]);
-  if (U)
-    for (var e of U(s))
-      Z.call(s, e) && w(l, e, s[e]);
-  return l;
-}, R = (l, s) => K(l, Q(s));
-var p = (l, s, e) => (w(l, typeof s != "symbol" ? s + "" : s, e), e);
+    Y.call(s, e) && _(c, e, s[e]);
+  if (I)
+    for (var e of I(s))
+      Z.call(s, e) && _(c, e, s[e]);
+  return c;
+}, V = (c, s) => K(c, Q(s));
+var f = (c, s, e) => (_(c, typeof s != "symbol" ? s + "" : s, e), e);
 import { defaultGlobalConfig as ee } from "../typings/tag/TagConfig.js";
 import { objectAssignDeepExports as y } from "../../vendor/object-assign-deep/objectAssignDeep.js";
 import * as ie from "three";
 import { DefaultConfig as te } from "../tag.config.js";
 import { anyPositionToVector3 as C } from "../../shared-utils/positionToVector3.js";
-import { planeNormal as E } from "../utils/planeNormal.js";
-import { getTagCenterPosition as _ } from "../utils/tagPosition.js";
+import { planeNormal as w } from "../utils/planeNormal.js";
+import { getTagCenterPosition as R } from "../utils/tagPosition.js";
 import { normalPositionToPositions as oe } from "../utils/normalPositionToPositions.js";
-import { TagCache as re } from "./TagCache.js";
-import { writable as ne } from "../../vendor/svelte/store/index.js";
+import { TagCache as ne } from "./TagCache.js";
+import { writable as re } from "../../vendor/svelte/store/index.js";
 import { isIOSWX as se } from "../../shared-utils/device.js";
 import { Five as fe } from "@realsee/five";
-import { isMediaPlaneTag as le, isMediaModelTag as B, isPlaneTag as ae, isPoint3DTag as ce } from "../utils/tag/tagCheck.js";
+import { isMediaPlaneTag as ae, isMediaModelTag as B, isPlaneTag as ce, isPoint3DTag as le } from "../utils/tag/tagCheck.js";
 import { VideoPlane as de } from "../utils/model/mediaPlane.js";
-import { FiveDomEvents as ue } from "../../shared-utils/five/FiveDomEvents.js";
+import { FiveDomEvents as he } from "../../shared-utils/five/FiveDomEvents.js";
 import N from "../utils/tag/adaptConfig.js";
-import { isPanoramaLike as A, isModelLike as $ } from "../../shared-utils/five/mode.js";
+import { isPanoramaLike as E, isModelLike as $ } from "../../shared-utils/five/mode.js";
 import "hammerjs";
 import "../../vendor/@tweenjs/tween/dist/tween.esm.js.js";
 import "../../CSS3DRenderPlugin/utils/three/CSS3DRender.js";
@@ -35,7 +35,7 @@ import "../../CSS3DRenderPlugin/utils/generateBehindFiveElement.js";
 import { entries as z } from "../../shared-utils/typescript/entries.js";
 import { getUrlExt as H } from "../../shared-utils/url/getUrl.js";
 import { transformPosition as J } from "../../shared-utils/five/transformPosition.js";
-import { WorkUtil as me } from "../../shared-utils/Utils/WorkUtil.js";
+import { WorkUtil as ge } from "../../shared-utils/Utils/WorkUtil.js";
 import "../../shared-utils/three/centerPoint.js";
 import "../../base/BasePlugin.js";
 import "../../shared-utils/Subscribe.js";
@@ -62,34 +62,40 @@ import "../../shared-utils/three/FragmentTransparencyMaterial.js";
 import "../../shared-utils/three/getNormal.js";
 import "../../shared-utils/five/calculateThreeMouse.js";
 import "../../shared-utils/Utils/BaseUtil.js";
-class di extends re {
+class di extends ne {
   constructor(e) {
     super(e);
-    p(this, "tags", []);
-    p(this, "config", te);
-    p(this, "workUtil", new me(this.five));
-    p(this, "mediaStore", ne({
+    f(this, "tags", []);
+    f(this, "config", te);
+    f(this, "tagsLengthWillUpdate", !0);
+    f(this, "workUtil", new ge(this.five));
+    f(this, "mediaStore", re({
       currentMediaElement: null
     }));
     /** css3DRenderPlugin */
-    p(this, "css3DRenderPlugin");
-    p(this, "store", {
+    f(this, "css3DRenderPlugin");
+    f(this, "store", {
       disposers: [],
       disposed: !1,
       resizeObserverDisposerAdding: !1,
       css3DRenderDisposer: /* @__PURE__ */ new Map()
     });
-    p(this, "domEvents", new ue(this.five));
-    p(this, "loadVideoFirstFrame", () => {
+    f(this, "domEvents", new he(this.five));
+    f(this, "_cache_pointTag");
+    f(this, "_cache_2DPointTag");
+    f(this, "_cache_imagePlane");
+    f(this, "_cache_mediaModel");
+    f(this, "_cache_css3DTag");
+    f(this, "loadVideoFirstFrame", () => {
       se && this.hooks.emit("loadVideoFirstFrame");
     });
-    this.mediaStore.subscribe(({ currentMediaElement: i }) => {
-      this.tags.forEach((o) => {
-        var t;
-        if (o.mediaPlane instanceof de && i !== o.mediaPlane.videoInstance) {
-          if (!((t = o.mediaPlane.videoInstance) != null && t.src) || i === o.mediaPlane.videoInstance)
+    this.mediaStore.subscribe(({ currentMediaElement: t }) => {
+      this.tags.forEach((i) => {
+        var o;
+        if (i.mediaPlane instanceof de && t !== i.mediaPlane.videoInstance) {
+          if (!((o = i.mediaPlane.videoInstance) != null && o.src) || t === i.mediaPlane.videoInstance)
             return;
-          o.mediaPlane.pause();
+          i.mediaPlane.pause();
         }
       });
     });
@@ -101,12 +107,12 @@ class di extends re {
     return this.workUtil.workCode;
   }
   getTagById(e) {
-    const i = this.tags.find((o) => o.id === e);
-    if (!i) {
+    const t = this.tags.find((i) => i.id === e);
+    if (!t) {
       console.warn(`getTagById Error: can't find tag id: ${e}`);
       return;
     }
-    return i;
+    return t;
   }
   /** 暂停当前标签内进行的所有多媒体 */
   pauseCurrentMedia() {
@@ -115,10 +121,10 @@ class di extends re {
   /**
    * @description: 获取标签配置
    */
-  getTagConfig(e, i) {
-    var n, f, a;
-    const o = this.calculateTagConfig(e, { useCache: i == null ? void 0 : i.useCache }), t = (n = i == null ? void 0 : i.fiveMode) != null ? n : this.five.getCurrentState().mode, r = (f = o.configWithFiveMode) == null ? void 0 : f[t];
-    return (a = r != null ? r : o) != null ? a : {};
+  getTagConfig(e, t) {
+    var r, a, l;
+    const i = this.calculateTagConfig(e, { useCache: t == null ? void 0 : t.useCache }), o = (r = t == null ? void 0 : t.fiveMode) != null ? r : this.five.getCurrentState().mode, n = (a = i.configWithFiveMode) == null ? void 0 : a[o];
+    return (l = n != null ? n : i) != null ? l : {};
   }
   /**
    * @description 获取标签当前状态
@@ -128,158 +134,167 @@ class di extends re {
   }
   updateTagConfig() {
     this.clearCache(), this.tags.forEach((e) => {
-      var t;
-      const i = this.getTagConfig(e, { useCache: !1 });
-      e.computedConfig = i;
-      const o = this.getTagConfig(e);
-      if (e.config = o, e.config.initialData) {
-        const r = JSON.parse(JSON.stringify(e.data));
-        e.data = (t = o.initialData) != null && t.important ? y(e.data, r, o.initialData) : y(e.data, o.initialData, r);
+      var o;
+      const t = this.getTagConfig(e, { useCache: !1 });
+      e.computedConfig = t;
+      const i = this.getTagConfig(e);
+      if (e.config = i, e.config.initialData) {
+        const n = JSON.parse(JSON.stringify(e.data));
+        e.data = (o = i.initialData) != null && o.important ? y(e.data, n, i.initialData) : y(e.data, i.initialData, n);
       }
     });
   }
-  can(e, i) {
-    const o = i, t = this.getTagConfig(o);
-    if (!t || typeof t != "object")
+  can(e, t) {
+    const i = t, o = this.getTagConfig(i);
+    if (!o || typeof o != "object")
       return !0;
     if (e === "show" || e === "hide") {
-      if (!t.visibleConfig || typeof t.visibleConfig != "object")
+      if (!o.visibleConfig || typeof o.visibleConfig != "object")
         return !0;
-      if (e === "show" && t.visibleConfig.keep === "hidden" || e === "hide" && (t.visibleConfig.keep === "visible" || t.visibleConfig.alwaysShowWhenMovePano))
+      if (e === "show" && o.visibleConfig.keep === "hidden" || e === "hide" && (o.visibleConfig.keep === "visible" || o.visibleConfig.alwaysShowWhenMovePano))
         return !1;
     }
     if (e === "fold" || e === "unfold") {
-      if (!t.unfoldedConfig || typeof t.unfoldedConfig != "object")
+      if (!o.unfoldedConfig || typeof o.unfoldedConfig != "object")
         return !0;
-      if (e === "fold" && t.unfoldedConfig.keep === "unfolded" || e === "unfold" && t.unfoldedConfig.keep === "folded")
+      if (e === "fold" && o.unfoldedConfig.keep === "unfolded" || e === "unfold" && o.unfoldedConfig.keep === "folded")
         return !1;
     }
     return !0;
   }
   getRenderType(e) {
-    const i = (() => {
+    const t = (() => {
       if (e.stickType === "3DPoint")
         return "Dom";
-      const o = this.getTagConfig(e);
-      if (!o || typeof o != "object" || !o.renderType)
+      const i = this.getTagConfig(e);
+      if (!i || typeof i != "object" || !i.renderType)
         return;
-      const t = e.data.mediaData;
-      if (!(!t || t.length === 0) && o.renderType === "Mesh") {
-        if (le(e)) {
-          if (t.length === 1) {
-            if (t[0].type === "Video")
+      const o = e.data.mediaData;
+      if (!(!o || o.length === 0) && i.renderType === "Mesh") {
+        if (ae(e)) {
+          if (o.length === 1) {
+            if (o[0].type === "Video")
               return navigator.userAgent.toLowerCase().indexOf("firefox") > -1 && navigator.userAgent.toLowerCase().indexOf("mobile") > -1 ? "Dom" : "Mesh";
-            if (t[0].type === "Image")
-              return H(t[0].url) === "gif" ? "Dom" : "Mesh";
+            if (o[0].type === "Image")
+              return H(o[0].url) === "gif" ? "Dom" : "Mesh";
           }
         } else if (B(e))
-          return t.length === 1 && t[0].type === "Image" ? H(t[0].url) === "gif" ? "Dom" : "Mesh" : "BehindDom";
+          return o.length === 1 && o[0].type === "Image" ? H(o[0].url) === "gif" ? "Dom" : "Mesh" : "BehindDom";
       }
     })();
-    return i != null ? i : "Dom";
+    return t != null ? t : "Dom";
   }
   /**
    * @description: 获取角度
    */
-  getAngle(e, i) {
-    const o = i != null ? i : this.five.getCurrentState().panoIndex;
-    if (o === void 0)
-      throw new Error(`getAngle(): fivePanoIndex is ${o}`);
-    const t = this.getPanoIndexCache({ panoIndex: i, id: e.id });
-    if (t.angle !== void 0)
-      return t.angle;
+  getAngle(e, t) {
+    const i = t != null ? t : this.five.getCurrentState().panoIndex;
+    if (i === void 0)
+      throw new Error(`getAngle(): fivePanoIndex is ${i}`);
+    const o = this.getPanoIndexCache({ panoIndex: t, id: e.id });
+    if (o.angle !== void 0)
+      return o.angle;
     {
-      const r = this.workUtil.getObserverPosition(o);
-      if (r === void 0)
-        throw new Error(`getAngle(): observerPosition is ${r}`);
-      const n = (() => e.stickType === "3DPoint" ? C(e.normal) : E(e.position))();
-      if (!n)
+      const n = this.workUtil.getObserverPosition(i);
+      if (n === void 0)
+        throw new Error(`getAngle(): observerPosition is ${n}`);
+      const r = (() => e.stickType === "3DPoint" ? C(e.normal) : w(e.position))();
+      if (!r)
         return;
-      const f = _(e);
-      if (!f)
+      const a = R(e);
+      if (!a)
         return;
-      const a = new ie.Vector3().copy(r).sub(f), h = n.angleTo(a) * 180 / Math.PI;
-      return t.angle = h, t.angle;
+      const l = new ie.Vector3().copy(n).sub(a), m = r.angleTo(l) * 180 / Math.PI;
+      return o.angle = m, o.angle;
     }
   }
   /**
    * @description: 获取距离
    */
-  getDistance(e, i) {
-    const o = b(b({}, this.five.getCurrentState()), i), { panoIndex: t, mode: r } = o, n = A(r) ? this.getPanoIndexCache({ panoIndex: t, id: e.id }) : void 0;
-    if ((n == null ? void 0 : n.distance) !== void 0)
-      return n.distance;
-    const f = _(e);
-    if (!f)
+  getDistance(e, t) {
+    const i = b(b({}, this.five.getCurrentState()), t), { panoIndex: o, mode: n } = i, r = E(n) ? this.getPanoIndexCache({ panoIndex: o, id: e.id }) : void 0;
+    if ((r == null ? void 0 : r.distance) !== void 0)
+      return r.distance;
+    const a = R(e);
+    if (!a)
       return -1;
-    if (A(r)) {
-      const a = this.workUtil.getObserverPosition(t);
-      if (a === void 0)
+    if (E(n)) {
+      const l = this.workUtil.getObserverPosition(o);
+      if (l === void 0)
         return -1;
-      const h = a.distanceTo(f);
-      return n && (n.distance = h), h;
+      const m = l.distanceTo(a);
+      return r && (r.distance = m), m;
     }
-    if ($(r))
-      return this.five.camera.position.distanceTo(f);
+    if ($(n))
+      return this.five.camera.position.distanceTo(a);
   }
   getPositions(e) {
-    if (ae(e))
+    if (ce(e))
       return e.position;
     if (B(e))
       return e.data.mediaPosition;
-    if (ce(e))
+    if (le(e))
       return oe(this.five.camera.position, C(e.position), C(e.normal));
   }
-  addObjectClickHandler(e, i, o) {
-    if (!i || !this.domEvents)
+  addObjectClickHandler(e, t, i) {
+    if (!t || !this.domEvents)
       return () => {
       };
-    const t = () => !(!this.getCurrentVisibleState(e) || e.loading), r = (n) => {
-      if (!t())
+    const o = () => !(!this.getCurrentVisibleState(e) || e.loading), n = (r) => {
+      if (!o())
         return !1;
-      o(n.origDomEvent);
+      i(r.origDomEvent);
     };
-    return this.domEvents.addEventListener(i, "click", r), () => {
-      var n;
-      (n = this.domEvents) == null || n.removeEventListener(i, "click", r);
+    return this.domEvents.addEventListener(t, "click", n), () => {
+      var r;
+      (r = this.domEvents) == null || r.removeEventListener(t, "click", n);
     };
   }
   getTagNormal(e) {
     if (e.normal)
       return C(e.normal);
     if (e.stickType === "Plane")
-      return E(e.position);
+      return w(e.position);
     if (e.stickType === "Model")
-      return E(this.getPositions(e));
+      return w(this.getPositions(e));
   }
-  // TODO: 优化点：下面这些函数，调用比较频繁，可以按点位加缓存
   get filterPointTag() {
-    return this.tags.filter((e) => e.stickType === "2DPoint" || e.stickType === "3DPoint").filter((e) => e.position);
+    var t;
+    const e = this.tags.filter((i) => i.stickType === "2DPoint" || i.stickType === "3DPoint").filter((i) => i.position);
+    return this.tagsLengthWillUpdate && (this._cache_pointTag = e, this.tagsLengthWillUpdate = !1), (t = this._cache_pointTag) != null ? t : e;
   }
   get filter2DPointTag() {
-    return this.tags.filter((e) => e.stickType === "2DPoint").filter((e) => e.position);
+    var t;
+    const e = this.tags.filter((i) => i.stickType === "2DPoint").filter((i) => i.position);
+    return this.tagsLengthWillUpdate && (this._cache_2DPointTag = e, this.tagsLengthWillUpdate = !1), (t = this._cache_2DPointTag) != null ? t : e;
   }
   get filterImagePlane() {
-    return this.tags.filter(
-      (e) => e.contentType === "MediaPlane" && e.stickType === "Plane" && this.getRenderType(e) === "Mesh"
+    var t;
+    const e = this.tags.filter(
+      (i) => i.contentType === "MediaPlane" && i.stickType === "Plane" && this.getRenderType(i) === "Mesh"
     );
+    return this.tagsLengthWillUpdate && (this._cache_imagePlane = e, this.tagsLengthWillUpdate = !1), (t = this._cache_imagePlane) != null ? t : e;
   }
   get filterMediaModel() {
-    return this.tags.filter((e) => e.stickType === "Model" && e.contentType === "MediaModel");
+    var t;
+    const e = this.tags.filter((i) => i.stickType === "Model" && i.contentType === "MediaModel");
+    return this.tagsLengthWillUpdate && (this._cache_mediaModel = e, this.tagsLengthWillUpdate = !1), (t = this._cache_mediaModel) != null ? t : e;
   }
   get filterCSS3DTag() {
-    return this.tags.filter(
+    var t;
+    const e = this.tags.filter(
       (i) => i.stickType === "3DPoint" || i.stickType === "Plane" || i.stickType === "Model" && i.contentType === "MediaModel"
     ).filter((i) => {
       const o = this.getRenderType(i);
       return o === "BehindDom" || o === "Dom";
     });
+    return this.tagsLengthWillUpdate && (this._cache_css3DTag = e, this.tagsLengthWillUpdate = !1), (t = this._cache_css3DTag) != null ? t : e;
   }
   getTransformedPostion(e) {
     if (!e)
       return;
-    const i = this.workUtil.transform;
-    return Array.isArray(e) && e.length === 4 ? e.map(C).map((o) => J(o, i)) : J(C(e), i);
+    const t = this.workUtil.transform;
+    return Array.isArray(e) && e.length === 4 ? e.map(C).map((i) => J(i, t)) : J(C(e), t);
   }
   /**
    * @description 检查是否已经销毁
@@ -291,49 +306,49 @@ class di extends re {
   /**
    * @description: 获取merge后的配置
    */
-  calculateTagConfig(e, i) {
-    var O, j, S, x, F;
-    const o = (O = i == null ? void 0 : i.useCache) != null ? O : !0;
+  calculateTagConfig(e, t) {
+    var W, L, U, A, O;
+    const i = (W = t == null ? void 0 : t.useCache) != null ? W : !0;
     if (!e)
-      return (j = this.config.globalConfig) != null ? j : {};
-    if (o) {
-      if ((S = e == null ? void 0 : e.computedConfig) != null && S._isMerged)
+      return (L = this.config.globalConfig) != null ? L : {};
+    if (i) {
+      if ((U = e == null ? void 0 : e.computedConfig) != null && U._isMerged)
         return e.computedConfig;
-      if ((x = e == null ? void 0 : e.config) != null && x._isMerged)
+      if ((A = e == null ? void 0 : e.config) != null && A._isMerged)
         return e.config;
     }
-    const t = {}, r = {}, n = {};
-    this.config.contentTypeConfig && Object.entries(this.config.contentTypeConfig).forEach(([d, u]) => {
-      var W, L;
-      const c = d, D = c.split("-"), I = d.startsWith("["), T = I ? D[0].slice(1, -1) : void 0, g = I ? D.slice(1) : D, v = T ? ["PanoramaLike", "ModelLike"].includes(T) ? (W = r[T]) != null ? W : r[T] = {} : (L = n[T]) != null ? L : n[T] = {} : t;
-      if (!v[c]) {
-        if (g.length === 0 && (v[c] = u), g.length === 1) {
-          const [m] = g;
-          (e.contentType === m || m === "Any") && (v[c] = u);
+    const o = {}, n = {}, r = {};
+    this.config.contentTypeConfig && Object.entries(this.config.contentTypeConfig).forEach(([h, g]) => {
+      var S, x;
+      const d = h, D = d.split("-"), j = h.startsWith("["), T = j ? D[0].slice(1, -1) : void 0, p = j ? D.slice(1) : D, v = T ? ["PanoramaLike", "ModelLike"].includes(T) ? (S = n[T]) != null ? S : n[T] = {} : (x = r[T]) != null ? x : r[T] = {} : o;
+      if (!v[d]) {
+        if (p.length === 0 && (v[d] = g), p.length === 1) {
+          const [u] = p;
+          (e.contentType === u || u === "Any") && (v[d] = g);
         }
-        if (g.length === 2) {
-          const [m = "Any", P = "Any"] = g;
-          m === "Mixin" && e.contentType === P && (v[c] = u), (e.stickType === m || m === "Any") && (e.contentType === P || P === "Any") && (v[c] = u);
+        if (p.length === 2) {
+          const [u = "Any", P = "Any"] = p;
+          u === "Mixin" && e.contentType === P && (v[d] = g), (e.stickType === u || u === "Any") && (e.contentType === P || P === "Any") && (v[d] = g);
         }
-        if (g.length === 3) {
-          const [m = "Any", P, X] = g;
+        if (p.length === 3) {
+          const [u = "Any", P, X] = p;
           if (P === "Audio" && e.contentType === "Audio") {
-            const V = e;
-            (V.stickType === m || m === "Any") && V.data.appearance === X && (v[c] = u);
+            const F = e;
+            (F.stickType === u || u === "Any") && F.data.appearance === X && (v[d] = g);
           }
         }
       }
     });
-    const f = (F = e.initialConfig) != null ? F : {}, a = y({}, ee, this.config.globalConfig, ...Object.values(t)), h = y({}, a, f), M = {}, G = Object.values(fe.Mode);
-    z(r).forEach(([d, u]) => {
-      G.forEach((c) => {
-        (d === "PanoramaLike" && A(c) || d === "ModelLike" && $(c)) && (M[c] = y({}, a, ...Object.values(u), f, { _isMerged: !0 }));
+    const a = (O = e.initialConfig) != null ? O : {}, l = y({}, ee, this.config.globalConfig, ...Object.values(o)), m = y({}, l, a), M = {}, G = Object.values(fe.Mode);
+    z(n).forEach(([h, g]) => {
+      G.forEach((d) => {
+        (h === "PanoramaLike" && E(d) || h === "ModelLike" && $(d)) && (M[d] = y({}, l, ...Object.values(g), a, { _isMerged: !0 }));
       });
-    }), z(n).forEach(([d, u]) => {
-      M[d] = y({}, a, ...Object.values(u), f, { _isMerged: !0 });
+    }), z(r).forEach(([h, g]) => {
+      M[h] = y({}, l, ...Object.values(g), a, { _isMerged: !0 });
     });
-    const k = R(b({}, h), { configWithFiveMode: M });
-    return N(k), Object.values(M).forEach((d) => N(d)), k._isMerged = !0, k;
+    const k = V(b({}, m), { configWithFiveMode: M });
+    return N(k), Object.values(M).forEach((h) => N(h)), k._isMerged = !0, k;
   }
 }
 export {