@mlightcad/cad-simple-viewer 1.7.8-preview.3 → 1.7.8-preview.5

package/dist/cad-simple-viewer.js

@@ -58264,7 +58264,10 @@ const tp = {
   async editTextEntity(e) {
     const t = e.database;
     this.setEntitySceneVisible(e.objectId, !1), this._isDirty = !0;
-    const i = Number(e.height), n = Number.isFinite(i) && i > 0 ? i : this.pixelsToWorldY(24), o = e.textString ?? "", r = Math.max(n * Math.max(o.length, 1) * 0.6, n), a = Number(e.rotation), l = new Di();
+    const i = Number(e.height), n = Number.isFinite(i) && i > 0 ? i : this.pixelsToWorldY(24), o = e.textString ?? "", r = Math.max(
+      n * Math.max(o.length, 1) * 0.6,
+      n
+    ), a = Number(e.rotation), l = new Di();
     let c = !1;
     try {
       const d = await l.open({
@@ -59857,26 +59860,35 @@ const tp = {
       return;
     const { placements: t, buckets: i } = e.flushMeshGlyphInstances(
       this._scene.internalScene,
-      (n) => this.resolveMeshGlyphLayerParent(n)
+      (n, o) => this.resolveMeshGlyphLayerParent(n, o)
     );
     t > 0 && (console.log(
       `[cad-simple-viewer-cli] mesh glyph InstancedMesh flush: placements=${t} buckets=${i}`
     ), this._isDirty = !0);
   }
   /**
-   * Prefers the active layout's layer group, then any layout that already has
-   * that layer (multi-layout HTML export). Falls back to null so flush can
-   * parent under the bookkeeping root.
+   * Parents mesh glyphs under the layout that owns the entity.
+   *
+   * Every layout has a layer group for each layer name. Preferring the active
+   * layout puts model-space TrueType text into the paper-space group while a
+   * paper layout is current, so viewports (which draw model space) never see
+   * it. When `ownerId` names a layout, only that layout's layer is used.
+   * Glyphs with no layout owner still follow the active layout.
    */
-  resolveMeshGlyphLayerParent(e) {
-    var i;
-    const t = (i = this._scene.activeLayout) == null ? void 0 : i.getLayer(e);
-    if (t)
-      return t.internalObject;
-    for (const n of this._scene.layouts.values()) {
-      const o = n.getLayer(e);
-      if (o)
-        return o.internalObject;
+  resolveMeshGlyphLayerParent(e, t) {
+    var o, r;
+    const i = t == null ? void 0 : t.trim();
+    if (i) {
+      const a = this._scene.layouts.get(i);
+      return a ? ((o = a.getLayer(e)) == null ? void 0 : o.internalObject) ?? null : null;
+    }
+    const n = (r = this._scene.activeLayout) == null ? void 0 : r.getLayer(e);
+    if (n)
+      return n.internalObject;
+    for (const a of this._scene.layouts.values()) {
+      const l = a.getLayer(e);
+      if (l)
+        return l.internalObject;
     }
     return null;
   }