@mlightcad/cad-simple-viewer 1.5.10 → 1.6.0

package/lib/view/AcTrView2d.js

@@ -104,11 +104,13 @@ import * as THREE from 'three';
 import Stats from 'three/examples/jsm/libs/stats.module';
 import { CSS2DRenderer } from 'three/examples/jsm/renderers/CSS2DRenderer.js';
 import { AcApDocManager, AcApSettingManager } from '../app';
+import { isMarkupHtmlTextEditing } from '../command/markup/AcApMarkupTextEdit';
 import { AcEdBaseView, AcEdConditionWaiter, AcEdCorsorType, AcEdGripManager, AcEdMTextEditor, AcEdOpenMode, AcEdViewMode, eventBus, resolvePointerSelectionAction } from '../editor';
 import { ACGI_MODEL_SPACE_BACKGROUND, isModelSpaceDatabase, readLayoutBackgroundColor } from '../editor/global/AcEdUiColor';
 import { isEffectiveSpatialQueryHit } from '../editor/view/AcEdSpatialQueryResult';
 import { AcTrGeometryUtil } from '../util';
 import { acapRunDatabaseEdit } from '../util/AcApDatabaseEdit';
+import { trySelectReviewOverlay, trySelectReviewOverlaysByBox } from './AcEdReviewOverlayPick';
 import { AcEdViewKeyHandler } from './AcEdViewKeyHandler';
 import { shouldExtendBboxForDirectEntity, tryBuildDirectEntityMeta } from './AcTrDirectBatch';
 import { AcTrEntityDisplayController } from './AcTrEntityDisplayController';
@@ -276,17 +278,23 @@ var AcTrView2d = /** @class */ (function (_super) {
             });
             var stillLoading = _this._numOfEntitiesToProcess > 0;
             var deferRenderWhileLoading = stillLoading && !_this._progressiveRendering;
-            if (!_this._isDirty && !stillLoading)
+            if (!_this._isDirty && !_this._htmlDirty && !stillLoading)
                 return;
             if (deferRenderWhileLoading)
                 return;
-            if (!_this._isDirty)
+            if (!_this._isDirty && !_this._htmlDirty)
                 return;
