@mlightcad/cad-simple-viewer 1.5.11 → 1.6.0

package/lib/command/{review/AcApRevVisibilityCmd.js → markup/AcApMarkupVisibilityCmd.js}

@@ -49,42 +49,45 @@ 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 { AcApAnnotation } from '../../app';
-import { AcEdOpenMode } from '../../editor';
-import { AcApBaseRevCmd } from './AcApBaseRevCmd';
+import { AcEdCommand, AcEdOpenMode } from '../../editor';
+import { MARKUP_LAYER, MARKUP_LIVE_LAYER } from './AcApMarkupStore';
+/** Session visibility for the markup HTML / canvas layer. */
+var markupVisible = true;
+/** Whether markup overlays are currently shown. */
+export function isMarkupVisible() {
+    return markupVisible;
+}
 /**
- * Command for switching the visibility of the current layer.
+ * Show or hide all Design Review markup overlays (committed + live layers).
  */
-var AcApRevVisibilityCmd = /** @class */ (function (_super) {
-    __extends(AcApRevVisibilityCmd, _super);
-    function AcApRevVisibilityCmd() {
+export function setMarkupVisible(view, visible) {
+    markupVisible = visible;
+    view.htmlTransientManager.setVisible(visible, MARKUP_LAYER);
+    view.htmlTransientManager.setVisible(visible, MARKUP_LIVE_LAYER);
+    view.isHtmlDirty = true;
+}
+/**
+ * Toggle Design Review markup overlay visibility.
+ */
+var AcApMarkupVisibilityCmd = /** @class */ (function (_super) {
+    __extends(AcApMarkupVisibilityCmd, _super);
+    function AcApMarkupVisibilityCmd() {
         var _this = _super.call(this) || this;
         _this.mode = AcEdOpenMode.Review;
-        _this.isShowEntityDrawStyleToolbar = false;
+        _this.recordsUndoStack = false;
         return _this;
     }
-    /**
-     * Executes the command to switch the visibility of the current layer.
-     *
-     * @param context - The application context containing the view
-     */
-    AcApRevVisibilityCmd.prototype.execute = function (context) {
+    AcApMarkupVisibilityCmd.prototype.execute = function (context) {
         return __awaiter(this, void 0, void 0, function () {
-            var db, annotation, annotationLayer, layer;
+            var view;
             return __generator(this, function (_a) {
-                db = context.doc.database;
-                annotation = new AcApAnnotation(db);
-                annotationLayer = annotation.getAnnotationLayer();
-                if (annotationLayer) {
-                    layer = db.tables.layerTable.getAt(annotationLayer);
-                    if (layer)
-                        layer.isOff = !layer.isOff;
-                }
+                view = context.view;
+                setMarkupVisible(view, !markupVisible);
                 return [2 /*return*/];
             });
         });
     };
-    return AcApRevVisibilityCmd;
-}(AcApBaseRevCmd));
-export { AcApRevVisibilityCmd };
-//# sourceMappingURL=AcApRevVisibilityCmd.js.map
+    return AcApMarkupVisibilityCmd;
+}(AcEdCommand));
+export { AcApMarkupVisibilityCmd };
+//# sourceMappingURL=AcApMarkupVisibilityCmd.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"AcApMarkupVisibilityCmd.js","sourceRoot":"","sources":["../../../src/command/markup/AcApMarkupVisibilityCmd.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,cAAc,CAAA;AAExD,OAAO,EAAE,YAAY,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAA;AAEnE,6DAA6D;AAC7D,IAAI,aAAa,GAAG,IAAI,CAAA;AAExB,mDAAmD;AACnD,MAAM,UAAU,eAAe;IAC7B,OAAO,aAAa,CAAA;AACtB,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,gBAAgB,CAAC,IAAgB,EAAE,OAAgB;IACjE,aAAa,GAAG,OAAO,CAAA;IACvB,IAAI,CAAC,oBAAoB,CAAC,UAAU,CAAC,OAAO,EAAE,YAAY,CAAC,CAAA;IAC3D,IAAI,CAAC,oBAAoB,CAAC,UAAU,CAAC,OAAO,EAAE,iBAAiB,CAAC,CAAA;IAChE,IAAI,CAAC,WAAW,GAAG,IAAI,CAAA;AACzB,CAAC;AAED;;GAEG;AACH;IAA6C,2CAAW;IACtD;QACE,YAAA,MAAK,WAAE,SAAA;QACP,KAAI,CAAC,IAAI,GAAG,YAAY,CAAC,MAAM,CAAA;QAC/B,KAAI,CAAC,gBAAgB,GAAG,KAAK,CAAA;;IAC/B,CAAC;IAEK,yCAAO,GAAb,UAAc,OAAoB;;;;gBAC1B,IAAI,GAAG,OAAO,CAAC,IAAkB,CAAA;gBACvC,gBAAgB,CAAC,IAAI,EAAE,CAAC,aAAa,CAAC,CAAA;;;;KACvC;IACH,8BAAC;AAAD,CAAC,AAXD,CAA6C,WAAW,GAWvD"}

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

@@ -0,0 +1,48 @@
+import { AcGePoint3d, type AcGeVector3dLike } from '@mlightcad/data-model';
+import type { AcTrView2d } from '../../../view';
+import { type AcApOverlayWorldDrawResult } from '../../overlay';
+import type { AcApMarkupRecord } from '../AcApMarkupTypes';
+import { AcApMarkupEntity } from './AcApMarkupEntity';
+/**
+ * Standalone callout markup (leader + bubble).
+ *
+ * Grips: tip (0), bubble anchor (1), and midpoint center-move (2).
+ */
+export declare class AcApMarkupCalloutEntity extends AcApMarkupEntity {
+    /**
+     * @param record - Store record whose geometry type must be `callout`.
+     */
+    constructor(record: AcApMarkupRecord);
+    /**
+     * Focus on the bubble anchor.
+     *
+     * @returns Anchor world point, or `undefined` when geometry is wrong type.
+     */
+    primaryPoint(): {
+        x: number;
+        y: number;
+        z: number;
+    } | undefined;
+    /**
+     * Tip, anchor, and midpoint grips.
+     *
+     * @returns Three WCS grip points, or empty when geometry is wrong type.
+     */
+    subGetGripPoints(): AcGePoint3d[];
+    /**
+     * Move tip (0), anchor (1), or both via midpoint (2).
+     *
+     * @param indices - Grip indices to move.
+     * @param offset - World-space translation.
+     * @returns This entity for chaining.
+     */
+    subMoveGripPointsAt(indices: number[], offset: AcGeVector3dLike): this;
+    /**
+     * Publish leader canvas, bubble, tip/center dots, and tip/bubble/center grips.
+     *
+     * @param view - Active 2D view.
+     * @returns Built visuals with deferred grip binding.
+     */
+    protected subWorldDraw(view: AcTrView2d): AcApOverlayWorldDrawResult;
+}
+//# sourceMappingURL=AcApMarkupCalloutEntity.d.ts.map

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

@@ -0,0 +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"}

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

@@ -0,0 +1,291 @@
+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 __());
+    };
+})();
+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);
+    if (o && typeof o.length === "number") return {
+        next: function () {
+            if (o && i >= o.length) o = void 0;
+            return { value: o && o[i++], done: !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 { acapBindOverlayCalloutGrips, acapDrawOverlayLeader, acapFitOverlayCanvas, acapPlaceOverlayHtml } from '../../overlay';
+import { runMarkupEdit } from '../AcApMarkupHistory';
+import { republishMarkup } from '../AcApMarkupRepublish';
+import { getMarkupStore } from '../AcApMarkupStore';
+import { bindMarkupInlineTextEdit } from '../AcApMarkupTextEdit';
+import { AcApMarkupEntity } from './AcApMarkupEntity';
+import { bindMarkupCenterMove, selectMarkupGroup } from './AcApMarkupEntityGrips';
+/**
+ * Standalone callout markup (leader + bubble).
+ *
+ * Grips: tip (0), bubble anchor (1), and midpoint center-move (2).
+ */
+var AcApMarkupCalloutEntity = /** @class */ (function (_super) {
+    __extends(AcApMarkupCalloutEntity, _super);
+    /**
+     * @param record - Store record whose geometry type must be `callout`.
+     */
+    function AcApMarkupCalloutEntity(record) {
+        return _super.call(this, record) || this;
+    }
+    /**
+     * Focus on the bubble anchor.
+     *
+     * @returns Anchor world point, or `undefined` when geometry is wrong type.
+     */
+    AcApMarkupCalloutEntity.prototype.primaryPoint = function () {
+        var geom = this.record.geometry;
+        if (geom.type !== 'callout')
+            return undefined;
+        return { x: geom.anchor.x, y: geom.anchor.y, z: 0 };
+    };
+    /**
+     * Tip, anchor, and midpoint grips.
+     *
+     * @returns Three WCS grip points, or empty when geometry is wrong type.
+     */
+    AcApMarkupCalloutEntity.prototype.subGetGripPoints = function () {
+        var geom = this.record.geometry;
+        if (geom.type !== 'callout')
+            return [];
+        return [
+            new AcGePoint3d(geom.tip.x, geom.tip.y, 0),
+            new AcGePoint3d(geom.anchor.x, geom.anchor.y, 0),
+            new AcGePoint3d((geom.tip.x + geom.anchor.x) / 2, (geom.tip.y + geom.anchor.y) / 2, 0)
+        ];
+    };
+    /**
+     * Move tip (0), anchor (1), or both via midpoint (2).
+     *
+     * @param indices - Grip indices to move.
+     * @param offset - World-space translation.
+     * @returns This entity for chaining.
+     */
+    AcApMarkupCalloutEntity.prototype.subMoveGripPointsAt = function (indices, offset) {
+        var e_1, _a;
+        var geom = this.record.geometry;
+        if (geom.type !== 'callout')
+            return this;
+        var tip = __assign({}, geom.tip);
+        var anchor = __assign({}, geom.anchor);
+        try {
+            for (var indices_1 = __values(indices), indices_1_1 = indices_1.next(); !indices_1_1.done; indices_1_1 = indices_1.next()) {
+                var index = indices_1_1.value;
+                if (index === 0) {
+                    tip = { x: tip.x + offset.x, y: tip.y + offset.y };
+                }
+                else if (index === 1) {
+                    anchor = { x: anchor.x + offset.x, y: anchor.y + offset.y };
+                }
+                else if (index === 2) {
+                    tip = { x: tip.x + offset.x, y: tip.y + offset.y };
+                    anchor = { x: anchor.x + offset.x, y: anchor.y + offset.y };
+                }
+            }
+        }
+        catch (e_1_1) { e_1 = { error: e_1_1 }; }
+        finally {
+            try {
+                if (indices_1_1 && !indices_1_1.done && (_a = indices_1.return)) _a.call(indices_1);
+            }
+            finally { if (e_1) throw e_1.error; }
+        }
+        this.record = __assign(__assign({}, this.record), { geometry: { type: 'callout', tip: tip, anchor: anchor } });
+        return this;
+    };
+    /**
+     * Publish leader canvas, bubble, tip/center dots, and tip/bubble/center grips.
+     *
+     * @param view - Active 2D view.
+     * @returns Built visuals with deferred grip binding.
+     */
+    AcApMarkupCalloutEntity.prototype.subWorldDraw = function (view) {
+        var _this = this;
+        var geom = this.record.geometry;
+        if (geom.type !== 'callout') {
+            return this.emptyResult(this.createGroup());
+        }
+        var _a = this.style(), color = _a.color, canvasLineWidth = _a.canvasLineWidth, layer = _a.layer, layoutId = _a.layoutId;
+        var group = this.createGroup();
+        /** Unbinders for viewChanged, inline edit, and grips. */
+        var cleanups = [];
+        /** Grip binders deferred until after manager.add(group). */
+        var pendingGrips = [];
+        var container = view.container;
+        var overlay = new AcTrHtmlCanvasOverlay({
+            id: "".concat(this.record.id, "-leader"),
+            container: container,
+            layer: layer,
+            layoutId: layoutId
+        });
+        group.addCanvas(overlay);
+        /** Live tip / anchor mutated during grips before store commit. */
+        var live = {
+            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,
+            text: this.record.text || this.record.comment || 'Callout',
+            fontSize: this.record.style.fontSize,
+            worldPosition: live.anchor,
+            layer: layer,
+            layoutId: layoutId
+        });
+        var tipDot = new AcTrHtmlDot({
+            id: "".concat(this.record.id, "-tip"),
+            color: color,
+            worldPosition: live.tip,
+            layer: layer,
+            layoutId: layoutId
+        });
+        var centerDot = new AcTrHtmlDot({
+            id: "".concat(this.record.id, "-center"),
+            color: color,
+            worldPosition: {
+                x: (live.tip.x + live.anchor.x) / 2,
+                y: (live.tip.y + live.anchor.y) / 2
+            },
+            layer: layer,
+            layoutId: layoutId
+        });
+        group.add(bubble, tipDot, centerDot);
+        cleanups.push(bindMarkupInlineTextEdit({
+            view: view,
+            el: bubble.textElement,
+            listenOn: bubble.element,
+            recordId: this.record.id,
+            multiline: true
+        }));
+        /**
+         * Keep the center grip halfway between tip and bubble during live drag.
+         */
+        var syncCenter = function () {
+            acapPlaceOverlayHtml(view, centerDot, {
+                x: (live.tip.x + live.anchor.x) / 2,
+                y: (live.tip.y + live.anchor.y) / 2
+            });
+        };
+        pendingGrips.push(function () {
+            cleanups.push(acapBindOverlayCalloutGrips({
+                view: view,
+                group: group,
+                tipEl: tipDot,
+                bubbleEl: bubble,
+                state: live,
+                onDragStart: function () { return selectMarkupGroup(view, _this.record.id); },
+                onLiveChange: function () {
+                    redraw();
+                    syncCenter();
+                },
+                onCommit: function (next) {
+                    runMarkupEdit(view, 'Move Callout', function () {
+                        var updated = getMarkupStore().updateGeometry(_this.record.id, {
+                            type: 'callout',
+                            tip: next.tip,
+                            anchor: next.anchor
+                        });
+                        if (updated)
+                            republishMarkup(view, updated);
+                    });
+                }
+            }), bindMarkupCenterMove({
+                view: view,
+                recordId: _this.record.id,
+                centerEl: centerDot,
+                attached: {
+                    live: live,
+                    redraw: redraw,
+                    tipDot: tipDot,
+                    bubble: bubble
+                }
+            }));
+        });
+        return {
+            group: group,
+            entityIds: [],
+            dispose: function () {
+                var e_2, _a;
+                try {
+                    for (var cleanups_1 = __values(cleanups), cleanups_1_1 = cleanups_1.next(); !cleanups_1_1.done; cleanups_1_1 = cleanups_1.next()) {
+                        var fn = cleanups_1_1.value;
+                        try {
+                            fn();
+                        }
+                        catch (_b) {
+                            // ignore
+                        }
+                    }
+                }
+                catch (e_2_1) { e_2 = { error: e_2_1 }; }
+                finally {
+                    try {
+                        if (cleanups_1_1 && !cleanups_1_1.done && (_a = cleanups_1.return)) _a.call(cleanups_1);
+                    }
+                    finally { if (e_2) throw e_2.error; }
+                }
+            },
+            bindGrips: function () {
+                var e_3, _a;
+                try {
+                    for (var pendingGrips_1 = __values(pendingGrips), pendingGrips_1_1 = pendingGrips_1.next(); !pendingGrips_1_1.done; pendingGrips_1_1 = pendingGrips_1.next()) {
+                        var bind = pendingGrips_1_1.value;
+                        bind();
+                    }
+                }
+                catch (e_3_1) { e_3 = { error: e_3_1 }; }
+                finally {
+                    try {
+                        if (pendingGrips_1_1 && !pendingGrips_1_1.done && (_a = pendingGrips_1.return)) _a.call(pendingGrips_1);
+                    }
+                    finally { if (e_3) throw e_3.error; }
+                }
+            }
+        };
+    };
+    return AcApMarkupCalloutEntity;
+}(AcApMarkupEntity));
+export { AcApMarkupCalloutEntity };
+//# sourceMappingURL=AcApMarkupCalloutEntity.js.map

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

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

package/lib/command/markup/entity/AcApMarkupEntity.d.ts

@@ -0,0 +1,131 @@
+import { AcGePoint3d, type AcGePoint3dLike, type AcGeVector3dLike, type AcGiLineWeight } from '@mlightcad/data-model';
+import { AcTrHtmlGroup } from '@mlightcad/three-renderer';
+import type { AcTrView2d } from '../../../view';
+import { AcApOverlayEntity, type AcApOverlaySerializable, type AcApOverlayWorldDrawResult } from '../../overlay';
+import type { AcApMarkupRecord } from '../AcApMarkupTypes';
+import { cssToMarkupColor } from '../AcApMarkupUtil';
+/**
+ * Shared draw state derived from a markup record for HTML / CAD styling.
+ */
+export interface AcApMarkupDrawStyle {
+    /** Resolved AutoCAD-style color for HTML and CAD transients. */
+    color: ReturnType<typeof cssToMarkupColor>;
+    /** CAD line weight applied to transient entities. */
+    lineWeight: AcGiLineWeight;
+    /** Canvas stroke width in CSS pixels corresponding to {@link lineWeight}. */
+    canvasLineWidth: number;
+    /** HTML transient layer name for this markup. */
+    layer: string;
+    /** Layout BTR id, or `undefined` when visible on every layout. */
+    layoutId: string | undefined;
+}
+/**
+ * Build {@link AcApMarkupDrawStyle} from a store record's style fields.
+ *
+ * @param record - Markup record whose style and layout are read.
+ * @returns Resolved color, weights, layer, and layout for drawing.
+ */
+export declare function markupDrawStyleFromRecord(record: AcApMarkupRecord): AcApMarkupDrawStyle;
+/**
+ * Base class for Design Review markup overlays.
+ *
+ * Concrete types implement {@link subWorldDraw} and optional grip protocols.
+ * Geometry and metadata live on {@link record}; render primitives are composed
+ * into an {@link AcTrHtmlGroup}.
+ *
+ * Implements {@link AcApOverlaySerializable} via {@link toRecord}. Rehydrate
+ * with {@link import('./AcApMarkupEntityFactory').createMarkupEntityFromRecord}.
+ */
+export declare abstract class AcApMarkupEntity extends AcApOverlayEntity implements AcApOverlaySerializable<AcApMarkupRecord> {
+    /** Current store snapshot driving this entity's geometry and metadata. */
+    protected record: AcApMarkupRecord;
+    /**
+     * @param record - Initial markup store record.
+     */
+    constructor(record: AcApMarkupRecord);
+    /**
+     * Markup id from the store record (also the HTML group id).
+     */
+    get id(): string;
+    /**
+     * Sidecar / store snapshot of this markup (same object as the live record).
+     *
+     * @returns Current {@link AcApMarkupRecord}.
+     */
+    toRecord(): AcApMarkupRecord;
+    /**
+     * Current store record held by this entity (alias of {@link toRecord}).
+     */
+    get markupRecord(): AcApMarkupRecord;
+    /**
+     * Replace the in-memory record (e.g. after store update before republish).
+     *
+     * @param record - Next store snapshot.
+     */
+    setRecord(record: AcApMarkupRecord): void;
+    /**
+     * Resolve draw style from the current record.
+     *
+     * @returns Color, line weight, layer, and layout for publishing.
+     */
+    protected style(): AcApMarkupDrawStyle;
+    /**
+     * Hit-test this markup's stroke / fill via {@link hitTestMarkupGeometry}.
+     *
+     * @param canvas - Pick location in canvas space.
+     * @param worldToScreen - World → canvas converter.
+     * @param threshold - Hit slop in pixels.
+     * @returns Whether the pick hits drawn geometry.
+     */
+    hitTest(canvas: {
+        x: number;
+        y: number;
+    }, worldToScreen: (point: {
+        x: number;
+        y: number;
+    }) => {
+        x: number;
+        y: number;
+    }, threshold: number): boolean;
+    /**
+     * Focus point at the geometry center (or type-specific primary point).
+     *
+     * @returns World point for zoom / focus, or `undefined`.
+     */
+    primaryPoint(): AcGePoint3dLike | undefined;
+    /**
+     * Default single center grip for whole-markup move.
+     *
+     * @returns Center grip, or empty when geometry has no center.
+     */
+    subGetGripPoints(): AcGePoint3d[];
+    /**
+     * Translate the whole markup when grip index `0` is moved.
+     *
+     * @param indices - Grip indices to move.
+     * @param offset - World-space translation.
+     * @returns This entity for chaining.
+     */
+    subMoveGripPointsAt(indices: number[], offset: AcGeVector3dLike): this;
+    /**
+     * Build an empty world-draw result for an already-created group.
+     *
+     * @param group - HTML group shell.
+     * @returns Result with no CAD entities and a no-op dispose.
+     */
+    protected emptyResult(group: AcTrHtmlGroup): AcApOverlayWorldDrawResult;
+    /**
+     * Create a selectable markup group shell for {@link id}.
+     *
+     * @returns New empty {@link AcTrHtmlGroup} on the markup layer.
+     */
+    protected createGroup(): AcTrHtmlGroup;
+    /**
+     * Emit HTML + CAD + canvas visuals for this markup type.
+     *
+     * @param view - Active 2D view.
+     * @returns Built visuals and cleanup hooks.
+     */
+    protected abstract subWorldDraw(view: AcTrView2d): AcApOverlayWorldDrawResult;
+}
+//# sourceMappingURL=AcApMarkupEntity.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"AcApMarkupEntity.d.ts","sourceRoot":"","sources":["../../../../src/command/markup/entity/AcApMarkupEntity.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,WAAW,EACX,KAAK,eAAe,EACpB,KAAK,gBAAgB,EACrB,KAAK,cAAc,EACpB,MAAM,uBAAuB,CAAA;AAC9B,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAA;AAEzD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,eAAe,CAAA;AAC/C,OAAO,EACL,iBAAiB,EACjB,KAAK,uBAAuB,EAC5B,KAAK,0BAA0B,EAChC,MAAM,eAAe,CAAA;AAOtB,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAA;AAC1D,OAAO,EACL,gBAAgB,EAGjB,MAAM,mBAAmB,CAAA;AAE1B;;GAEG;AACH,MAAM,WAAW,mBAAmB;IAClC,gEAAgE;IAChE,KAAK,EAAE,UAAU,CAAC,OAAO,gBAAgB,CAAC,CAAA;IAC1C,qDAAqD;IACrD,UAAU,EAAE,cAAc,CAAA;IAC1B,6EAA6E;IAC7E,eAAe,EAAE,MAAM,CAAA;IACvB,iDAAiD;IACjD,KAAK,EAAE,MAAM,CAAA;IACb,kEAAkE;IAClE,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAA;CAC7B;AAED;;;;;GAKG;AACH,wBAAgB,yBAAyB,CACvC,MAAM,EAAE,gBAAgB,GACvB,mBAAmB,CAYrB;AAED;;;;;;;;;GASG;AACH,8BAAsB,gBACpB,SAAQ,iBACR,YAAW,uBAAuB,CAAC,gBAAgB,CAAC;IAEpD,0EAA0E;IAC1E,SAAS,CAAC,MAAM,EAAE,gBAAgB,CAAA;IAElC;;OAEG;gBACS,MAAM,EAAE,gBAAgB;IAKpC;;OAEG;IACH,IAAI,EAAE,IAAI,MAAM,CAEf;IAED;;;;OAIG;IACH,QAAQ,IAAI,gBAAgB;IAI5B;;OAEG;IACH,IAAI,YAAY,IAAI,gBAAgB,CAEnC;IAED;;;;OAIG;IACH,SAAS,CAAC,MAAM,EAAE,gBAAgB,GAAG,IAAI;IAIzC;;;;OAIG;IACH,SAAS,CAAC,KAAK,IAAI,mBAAmB;IAItC;;;;;;;OAOG;IACM,OAAO,CACd,MAAM,EAAE;QAAE,CAAC,EAAE,MAAM,CAAC;QAAC,CAAC,EAAE,MAAM,CAAA;KAAE,EAChC,aAAa,EAAE,CAAC,KAAK,EAAE;QAAE,CAAC,EAAE,MAAM,CAAC;QAAC,CAAC,EAAE,MAAM,CAAA;KAAE,KAAK;QAClD,CAAC,EAAE,MAAM,CAAA;QACT,CAAC,EAAE,MAAM,CAAA;KACV,EACD,SAAS,EAAE,MAAM,GAChB,OAAO;IASV;;;;OAIG;IACM,YAAY,IAAI,eAAe,GAAG,SAAS;IAMpD;;;;OAIG;IACM,gBAAgB,IAAI,WAAW,EAAE;IAK1C;;;;;;OAMG;IACM,mBAAmB,CAC1B,OAAO,EAAE,MAAM,EAAE,EACjB,MAAM,EAAE,gBAAgB,GACvB,IAAI;IAcP;;;;;OAKG;IACH,SAAS,CAAC,WAAW,CAAC,KAAK,EAAE,aAAa,GAAG,0BAA0B;IAQvE;;;;OAIG;IACH,SAAS,CAAC,WAAW,IAAI,aAAa;IAUtC;;;;;OAKG;IACH,SAAS,CAAC,QAAQ,CAAC,YAAY,CAC7B,IAAI,EAAE,UAAU,GACf,0BAA0B;CAC9B"}