@mlightcad/cad-simple-viewer 1.7.8-preview.4 → 1.7.8-preview.6

package/lib/view/AcTrView2d.js

@@ -109,7 +109,7 @@ import { AcApOpenViewMode } from '../app/AcApOpenDatabaseOptions';
 import { AcApZoomCmd } from '../command/AcApZoomCmd';
 import { isMarkupHtmlTextEditing } from '../command/markup/AcApMarkupTextEdit';
 import { notifyMeasurementLayoutChanged } from '../command/measure/AcApMeasurementStore';
-import { acedAttachMobileBoxGesture, AcEdBaseView, AcEdConditionWaiter, AcEdCorsorType, AcEdGripManager, acedGuardCanvasTouchCallout, acedInteractionStrategy, acedIsTouchDerivedMouseEvent, AcEdMTextEditor, AcEdOpenMode, acedShouldIgnoreCompatMouse, AcEdViewMode, eventBus, resolvePointerSelectionAction } from '../editor';
+import { acedAttachMobileBoxGesture, AcEdBaseView, acedCollectViewportBoxSelectionIds, AcEdConditionWaiter, AcEdCorsorType, AcEdGripManager, acedGuardCanvasTouchCallout, acedInteractionStrategy, acedIsTouchDerivedMouseEvent, AcEdMTextEditor, AcEdOpenMode, acedShouldIgnoreCompatMouse, AcEdViewMode, eventBus, resolvePointerSelectionAction } from '../editor';
 import { ACGI_MODEL_SPACE_BACKGROUND, isModelSpaceDatabase, readLayoutBackgroundColor } from '../editor/global/AcEdUiColor';
 import { ML_UI_Z_CANVAS_HTML_OVERLAY } from '../editor/global/AcEdUiLayout';
 import { acedEntityIntersectsSelectionBox, acedNeedsCrossingGeometryRefine } from '../editor/view/AcEdSelectionBoxIntersect';
