@mlightcad/cad-simple-viewer 1.6.2 → 1.7.0

package/lib/command/markup/AcApMarkupCalloutCmd.js

@@ -62,13 +62,18 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 };
 import { AcGePoint3d } from '@mlightcad/data-model';
 import { AcTrHtmlCallout, AcTrHtmlDot } from '@mlightcad/three-renderer';
-import { AcEdCommand, AcEdPreviewJig, AcEdPromptPointOptions, AcEdPromptStatus } from '../../editor';
+import { AcEdPreviewJig, AcEdPromptPointOptions, AcEdPromptStatus } from '../../editor';
 import { AcApI18n } from '../../i18n';
+import { pickAttachableShapeMarkupAt } from '../../view';
 import { AcApHtmlLivePreview, acapStrokeLiveSegment } from '../overlay/AcApHtmlLivePreview';
-import { configureMarkupCommand, createMarkupMeta, promptMarkupCapsuleText, withMarkupInput } from './AcApMarkupCmdUtil';
-import { commitMarkup } from './AcApMarkupPresenter';
+import { acapSyncLiveOverlayTextHeight } from '../overlay/AcApOverlayDrawUtil';
+import { createMarkupMeta, promptMarkupCapsuleText } from './AcApMarkupCmdUtil';
+import { AcApMarkupDrawCmd } from './AcApMarkupDrawCmd';
+import { isAttachableShapeMarkup, markupShapeOutlineFromGeometry } from './AcApMarkupGeometry';
+import { attachCalloutToMarkup, commitMarkup } from './AcApMarkupPresenter';
+import { promptAttachedCallout } from './AcApMarkupShapeCallout';
 import { MARKUP_LIVE_LAYER } from './AcApMarkupStore';
-import { defaultMarkupColor, getMarkupFontSize, getMarkupLineWeight, markupCanvasLineWidth, subscribeMarkupDrawStyle } from './AcApMarkupUtil';
+import { defaultMarkupColor, defaultMarkupStyle, getMarkupFontSize, MARKUP_LINE_WEIGHT, markupCanvasLineWidth, subscribeMarkupDrawStyle } from './AcApMarkupUtil';
 /**
  * Live preview while placing a callout text bubble:
  * tip marker + leader line + arrowhead + floating callout bubble.
@@ -105,6 +110,7 @@ var AcApMarkupCalloutJig = /** @class */ (function (_super) {
             layoutId: layoutId
         });
         _this._ht.add(_this._bubble);