-            if (_this._progressiveRendering && stillLoading) {
-                _this._progressivePaintCount++;
+            var needsRedraw = false;
+            if (_this._isDirty) {
+                if (_this._progressiveRendering && stillLoading) {
+                    _this._progressivePaintCount++;
+                }
+                needsRedraw = _this._layoutViewManager.render(_this._scene);
             }
-            var needsRedraw = _this._layoutViewManager.render(_this._scene);
-            if (_this.internalCamera) {
+            // Camera / WebGL dirty also reprojects CSS2D overlays. HTML-only dirty
+            // skips the WebGL pass so measurement badges and markup DOM can update
+            // without clearing and redrawing the drawing.
+            if (_this.internalCamera && (_this._isDirty || _this._htmlDirty)) {
                 _this._css2dRenderer.render(_this._scene.internalScene, _this.internalCamera);
             }
             (_a = _this._stats) === null || _a === void 0 ? void 0 : _a.update();
@@ -294,6 +302,7 @@ var AcTrView2d = /** @class */ (function (_super) {
             // from geometry batches to keep total open time down. Counter hitting 0
             // still forces a final dirty in decreaseNumOfEntitiesToProcess().
             _this._isDirty = needsRedraw;
+            _this._htmlDirty = false;
         };
         _this._gripManager = new AcEdGripManager(_this);
         _this._keyHandler = new AcEdViewKeyHandler(_this);
@@ -350,6 +359,7 @@ var AcTrView2d = /** @class */ (function (_super) {
             return (_this.mode === AcEdViewMode.SELECTION &&
                 !_this.editor.isActive &&
                 !AcEdMTextEditor.getActiveInputBox() &&
+                !isMarkupHtmlTextEditing() &&
                 !_this._gripManager.isDragging);
         };
         var clearSelectionPreview = function () {
@@ -412,12 +422,22 @@ var AcTrView2d = /** @class */ (function (_super) {
             clearSelectionPreview();
             var action = _this.getPointerSelectionAction(e);
             if (_this.isSelectionClick(selectionStartCanvas, endCanvas)) {
-                var picked = _this.pick(endWcs);
-                if (picked.length > 0) {
-                    _this.applySelection([picked[0].id], action);
+                if (trySelectReviewOverlay(_this, endCanvas.x, endCanvas.y, action)) {
+                    if (action === 'replace') {
+                        _this.selectionSet.clear();
+                    }
                 }
-                else if (action === 'replace') {
-                    _this.selectionSet.clear();
+                else {
+                    var picked = _this.pick(endWcs);
+                    if (picked.length > 0) {
+                        if (action === 'replace') {
+                            _this.htmlTransientManager.deselectAll();
+                        }
+                        _this.applySelection([picked[0].id], action);
+                    }
+                    else if (action === 'replace') {
+                        _this.selectionSet.clear();
+                    }
                 }
             }
             else {
@@ -426,6 +446,7 @@ var AcTrView2d = /** @class */ (function (_super) {
                     .expandByPoint(endWcs);
                 var mode = _this.getSelectionMode(selectionStartCanvas, endCanvas);
                 _this.selectByBoxWithMode(box, mode, action);
+                trySelectReviewOverlaysByBox(_this, box, mode, action);
             }
             selectionStartWcs = null;
             selectionStartCanvas = null;
@@ -462,28 +483,13 @@ var AcTrView2d = /** @class */ (function (_super) {
             // diverges from how AutoCAD preserves per-tab view state.
             var isFirstVisit = !_this._initializedLayouts.has(btrId);
             _this._initializedLayouts.add(btrId);
-            // Clear measurement overlays before swapping layouts.
-            // Measurements are screen/coordinate-anchored — their dimension
-            // text, hatch indicators, and HTML overlays were laid out in
-            // the previous layout's WCS (paper coords, ~unit scale) and
-            // would render at nonsense positions in a different layout
-            // (model WCS is typically O(10^5) larger, paper layouts use
-            // their own sheet coords). Selection state is intentionally
-            // **not** cleared here: it is entity-id-based and the same
-            // entity stays selected wherever it is rendered (the model
-            // entity drilled through a paper viewport remains visually
-            // selected when the user returns to model space, matching
-            // AutoCAD desktop's behaviour).
-            //
-            // Dynamic import avoids a circular dependency: the cleanup
-            // module already imports `AcTrView2d` for its
-            // `htmlTransientManager` cast, so a static import here would
-            // create a cycle. The cost (one extra microtask) is
-            // negligible for a layout switch.
-            void import('../command/measure/AcApClearMeasurementsCmd').then(function (_a) {
-                var clearAllMeasurements = _a.clearAllMeasurements;
-                return clearAllMeasurements(_this);
-            });
+            // Measurement HTML overlays are layout-scoped via `layoutId`.
+            // Switching layouts only updates visibility (see
+            // {@link AcTrHtmlTransientManager.setActiveLayoutId} from the
+            // `activeLayoutBtrId` setter below) — overlays are not deleted, so
+            // returning to a layout restores its measurements. Entity selection
+            // is intentionally **not** cleared here: it is entity-id-based and
+            // the same entity stays selected wherever it is rendered.
             _this.activeLayoutBtrId = btrId;
             _this.createLayoutViewIfNeeded(btrId);
             _this.loadLayoutEntitiesIfNeeded(btrId);
@@ -515,6 +521,7 @@ var AcTrView2d = /** @class */ (function (_super) {
         _this.initialize();
         _this.onWindowResize();
         _this._isDirty = true;
+        _this._htmlDirty = false;
         _this.startAnimationLoop();
         _this._numOfEntitiesToProcess = 0;
         _this._pendingGeometryJobs = 0;
@@ -580,17 +587,25 @@ var AcTrView2d = /** @class */ (function (_super) {
     });
     Object.defineProperty(AcTrView2d.prototype, "isDirty", {
         /**
-         * Gets whether the view needs to be re-rendered.
+         * Gets whether the WebGL scene needs to be re-rendered.
          *
-         * @returns True if the view is dirty and needs re-rendering
+         * Camera, CAD entities, and WebGL transients set this flag. CSS2D / HTML
+         * overlay mutations should use {@link isHtmlDirty} instead so a badge or
+         * markup DOM change does not clear and redraw the drawing.
+         *
+         * @returns True if the WebGL view is dirty and needs re-rendering
          */
         get: function () {
             return this._isDirty;
         },
         /**
-         * Sets whether the view needs to be re-rendered.
+         * Sets whether the WebGL scene needs to be re-rendered.
+         *
+         * When true, the animation loop also runs CSS2DRenderer so HTML
+         * overlays reproject after pan / zoom. HTML-only changes should set
+         * {@link isHtmlDirty} instead.
          *
-         * @param value - True to mark the view as needing re-rendering
+         * @param value - True to mark the WebGL view as needing re-rendering
          */
         set: function (value) {
             this._isDirty = value;
@@ -613,6 +628,49 @@ var AcTrView2d = /** @class */ (function (_super) {
         enumerable: false,
         configurable: true
     });
+    /**
+     * Waits until batch conversion and deferred glyph/font geometry finish.
+     *
+     * Document open can resolve before text is drawable (`FontManager.lazyFontLoading`
+     * + deferred geometry jobs). Call this before raster/HTML export or scripted
+     * commands that assume a complete scene.
+     *
+     * @param timeoutMs - Maximum wait; returns `false` on timeout (default 60s).
+     * @returns `true` when idle, `false` if still busy after the timeout.
+     */
+    AcTrView2d.prototype.waitUntilIdle = function () {
+        return __awaiter(this, arguments, void 0, function (timeoutMs) {
+            var deadline, idleStreak;
+            if (timeoutMs === void 0) { timeoutMs = 60000; }
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        deadline = Date.now() + Math.max(0, timeoutMs);
+                        idleStreak = 0;
+                        _a.label = 1;
+                    case 1:
+                        if (!this.isProcessingEntities) {
+                            idleStreak++;
+                            if (idleStreak >= 2) {
+                                return [2 /*return*/, true];
+                            }
+                        }
+                        else {
+                            idleStreak = 0;
+                        }
+                        if (Date.now() > deadline) {
+                            return [2 /*return*/, !this.isProcessingEntities];
+                        }
+                        return [4 /*yield*/, new Promise(function (resolve) { return setTimeout(resolve, 16); })];
+                    case 2:
+                        _a.sent();
+                        _a.label = 3;
+                    case 3: return [3 /*break*/, 1];
+                    case 4: return [2 /*return*/];
+                }
+            });
+        });
+    };
     Object.defineProperty(AcTrView2d.prototype, "progressiveRendering", {
         /**
          * Whether entity conversion during document open is deferred for progressive display.
@@ -659,6 +717,29 @@ var AcTrView2d = /** @class */ (function (_super) {
     AcTrView2d.prototype.endProgressiveOpenFit = function () {
         this._progressiveOpenFit.end();
     };
+    Object.defineProperty(AcTrView2d.prototype, "isHtmlDirty", {
+        /**
+         * Gets whether CSS2D / HTML overlays need a CSS2DRenderer pass.
+         *
+         * @returns True if HTML overlays changed without a WebGL scene change
+         */
+        get: function () {
+            return this._htmlDirty;
+        },
+        /**
+         * Sets whether CSS2D / HTML overlays need a CSS2DRenderer pass.
+         *
+         * Does not force a WebGL redraw. Camera changes still go through
+         * {@link isDirty}, which also refreshes overlay projection.
+         *
+         * @param value - True to mark HTML overlays as needing a CSS2D pass
+         */
+        set: function (value) {
+            this._htmlDirty = value;
+        },
+        enumerable: false,
+        configurable: true
+    });
     Object.defineProperty(AcTrView2d.prototype, "missedData", {
         /**
          * Gets information about missing data during rendering (fonts, images, xrefs).
@@ -957,6 +1038,7 @@ var AcTrView2d = /** @class */ (function (_super) {
         set: function (value) {
             this._layoutViewManager.activeLayoutBtrId = value;
             this._scene.activeLayoutBtrId = value;
+            this.htmlTransientManager.setActiveLayoutId(value);
             this._isDirty = true;
         },
         enumerable: false,
@@ -1003,7 +1085,7 @@ var AcTrView2d = /** @class */ (function (_super) {
      */
     AcTrView2d.prototype.ensureEntitiesConvertedForExport = function (options) {
         return __awaiter(this, void 0, void 0, function () {
-            var includeInvisibleLayers, db, pending, _a, _b, _c, layoutBtrId, blockTableRecord;
+            var includeInvisibleLayers, db, pending, _a, _b, _c, layoutBtrId, blockTableRecord, idle;
             var e_4, _d;
             var _this = this;
             return __generator(this, function (_e) {
@@ -1029,13 +1111,18 @@ var AcTrView2d = /** @class */ (function (_super) {
                             }
                             finally { if (e_4) throw e_4.error; }
                         }
-                        if (pending.length === 0) {
-                            return [2 /*return*/];
-                        }
+                        if (!(pending.length > 0)) return [3 /*break*/, 2];
                         this._numOfEntitiesToProcess += pending.length;
                         return [4 /*yield*/, this.batchConvert(pending, { forExport: true })];
                     case 1:
                         _e.sent();
+                        _e.label = 2;
+                    case 2: return [4 /*yield*/, this.waitUntilIdle()];
+                    case 3:
+                        idle = _e.sent();
+                        if (!idle) {
+                            log.warn('[AcTrView2d] Timed out waiting for deferred geometry before export');
+                        }
                         return [2 /*return*/];
                 }
             });
@@ -1528,31 +1615,40 @@ var AcTrView2d = /** @class */ (function (_super) {
         var _this = this;
         var entities = Array.isArray(entity) ? entity : [entity];
         var epoch = this._convertEpoch;
-        var _loop_2 = function (i) {
-            var entity_1 = entities[i];
-            var threeEntity = this_1.drawEntity(entity_1, true);
-            if (threeEntity) {
-                threeEntity.objectId = entity_1.objectId;
-                void threeEntity
-                    .asyncDraw()
-                    .then(function () {
-                    // Drop stale transients started before clear()/regen invalidated the view.
-                    if (epoch !== _this._convertEpoch) {
+        // Overlay transients (markup / measurement / jigs) must honor entity
+        // lineweight even when LWDISPLAY is off; otherwise ribbon style is a no-op.
+        var previousForce = this._renderer.forceShowLineWeight;
+        this._renderer.forceShowLineWeight = true;
+        try {
+            var _loop_2 = function (i) {
+                var entity_1 = entities[i];
+                var threeEntity = this_1.drawEntity(entity_1, true);
+                if (threeEntity) {
+                    threeEntity.objectId = entity_1.objectId;
+                    void threeEntity
+                        .asyncDraw()
+                        .then(function () {
+                        // Drop stale transients started before clear()/regen invalidated the view.
+                        if (epoch !== _this._convertEpoch) {
+                            threeEntity.dispose();
+                            return;
+                        }
+                        _this._scene.addTransientEntity(threeEntity);
+                        _this._isDirty = true;
+                    })
+                        .catch(function (error) {
+                        log.error('[AcTrView2d] Transient entity geometry failed:', error);
                         threeEntity.dispose();
-                        return;
-                    }
-                    _this._scene.addTransientEntity(threeEntity);
-                    _this._isDirty = true;
-                })
-                    .catch(function (error) {
-                    log.error('[AcTrView2d] Transient entity geometry failed:', error);
-                    threeEntity.dispose();
-                });
+                    });
+                }
+            };
+            var this_1 = this;
+            for (var i = 0; i < entities.length; ++i) {
+                _loop_2(i);
             }
-        };
-        var this_1 = this;
-        for (var i = 0; i < entities.length; ++i) {
-            _loop_2(i);
+        }
+        finally {
+            this._renderer.forceShowLineWeight = previousForce;
         }
     };
     /**
@@ -1563,6 +1659,15 @@ var AcTrView2d = /** @class */ (function (_super) {
         this._scene.removeTransientEntity(objectId);
         this._isDirty = true;
     };
+    /**
+     * Show or hide a published CAD transient entity (e.g. when its measurement
+     * group is hidden by a layout switch).
+     */
+    AcTrView2d.prototype.setTransientEntityVisible = function (objectId, visible) {
+        if (this._scene.setTransientEntityVisible(objectId, visible)) {
+            this._isDirty = true;
+        }
+    };
     /**
      * @inheritdoc
      */
@@ -1599,12 +1704,14 @@ var AcTrView2d = /** @class */ (function (_super) {
      * @inheritdoc
      */
     AcTrView2d.prototype.updateTransientPreviewTransforms = function (transforms) {
-        if (this._scene.updateTransientPreviewTransforms(transforms.map(function (entry) { return ({
+        var updated = this._scene.updateTransientPreviewTransforms(transforms.map(function (entry) { return ({
             objectId: entry.objectId,
             matrix: AcTrMatrixUtil.createMatrix4(entry.matrix)
-        }); }))) {
+        }); }));
+        if (updated.webgl)
             this._isDirty = true;
-        }
+        if (updated.html)
+            this._htmlDirty = true;
     };
     /**
      * @inheritdoc
@@ -2275,14 +2382,12 @@ var AcTrView2d = /** @class */ (function (_super) {
         });
     };
     AcTrView2d.prototype.needsDeferredFontGeometry = function (threeEntity) {
-        return (threeEntity instanceof AcTrGlyphEntity ||
-            threeEntity instanceof AcTrGroup);
+        return (threeEntity instanceof AcTrGlyphEntity || threeEntity instanceof AcTrGroup);
     };
     AcTrView2d.prototype.groupHasPendingGlyphGeometry = function (group) {
         var pending = false;
         group.traverse(function (child) {
-            if (child instanceof AcTrGlyphEntity &&
-                !child.hasDrawableGeometry()) {
+            if (child instanceof AcTrGlyphEntity && !child.hasDrawableGeometry()) {
                 pending = true;
             }
         });
@@ -2331,8 +2436,7 @@ var AcTrView2d = /** @class */ (function (_super) {
                         epoch = this._convertEpoch;
                         _a.label = 1;
                     case 1:
-                        if (!(epoch === this._convertEpoch &&
-                            this._pendingGeometryJobs > 0)) return [3 /*break*/, 3];
+                        if (!(epoch === this._convertEpoch && this._pendingGeometryJobs > 0)) return [3 /*break*/, 3];
                         return [4 /*yield*/, new Promise(function (resolve) { return setTimeout(resolve, 0); })];
                     case 2:
                         _a.sent();
@@ -2751,7 +2855,8 @@ var AcTrView2d = /** @class */ (function (_super) {
         else if (this._numOfEntitiesToProcess === 0) {
             // Always mark dirty when the queue drains. Progressive open throttles
             // mid-open paints, so the last batch would otherwise never redraw until
-            // the user pans/zooms (animate bails when !_isDirty && !stillLoading).
+            // the user pans/zooms (animate bails when !_isDirty && !_htmlDirty &&
+            // !stillLoading).
             this._isDirty = true;
         }
     };