@@ -693,7 +693,9 @@ var AcTrView2d = /** @class */ (function (_super) {
             beginSelectionPreview(e.clientX, e.clientY);
         }, { signal: viewDomSignal });
         _this.canvas.addEventListener('mousemove', function (e) {
-            if (!selectionStartWcs || !selectionPreviewEl || !selectionStartCanvas) {
+            if (!selectionStartWcs ||
+                !selectionPreviewEl ||
+                !selectionStartCanvas) {
                 return;
             }
             if (acedIsTouchDerivedMouseEvent(e) || acedShouldIgnoreCompatMouse()) {
@@ -2107,7 +2109,9 @@ var AcTrView2d = /** @class */ (function (_super) {
                         this.setEntitySceneVisible(mtext.objectId, false);
                         this._isDirty = true;
                         resolvePresentation = mtext.resolveAnnotativePresentation;
-                        presentation = typeof resolvePresentation === 'function' ? resolvePresentation.call(mtext) : null;
+                        presentation = typeof resolvePresentation === 'function'
+                            ? resolvePresentation.call(mtext)
+                            : null;
                         rawLocation = (_d = presentation === null || presentation === void 0 ? void 0 : presentation.position) !== null && _d !== void 0 ? _d : mtext.location;
                         location = {
                             x: rawLocation.x,
@@ -2116,10 +2120,14 @@ var AcTrView2d = /** @class */ (function (_super) {
                         };
                         direction = (_f = presentation === null || presentation === void 0 ? void 0 : presentation.direction) !== null && _f !== void 0 ? _f : mtext.direction;
                         attachmentPoint = (_g = presentation === null || presentation === void 0 ? void 0 : presentation.attachmentPoint) !== null && _g !== void 0 ? _g : mtext.attachmentPoint;
-                        editorWidth = presentation && Number.isFinite(presentation.width) && presentation.width > 0
+                        editorWidth = presentation &&
+                            Number.isFinite(presentation.width) &&
+                            presentation.width > 0
                             ? presentation.width
                             : this.resolveMTextEditorWidth(mtext);
-                        textHeight = presentation && Number.isFinite(presentation.height) && presentation.height > 0
+                        textHeight = presentation &&
+                            Number.isFinite(presentation.height) &&
+                            presentation.height > 0
                             ? presentation.height
                             : this.resolveMTextEditorTextHeight(mtext);
                         editor = new AcEdMTextEditor();
@@ -2526,6 +2534,61 @@ var AcTrView2d = /** @class */ (function (_super) {
     AcTrView2d.prototype.selectByBox = function (box) {
         this.selectByBoxWithMode(box, 'crossing', 'add');
     };
+    /**
+     * Collects model-space entities selected through the active layout's paper
+     * viewports.
+     *
+     * Box selection used to query only the active layout's spatial index, so
+     * model-space content rendered inside a viewport could be clicked (pick
+     * drills through) but never box-selected — reported for LEADER entities in
+     * `布局1`. Each viewport's visible slice of the pick rectangle is mapped to
+     * model WCS, queried, and mapped back so window / crossing keeps its exact
+     * AutoCAD meaning.
+     */
+    AcTrView2d.prototype.collectViewportDrillThroughSelectionIds = function (box, mode) {
+        var e_10, _a;
+        var _b, _c;
+        var activeLayoutView = this.activeLayoutView;
+        var modelLayout = this._scene.modelSpaceLayout;
+        if (!activeLayoutView || !modelLayout)
+            return [];
+        if (activeLayoutView.layoutBtrId === this._scene.modelSpaceBtrId)
+            return [];
+        var viewports = [];
+        var _loop_2 = function (vpView) {
+            viewports.push({
+                paperBox: vpView.viewport.box,
+                frozenLayers: vpView.viewport.frozenLayers,
+                paperPointToModel: function (point) { return vpView.paperPointToModel(point); },
+                modelPointToPaper: function (point) { return vpView.modelPointToPaper(point); }
+            });
+        };
+        try {
+            for (var _d = __values(activeLayoutView.viewportViews), _e = _d.next(); !_e.done; _e = _d.next()) {
+                var vpView = _e.value;
+                _loop_2(vpView);
+            }
+        }
+        catch (e_10_1) { e_10 = { error: e_10_1 }; }
+        finally {
+            try {
+                if (_e && !_e.done && (_a = _d.return)) _a.call(_d);
+            }
+            finally { if (e_10) throw e_10.error; }
+        }
+        if (viewports.length === 0)
+            return [];
+        var database = (_c = (_b = AcApDocManager.tryGetInstance()) === null || _b === void 0 ? void 0 : _b.curDocument) === null || _c === void 0 ? void 0 : _c.database;
+        return acedCollectViewportBoxSelectionIds({
+            selectionBox: box,
+            mode: mode,
+            viewports: viewports,
+            searchModel: function (modelBox, selectionMode) {
+                return modelLayout.search(modelBox, { selectionMode: selectionMode });
+            },
+            entityOf: function (id) { var _a; return (_a = database === null || database === void 0 ? void 0 : database.tables.blockTable.getEntityById(id)) !== null && _a !== void 0 ? _a : undefined; }
+        });
+    };
     /**
      * Drops crossing spatial hits whose curve geometry misses the pick box.
      *
@@ -2534,7 +2597,7 @@ var AcTrView2d = /** @class */ (function (_super) {
      * that interior also selects those polylines and can stall highlight work.
      */
     AcTrView2d.prototype.refineCrossingSelectionHits = function (box, results) {
-        var e_10, _a;
+        var e_11, _a;
         var _b;
         var database = (_b = AcApDocManager.instance.curDocument) === null || _b === void 0 ? void 0 : _b.database;
         if (!database) {
@@ -2559,12 +2622,12 @@ var AcTrView2d = /** @class */ (function (_super) {
                 }
             }
         }
-        catch (e_10_1) { e_10 = { error: e_10_1 }; }
+        catch (e_11_1) { e_11 = { error: e_11_1 }; }
         finally {
             try {
                 if (results_1_1 && !results_1_1.done && (_a = results_1.return)) _a.call(results_1);
             }
-            finally { if (e_10) throw e_10.error; }
+            finally { if (e_11) throw e_11.error; }
         }
         return ids;
     };
@@ -2580,7 +2643,7 @@ var AcTrView2d = /** @class */ (function (_super) {
      * @inheritdoc
      */
     AcTrView2d.prototype.updateLayer = function (layer, changes) {
-        var e_11, _a;
+        var e_12, _a;
         var touchedObjectIds = this._scene.updateLayer(this.toLayerInfo(layer)).touchedObjectIds;
         if (this._layerAppearance.layerStyleMayHaveChanged(changes)) {
             this._layerAppearance.syncFromLiveRecord(layer);
@@ -2602,12 +2665,12 @@ var AcTrView2d = /** @class */ (function (_super) {
                 this.applySessionHiddenObjectState(objectId);
             }
         }
-        catch (e_11_1) { e_11 = { error: e_11_1 }; }
+        catch (e_12_1) { e_12 = { error: e_12_1 }; }
         finally {
             try {
                 if (touchedObjectIds_1_1 && !touchedObjectIds_1_1.done && (_a = touchedObjectIds_1.return)) _a.call(touchedObjectIds_1);
             }
-            finally { if (e_11) throw e_11.error; }
+            finally { if (e_12) throw e_12.error; }
         }
         this._isDirty = true;
     };
@@ -2944,7 +3007,7 @@ var AcTrView2d = /** @class */ (function (_super) {
      * drawable entity that must be rebuilt (for example ATTRIB → INSERT).
      */
     AcTrView2d.prototype.resolveSceneUpdateEntities = function (entities) {
-        var e_12, _a;
+        var e_13, _a;
         var _b;
         var db = (_b = AcApDocManager.instance.curDocument) === null || _b === void 0 ? void 0 : _b.database;
         var resolved = [];
@@ -2966,12 +3029,12 @@ var AcTrView2d = /** @class */ (function (_super) {
                 resolved.push(target);
             }
         }
-        catch (e_12_1) { e_12 = { error: e_12_1 }; }
+        catch (e_13_1) { e_13 = { error: e_13_1 }; }
         finally {
             try {
                 if (entities_1_1 && !entities_1_1.done && (_a = entities_1.return)) _a.call(entities_1);
             }
-            finally { if (e_12) throw e_12.error; }
+            finally { if (e_13) throw e_13.error; }
         }
         return resolved;
     };
@@ -3756,7 +3819,7 @@ var AcTrView2d = /** @class */ (function (_super) {
      * @param layoutBtrId Input the block table record id of the layout
      */
     AcTrView2d.prototype.loadLayoutEntitiesIfNeeded = function (layoutBtrId) {
-        var e_13, _a;
+        var e_14, _a;
         var _this = this;
         try {
             var db = AcApDocManager.instance.curDocument.database;
@@ -3820,12 +3883,12 @@ var AcTrView2d = /** @class */ (function (_super) {
                     entities_2.push(entity);
                 }
             }
-            catch (e_13_1) { e_13 = { error: e_13_1 }; }
+            catch (e_14_1) { e_14 = { error: e_14_1 }; }
             finally {
                 try {
                     if (iterator_1_1 && !iterator_1_1.done && (_a = iterator_1.return)) _a.call(iterator_1);
                 }
-                finally { if (e_13) throw e_13.error; }
+                finally { if (e_14) throw e_14.error; }
             }
             if (entities_2.length === 0) {
                 // Empty layout (e.g. a freshly-created paper space tab). Mark as
@@ -4168,8 +4231,8 @@ var AcTrView2d = /** @class */ (function (_super) {
      */
     AcTrView2d.prototype.redrawGlyphEntitiesAfterFontLoad = function (epoch, fontName) {
         return __awaiter(this, void 0, void 0, function () {
-            var redrawEpoch, glyphs, _a, _b, layout, glyphs_1, glyphs_1_1, glyph, e_14_1, defaults, normalized_1, msSinceIdle, db;
-            var e_15, _c, e_14, _d;
+            var redrawEpoch, glyphs, _a, _b, layout, glyphs_1, glyphs_1_1, glyph, e_15_1, defaults, normalized_1, msSinceIdle, db;
+            var e_16, _c, e_15, _d;
             var _e, _f;
             return __generator(this, function (_g) {
                 switch (_g.label) {
@@ -4191,12 +4254,12 @@ var AcTrView2d = /** @class */ (function (_super) {
                                 });
                             }
                         }
-                        catch (e_15_1) { e_15 = { error: e_15_1 }; }
+                        catch (e_16_1) { e_16 = { error: e_16_1 }; }
                         finally {
                             try {
                                 if (_b && !_b.done && (_c = _a.return)) _c.call(_a);
                             }
-                            finally { if (e_15) throw e_15.error; }
+                            finally { if (e_16) throw e_16.error; }
                         }
                         _g.label = 1;
                     case 1:
@@ -4219,14 +4282,14 @@ var AcTrView2d = /** @class */ (function (_super) {
                         return [3 /*break*/, 2];
                     case 5: return [3 /*break*/, 8];
                     case 6:
-                        e_14_1 = _g.sent();
-                        e_14 = { error: e_14_1 };
+                        e_15_1 = _g.sent();
+                        e_15 = { error: e_15_1 };
                         return [3 /*break*/, 8];
                     case 7:
                         try {
                             if (glyphs_1_1 && !glyphs_1_1.done && (_d = glyphs_1.return)) _d.call(glyphs_1);
                         }
-                        finally { if (e_14) throw e_14.error; }
+                        finally { if (e_15) throw e_15.error; }
                         return [7 /*endfinally*/];
                     case 8:
                         if (glyphs.length > 0) {
@@ -4277,7 +4340,7 @@ var AcTrView2d = /** @class */ (function (_super) {
         });
     };
     AcTrView2d.prototype.groupHasPendingGlyphGeometry = function (group) {
-        var e_16, _a;
+        var e_17, _a;
         try {
             // Prefer O(block-def shells). A full THREE.traverse over a mega-block
             // (100k+ flattened mesh leaves) was dominating scene-convert wall time.
@@ -4288,12 +4351,12 @@ var AcTrView2d = /** @class */ (function (_super) {
                 }
             }
         }
-        catch (e_16_1) { e_16 = { error: e_16_1 }; }
+        catch (e_17_1) { e_17 = { error: e_17_1 }; }
         finally {
             try {
                 if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
             }
-            finally { if (e_16) throw e_16.error; }
+            finally { if (e_17) throw e_17.error; }
         }
         return AcTrView2d.directChildrenHavePendingGlyphs(group);
     };
@@ -4304,7 +4367,7 @@ var AcTrView2d = /** @class */ (function (_super) {
      * a whole-floor INSERT is O(glyph shells), not O(all drawable leaves).
      */
     AcTrView2d.directChildrenHavePendingGlyphs = function (root) {
-        var e_17, _a;
+        var e_18, _a;
         var children = root.children;
         for (var i = 0; i < children.length; i++) {
             var child = children[i];
@@ -4316,7 +4379,7 @@ var AcTrView2d = /** @class */ (function (_super) {
             }
             if (child instanceof AcTrGroup) {
                 try {
-                    for (var _b = (e_17 = void 0, __values(child.getSourceEntities())), _c = _b.next(); !_c.done; _c = _b.next()) {
+                    for (var _b = (e_18 = void 0, __values(child.getSourceEntities())), _c = _b.next(); !_c.done; _c = _b.next()) {
                         var entity = _c.value;
                         if (entity instanceof AcTrGlyphEntity &&
                             !entity.hasDrawableGeometry()) {
@@ -4324,12 +4387,12 @@ var AcTrView2d = /** @class */ (function (_super) {
                         }
                     }
                 }
-                catch (e_17_1) { e_17 = { error: e_17_1 }; }
+                catch (e_18_1) { e_18 = { error: e_18_1 }; }
                 finally {
                     try {
                         if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
                     }
-                    finally { if (e_17) throw e_17.error; }
+                    finally { if (e_18) throw e_18.error; }
                 }
                 if (AcTrView2d.directChildrenHavePendingGlyphs(child)) {
                     return true;
@@ -4371,7 +4434,7 @@ var AcTrView2d = /** @class */ (function (_super) {
      */
     AcTrView2d.prototype.pumpDeferredGeometryQueue = function () {
         var _this = this;
-        var _loop_2 = function () {
+        var _loop_3 = function () {
             var job = this_1._deferredGeometryQueue.shift();
             if (job.epoch !== this_1._convertEpoch) {
                 this_1._pendingGeometryJobs = Math.max(0, this_1._pendingGeometryJobs - 1);
@@ -4411,7 +4474,7 @@ var AcTrView2d = /** @class */ (function (_super) {
         var this_1 = this;
         while (this._deferredGeometryActive < AcTrView2d.DEFERRED_GEOMETRY_CONCURRENCY &&
             this._deferredGeometryQueue.length > 0) {
-            _loop_2();
+            _loop_3();
         }
     };
     /** Drops queued deferred geometry and resets counters for a new epoch. */
@@ -4493,7 +4556,7 @@ var AcTrView2d = /** @class */ (function (_super) {
      * paper layouts.
      */
     AcTrView2d.prototype.ensureViewportViews = function (blockTableRecord, layoutView) {
-        var e_18, _a;
+        var e_19, _a;
         var iterator = blockTableRecord.newIterator();
         try {
             for (var iterator_2 = __values(iterator), iterator_2_1 = iterator_2.next(); !iterator_2_1.done; iterator_2_1 = iterator_2.next()) {
@@ -4506,12 +4569,12 @@ var AcTrView2d = /** @class */ (function (_super) {
                 layoutView.addViewport(viewportView);
             }
         }
-        catch (e_18_1) { e_18 = { error: e_18_1 }; }
+        catch (e_19_1) { e_19 = { error: e_19_1 }; }
         finally {
             try {
                 if (iterator_2_1 && !iterator_2_1.done && (_a = iterator_2.return)) _a.call(iterator_2);
             }
-            finally { if (e_18) throw e_18.error; }
+            finally { if (e_19) throw e_19.error; }
         }
     };
     /**
@@ -4520,7 +4583,7 @@ var AcTrView2d = /** @class */ (function (_super) {
      * {@link AcDbViewport.frozenLayerIds} but omit them from `toGiViewport()`.
      */
     AcTrView2d.prototype.toGiViewportWithFrozenLayers = function (entity) {
-        var e_19, _a;
+        var e_20, _a;
         var _b;
         var gi = entity.toGiViewport();
         if (gi.frozenLayers && gi.frozenLayers.length > 0) {
@@ -4540,12 +4603,12 @@ var AcTrView2d = /** @class */ (function (_super) {
                         names.push(layer.name);
                 }
             }
-            catch (e_19_1) { e_19 = { error: e_19_1 }; }
+            catch (e_20_1) { e_20 = { error: e_20_1 }; }
             finally {
                 try {
                     if (ids_1_1 && !ids_1_1.done && (_a = ids_1.return)) _a.call(ids_1);
                 }
-                finally { if (e_19) throw e_19.error; }
+                finally { if (e_20) throw e_20.error; }
             }
         }
         gi.frozenLayerIds = __spreadArray([], __read(ids), false);
@@ -4559,7 +4622,7 @@ var AcTrView2d = /** @class */ (function (_super) {
      */
     AcTrView2d.prototype.batchConvert = function (entities_3) {
         return __awaiter(this, arguments, void 0, function (entities, options) {
-            var epoch, db, progressive, yieldBudgetMs, yieldGate, yieldToEventLoop, _loop_3, this_2, i;
+            var epoch, db, progressive, yieldBudgetMs, yieldGate, yieldToEventLoop, _loop_4, this_2, i;
             var _this = this;
             var _a, _b, _c, _d;
             if (options === void 0) { options = {}; }
@@ -4586,7 +4649,7 @@ var AcTrView2d = /** @class */ (function (_super) {
                         yieldToEventLoop = function () {
                             return new Promise(function (resolve) { return setTimeout(resolve, 0); });
                         };
-                        _loop_3 = function (i) {
+                        _loop_4 = function (i) {
                             var entity, shouldConvert, objectId_1, convertGen_1, directMeta, added, superseded, threeEntity_1, isMultiLayerGroup, deferGeometry, isExtendBbox_1, commitEntity, fileName, error_3, failedId, didYield;
                             return __generator(this, function (_f) {
                                 switch (_f.label) {
@@ -4825,7 +4888,7 @@ var AcTrView2d = /** @class */ (function (_super) {
                         _e.label = 1;
                     case 1:
                         if (!(i < entities.length)) return [3 /*break*/, 4];
-                        return [5 /*yield**/, _loop_3(i)];
+                        return [5 /*yield**/, _loop_4(i)];
                     case 2:
                         _e.sent();
                         _e.label = 3;
@@ -4865,8 +4928,8 @@ var AcTrView2d = /** @class */ (function (_super) {
     };
     AcTrView2d.prototype.handleGroup = function (group_1, progressive_1) {
         return __awaiter(this, arguments, void 0, function (group, progressive, epoch, convertGen) {
-            var t0, objectId, children, objectsGroupByLayer_2, children_1, children_1_1, child, renderContext, groupObjectId, groupLayerName, lazyChildren, groupChildBoxes, aggregateSpatialBbox, registeredChildIndex, yieldToEventLoop, lastGroupYieldAt, _loop_4, this_3, objectsGroupByLayer_1, objectsGroupByLayer_1_1, _a, layerName, objects, e_20_1;
-            var e_21, _b, e_20, _c;
+            var t0, objectId, children, objectsGroupByLayer_2, children_1, children_1_1, child, renderContext, groupObjectId, groupLayerName, lazyChildren, groupChildBoxes, aggregateSpatialBbox, registeredChildIndex, yieldToEventLoop, lastGroupYieldAt, _loop_5, this_3, objectsGroupByLayer_1, objectsGroupByLayer_1_1, _a, layerName, objects, e_21_1;
+            var e_22, _b, e_21, _c;
             var _this = this;
             var _d, _e;
             if (epoch === void 0) { epoch = this._convertEpoch; }
@@ -4921,12 +4984,12 @@ var AcTrView2d = /** @class */ (function (_super) {
                                 child.parent = null;
                             }
                         }
-                        catch (e_21_1) { e_21 = { error: e_21_1 }; }
+                        catch (e_22_1) { e_22 = { error: e_22_1 }; }
                         finally {
                             try {
                                 if (children_1_1 && !children_1_1.done && (_b = children_1.return)) _b.call(children_1);
                             }
-                            finally { if (e_21) throw e_21.error; }
+                            finally { if (e_22) throw e_22.error; }
                         }
                         renderContext = group.renderContext;
                         groupObjectId = group.objectId;
@@ -4957,7 +5020,7 @@ var AcTrView2d = /** @class */ (function (_super) {
                             return new Promise(function (resolve) { return setTimeout(resolve, 0); });
                         };
                         lastGroupYieldAt = progressive ? performance.now() : 0;
-                        _loop_4 = function (layerName, objects) {
+                        _loop_5 = function (layerName, objects) {
                             var effectiveLayerName, sourceLayerForMaterials, entity, entityUserData, i, tAdd;
                             return __generator(this, function (_g) {
                                 switch (_g.label) {
@@ -5032,7 +5095,7 @@ var AcTrView2d = /** @class */ (function (_super) {
                     case 4:
                         if (!!objectsGroupByLayer_1_1.done) return [3 /*break*/, 7];
                         _a = __read(objectsGroupByLayer_1_1.value, 2), layerName = _a[0], objects = _a[1];
-                        return [5 /*yield**/, _loop_4(layerName, objects)];
+                        return [5 /*yield**/, _loop_5(layerName, objects)];
                     case 5:
                         _f.sent();
                         _f.label = 6;
@@ -5041,14 +5104,14 @@ var AcTrView2d = /** @class */ (function (_super) {
                         return [3 /*break*/, 4];
                     case 7: return [3 /*break*/, 10];
                     case 8:
-                        e_20_1 = _f.sent();
-                        e_20 = { error: e_20_1 };
+                        e_21_1 = _f.sent();
+                        e_21 = { error: e_21_1 };
                         return [3 /*break*/, 10];
                     case 9:
                         try {
                             if (objectsGroupByLayer_1_1 && !objectsGroupByLayer_1_1.done && (_c = objectsGroupByLayer_1.return)) _c.call(objectsGroupByLayer_1);
                         }
-                        finally { if (e_20) throw e_20.error; }
+                        finally { if (e_21) throw e_21.error; }
                         return [7 /*endfinally*/];
                     case 10:
                         group.dispose();
@@ -5165,7 +5228,9 @@ var AcTrView2d = /** @class */ (function (_super) {
         if (!mtextRenderer.getMeshGlyphInstancing()) {
             return;
         }
-        var _a = mtextRenderer.flushMeshGlyphInstances(this._scene.internalScene, function (layerName) { return _this.resolveMeshGlyphLayerParent(layerName); }), placements = _a.placements, buckets = _a.buckets;
+        var _a = mtextRenderer.flushMeshGlyphInstances(this._scene.internalScene, function (layerName, ownerId) {
+            return _this.resolveMeshGlyphLayerParent(layerName, ownerId);
+        }), placements = _a.placements, buckets = _a.buckets;
         if (placements > 0) {
             // Prefix for headless CLI console forwarding.
             console.log("[cad-simple-viewer-cli] mesh glyph InstancedMesh flush: placements=".concat(placements, " buckets=").concat(buckets));
@@ -5175,32 +5240,44 @@ var AcTrView2d = /** @class */ (function (_super) {
         }
     };
     /**
-     * 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.
      */
-    AcTrView2d.prototype.resolveMeshGlyphLayerParent = function (layerName) {
-        var e_22, _a;
-        var _b;
-        var active = (_b = this._scene.activeLayout) === null || _b === void 0 ? void 0 : _b.getLayer(layerName);
+    AcTrView2d.prototype.resolveMeshGlyphLayerParent = function (layerName, ownerId) {
+        var e_23, _a;
+        var _b, _c, _d;
+        var owner = ownerId === null || ownerId === void 0 ? void 0 : ownerId.trim();
+        if (owner) {
+            var layout = this._scene.layouts.get(owner);
+            if (!layout) {
+                return null;
+            }
+            return (_c = (_b = layout.getLayer(layerName)) === null || _b === void 0 ? void 0 : _b.internalObject) !== null && _c !== void 0 ? _c : null;
+        }
+        var active = (_d = this._scene.activeLayout) === null || _d === void 0 ? void 0 : _d.getLayer(layerName);
         if (active) {
             return active.internalObject;
         }
         try {
-            for (var _c = __values(this._scene.layouts.values()), _d = _c.next(); !_d.done; _d = _c.next()) {
-                var layout = _d.value;
+            for (var _e = __values(this._scene.layouts.values()), _f = _e.next(); !_f.done; _f = _e.next()) {
+                var layout = _f.value;
                 var layer = layout.getLayer(layerName);
                 if (layer) {
                     return layer.internalObject;
                 }
             }
         }
-        catch (e_22_1) { e_22 = { error: e_22_1 }; }
+        catch (e_23_1) { e_23 = { error: e_23_1 }; }
         finally {
             try {
-                if (_d && !_d.done && (_a = _c.return)) _a.call(_c);
+                if (_f && !_f.done && (_a = _e.return)) _a.call(_e);
             }
-            finally { if (e_22) throw e_22.error; }
+            finally { if (e_23) throw e_23.error; }
         }
         return null;
     };