+        acapSyncLiveOverlayTextHeight(_this._view, [_this._bubble], defaultMarkupStyle());
         _this._preview = new AcApHtmlLivePreview(_this._view, "live-markup-callout-leader-".concat(stamp), MARKUP_LIVE_LAYER);
         _this._unsubDrawStyle = subscribeMarkupDrawStyle(function () {
             return _this.applyCurrentStyle();
@@ -121,11 +127,13 @@ var AcApMarkupCalloutJig = /** @class */ (function (_super) {
         configurable: true
     });
     AcApMarkupCalloutJig.prototype.update = function (anchor) {
-        var _a;
+        var _a, _b;
         this._anchor = { x: anchor.x, y: anchor.y, z: (_a = anchor.z) !== null && _a !== void 0 ? _a : 0 };
         this._color = defaultMarkupColor();
         this._bubble.setPosition(this._anchor);
-        this._bubble.setFontSize(getMarkupFontSize());
+        var style = defaultMarkupStyle();
+        this._bubble.setFontSize((_b = style.fontSize) !== null && _b !== void 0 ? _b : getMarkupFontSize());
+        acapSyncLiveOverlayTextHeight(this._view, [this._bubble], style);
         this.paintLeader();
         this._view.isHtmlDirty = true;
     };
@@ -156,15 +164,18 @@ var AcApMarkupCalloutJig = /** @class */ (function (_super) {
     };
     /** Apply session draw style to the frozen preview (including during text entry). */
     AcApMarkupCalloutJig.prototype.applyCurrentStyle = function () {
+        var _a;
         this._color = defaultMarkupColor();
         this._tipDot.setColor(this._color);
         this._bubble.setColor(this._color);
-        this._bubble.setFontSize(getMarkupFontSize());
+        var style = defaultMarkupStyle();
+        this._bubble.setFontSize((_a = style.fontSize) !== null && _a !== void 0 ? _a : getMarkupFontSize());
+        acapSyncLiveOverlayTextHeight(this._view, [this._bubble], style);
         this.paintLeader();
         this._view.isHtmlDirty = true;
     };
     AcApMarkupCalloutJig.prototype.paintLeader = function () {
-        var lineWidth = markupCanvasLineWidth(getMarkupLineWeight());
+        var lineWidth = markupCanvasLineWidth(MARKUP_LINE_WEIGHT);
         var color = this._color;
         var tip = this._tip;
         var anchor = this._anchor;
@@ -190,17 +201,15 @@ var AcApMarkupCalloutJig = /** @class */ (function (_super) {
 var AcApMarkupCalloutCmd = /** @class */ (function (_super) {
     __extends(AcApMarkupCalloutCmd, _super);
     function AcApMarkupCalloutCmd() {
-        var _this = _super.call(this) || this;
-        configureMarkupCommand(_this);
-        return _this;
+        return _super !== null && _super.apply(this, arguments) || this;
     }
     AcApMarkupCalloutCmd.prototype.execute = function (context) {
         return __awaiter(this, void 0, void 0, function () {
             var _this = this;
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, withMarkupInput(context, function () { return __awaiter(_this, void 0, void 0, function () {
-                            var color, tipPrompt, tipResult, tip, jig, anchorPrompt, anchorResult, anchor, text, meta, record;
+                    case 0: return [4 /*yield*/, this.withMarkupInput(context, function () { return __awaiter(_this, void 0, void 0, function () {
+                            var color, tipPrompt, tipResult, tip, view2d, host, outline, callout, jig, anchorPrompt, anchorResult, anchor, text, meta, record;
                             var _a;
                             return __generator(this, function (_b) {
                                 switch (_b.label) {
@@ -213,23 +222,39 @@ var AcApMarkupCalloutCmd = /** @class */ (function (_super) {
                                         if (tipResult.status !== AcEdPromptStatus.OK)
                                             return [2 /*return*/];
                                         tip = tipResult.value;
-                                        jig = new AcApMarkupCalloutJig(context.view, tip, '', color);
-                                        _b.label = 2;
+                                        view2d = context.view;
+                                        host = pickAttachableShapeMarkupAt(view2d, { x: tip.x, y: tip.y });
+                                        if (!(host && isAttachableShapeMarkup(host.geometry))) return [3 /*break*/, 3];
+                                        outline = markupShapeOutlineFromGeometry(host.geometry);
+                                        return [4 /*yield*/, promptAttachedCallout(context, outline, {
+                                                force: true,
+                                                previewShape: false,
+                                                toward: { x: tip.x, y: tip.y }
+                                            })];
                                     case 2:
-                                        _b.trys.push([2, , 5, 6]);
+                                        callout = _b.sent();
+                                        if (callout) {
+                                            attachCalloutToMarkup(context.view, host.id, callout);
+                                        }
+                                        return [2 /*return*/];
+                                    case 3:
+                                        jig = new AcApMarkupCalloutJig(context.view, tip, '', color);
+                                        _b.label = 4;
+                                    case 4:
+                                        _b.trys.push([4, , 7, 8]);
                                         anchorPrompt = new AcEdPromptPointOptions(AcApI18n.t('jig.markup.callout.anchor'));
                                         anchorPrompt.basePoint = new AcGePoint3d(tip.x, tip.y, (_a = tip.z) !== null && _a !== void 0 ? _a : 0);
                                         anchorPrompt.useBasePoint = true;
                                         anchorPrompt.useDashedLine = false;
                                         anchorPrompt.jig = jig;
                                         return [4 /*yield*/, context.view.editor.getPoint(anchorPrompt)];
-                                    case 3:
+                                    case 5:
                                         anchorResult = _b.sent();
                                         if (anchorResult.status !== AcEdPromptStatus.OK)
                                             return [2 /*return*/];
                                         anchor = anchorResult.value;
                                         return [4 /*yield*/, promptMarkupCapsuleText(jig.capsule)];
-                                    case 4:
+                                    case 6:
                                         text = _b.sent();
                                         meta = createMarkupMeta('callout', context.view, context, { text: text || undefined });
                                         record = __assign(__assign({}, meta), { type: 'callout', geometry: {
@@ -238,11 +263,11 @@ var AcApMarkupCalloutCmd = /** @class */ (function (_super) {
                                                 anchor: { x: anchor.x, y: anchor.y }
                                             } });
                                         commitMarkup(context.view, record);
-                                        return [3 /*break*/, 6];
-                                    case 5:
+                                        return [3 /*break*/, 8];
+                                    case 7:
                                         jig.disposePreview();
                                         return [7 /*endfinally*/];
-                                    case 6: return [2 /*return*/];
+                                    case 8: return [2 /*return*/];
                                 }
                             });
                         }); })];
@@ -254,6 +279,6 @@ var AcApMarkupCalloutCmd = /** @class */ (function (_super) {
         });
     };
     return AcApMarkupCalloutCmd;
-}(AcEdCommand));
+}(AcApMarkupDrawCmd));
 export { AcApMarkupCalloutCmd };
 //# sourceMappingURL=AcApMarkupCalloutCmd.js.map

package/lib/command/markup/AcApMarkupCalloutCmd.js.map

@@ -1 +1 @@
-{"version":3,"file":"AcApMarkupCalloutCmd.js","sourceRoot":"","sources":["../../../src/command/markup/AcApMarkupCalloutCmd.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"AcApMarkupCalloutCmd.js","sourceRoot":"","sources":["../../../src/command/markup/AcApMarkupCalloutCmd.ts"],"names":[],"mappings":"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"}

package/lib/command/markup/AcApMarkupCircleCmd.d.ts

@@ -1,10 +1,9 @@
 import { AcApContext } from '../../app';
-import { AcEdCommand } from '../../editor';
+import { AcApMarkupDrawCmd } from './AcApMarkupDrawCmd';
 /**
  * Create a circle markup, optionally with an attached callout (no arrow).
  */
-export declare class AcApMarkupCircleCmd extends AcEdCommand {
-    constructor();
+export declare class AcApMarkupCircleCmd extends AcApMarkupDrawCmd {
     execute(context: AcApContext): Promise<void>;
 }
 //# sourceMappingURL=AcApMarkupCircleCmd.d.ts.map

package/lib/command/markup/AcApMarkupCircleCmd.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AcApMarkupCircleCmd.d.ts","sourceRoot":"","sources":["../../../src/command/markup/AcApMarkupCircleCmd.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,WAAW,EAAE,MAAM,WAAW,CAAA;AACvC,OAAO,EAEL,WAAW,EAIZ,MAAM,cAAc,CAAA;AAuErB;;GAEG;AACH,qBAAa,mBAAoB,SAAQ,WAAW;;IAM5C,OAAO,CAAC,OAAO,EAAE,WAAW;CA6CnC"}
+{"version":3,"file":"AcApMarkupCircleCmd.d.ts","sourceRoot":"","sources":["../../../src/command/markup/AcApMarkupCircleCmd.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,WAAW,CAAA;AAcvC,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAA;AA4DvD;;GAEG;AACH,qBAAa,mBAAoB,SAAQ,iBAAiB;IAClD,OAAO,CAAC,OAAO,EAAE,WAAW;CAiDnC"}

package/lib/command/markup/AcApMarkupCircleCmd.js

@@ -61,14 +61,15 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     }
 };
 import { AcGePoint3d } from '@mlightcad/data-model';
-import { AcEdCommand, AcEdPreviewJig, AcEdPromptDistanceOptions, AcEdPromptStatus } from '../../editor';
+import { AcEdPreviewJig, AcEdPromptDistanceOptions, AcEdPromptStatus } from '../../editor';
 import { AcApI18n } from '../../i18n';
 import { AcApHtmlLivePreview, acapStrokeLiveCircle } from '../overlay/AcApHtmlLivePreview';
-import { configureMarkupCommand, createMarkupMeta, withMarkupInput } from './AcApMarkupCmdUtil';
+import { createMarkupMeta } from './AcApMarkupCmdUtil';
+import { AcApMarkupDrawCmd } from './AcApMarkupDrawCmd';
 import { commitMarkup } from './AcApMarkupPresenter';
 import { promptAttachedCallout, promptShapeFirstCorner } from './AcApMarkupShapeCallout';
 import { MARKUP_LIVE_LAYER } from './AcApMarkupStore';
-import { defaultMarkupColor, getMarkupLineWeight, markupCanvasLineWidth } from './AcApMarkupUtil';
+import { defaultMarkupColor, MARKUP_LINE_WEIGHT, markupCanvasLineWidth } from './AcApMarkupUtil';
 var AcApMarkupCircleJig = /** @class */ (function (_super) {
     __extends(AcApMarkupCircleJig, _super);
     function AcApMarkupCircleJig(view, center, color) {
@@ -92,7 +93,7 @@ var AcApMarkupCircleJig = /** @class */ (function (_super) {
         var _this = this;
         this._radius = Math.max(radius, 0);
         this._color = defaultMarkupColor();
-        var lineWidth = markupCanvasLineWidth(getMarkupLineWeight());
+        var lineWidth = markupCanvasLineWidth(MARKUP_LINE_WEIGHT);
         this._preview.acapSetDraw(function (ctx, view) {
             acapStrokeLiveCircle(ctx, view, _this._center, _this._radius, _this._color, lineWidth);
         });
@@ -109,16 +110,14 @@ var AcApMarkupCircleJig = /** @class */ (function (_super) {
 var AcApMarkupCircleCmd = /** @class */ (function (_super) {
     __extends(AcApMarkupCircleCmd, _super);
     function AcApMarkupCircleCmd() {
-        var _this = _super.call(this) || this;
-        configureMarkupCommand(_this);
-        return _this;
+        return _super !== null && _super.apply(this, arguments) || this;
     }
     AcApMarkupCircleCmd.prototype.execute = function (context) {
         return __awaiter(this, void 0, void 0, function () {
             var _this = this;
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, withMarkupInput(context, function () { return __awaiter(_this, void 0, void 0, function () {
+                    case 0: return [4 /*yield*/, this.withMarkupInput(context, function () { return __awaiter(_this, void 0, void 0, function () {
                             var color, center, radiusPrompt, radiusResult, radius, callout, meta, record;
                             var _a;
                             return __generator(this, function (_b) {
@@ -169,6 +168,6 @@ var AcApMarkupCircleCmd = /** @class */ (function (_super) {
         });
     };
     return AcApMarkupCircleCmd;
-}(AcEdCommand));
+}(AcApMarkupDrawCmd));
 export { AcApMarkupCircleCmd };
 //# sourceMappingURL=AcApMarkupCircleCmd.js.map

package/lib/command/markup/AcApMarkupCircleCmd.js.map

@@ -1 +1 @@
-{"version":3,"file":"AcApMarkupCircleCmd.js","sourceRoot":"","sources":["../../../src/command/markup/AcApMarkupCircleCmd.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"AcApMarkupCircleCmd.js","sourceRoot":"","sources":["../../../src/command/markup/AcApMarkupCircleCmd.ts"],"names":[],"mappings":"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"}

package/lib/command/markup/AcApMarkupCloudCmd.d.ts

@@ -1,11 +1,10 @@
 import { AcApContext } from '../../app';
-import { AcEdCommand } from '../../editor';
+import { AcApMarkupDrawCmd } from './AcApMarkupDrawCmd';
 /**
  * Create a rectangular revision-cloud markup, optionally with an attached
  * callout (leader + text, no arrow).
  */
-export declare class AcApMarkupCloudCmd extends AcEdCommand {
-    constructor();
+export declare class AcApMarkupCloudCmd extends AcApMarkupDrawCmd {
     execute(context: AcApContext): Promise<void>;
 }
 //# sourceMappingURL=AcApMarkupCloudCmd.d.ts.map

package/lib/command/markup/AcApMarkupCloudCmd.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AcApMarkupCloudCmd.d.ts","sourceRoot":"","sources":["../../../src/command/markup/AcApMarkupCloudCmd.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,WAAW,EAAE,MAAM,WAAW,CAAA;AACvC,OAAO,EAEL,WAAW,EAIZ,MAAM,cAAc,CAAA;AAkFrB;;;GAGG;AACH,qBAAa,kBAAmB,SAAQ,WAAW;;IAM3C,OAAO,CAAC,OAAO,EAAE,WAAW;CA0CnC"}
+{"version":3,"file":"AcApMarkupCloudCmd.d.ts","sourceRoot":"","sources":["../../../src/command/markup/AcApMarkupCloudCmd.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,WAAW,CAAA;AAevC,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAA;AAsEvD;;;GAGG;AACH,qBAAa,kBAAmB,SAAQ,iBAAiB;IACjD,OAAO,CAAC,OAAO,EAAE,WAAW;CA0CnC"}

package/lib/command/markup/AcApMarkupCloudCmd.js

@@ -60,15 +60,16 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
-import { AcEdCommand, AcEdPreviewJig, AcEdPromptPointOptions, AcEdPromptStatus } from '../../editor';
+import { AcEdPreviewJig, AcEdPromptPointOptions, AcEdPromptStatus } from '../../editor';
 import { AcApI18n } from '../../i18n';
 import { AcApHtmlLivePreview, acapStrokeLivePolyline } from '../overlay/AcApHtmlLivePreview';
-import { configureMarkupCommand, createMarkupMeta, withMarkupInput } from './AcApMarkupCmdUtil';
+import { createMarkupMeta } from './AcApMarkupCmdUtil';
+import { AcApMarkupDrawCmd } from './AcApMarkupDrawCmd';
 import { commitMarkup } from './AcApMarkupPresenter';
 import { markupCloudVertices, tessellateMarkupCloud } from './AcApMarkupShapeBuilder';
 import { promptAttachedCallout, promptShapeFirstCorner } from './AcApMarkupShapeCallout';
 import { MARKUP_LIVE_LAYER } from './AcApMarkupStore';
-import { defaultMarkupColor, getMarkupLineWeight, markupCanvasLineWidth } from './AcApMarkupUtil';
+import { defaultMarkupColor, MARKUP_LINE_WEIGHT, markupCanvasLineWidth } from './AcApMarkupUtil';
 /** Build tessellated cloud outline (HTML stroke; no AcDb). */
 function cloudLivePoints(first, second, view) {
     return tessellateMarkupCloud(markupCloudVertices(first, second, view));
@@ -96,7 +97,7 @@ var AcApMarkupCloudJig = /** @class */ (function (_super) {
         var _this = this;
         this._second = second;
         this._color = defaultMarkupColor();
-        var lineWidth = markupCanvasLineWidth(getMarkupLineWeight());
+        var lineWidth = markupCanvasLineWidth(MARKUP_LINE_WEIGHT);
         var points = cloudLivePoints(this._first, this._second, this._view);
         this._preview.acapSetDraw(function (ctx, view) {
             acapStrokeLivePolyline(ctx, view, points, _this._color, lineWidth, {
@@ -117,16 +118,14 @@ var AcApMarkupCloudJig = /** @class */ (function (_super) {
 var AcApMarkupCloudCmd = /** @class */ (function (_super) {
     __extends(AcApMarkupCloudCmd, _super);
     function AcApMarkupCloudCmd() {
-        var _this = _super.call(this) || this;
-        configureMarkupCommand(_this);
-        return _this;
+        return _super !== null && _super.apply(this, arguments) || this;
     }
     AcApMarkupCloudCmd.prototype.execute = function (context) {
         return __awaiter(this, void 0, void 0, function () {
             var _this = this;
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, withMarkupInput(context, function () { return __awaiter(_this, void 0, void 0, function () {
+                    case 0: return [4 /*yield*/, this.withMarkupInput(context, function () { return __awaiter(_this, void 0, void 0, function () {
                             var color, p1, p2Prompt, p2Result, p2, callout, meta, record;
                             return __generator(this, function (_a) {
                                 switch (_a.label) {
@@ -173,6 +172,6 @@ var AcApMarkupCloudCmd = /** @class */ (function (_super) {
         });
     };
     return AcApMarkupCloudCmd;
-}(AcEdCommand));
+}(AcApMarkupDrawCmd));
 export { AcApMarkupCloudCmd };
 //# sourceMappingURL=AcApMarkupCloudCmd.js.map

package/lib/command/markup/AcApMarkupCloudCmd.js.map

@@ -1 +1 @@
-{"version":3,"file":"AcApMarkupCloudCmd.js","sourceRoot":"","sources":["../../../src/command/markup/AcApMarkupCloudCmd.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"AcApMarkupCloudCmd.js","sourceRoot":"","sources":["../../../src/command/markup/AcApMarkupCloudCmd.ts"],"names":[],"mappings":"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"}

package/lib/command/markup/AcApMarkupCmdUtil.d.ts

@@ -1,5 +1,5 @@
 import type { AcApContext } from '../../app';
-import { AcEdOpenMode } from '../../editor';
+import { type AcEdCommand, AcEdOpenMode } from '../../editor';
 import type { AcTrView2d } from '../../view';
 import type { AcApMarkupMeta, AcApMarkupRecord, AcApMarkupType } from './AcApMarkupTypes';
 /** Shared open-mode for all Design Review markup commands. */
@@ -12,6 +12,12 @@ export declare function configureMarkupCommand(command: {
     mode: AcEdOpenMode;
     recordsUndoStack: boolean;
 }): void;
+/**
+ * Markup drawing commands: Review mode plus color / font-size in the
+ * phone/pad session panel. Prefer {@link AcApMarkupDrawCmd} for new tools;
+ * this helper remains for one-off configuration.
+ */
+export declare function configureMarkupDrawCommand(command: AcEdCommand): void;
 /** Create shared metadata fields for a new markup record. */
 export declare function createMarkupMeta(type: AcApMarkupType, view: AcTrView2d, context: AcApContext, extras?: Partial<Pick<AcApMarkupMeta, 'text' | 'comment'>>): Omit<AcApMarkupMeta, 'type'> & {
     type: AcApMarkupType;

package/lib/command/markup/AcApMarkupCmdUtil.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AcApMarkupCmdUtil.d.ts","sourceRoot":"","sources":["../../../src/command/markup/AcApMarkupCmdUtil.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,WAAW,CAAA;AAC5C,OAAO,EAEL,YAAY,EAIb,MAAM,cAAc,CAAA;AAErB,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,YAAY,CAAA;AAE5C,OAAO,KAAK,EACV,cAAc,EACd,gBAAgB,EAChB,cAAc,EACf,MAAM,mBAAmB,CAAA;AAQ1B,8DAA8D;AAC9D,eAAO,MAAM,gBAAgB,sBAAsB,CAAA;AAEnD;;;GAGG;AACH,wBAAgB,sBAAsB,CAAC,OAAO,EAAE;IAC9C,IAAI,EAAE,YAAY,CAAA;IAClB,gBAAgB,EAAE,OAAO,CAAA;CAC1B,GAAG,IAAI,CAGP;AAED,6DAA6D;AAC7D,wBAAgB,gBAAgB,CAC9B,IAAI,EAAE,cAAc,EACpB,IAAI,EAAE,UAAU,EAChB,OAAO,EAAE,WAAW,EACpB,MAAM,CAAC,EAAE,OAAO,CAAC,IAAI,CAAC,cAAc,EAAE,MAAM,GAAG,SAAS,CAAC,CAAC,GACzD,IAAI,CAAC,cAAc,EAAE,MAAM,CAAC,GAAG;IAAE,IAAI,EAAE,cAAc,CAAA;CAAE,CAczD;AAED,+DAA+D;AAC/D,wBAAsB,gBAAgB,CACpC,OAAO,EAAE,WAAW,EACpB,UAAU,EAAE,MAAM,EAClB,YAAY,SAAK,GAChB,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAW7B;AAED;;GAEG;AACH,MAAM,WAAW,qBAAqB;IACpC,iDAAiD;IACjD,WAAW,EAAE,WAAW,CAAA;IACxB,gEAAgE;IAChE,OAAO,EAAE,WAAW,CAAA;CACrB;AAED;;;;GAIG;AACH,wBAAsB,uBAAuB,CAC3C,IAAI,EAAE,qBAAqB,EAC3B,OAAO,CAAC,EAAE;IAAE,SAAS,CAAC,EAAE,OAAO,CAAC;IAAC,WAAW,CAAC,EAAE,MAAM,CAAA;CAAE,GACtD,OAAO,CAAC,MAAM,CAAC,CAQjB;AAED,0EAA0E;AAC1E,wBAAsB,eAAe,CACnC,OAAO,EAAE,WAAW,EACpB,EAAE,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,GACtB,OAAO,CAAC,IAAI,CAAC,CAIf;AAED,mDAAmD;AACnD,MAAM,MAAM,YAAY,GAAG,CAAC,MAAM,EAAE,gBAAgB,KAAK,IAAI,CAAA"}
+{"version":3,"file":"AcApMarkupCmdUtil.d.ts","sourceRoot":"","sources":["../../../src/command/markup/AcApMarkupCmdUtil.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,WAAW,CAAA;AAC5C,OAAO,EACL,KAAK,WAAW,EAEhB,YAAY,EAIb,MAAM,cAAc,CAAA;AAGrB,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,YAAY,CAAA;AAE5C,OAAO,KAAK,EACV,cAAc,EACd,gBAAgB,EAChB,cAAc,EACf,MAAM,mBAAmB,CAAA;AAQ1B,8DAA8D;AAC9D,eAAO,MAAM,gBAAgB,sBAAsB,CAAA;AAEnD;;;GAGG;AACH,wBAAgB,sBAAsB,CAAC,OAAO,EAAE;IAC9C,IAAI,EAAE,YAAY,CAAA;IAClB,gBAAgB,EAAE,OAAO,CAAA;CAC1B,GAAG,IAAI,CAGP;AAED;;;;GAIG;AACH,wBAAgB,0BAA0B,CAAC,OAAO,EAAE,WAAW,GAAG,IAAI,CAGrE;AAED,6DAA6D;AAC7D,wBAAgB,gBAAgB,CAC9B,IAAI,EAAE,cAAc,EACpB,IAAI,EAAE,UAAU,EAChB,OAAO,EAAE,WAAW,EACpB,MAAM,CAAC,EAAE,OAAO,CAAC,IAAI,CAAC,cAAc,EAAE,MAAM,GAAG,SAAS,CAAC,CAAC,GACzD,IAAI,CAAC,cAAc,EAAE,MAAM,CAAC,GAAG;IAAE,IAAI,EAAE,cAAc,CAAA;CAAE,CAczD;AAED,+DAA+D;AAC/D,wBAAsB,gBAAgB,CACpC,OAAO,EAAE,WAAW,EACpB,UAAU,EAAE,MAAM,EAClB,YAAY,SAAK,GAChB,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAW7B;AAED;;GAEG;AACH,MAAM,WAAW,qBAAqB;IACpC,iDAAiD;IACjD,WAAW,EAAE,WAAW,CAAA;IACxB,gEAAgE;IAChE,OAAO,EAAE,WAAW,CAAA;CACrB;AAED;;;;GAIG;AACH,wBAAsB,uBAAuB,CAC3C,IAAI,EAAE,qBAAqB,EAC3B,OAAO,CAAC,EAAE;IAAE,SAAS,CAAC,EAAE,OAAO,CAAC;IAAC,WAAW,CAAC,EAAE,MAAM,CAAA;CAAE,GACtD,OAAO,CAAC,MAAM,CAAC,CAQjB;AAED,0EAA0E;AAC1E,wBAAsB,eAAe,CACnC,OAAO,EAAE,WAAW,EACpB,EAAE,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,GACtB,OAAO,CAAC,IAAI,CAAC,CAIf;AAED,mDAAmD;AACnD,MAAM,MAAM,YAAY,GAAG,CAAC,MAAM,EAAE,gBAAgB,KAAK,IAAI,CAAA"}

package/lib/command/markup/AcApMarkupCmdUtil.js

@@ -36,6 +36,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 };
 import { AcEdCorsorType, AcEdOpenMode, AcEdPromptStatus, AcEdPromptStringOptions, AcEdViewMode } from '../../editor';
 import { AcApI18n } from '../../i18n';
+import { acuiBindDrawStyleSessionAccessory } from '../../ui/AcUiDrawStyle';
 import { editMarkupHtmlText } from './AcApMarkupTextEdit';
 import { createMarkupId, defaultMarkupStyle, getMarkupAuthor, markupNow } from './AcApMarkupUtil';
 /** Shared open-mode for all Design Review markup commands. */
@@ -48,6 +49,15 @@ export function configureMarkupCommand(command) {
     command.mode = MARKUP_OPEN_MODE;
     command.recordsUndoStack = false;
 }
+/**
+ * Markup drawing commands: Review mode plus color / font-size in the
+ * phone/pad session panel. Prefer {@link AcApMarkupDrawCmd} for new tools;
+ * this helper remains for one-off configuration.
+ */
+export function configureMarkupDrawCommand(command) {
+    configureMarkupCommand(command);
+    acuiBindDrawStyleSessionAccessory(command);
+}
 /** Create shared metadata fields for a new markup record. */
 export function createMarkupMeta(type, view, context, extras) {
     var _a;

package/lib/command/markup/AcApMarkupCmdUtil.js.map

@@ -1 +1 @@
-{"version":3,"file":"AcApMarkupCmdUtil.js","sourceRoot":"","sources":["../../../src/command/markup/AcApMarkupCmdUtil.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"AcApMarkupCmdUtil.js","sourceRoot":"","sources":["../../../src/command/markup/AcApMarkupCmdUtil.ts"],"names":[],"mappings":"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"}

package/lib/command/markup/AcApMarkupDrawCmd.d.ts

@@ -0,0 +1,19 @@
+import type { AcApContext } from '../../app/AcApContext';
+import { AcApDrawStyleDrawCmd } from '../AcApDrawStyleDrawCmd';
+/**
+
+ * Base class for commands that create Design Review markup overlays.
+
+ *
+
+ * Review mode, no empty DB undo marks, and the phone/pad color / font-size
+
+ * accessory. Clear, visibility, and import/export stay on {@link AcEdCommand}.
+
+ */
+export declare abstract class AcApMarkupDrawCmd extends AcApDrawStyleDrawCmd {
+    constructor();
+    /** Run a markup-draw body inside selection mode + crosshair cursor. */
+    protected withMarkupInput(context: AcApContext, fn: () => Promise<void>): Promise<void>;
+}
+//# sourceMappingURL=AcApMarkupDrawCmd.d.ts.map

package/lib/command/markup/AcApMarkupDrawCmd.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"AcApMarkupDrawCmd.d.ts","sourceRoot":"","sources":["../../../src/command/markup/AcApMarkupDrawCmd.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAA;AAMxD,OAAO,EAAE,oBAAoB,EAAE,MAAM,yBAAyB,CAAA;AAI9D;;;;;;;;;;GAUG;AAEH,8BAAsB,iBAAkB,SAAQ,oBAAoB;;IAkBlE,uEAAuE;IAEvE,SAAS,CAAC,eAAe,CAEvB,OAAO,EAAE,WAAW,EAEpB,EAAE,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,GAEtB,OAAO,CAAC,IAAI,CAAC;CAMjB"}

package/lib/command/markup/AcApMarkupDrawCmd.js

@@ -0,0 +1,47 @@
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    };
+    return function (d, b) {
+        if (typeof b !== "function" && b !== null)
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+import { AcEdOpenMode } from '../../editor/view/AcEdOpenMode';
+import { withDrawOverlayInput } from '../AcApDrawOverlayInput';
+import { AcApDrawStyleDrawCmd } from '../AcApDrawStyleDrawCmd';
+/**
+
+ * Base class for commands that create Design Review markup overlays.
+
+ *
+
+ * Review mode, no empty DB undo marks, and the phone/pad color / font-size
+
+ * accessory. Clear, visibility, and import/export stay on {@link AcEdCommand}.
+
+ */
+var AcApMarkupDrawCmd = /** @class */ (function (_super) {
+    __extends(AcApMarkupDrawCmd, _super);
+    function AcApMarkupDrawCmd() {
+        var _this = _super.call(this) || this;
+        // Same defaults as {@link configureMarkupDrawCommand}; inlined so this
+        // module does not import the editor barrel (keeps Node Jest loadable).
+        _this.mode = AcEdOpenMode.Review;
+        _this.recordsUndoStack = false;
+        return _this;
+    }
+    /** Run a markup-draw body inside selection mode + crosshair cursor. */
+    AcApMarkupDrawCmd.prototype.withMarkupInput = function (context, fn) {
+        return withDrawOverlayInput(context, fn);
+    };
+    return AcApMarkupDrawCmd;
+}(AcApDrawStyleDrawCmd));
+export { AcApMarkupDrawCmd };
+//# sourceMappingURL=AcApMarkupDrawCmd.js.map

package/lib/command/markup/AcApMarkupDrawCmd.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"AcApMarkupDrawCmd.js","sourceRoot":"","sources":["../../../src/command/markup/AcApMarkupDrawCmd.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAA;AAE7D,OAAO,EAAE,oBAAoB,EAAE,MAAM,yBAAyB,CAAA;AAE9D,OAAO,EAAE,oBAAoB,EAAE,MAAM,yBAAyB,CAAA;AAI9D;;;;;;;;;;GAUG;AAEH;IAAgD,qCAAoB;IAElE;QAEE,YAAA,MAAK,WAAE,SAAA;QAEP,uEAAuE;QAEvE,uEAAuE;QAEvE,KAAI,CAAC,IAAI,GAAG,YAAY,CAAC,MAAM,CAAA;QAE/B,KAAI,CAAC,gBAAgB,GAAG,KAAK,CAAA;;IAE/B,CAAC;IAID,uEAAuE;IAE7D,2CAAe,GAAzB,UAEE,OAAoB,EAEpB,EAAuB;QAIvB,OAAO,oBAAoB,CAAC,OAAO,EAAE,EAAE,CAAC,CAAA;IAE1C,CAAC;IAEH,wBAAC;AAAD,CAAC,AAhCD,CAAgD,oBAAoB,GAgCnE"}

package/lib/command/markup/AcApMarkupGeometry.d.ts

@@ -1,6 +1,7 @@
 import { AcGeBox2d } from '@mlightcad/data-model';
 import { type AcApScreenPoint } from '../../util/AcApScreenHitTest';
-import type { AcApMarkupAttachedCallout, AcApMarkupGeometry, AcApMarkupPoint2d } from './AcApMarkupTypes';
+import type { AcApMarkupShapeOutline } from './AcApMarkupShapeCallout';
+import type { AcApMarkupAttachedCallout, AcApMarkupCircleGeometry, AcApMarkupCloudGeometry, AcApMarkupGeometry, AcApMarkupPoint2d, AcApMarkupRectGeometry } from './AcApMarkupTypes';
 type WorldToScreen = (point: AcApMarkupPoint2d) => AcApScreenPoint;
 /**
  * Translate a 2D markup point by a world-space delta.
@@ -38,13 +39,48 @@ export declare function markupGeometryCenter(geometry: AcApMarkupGeometry): AcAp
  * @returns A new geometry object of the same type.
  */
 export declare function translateMarkupGeometry(geometry: AcApMarkupGeometry, dx: number, dy: number): AcApMarkupGeometry;
+/**
+ * Grow `box` by the world-space corners of overlay client rectangles.
+ *
+ * Used so zoom-to includes HTML text boxes / badges / stamps whose size is
+ * screen-space, not just geometry control points.
+ *
+ * @param box - World AABB to expand in place.
+ * @param rects - Overlay `getBoundingClientRect()` results.
+ * @param clientToWorld - Converts viewport/client pixels to world XY.
+ */
+export declare function expandMarkupBoundsByClientRects(box: AcGeBox2d, rects: ReadonlyArray<{
+    left: number;
+    top: number;
+    right: number;
+    bottom: number;
+}>, clientToWorld: (clientX: number, clientY: number) => AcApMarkupPoint2d): void;
 /**
  * Axis-aligned world bounds of a markup's control geometry.
  *
- * Used for window / crossing box selection. Point-like markups (text / stamp /
- * symbol) use their anchor; shapes include attached callout tip and anchor.
+ * Used for window / crossing box selection and zoom-to. Point-like markups
+ * (text / stamp / symbol) use their anchor; shapes include attached callout
+ * tip and anchor so leaders are part of the same box as the shape.
  */
 export declare function markupGeometryBounds(geometry: AcApMarkupGeometry): AcGeBox2d | undefined;
+/**
+ * Cloud / rect / circle geometry that can receive an attached callout.
+ */
+export type AcApMarkupAttachableShapeGeometry = AcApMarkupCloudGeometry | AcApMarkupRectGeometry | AcApMarkupCircleGeometry;
+/**
+ * Whether geometry is a cloud / rect / circle with no leader + text box yet.
+ */
+export declare function isAttachableShapeMarkup(geometry: AcApMarkupGeometry): geometry is AcApMarkupAttachableShapeGeometry;
+/**
+ * Shape outline used to constrain an attached-callout leader tip.
+ */
+export declare function markupShapeOutlineFromGeometry(geometry: AcApMarkupAttachableShapeGeometry): AcApMarkupShapeOutline;
+/**
+ * Whether a canvas-space pick hits a cloud / rect / circle outer frame
+ * (AABB for cloud/rect, circumference for circle). Does not hit interiors
+ * or an already-attached callout leader.
+ */
+export declare function hitTestMarkupShapeOutline(geometry: AcApMarkupGeometry, canvas: AcApScreenPoint, worldToScreen: WorldToScreen, threshold: number): boolean;
 /**
  * Whether a canvas-space pick hits a markup's drawn stroke (not HTML capsules).
  *

package/lib/command/markup/AcApMarkupGeometry.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AcApMarkupGeometry.d.ts","sourceRoot":"","sources":["../../../src/command/markup/AcApMarkupGeometry.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAA;AAEjD,OAAO,EACL,KAAK,eAAe,EAKrB,MAAM,8BAA8B,CAAA;AACrC,OAAO,KAAK,EACV,yBAAyB,EACzB,kBAAkB,EAClB,iBAAiB,EAClB,MAAM,mBAAmB,CAAA;AAK1B,KAAK,aAAa,GAAG,CAAC,KAAK,EAAE,iBAAiB,KAAK,eAAe,CAAA;AAElE;;;;;;;GAOG;AACH,wBAAgB,oBAAoB,CAClC,KAAK,EAAE,iBAAiB,EACxB,EAAE,EAAE,MAAM,EACV,EAAE,EAAE,MAAM,GACT,iBAAiB,CAEnB;AAED;;;;;;;GAOG;AACH,wBAAgB,wBAAwB,CACtC,OAAO,EAAE,yBAAyB,EAClC,EAAE,EAAE,MAAM,EACV,EAAE,EAAE,MAAM,GACT,yBAAyB,CAM3B;AAED;;;;;GAKG;AACH,wBAAgB,oBAAoB,CAClC,QAAQ,EAAE,kBAAkB,GAC3B,iBAAiB,GAAG,SAAS,CA6B/B;AAED;;;;;;;;;GASG;AACH,wBAAgB,uBAAuB,CACrC,QAAQ,EAAE,kBAAkB,EAC5B,EAAE,EAAE,MAAM,EACV,EAAE,EAAE,MAAM,GACT,kBAAkB,CAuDpB;AAyBD;;;;;GAKG;AACH,wBAAgB,oBAAoB,CAClC,QAAQ,EAAE,kBAAkB,GAC3B,SAAS,GAAG,SAAS,CAuCvB;AAED;;;;;;GAMG;AACH,wBAAgB,qBAAqB,CACnC,QAAQ,EAAE,kBAAkB,EAC5B,MAAM,EAAE,eAAe,EACvB,aAAa,EAAE,aAAa,EAC5B,SAAS,EAAE,MAAM,GAChB,OAAO,CAgFT"}
+{"version":3,"file":"AcApMarkupGeometry.d.ts","sourceRoot":"","sources":["../../../src/command/markup/AcApMarkupGeometry.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAA;AAEjD,OAAO,EACL,KAAK,eAAe,EAKrB,MAAM,8BAA8B,CAAA;AACrC,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAA;AACtE,OAAO,KAAK,EACV,yBAAyB,EACzB,wBAAwB,EACxB,uBAAuB,EACvB,kBAAkB,EAClB,iBAAiB,EACjB,sBAAsB,EACvB,MAAM,mBAAmB,CAAA;AAK1B,KAAK,aAAa,GAAG,CAAC,KAAK,EAAE,iBAAiB,KAAK,eAAe,CAAA;AAElE;;;;;;;GAOG;AACH,wBAAgB,oBAAoB,CAClC,KAAK,EAAE,iBAAiB,EACxB,EAAE,EAAE,MAAM,EACV,EAAE,EAAE,MAAM,GACT,iBAAiB,CAEnB;AAED;;;;;;;GAOG;AACH,wBAAgB,wBAAwB,CACtC,OAAO,EAAE,yBAAyB,EAClC,EAAE,EAAE,MAAM,EACV,EAAE,EAAE,MAAM,GACT,yBAAyB,CAM3B;AAED;;;;;GAKG;AACH,wBAAgB,oBAAoB,CAClC,QAAQ,EAAE,kBAAkB,GAC3B,iBAAiB,GAAG,SAAS,CA6B/B;AAED;;;;;;;;;GASG;AACH,wBAAgB,uBAAuB,CACrC,QAAQ,EAAE,kBAAkB,EAC5B,EAAE,EAAE,MAAM,EACV,EAAE,EAAE,MAAM,GACT,kBAAkB,CAuDpB;AAyBD;;;;;;;;;GASG;AACH,wBAAgB,+BAA+B,CAC7C,GAAG,EAAE,SAAS,EACd,KAAK,EAAE,aAAa,CAAC;IACnB,IAAI,EAAE,MAAM,CAAA;IACZ,GAAG,EAAE,MAAM,CAAA;IACX,KAAK,EAAE,MAAM,CAAA;IACb,MAAM,EAAE,MAAM,CAAA;CACf,CAAC,EACF,aAAa,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,KAAK,iBAAiB,GACrE,IAAI,CAMN;AAED;;;;;;GAMG;AACH,wBAAgB,oBAAoB,CAClC,QAAQ,EAAE,kBAAkB,GAC3B,SAAS,GAAG,SAAS,CAuCvB;AAED;;GAEG;AACH,MAAM,MAAM,iCAAiC,GACzC,uBAAuB,GACvB,sBAAsB,GACtB,wBAAwB,CAAA;AAE5B;;GAEG;AACH,wBAAgB,uBAAuB,CACrC,QAAQ,EAAE,kBAAkB,GAC3B,QAAQ,IAAI,iCAAiC,CAO/C;AAED;;GAEG;AACH,wBAAgB,8BAA8B,CAC5C,QAAQ,EAAE,iCAAiC,GAC1C,sBAAsB,CAaxB;AAED;;;;GAIG;AACH,wBAAgB,yBAAyB,CACvC,QAAQ,EAAE,kBAAkB,EAC5B,MAAM,EAAE,eAAe,EACvB,aAAa,EAAE,aAAa,EAC5B,SAAS,EAAE,MAAM,GAChB,OAAO,CAiET;AAED;;;;;;GAMG;AACH,wBAAgB,qBAAqB,CACnC,QAAQ,EAAE,kBAAkB,EAC5B,MAAM,EAAE,eAAe,EACvB,aAAa,EAAE,aAAa,EAC5B,SAAS,EAAE,MAAM,GAChB,OAAO,CA6CT"}