@mlightcad/cad-simple-viewer 1.6.2 → 1.7.0

package/lib/command/markup/AcApMarkupPresenter.js

@@ -1,3 +1,14 @@
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
 var __values = (this && this.__values) || function(o) {
     var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
     if (m) return m.call(o);
@@ -11,9 +22,12 @@ var __values = (this && this.__values) || function(o) {
 };
 import { AcGeBox2d } from '@mlightcad/data-model';
 import { acapNotifyUndoStackChanged } from '../../util/AcApDatabaseEdit';
+import { expandMarkupBoundsByClientRects, isAttachableShapeMarkup, markupGeometryBounds } from './AcApMarkupGeometry';
 import { getMarkupHistory, getSessionUndo, runMarkupEdit } from './AcApMarkupHistory';
 import { registerMarkupPublish } from './AcApMarkupRepublish';
+import { getActiveMarkupBag } from './AcApMarkupSession';
 import { getMarkupStore, MARKUP_LAYER, MARKUP_LIVE_LAYER } from './AcApMarkupStore';
+import { patchMarkupStyleWcs, withMarkupStyleWcs } from './AcApMarkupUtil';
 import { createMarkupEntityFromRecord } from './entity';
 // Re-export shape builders for commands / jigs that imported them from here.
 export { markupCloudVertices, markupRectCorners, strokeMarkupCloud, tessellateMarkupCloud, buildMarkupCloud, buildMarkupRect } from './AcApMarkupShapeBuilder';
@@ -224,34 +238,75 @@ var AcApMarkupPresenter = /** @class */ (function () {
         asView2d(view).htmlTransientManager.selectGroup(id);
         getMarkupStore().setSelectedId(id);
     };
-    /** Zoom roughly to a markup's primary world point. */
+    /**
+     * Zoom to the combined world AABB of a markup: shape, leader, and published
+     * HTML overlays (text box / badge / stamp).
+     */
     AcApMarkupPresenter.prototype.focus = function (view, record) {
-        var p = createMarkupEntityFromRecord(record).primaryPoint();
-        if (!p)
+        var box = markupFocusExtents(view, record);
+        if (!box)
             return;
-        var view2d = asView2d(view);
-        var pad = 50;
-        var box = new AcGeBox2d()
-            .expandByPoint({ x: p.x - pad, y: p.y - pad })
-            .expandByPoint({ x: p.x + pad, y: p.y + pad });
-        view2d.zoomTo(box, 1.5);
+        asView2d(view).zoomTo(box, 1.5);
         this.select(view, record.id);
     };
     return AcApMarkupPresenter;
 }());
 export { AcApMarkupPresenter };
-var sharedPresenter;
+/**
+ * Combined zoom-to box for a markup: control geometry plus HTML text boxes.
+ *
+ * Grip dots are omitted; they sit on geometry already included in the AABB.
+ *
+ * @param view - View used for overlay lookup and client → world conversion.
+ * @param record - Markup whose shape, leader, and overlays are framed.
+ * @returns World AABB, or `undefined` when the markup has no finite bounds.
+ */
+export function markupFocusExtents(view, record) {
+    var e_4, _a;
+    var geometryBox = markupGeometryBounds(record.geometry);
+    var box = geometryBox
+        ? new AcGeBox2d(geometryBox.min, geometryBox.max)
+        : new AcGeBox2d();
+    var group = asView2d(view).htmlTransientManager.getGroup(record.id);
+    if (group) {
+        var rects = [];
+        try {
+            for (var _b = __values(group.children), _c = _b.next(); !_c.done; _c = _b.next()) {
+                var child = _c.value;
+                var el = child.element;
+                if (el.classList.contains('ml-html-dot') ||
+                    el.classList.contains('ml-html-grip')) {
+                    continue;
+                }
+                var rect = el.getBoundingClientRect();
+                if (rect.width <= 0 && rect.height <= 0)
+                    continue;
+                rects.push(rect);
+            }
+        }
+        catch (e_4_1) { e_4 = { error: e_4_1 }; }
+        finally {
+            try {
+                if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
+            }
+            finally { if (e_4) throw e_4.error; }
+        }
+        expandMarkupBoundsByClientRects(box, rects, function (clientX, clientY) {
+            var canvas = view.viewportToCanvas({ x: clientX, y: clientY });
+            return view.screenToWorld(canvas);
+        });
+    }
+    return box.isEmpty() ? undefined : box;
+}
 /** Shared presenter for the active viewer session. */
 export function getMarkupPresenter() {
-    if (!sharedPresenter)
-        sharedPresenter = new AcApMarkupPresenter();
-    return sharedPresenter;
+    return getActiveMarkupBag().presenter;
 }
 registerMarkupPublish(function (view, record) {
     getMarkupPresenter().publish(view, record);
 });
 /**
- * Reset markup store, visuals tracking, and undo history for a new drawing.
+ * Reset markup store, visuals tracking, and undo history for the active drawing.
  * Call before {@link AcTrView2d.clear} so overlay dispose does not look like
  * user deletes and leftover undo cannot republish the previous drawing.
  */
