@mlightcad/cad-simple-viewer 1.6.3 → 1.7.0

package/lib/command/markup/AcApMarkupTextCmd.js

@@ -61,28 +61,28 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     }
 };
 import { AcTrHtmlBadge } from '@mlightcad/three-renderer';
-import { AcEdCommand, AcEdPromptPointOptions, AcEdPromptStatus } from '../../editor';
+import { AcEdPromptPointOptions, AcEdPromptStatus } from '../../editor';
 import { AcApI18n } from '../../i18n';
-import { configureMarkupCommand, createMarkupMeta, promptMarkupCapsuleText, withMarkupInput } from './AcApMarkupCmdUtil';
+import { acapSyncLiveOverlayTextHeight } from '../overlay/AcApOverlayDrawUtil';
+import { createMarkupMeta, promptMarkupCapsuleText } from './AcApMarkupCmdUtil';
+import { AcApMarkupDrawCmd } from './AcApMarkupDrawCmd';
 import { commitMarkup } from './AcApMarkupPresenter';
 import { MARKUP_LIVE_LAYER } from './AcApMarkupStore';
-import { defaultMarkupColor, getMarkupFontSize, subscribeMarkupDrawStyle } from './AcApMarkupUtil';
+import { defaultMarkupColor, defaultMarkupStyle, getMarkupFontSize, subscribeMarkupDrawStyle } from './AcApMarkupUtil';
 /**
  * Place a text markup label at a picked world point.
  */
 var AcApMarkupTextCmd = /** @class */ (function (_super) {
     __extends(AcApMarkupTextCmd, _super);
     function AcApMarkupTextCmd() {
-        var _this = _super.call(this) || this;
-        configureMarkupCommand(_this);
-        return _this;
+        return _super !== null && _super.apply(this, arguments) || this;
     }
     AcApMarkupTextCmd.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 pointPrompt, pointResult, position, view, badgeId, badge, unsubDrawStyle, text, meta, record;
                             return __generator(this, function (_a) {
                                 switch (_a.label) {
@@ -106,10 +106,14 @@ var AcApMarkupTextCmd = /** @class */ (function (_super) {
                                             layoutId: view.activeLayoutBtrId
                                         });
                                         view.htmlTransientManager.add(badge);
+                                        acapSyncLiveOverlayTextHeight(view, [badge], defaultMarkupStyle());
                                         view.isHtmlDirty = true;
                                         unsubDrawStyle = subscribeMarkupDrawStyle(function () {
+                                            var _a;
                                             badge.setColor(defaultMarkupColor());
-                                            badge.setFontSize(getMarkupFontSize());
+                                            var style = defaultMarkupStyle();
+                                            badge.setFontSize((_a = style.fontSize) !== null && _a !== void 0 ? _a : getMarkupFontSize());
+                                            acapSyncLiveOverlayTextHeight(view, [badge], style);
                                             view.isHtmlDirty = true;
                                         });
                                         text = 'Note';
@@ -142,6 +146,6 @@ var AcApMarkupTextCmd = /** @class */ (function (_super) {
         });
     };
     return AcApMarkupTextCmd;
-}(AcEdCommand));
+}(AcApMarkupDrawCmd));
 export { AcApMarkupTextCmd };
 //# sourceMappingURL=AcApMarkupTextCmd.js.map

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

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

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

