@mlightcad/cad-simple-viewer 1.6.3 → 1.7.1

package/lib/editor/input/ui/AcEdInputManager.js

@@ -88,13 +88,23 @@ var __values = (this && this.__values) || function(o) {
 import { acdbHostApplicationServices, AcDbSystemVariables, AcDbSysVarManager, AcGeBox2d } from '@mlightcad/data-model';
 import { AcApDocManager, AcApSettingManager } from '../../../app';
 import { AcApI18n } from '../../../i18n';
+import { AcUiTouchPointTutorialDialog } from '../../../ui/AcUiTouchPointTutorialDialog';
+import { acedIsMobileUiLayout, acedShouldHideDesktopCommandLine, acedSubscribeUiLayout } from '../../global/AcEdUiLayout';
 import { AcEdSelectionSet } from '../AcEdSelectionSet';
 import { AcEdAngleHandler, AcEdDistanceHandler, AcEdDoubleHandler, AcEdIntegerHandler, AcEdPointHandler, AcEdStringHandler } from '../handler';
 import { AcEdKeywordHandler } from '../handler/AcEdKeywordHandler';
+import { AcEdMarkerManager } from '../marker';
 import { AcEdPromptBoxResult, AcEdPromptDoubleResult, AcEdPromptEntityResult, AcEdPromptIntegerResult, AcEdPromptKeywordOptions, AcEdPromptOptions, AcEdPromptPointOptions, AcEdPromptPointResult, AcEdPromptResult, AcEdPromptSelectionResult, AcEdPromptStatus } from '../prompt';
 import { AcEdCommandLine } from './AcEdCommandLine';
+import { AcEdEntityPickCancelChrome } from './AcEdEntityPickCancelChrome';
 import { AcEdFloatingInput } from './AcEdFloatingInput';
 import { AcEdFloatingMessage } from './AcEdFloatingMessage';
+import { acedInteractionStrategy } from './AcEdInteractionStrategy';
+import { acedAttachMobileBoxGesture } from './AcEdMobileBoxGesture';
+import { AcEdMobileCommandChrome } from './AcEdMobileCommandChrome';
+import { acedComputeSessionMetrics } from './AcEdMobileSessionMetrics';
+import { AcEdSessionAccessoryController } from './AcEdSessionAccessoryController';
+import { acedIsTouchDerivedMouseEvent, acedIsTouchLongPressContextMenu, acedShouldIgnoreCompatMouse } from './AcEdTouchPointSession';
 /**
  * Internal control-flow error used to propagate keyword picks out of
  * floating-input loops.
@@ -139,10 +149,23 @@ var AcEdInputManager = /** @class */ (function () {
      * positioning and live preview updates.
      *
      * @param view - The view associated with the input manager
+     * @param editorEvents - Editor event bus; passed in because `view.editor` is
+     *   not assigned until {@link AcEditor} finishes constructing.
      */
-    function AcEdInputManager(view) {
+    function AcEdInputManager(view, editorEvents) {
+        var _this = this;
         /** Stores last confirmed point from getPoint() or getBox() */
         this.lastPoint = null;
+        /**
+         * Plus marks at confirmed pick points for the active command.
+         * Positions accumulate across sequential {@link getPoint} prompts (including
+         * scripted ones); DOM marks appear only when a later interactive prompt
+         * starts so single-point commands do not flash a mark. Cleared on command end.
+         */
+        this._confirmedPointMarks = null;
+        this._confirmedPointPositions = [];
+        /** Top-right X shown during mobile entity picks (below message bar). */
+        this._entityPickCancel = null;
         /** Buffered command-line style inputs (each item is one Enter-confirmed value). */
         this._scriptInputs = [];
         /** Current modifier key state during input sessions. */
@@ -172,7 +195,12 @@ var AcEdInputManager = /** @class */ (function () {
          * their sub-prompts sequentially), so a single slot is sufficient.
          */
         this._activeRejector = null;
+        /** Latest cancel callback for {@link _entityPickCancel}. */
+        this._entityPickCancelOnCancel = null;
         this.view = view;
+        this._boundRepositionConfirmedPointMarks = function () {
+            return _this.repositionConfirmedPointMarks();
+        };
         this.injectCSS();
         // Newly added UI overlays (command line, previews) are container-local.
         // Ensure absolute-positioned children are anchored to this view only.
@@ -182,11 +210,80 @@ var AcEdInputManager = /** @class */ (function () {
         }
         var commandLine = new AcEdCommandLine(this.view.container);
         this._commandLine = commandLine;
-        commandLine.visible = AcApSettingManager.instance.isShowCommandLine;
+        this._mobileChrome = new AcEdMobileCommandChrome(this.view.container);
+        this._sessionAccessoryController = new AcEdSessionAccessoryController({
+            view: this.view,
+            getMobileChrome: function () { return _this._mobileChrome; },
+            isMobilePromptOpen: function () { return _this._mobileChrome.isOpen; },
+            getEditorEvents: function () { return editorEvents; }
+        });
+        this._sessionAccessoryController.bindEditorEvents();
+        this.syncDesktopCommandLineVisibility();
         AcApSettingManager.instance.events.modified.addEventListener(function () {
-            commandLine.visible = AcApSettingManager.instance.isShowCommandLine;
+            _this.syncDesktopCommandLineVisibility();
+        });
+        acedSubscribeUiLayout(function () {
+            _this.syncDesktopCommandLineVisibility();
+            if (!acedInteractionStrategy().point.usesSessionChrome &&
+                _this._mobileChrome.isOpen) {
+                _this._mobileChrome.hide();
+            }
+            _this._sessionAccessoryController.remountActiveSessionAccessory();
+        });
+        this.view.events.viewChanged.addEventListener(this._boundRepositionConfirmedPointMarks);
+        this.view.events.viewResize.addEventListener(this._boundRepositionConfirmedPointMarks);
+        // Safety net: if a prompt failed to clean up, close the mobile session
+        // panel when the command finishes so the bottom chrome cannot linger.
+        // Also clear confirmed-point plus marks for the finished command.
+        editorEvents.commandEnded.addEventListener(function () {
+            _this.clearConfirmedPointMarks();
+            if (_this._mobileChrome.isOpen) {
+                _this.endMobilePrompt();
+            }
         });
     }
+    Object.defineProperty(AcEdInputManager.prototype, "isMobilePromptOpen", {
+        /**
+         * Whether the phone/pad bottom session panel is open for the current prompt.
+         */
+        get: function () {
+            return this._mobileChrome.isOpen;
+        },
+        enumerable: false,
+        configurable: true
+    });
+    Object.defineProperty(AcEdInputManager.prototype, "mobileChrome", {
+        /** Mobile session panel chrome. */
+        get: function () {
+            return this._mobileChrome;
+        },
+        enumerable: false,
+        configurable: true
+    });
+    Object.defineProperty(AcEdInputManager.prototype, "sessionAccessoryHost", {
+        /** Active mount target for session accessories. */
+        get: function () {
+            return this._sessionAccessoryController.sessionAccessoryHost;
+        },
+        enumerable: false,
+        configurable: true
+    });
+    Object.defineProperty(AcEdInputManager.prototype, "selectionSessionAccessory", {
+        /** Selection-driven accessory shown when no command accessory is mounted. */
+        get: function () {
+            return this._sessionAccessoryController.selectionSessionAccessory;
+        },
+        /**
+         * Updates the selection-driven accessory on the session accessory controller.
+         *
+         * @param value - Accessory to show on selection, or `null` to clear.
+         */
+        set: function (value) {
+            this._sessionAccessoryController.selectionSessionAccessory = value;
+        },
+        enumerable: false,
+        configurable: true
+    });
     Object.defineProperty(AcEdInputManager.prototype, "isActive", {
         /**
          * The flag to indicate whether it is currently in an “input acquisition” mode (e.g., point
@@ -250,6 +347,110 @@ var AcEdInputManager = /** @class */ (function () {
         this._activeRejector = null;
         rejector();
     };
+    /**
+     * Shows or hides the desktop command line according to settings and layout.
+     */
+    AcEdInputManager.prototype.syncDesktopCommandLineVisibility = function () {
+        var hide = acedShouldHideDesktopCommandLine(this.active);
+        this._commandLine.visible =
+            !hide && AcApSettingManager.instance.isShowCommandLine;
+    };
+    /**
+     * Visible keyword chips for the mobile session panel.
+     */
+    AcEdInputManager.prototype.mobileKeywordChips = function (options) {
+        var _a, _b;
+        return ((_b = (_a = options.keywords) === null || _a === void 0 ? void 0 : _a.toArray()) !== null && _b !== void 0 ? _b : [])
+            .filter(function (kw) { return kw.visible; })
+            .map(function (kw) { return ({
+            displayName: kw.displayName,
+            globalName: kw.globalName,
+            enabled: kw.enabled
+        }); });
+    };
+    /**
+     * Opens the mobile command chrome for the current prompt when on phone/pad.
+     */
+    AcEdInputManager.prototype.beginMobilePrompt = function (args) {
+        var _a;
+        this.syncDesktopCommandLineVisibility();
+        if (!acedInteractionStrategy().point.usesSessionChrome)
+            return;
+        this._mobileChrome.show({
+            prompt: args.prompt,
+            keywords: (_a = args.keywords) !== null && _a !== void 0 ? _a : [],
+            allowNone: args.allowNone,
+            showMetrics: args.showMetrics,
+            showStringInput: args.showStringInput,
+            stringValue: args.stringValue,
+            stringPlaceholder: args.stringPlaceholder
+        }, {
+            onConfirm: args.onConfirm,
+            onCancel: args.onCancel,
+            onKeyword: args.onKeyword
+        });
+        this._sessionAccessoryController.remountActiveSessionAccessory();
+        if (args.touchPointTutorial) {
+            void AcUiTouchPointTutorialDialog.maybeShow(this.view.container);
+        }
+    };
+    /** Closes the mobile command chrome and restores desktop CLI visibility. */
+    AcEdInputManager.prototype.endMobilePrompt = function () {
+        this._mobileChrome.hide();
+        this.syncDesktopCommandLineVisibility();
+        this._sessionAccessoryController.remountActiveSessionAccessory();
+    };
+    /**
+     * Shows the top-right entity-pick cancel button on mobile layouts only.
+     *
+     * @param onCancel - Invoked when the user taps X.
+     */
+    AcEdInputManager.prototype.showEntityPickCancel = function (onCancel) {
+        var _this = this;
+        if (!acedIsMobileUiLayout()) {
+            this.hideEntityPickCancel();
+            return;
+        }
+        if (!this._entityPickCancel) {
+            this._entityPickCancel = new AcEdEntityPickCancelChrome({
+                container: this.view.container,
+                onCancel: function () { var _a; return (_a = _this._entityPickCancelOnCancel) === null || _a === void 0 ? void 0 : _a.call(_this); },
+                label: AcApI18n.t('main.entityPick.cancel'),
+                topOffsetPx: 48
+            });
+        }
+        else {
+            this._entityPickCancel.setLabel(AcApI18n.t('main.entityPick.cancel'));
+        }
+        this._entityPickCancelOnCancel = onCancel;
+        this._entityPickCancel.show();
+    };
+    /** Hides the mobile entity-pick cancel button. */
+    AcEdInputManager.prototype.hideEntityPickCancel = function () {
+        var _a;
+        this._entityPickCancelOnCancel = null;
+        (_a = this._entityPickCancel) === null || _a === void 0 ? void 0 : _a.hide();
+    };
+    /**
+     * Pushes live length/angle/Δ values into the mobile session panel.
+     */
+    AcEdInputManager.prototype.pushMobileMetrics = function (cursor, basePoint) {
+        if (!this._mobileChrome.isOpen)
+            return;
+        var metrics = acedComputeSessionMetrics(cursor, basePoint);
+        // A zero-length rubber-band (cursor still on lastPoint after lift / before
+        // the next press) must not wipe the previous readout.
+        if (metrics.hasBasePoint && metrics.length === 0)
+            return;
+        this._mobileChrome.setMetrics(metrics, {
+            length: this.formatNumber(metrics.length, 'distance'),
+            angle: this.formatNumber(metrics.angleDeg, 'angle'),
+            dx: this.formatNumber(metrics.dx, 'point'),
+            dy: this.formatNumber(metrics.dy, 'point'),
+            x: this.formatNumber(metrics.x, 'point'),
+            y: this.formatNumber(metrics.y, 'point')
+        });
+    };
     /**
      * Queue scripted inputs for subsequent getXXX calls.
      * One array item equals one Enter-confirmed value.
@@ -710,7 +911,8 @@ var AcEdInputManager = /** @class */ (function () {
             inputCount: 1,
             promptOptions: options,
             handler: handler,
-            getDynamicValue: getDynamicValue
+            getDynamicValue: getDynamicValue,
+            showMetrics: false
         });
     };
     /**
@@ -779,6 +981,7 @@ var AcEdInputManager = /** @class */ (function () {
                                         floatingInput === null || floatingInput === void 0 ? void 0 : floatingInput.setBasePoint(firstPoint, {
                                             showBaseLineOnly: !options.useDashedLine
                                         });
+                                        _this._mobileChrome.update({ showMetrics: true });
                                         return false;
                                     }
                                     return true;
@@ -966,7 +1169,11 @@ var AcEdInputManager = /** @class */ (function () {
                                             inputCount: 1,
                                             promptOptions: options,
                                             handler: handler,
-                                            getDynamicValue: getDynamicValue
+                                            getDynamicValue: getDynamicValue,
+                                            showMetrics: false,
+                                            showStringInput: true,
+                                            // String value comes from the session panel / typed boxes, not picks.
+                                            allowPickCommit: false
                                         })];
                                 case 1: return [2 /*return*/, _a.sent()];
                             }
@@ -998,36 +1205,49 @@ var AcEdInputManager = /** @class */ (function () {
                                 return [2 /*return*/, scriptedValue];
                             }
                             return [2 /*return*/, new Promise(function (resolve, reject) {
-                                    // Register a rejector so `cancelActiveInput()` (called by the
-                                    // command dispatcher when a new command pre-empts the running one)
-                                    // can abort this keyword-only prompt the same way ESC would.
-                                    var rejector = function (err) {
+                                    var settled = false;
+                                    var finish = function (action) {
+                                        if (settled)
+                                            return;
+                                        settled = true;
+                                        _this.active = false;
                                         if (_this._activeRejector === rejector) {
                                             _this._activeRejector = null;
                                         }
-                                        // Tear down the floating command-line keyword session so its
-                                        // input box and event listeners do not linger after cancel.
                                         _this._commandLine.cancelActiveSession();
-                                        reject(err !== null && err !== void 0 ? err : new Error('cancelled'));
+                                        _this.endMobilePrompt();
+                                        action();
+                                    };
+                                    var rejector = function (err) {
+                                        finish(function () { return reject(err !== null && err !== void 0 ? err : new Error('cancelled')); });
                                     };
                                     _this._activeRejector = rejector;
-                                    _this._commandLine.getKeywords(options, true).then(function (result) {
-                                        if (_this._activeRejector === rejector) {
-                                            _this._activeRejector = null;
+                                    // Pad hides the desktop CLI only while a prompt session is active.
+                                    _this.active = true;
+                                    _this.beginMobilePrompt({
+                                        prompt: options.getDisplayMessage(),
+                                        keywords: _this.mobileKeywordChips(options),
+                                        allowNone: options.allowNone,
+                                        showMetrics: false,
+                                        onConfirm: function () {
+                                            if (options.allowNone) {
+                                                rejector(new AcEdNoneInputError());
+                                            }
+                                        },
+                                        onCancel: function () { return rejector(); },
+                                        onKeyword: function (globalName) {
+                                            finish(function () { return resolve(globalName); });
                                         }
+                                    });
+                                    _this._commandLine.getKeywords(options, true).then(function (result) {
                                         if (!result) {
-                                            reject(options.allowNone
+                                            rejector(options.allowNone
                                                 ? new AcEdNoneInputError()
                                                 : new Error('cancelled'));
                                             return;
                                         }
-                                        resolve(result);
-                                    }, function (err) {
-                                        if (_this._activeRejector === rejector) {
-                                            _this._activeRejector = null;
-                                        }
-                                        reject(err);
-                                    });
+                                        finish(function () { return resolve(result); });
+                                    }, function (err) { return rejector(err instanceof Error ? err : undefined); });
                                 })];
                         });
                     }); }, function (value) { return new AcEdPromptResult(AcEdPromptStatus.OK, value); }, function (status) { return new AcEdPromptResult(status); }, { keyword: false })];
@@ -1083,14 +1303,16 @@ var AcEdInputManager = /** @class */ (function () {
                             var startCanvas = null;
                             var previewEl = null;
                             var lastDragEvent = null;
-                            var updateSelectionPreview = function (e) {
+                            var disposeGesture = null;
+                            var updateSelectionPreview = function (clientX, clientY, action) {
+                                if (action === void 0) { action = 'add'; }
                                 if (!startWcs || !previewEl || !startCanvas)
                                     return;
-                                var curWcs = _this.view.screenToWorld(_this.view.viewportToCanvas({ x: e.clientX, y: e.clientY }));
                                 var curCanvas = _this.view.viewportToCanvas({
-                                    x: e.clientX,
-                                    y: e.clientY
+                                    x: clientX,
+                                    y: clientY
                                 });
+                                var curWcs = _this.view.screenToWorld(curCanvas);
                                 var p1 = _this.view.worldToScreen(startWcs);
                                 var p2 = _this.view.worldToScreen(curWcs);
                                 var left = Math.min(p1.x, p2.x);
@@ -1098,7 +1320,6 @@ var AcEdInputManager = /** @class */ (function () {
                                 var width = Math.abs(p1.x - p2.x);
                                 var height = Math.abs(p1.y - p2.y);
                                 var mode = _this.view.getSelectionMode(startCanvas, curCanvas);
-                                var action = _this.view.getSelectionActionFromEvent(e, 'add');
                                 var style = _this.view.getSelectionPreviewStyle(mode, action);
                                 Object.assign(previewEl.style, {
                                     left: "".concat(left, "px"),
@@ -1112,7 +1333,7 @@ var AcEdInputManager = /** @class */ (function () {
                             };
                             var onViewChanged = function () {
                                 if (lastDragEvent) {
-                                    updateSelectionPreview(lastDragEvent);
+                                    updateSelectionPreview(lastDragEvent.clientX, lastDragEvent.clientY, _this.view.getSelectionActionFromEvent(lastDragEvent, 'add'));
                                 }
                             };
                             var settled = false;
@@ -1133,6 +1354,10 @@ var AcEdInputManager = /** @class */ (function () {
                                 previewEl === null || previewEl === void 0 ? void 0 : previewEl.remove();
                                 keywordSession === null || keywordSession === void 0 ? void 0 : keywordSession.cancel();
                                 _this._commandLine.clear();
+                                _this.endMobilePrompt();
+                                disposeGesture === null || disposeGesture === void 0 ? void 0 : disposeGesture();
+                                disposeGesture = null;
+                                _this.view.setNavigationEnabled(true);
                                 document.removeEventListener('keydown', keyHandler);
                                 _this.view.canvas.removeEventListener('mousedown', mouseDown);
                                 _this.view.canvas.removeEventListener('mousemove', mouseMove);
@@ -1142,6 +1367,20 @@ var AcEdInputManager = /** @class */ (function () {
                                 _this.view.events.viewResize.removeEventListener(onViewChanged);
                             };
                             _this._activeRejector = rejector;
+                            _this.beginMobilePrompt({
+                                prompt: options.getDisplayMessage(),
+                                keywords: _this.mobileKeywordChips(options),
+                                allowNone: true,
+                                showMetrics: false,
+                                onConfirm: function () {
+                                    cleanup();
+                                    resolve(__spreadArray([], __read(selected), false));
+                                },
+                                onCancel: function () { return rejector(); },
+                                onKeyword: function (globalName) {
+                                    rejector(new AcEdKeywordInputError(globalName));
+                                }
+                            });
                             keywordSession === null || keywordSession === void 0 ? void 0 : keywordSession.promise.then(function (keyword) {
                                 if (settled)
                                     return;
@@ -1168,51 +1407,12 @@ var AcEdInputManager = /** @class */ (function () {
                                     e.preventDefault();
                                 }
                             };
-                            var mouseDown = function (e) {
-                                if (e.button === 2) {
-                                    if (_this.shouldUseRightClickEnter()) {
-                                        e.preventDefault();
-                                        cleanup();
-                                        resolve(__spreadArray([], __read(selected), false));
-                                    }
-                                    return;
-                                }
-                                if (e.button !== 0)
-                                    return;
-                                startCanvas = _this.view.viewportToCanvas({
-                                    x: e.clientX,
-                                    y: e.clientY
-                                });
-                                startWcs = _this.view.screenToWorld(startCanvas);
-                                previewEl = document.createElement('div');
-                                previewEl.className = 'ml-jig-preview-rect';
-                                _this.view.container.appendChild(previewEl);
-                            };
-                            var mouseMove = function (e) {
-                                if (e.buttons !== 1)
-                                    return;
-                                if (!startWcs || !previewEl || !startCanvas)
-                                    return;
-                                lastDragEvent = e;
-                                updateSelectionPreview(e);
+                            var clientToCanvas = function (clientX, clientY) {
+                                return _this.view.viewportToCanvas({ x: clientX, y: clientY });
                             };
-                            var mouseUp = function (e) {
+                            var applySelectionAt = function (endCanvas, endWcs, action, isClick) {
                                 var e_2, _a;
-                                if (e.button !== 0)
-                                    return;
-                                if (!startWcs || !startCanvas)
-                                    return;
-                                var endWcs = _this.view.screenToWorld(_this.view.viewportToCanvas({ x: e.clientX, y: e.clientY }));
-                                var endCanvas = _this.view.viewportToCanvas({
-                                    x: e.clientX,
-                                    y: e.clientY
-                                });
-                                previewEl === null || previewEl === void 0 ? void 0 : previewEl.remove();
-                                previewEl = null;
-                                lastDragEvent = null;
-                                // Click selection
-                                var action = _this.view.getSelectionActionFromEvent(e, 'add');
-                                if (_this.view.isSelectionClick(startCanvas, endCanvas)) {
+                                if (isClick) {
                                     var picked = _this.view.pick(endWcs);
                                     if (picked.length > 0) {
                                         _this.view.applySelection([picked[0].id], action);
@@ -1221,8 +1421,7 @@ var AcEdInputManager = /** @class */ (function () {
                                         _this.view.selectionSet.clear();
                                     }
                                 }
-                                else {
-                                    // Box selection
+                                else if (startWcs && startCanvas) {
                                     var box = new AcGeBox2d()
                                         .expandByPoint(startWcs)
                                         .expandByPoint(endWcs);
@@ -1243,15 +1442,113 @@ var AcEdInputManager = /** @class */ (function () {
                                     }
                                     finally { if (e_2) throw e_2.error; }
                                 }
-                                if (options.singleOnly && action !== 'remove') {
-                                    if (selected.size > 0) {
+                                if (options.singleOnly &&
+                                    action !== 'remove' &&
+                                    selected.size > 0) {
+                                    cleanup();
+                                    resolve(__spreadArray([], __read(selected), false));
+                                }
+                            };
+                            var beginPreview = function (clientX, clientY) {
+                                startCanvas = clientToCanvas(clientX, clientY);
+                                startWcs = _this.view.screenToWorld(startCanvas);
+                                previewEl === null || previewEl === void 0 ? void 0 : previewEl.remove();
+                                previewEl = document.createElement('div');
+                                previewEl.className = 'ml-jig-preview-rect';
+                                _this.view.container.appendChild(previewEl);
+                            };
+                            var clearBoxPreview = function () {
+                                previewEl === null || previewEl === void 0 ? void 0 : previewEl.remove();
+                                previewEl = null;
+                                lastDragEvent = null;
+                                startWcs = null;
+                                startCanvas = null;
+                            };
+                            var mouseDown = function (e) {
+                                if (e.button === 2) {
+                                    if (_this.shouldUseRightClickEnter()) {
+                                        e.preventDefault();
                                         cleanup();
                                         resolve(__spreadArray([], __read(selected), false));
                                     }
+                                    return;
                                 }
+                                if (e.button !== 0)
+                                    return;
+                                if (acedIsTouchDerivedMouseEvent(e) ||
+                                    acedShouldIgnoreCompatMouse()) {
+                                    return;
+                                }
+                                beginPreview(e.clientX, e.clientY);
+                            };
+                            var mouseMove = function (e) {
+                                if (e.buttons !== 1)
+                                    return;
+                                if (!startWcs || !previewEl || !startCanvas)
+                                    return;
+                                if (acedIsTouchDerivedMouseEvent(e) ||
+                                    acedShouldIgnoreCompatMouse()) {
+                                    return;
+                                }
+                                lastDragEvent = e;
+                                updateSelectionPreview(e.clientX, e.clientY, _this.view.getSelectionActionFromEvent(e, 'add'));
+                            };
+                            var mouseUp = function (e) {
+                                if (e.button !== 0)
+                                    return;
+                                if (!startWcs || !startCanvas)
+                                    return;
+                                if (acedIsTouchDerivedMouseEvent(e) ||
+                                    acedShouldIgnoreCompatMouse()) {
+                                    return;
+                                }
+                                var endCanvas = clientToCanvas(e.clientX, e.clientY);
+                                var endWcs = _this.view.screenToWorld(endCanvas);
+                                var isClick = _this.view.isSelectionClick(startCanvas, endCanvas);
+                                var action = _this.view.getSelectionActionFromEvent(e, 'add');
+                                previewEl === null || previewEl === void 0 ? void 0 : previewEl.remove();
+                                previewEl = null;
+                                lastDragEvent = null;
+                                applySelectionAt(endCanvas, endWcs, action, isClick);
                                 startWcs = null;
                                 startCanvas = null;
                             };
+                            disposeGesture = acedAttachMobileBoxGesture({
+                                element: _this.view.canvas,
+                                setNavigationEnabled: function (enabled) {
+                                    _this.view.setNavigationEnabled(enabled);
+                                },
+                                onActivate: function (clientX, clientY) {
+                                    beginPreview(clientX, clientY);
+                                    lastDragEvent = null;
+                                    updateSelectionPreview(clientX, clientY, 'add');
+                                },
+                                onMove: function (clientX, clientY) {
+                                    updateSelectionPreview(clientX, clientY, 'add');
+                                },
+                                onBoxEnd: function (clientX, clientY, moved) {
+                                    if (!startWcs || !startCanvas) {
+                                        clearBoxPreview();
+                                        return;
+                                    }
+                                    var endCanvas = clientToCanvas(clientX, clientY);
+                                    var endWcs = _this.view.screenToWorld(endCanvas);
+                                    previewEl === null || previewEl === void 0 ? void 0 : previewEl.remove();
+                                    previewEl = null;
+                                    lastDragEvent = null;
+                                    applySelectionAt(endCanvas, endWcs, 'add', !moved);
+                                    startWcs = null;
+                                    startCanvas = null;
+                                },
+                                onTap: function (clientX, clientY) {
+                                    var endCanvas = clientToCanvas(clientX, clientY);
+                                    var endWcs = _this.view.screenToWorld(endCanvas);
+                                    applySelectionAt(endCanvas, endWcs, 'add', true);
+                                },
+                                onAbort: function () {
+                                    clearBoxPreview();
+                                }
+                            });
                             document.addEventListener('keydown', keyHandler);
                             _this.view.canvas.addEventListener('mousedown', mouseDown);
                             _this.view.canvas.addEventListener('mousemove', mouseMove);
@@ -1319,8 +1616,27 @@ var AcEdInputManager = /** @class */ (function () {
                                 floatingMessage === null || floatingMessage === void 0 ? void 0 : floatingMessage.dispose();
                                 keywordSession === null || keywordSession === void 0 ? void 0 : keywordSession.cancel();
                                 _this._commandLine.clear();
+                                _this.hideEntityPickCancel();
+                                _this.endMobilePrompt();
                             };
                             _this._activeRejector = rejector;
+                            _this.beginMobilePrompt({
+                                prompt: options.getDisplayMessage(),
+                                keywords: _this.mobileKeywordChips(options),
+                                allowNone: options.allowNone,
+                                showMetrics: false,
+                                onConfirm: function () {
+                                    if (!options.allowNone)
+                                        return;
+                                    cleanup();
+                                    resolve(null);
+                                },
+                                onCancel: function () { return rejector(); },
+                                onKeyword: function (globalName) {
+                                    rejector(new AcEdKeywordInputError(globalName));
+                                }
+                            });
+                            _this.showEntityPickCancel(function () { return rejector(); });
                             keywordSession === null || keywordSession === void 0 ? void 0 : keywordSession.promise.then(function (keyword) {
                                 if (settled)
                                     return;
@@ -1398,12 +1714,10 @@ var AcEdInputManager = /** @class */ (function () {
     };
     /**
      * Prompt the user to specify a rectangular box by selecting two corners.
-     * Each corner may be specified by clicking on the canvas or typing "x,y".
-     * A live HTML overlay rectangle previews the box as the user moves the mouse.
      *
-     * The box prompt is implemented as two chained point prompts. Keywords from
-     * the original box prompt are copied into each corner prompt so the caller
-     * sees a consistent interaction model across both stages.
+     * Desktop: two chained point prompts with a live HTML overlay preview.
+     * Phone/pad: the mobile {@link acedInteractionStrategy} uses long-press
+     * (~1s) + drag on touch, and click-drag or two clicks on mouse.
      *
      * @param options - Box prompt options controlling corner messages, preview behavior, and keywords
      * @returns A prompt result containing the final 2D box, cancel status, or keyword
@@ -1412,63 +1726,309 @@ var AcEdInputManager = /** @class */ (function () {
         return __awaiter(this, void 0, void 0, function () {
             var _this = this;
             return __generator(this, function (_a) {
-                return [2 /*return*/, this.executePrompt(function () { return __awaiter(_this, void 0, void 0, function () {
-                        var message1, options1, p1Result, p1, cwcsP1, previewEl, cleanup, drawPreview, message2, options2, p2, box;
-                        var _this = this;
-                        return __generator(this, function (_a) {
-                            switch (_a.label) {
-                                case 0:
-                                    message1 = options.firstCornerMessage ||
-                                        AcApI18n.t('main.inputManager.firstCorner');
-                                    options1 = new AcEdPromptPointOptions(message1);
-                                    this.copyKeywords(options, options1);
-                                    options1.useDashedLine = options.useDashedLine;
-                                    options1.useBasePoint = options.useBasePoint;
-                                    options1.disableOSnap = options.disableOSnap;
-                                    options1.allowNone = options.allowNone;
-                                    return [4 /*yield*/, this.getPoint(options1)];
-                                case 1:
-                                    p1Result = _a.sent();
-                                    if (p1Result.status !== AcEdPromptStatus.OK) {
-                                        return [2 /*return*/, new AcEdPromptBoxResult(p1Result.status, undefined, p1Result.stringResult)];
-                                    }
-                                    p1 = p1Result.value;
-                                    cwcsP1 = this.view.worldToScreen(p1);
-                                    previewEl = document.createElement('div');
-                                    previewEl.className = 'ml-jig-preview-rect';
-                                    this.view.container.appendChild(previewEl);
-                                    cleanup = function () {
-                                        previewEl.remove();
-                                    };
-                                    drawPreview = function (pos) {
-                                        var cwcsP2 = _this.view.worldToScreen(pos);
-                                        var left = Math.min(cwcsP2.x, cwcsP1.x);
-                                        var top = Math.min(cwcsP2.y, cwcsP1.y);
-                                        var width = Math.abs(cwcsP2.x - cwcsP1.x);
-                                        var height = Math.abs(cwcsP2.y - cwcsP1.y);
-                                        Object.assign(previewEl.style, {
-                                            left: "".concat(left, "px"),
-                                            top: "".concat(top, "px"),
-                                            width: "".concat(width, "px"),
-                                            height: "".concat(height, "px")
-                                        });
-                                    };
-                                    message2 = options.secondCornerMessage ||
-                                        AcApI18n.t('main.inputManager.secondCorner');
-                                    options2 = new AcEdPromptPointOptions(message2);
-                                    this.copyKeywords(options, options2);
-                                    options2.useDashedLine = options.useDashedLine;
-                                    options2.useBasePoint = options.useBasePoint;
-                                    options2.disableOSnap = options.disableOSnap;
-                                    return [4 /*yield*/, this.getPointInternal(options2, cleanup, drawPreview)];
-                                case 2:
-                                    p2 = _a.sent();
-                                    box = new AcGeBox2d().expandByPoint(p1).expandByPoint(p2);
-                                    return [2 /*return*/, new AcEdPromptBoxResult(AcEdPromptStatus.OK, box)];
-                            }
-                        });
-                    }); }, function (value) { return value; }, function (status) { return new AcEdPromptBoxResult(status); })];
+                return [2 /*return*/, this.executePrompt(function () {
+                        return acedInteractionStrategy().acquireBox({
+                            acquireTwoPointBox: function (opts) { return _this.getBoxViaTwoPoints(opts); },
+                            acquireHoldDragBox: function (opts) { return _this.getBoxViaHoldDrag(opts); }
+                        }, options);
+                    }, function (value) { return value; }, function (status) { return new AcEdPromptBoxResult(status); })];
+            });
+        });
+    };
+    /**
+     * Desktop / two-click box acquisition used by {@link getBox}.
+     */
+    AcEdInputManager.prototype.getBoxViaTwoPoints = function (options) {
+        return __awaiter(this, void 0, void 0, function () {
+            var message1, options1, p1Result, p1, cwcsP1, previewEl, cleanup, drawPreview, message2, options2, p2, box;
+            var _this = this;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        message1 = options.firstCornerMessage || AcApI18n.t('main.inputManager.firstCorner');
+                        options1 = new AcEdPromptPointOptions(message1);
+                        this.copyKeywords(options, options1);
+                        options1.useDashedLine = options.useDashedLine;
+                        options1.useBasePoint = options.useBasePoint;
+                        options1.disableOSnap = options.disableOSnap;
+                        options1.allowNone = options.allowNone;
+                        return [4 /*yield*/, this.getPoint(options1)];
+                    case 1:
+                        p1Result = _a.sent();
+                        if (p1Result.status !== AcEdPromptStatus.OK) {
+                            return [2 /*return*/, new AcEdPromptBoxResult(p1Result.status, undefined, p1Result.stringResult)];
+                        }
+                        p1 = p1Result.value;
+                        cwcsP1 = this.view.worldToScreen(p1);
+                        previewEl = document.createElement('div');
+                        previewEl.className = 'ml-jig-preview-rect';
+                        this.view.container.appendChild(previewEl);
+                        cleanup = function () {
+                            previewEl.remove();
+                        };
+                        drawPreview = function (pos) {
+                            var cwcsP2 = _this.view.worldToScreen(pos);
+                            var left = Math.min(cwcsP2.x, cwcsP1.x);
+                            var top = Math.min(cwcsP2.y, cwcsP1.y);
+                            var width = Math.abs(cwcsP2.x - cwcsP1.x);
+                            var height = Math.abs(cwcsP2.y - cwcsP1.y);
+                            Object.assign(previewEl.style, {
+                                left: "".concat(left, "px"),
+                                top: "".concat(top, "px"),
+                                width: "".concat(width, "px"),
+                                height: "".concat(height, "px")
+                            });
+                        };
+                        message2 = options.secondCornerMessage ||
+                            AcApI18n.t('main.inputManager.secondCorner');
+                        options2 = new AcEdPromptPointOptions(message2);
+                        this.copyKeywords(options, options2);
+                        options2.useDashedLine = options.useDashedLine;
+                        options2.useBasePoint = options.useBasePoint;
+                        options2.disableOSnap = options.disableOSnap;
+                        return [4 /*yield*/, this.getPointInternal(options2, cleanup, drawPreview)];
+                    case 2:
+                        p2 = _a.sent();
+                        box = new AcGeBox2d().expandByPoint(p1).expandByPoint(p2);
+                        return [2 /*return*/, new AcEdPromptBoxResult(AcEdPromptStatus.OK, box)];
+                }
+            });
+        });
+    };
+    /**
+     * Phone/pad box acquisition: long-press locks corner 1, drag, release for
+     * corner 2. Mouse still works via click-drag or two clicks.
+     * Preview uses window/crossing styles by drag direction.
+     */
+    AcEdInputManager.prototype.getBoxViaHoldDrag = function (options) {
+        var _this = this;
+        return new Promise(function (resolve, reject) {
+            _this.active = true;
+            var message = options.firstCornerMessage ||
+                AcApI18n.t('main.inputManager.firstCorner');
+            var keywordSession = _this.startKeywordSession(options, true);
+            if (!keywordSession) {
+                _this._commandLine.setPrompt(message);
+            }
+            var floatingMessage = new AcEdFloatingMessage(_this.view, {
+                parent: _this.view.canvas,
+                message: message
+            });
+            var startWcs = null;
+            var startCanvas = null;
+            var previewEl = null;
+            var settled = false;
+            var disposeGesture = null;
+            var firstCornerLocked = false;
+            var lastMouse = null;
+            var clearPreview = function () {
+                previewEl === null || previewEl === void 0 ? void 0 : previewEl.remove();
+                previewEl = null;
+            };
+            var resetBox = function () {
+                clearPreview();
+                startWcs = null;
+                startCanvas = null;
+                firstCornerLocked = false;
+                lastMouse = null;
+            };
+            var clientToCanvas = function (clientX, clientY) {
+                return _this.view.viewportToCanvas({ x: clientX, y: clientY });
+            };
+            var updatePreview = function (clientX, clientY) {
+                if (!startWcs || !previewEl || !startCanvas)
+                    return;
+                var curCanvas = clientToCanvas(clientX, clientY);
+                var curWcs = _this.view.screenToWorld(curCanvas);
+                var p1 = _this.view.worldToScreen(startWcs);
+                var p2 = _this.view.worldToScreen(curWcs);
+                var mode = _this.view.getSelectionMode(startCanvas, curCanvas);
+                var style = _this.view.getSelectionPreviewStyle(mode, 'add');
+                Object.assign(previewEl.style, {
+                    left: "".concat(Math.min(p1.x, p2.x), "px"),
+                    top: "".concat(Math.min(p1.y, p2.y), "px"),
+                    width: "".concat(Math.abs(p1.x - p2.x), "px"),
+                    height: "".concat(Math.abs(p1.y - p2.y), "px"),
+                    borderStyle: style.borderStyle,
+                    background: style.background
+                });
+                previewEl.style.setProperty('--line-color', style.lineColor);
+            };
+            var beginPreview = function (clientX, clientY) {
+                var canvas = clientToCanvas(clientX, clientY);
+                startCanvas = canvas;
+                startWcs = _this.view.screenToWorld(canvas);
+                firstCornerLocked = false;
+                lastMouse = { clientX: clientX, clientY: clientY };
+                clearPreview();
+                previewEl = document.createElement('div');
+                previewEl.className = 'ml-jig-preview-rect';
+                _this.view.container.appendChild(previewEl);
+                updatePreview(clientX, clientY);
+            };
+            var commitBoxIfMoved = function (clientX, clientY) {
+                if (!startWcs || !startCanvas)
+                    return false;
+                var endCanvas = clientToCanvas(clientX, clientY);
+                if (_this.view.isSelectionClick(startCanvas, endCanvas))
+                    return false;
+                var endWcs = _this.view.screenToWorld(endCanvas);
+                var box = new AcGeBox2d()
+                    .expandByPoint(startWcs)
+                    .expandByPoint(endWcs);
+                cleanup();
+                resolve(new AcEdPromptBoxResult(AcEdPromptStatus.OK, box));
+                return true;
+            };
+            var rejector = function (err) {
+                cleanup();
+                reject(err !== null && err !== void 0 ? err : new Error('cancelled'));
+            };
+            var cleanup = function () {
+                if (settled)
+                    return;
+                settled = true;
+                _this.active = false;
+                if (_this._activeRejector === rejector) {
+                    _this._activeRejector = null;
+                }
+                disposeGesture === null || disposeGesture === void 0 ? void 0 : disposeGesture();
+                disposeGesture = null;
+                resetBox();
+                floatingMessage.dispose();
+                keywordSession === null || keywordSession === void 0 ? void 0 : keywordSession.cancel();
+                _this._commandLine.clear();
+                _this.endMobilePrompt();
+                _this.view.setNavigationEnabled(true);
+                document.removeEventListener('keydown', keyHandler);
+                _this.view.canvas.removeEventListener('mousedown', mouseDown);
+                _this.view.canvas.removeEventListener('mousemove', mouseMove);
+                _this.view.canvas.removeEventListener('mouseup', mouseUp);
+                _this.view.canvas.removeEventListener('contextmenu', contextMenuHandler);
+                _this.view.events.viewChanged.removeEventListener(onViewChanged);
+                _this.view.events.viewResize.removeEventListener(onViewChanged);
+            };
+            _this._activeRejector = rejector;
+            _this.beginMobilePrompt({
+                prompt: options.getDisplayMessage(),
+                keywords: _this.mobileKeywordChips(options),
+                allowNone: options.allowNone,
+                showMetrics: false,
+                onConfirm: function () {
+                    if (options.allowNone) {
+                        cleanup();
+                        resolve(new AcEdPromptBoxResult(AcEdPromptStatus.None));
+                    }
+                },
+                onCancel: function () { return rejector(); },
+                onKeyword: function (globalName) {
+                    rejector(new AcEdKeywordInputError(globalName));
+                }
             });
+            keywordSession === null || keywordSession === void 0 ? void 0 : keywordSession.promise.then(function (keyword) {
+                if (settled)
+                    return;
+                if (!keyword) {
+                    rejector();
+                    return;
+                }
+                rejector(new AcEdKeywordInputError(keyword));
+            });
+            var keyHandler = function (e) {
+                if (e.key === 'Escape') {
+                    rejector();
+                    return;
+                }
+                if (e.key === 'Enter' && options.allowNone) {
+                    cleanup();
+                    resolve(new AcEdPromptBoxResult(AcEdPromptStatus.None));
+                }
+            };
+            document.addEventListener('keydown', keyHandler);
+            var contextMenuHandler = function (e) {
+                if (_this.shouldUseRightClickEnter()) {
+                    e.preventDefault();
+                }
+            };
+            var isCompatMouse = function (e) {
+                return acedIsTouchDerivedMouseEvent(e) || acedShouldIgnoreCompatMouse();
+            };
+            var mouseDown = function (e) {
+                if (e.button === 2) {
+                    if (_this.shouldUseRightClickEnter() && options.allowNone) {
+                        e.preventDefault();
+                        cleanup();
+                        resolve(new AcEdPromptBoxResult(AcEdPromptStatus.None));
+                    }
+                    return;
+                }
+                if (e.button !== 0)
+                    return;
+                if (isCompatMouse(e))
+                    return;
+                if (firstCornerLocked)
+                    return;
+                _this.view.setNavigationEnabled(false);
+                beginPreview(e.clientX, e.clientY);
+            };
+            var mouseMove = function (e) {
+                if (!startWcs || !previewEl || !startCanvas)
+                    return;
+                if (isCompatMouse(e))
+                    return;
+                if (e.buttons !== 1 && !firstCornerLocked)
+                    return;
+                lastMouse = { clientX: e.clientX, clientY: e.clientY };
+                updatePreview(e.clientX, e.clientY);
+            };
+            var mouseUp = function (e) {
+                if (e.button !== 0)
+                    return;
+                if (!startWcs || !startCanvas)
+                    return;
+                if (isCompatMouse(e))
+                    return;
+                if (commitBoxIfMoved(e.clientX, e.clientY))
+                    return;
+                firstCornerLocked = true;
+            };
+            var onViewChanged = function () {
+                if (lastMouse && startWcs && previewEl) {
+                    updatePreview(lastMouse.clientX, lastMouse.clientY);
+                }
+            };
+            disposeGesture = acedAttachMobileBoxGesture({
+                element: _this.view.canvas,
+                setNavigationEnabled: function (enabled) {
+                    _this.view.setNavigationEnabled(enabled);
+                },
+                onActivate: function (clientX, clientY) {
+                    beginPreview(clientX, clientY);
+                    lastMouse = null;
+                    updatePreview(clientX, clientY);
+                },
+                onMove: function (clientX, clientY) {
+                    updatePreview(clientX, clientY);
+                },
+                onBoxEnd: function (clientX, clientY, moved) {
+                    if (!startWcs || !startCanvas)
+                        return;
+                    if (!moved) {
+                        resetBox();
+                        return;
+                    }
+                    commitBoxIfMoved(clientX, clientY);
+                },
+                onAbort: function () {
+                    resetBox();
+                }
+            });
+            _this.view.canvas.addEventListener('mousedown', mouseDown);
+            _this.view.canvas.addEventListener('mousemove', mouseMove);
+            _this.view.canvas.addEventListener('mouseup', mouseUp);
+            _this.view.canvas.addEventListener('contextmenu', contextMenuHandler);
+            _this.view.events.viewChanged.addEventListener(onViewChanged);
+            _this.view.events.viewResize.addEventListener(onViewChanged);
         });
     };
     /**
@@ -1486,36 +2046,92 @@ var AcEdInputManager = /** @class */ (function () {
      */
     AcEdInputManager.prototype.getPointInternal = function (options, cleanup, drawPreview) {
         return __awaiter(this, void 0, void 0, function () {
-            var scriptedValue, getDynamicValue, handler;
+            var scriptedValue, getDynamicValue, handler, value;
             var _this = this;
             return __generator(this, function (_a) {
-                scriptedValue = this.tryGetScriptedPoint(options);
-                if (scriptedValue != null) {
-                    cleanup === null || cleanup === void 0 ? void 0 : cleanup();
-                    return [2 /*return*/, Promise.resolve(scriptedValue)];
-                }
-                getDynamicValue = function (pos) {
-                    return {
-                        value: { x: pos.x, y: pos.y, z: 0 },
-                        raw: {
-                            x: _this.formatNumber(pos.x, 'point'),
-                            y: _this.formatNumber(pos.y, 'point')
+                switch (_a.label) {
+                    case 0:
+                        scriptedValue = this.tryGetScriptedPoint(options);
+                        if (scriptedValue != null) {
+                            cleanup === null || cleanup === void 0 ? void 0 : cleanup();
+                            // Record for later interactive prompts in the same command; no DOM yet.
+                            this.recordConfirmedPointMarkIfNeeded(options, scriptedValue);
+                            return [2 /*return*/, scriptedValue];
                         }
-                    };
-                };
-                handler = new AcEdPointHandler(options);
-                return [2 /*return*/, this.makeFloatingInputPromise({
-                        inputCount: 2,
-                        promptOptions: options,
-                        disableOSnap: options.disableOSnap,
-                        cleanup: cleanup,
-                        handler: handler,
-                        getDynamicValue: getDynamicValue,
-                        drawPreview: drawPreview
-                    })];
+                        // Show marks for points confirmed earlier in this command while picking
+                        // the next one (avoids a flash when the command ends after a single pick).
+                        this.showConfirmedPointMarksIfAny();
+                        getDynamicValue = function (pos) {
+                            return {
+                                value: { x: pos.x, y: pos.y, z: 0 },
+                                raw: {
+                                    x: _this.formatNumber(pos.x, 'point'),
+                                    y: _this.formatNumber(pos.y, 'point')
+                                }
+                            };
+                        };
+                        handler = new AcEdPointHandler(options);
+                        return [4 /*yield*/, this.makeFloatingInputPromise({
+                                inputCount: 2,
+                                promptOptions: options,
+                                disableOSnap: options.disableOSnap,
+                                cleanup: cleanup,
+                                handler: handler,
+                                getDynamicValue: getDynamicValue,
+                                drawPreview: drawPreview
+                            })];
+                    case 1:
+                        value = _a.sent();
+                        this.recordConfirmedPointMarkIfNeeded(options, value);
+                        return [2 /*return*/, value];
+                }
             });
         });
     };
+    /**
+     * Whether a confirmed-point plus mark should be tracked for this prompt.
+     *
+     * Explicit {@link AcEdPromptPointOptions.showConfirmedPointMark} overrides
+     * the phone/pad default.
+     */
+    AcEdInputManager.prototype.shouldShowConfirmedPointMark = function (options) {
+        var override = options.showConfirmedPointMark;
+        if (override !== undefined)
+            return override;
+        return acedInteractionStrategy().point.showsConfirmedPointMarks;
+    };
+    /**
+     * Records a confirmed pick for later display when enabled for the prompt.
+     * DOM marks are deferred until {@link showConfirmedPointMarksIfAny}.
+     */
+    AcEdInputManager.prototype.recordConfirmedPointMarkIfNeeded = function (options, point) {
+        if (!this.shouldShowConfirmedPointMark(options))
+            return;
+        this._confirmedPointPositions.push({ x: point.x, y: point.y });
+    };
+    /**
+     * Renders plus marks for points already confirmed in this command.
+     * Called at the start of an interactive {@link getPointInternal}.
+     */
+    AcEdInputManager.prototype.showConfirmedPointMarksIfAny = function () {
+        var _a;
+        if (this._confirmedPointPositions.length === 0)
+            return;
+        (_a = this._confirmedPointMarks) !== null && _a !== void 0 ? _a : (this._confirmedPointMarks = new AcEdMarkerManager(this.view));
+        this._confirmedPointMarks.setHintMarkers(this._confirmedPointPositions, 'plus');
+    };
+    /** Repositions confirmed-point marks after pan/zoom. */
+    AcEdInputManager.prototype.repositionConfirmedPointMarks = function () {
+        var _a;
+        (_a = this._confirmedPointMarks) === null || _a === void 0 ? void 0 : _a.repositionHints();
+    };
+    /** Clears all confirmed-point plus marks for the finished command. */
+    AcEdInputManager.prototype.clearConfirmedPointMarks = function () {
+        var _a;
+        (_a = this._confirmedPointMarks) === null || _a === void 0 ? void 0 : _a.clear();
+        this._confirmedPointMarks = null;
+        this._confirmedPointPositions = [];
+    };
     /**
      * Attempts to consume one scripted input and parse it as a point.
      * Supported forms: "x,y", "x,y,z", or "x y".
@@ -1766,7 +2382,7 @@ var AcEdInputManager = /** @class */ (function () {
             var _this = this;
             return __generator(this, function (_a) {
                 return [2 /*return*/, new Promise(function (resolve, reject) {
-                        var _a, _b, _c;
+                        var _a, _b, _c, _d, _e;
                         _this.active = true;
                         _this.entitySelectionActive = false;
                         var settled = false;
@@ -1790,6 +2406,18 @@ var AcEdInputManager = /** @class */ (function () {
                             ? options.promptOptions.allowNone
                             : false;
                         var defaultBehavior = _this.resolvePromptDefaultValue(options.promptOptions);
+                        var showStringInput = options.showStringInput === true &&
+                            acedInteractionStrategy().point.usesSessionChrome;
+                        var showMetrics = showStringInput
+                            ? false
+                            : ((_c = options.showMetrics) !== null && _c !== void 0 ? _c : (options.inputCount === 2 || basePoint != null));
+                        var allowPickCommit = options.allowPickCommit !== false;
+                        var getDynamicValue = function (pos) {
+                            if (!showStringInput) {
+                                _this.pushMobileMetrics(pos, basePoint !== null && basePoint !== void 0 ? basePoint : floatingInput.sessionBasePoint);
+                            }
+                            return options.getDynamicValue(pos);
+                        };
                         var floatingInput = new AcEdFloatingInput(_this.view, {
                             parent: _this.view.canvas,
                             inputCount: options.inputCount,
@@ -1803,8 +2431,9 @@ var AcEdInputManager = /** @class */ (function () {
                             allowNone: allowNone,
                             useDefaultValue: defaultBehavior.useDefaultValue,
                             defaultValue: defaultBehavior.defaultValue,
+                            allowPickCommit: allowPickCommit,
                             validate: validate,
-                            getDynamicValue: options.getDynamicValue,
+                            getDynamicValue: getDynamicValue,
                             drawPreview: function (pos) {
                                 var _a;
                                 if (promptDefaults.jig) {
@@ -1831,7 +2460,7 @@ var AcEdInputManager = /** @class */ (function () {
                             onCancel: function () { return rejector(); },
                             onNone: function () { return noneRejector(); }
                         });
-                        (_c = options.onFloatingInputCreated) === null || _c === void 0 ? void 0 : _c.call(options, floatingInput);
+                        (_d = options.onFloatingInputCreated) === null || _d === void 0 ? void 0 : _d.call(options, floatingInput);
                         var cleanup = function () {
                             var _a, _b;
                             if (settled)
@@ -1851,6 +2480,7 @@ var AcEdInputManager = /** @class */ (function () {
                             floatingInput.dispose();
                             promptInputSession.cancel();
                             _this._commandLine.clear();
+                            _this.endMobilePrompt();
                         };
                         var resolver = function (value) {
                             cleanup();
@@ -1867,6 +2497,41 @@ var AcEdInputManager = /** @class */ (function () {
                         var keywordRejector = function (keyword) {
                             rejector(new AcEdKeywordInputError(keyword));
                         };
+                        var commitMobileString = function () {
+                            var raw = _this._mobileChrome.getStringValue();
+                            if (!raw.trim() && defaultBehavior.useDefaultValue) {
+                                resolver(defaultBehavior.defaultValue);
+                                return;
+                            }
+                            var parsed = options.handler.parse(raw);
+                            if (parsed != null) {
+                                resolver(parsed);
+                                return;
+                            }
+                            // Invalid: keep the session open and refocus the field.
+                            _this._mobileChrome.focusStringInput();
+                        };
+                        _this.beginMobilePrompt({
+                            prompt: options.promptOptions.getDisplayMessage(),
+                            keywords: _this.mobileKeywordChips(options.promptOptions),
+                            allowNone: allowNone,
+                            showMetrics: showMetrics,
+                            showStringInput: showStringInput,
+                            stringValue: showStringInput && defaultBehavior.useDefaultValue
+                                ? String((_e = defaultBehavior.defaultValue) !== null && _e !== void 0 ? _e : '')
+                                : undefined,
+                            touchPointTutorial: !showStringInput,
+                            onConfirm: function () {
+                                if (showStringInput) {
+                                    commitMobileString();
+                                }
+                                else {
+                                    noneRejector();
+                                }
+                            },
+                            onCancel: function () { return rejector(); },
+                            onKeyword: keywordRejector
+                        });
                         var escHandler = function (e) {
                             if (e.key === 'Escape') {
                                 rejector();
@@ -1880,6 +2545,14 @@ var AcEdInputManager = /** @class */ (function () {
                             }
                         };
                         var contextMenuHandler = function (e) {
+                            // Phone long-press synthesizes contextmenu while the snap loupe is
+                            // opening. That is not right-click Enter — swallowing it would
+                            // cancel the measure / point prompt as soon as the loupe appears.
+                            if (acedIsTouchLongPressContextMenu(e) ||
+                                acedInteractionStrategy().point.swallowsPromptContextMenu) {
+                                e.preventDefault();
+                                return;
+                            }
                             if (!_this.shouldUseRightClickEnter())
                                 return;
                             e.preventDefault();
@@ -1890,7 +2563,15 @@ var AcEdInputManager = /** @class */ (function () {
                         document.addEventListener('keyup', modifierHandler);
                         _this.view.canvas.addEventListener('contextmenu', contextMenuHandler);
                         // showAt() expects viewport coordinates; curMousePos is canvas-local.
-                        floatingInput.showAt(_this.view.canvasToViewport(_this.view.curMousePos));
+                        // On touch, skip the dummy canvas-(0,0) seed until a real pointer sample.
+                        // Also skip leftover finger coords after a touch pick — those seed a
+                        // short jig segment on the next measure-distance prompt.
+                        if (_this.view.hasCursorPos && !acedShouldIgnoreCompatMouse()) {
+                            floatingInput.showAt(_this.view.canvasToViewport(_this.view.curMousePos));
+                        }
+                        else {
+                            floatingInput.showAt({ x: 0, y: 0 });
+                        }
                         promptInputSession.promise.then(function (result) {
                             if (settled)
                                 return;