@mlightcad/cad-simple-viewer 1.7.6 → 1.7.7-preview.0

package/lib/view/AcTrView2d.js

@@ -105,6 +105,7 @@ 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 { AcApOpenViewMode } from '../app/AcApOpenDatabaseOptions';
 import { AcApZoomCmd } from '../command/AcApZoomCmd';
 import { isMarkupHtmlTextEditing } from '../command/markup/AcApMarkupTextEdit';
 import { notifyMeasurementLayoutChanged } from '../command/measure/AcApMeasurementStore';
@@ -115,6 +116,7 @@ import { acedEntityIntersectsSelectionBox, acedNeedsCrossingGeometryRefine } fro
 import { isEffectiveSpatialQueryHit } from '../editor/view/AcEdSpatialQueryResult';
 import { AcTrGeometryUtil } from '../util';
 import { acapRunDatabaseEdit } from '../util/AcApDatabaseEdit';
+import { acapResolveLayoutFrameBox } from '../util/AcApLayoutViewFraming';
 import { collectTextStyleFontNames, planTextStyleFontPreload } from '../util/AcApTextStyleFontPreload';
 import { ACAP_READING_MODE_BACKGROUND, AcApReadingModeState } from './AcApReadingMode';
 import { trySelectReviewOverlay, trySelectReviewOverlaysByBox } from './AcEdReviewOverlayPick';
