@mlightcad/cad-simple-viewer 1.6.3 → 1.7.0

package/lib/app/AcApDocManager.js

@@ -95,10 +95,12 @@ var __values = (this && this.__values) || function(o) {
 import { AcCmEventManager, AcDbDatabase, AcDbFileType, acdbHostApplicationServices, AcDbSysVarManager, AcGeBox2d, log } from '@mlightcad/data-model';
 import { FontManager } from '@mlightcad/mtext-renderer';
 import { AcTrMTextRenderer } from '@mlightcad/three-renderer';
-import { AcApAboutCmd, AcApArcCmd, acapBindMarkupSession, AcApCacheFontCmd, AcApCircleCmd, AcApClearMarkupsCmd, AcApClearMeasurementsCmd, AcApCloseCmd, AcApConvertToDxfCmd, AcApConvertToPngCmd, AcApCopyCmd, AcApDimLinearCmd, acapDisposeMarkupSession, AcApEllipseCmd, AcApEntityPreviewCmd, AcApEraseCmd, AcApHatchCmd, AcApHideObjectsCmd, AcApImageAttachCmd, AcApInsertCmd, AcApLayerCloseCmd, AcApLayerCmd, AcApLayerCurCmd, AcApLayerDelCmd, AcApLayerFreezeCmd, AcApLayerIsoCmd, AcApLayerLockCmd, AcApLayerOnCmd, AcApLayerPCmd, AcApLayerThawCmd, AcApLayerUnisoCmd, AcApLayerUnlockCmd, AcApLayoffCmd, AcApLineCmd, AcApLogCmd, AcApMarkupArrowCmd, AcApMarkupCalloutCmd, AcApMarkupCircleCmd, AcApMarkupCloudCmd, AcApMarkupExportCmd, AcApMarkupHighlightCmd, AcApMarkupImportCmd, AcApMarkupLineCmd, AcApMarkupRectCmd, AcApMarkupStampCmd, AcApMarkupTextCmd, AcApMarkupVisibilityCmd, AcApMeasureAngleCmd, AcApMeasureArcCmd, AcApMeasureAreaCmd, AcApMeasureDistanceCmd, AcApMeasurementExportCmd, AcApMeasurementImportCmd, AcApMeasurementVisibilityCmd, AcApMeasurePointCmd, AcApMLineCmd, AcApMoveCmd, AcApMTextCmd, AcApOffsetCmd, AcApOpenCmd, AcApPanCmd, AcApPointCmd, AcApPolygonCmd, AcApPolylineCmd, AcApQNewCmd, AcApRayCmd, AcApRectCmd, AcApRedoCmd, AcApRegenCmd, AcApRevCloudCmd, AcApRotateCmd, AcApSelectCmd, AcApSketchCmd, AcApSplineCmd, AcApSwitchBgCmd, AcApSysVarCmd, AcApUndoCmd, AcApUnisolateObjectsCmd, AcApXAttachCmd, AcApXLineCmd, AcApZoomCmd, resetMarkupSession, resetMeasurementSession } from '../command';
-import { AcEdCommandStack, AcEdOpenMode } from '../editor';
+import { AcApAboutCmd, AcApArcCmd, acapBindMarkupSession, AcApCacheFontCmd, AcApCircleCmd, AcApCloseCmd, AcApConvertToDxfCmd, AcApConvertToPngCmd, AcApCopyCmd, AcApDimLinearCmd, acapDisposeMarkupSession, AcApEllipseCmd, AcApEntityPreviewCmd, AcApEraseCmd, AcApHatchCmd, AcApHideObjectsCmd, AcApImageAttachCmd, AcApInsertCmd, AcApLayerCloseCmd, AcApLayerCmd, AcApLayerCurCmd, AcApLayerDelCmd, AcApLayerFreezeCmd, AcApLayerIsoCmd, AcApLayerLockCmd, AcApLayerOnCmd, AcApLayerPCmd, AcApLayerThawCmd, AcApLayerUnisoCmd, AcApLayerUnlockCmd, AcApLayoffCmd, AcApLineCmd, AcApLogCmd, AcApMLineCmd, AcApMoveCmd, AcApMTextCmd, AcApOffsetCmd, AcApOpenCmd, AcApPanCmd, AcApPointCmd, AcApPolygonCmd, AcApPolylineCmd, AcApQNewCmd, AcApRayCmd, AcApReadingModeCmd, AcApRectCmd, AcApRedoCmd, AcApRegenCmd, AcApRevCloudCmd, AcApRotateCmd, AcApSelectCmd, AcApSketchCmd, AcApSplineCmd, AcApSwitchBgCmd, AcApSysVarCmd, AcApUndoCmd, AcApUnisolateObjectsCmd, AcApXAttachCmd, AcApXLineCmd, AcApZoomCmd, resetMarkupSession, resetMeasurementSession } from '../command';
+import { acapGetDrawStyleSessionAccessory } from '../command/AcApDrawStyleSession';
+import { registerMarkupCommands } from '../command/markup/AcApRegisterMarkupCommands';
+import { registerMeasureCommands } from '../command/measure/AcApRegisterMeasureCommands';
+import { AcEdCommandStack, AcEdOpenMode, eventBus } from '../editor';
 import { AcApPluginManager } from '../plugin/AcApPluginManager';
-import { AcApDrawStyleToolbar } from '../ui/AcApDrawStyleToolbar';
 import { isScriptQuitCommand, parseScriptLines } from '../util/AcApScriptParser';
 import { acapWithSecondaryDatabase } from '../util/AcApSecondaryDatabase';
 import { AcTrView2d } from '../view';
@@ -106,14 +108,15 @@ import { AcApBusyIndicator } from './AcApBusyIndicator';
 import { acapBindCommandServices } from './AcApCommandServices';
 import { AcApContext } from './AcApContext';
 import { AcApDocSession } from './AcApDocSession';
+import { ACAP_DEFAULT_DOCS_BASE_URL, acapSetDocsBaseUrl } from './AcApDocsUrl';
 import { AcApDocument } from './AcApDocument';
 import { AcApFontLoader } from './AcApFontLoader';
+import { AcApOpenViewMode } from './AcApOpenDatabaseOptions';
 import { acapInstallOpenFileDialog, acapUninstallOpenFileDialog, acapUpdateOpenFileDialogOptions } from './AcApOpenFileDialog';
 import { AcApOpenFileProfiler } from './AcApOpenFileProfiler';
 import { AcApOpenFileProgressController } from './AcApOpenFileProgressController';
 import { checkWebworkerReadiness, DEFAULT_WEBWORKER_FILE_URLS, resetWebworkerReadinessCache } from './AcApWebworkerReadiness';
 import { AcApXrefManager } from './AcApXrefManager';
-import { AcApOpenViewMode } from './AcDbOpenDatabaseOptions';
 var DEFAULT_BASE_URL = 'https://cdn.jsdelivr.net/gh/mlightcad/cad-data';
 /** Default ISO drawing template loaded by {@link AcApDocManager.newDocument}. */
 var DEFAULT_NEW_DRAWING_TEMPLATE = 'templates/acadiso.dxf';
@@ -165,7 +168,8 @@ var DEFAULT_COMMAND_ALIASES = {
     XLINE: ['XL'],
     ZOOM: ['Z'],
     UNDO: ['U'],
-    REDO: ['REDO']
+    REDO: ['REDO'],
+    READINGMODE: ['RM']
 };
 /** AutoCAD-era default font fallback chain used when glyphs are missing. */
 var DEFAULT_FONTS_PRESET = 'modern';
@@ -194,7 +198,7 @@ var AcApDocManager = /** @class */ (function () {
     function AcApDocManager(options) {
         if (options === void 0) { options = {}; }
         var _this = this;
-        var _a, _b, _c, _d;
+        var _a, _b, _c, _d, _e;
         /** Open document sessions (MDI). The shared view shows {@link _activeSession}. */
         this._sessions = [];
         /** Monotonic id suffix for {@link AcApDocSession.id}. */
@@ -223,8 +227,10 @@ var AcApDocManager = /** @class */ (function () {
             workersReady: new AcCmEventManager()
         };
         this._baseUrl = (_a = options.baseUrl) !== null && _a !== void 0 ? _a : DEFAULT_BASE_URL;
+        acapSetDocsBaseUrl((_b = options.docsBaseUrl) !== null && _b !== void 0 ? _b : ACAP_DEFAULT_DOCS_BASE_URL);
         this._commandAliasOverrides = this.normalizeCommandAliasConfig(options.commandAliases);
         this._openDocumentDefaults = options.openDocumentDefaults;
+        this._disableExport = options.disableExport === true;
         if (options.useMainThreadDraw) {
             AcTrMTextRenderer.getInstance().setRenderMode('main');
         }
@@ -238,7 +244,7 @@ var AcApDocManager = /** @class */ (function () {
         void AcTrMTextRenderer.getInstance().setAwaitFontsBeforeDraw(true);
         // Create one empty drawing
         var doc = new AcApDocument();
-        var initialSize = (_c = (_b = options.container) === null || _b === void 0 ? void 0 : _b.getBoundingClientRect()) !== null && _c !== void 0 ? _c : {
+        var initialSize = (_d = (_c = options.container) === null || _c === void 0 ? void 0 : _c.getBoundingClientRect()) !== null && _d !== void 0 ? _d : {
             width: 300,
             height: 150
         };
@@ -274,17 +280,17 @@ var AcApDocManager = /** @class */ (function () {
         this._activeSession = new AcApDocSession("doc-".concat(this._nextSessionId++), context);
         this._sessions = [this._activeSession];
         acapBindMarkupSession(this._activeSession.id);
-        this._drawStyleToolbar = new AcApDrawStyleToolbar(view);
         this._fontLoader = new AcApFontLoader();
+        // Share one DefaultFontLoader cache between UI catalog and on-demand draws.
+        FontManager.instance.setFontLoader(this._fontLoader.fontLoader);
         var fontsUrl = this.resolveFontsBaseUrl();
         this._fontLoader.baseUrl = fontsUrl;
-        // On-demand loads go through FontManager's loader, not AcApFontLoader.
         FontManager.instance.baseUrl = fontsUrl;
         acdbHostApplicationServices().workingDatabase = doc.database;
         this._commandManager = new AcEdCommandStack();
         this.registerCommands();
         this._pluginManager = new AcApPluginManager(this.context, this._commandManager);
-        var busyHost = (_d = options.busyIndicatorHost) !== null && _d !== void 0 ? _d : view.container;
+        var busyHost = (_e = options.busyIndicatorHost) !== null && _e !== void 0 ? _e : view.container;
         this._busyIndicatorHost = busyHost;
         this._openFileProgress = new AcApOpenFileProgressController(busyHost);
         this._openFileProgress.setSceneBusyGate(function () { return _this.openProgressView.isProcessingEntities; });
@@ -364,6 +370,13 @@ var AcApDocManager = /** @class */ (function () {
         enumerable: false,
         configurable: true
     });
+    /**
+     * Returns the singleton when {@link createInstance} has finished, otherwise
+     * `undefined`. Safe to call while the constructor is still running.
+     */
+    AcApDocManager.tryGetInstance = function () {
+        return AcApDocManager._instance;
+    };
     /**
      * Destroy the view and unload all plugins
      */
@@ -799,13 +812,12 @@ var AcApDocManager = /** @class */ (function () {
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(AcApDocManager.prototype, "drawStyleToolbar", {
+    Object.defineProperty(AcApDocManager.prototype, "drawStyleSessionAccessory", {
         /**
-         * Overlay shown in the filename slot while a measurement or markup
-         * drawing command is active.
+         * Color / font-size session accessory for measurement and markup drawing.
          */
         get: function () {
-            return this._drawStyleToolbar;
+            return acapGetDrawStyleSessionAccessory(this._mainView);
         },
         enumerable: false,
         configurable: true
@@ -820,6 +832,17 @@ var AcApDocManager = /** @class */ (function () {
         enumerable: false,
         configurable: true
     });
+    Object.defineProperty(AcApDocManager.prototype, "disableExport", {
+        /**
+         * Whether drawing export commands (and host export UI) are disabled.
+         * Set via {@link AcApDocManagerOptions.disableExport}; defaults to false.
+         */
+        get: function () {
+            return this._disableExport;
+        },
+        enumerable: false,
+        configurable: true
+    });
     /**
      * Resolves colors for creating new entities.
      *
@@ -868,6 +891,8 @@ var AcApDocManager = /** @class */ (function () {
          * Gets the list of available fonts that can be loaded.
          *
          * Note: These fonts are available for loading but may not be loaded yet.
+         * Prefer {@link getAvaiableFonts} when the catalog may not have been fetched yet
+         * (lazy font loading no longer preloads metadata at viewer init).
          *
          * @returns Array of available font names
          */
@@ -877,6 +902,31 @@ var AcApDocManager = /** @class */ (function () {
         enumerable: false,
         configurable: true
     });
+    /**
+     * Fetches font repository metadata (`fonts.json`) if not already cached.
+     * Emits `failed-to-get-avaiable-fonts` and returns `[]` when the catalog cannot
+     * be retrieved.
+     */
+    AcApDocManager.prototype.getAvaiableFonts = function () {
+        return __awaiter(this, void 0, void 0, function () {
+            var _a;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        _b.trys.push([0, 2, , 3]);
+                        return [4 /*yield*/, this._fontLoader.getAvaiableFonts()];
+                    case 1: return [2 /*return*/, _b.sent()];
+                    case 2:
+                        _a = _b.sent();
+                        eventBus.emit('failed-to-get-avaiable-fonts', {
+                            url: this._fontLoader.baseUrl
+                        });
+                        return [2 /*return*/, []];
+                    case 3: return [2 /*return*/];
+                }
+            });
+        });
+    };
     /**
      * Loads the specified fonts for text rendering.
      *
@@ -905,7 +955,7 @@ var AcApDocManager = /** @class */ (function () {
      *
      * This method loads either the specified fonts or the configured default font
      * fallback chains ({@link DEFAULT_FONTS_PRESET}, currently `modern`: text
-     * `hztxt` 鈫?`simsun`, symbol `amgdt`) if no fonts are provided. The loaded
+     * `simsun` → `hztxt`, symbol `amgdt`) if no fonts are provided. The loaded
      * fonts are used for rendering CAD text entities like MText and Text in the viewer.
      *
      * It is better to load default fonts when viewer is initialized so that the viewer can
@@ -1287,6 +1337,39 @@ var AcApDocManager = /** @class */ (function () {
         var target = view !== null && view !== void 0 ? view : this.curView;
         target.setCompareDisplay(options);
     };
+    /**
+     * Whether transient reading mode is active on a view (default: current view).
+     *
+     * @param view - Target canvas; defaults to {@link curView}.
+     */
+    AcApDocManager.prototype.isReadingModeEnabled = function (view) {
+        var target = view !== null && view !== void 0 ? view : this.curView;
+        return target.readingModeEnabled;
+    };
+    /**
+     * Enables or disables transient reading mode on a view (default: current view).
+     *
+     * Reading mode forces black linework on a white canvas without modifying the
+     * drawing database. It shares the compare-display colour path, so it is
+     * mutually exclusive with active compare display on that view.
+     *
+     * @param enabled - When true, enables reading mode; when false, restores the
+     *   previous canvas background and entity colours.
+     * @param view - Target canvas; defaults to {@link curView}.
+     */
+    AcApDocManager.prototype.setReadingMode = function (enabled, view) {
+        var target = view !== null && view !== void 0 ? view : this.curView;
+        target.setReadingMode(enabled);
+    };
+    /**
+     * Toggles transient reading mode on a view (default: current view).
+     *
+     * @param view - Target canvas; defaults to {@link curView}.
+     */
+    AcApDocManager.prototype.toggleReadingMode = function (view) {
+        var target = view !== null && view !== void 0 ? view : this.curView;
+        target.toggleReadingMode();
+    };
     /**
      * Applies compare-display coloring to one overlay layout.
      *
@@ -1485,8 +1568,8 @@ var AcApDocManager = /** @class */ (function () {
      * Registers all default commands available in the CAD viewer.
      *
      * This method sets up the command system by registering built-in commands including:
-     * - cdxf: Convert to DXF
-     * - pngout: Export to PNG
+     * - cdxf: Convert to DXF (when {@link AcApDocManagerOptions.disableExport} is false)
+     * - pngout: Export to PNG (when {@link AcApDocManagerOptions.disableExport} is false)
      * - log: Output debug information in console
      * - open: Open document
      * - qnew: Quick new document
@@ -1521,22 +1604,19 @@ var AcApDocManager = /** @class */ (function () {
         addSystemCommand('cachefont', 'cachefont', new AcApCacheFontCmd());
         addSystemCommand('circle', 'circle', new AcApCircleCmd());
         addSystemCommand('close', 'close', new AcApCloseCmd());
-        addSystemCommand('cdxf', 'cdxf', new AcApConvertToDxfCmd());
-        addSystemCommand('pngout', 'pngout', new AcApConvertToPngCmd());
+        if (!this._disableExport) {
+            addSystemCommand('cdxf', 'cdxf', new AcApConvertToDxfCmd());
+            addSystemCommand('pngout', 'pngout', new AcApConvertToPngCmd());
+        }
         addSystemCommand('entout', 'entout', new AcApEntityPreviewCmd());
         addSystemCommand('ellipse', 'ellipse', new AcApEllipseCmd());
         addSystemCommand('erase', 'erase', new AcApEraseCmd());
         addSystemCommand('hideobjects', 'hideobjects', new AcApHideObjectsCmd());
         addSystemCommand('dimlinear', 'dimlinear', new AcApDimLinearCmd());
-        addSystemCommand('measuredistance', 'measuredistance', new AcApMeasureDistanceCmd());
-        addSystemCommand('measurearea', 'measurearea', new AcApMeasureAreaCmd());
-        addSystemCommand('measureangle', 'measureangle', new AcApMeasureAngleCmd());
-        addSystemCommand('measurearc', 'measurearc', new AcApMeasureArcCmd());
-        addSystemCommand('measurepoint', 'measurepoint', new AcApMeasurePointCmd());
-        addSystemCommand('clearmeasurements', 'clearmeasurements', new AcApClearMeasurementsCmd());
-        addSystemCommand('measurementvis', 'measurementvis', new AcApMeasurementVisibilityCmd());
-        addSystemCommand('measurementexport', 'measurementexport', new AcApMeasurementExportCmd());
-        addSystemCommand('measurementimport', 'measurementimport', new AcApMeasurementImportCmd());
+        registerMeasureCommands(addSystemCommand, {
+            view: this._mainView,
+            commandManager: this._commandManager
+        });
         addSystemCommand('-hatch', '-hatch', new AcApHatchCmd());
         addSystemCommand('imageattach', 'imageattach', new AcApImageAttachCmd());
         addSystemCommand('-insert', '-insert', new AcApInsertCmd());
@@ -1572,23 +1652,15 @@ var AcApDocManager = /** @class */ (function () {
         addSystemCommand('rectang', 'rectang', new AcApRectCmd());
         addSystemCommand('regen', 'regen', new AcApRegenCmd());
         addSystemCommand('revcloud', 'revcloud', new AcApRevCloudCmd());
-        addSystemCommand('markuptext', 'markuptext', new AcApMarkupTextCmd());
-        addSystemCommand('markupline', 'markupline', new AcApMarkupLineCmd());
-        addSystemCommand('markuparrow', 'markuparrow', new AcApMarkupArrowCmd());
-        addSystemCommand('markupcloud', 'markupcloud', new AcApMarkupCloudCmd());
-        addSystemCommand('markuprect', 'markuprect', new AcApMarkupRectCmd());
-        addSystemCommand('markupcircle', 'markupcircle', new AcApMarkupCircleCmd());
-        addSystemCommand('markuphighlight', 'markuphighlight', new AcApMarkupHighlightCmd());
-        addSystemCommand('markupcallout', 'markupcallout', new AcApMarkupCalloutCmd());
-        addSystemCommand('markupstamp', 'markupstamp', new AcApMarkupStampCmd());
-        addSystemCommand('markupvis', 'markupvis', new AcApMarkupVisibilityCmd());
-        addSystemCommand('clearmarkups', 'clearmarkups', new AcApClearMarkupsCmd());
-        addSystemCommand('markupexport', 'markupexport', new AcApMarkupExportCmd());
-        addSystemCommand('markupimport', 'markupimport', new AcApMarkupImportCmd());
+        registerMarkupCommands(addSystemCommand, {
+            view: this._mainView,
+            commandManager: this._commandManager
+        });
         addSystemCommand('select', 'select', new AcApSelectCmd());
         addSystemCommand('sketch', 'sketch', new AcApSketchCmd());
         addSystemCommand('spline', 'spline', new AcApSplineCmd());
         addSystemCommand('switchbg', 'switchbg', new AcApSwitchBgCmd());
+        addSystemCommand('readingmode', 'readingmode', new AcApReadingModeCmd());
         addSystemCommand('unisolateobjects', 'unisolateobjects', new AcApUnisolateObjectsCmd());
         addSystemCommand('xline', 'xline', new AcApXLineCmd());
         addSystemCommand('undo', 'undo', new AcApUndoCmd());
@@ -1774,7 +1846,7 @@ var AcApDocManager = /** @class */ (function () {
      */
     AcApDocManager.prototype.executeNamedCommand = function (cmdName, options) {
         return __awaiter(this, void 0, void 0, function () {
-            var documentMode, cmd, loaded, promise;
+            var documentMode, cmd, loaded;
             var _this = this;
             var _a, _b;
             return __generator(this, function (_c) {
@@ -1803,22 +1875,42 @@ var AcApDocManager = /** @class */ (function () {
                         // starting this one. The previous command's pending prompt is rejected
                         // with `AcEdPromptStatus.Cancel`, and we await its `trigger()` settlement
                         // so its `commandEnded` lifecycle finishes before the new one begins.
-                        return [4 /*yield*/, this._commandManager.cancelActive()];
+                        return [4 /*yield*/, this._commandManager.cancelActive()
+                            // markActive must run before trigger(): the first getPoint prompt is
+                            // opened synchronously until the first await, and the mobile session
+                            // accessory reads commandManager.activeCommand.
+                        ];
                     case 3:
                         // AutoCAD-style command exclusivity: cancel any in-flight command before
                         // starting this one. The previous command's pending prompt is rejected
                         // with `AcEdPromptStatus.Cancel`, and we await its `trigger()` settlement
                         // so its `commandEnded` lifecycle finishes before the new one begins.
                         _c.sent();
-                        promise = cmd.trigger(this.context).finally(function () {
-                            if (!options.preserveScriptInputs) {
-                                _this.editor.clearScriptInputs();
-                            }
-                            _this._commandManager.clearActive(cmd);
-                        });
-                        this._commandManager.markActive(cmd, this.curView, promise);
-                        return [4 /*yield*/, promise];
+                        // markActive must run before trigger(): the first getPoint prompt is
+                        // opened synchronously until the first await, and the mobile session
+                        // accessory reads commandManager.activeCommand.
+                        return [4 /*yield*/, this._commandManager.runActive(cmd, this.curView, function () { return __awaiter(_this, void 0, void 0, function () {
+                                return __generator(this, function (_a) {
+                                    switch (_a.label) {
+                                        case 0:
+                                            _a.trys.push([0, , 2, 3]);
+                                            return [4 /*yield*/, cmd.trigger(this.context)];
+                                        case 1:
+                                            _a.sent();
+                                            return [3 /*break*/, 3];
+                                        case 2:
+                                            if (!options.preserveScriptInputs) {
+                                                this.editor.clearScriptInputs();
+                                            }
+                                            return [7 /*endfinally*/];
+                                        case 3: return [2 /*return*/];
+                                    }
+                                });
+                            }); })];
                     case 4:
+                        // markActive must run before trigger(): the first getPoint prompt is
+                        // opened synchronously until the first await, and the mobile session
+                        // accessory reads commandManager.activeCommand.
                         _c.sent();
                         return [2 /*return*/];
                 }
@@ -1894,6 +1986,7 @@ var AcApDocManager = /** @class */ (function () {
             // Drop overlay / markup history before view.clear() disposes HTML.
             resetMeasurementSession();
             resetMarkupSession();
+            AcApZoomCmd.clearOriginalViews();
             this.openProgressView.clear();
         }
         this.openProgressView.bindDrawDatabase(this.context.doc.database);
@@ -1970,8 +2063,10 @@ var AcApDocManager = /** @class */ (function () {
             var layoutLimits = activeLayout === null || activeLayout === void 0 ? void 0 : activeLayout.limits;
             var openViewMode = this.resolveOpenViewMode(options);
             var progressiveRendering = (_b = options === null || options === void 0 ? void 0 : options.progressiveRendering) !== null && _b !== void 0 ? _b : false;
+            var framedSynchronously = false;
             if (isPaperSpaceActive && layoutLimits && !layoutLimits.isEmpty()) {
                 view.zoomTo(layoutLimits);
+                framedSynchronously = true;
             }
             else if (openViewMode === AcApOpenViewMode.Extents) {
                 if (progressiveRendering) {
@@ -1988,9 +2083,11 @@ var AcApDocManager = /** @class */ (function () {
                 var activeModelViewBox = vport === null || vport === void 0 ? void 0 : vport.modelViewBox(canvasAspect);
                 if (activeModelViewBox) {
                     view.zoomTo(activeModelViewBox);
+                    framedSynchronously = true;
                 }
                 else if (this.hasUsableDrawingExtents(db)) {
                     view.zoomTo(new AcGeBox2d(db.extmin, db.extmax));
+                    framedSynchronously = true;
                 }
                 else {
                     if (progressiveRendering) {
@@ -2012,6 +2109,11 @@ var AcApDocManager = /** @class */ (function () {
             // above relies on `curView` being an `AcTrView2d`, and the
             // markLayoutAsInitialized method is part of that contract.
             view.markLayoutAsInitialized(db.currentSpaceId);
+            // `zoomToFitDrawing` frames asynchronously; capture original view in
+            // its completion callback instead of here (pre-fit camera is wrong).
+            if (framedSynchronously) {
+                AcApZoomCmd.rememberOriginalView(view, db.currentSpaceId);
+            }
             // OPENPROF: db.read is done; wait for batchConvert to drain, then print.
             this._openFileProfiler.markReadCompleteAndScheduleReport(view);
         }