@realsee/dnalogel 3.81.9 → 3.81.10-alpha.0

package/libs/PanoTagPlugin/controller/Tag/ModelTag.js

@@ -59,6 +59,7 @@ import "../../../shared-utils/CSS3DRender/OpacityMesh.js";
 import "../../../shared-utils/three/centerPoint.js";
 import "../../../shared-utils/isNil.js";
 import "@realsee/five";
+import "../../../shared-utils/audioFocus.js";
 import "../../../shared-utils/three/loadTexture.js";
 import "../../../shared-utils/three/Quadrangle.js";
 import "../../../shared-utils/math/pointsIsRectangle.js";
@@ -204,7 +205,7 @@ import "../../../shared-utils/five/getFloorIndex.js";
 import "../../../shared-utils/safeObj.js";
 import "../../utils/Cache.js";
 import "../../../shared-utils/promise/withResolvers.js";
-class rr extends R {
+class mr extends R {
   constructor(t, e) {
     super(t, e);
     v(this, "loading", !1);
@@ -298,5 +299,5 @@ class rr extends R {
   }
 }
 export {
-  rr as ModelTag
+  mr as ModelTag
 };

package/libs/PanoTagPlugin/controller/Tag/PlaneTag.js

@@ -2,36 +2,36 @@ var j = Object.defineProperty, V = Object.defineProperties;
 var k = Object.getOwnPropertyDescriptors;
 var F = Object.getOwnPropertySymbols;
 var M = Object.prototype.hasOwnProperty, w = Object.prototype.propertyIsEnumerable;
-var b = (c, d, t) => d in c ? j(c, d, { enumerable: !0, configurable: !0, writable: !0, value: t }) : c[d] = t, I = (c, d) => {
+var b = (u, d, t) => d in u ? j(u, d, { enumerable: !0, configurable: !0, writable: !0, value: t }) : u[d] = t, I = (u, d) => {
   for (var t in d || (d = {}))
-    M.call(d, t) && b(c, t, d[t]);
+    M.call(d, t) && b(u, t, d[t]);
   if (F)
     for (var t of F(d))
-      w.call(d, t) && b(c, t, d[t]);
-  return c;
-}, S = (c, d) => V(c, k(d));
-var v = (c, d, t) => (b(c, typeof d != "symbol" ? d + "" : d, t), t);
-var C = (c, d, t) => new Promise((e, i) => {
-  var o = (r) => {
+      w.call(d, t) && b(u, t, d[t]);
+  return u;
+}, S = (u, d) => V(u, k(d));
+var v = (u, d, t) => (b(u, typeof d != "symbol" ? d + "" : d, t), t);
+var C = (u, d, t) => new Promise((e, i) => {
+  var o = (a) => {
     try {
-      p(t.next(r));
-    } catch (a) {
-      i(a);
+      p(t.next(a));
+    } catch (n) {
+      i(n);
     }
-  }, l = (r) => {
+  }, l = (a) => {
     try {
-      p(t.throw(r));
-    } catch (a) {
-      i(a);
+      p(t.throw(a));
+    } catch (n) {
+      i(n);
     }
-  }, p = (r) => r.done ? e(r.value) : Promise.resolve(r.value).then(o, l);
-  p((t = t.apply(c, d)).next());
+  }, p = (a) => a.done ? e(a.value) : Promise.resolve(a.value).then(o, l);
+  p((t = t.apply(u, d)).next());
 });
 import { CONST as _ } from "../../../shared-utils/constants.js";
-import { CSS3DObjectPlus as O } from "../../../shared-utils/CSS3DRender/CSS3DObject.js";
+import { CSS3DObjectPlus as A } from "../../../shared-utils/CSS3DRender/CSS3DObject.js";
 import { anyPositionToVector3 as E, arrayPositionToVector3 as P } from "../../../shared-utils/positionToVector3.js";
 import * as x from "three";
-import { planeNormal as A } from "../../utils/planeNormal.js";
+import { planeNormal as O } from "../../utils/planeNormal.js";
 import { centerPoint as H } from "../../../shared-utils/three/centerPoint.js";
 import { VideoPlane as G, ImagePlane as L } from "../../utils/model/mediaPlane.js";
 import B from "../../Components/Tag/index.js";
@@ -58,6 +58,7 @@ import { getFloorMesh as q } from "../../../shared-utils/five/getFloorMesh.js";
 import "../../../shared-utils/even.js";
 import "../../../shared-utils/CSS3DRender/OpacityMesh.js";
 import "../../../shared-utils/isNil.js";
+import "../../../shared-utils/audioFocus.js";
 import "../../../shared-utils/three/loadTexture.js";
 import "../../../shared-utils/three/Quadrangle.js";
 import "../../../shared-utils/math/pointsIsRectangle.js";
@@ -302,7 +303,7 @@ import "../../../Sculpt/Objects/Line/index.js";
 import "../../../Sculpt/Editors/RectangleMeshEditor.js";
 import "../../../Sculpt/utils/sortPositionsByCameraPosition.js";
 const Z = /* @__PURE__ */ new Map(), z = /* @__PURE__ */ new Map();
-class tn extends N {
+class ia extends N {
   constructor(t, e) {
     super(t, e);
     v(this, "_floorIndex");
@@ -328,8 +329,8 @@ class tn extends N {
     this._floorIndexDirty = !0;
   }
   applyVisible() {
-    var e, i, o, l, p, r;
-    this.computeRenderType() === "Mesh" ? (this.initialSculpt(), ((i = (e = this.data.mediaData) == null ? void 0 : e[0]) == null ? void 0 : i.type) === "Video" ? this.renderVideoPlane() : ((l = (o = this.data.mediaData) == null ? void 0 : o[0]) == null ? void 0 : l.type) === "Image" ? this.renderImagePlane() : this.renderEmptyPlane()) : ((p = this.tag3DContentSvelte) == null || p.svelteApp.$set({ tag: this, state: this.plugin.state, temporaryState: this.plugin.temporaryState }), (r = this.tag3DContentSvelte) != null && r.css3DInstance && (this.tag3DContentSvelte.css3DInstance.visible = this.visible, this.five.needsRender = !0)), this.syncEditorAuxiliaryVisibility();
+    var e, i, o, l, p, a;
+    this.computeRenderType() === "Mesh" ? (this.initialSculpt(), ((i = (e = this.data.mediaData) == null ? void 0 : e[0]) == null ? void 0 : i.type) === "Video" ? this.renderVideoPlane() : ((l = (o = this.data.mediaData) == null ? void 0 : o[0]) == null ? void 0 : l.type) === "Image" ? this.renderImagePlane() : this.renderEmptyPlane()) : ((p = this.tag3DContentSvelte) == null || p.svelteApp.$set({ tag: this, state: this.plugin.state, temporaryState: this.plugin.temporaryState }), (a = this.tag3DContentSvelte) != null && a.css3DInstance && (this.tag3DContentSvelte.css3DInstance.visible = this.visible, this.five.needsRender = !0)), this.syncEditorAuxiliaryVisibility();
   }
   set(t, e = !0) {
     super.set(t, e), T(this.five).then(() => {
@@ -337,63 +338,63 @@ class tn extends N {
     });
   }
   setData(...t) {
-    var i, o, l, p, r;
-    super.setData(...t), this.computeRenderType() === "Mesh" ? (((o = (i = this.data.mediaData) == null ? void 0 : i[0]) == null ? void 0 : o.type) === "Video" ? this.renderVideoPlane() : ((p = (l = this.data.mediaData) == null ? void 0 : l[0]) == null ? void 0 : p.type) === "Image" ? this.renderImagePlane() : this.renderEmptyPlane(), this.mediaPlane && (this.mediaPlane.opacity = this.opacity)) : (r = this.tag3DContentSvelte) == null || r.svelteApp.$set({ tag: this });
+    var i, o, l, p, a;
+    super.setData(...t), this.computeRenderType() === "Mesh" ? (((o = (i = this.data.mediaData) == null ? void 0 : i[0]) == null ? void 0 : o.type) === "Video" ? this.renderVideoPlane() : ((p = (l = this.data.mediaData) == null ? void 0 : l[0]) == null ? void 0 : p.type) === "Image" ? this.renderImagePlane() : this.renderEmptyPlane(), this.mediaPlane && (this.mediaPlane.opacity = this.opacity)) : (a = this.tag3DContentSvelte) == null || a.svelteApp.$set({ tag: this });
   }
   /** 计算楼层索引 */
   computeFloorIndex() {
-    var p, r;
+    var p, a;
     const t = /* @__PURE__ */ new Map();
-    ((r = (p = this.five.works.getWork(this.workUtil.workCode)) == null ? void 0 : p.observers) != null ? r : []).forEach((a) => {
+    ((a = (p = this.five.works.getWork(this.workUtil.workCode)) == null ? void 0 : p.observers) != null ? a : []).forEach((n) => {
       var h;
-      const m = (h = a.floorIndex) != null ? h : 0;
+      const m = (h = n.floorIndex) != null ? h : 0;
       if (!t.has(m)) {
-        const u = q(this.five, m);
-        u.isEmpty() || t.set(m, u);
+        const f = q(this.five, m);
+        f.isEmpty() || t.set(m, f);
       }
     });
     const i = H(...this.position.map(E)), o = [], l = [];
-    if (t.forEach((a, m) => {
-      l.push({ floorIndex: m, box: a }), a.containsPoint(i) && o.push({ floorIndex: m, box: a });
+    if (t.forEach((n, m) => {
+      l.push({ floorIndex: m, box: n }), n.containsPoint(i) && o.push({ floorIndex: m, box: n });
     }), o.length === 1)
       return o[0].floorIndex;
     if (o.length > 1) {
-      let a = 1 / 0, m = o[0].floorIndex;
-      return o.forEach(({ floorIndex: h, box: u }) => {
+      let n = 1 / 0, m = o[0].floorIndex;
+      return o.forEach(({ floorIndex: h, box: f }) => {
         const s = new x.Vector3();
-        u.getCenter(s);
-        const n = i.distanceTo(s);
-        n < a && (a = n, m = h);
+        f.getCenter(s);
+        const r = i.distanceTo(s);
+        r < n && (n = r, m = h);
       }), m;
     }
     if (l.length > 0) {
-      let a = 1 / 0, m = l[0].floorIndex;
-      return l.forEach(({ floorIndex: h, box: u }) => {
+      let n = 1 / 0, m = l[0].floorIndex;
+      return l.forEach(({ floorIndex: h, box: f }) => {
         const s = new x.Vector3();
-        u.getCenter(s);
-        const n = i.distanceTo(s);
-        n < a && (a = n, m = h);
+        f.getCenter(s);
+        const r = i.distanceTo(s);
+        r < n && (n = r, m = h);
       }), m;
     }
   }
   loadModel() {
     return C(this, null, function* () {
-      var e, i, o, l, p, r;
+      var e, i, o, l, p, a;
       if (yield T(this.five), this.computeRenderType() === "Mesh")
         this.initialSculpt(), ((i = (e = this.data.mediaData) == null ? void 0 : e[0]) == null ? void 0 : i.type) === "Video" ? this.renderVideoPlane() : ((l = (o = this.data.mediaData) == null ? void 0 : o[0]) == null ? void 0 : l.type) === "Image" ? this.renderImagePlane() : this.renderEmptyPlane();
       else {
         $(this.five);
-        const a = this.position.map(E);
-        (r = (p = this.tag3DContentSvelte) == null ? void 0 : p.dispose) == null || r.call(p);
+        const n = this.position.map(E);
+        (a = (p = this.tag3DContentSvelte) == null ? void 0 : p.dispose) == null || a.call(p);
         const m = document.createElement("div");
         m.classList.add("tag-media-container");
-        const h = I({ mode: "front", cornerPoints: a, container: m }, this.config.tag3DConfig), u = this.computeRenderType() === "BehindDom" || h.mode === "behind" ? "behind" : "front", s = new O(S(I({}, h), { mode: u })), n = this.computeNormal();
-        s.position.add(n.clone().setLength(_.Z_FIGHTING_OFFSET)), this.plugin.group.add(s);
+        const h = I({ mode: "front", cornerPoints: n, container: m }, this.config.tag3DConfig), f = this.computeRenderType() === "BehindDom" || h.mode === "behind" ? "behind" : "front", s = new A(S(I({}, h), { mode: f })), r = this.computeNormal();
+        s.position.add(r.clone().setLength(_.Z_FIGHTING_OFFSET)), this.plugin.group.add(s);
         let y;
         s.mode === "behind" && this.config.clickable !== !1 && (y = this.addObjectClickHandler(this, s, (g) => {
           this.plugin.hooks.emit("click", { event: g, target: "TagContent", tag: this });
         }));
-        const f = new B({
+        const c = new B({
           target: m,
           props: {
             tag: this,
@@ -405,15 +406,15 @@ class tn extends N {
           }
         });
         this.tag3DContentSvelte = {
-          svelteApp: f,
+          svelteApp: c,
           domContainer: {
             css3DObject: s
           },
           css3DInstance: s,
-          initialNormal: n,
-          currentNormal: n,
+          initialNormal: r,
+          currentNormal: r,
           dispose: () => {
-            f.$destroy(), s.dispose(), y == null || y();
+            c.$destroy(), s.dispose(), y == null || y();
           }
         }, this.five.needsRender = !0;
       }
@@ -478,20 +479,21 @@ class tn extends N {
     this.rectanglePlane.visible = !0, t == null || t.show(), this.five.needsRender = !0;
   }
   renderVideoPlane() {
-    var m, h, u;
+    var m, h, f;
     const t = this.data.mediaData[0];
     if (!t)
       return;
     const { url: e } = t;
     if (!e)
       return;
-    const i = (m = this.data.objectFit) != null ? m : "contain", o = this.currentVisible, l = (() => !!(this.mediaPlane && !o))(), p = (() => !!(!this.mediaPlane && o))(), r = (() => !!(this.mediaPlane && (this.mediaPlane.src !== e || this.mediaPlane.objectFit !== i)))();
-    (l || r) && this.mediaPlane && (this.plugin.imagePlaneGroup.remove(this.mediaPlane), this.mediaPlane.dispose(), this.mediaPlane.removeFromParent(), this.mediaPlane = void 0);
-    const a = (() => !!(this.mediaPlane && this.mediaPlane.objectFit && this.mediaPlane.objectFit !== i))();
-    if (p || r) {
+    const i = (m = this.data.objectFit) != null ? m : "contain", o = this.currentVisible, l = (() => !!(this.mediaPlane && !o))(), p = (() => !!(!this.mediaPlane && o))(), a = (() => !!(this.mediaPlane && (this.mediaPlane.src !== e || this.mediaPlane.objectFit !== i)))();
+    (l || a) && this.mediaPlane && (this.plugin.imagePlaneGroup.remove(this.mediaPlane), this.mediaPlane.dispose(), this.mediaPlane.removeFromParent(), this.mediaPlane = void 0);
+    const n = (() => !!(this.mediaPlane && this.mediaPlane.objectFit && this.mediaPlane.objectFit !== i))();
+    if (p || a) {
       let s = this.position.map(P);
       this.rectanglePlane && (s = this.rectanglePlane.data.points.map(P));
-      const n = new G(e, s, {
+      const r = new G(e, s, {
+        audioFocus: this.audioFocus,
         videoCoverSrc: t.videoCoverUrl,
         playButton: this.data.playIcon,
         paused: !((h = this.data.autoplayConfig) != null && h.autoplayVideo),
@@ -501,34 +503,34 @@ class tn extends N {
         domEvents: this.plugin.domEvents,
         opacity: this.opacity
       });
-      this.plugin.domEvents.addAutoBindEventListener(n, "click", (f) => {
+      r.onDispose(this.bindAudioFocus((c) => r.setAudioFocus(c))), this.plugin.domEvents.addAutoBindEventListener(r, "click", (c) => {
         var g, D;
-        !((g = n.videoInstance) != null && g.paused) && ((D = n.videoInstance) == null ? void 0 : D.muted) === !1 && this.plugin.hooks.emit("playStateChange", {
-          event: f,
+        !((g = r.videoInstance) != null && g.paused) && ((D = r.videoInstance) == null ? void 0 : D.muted) === !1 && this.plugin.hooks.emit("playStateChange", {
+          event: c,
           state: "playing",
           tag: this,
-          mediaInstance: n.videoInstance
+          mediaInstance: r.videoInstance
         });
-      }), n.onVideoReady = (f) => {
-        f.addEventListener("play", (g) => {
-          this.plugin.mediaStore.set({ currentMediaElement: n.videoInstance }), this.plugin.hooks.emit("playStateChange", { event: g, state: "playing", tag: this, mediaInstance: n.videoInstance });
-        }), f.addEventListener("pause", (g) => {
-          this.plugin.hooks.emit("playStateChange", { event: g, state: "paused", tag: this, mediaInstance: n.videoInstance });
-        }), f.addEventListener("ended", (g) => {
-          this.plugin.hooks.emit("playStateChange", { event: g, state: "paused", tag: this, mediaInstance: n.videoInstance });
+      }), r.onVideoReady = (c) => {
+        c.addEventListener("play", (g) => {
+          this.plugin.mediaStore.set({ currentMediaElement: r.videoInstance }), this.plugin.hooks.emit("playStateChange", { event: g, state: "playing", tag: this, mediaInstance: r.videoInstance });
+        }), c.addEventListener("pause", (g) => {
+          this.plugin.hooks.emit("playStateChange", { event: g, state: "paused", tag: this, mediaInstance: r.videoInstance });
+        }), c.addEventListener("ended", (g) => {
+          this.plugin.hooks.emit("playStateChange", { event: g, state: "paused", tag: this, mediaInstance: r.videoInstance });
         });
       };
-      const y = (f) => (this.five.on("renderFrame", f), () => this.five.off("renderFrame", f));
-      n.initialRenderHooks(y), this.mediaPlane = n, this.play = () => n.play(), this.pause = () => n.pause(), this.plugin.imagePlaneGroup.add(this.mediaPlane);
+      const y = (c) => (this.five.on("renderFrame", c), () => this.five.off("renderFrame", c));
+      r.initialRenderHooks(y), this.mediaPlane = r, this.play = (c = "auto") => r.play(!1, c), this.pause = () => r.pause(), this.plugin.imagePlaneGroup.add(this.mediaPlane);
     }
-    if (a) {
+    if (n) {
       const s = this.rectanglePlane.data.points.map(P);
-      (u = this.mediaPlane) == null || u.changePointsOrParams({ cornerPoints: s, params: { objectFit: i } });
+      (f = this.mediaPlane) == null || f.changePointsOrParams({ cornerPoints: s, params: { objectFit: i } });
     }
     this.five.needsRender = !0;
   }
   renderImagePlane() {
-    var h, u;
+    var h, f;
     const t = this.data.mediaData[0], e = (h = this.data.objectFit) != null ? h : "contain";
     if (!t)
       return;
@@ -536,8 +538,8 @@ class tn extends N {
     if (!i)
       return;
     let o = this.position.map(P);
-    const l = this.currentVisible, p = (() => !!(this.mediaPlane && !l))(), r = (() => !!(!this.mediaPlane && l))(), a = (() => !!(this.mediaPlane && this.mediaPlane.src !== i))(), m = (() => !!(this.mediaPlane && this.mediaPlane.objectFit && this.mediaPlane.objectFit !== e))();
-    if ((p || a) && this.mediaPlane && (this.plugin.imagePlaneGroup.remove(this.mediaPlane), this.mediaPlane.dispose(), this.mediaPlane.removeFromParent(), this.mediaPlane = void 0), (r || a) && (this.rectanglePlane && (o = this.rectanglePlane.data.points.map(P)), this.mediaPlane = new L(i, o, { objectFit: this.data.objectFit, opacity: this.opacity }), this.getConfig().clickable !== !1 && this.plugin.domEvents.addAutoBindEventListener(
+    const l = this.currentVisible, p = (() => !!(this.mediaPlane && !l))(), a = (() => !!(!this.mediaPlane && l))(), n = (() => !!(this.mediaPlane && this.mediaPlane.src !== i))(), m = (() => !!(this.mediaPlane && this.mediaPlane.objectFit && this.mediaPlane.objectFit !== e))();
+    if ((p || n) && this.mediaPlane && (this.plugin.imagePlaneGroup.remove(this.mediaPlane), this.mediaPlane.dispose(), this.mediaPlane.removeFromParent(), this.mediaPlane = void 0), (a || n) && (this.rectanglePlane && (o = this.rectanglePlane.data.points.map(P)), this.mediaPlane = new L(i, o, { objectFit: this.data.objectFit, opacity: this.opacity }), this.getConfig().clickable !== !1 && this.plugin.domEvents.addAutoBindEventListener(
       this.mediaPlane,
       "click",
       (s) => {
@@ -546,7 +548,7 @@ class tn extends N {
       { noEmitWhenHide: !0 }
     ), this.plugin.imagePlaneGroup.add(this.mediaPlane)), m) {
       const s = this.rectanglePlane.data.points.map(P);
-      (u = this.mediaPlane) == null || u.changePointsOrParams({ cornerPoints: s, params: { objectFit: e } });
+      (f = this.mediaPlane) == null || f.changePointsOrParams({ cornerPoints: s, params: { objectFit: e } });
     }
     this.five.needsRender = !0;
   }
@@ -554,9 +556,9 @@ class tn extends N {
     this.mediaPlane && (this.plugin.imagePlaneGroup.remove(this.mediaPlane), this.mediaPlane.dispose(), this.mediaPlane.removeFromParent(), this.mediaPlane = void 0);
   }
   computeNormal() {
-    return A(this.position);
+    return O(this.position);
   }
 }
 export {
-  tn as PlaneTag
+  ia as PlaneTag
 };

package/libs/PanoTagPlugin/controller/TagRender.js

@@ -13,6 +13,7 @@ import "../../vendor/svelte/internal/index.js";
 import "../../shared-utils/device.js";
 import "@realsee/five";
 import "../utils/model/mediaPlane.js";
+import "../../shared-utils/audioFocus.js";
 import "../../shared-utils/three/centerPoint.js";
 import "../../shared-utils/three/loadTexture.js";
 import "../../shared-utils/three/Quadrangle.js";
@@ -96,7 +97,7 @@ import "../../shared-utils/url/defaultUrls.js";
 import "../../vendor/object-assign-deep/objectAssignDeep.js";
 import "../../shared-utils/typescript/entries.js";
 import "../utils/tag/adaptConfig.js";
-class $t extends l {
+class tr extends l {
   constructor(t) {
     super(t);
     o(this, "rendererMap", /* @__PURE__ */ new Map());
@@ -147,5 +148,5 @@ class $t extends l {
   }
 }
 export {
-  $t as TagRender
+  tr as TagRender
 };

package/libs/PanoTagPlugin/controller/TagUtil.js

@@ -42,6 +42,7 @@ import { objectAssignDeepExports as P } from "../../vendor/object-assign-deep/ob
 import { entries as B } from "../../shared-utils/typescript/entries.js";
 import H from "../utils/tag/adaptConfig.js";
 import "../../vendor/svelte/internal/index.js";
+import "../../shared-utils/audioFocus.js";
 import "../../shared-utils/three/centerPoint.js";
 import "../../shared-utils/three/loadTexture.js";
 import "../../shared-utils/three/Quadrangle.js";
@@ -105,7 +106,7 @@ import "../../CSS3DRenderPlugin/utils/getAllCSS3DObject.js";
 import "../../CSS3DRenderPlugin/utils/three/CSS3DGroup.js";
 import "../../shared-utils/five/calculateThreeMouse.js";
 import "../../shared-utils/url/defaultUrls.js";
-class Kt extends ce {
+class Nt extends ce {
   constructor(e) {
     super(e);
     s(this, "tags", []);
@@ -313,5 +314,5 @@ class Kt extends ce {
   }
 }
 export {
-  Kt as TagUtil
+  Nt as TagUtil
 };

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

@@ -1,3 +1,4 @@
+import type { AudioFocusHost } from '../../shared-utils/audioFocus';
 import type { Tag, TagId, Tags, State, ContentTypeConfigKey } from '../typings';
 import type { TagClickParams, TagConfigByKey, TagContentType } from '..';
 import type { ArrayPosition } from '../typings';
@@ -6,6 +7,7 @@ import { TagRender } from './TagRender';
 import type { PartialObjectDeep } from '../../typings/typings';
 export declare const pluginFlag: (name: string) => string;
 declare class PanoTagPluginController extends TagRender {
+    audioFocus?: AudioFocusHost;
     /** state */
     state: {
         enabled: boolean;
@@ -17,6 +19,7 @@ declare class PanoTagPluginController extends TagRender {
     /** 全局 hover 启用状态，默认 true */
     globalHoverEnabled: boolean;
     constructor(five: Five, params?: {
+        audioFocus?: AudioFocusHost;
         config?: Pick<Tags, 'contentTypeConfig' | 'globalConfig'>;
         debug?: boolean;
         containerZIndex?: number;