@@ -247,6 +249,12 @@ var AcTrView2d = /** @class */ (function (_super) {
          * race during document open.
          */
         _this._externallyFramedLayouts = new Set();
+        /**
+         * Open options → Initial view (`Extents` / `Saved`) for this document.
+         * Applied at document open for the startup layout, and again on the
+         * **first visit** to every other layout the user has not framed yet.
+         */
+        _this._openViewMode = AcApOpenViewMode.Extents;
         /**
          * Layer names with an in-flight {@link convertMissingEntitiesOnLayer} pass.
          *
@@ -2334,8 +2342,9 @@ var AcTrView2d = /** @class */ (function (_super) {
         var idsAdded = [];
         var results = this.pick(point);
         results.forEach(function (item) { return idsAdded.push(item.id); });
-        if (idsAdded.length > 0)
-            this.selectionSet.add(idsAdded);
+        var selectable = this.selectableIds(idsAdded, 'add');
+        if (selectable.length > 0)
+            this.selectionSet.add(selectable);
     };
     /**
      * @inheritdoc
@@ -2754,6 +2763,15 @@ var AcTrView2d = /** @class */ (function (_super) {
         this._initializedLayouts.add(layoutBtrId);
         this._externallyFramedLayouts.add(layoutBtrId);
     };
+    /**
+     * Records the Open options → Initial view choice for this document.
+     *
+     * Used by {@link applyInitialZoom} on the first visit to any layout that
+     * was not already framed at open time.
+     */
+    AcTrView2d.prototype.setOpenViewMode = function (mode) {
+        this._openViewMode = mode;
+    };
     /**
      * Whether the layout has already been visited (or framed by the
      * application layer), i.e. a switch to it will not run the first-visit
@@ -2781,41 +2799,18 @@ var AcTrView2d = /** @class */ (function (_super) {
         return undefined;
     };
     /**
-     * Applies the initial zoom-to-fit for a layout the user just switched
-     * into for the first time. Picks the best available "what should the
-     * camera frame?" signal in this order:
-     *
-     * 1. **`AcDbLayout.limits`** (LIMMIN/LIMMAX) — only when it actually
-     *    contains the layout's viewports. Many real DWGs ship with garbage
-     *    limits (e.g. `(0,0)-(12,9)` from a legacy template setup) that
-     *    don't reflect the actual paper sheet. We reject those by
-     *    checking containment against `viewportsBoundingBox`.
+     * Applies Open options → Initial view for a layout the user just switched
+     * into for the **first** time ({@link setOpenViewMode}).
      *
-     * 2. **`AcTrLayoutView.viewportsBoundingBox`** — bounding box of all
-     *    real user viewports in the layout. In production sheets viewports
-     *    typically span 70-90% of the paper, so this is a great proxy for
-     *    the printable area and (crucially) ignores outliers like title
-     *    blocks authored in a different unit/scale.
+     * - **Saved + model**: VPORT `*ACTIVE`, else geometry fallback.
+     * - **Saved + paper**: {@link acapResolveLayoutFrameBox} with limits
+     *   trusted only when they contain real viewports (rejects template
+     *   `(0,0)-(12,9)`), then viewports → layout extents → entity box.
+     * - **Extents**: frame converted geometry (and paper viewports as a
+     *   content proxy). Does not prefer LIMMIN/LIMMAX over drawable bounds.
      *
-     * 3. **`AcDbLayout.extents`** — the layout's own EXTMIN/EXTMAX, if
-     *    populated. Many parsers leave this empty (we've seen `(0,0)-(0,0)`),
-     *    so it sits below the viewport-based heuristic.
-     *
-     * 4. **`getDrawingExtents`** (entity extents from batch geometry) —
-     *    last-resort fallback for layouts with no viewports and no
-     *    sensible limits/extents (e.g. a freshly created empty paper).
-     *    Vulnerable to scale-mismatch outliers, but better than no zoom.
-     *
-     * **Critically, this runs through `AcEdConditionWaiter`**: at the
-     * moment `layoutSwitched` fires, the layout's entities (including its
-     * `AcDbViewport`s) have not yet been batch-converted into the scene
-     * — `loadLayoutEntitiesIfNeeded` chunked-converts via the progressive
-     * convert queue (or direct `batchConvert`).
-     * Without the waiter, `viewportsBoundingBox` returns undefined and
-     * the strategy degrades into (1) zooming to garbage `limits`, or
-     * (4) zooming to an empty scene box. The waiter polls
-     * {@link isProcessingEntities} (convert queue + deferred glyph jobs)
-     * and only fires the heuristic once conversion and text geometry finish.
+     * Runs through {@link AcEdConditionWaiter} so viewport / entity convert
+     * finishes before framing.
      */
     AcTrView2d.prototype.applyInitialZoom = function (btrId, layout) {
         var _this = this;
@@ -2823,40 +2818,58 @@ var AcTrView2d = /** @class */ (function (_super) {
             if (_this._externallyFramedLayouts.delete(btrId)) {
                 return;
             }
-            var limits = layout.limits;
-            var layoutView = _this._layoutViewManager.getAt(btrId);
-            var vpsBox = layoutView === null || layoutView === void 0 ? void 0 : layoutView.viewportsBoundingBox;
-            var limitsContainsViewports = (function () {
-                if (!limits || limits.isEmpty())
-                    return false;
-                if (!vpsBox)
-                    return true;
-                return (limits.min.x <= vpsBox.min.x &&
-                    limits.min.y <= vpsBox.min.y &&
-                    limits.max.x >= vpsBox.max.x &&
-                    limits.max.y >= vpsBox.max.y);
-            })();
-            if (limits && !limits.isEmpty() && limitsContainsViewports) {
-                _this.zoomTo(limits);
-            }
-            else if (vpsBox) {
-                _this.zoomTo(vpsBox);
-            }
-            else if (layout.extents && !layout.extents.isEmpty()) {
-                var extents = layout.extents;
-                _this.zoomTo(new AcGeBox2d({ x: extents.min.x, y: extents.min.y }, { x: extents.max.x, y: extents.max.y }));
-            }
-            else {
-                var box = _this.getDrawingExtents();
-                if (box) {
-                    _this.zoomTo(box);
-                }
+            var box = _this.resolveFirstVisitFrameBox(btrId, layout);
+            if (box) {
+                _this.zoomTo(box);
             }
             _this._isDirty = true;
             AcApZoomCmd.rememberOriginalView(_this, btrId);
         }, 300, 0);
         waiter.start();
     };
+    /**
+     * Resolves the camera box for a layout's first visit from
+     * {@link _openViewMode}.
+     */
+    AcTrView2d.prototype.resolveFirstVisitFrameBox = function (btrId, layout) {
+        var _a, _b;
+        var isModelSpace = btrId === this.modelSpaceBtrId;
+        var wantSaved = this._openViewMode === AcApOpenViewMode.Saved;
+        if (wantSaved && isModelSpace) {
+            var db = AcApDocManager.instance.curDocument.database;
+            var aspect = this.width / Math.max(this.height, 1);
+            var savedBox = db.tables.viewportTable.getActiveVportBox(aspect);
+            if (savedBox)
+                return savedBox;
+        }
+        var layoutView = this._layoutViewManager.getAt(btrId);
+        var extents = layout.extents;
+        var layoutExtents = extents && !extents.isEmpty()
+            ? {
+                min: { x: extents.min.x, y: extents.min.y },
+                max: { x: extents.max.x, y: extents.max.y }
+            }
+            : undefined;
+        var entityBox = this.getDrawingExtents();
+        var viewportsBox = layoutView === null || layoutView === void 0 ? void 0 : layoutView.viewportsBoundingBox;
+        if (wantSaved && !isModelSpace) {
+            // Paper Saved: trust LIMMIN/LIMMAX only when they contain viewports.
+            return (_a = acapResolveLayoutFrameBox({
+                limits: layout.limits,
+                viewportsBox: viewportsBox,
+                layoutExtents: layoutExtents,
+                entityBox: entityBox
+            })) === null || _a === void 0 ? void 0 : _a.box;
+        }
+        // Extents (any layout), or Saved model fallback without *ACTIVE:
+        // prefer drawable content; never lead with template model/paper limits.
+        return (_b = acapResolveLayoutFrameBox({
+            limits: undefined,
+            viewportsBox: isModelSpace ? undefined : viewportsBox,
+            layoutExtents: layoutExtents,
+            entityBox: entityBox
+        })) === null || _b === void 0 ? void 0 : _b.box;
+    };
     /**
      * Invalidates in-flight progressive convert and empties convert / deferred
      * queues without tearing down the renderer or DOM.
@@ -2889,6 +2902,7 @@ var AcTrView2d = /** @class */ (function (_super) {
         this._missedImages.clear();
         this._initializedLayouts.clear();
         this._externallyFramedLayouts.clear();
+        this._openViewMode = AcApOpenViewMode.Extents;
         this._loadingLayouts.clear();
         this._renderer.dispose();
         // Drop block templates when the scene is torn down (next open / close).
@@ -2906,6 +2920,7 @@ var AcTrView2d = /** @class */ (function (_super) {
             layoutViewManager: this._layoutViewManager,
             initializedLayouts: this._initializedLayouts,
             externallyFramedLayouts: this._externallyFramedLayouts,
+            openViewMode: this._openViewMode,
             loadingLayouts: this._loadingLayouts,
             missedImages: this._missedImages,
             missedFonts: this._renderer.snapshotMissedFonts(),
@@ -2918,7 +2933,7 @@ var AcTrView2d = /** @class */ (function (_super) {
      * @param state - Snapshot previously returned by {@link captureSessionState} or {@link beginNewSession}.
      */
     AcTrView2d.prototype.restoreSessionState = function (state) {
-        var _a;
+        var _a, _b;
         this._convertEpoch++;
         this.clearFontLoadedRedrawTimer();
         this.cancelOpenLineworkFrame();
@@ -2933,9 +2948,10 @@ var AcTrView2d = /** @class */ (function (_super) {
         this._layoutViewManager = state.layoutViewManager;
         this._initializedLayouts = state.initializedLayouts;
         this._externallyFramedLayouts = state.externallyFramedLayouts;
+        this._openViewMode = (_a = state.openViewMode) !== null && _a !== void 0 ? _a : AcApOpenViewMode.Extents;
         this._loadingLayouts = state.loadingLayouts;
         this._missedImages = state.missedImages;
-        this._renderer.replaceMissedFonts((_a = state.missedFonts) !== null && _a !== void 0 ? _a : {});
+        this._renderer.replaceMissedFonts((_b = state.missedFonts) !== null && _b !== void 0 ? _b : {});
         this.rebindLayerAppearance();
         this._layoutViewManager.resize(this.width, this.height);
         this.selectionSet.clear();
@@ -2966,6 +2982,7 @@ var AcTrView2d = /** @class */ (function (_super) {
         this._layoutViewManager = new AcTrLayoutViewManager();
         this._initializedLayouts = new Set();
         this._externallyFramedLayouts = new Set();
+        this._openViewMode = AcApOpenViewMode.Extents;
         this._loadingLayouts = new Set();
         this._missedImages = new Map();
         this._renderer.clearMissedFonts();