@@ -267,10 +322,31 @@ export function resetMarkupSession() {
  */
 export function commitMarkup(view, record) {
     runMarkupEdit(view, 'Create Markup', function () {
-        getMarkupStore().upsert(record);
-        getMarkupPresenter().publish(view, record);
+        var enriched = __assign(__assign({}, record), { style: withMarkupStyleWcs(record.style, asView2d(view)) });
+        getMarkupStore().upsert(enriched);
+        getMarkupPresenter().publish(view, enriched);
     });
 }
+/**
+ * Attach a leader + text box to an existing cloud / rect / circle that has none.
+ *
+ * @returns true when the record was updated.
+ */
+export function attachCalloutToMarkup(view, recordId, callout) {
+    var store = getMarkupStore();
+    var existing = store.get(recordId);
+    if (!existing || !isAttachableShapeMarkup(existing.geometry))
+        return false;
+    runMarkupEdit(view, 'Attach Callout', function () {
+        var current = store.get(recordId);
+        if (!current || !isAttachableShapeMarkup(current.geometry))
+            return;
+        var updated = __assign(__assign({}, current), { text: callout.text, geometry: __assign(__assign({}, current.geometry), { callout: callout }), updatedAt: new Date().toISOString() });
+        store.upsert(updated);
+        getMarkupPresenter().publish(view, updated);
+    });
+    return true;
+}
 /**
  * Apply a style patch to the selected markup and republish it.
  */
@@ -280,9 +356,15 @@ export function applyMarkupStyleToSelection(view, patch) {
     if (!id)
         return;
     runMarkupEdit(view, 'Markup Style', function () {
+        var previous = store.get(id);
+        if (!previous)
+            return;
         var updated = store.updateStyle(id, patch);
-        if (updated)
-            getMarkupPresenter().publish(view, updated);
+        if (!updated)
+            return;
+        var enriched = __assign(__assign({}, updated), { style: patchMarkupStyleWcs(previous.style, updated.style, asView2d(view), patch) });
+        store.upsert(enriched);
+        getMarkupPresenter().publish(view, enriched);
     });
 }
 //# sourceMappingURL=AcApMarkupPresenter.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"AcApMarkupPresenter.js","sourceRoot":"","sources":["../../../src/command/markup/AcApMarkupPresenter.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,OAAO,EAAE,SAAS,EAAwB,MAAM,uBAAuB,CAAA;AAGvE,OAAO,EAAE,0BAA0B,EAAE,MAAM,6BAA6B,CAAA;AAExE,OAAO,EACL,gBAAgB,EAChB,cAAc,EACd,aAAa,EACd,MAAM,qBAAqB,CAAA;AAC5B,OAAO,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAA;AAC7D,OAAO,EACL,cAAc,EACd,YAAY,EACZ,iBAAiB,EAClB,MAAM,mBAAmB,CAAA;AAE1B,OAAO,EAAE,4BAA4B,EAAE,MAAM,UAAU,CAAA;AAEvD,6EAA6E;AAC7E,OAAO,EACL,mBAAmB,EACnB,iBAAiB,EACjB,iBAAiB,EACjB,qBAAqB,EACrB,gBAAgB,EAChB,eAAe,EAChB,MAAM,0BAA0B,CAAA;AAEjC,SAAS,QAAQ,CAAC,IAAkB;IAClC,OAAO,IAAkB,CAAA;AAC3B,CAAC;AAED;;;;;;GAMG;AACH;IAAA;QACmB,cAAS,GAAG,IAAI,GAAG,EAAU,CAAA;QACtC,2BAAsB,GAAG,KAAK,CAAA;IA+LxC,CAAC;IA7LC,iEAAiE;IACjE,0CAAY,GAAZ,UAAa,IAAkB;;QAC7B,IAAI,CAAC,YAAY,CAAC,IAAI,EAAE,EAAE,UAAU,EAAE,KAAK,EAAE,CAAC,CAAA;;YAC9C,KAAqB,IAAA,KAAA,SAAA,cAAc,EAAE,CAAC,IAAI,EAAE,CAAA,gBAAA,4BAAE,CAAC;gBAA1C,IAAM,MAAM,WAAA;gBACf,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC,CAAA;YAC5B,CAAC;;;;;;;;;IACH,CAAC;IAED;;;OAGG;IACH,qCAAO,GAAP,UAAQ,IAAkB,EAAE,MAAwB;QAApD,iBAwDC;;QAvDC,IAAM,MAAM,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAA;QAC7B,IAAM,gBAAgB,GAAG,cAAc,EAAE,CAAC,UAAU,KAAK,MAAM,CAAC,EAAE,CAAA;QAClE,IAAI,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE,CAAC;YAClC,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,MAAM,CAAC,EAAE,EAAE,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC,CAAA;QACxD,CAAC;QAED,IAAM,MAAM,GAAG,4BAA4B,CAAC,MAAM,CAAC,CAAA;QACnD,IAAM,KAAK,GAAG,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,CAAA;QAC9B,IAAA,KAAK,GAAgB,KAAK,MAArB,EAAE,SAAS,GAAK,KAAK,UAAV,CAAU;QAClC,IAAM,MAAM,GAAG;YACb,SAAS,WAAA;YACT,OAAO,EAAE,KAAK,CAAC,OAAO;SACvB,CAAA;QAED,IAAM,KAAK,GAAG,cAAc,EAAE,CAAA;QAC9B,IAAM,mBAAmB,GAAG,KAAK,CAAC,iBAAiB,CAAA;QACnD,KAAK,CAAC,iBAAiB,GAAG,UAAC,QAAQ,EAAE,CAAC;YACpC,mBAAmB,aAAnB,mBAAmB,uBAAnB,mBAAmB,CAAG,QAAQ,EAAE,CAAC,CAAC,CAAA;YAClC,IAAI,QAAQ,EAAE,CAAC;gBACb,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC,EAAE,CAAC,CAAA;gBACzB,IAAI,MAAM,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC;oBAAE,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,SAAS,CAAC,CAAA;YACrE,CAAC;iBAAM,CAAC;gBACN,IAAI,KAAK,CAAC,UAAU,KAAK,CAAC,CAAC,EAAE;oBAAE,KAAK,CAAC,aAAa,CAAC,SAAS,CAAC,CAAA;gBAC7D,IAAI,MAAM,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC;oBAAE,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,SAAS,CAAC,CAAA;YACvE,CAAC;QACH,CAAC,CAAA;QAED,IAAM,kBAAkB,GAAG,KAAK,CAAC,gBAAgB,CAAA;QACjD,KAAK,CAAC,gBAAgB,GAAG,UAAC,OAAO,EAAE,CAAC;;YAClC,kBAAkB,aAAlB,kBAAkB,uBAAlB,kBAAkB,CAAG,OAAO,EAAE,CAAC,CAAC,CAAA;;gBAChC,KAAuB,IAAA,KAAA,SAAA,MAAM,CAAC,SAAS,CAAA,gBAAA,4BAAE,CAAC;oBAArC,IAAM,QAAQ,WAAA;oBACjB,MAAM,CAAC,yBAAyB,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAA;gBACrD,CAAC;;;;;;;;;QACH,CAAC,CAAA;QAED,IAAM,WAAW,GAAG,KAAK,CAAC,SAAS,CAAA;QACnC,KAAK,CAAC,SAAS,GAAG;YAChB,WAAW,aAAX,WAAW,uBAAX,WAAW,EAAI,CAAA;YACf,IAAI,MAAM,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC;gBAAE,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,SAAS,CAAC,CAAA;YACrE,MAAM,CAAC,OAAO,EAAE,CAAA;YAChB,KAAI,CAAC,SAAS,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;YAChC,IAAI,CAAC,KAAI,CAAC,sBAAsB,EAAE,CAAC;gBACjC,KAAK,CAAC,YAAY,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;YAC/B,CAAC;QACH,CAAC,CAAA;QAED,MAAM,CAAC,oBAAoB,CAAC,GAAG,CAAC,KAAK,CAAC,CAAA;QACtC,MAAA,KAAK,CAAC,SAAS,qDAAI,CAAA;QACnB,MAAM,CAAC,WAAW,GAAG,IAAI,CAAA;QACzB,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;QAE7B,IAAI,gBAAgB,EAAE,CAAC;YACrB,cAAc,EAAE,CAAC,aAAa,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;YACzC,MAAM,CAAC,oBAAoB,CAAC,WAAW,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;QACpD,CAAC;IACH,CAAC;IAED;;OAEG;IACH,uCAAS,GAAT,UACE,IAAkB,EAClB,EAAU,EACV,OAAmC;QAHrC,iBAYC;QAPC,IAAM,WAAW,GAAG,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,WAAW,MAAK,IAAI,CAAA;QACjD,IAAM,KAAK,GAAG,cAAM,OAAA,KAAI,CAAC,iBAAiB,CAAC,IAAI,EAAE,EAAE,EAAE,WAAW,CAAC,EAA7C,CAA6C,CAAA;QACjE,IAAI,CAAC,WAAW,IAAI,CAAC,gBAAgB,EAAE,CAAC,MAAM,EAAE,CAAC;YAC/C,aAAa,CAAC,IAAI,EAAE,eAAe,EAAE,KAAK,CAAC,CAAA;YAC3C,OAAM;QACR,CAAC;QACD,KAAK,EAAE,CAAA;IACT,CAAC;IAEO,+CAAiB,GAAzB,UACE,IAAkB,EAClB,EAAU,EACV,WAAoB;QAEpB,IAAM,MAAM,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAA;QAC7B,IAAI,CAAC,sBAAsB,GAAG,WAAW,CAAA;QACzC,IAAI,CAAC;YACH,IAAI,MAAM,CAAC,oBAAoB,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC;gBACxC,MAAM,CAAC,oBAAoB,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;YACxC,CAAC;iBAAM,CAAC;gBACN,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;gBACzB,IAAI,CAAC,WAAW;oBAAE,cAAc,EAAE,CAAC,YAAY,CAAC,EAAE,CAAC,CAAA;YACrD,CAAC;QACH,CAAC;gBAAS,CAAC;YACT,IAAI,CAAC,sBAAsB,GAAG,KAAK,CAAA;QACrC,CAAC;QACD,MAAM,CAAC,WAAW,GAAG,IAAI,CAAA;IAC3B,CAAC;IAED,+DAA+D;IAC/D,0CAAY,GAAZ,UAAa,IAAkB,EAAE,OAAkC;QAAnE,iBAQC;QAPC,IAAM,gBAAgB,GAAG,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,UAAU,MAAK,KAAK,CAAA;QACtD,IAAM,KAAK,GAAG,cAAM,OAAA,KAAI,CAAC,oBAAoB,CAAC,IAAI,EAAE,gBAAgB,CAAC,EAAjD,CAAiD,CAAA;QACrE,IAAI,gBAAgB,IAAI,CAAC,gBAAgB,EAAE,CAAC,MAAM,EAAE,CAAC;YACnD,aAAa,CAAC,IAAI,EAAE,eAAe,EAAE,KAAK,CAAC,CAAA;YAC3C,OAAM;QACR,CAAC;QACD,KAAK,EAAE,CAAA;IACT,CAAC;IAED;;OAEG;IACH,yCAAW,GAAX,UACE,IAAkB,EAClB,QAAgB,EAChB,OAAkC;QAHpC,iBAqBC;QAhBC,IAAM,gBAAgB,GAAG,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,UAAU,MAAK,KAAK,CAAA;QACtD,IAAM,KAAK,GAAG;;YACZ,IAAM,GAAG,GAAG,cAAc,EAAE;iBACzB,IAAI,EAAE;iBACN,MAAM,CAAC,UAAA,MAAM,IAAI,OAAA,MAAM,CAAC,QAAQ,KAAK,QAAQ,EAA5B,CAA4B,CAAC;iBAC9C,GAAG,CAAC,UAAA,MAAM,IAAI,OAAA,MAAM,CAAC,EAAE,EAAT,CAAS,CAAC,CAAA;;gBAC3B,KAAiB,IAAA,QAAA,SAAA,GAAG,CAAA,wBAAA,yCAAE,CAAC;oBAAlB,IAAM,EAAE,gBAAA;oBACX,KAAI,CAAC,SAAS,CAAC,IAAI,EAAE,EAAE,EAAE,EAAE,WAAW,EAAE,CAAC,gBAAgB,EAAE,CAAC,CAAA;gBAC9D,CAAC;;;;;;;;;YACD,QAAQ,CAAC,IAAI,CAAC,CAAC,WAAW,GAAG,IAAI,CAAA;QACnC,CAAC,CAAA;QACD,IAAI,gBAAgB,IAAI,CAAC,gBAAgB,EAAE,CAAC,MAAM,EAAE,CAAC;YACnD,aAAa,CAAC,IAAI,EAAE,eAAe,EAAE,KAAK,CAAC,CAAA;YAC3C,OAAM;QACR,CAAC;QACD,KAAK,EAAE,CAAA;IACT,CAAC;IAEO,kDAAoB,GAA5B,UACE,IAAkB,EAClB,gBAAyB;QAEzB,IAAM,MAAM,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAA;QAC7B,IAAI,CAAC,sBAAsB,GAAG,IAAI,CAAA;QAClC,IAAI,CAAC;YACH,MAAM,CAAC,oBAAoB,CAAC,WAAW,EAAE,CAAA;YACzC,MAAM,CAAC,oBAAoB,CAAC,KAAK,CAAC,YAAY,CAAC,CAAA;YAC/C,MAAM,CAAC,oBAAoB,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAA;YACpD,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,CAAA;QACxB,CAAC;gBAAS,CAAC;YACT,IAAI,CAAC,sBAAsB,GAAG,KAAK,CAAA;QACrC,CAAC;QACD,IAAI,gBAAgB,EAAE,CAAC;YACrB,cAAc,EAAE,CAAC,KAAK,CAAC,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAA;QAC7C,CAAC;QACD,MAAM,CAAC,WAAW,GAAG,IAAI,CAAA;IAC3B,CAAC;IAED,qEAAqE;IACrE,6CAAe,GAAf;QACE,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,CAAA;IACxB,CAAC;IAED,6CAA6C;IAC7C,oCAAM,GAAN,UAAO,IAAkB,EAAE,EAAU;QACnC,QAAQ,CAAC,IAAI,CAAC,CAAC,oBAAoB,CAAC,WAAW,CAAC,EAAE,CAAC,CAAA;QACnD,cAAc,EAAE,CAAC,aAAa,CAAC,EAAE,CAAC,CAAA;IACpC,CAAC;IAED,sDAAsD;IACtD,mCAAK,GAAL,UAAM,IAAkB,EAAE,MAAwB;QAChD,IAAM,CAAC,GAAG,4BAA4B,CAAC,MAAM,CAAC,CAAC,YAAY,EAE9C,CAAA;QACb,IAAI,CAAC,CAAC;YAAE,OAAM;QACd,IAAM,MAAM,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAA;QAC7B,IAAM,GAAG,GAAG,EAAE,CAAA;QACd,IAAM,GAAG,GAAG,IAAI,SAAS,EAAE;aACxB,aAAa,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,GAAG,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,GAAG,EAAE,CAAC;aAC7C,aAAa,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,GAAG,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,GAAG,EAAE,CAAC,CAAA;QAChD,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,CAAA;QACvB,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,EAAE,CAAC,CAAA;IAC9B,CAAC;IACH,0BAAC;AAAD,CAAC,AAjMD,IAiMC;;AAED,IAAI,eAAgD,CAAA;AAEpD,sDAAsD;AACtD,MAAM,UAAU,kBAAkB;IAChC,IAAI,CAAC,eAAe;QAAE,eAAe,GAAG,IAAI,mBAAmB,EAAE,CAAA;IACjE,OAAO,eAAe,CAAA;AACxB,CAAC;AAED,qBAAqB,CAAC,UAAC,IAAI,EAAE,MAAM;IACjC,kBAAkB,EAAE,CAAC,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC,CAAA;AAC5C,CAAC,CAAC,CAAA;AAEF;;;;GAIG;AACH,MAAM,UAAU,kBAAkB;IAChC,gBAAgB,EAAE,CAAC,KAAK,EAAE,CAAA;IAC1B,cAAc,EAAE,CAAC,KAAK,EAAE,CAAA;IACxB,cAAc,EAAE,CAAC,KAAK,EAAE,CAAA;IACxB,kBAAkB,EAAE,CAAC,eAAe,EAAE,CAAA;IACtC,0BAA0B,EAAE,CAAA;AAC9B,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,YAAY,CAC1B,IAAkB,EAClB,MAAwB;IAExB,aAAa,CAAC,IAAI,EAAE,eAAe,EAAE;QACnC,cAAc,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;QAC/B,kBAAkB,EAAE,CAAC,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC,CAAA;IAC5C,CAAC,CAAC,CAAA;AACJ,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,2BAA2B,CACzC,IAAkB,EAClB,KAAyC;IAEzC,IAAM,KAAK,GAAG,cAAc,EAAE,CAAA;IAC9B,IAAM,EAAE,GAAG,KAAK,CAAC,UAAU,CAAA;IAC3B,IAAI,CAAC,EAAE;QAAE,OAAM;IACf,aAAa,CAAC,IAAI,EAAE,cAAc,EAAE;QAClC,IAAM,OAAO,GAAG,KAAK,CAAC,WAAW,CAAC,EAAE,EAAE,KAAK,CAAC,CAAA;QAC5C,IAAI,OAAO;YAAE,kBAAkB,EAAE,CAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,CAAA;IAC1D,CAAC,CAAC,CAAA;AACJ,CAAC"}
+{"version":3,"file":"AcApMarkupPresenter.js","sourceRoot":"","sources":["../../../src/command/markup/AcApMarkupPresenter.ts"],"names":[],"mappings":"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"}

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

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

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

@@ -1 +1 @@
-{"version":3,"file":"AcApMarkupRectCmd.d.ts","sourceRoot":"","sources":["../../../src/command/markup/AcApMarkupRectCmd.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,WAAW,CAAA;AACvC,OAAO,EAEL,WAAW,EAIZ,MAAM,cAAc,CAAA;AAqErB;;GAEG;AACH,qBAAa,iBAAkB,SAAQ,WAAW;;IAM1C,OAAO,CAAC,OAAO,EAAE,WAAW;CAuCnC"}
+{"version":3,"file":"AcApMarkupRectCmd.d.ts","sourceRoot":"","sources":["../../../src/command/markup/AcApMarkupRectCmd.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,WAAW,CAAA;AAevC,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAA;AAyDvD;;GAEG;AACH,qBAAa,iBAAkB,SAAQ,iBAAiB;IAChD,OAAO,CAAC,OAAO,EAAE,WAAW;CA4CnC"}

package/lib/command/markup/AcApMarkupRectCmd.js

@@ -60,14 +60,15 @@ 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, acapLiveRectCorners, acapStrokeLivePolyline } 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 AcApMarkupRectJig = /** @class */ (function (_super) {
     __extends(AcApMarkupRectJig, _super);
     function AcApMarkupRectJig(view, start, color) {
@@ -91,7 +92,7 @@ var AcApMarkupRectJig = /** @class */ (function (_super) {
         var _this = this;
         this._second = second;
         this._color = defaultMarkupColor();
-        var lineWidth = markupCanvasLineWidth(getMarkupLineWeight());
+        var lineWidth = markupCanvasLineWidth(MARKUP_LINE_WEIGHT);
         var corners = acapLiveRectCorners(this._first, this._second);
         this._preview.acapSetDraw(function (ctx, view) {
             acapStrokeLivePolyline(ctx, view, corners, _this._color, lineWidth, {
@@ -111,16 +112,14 @@ var AcApMarkupRectJig = /** @class */ (function (_super) {
 var AcApMarkupRectCmd = /** @class */ (function (_super) {
     __extends(AcApMarkupRectCmd, _super);
     function AcApMarkupRectCmd() {
-        var _this = _super.call(this) || this;
-        configureMarkupCommand(_this);
-        return _this;
+        return _super !== null && _super.apply(this, arguments) || this;
     }
     AcApMarkupRectCmd.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) {
@@ -169,6 +168,6 @@ var AcApMarkupRectCmd = /** @class */ (function (_super) {
         });
     };
     return AcApMarkupRectCmd;
-}(AcEdCommand));
+}(AcApMarkupDrawCmd));
 export { AcApMarkupRectCmd };
 //# sourceMappingURL=AcApMarkupRectCmd.js.map

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

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

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

@@ -0,0 +1,54 @@
+import type { AcApMarkupHistory, AcApSessionUndo } from './AcApMarkupHistory';
+import type { AcApMarkupPresenter } from './AcApMarkupPresenter';
+import type { AcApMarkupStore } from './AcApMarkupStore';
+import type { AcApMarkupRecord } from './AcApMarkupTypes';
+/** Per-document markup bags (store + presenter + history). */
+export interface AcApMarkupSessionBag {
+    /** Markup records for this session. */
+    store: AcApMarkupStore;
+    /** Overlay visuals for this session. */
+    presenter: AcApMarkupPresenter;
+    /** Undo/redo stack for this session. */
+    history: AcApMarkupHistory;
+    /** DB / markup / overlay undo coordinator for this session. */
+    sessionUndo: AcApSessionUndo;
+}
+/** Factory that builds a fresh {@link AcApMarkupSessionBag}. */
+type BagFactory = () => AcApMarkupSessionBag;
+/**
+ * Installs the factory used to create per-session markup bags.
+ * Called once from the markup module bootstrap to avoid circular imports.
+ *
+ * @param factory - Creates a store + presenter + history bag.
+ */
+export declare function acapSetMarkupBagFactory(factory: BagFactory): void;
+/** Returns the bag for the active session (or a process fallback). */
+export declare function getActiveMarkupBag(): AcApMarkupSessionBag;
+/**
+ * Binds markup APIs to a document session id.
+ *
+ * @param sessionId - {@link AcApDocSession.id} of the active document.
+ */
+export declare function acapBindMarkupSession(sessionId: string): void;
+/** Returns the currently bound session id, if any. */
+export declare function acapActiveMarkupSessionId(): string | undefined;
+/**
+ * Disposes markup state for a closed document session.
+ *
+ * @param sessionId - Session whose bag should be dropped.
+ */
+export declare function acapDisposeMarkupSession(sessionId: string): void;
+/**
+ * Lists markup records for a session without activating it.
+ *
+ * @param sessionId - Session to inspect.
+ */
+export declare function listMarkupsForSession(sessionId: string): AcApMarkupRecord[];
+/**
+ * Returns the store for a session without activating it.
+ *
+ * @param sessionId - Session to inspect.
+ */
+export declare function getMarkupStoreForSession(sessionId: string): AcApMarkupStore | undefined;
+export {};
+//# sourceMappingURL=AcApMarkupSession.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"AcApMarkupSession.d.ts","sourceRoot":"","sources":["../../../src/command/markup/AcApMarkupSession.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAA;AAC7E,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAA;AAChE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAA;AACxD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAA;AAEzD,8DAA8D;AAC9D,MAAM,WAAW,oBAAoB;IACnC,uCAAuC;IACvC,KAAK,EAAE,eAAe,CAAA;IACtB,wCAAwC;IACxC,SAAS,EAAE,mBAAmB,CAAA;IAC9B,wCAAwC;IACxC,OAAO,EAAE,iBAAiB,CAAA;IAC1B,+DAA+D;IAC/D,WAAW,EAAE,eAAe,CAAA;CAC7B;AAED,gEAAgE;AAChE,KAAK,UAAU,GAAG,MAAM,oBAAoB,CAAA;AAW5C;;;;;GAKG;AACH,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,UAAU,GAAG,IAAI,CAEjE;AAuBD,sEAAsE;AACtE,wBAAgB,kBAAkB,IAAI,oBAAoB,CAEzD;AAED;;;;GAIG;AACH,wBAAgB,qBAAqB,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI,CAG7D;AAED,sDAAsD;AACtD,wBAAgB,yBAAyB,IAAI,MAAM,GAAG,SAAS,CAE9D;AAED;;;;GAIG;AACH,wBAAgB,wBAAwB,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI,CAKhE;AAED;;;;GAIG;AACH,wBAAgB,qBAAqB,CAAC,SAAS,EAAE,MAAM,GAAG,gBAAgB,EAAE,CAE3E;AAED;;;;GAIG;AACH,wBAAgB,wBAAwB,CACtC,SAAS,EAAE,MAAM,GAChB,eAAe,GAAG,SAAS,CAE7B"}

package/lib/command/markup/AcApMarkupSession.js

@@ -0,0 +1,85 @@
+/** Bags keyed by {@link AcApDocSession.id}. */
+var bags = new Map();
+/** Session currently receiving markup commands. */
+var activeSessionId;
+/** Installed by {@link acapSetMarkupBagFactory}. */
+var bagFactory;
+/** Fallback bag used before any session is bound. */
+var fallbackBag;
+/**
+ * Installs the factory used to create per-session markup bags.
+ * Called once from the markup module bootstrap to avoid circular imports.
+ *
+ * @param factory - Creates a store + presenter + history bag.
+ */
+export function acapSetMarkupBagFactory(factory) {
+    bagFactory = factory;
+}
+/**
+ * Returns the bag for `sessionId`, creating it (or the process fallback) as needed.
+ *
+ * @param sessionId - Document session id, or omitted for the unbound fallback.
+ */
+function ensureBag(sessionId) {
+    if (!bagFactory) {
+        throw new Error('Markup session bag factory is not installed');
+    }
+    if (!sessionId) {
+        if (!fallbackBag)
+            fallbackBag = bagFactory();
+        return fallbackBag;
+    }
+    var bag = bags.get(sessionId);
+    if (!bag) {
+        bag = bagFactory();
+        bags.set(sessionId, bag);
+    }
+    return bag;
+}
+/** Returns the bag for the active session (or a process fallback). */
+export function getActiveMarkupBag() {
+    return ensureBag(activeSessionId);
+}
+/**
+ * Binds markup APIs to a document session id.
+ *
+ * @param sessionId - {@link AcApDocSession.id} of the active document.
+ */
+export function acapBindMarkupSession(sessionId) {
+    activeSessionId = sessionId;
+    ensureBag(sessionId);
+}
+/** Returns the currently bound session id, if any. */
+export function acapActiveMarkupSessionId() {
+    return activeSessionId;
+}
+/**
+ * Disposes markup state for a closed document session.
+ *
+ * @param sessionId - Session whose bag should be dropped.
+ */
+export function acapDisposeMarkupSession(sessionId) {
+    bags.delete(sessionId);
+    if (activeSessionId === sessionId) {
+        activeSessionId = undefined;
+    }
+}
+/**
+ * Lists markup records for a session without activating it.
+ *
+ * @param sessionId - Session to inspect.
+ */
+export function listMarkupsForSession(sessionId) {
+    var _a, _b;
+    return (_b = (_a = bags.get(sessionId)) === null || _a === void 0 ? void 0 : _a.store.list()) !== null && _b !== void 0 ? _b : [];
+}
+/**
+ * Returns the store for a session without activating it.
+ *
+ * @param sessionId - Session to inspect.
+ */
+export function getMarkupStoreForSession(sessionId) {
+    var _a;
+    return (_a = bags.get(sessionId)) === null || _a === void 0 ? void 0 : _a.store;
+}
+//# sourceMappingURL=AcApMarkupSession.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"AcApMarkupSession.js","sourceRoot":"","sources":["../../../src/command/markup/AcApMarkupSession.ts"],"names":[],"mappings":"AAoBA,+CAA+C;AAC/C,IAAM,IAAI,GAAG,IAAI,GAAG,EAAgC,CAAA;AACpD,mDAAmD;AACnD,IAAI,eAAmC,CAAA;AACvC,oDAAoD;AACpD,IAAI,UAAkC,CAAA;AACtC,qDAAqD;AACrD,IAAI,WAA6C,CAAA;AAEjD;;;;;GAKG;AACH,MAAM,UAAU,uBAAuB,CAAC,OAAmB;IACzD,UAAU,GAAG,OAAO,CAAA;AACtB,CAAC;AAED;;;;GAIG;AACH,SAAS,SAAS,CAAC,SAAkB;IACnC,IAAI,CAAC,UAAU,EAAE,CAAC;QAChB,MAAM,IAAI,KAAK,CAAC,6CAA6C,CAAC,CAAA;IAChE,CAAC;IACD,IAAI,CAAC,SAAS,EAAE,CAAC;QACf,IAAI,CAAC,WAAW;YAAE,WAAW,GAAG,UAAU,EAAE,CAAA;QAC5C,OAAO,WAAW,CAAA;IACpB,CAAC;IACD,IAAI,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,CAAA;IAC7B,IAAI,CAAC,GAAG,EAAE,CAAC;QACT,GAAG,GAAG,UAAU,EAAE,CAAA;QAClB,IAAI,CAAC,GAAG,CAAC,SAAS,EAAE,GAAG,CAAC,CAAA;IAC1B,CAAC;IACD,OAAO,GAAG,CAAA;AACZ,CAAC;AAED,sEAAsE;AACtE,MAAM,UAAU,kBAAkB;IAChC,OAAO,SAAS,CAAC,eAAe,CAAC,CAAA;AACnC,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,qBAAqB,CAAC,SAAiB;IACrD,eAAe,GAAG,SAAS,CAAA;IAC3B,SAAS,CAAC,SAAS,CAAC,CAAA;AACtB,CAAC;AAED,sDAAsD;AACtD,MAAM,UAAU,yBAAyB;IACvC,OAAO,eAAe,CAAA;AACxB,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,wBAAwB,CAAC,SAAiB;IACxD,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAA;IACtB,IAAI,eAAe,KAAK,SAAS,EAAE,CAAC;QAClC,eAAe,GAAG,SAAS,CAAA;IAC7B,CAAC;AACH,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,qBAAqB,CAAC,SAAiB;;IACrD,OAAO,MAAA,MAAA,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,0CAAE,KAAK,CAAC,IAAI,EAAE,mCAAI,EAAE,CAAA;AAChD,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,wBAAwB,CACtC,SAAiB;;IAEjB,OAAO,MAAA,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,0CAAE,KAAK,CAAA;AACnC,CAAC"}

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

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=AcApMarkupSessionBootstrap.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"AcApMarkupSessionBootstrap.d.ts","sourceRoot":"","sources":["../../../src/command/markup/AcApMarkupSessionBootstrap.ts"],"names":[],"mappings":""}

package/lib/command/markup/AcApMarkupSessionBootstrap.js

@@ -0,0 +1,12 @@
+import { AcApMarkupHistory, AcApSessionUndo } from './AcApMarkupHistory';
+import { AcApMarkupPresenter } from './AcApMarkupPresenter';
+import { acapSetMarkupBagFactory } from './AcApMarkupSession';
+import { AcApMarkupStore } from './AcApMarkupStore';
+/** Installs default bag factory (store + presenter + history per session). */
+acapSetMarkupBagFactory(function () { return ({
+    store: new AcApMarkupStore(),
+    presenter: new AcApMarkupPresenter(),
+    history: new AcApMarkupHistory(),
+    sessionUndo: new AcApSessionUndo()
+}); });
+//# sourceMappingURL=AcApMarkupSessionBootstrap.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"AcApMarkupSessionBootstrap.js","sourceRoot":"","sources":["../../../src/command/markup/AcApMarkupSessionBootstrap.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAA;AACxE,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAA;AAC3D,OAAO,EAAE,uBAAuB,EAAE,MAAM,qBAAqB,CAAA;AAC7D,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAA;AAEnD,8EAA8E;AAC9E,uBAAuB,CAAC,cAAM,OAAA,CAAC;IAC7B,KAAK,EAAE,IAAI,eAAe,EAAE;IAC5B,SAAS,EAAE,IAAI,mBAAmB,EAAE;IACpC,OAAO,EAAE,IAAI,iBAAiB,EAAE;IAChC,WAAW,EAAE,IAAI,eAAe,EAAE;CACnC,CAAC,EAL4B,CAK5B,CAAC,CAAA"}

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

@@ -18,14 +18,16 @@ export interface AcApMarkupCloudVertex {
 /**
  * Build closed revision-cloud vertices (points + bulges) between two corners.
  *
- * Lobe size tracks the current view scale ({@link CLOUD_DIAMETER_PIXELS}).
+ * Lobe size is a world-space diameter. When omitted, {@link ACAP_OVERLAY_CLOUD_DIAMETER_PX}
+ * is converted at the current view (jig / first paint).
  *
  * @param firstPoint - One corner of the cloud AABB.
  * @param secondPoint - Opposite corner of the cloud AABB.
- * @param view - View used to size lobes in screen pixels.
+ * @param view - View used to size lobes when `diameterWcs` is omitted.
+ * @param diameterWcs - Optional world-space lobe diameter (keeps size across zoom).
  * @returns Closed ring of vertices (last segment uses the last bulge → first point).
  */
-export declare function markupCloudVertices(firstPoint: AcGePoint2dLike, secondPoint: AcGePoint2dLike, view: AcEdBaseView): AcApMarkupCloudVertex[];
+export declare function markupCloudVertices(firstPoint: AcGePoint2dLike, secondPoint: AcGePoint2dLike, view: AcEdBaseView, diameterWcs?: number): AcApMarkupCloudVertex[];
 /**
  * Axis-aligned rectangle corners as a closed polyline (world).
  *
@@ -57,11 +59,12 @@ export declare function tessellateMarkupCloud(vertices: AcApMarkupCloudVertex[])
  * @param color - CSS stroke color.
  * @param lineWidth - Stroke width in CSS pixels.
  * @param offset - Optional live drag translation in world space.
+ * @param strokeWidthWcs - Optional persisted world-space stroke width.
  */
 export declare function strokeMarkupCloud(ctx: CanvasRenderingContext2D, view: AcEdBaseView, first: AcGePoint2dLike, second: AcGePoint2dLike, color: string, lineWidth: number, offset?: {
     dx: number;
     dy: number;
-}): void;
+}, strokeWidthWcs?: number): void;
 /**
  * @deprecated Prefer {@link markupCloudVertices} / {@link strokeMarkupCloud}.
  * Kept for callers that still need an in-memory vertex list via the old name.

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

@@ -1 +1 @@
-{"version":3,"file":"AcApMarkupShapeBuilder.d.ts","sourceRoot":"","sources":["../../../src/command/markup/AcApMarkupShapeBuilder.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAA;AAE5D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,cAAc,CAAA;AAOhD,sEAAsE;AACtE,MAAM,WAAW,qBAAqB;IACpC,eAAe;IACf,CAAC,EAAE,MAAM,CAAA;IACT,eAAe;IACf,CAAC,EAAE,MAAM,CAAA;IACT;;;OAGG;IACH,KAAK,EAAE,MAAM,CAAA;CACd;AAqBD;;;;;;;;;GASG;AACH,wBAAgB,mBAAmB,CACjC,UAAU,EAAE,eAAe,EAC3B,WAAW,EAAE,eAAe,EAC5B,IAAI,EAAE,YAAY,GACjB,qBAAqB,EAAE,CA+DzB;AAED;;;;;;GAMG;AACH,wBAAgB,iBAAiB,CAC/B,KAAK,EAAE,eAAe,EACtB,MAAM,EAAE,eAAe,GACtB,KAAK,CAAC;IAAE,CAAC,EAAE,MAAM,CAAC;IAAC,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,CAOjC;AAiDD;;;;;GAKG;AACH,wBAAgB,qBAAqB,CACnC,QAAQ,EAAE,qBAAqB,EAAE,GAChC,KAAK,CAAC;IAAE,CAAC,EAAE,MAAM,CAAC;IAAC,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,CAgBjC;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,iBAAiB,CAC/B,GAAG,EAAE,wBAAwB,EAC7B,IAAI,EAAE,YAAY,EAClB,KAAK,EAAE,eAAe,EACtB,MAAM,EAAE,eAAe,EACvB,KAAK,EAAE,MAAM,EACb,SAAS,EAAE,MAAM,EACjB,MAAM,CAAC,EAAE;IAAE,EAAE,EAAE,MAAM,CAAC;IAAC,EAAE,EAAE,MAAM,CAAA;CAAE,GAClC,IAAI,CAmBN;AAED;;;GAGG;AACH,wBAAgB,gBAAgB,CAC9B,MAAM,EAAE;IAAE,KAAK,EAAE,CAAC,CAAC,EAAE,OAAO,KAAK,IAAI,CAAC;IAAC,WAAW,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE;QAAE,CAAC,EAAE,MAAM,CAAC;QAAC,CAAC,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC,CAAC,EAAE,MAAM,KAAK,IAAI,CAAC;IAAC,MAAM,EAAE,OAAO,CAAA;CAAE,EACnI,UAAU,EAAE,eAAe,EAC3B,WAAW,EAAE,eAAe,EAC5B,IAAI,EAAE,YAAY,GACjB,IAAI,CAON;AAED;;GAEG;AACH,wBAAgB,eAAe,CAC7B,IAAI,EAAE;IACJ,KAAK,EAAE,CAAC,CAAC,EAAE,OAAO,KAAK,IAAI,CAAA;IAC3B,WAAW,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE;QAAE,CAAC,EAAE,MAAM,CAAC;QAAC,CAAC,EAAE,MAAM,CAAA;KAAE,KAAK,IAAI,CAAA;IAC7D,MAAM,EAAE,OAAO,CAAA;CAChB,EACD,KAAK,EAAE,eAAe,EACtB,MAAM,EAAE,eAAe,GACtB,IAAI,CAON"}
+{"version":3,"file":"AcApMarkupShapeBuilder.d.ts","sourceRoot":"","sources":["../../../src/command/markup/AcApMarkupShapeBuilder.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAA;AAE5D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,cAAc,CAAA;AAOhD,sEAAsE;AACtE,MAAM,WAAW,qBAAqB;IACpC,eAAe;IACf,CAAC,EAAE,MAAM,CAAA;IACT,eAAe;IACf,CAAC,EAAE,MAAM,CAAA;IACT;;;OAGG;IACH,KAAK,EAAE,MAAM,CAAA;CACd;AAqBD;;;;;;;;;;;GAWG;AACH,wBAAgB,mBAAmB,CACjC,UAAU,EAAE,eAAe,EAC3B,WAAW,EAAE,eAAe,EAC5B,IAAI,EAAE,YAAY,EAClB,WAAW,CAAC,EAAE,MAAM,GACnB,qBAAqB,EAAE,CA6DzB;AAED;;;;;;GAMG;AACH,wBAAgB,iBAAiB,CAC/B,KAAK,EAAE,eAAe,EACtB,MAAM,EAAE,eAAe,GACtB,KAAK,CAAC;IAAE,CAAC,EAAE,MAAM,CAAC;IAAC,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,CAOjC;AA+CD;;;;;GAKG;AACH,wBAAgB,qBAAqB,CACnC,QAAQ,EAAE,qBAAqB,EAAE,GAChC,KAAK,CAAC;IAAE,CAAC,EAAE,MAAM,CAAC;IAAC,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,CAgBjC;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,iBAAiB,CAC/B,GAAG,EAAE,wBAAwB,EAC7B,IAAI,EAAE,YAAY,EAClB,KAAK,EAAE,eAAe,EACtB,MAAM,EAAE,eAAe,EACvB,KAAK,EAAE,MAAM,EACb,SAAS,EAAE,MAAM,EACjB,MAAM,CAAC,EAAE;IAAE,EAAE,EAAE,MAAM,CAAC;IAAC,EAAE,EAAE,MAAM,CAAA;CAAE,EACnC,cAAc,CAAC,EAAE,MAAM,GACtB,IAAI,CAuCN;AAED;;;GAGG;AACH,wBAAgB,gBAAgB,CAC9B,MAAM,EAAE;IACN,KAAK,EAAE,CAAC,CAAC,EAAE,OAAO,KAAK,IAAI,CAAA;IAC3B,WAAW,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE;QAAE,CAAC,EAAE,MAAM,CAAC;QAAC,CAAC,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC,CAAC,EAAE,MAAM,KAAK,IAAI,CAAA;IACzE,MAAM,EAAE,OAAO,CAAA;CAChB,EACD,UAAU,EAAE,eAAe,EAC3B,WAAW,EAAE,eAAe,EAC5B,IAAI,EAAE,YAAY,GACjB,IAAI,CAWN;AAED;;GAEG;AACH,wBAAgB,eAAe,CAC7B,IAAI,EAAE;IACJ,KAAK,EAAE,CAAC,CAAC,EAAE,OAAO,KAAK,IAAI,CAAA;IAC3B,WAAW,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE;QAAE,CAAC,EAAE,MAAM,CAAC;QAAC,CAAC,EAAE,MAAM,CAAA;KAAE,KAAK,IAAI,CAAA;IAC7D,MAAM,EAAE,OAAO,CAAA;CAChB,EACD,KAAK,EAAE,eAAe,EACtB,MAAM,EAAE,eAAe,GACtB,IAAI,CAON"}

package/lib/command/markup/AcApMarkupShapeBuilder.js

@@ -12,10 +12,7 @@ var __values = (this && this.__values) || function(o) {
     };
     throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
 };
-/**
- * Target screen diameter in CSS pixels for each revision-cloud lobe.
- */
-var CLOUD_DIAMETER_PIXELS = 8;
+import { ACAP_OVERLAY_CLOUD_DIAMETER_PX, ACAP_OVERLAY_CLOUD_WCS, acapScaledOverlayLineWidth } from '../overlay/AcApOverlayDrawUtil';
 /**
  * Convert a screen-space pixel length to world distance at a reference point.
  *
@@ -33,14 +30,16 @@ function pixelToWorldDistance(view, pixelDistance, referencePoint) {
 /**
  * Build closed revision-cloud vertices (points + bulges) between two corners.
  *
- * Lobe size tracks the current view scale ({@link CLOUD_DIAMETER_PIXELS}).
+ * Lobe size is a world-space diameter. When omitted, {@link ACAP_OVERLAY_CLOUD_DIAMETER_PX}
+ * is converted at the current view (jig / first paint).
  *
  * @param firstPoint - One corner of the cloud AABB.
  * @param secondPoint - Opposite corner of the cloud AABB.
- * @param view - View used to size lobes in screen pixels.
+ * @param view - View used to size lobes when `diameterWcs` is omitted.
+ * @param diameterWcs - Optional world-space lobe diameter (keeps size across zoom).
  * @returns Closed ring of vertices (last segment uses the last bulge → first point).
  */
-export function markupCloudVertices(firstPoint, secondPoint, view) {
+export function markupCloudVertices(firstPoint, secondPoint, view, diameterWcs) {
     var minX = Math.min(firstPoint.x, secondPoint.x);
     var maxX = Math.max(firstPoint.x, secondPoint.x);
     var minY = Math.min(firstPoint.y, secondPoint.y);
@@ -48,7 +47,9 @@ export function markupCloudVertices(firstPoint, secondPoint, view) {
     var width = maxX - minX;
     var height = maxY - minY;
     var centerPoint = { x: (minX + maxX) / 2, y: (minY + maxY) / 2 };
-    var cloudDiameter = pixelToWorldDistance(view, CLOUD_DIAMETER_PIXELS, centerPoint);
+    var cloudDiameter = diameterWcs != null && diameterWcs > 0
+        ? diameterWcs
+        : pixelToWorldDistance(view, ACAP_OVERLAY_CLOUD_DIAMETER_PX, centerPoint);
     var chordLength = Math.max(cloudDiameter, 1e-6);
     var numSegmentsX = Math.max(4, Math.ceil(width / chordLength) * 2);
     var numSegmentsY = Math.max(4, Math.ceil(height / chordLength) * 2);
@@ -197,12 +198,24 @@ export function tessellateMarkupCloud(vertices) {
  * @param color - CSS stroke color.
  * @param lineWidth - Stroke width in CSS pixels.
  * @param offset - Optional live drag translation in world space.
+ * @param strokeWidthWcs - Optional persisted world-space stroke width.
  */
-export function strokeMarkupCloud(ctx, view, first, second, color, lineWidth, offset) {
+export function strokeMarkupCloud(ctx, view, first, second, color, lineWidth, offset, strokeWidthWcs) {
     var _a, _b;
     var dx = (_a = offset === null || offset === void 0 ? void 0 : offset.dx) !== null && _a !== void 0 ? _a : 0;
     var dy = (_b = offset === null || offset === void 0 ? void 0 : offset.dy) !== null && _b !== void 0 ? _b : 0;
-    var vertices = markupCloudVertices(first, second, view);
+    var centerPoint = {
+        x: (first.x + second.x) / 2,
+        y: (first.y + second.y) / 2
+    };
+    var diameterWcs = Number(ctx.canvas.dataset[ACAP_OVERLAY_CLOUD_WCS]);
+    if (!(diameterWcs > 0) || !Number.isFinite(diameterWcs)) {
+        diameterWcs = pixelToWorldDistance(view, ACAP_OVERLAY_CLOUD_DIAMETER_PX, centerPoint);
+        if (diameterWcs > 0) {
+            ctx.canvas.dataset[ACAP_OVERLAY_CLOUD_WCS] = String(diameterWcs);
+        }
+    }
+    var vertices = markupCloudVertices(first, second, view, diameterWcs);
     var world = tessellateMarkupCloud(vertices).map(function (p) { return ({
         x: p.x + dx,
         y: p.y + dy
@@ -211,7 +224,7 @@ export function strokeMarkupCloud(ctx, view, first, second, color, lineWidth, of
         return;
     var screen = world.map(function (p) { return view.worldToScreen(p); });
     ctx.strokeStyle = color;
-    ctx.lineWidth = lineWidth;
+    ctx.lineWidth = acapScaledOverlayLineWidth(lineWidth, ctx.canvas, view, strokeWidthWcs);
     ctx.beginPath();
     ctx.moveTo(screen[0].x, screen[0].y);
     for (var i = 1; i < screen.length; i++) {