@@ -17,10 +17,26 @@ export interface AcApMarkupPoint2d {
 export interface AcApMarkupStyle {
     /** CSS color string, e.g. `#ff0000` or `rgb(255,0,0)`. */
     color: string;
-    /** Optional AutoCAD-style line weight enum value. */
+    /** Always hairline (`0`) on write; legacy non-zero values are ignored on parse. */
     lineWeight?: number;
-    /** Screen-space font size in CSS pixels for text / callout bubbles. */
+    /** Authoring font size in CSS pixels for text / callout bubbles (legacy / UI). */
     fontSize?: number;
+    /**
+     * Text / callout height in world units. Prefer this over {@link fontSize}
+     * when restoring overlays so size is independent of camera zoom.
+     */
+    textHeightWcs?: number;
+    /** Authoring mode; omitted means adaptive (legacy). */
+    textHeightMode?: 'adaptive' | 'custom';
+    /**
+     * Arrow-head length in world units (arrow / callout markups). Prefer this
+     * when restoring overlays so arrow size is independent of camera zoom.
+     */
+    arrowSizeWcs?: number;
+    /**
+     * Legacy canvas stroke width in world units. Ignored on parse; never written.
+     */
+    strokeWidthWcs?: number;
 }
 /** Shared metadata on every markup record. */
 export interface AcApMarkupMeta {

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

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

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

@@ -1,33 +1,62 @@
 import { AcCmColor, AcDbDatabase, AcGiLineWeight } from '@mlightcad/data-model';
+import type { AcEdBaseView } from '../../editor';
 import type { AcApMarkupStyle } from './AcApMarkupTypes';
 /** Factory default markup color (ACI red) used to seed the draw style. */
 export declare function createDefaultMarkupColor(): AcCmColor;
+/**
+ * Overlay line weight meaning "no CAD lineweight" (hairline).
+ *
+ * Drawn as 1 CSS pixel and not scaled with zoom.
+ */
+export declare const MARKUP_HAIRLINE_LINE_WEIGHT: AcGiLineWeight;
 /** Factory default CAD line weight for markup geometry. */
-export declare const MARKUP_LINE_WEIGHT = AcGiLineWeight.LineWeight070;
+export declare const MARKUP_LINE_WEIGHT: AcGiLineWeight;
 /** Factory default screen font size (CSS px) for text / callout markups. */
 export declare const MARKUP_FONT_SIZE = 12;
-/** Notify when session markup color / lineweight / font size changes. */
+/** Notify when session markup color / font size changes. */
 export declare function subscribeMarkupDrawStyle(listener: () => void): () => void;
 /** Current color used when drawing markups (clone for safety). */
 export declare function defaultMarkupColor(): AcCmColor;
-/** Current line weight used when drawing markups. */
-export declare function getMarkupLineWeight(): AcGiLineWeight;
 /** Current font size (CSS px) used when drawing text / callout markups. */
 export declare function getMarkupFontSize(): number;
+/** Current markup text-height authoring mode. */
+export declare function getMarkupTextHeightMode(): 'adaptive' | 'custom';
+/** Custom WCS text height for the markup draw session, if any. */
+export declare function getMarkupCustomTextHeightWcs(): number | undefined;
 /** Update the session markup draw color (affects current/future markups). */
 export declare function setMarkupDrawColor(color: AcCmColor): void;
-/** Update the session markup draw line weight. */
-export declare function setMarkupDrawLineWeight(weight: AcGiLineWeight): void;
 /** Update the session markup draw font size (CSS px). */
 export declare function setMarkupDrawFontSize(size: number): void;
+/**
+ * Sets adaptive (screen) or custom (WCS) text height for new markups.
+ *
+ * @param mode - Authoring mode.
+ * @param value - Font size px when adaptive; WCS height when custom.
+ */
+export declare function setMarkupTextHeight(mode: 'adaptive' | 'custom', value: number): void;
+/**
+ * Resolve a stored markup line weight, treating missing / negative CAD
+ * specials as the hairline default. `0` is hairline and is kept.
+ */
+export declare function resolveMarkupLineWeight(weight: number | undefined | null): AcGiLineWeight;
 /** Map a CAD line weight to a canvas stroke width in CSS pixels. */
 export declare function markupCanvasLineWidth(weight: AcGiLineWeight | number): number;
 /** Convert AcCmColor to a CSS color string for sidecar style. */
 export declare function markupColorToCss(color: AcCmColor): string;
 /** Parse a CSS color string back into AcCmColor (best-effort). */
 export declare function cssToMarkupColor(css: string): AcCmColor;
-/** Build a style object from the current markup draw color / line weight / font size. */
+/** Build a style object from the current markup draw color / font size. */
 export declare function defaultMarkupStyle(): AcApMarkupStyle;
+/** Attach world-space text height (and arrow length) from the current view. */
+export declare function withMarkupStyleWcs(style: AcApMarkupStyle, view: AcEdBaseView): AcApMarkupStyle;
+/**
+ * Merge a style patch while keeping world-space text size independent of color.
+ *
+ * Only recomputes / scales {@link AcApMarkupStyle.textHeightWcs} when font size
+ * changes. Overlay strokes stay hairline; {@link AcApMarkupStyle.strokeWidthWcs}
+ * is never written.
+ */
+export declare function patchMarkupStyleWcs(previous: AcApMarkupStyle, next: AcApMarkupStyle, view: AcEdBaseView, patch: Partial<AcApMarkupStyle>): AcApMarkupStyle;
 /** Create a new unique markup id. */
 export declare function createMarkupId(prefix?: string): string;
 /** ISO timestamp for created/updated fields. */

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

@@ -1 +1 @@
-{"version":3,"file":"AcApMarkupUtil.d.ts","sourceRoot":"","sources":["../../../src/command/markup/AcApMarkupUtil.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,SAAS,EAET,YAAY,EAGZ,cAAc,EACf,MAAM,uBAAuB,CAAA;AAG9B,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAA;AAExD,0EAA0E;AAC1E,wBAAgB,wBAAwB,IAAI,SAAS,CAEpD;AAED,2DAA2D;AAC3D,eAAO,MAAM,kBAAkB,+BAA+B,CAAA;AAE9D,4EAA4E;AAC5E,eAAO,MAAM,gBAAgB,KAAK,CAAA;AAiBlC,yEAAyE;AACzE,wBAAgB,wBAAwB,CAAC,QAAQ,EAAE,MAAM,IAAI,GAAG,MAAM,IAAI,CAKzE;AAED,kEAAkE;AAClE,wBAAgB,kBAAkB,IAAI,SAAS,CAE9C;AAED,qDAAqD;AACrD,wBAAgB,mBAAmB,IAAI,cAAc,CAEpD;AAED,2EAA2E;AAC3E,wBAAgB,iBAAiB,IAAI,MAAM,CAE1C;AAED,6EAA6E;AAC7E,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,SAAS,GAAG,IAAI,CAGzD;AAED,kDAAkD;AAClD,wBAAgB,uBAAuB,CAAC,MAAM,EAAE,cAAc,GAAG,IAAI,CAIpE;AAED,yDAAyD;AACzD,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAIxD;AAED,oEAAoE;AACpE,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,cAAc,GAAG,MAAM,GAAG,MAAM,CAI7E;AAED,iEAAiE;AACjE,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,SAAS,GAAG,MAAM,CAEzD;AAED,kEAAkE;AAClE,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,MAAM,GAAG,SAAS,CAQvD;AAED,yFAAyF;AACzF,wBAAgB,kBAAkB,IAAI,eAAe,CAMpD;AAED,qCAAqC;AACrC,wBAAgB,cAAc,CAAC,MAAM,SAAW,GAAG,MAAM,CAKxD;AAED,gDAAgD;AAChD,wBAAgB,SAAS,IAAI,MAAM,CAElC;AAED;;;;GAIG;AACH,wBAAgB,eAAe,CAAC,EAAE,EAAE,YAAY,GAAG,MAAM,CAMxD"}
+{"version":3,"file":"AcApMarkupUtil.d.ts","sourceRoot":"","sources":["../../../src/command/markup/AcApMarkupUtil.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,SAAS,EAET,YAAY,EAGZ,cAAc,EACf,MAAM,uBAAuB,CAAA;AAE9B,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,cAAc,CAAA;AAGhD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAA;AAExD,0EAA0E;AAC1E,wBAAgB,wBAAwB,IAAI,SAAS,CAEpD;AAED;;;;GAIG;AACH,eAAO,MAAM,2BAA2B,EAAQ,cAAc,CAAA;AAE9D,2DAA2D;AAC3D,eAAO,MAAM,kBAAkB,gBAA8B,CAAA;AAE7D,4EAA4E;AAC5E,eAAO,MAAM,gBAAgB,KAAK,CAAA;AAoBlC,4DAA4D;AAC5D,wBAAgB,wBAAwB,CAAC,QAAQ,EAAE,MAAM,IAAI,GAAG,MAAM,IAAI,CAKzE;AAED,kEAAkE;AAClE,wBAAgB,kBAAkB,IAAI,SAAS,CAE9C;AAED,2EAA2E;AAC3E,wBAAgB,iBAAiB,IAAI,MAAM,CAE1C;AAED,iDAAiD;AACjD,wBAAgB,uBAAuB,IAAI,UAAU,GAAG,QAAQ,CAE/D;AAED,kEAAkE;AAClE,wBAAgB,4BAA4B,IAAI,MAAM,GAAG,SAAS,CAEjE;AAED,6EAA6E;AAC7E,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,SAAS,GAAG,IAAI,CAGzD;AAED,yDAAyD;AACzD,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAMxD;AAED;;;;;GAKG;AACH,wBAAgB,mBAAmB,CACjC,IAAI,EAAE,UAAU,GAAG,QAAQ,EAC3B,KAAK,EAAE,MAAM,GACZ,IAAI,CAUN;AAED;;;GAGG;AACH,wBAAgB,uBAAuB,CACrC,MAAM,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,GAChC,cAAc,CAIhB;AAED,oEAAoE;AACpE,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,cAAc,GAAG,MAAM,GAAG,MAAM,CAI7E;AAED,iEAAiE;AACjE,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,SAAS,GAAG,MAAM,CAEzD;AAED,kEAAkE;AAClE,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,MAAM,GAAG,SAAS,CAEvD;AAED,2EAA2E;AAC3E,wBAAgB,kBAAkB,IAAI,eAAe,CAYpD;AAED,+EAA+E;AAC/E,wBAAgB,kBAAkB,CAChC,KAAK,EAAE,eAAe,EACtB,IAAI,EAAE,YAAY,GACjB,eAAe,CA+BjB;AAED;;;;;;GAMG;AACH,wBAAgB,mBAAmB,CACjC,QAAQ,EAAE,eAAe,EACzB,IAAI,EAAE,eAAe,EACrB,IAAI,EAAE,YAAY,EAClB,KAAK,EAAE,OAAO,CAAC,eAAe,CAAC,GAC9B,eAAe,CAwCjB;AAED,qCAAqC;AACrC,wBAAgB,cAAc,CAAC,MAAM,SAAW,GAAG,MAAM,CAKxD;AAED,gDAAgD;AAChD,wBAAgB,SAAS,IAAI,MAAM,CAElC;AAED;;;;GAIG;AACH,wBAAgB,eAAe,CAAC,EAAE,EAAE,YAAY,GAAG,MAAM,CAMxD"}

package/lib/command/markup/AcApMarkupUtil.js

@@ -1,3 +1,25 @@
+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 __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+};
 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);
@@ -9,22 +31,31 @@ var __values = (this && this.__values) || function(o) {
     };
     throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
 };
-import { AcCmColor, AcCmColorMethod, AcDbSystemVariables, AcDbSysVarManager, AcGiLineWeight } from '@mlightcad/data-model';
-import { preferExactAciColor } from '../../util/AcApCssColor';
+import { AcCmColor, AcCmColorMethod, AcDbSystemVariables, AcDbSysVarManager } from '@mlightcad/data-model';
+import { acCmColorToCssHex, parseCssToAcCmColor } from '../../util/AcApCssColor';
+import { ACAP_OVERLAY_ARROW_SIZE_PX, acapScreenPxToWcs } from '../overlay/AcApOverlayDrawUtil';
 /** Factory default markup color (ACI red) used to seed the draw style. */
 export function createDefaultMarkupColor() {
     return new AcCmColor(AcCmColorMethod.ByACI, 1);
 }
+/**
+ * Overlay line weight meaning "no CAD lineweight" (hairline).
+ *
+ * Drawn as 1 CSS pixel and not scaled with zoom.
+ */
+export var MARKUP_HAIRLINE_LINE_WEIGHT = 0;
 /** Factory default CAD line weight for markup geometry. */
-export var MARKUP_LINE_WEIGHT = AcGiLineWeight.LineWeight070;
+export var MARKUP_LINE_WEIGHT = MARKUP_HAIRLINE_LINE_WEIGHT;
 /** Factory default screen font size (CSS px) for text / callout markups. */
 export var MARKUP_FONT_SIZE = 12;
 /** Session draw color for newly created markups. */
 var markupDrawColor = createDefaultMarkupColor();
-/** Session draw line weight for newly created markups. */
-var markupDrawLineWeight = MARKUP_LINE_WEIGHT;
 /** Session draw font size for newly created text / callout markups. */
 var markupDrawFontSize = MARKUP_FONT_SIZE;
+/** Session text-height authoring mode. */
+var markupTextHeightMode = 'adaptive';
+/** Session custom WCS text height when mode is `'custom'`. */
+var markupCustomTextHeightWcs;
 var drawStyleListeners = new Set();
 function notifyMarkupDrawStyleChanged() {
     var e_1, _a;
@@ -42,7 +73,7 @@ function notifyMarkupDrawStyleChanged() {
         finally { if (e_1) throw e_1.error; }
     }
 }
-/** Notify when session markup color / lineweight / font size changes. */
+/** Notify when session markup color / font size changes. */
 export function subscribeMarkupDrawStyle(listener) {
     drawStyleListeners.add(listener);
     return function () {
@@ -53,64 +84,148 @@ export function subscribeMarkupDrawStyle(listener) {
 export function defaultMarkupColor() {
     return markupDrawColor.clone();
 }
-/** Current line weight used when drawing markups. */
-export function getMarkupLineWeight() {
-    return markupDrawLineWeight;
-}
 /** Current font size (CSS px) used when drawing text / callout markups. */
 export function getMarkupFontSize() {
     return markupDrawFontSize;
 }
+/** Current markup text-height authoring mode. */
+export function getMarkupTextHeightMode() {
+    return markupTextHeightMode;
+}
+/** Custom WCS text height for the markup draw session, if any. */
+export function getMarkupCustomTextHeightWcs() {
+    return markupCustomTextHeightWcs;
+}
 /** Update the session markup draw color (affects current/future markups). */
 export function setMarkupDrawColor(color) {
     markupDrawColor = color.clone();
     notifyMarkupDrawStyleChanged();
 }
-/** Update the session markup draw line weight. */
-export function setMarkupDrawLineWeight(weight) {
-    if (!(weight > 0))
-        return;
-    markupDrawLineWeight = weight;
-    notifyMarkupDrawStyleChanged();
-}
 /** Update the session markup draw font size (CSS px). */
 export function setMarkupDrawFontSize(size) {
     if (!Number.isFinite(size) || size <= 0)
         return;
     markupDrawFontSize = size;
+    markupTextHeightMode = 'adaptive';
+    markupCustomTextHeightWcs = undefined;
     notifyMarkupDrawStyleChanged();
 }
+/**
+ * Sets adaptive (screen) or custom (WCS) text height for new markups.
+ *
+ * @param mode - Authoring mode.
+ * @param value - Font size px when adaptive; WCS height when custom.
+ */
+export function setMarkupTextHeight(mode, value) {
+    if (!Number.isFinite(value) || value <= 0)
+        return;
+    markupTextHeightMode = mode;
+    if (mode === 'adaptive') {
+        markupDrawFontSize = value;
+        markupCustomTextHeightWcs = undefined;
+    }
+    else {
+        markupCustomTextHeightWcs = value;
+    }
+    notifyMarkupDrawStyleChanged();
+}
+/**
+ * Resolve a stored markup line weight, treating missing / negative CAD
+ * specials as the hairline default. `0` is hairline and is kept.
+ */
+export function resolveMarkupLineWeight(weight) {
+    return typeof weight === 'number' && Number.isFinite(weight) && weight >= 0
+        ? weight
+        : MARKUP_LINE_WEIGHT;
+}
 /** Map a CAD line weight to a canvas stroke width in CSS pixels. */
 export function markupCanvasLineWidth(weight) {
     var n = Number(weight);
     if (!Number.isFinite(n) || n <= 0)
-        return 2;
+        return 0;
     return Math.max(1, n / 28);
 }
 /** Convert AcCmColor to a CSS color string for sidecar style. */
 export function markupColorToCss(color) {
-    var _a;
-    return (_a = color.cssColor) !== null && _a !== void 0 ? _a : "rgb(".concat(color.red, ", ").concat(color.green, ", ").concat(color.blue, ")");
+    return acCmColorToCssHex(color);
 }
 /** Parse a CSS color string back into AcCmColor (best-effort). */
 export function cssToMarkupColor(css) {
-    var fromString = AcCmColor.fromString(css);
-    if (fromString)
-        return preferExactAciColor(fromString);
-    try {
-        return preferExactAciColor(new AcCmColor().setRGBFromCss(css));
+    return parseCssToAcCmColor(css, [255, 0, 0]);
+}
+/** Build a style object from the current markup draw color / font size. */
+export function defaultMarkupStyle() {
+    return __assign({ color: markupColorToCss(defaultMarkupColor()), lineWeight: MARKUP_LINE_WEIGHT, fontSize: getMarkupFontSize(), textHeightMode: markupTextHeightMode }, (markupTextHeightMode === 'custom' &&
+        markupCustomTextHeightWcs != null &&
+        markupCustomTextHeightWcs > 0
+        ? { textHeightWcs: markupCustomTextHeightWcs }
+        : {}));
+}
+/** Attach world-space text height (and arrow length) from the current view. */
+export function withMarkupStyleWcs(style, view) {
+    var fontSize = style.fontSize != null && style.fontSize > 0
+        ? style.fontSize
+        : MARKUP_FONT_SIZE;
+    var arrowSizeWcs = style.arrowSizeWcs != null && style.arrowSizeWcs > 0
+        ? style.arrowSizeWcs
+        : acapScreenPxToWcs(ACAP_OVERLAY_ARROW_SIZE_PX, view);
+    var textHeightWcs;
+    if (style.textHeightMode === 'custom' &&
+        style.textHeightWcs != null &&
+        style.textHeightWcs > 0) {
+        // Custom: keep the authored world height — never re-derive from fontSize.
+        textHeightWcs = style.textHeightWcs;
+    }
+    else if (style.textHeightMode === 'adaptive') {
+        // Fit-to-screen: bake the current screen font size into WCS at commit.
+        textHeightWcs = acapScreenPxToWcs(fontSize, view);
     }
-    catch (_a) {
-        return createDefaultMarkupColor();
+    else if (style.textHeightWcs != null && style.textHeightWcs > 0) {
+        textHeightWcs = style.textHeightWcs;
     }
+    else {
+        textHeightWcs = acapScreenPxToWcs(fontSize, view);
+    }
+    return __assign(__assign({}, style), { lineWeight: MARKUP_LINE_WEIGHT, textHeightWcs: textHeightWcs, arrowSizeWcs: arrowSizeWcs });
 }
-/** Build a style object from the current markup draw color / line weight / font size. */
-export function defaultMarkupStyle() {
-    return {
-        color: markupColorToCss(defaultMarkupColor()),
-        lineWeight: getMarkupLineWeight(),
-        fontSize: getMarkupFontSize()
-    };
+/**
+ * Merge a style patch while keeping world-space text size independent of color.
+ *
+ * Only recomputes / scales {@link AcApMarkupStyle.textHeightWcs} when font size
+ * changes. Overlay strokes stay hairline; {@link AcApMarkupStyle.strokeWidthWcs}
+ * is never written.
+ */
+export function patchMarkupStyleWcs(previous, next, view, patch) {
+    var _a, _b, _c;
+    var prevFont = previous.fontSize != null && previous.fontSize > 0
+        ? previous.fontSize
+        : MARKUP_FONT_SIZE;
+    var nextFont = next.fontSize != null && next.fontSize > 0 ? next.fontSize : MARKUP_FONT_SIZE;
+    var fontSizeChanged = patch.fontSize != null && patch.fontSize !== previous.fontSize;
+    var customHeightChanged = patch.textHeightWcs != null && patch.textHeightWcs !== previous.textHeightWcs;
+    var mode = (_b = (_a = next.textHeightMode) !== null && _a !== void 0 ? _a : previous.textHeightMode) !== null && _b !== void 0 ? _b : 'adaptive';
+    var textHeightWcs = (_c = previous.textHeightWcs) !== null && _c !== void 0 ? _c : next.textHeightWcs;
+    if (mode === 'custom' && next.textHeightWcs != null && next.textHeightWcs > 0) {
+        textHeightWcs = next.textHeightWcs;
+    }
+    else if (fontSizeChanged) {
+        if (textHeightWcs != null && textHeightWcs > 0 && prevFont > 0) {
+            textHeightWcs = textHeightWcs * (nextFont / prevFont);
+        }
+        else {
+            textHeightWcs = acapScreenPxToWcs(nextFont, view);
+        }
+    }
+    else if (customHeightChanged) {
+        textHeightWcs = next.textHeightWcs;
+    }
+    else if (textHeightWcs == null || !(textHeightWcs > 0)) {
+        textHeightWcs = acapScreenPxToWcs(nextFont, view);
+    }
+    var _omitStroke = next.strokeWidthWcs, rest = __rest(next, ["strokeWidthWcs"]);
+    return __assign(__assign({}, rest), { textHeightMode: mode, lineWeight: MARKUP_LINE_WEIGHT, textHeightWcs: textHeightWcs, arrowSizeWcs: previous.arrowSizeWcs != null && previous.arrowSizeWcs > 0
+            ? previous.arrowSizeWcs
+            : next.arrowSizeWcs });
 }
 /** Create a new unique markup id. */
 export function createMarkupId(prefix) {

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

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

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

@@ -0,0 +1,8 @@
+import type { AcApSystemCommandRegistrar } from '../AcApDrawStyleSession';
+import { type AcApDrawStyleSessionInstallContext } from '../AcApDrawStyleSession';
+/**
+ * Registers markup commands and installs the shared draw-style session
+ * accessory for the view (idempotent).
+ */
+export declare function registerMarkupCommands(addSystemCommand: AcApSystemCommandRegistrar, installCtx: AcApDrawStyleSessionInstallContext): void;
+//# sourceMappingURL=AcApRegisterMarkupCommands.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"AcApRegisterMarkupCommands.d.ts","sourceRoot":"","sources":["../../../src/command/markup/AcApRegisterMarkupCommands.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,yBAAyB,CAAA;AACzE,OAAO,EACL,KAAK,kCAAkC,EAExC,MAAM,yBAAyB,CAAA;AAehC;;;GAGG;AACH,wBAAgB,sBAAsB,CACpC,gBAAgB,EAAE,0BAA0B,EAC5C,UAAU,EAAE,kCAAkC,GAC7C,IAAI,CAwBN"}

package/lib/command/markup/AcApRegisterMarkupCommands.js

@@ -0,0 +1,35 @@
+import { acapInstallDrawStyleSessionAccessory } from '../AcApDrawStyleSession';
+import { AcApClearMarkupsCmd } from './AcApClearMarkupsCmd';
+import { AcApMarkupArrowCmd } from './AcApMarkupArrowCmd';
+import { AcApMarkupCalloutCmd } from './AcApMarkupCalloutCmd';
+import { AcApMarkupCircleCmd } from './AcApMarkupCircleCmd';
+import { AcApMarkupCloudCmd } from './AcApMarkupCloudCmd';
+import { AcApMarkupHighlightCmd } from './AcApMarkupHighlightCmd';
+import { AcApMarkupExportCmd } from './AcApMarkupImportExportCmd';
+import { AcApMarkupImportCmd } from './AcApMarkupImportExportCmd';
+import { AcApMarkupLineCmd } from './AcApMarkupLineCmd';
+import { AcApMarkupRectCmd } from './AcApMarkupRectCmd';
+import { AcApMarkupStampCmd } from './AcApMarkupStampCmd';
+import { AcApMarkupTextCmd } from './AcApMarkupTextCmd';
+import { AcApMarkupVisibilityCmd } from './AcApMarkupVisibilityCmd';
+/**
+ * Registers markup commands and installs the shared draw-style session
+ * accessory for the view (idempotent).
+ */
+export function registerMarkupCommands(addSystemCommand, installCtx) {
+    acapInstallDrawStyleSessionAccessory(installCtx);
+    addSystemCommand('markuptext', 'markuptext', new AcApMarkupTextCmd());
+    addSystemCommand('markupline', 'markupline', new AcApMarkupLineCmd());
+    addSystemCommand('markuparrow', 'markuparrow', new AcApMarkupArrowCmd());
+    addSystemCommand('markupcloud', 'markupcloud', new AcApMarkupCloudCmd());
+    addSystemCommand('markuprect', 'markuprect', new AcApMarkupRectCmd());
+    addSystemCommand('markupcircle', 'markupcircle', new AcApMarkupCircleCmd());
+    addSystemCommand('markuphighlight', 'markuphighlight', new AcApMarkupHighlightCmd());
+    addSystemCommand('markupcallout', 'markupcallout', new AcApMarkupCalloutCmd());
+    addSystemCommand('markupstamp', 'markupstamp', new AcApMarkupStampCmd());
+    addSystemCommand('markupvis', 'markupvis', new AcApMarkupVisibilityCmd());
+    addSystemCommand('clearmarkups', 'clearmarkups', new AcApClearMarkupsCmd());
+    addSystemCommand('markupexport', 'markupexport', new AcApMarkupExportCmd());
+    addSystemCommand('markupimport', 'markupimport', new AcApMarkupImportCmd());
+}
+//# sourceMappingURL=AcApRegisterMarkupCommands.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"AcApRegisterMarkupCommands.js","sourceRoot":"","sources":["../../../src/command/markup/AcApRegisterMarkupCommands.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,oCAAoC,EACrC,MAAM,yBAAyB,CAAA;AAChC,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAA;AAC3D,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAA;AACzD,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAA;AAC7D,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAA;AAC3D,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAA;AACzD,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAA;AACjE,OAAO,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAA;AACjE,OAAO,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAA;AACjE,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAA;AACvD,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAA;AACvD,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAA;AACzD,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAA;AACvD,OAAO,EAAE,uBAAuB,EAAE,MAAM,2BAA2B,CAAA;AAEnE;;;GAGG;AACH,MAAM,UAAU,sBAAsB,CACpC,gBAA4C,EAC5C,UAA8C;IAE9C,oCAAoC,CAAC,UAAU,CAAC,CAAA;IAEhD,gBAAgB,CAAC,YAAY,EAAE,YAAY,EAAE,IAAI,iBAAiB,EAAE,CAAC,CAAA;IACrE,gBAAgB,CAAC,YAAY,EAAE,YAAY,EAAE,IAAI,iBAAiB,EAAE,CAAC,CAAA;IACrE,gBAAgB,CAAC,aAAa,EAAE,aAAa,EAAE,IAAI,kBAAkB,EAAE,CAAC,CAAA;IACxE,gBAAgB,CAAC,aAAa,EAAE,aAAa,EAAE,IAAI,kBAAkB,EAAE,CAAC,CAAA;IACxE,gBAAgB,CAAC,YAAY,EAAE,YAAY,EAAE,IAAI,iBAAiB,EAAE,CAAC,CAAA;IACrE,gBAAgB,CAAC,cAAc,EAAE,cAAc,EAAE,IAAI,mBAAmB,EAAE,CAAC,CAAA;IAC3E,gBAAgB,CACd,iBAAiB,EACjB,iBAAiB,EACjB,IAAI,sBAAsB,EAAE,CAC7B,CAAA;IACD,gBAAgB,CACd,eAAe,EACf,eAAe,EACf,IAAI,oBAAoB,EAAE,CAC3B,CAAA;IACD,gBAAgB,CAAC,aAAa,EAAE,aAAa,EAAE,IAAI,kBAAkB,EAAE,CAAC,CAAA;IACxE,gBAAgB,CAAC,WAAW,EAAE,WAAW,EAAE,IAAI,uBAAuB,EAAE,CAAC,CAAA;IACzE,gBAAgB,CAAC,cAAc,EAAE,cAAc,EAAE,IAAI,mBAAmB,EAAE,CAAC,CAAA;IAC3E,gBAAgB,CAAC,cAAc,EAAE,cAAc,EAAE,IAAI,mBAAmB,EAAE,CAAC,CAAA;IAC3E,gBAAgB,CAAC,cAAc,EAAE,cAAc,EAAE,IAAI,mBAAmB,EAAE,CAAC,CAAA;AAC7E,CAAC"}

package/lib/command/markup/entity/AcApMarkupCalloutEntity.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AcApMarkupCalloutEntity.d.ts","sourceRoot":"","sources":["../../../../src/command/markup/entity/AcApMarkupCalloutEntity.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,KAAK,gBAAgB,EAAE,MAAM,uBAAuB,CAAA;AAO1E,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,eAAe,CAAA;AAC/C,OAAO,EAIL,KAAK,0BAA0B,EACV,MAAM,eAAe,CAAA;AAK5C,OAAO,KAAK,EAAqB,gBAAgB,EAAE,MAAM,oBAAoB,CAAA;AAC7E,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAA;AAMrD;;;;GAIG;AACH,qBAAa,uBAAwB,SAAQ,gBAAgB;IAC3D;;OAEG;gBACS,MAAM,EAAE,gBAAgB;IAIpC;;;;OAIG;IACM,YAAY;;;;;IAMrB;;;;OAIG;IACM,gBAAgB,IAAI,WAAW,EAAE;IAc1C;;;;;;OAMG;IACM,mBAAmB,CAC1B,OAAO,EAAE,MAAM,EAAE,EACjB,MAAM,EAAE,gBAAgB,GACvB,IAAI;IAsBP;;;;;OAKG;IACH,SAAS,CAAC,YAAY,CAAC,IAAI,EAAE,UAAU,GAAG,0BAA0B;CAkJrE"}
+{"version":3,"file":"AcApMarkupCalloutEntity.d.ts","sourceRoot":"","sources":["../../../../src/command/markup/entity/AcApMarkupCalloutEntity.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,KAAK,gBAAgB,EAAE,MAAM,uBAAuB,CAAA;AAO1E,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,eAAe,CAAA;AAC/C,OAAO,EAIL,KAAK,0BAA0B,EACV,MAAM,eAAe,CAAA;AAK5C,OAAO,KAAK,EAAqB,gBAAgB,EAAE,MAAM,oBAAoB,CAAA;AAC7E,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAA;AAMrD;;;;GAIG;AACH,qBAAa,uBAAwB,SAAQ,gBAAgB;IAC3D;;OAEG;gBACS,MAAM,EAAE,gBAAgB;IAIpC;;;;OAIG;IACM,YAAY;;;;;IAMrB;;;;OAIG;IACM,gBAAgB,IAAI,WAAW,EAAE;IAc1C;;;;;;OAMG;IACM,mBAAmB,CAC1B,OAAO,EAAE,MAAM,EAAE,EACjB,MAAM,EAAE,gBAAgB,GACvB,IAAI;IAsBP;;;;;OAKG;IACH,SAAS,CAAC,YAAY,CAAC,IAAI,EAAE,UAAU,GAAG,0BAA0B;CAuJrE"}

package/lib/command/markup/entity/AcApMarkupCalloutEntity.js

@@ -36,7 +36,7 @@ var __values = (this && this.__values) || function(o) {
     throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
 };
 import { AcGePoint3d } from '@mlightcad/data-model';
-import { AcTrHtmlCallout, AcTrHtmlCanvasOverlay, AcTrHtmlDot } from '@mlightcad/three-renderer';
+import { AcTrHtmlCallout, AcTrHtmlCanvasOverlay, AcTrHtmlGrip } from '@mlightcad/three-renderer';
 import { acapBindOverlayCalloutGrips, acapDrawOverlayLeader, acapFitOverlayCanvas, acapPlaceOverlayHtml } from '../../overlay';
 import { runMarkupEdit } from '../AcApMarkupHistory';
 import { republishMarkup } from '../AcApMarkupRepublish';
@@ -153,18 +153,6 @@ var AcApMarkupCalloutEntity = /** @class */ (function (_super) {
             tip: __assign({}, geom.tip),
             anchor: __assign({}, geom.anchor)
         };
-        /**
-         * Redraw the leader (with arrow) from {@link live}.
-         */
-        var redraw = function () {
-            var ctx = acapFitOverlayCanvas(overlay.canvas, container);
-            if (!ctx)
-                return;
-            acapDrawOverlayLeader(ctx, view.worldToScreen(live.tip), view.worldToScreen(live.anchor), _this.record.style.color, true, canvasLineWidth);
-        };
-        redraw();
-        view.events.viewChanged.addEventListener(redraw);
-        cleanups.push(function () { return view.events.viewChanged.removeEventListener(redraw); });
         var bubble = new AcTrHtmlCallout({
             id: "".concat(this.record.id, "-bubble"),
             color: color,
@@ -174,14 +162,14 @@ var AcApMarkupCalloutEntity = /** @class */ (function (_super) {
             layer: layer,
             layoutId: layoutId
         });
-        var tipDot = new AcTrHtmlDot({
+        var tipDot = new AcTrHtmlGrip({
             id: "".concat(this.record.id, "-tip"),
             color: color,
             worldPosition: live.tip,
             layer: layer,
             layoutId: layoutId
         });
-        var centerDot = new AcTrHtmlDot({
+        var centerDot = new AcTrHtmlGrip({
             id: "".concat(this.record.id, "-center"),
             color: color,
             worldPosition: {
@@ -192,6 +180,19 @@ var AcApMarkupCalloutEntity = /** @class */ (function (_super) {
             layoutId: layoutId
         });
         group.add(bubble, tipDot, centerDot);
+        this.seedOverlaySizes(view, [bubble, tipDot, centerDot], [overlay.canvas]);
+        /**
+         * Redraw the leader (with arrow) from {@link live}.
+         */
+        var redraw = function () {
+            var ctx = acapFitOverlayCanvas(overlay.canvas, container);
+            if (!ctx)
+                return;
+            acapDrawOverlayLeader(ctx, view.worldToScreen(live.tip), view.worldToScreen(live.anchor), _this.record.style.color, true, canvasLineWidth, view, _this.record.style.strokeWidthWcs, _this.record.style.arrowSizeWcs);
+        };
+        redraw();
+        view.events.viewChanged.addEventListener(redraw);
+        cleanups.push(function () { return view.events.viewChanged.removeEventListener(redraw); });
         cleanups.push(bindMarkupInlineTextEdit({
             view: view,
             el: bubble.textElement,