@orbat-mapper/tactical-draw 0.2.0-alpha.12 → 0.2.0-alpha.13

package/dist/index.d.mts

@@ -1167,11 +1167,12 @@ declare class TacticalDraw {
   private renderMeasuresToGraphics;
   /**
    * Re-render the graphics layer on a view (zoom) change so pixel-denominated
-   * measures rescale live. Skipped entirely when nothing rendered carries a
-   * resolution-dependent size — meter geometry is zoom-independent, so a rebuild
-   * would be wasted layer writes. During an active edit the edited measure lives
-   * on the preview layer (lifted from graphics), so it is excluded here exactly
-   * as in `render()`; the preview's own view-change subscription rescales it.
+   * and not-yet-committed label-sized measures rescale live. Skipped entirely
+   * when nothing rendered still reads live view state — meter geometry with a
+   * captured label size is zoom-independent, so a rebuild would be wasted
+   * layer writes. During an active edit the edited measure lives on the
+   * preview layer (lifted from graphics), so it is excluded here exactly as
+   * in `render()`; the preview's own view-change subscription rescales it.
    */
   private readonly handleViewChange;
   /**

package/dist/index.mjs

@@ -563,6 +563,21 @@ function measureUsesAdapterResolution(measure) {
 	return measure.options?.[spec.pixels] !== void 0;
 }
 /**
+* Whether rendering `measure` through [[renderMeasureForAdapter]] reads live
+* adapter view state — either a pixel-denominated size
+* ([[measureUsesAdapterResolution]]) or draw-time label sizing that
+* [[withCommittedAdapterMeasureOptions]] would still capture (a
+* `capturesLabelSize` kind not yet carrying `labelSizePixels`). The
+* view-change rerender gates key off this so such measures rescale live;
+* committed label-sized measures already carry `labelSizePixels`, stay
+* zoom-independent, and keep skipping the rebuild.
+*/
+function measureRendersFromViewState(measure) {
+	if (measureUsesAdapterResolution(measure)) return true;
+	if (!getControlMeasureMetadata(measure.kind).capturesLabelSize) return false;
+	return typeof measure.options?.labelSizePixels !== "number";
+}
+/**
 * The [[SizeAnchor]] a measure currently encodes (ADR-0020): `screen` when it
 * carries its kind's pixel-denominated size option, `ground` otherwise. Keys off
 * the same `PIXEL_SIZE_OPTIONS` table as the bake, so a consumer deciding how to
@@ -617,9 +632,11 @@ function withAdapterMeasureOptions(measure, adapter) {
 	};
 }
 /**
-* Capture draw-time label sizing options on commit. These are stable feature
-* style inputs; adapters scale from them without TacticalDraw re-rendering on
-* every zoom.
+* Capture draw-time label sizing options. These are stable feature style
+* inputs; adapters scale from them without TacticalDraw re-rendering on every
+* zoom. No-op if the measure already carries `labelSizePixels` (e.g. already
+* committed), so it's safe to call on every render as well as on commit
+* itself — see [[renderMeasureForAdapter]].
 */
 function withCommittedAdapterMeasureOptions(measure, adapter) {
 	if (!getControlMeasureMetadata(measure.kind).capturesLabelSize) return measure;
@@ -641,10 +658,17 @@ function withCommittedAdapterMeasureOptions(measure, adapter) {
 * "turn a measure into features against the live map" — every TacticalDraw
 * layer write (graphics reconcile, draw preview, edit preview, commit snapshot)
 * routes through here so pixel sizing is resolved identically everywhere and no
-* call site can forget the injection. See [[withAdapterMeasureOptions]].
+* call site can forget the injection. Composes [[withAdapterMeasureOptions]]
+* (pixel size → `metersPerPixel`) with [[withCommittedAdapterMeasureOptions]]
+* (label size defaults for `capturesLabelSize` kinds), so draw/edit previews
+* get the same label clearance a commit would bake in — the input `measure`
+* is never mutated, and callers that need the persisted/working measure to
+* stay free of these render-only options must keep using that separately
+* (draw/edit commit paths call [[withCommittedAdapterMeasureOptions]]
+* directly to produce the value they persist).
 */
 function renderMeasureForAdapter(adapter, measure, opts) {
-	return renderControlMeasure(withAdapterMeasureOptions(measure, adapter), opts);
+	return renderControlMeasure(withAdapterMeasureOptions(withCommittedAdapterMeasureOptions(measure, adapter), adapter), opts);
 }
 //#endregion
 //#region src/tactical-draw/run-interaction.ts
@@ -923,7 +947,7 @@ function runFixedLengthDraw(options) {
 		ctx.writeLayer(guideLayer, guideFeatures);
 	}
 	function rescaleOnViewChange() {
-		if (!measureUsesAdapterResolution({
+		if (!measureRendersFromViewState({
 			kind,
 			options: measureOptions
 		})) return;
@@ -1296,7 +1320,7 @@ function runVariableLengthDraw(options) {
 		ctx.writeLayer(guideLayer, guideFeatures);
 	}
 	function rescaleOnViewChange() {
-		if (!measureUsesAdapterResolution({
+		if (!measureRendersFromViewState({
 			kind,
 			options: measureOptions
 		})) return;
@@ -2107,7 +2131,7 @@ function runEdit(opts) {
 	}
 	function rescaleOnViewChange() {
 		if (ctx.settled) return;
-		if (measureUsesAdapterResolution({
+		if (measureRendersFromViewState({
 			kind: measure.kind,
 			options: workingOptions
 		})) renderPreview();
@@ -3022,7 +3046,7 @@ function runGroupTransform(opts) {
 	}
 	function rescaleOnViewChange() {
 		if (ctx.settled) return;
-		if (members.some((m) => measureUsesAdapterResolution({
+		if (members.some((m) => measureRendersFromViewState({
 			kind: m.measure.kind,
 			options: m.measure.options
 		}))) renderAllPreviews();
@@ -3594,17 +3618,18 @@ var TacticalDraw = class {
 	}
 	/**
 	* Re-render the graphics layer on a view (zoom) change so pixel-denominated
-	* measures rescale live. Skipped entirely when nothing rendered carries a
-	* resolution-dependent size — meter geometry is zoom-independent, so a rebuild
-	* would be wasted layer writes. During an active edit the edited measure lives
-	* on the preview layer (lifted from graphics), so it is excluded here exactly
-	* as in `render()`; the preview's own view-change subscription rescales it.
+	* and not-yet-committed label-sized measures rescale live. Skipped entirely
+	* when nothing rendered still reads live view state — meter geometry with a
+	* captured label size is zoom-independent, so a rebuild would be wasted
+	* layer writes. During an active edit the edited measure lives on the
+	* preview layer (lifted from graphics), so it is excluded here exactly as
+	* in `render()`; the preview's own view-change subscription rescales it.
 	*/
 	handleViewChange = () => {
 		if (this.destroyed || !this.hasRendered) return;
 		const excluded = this.excludedInteractionIds();
 		const visible = excluded.size > 0 ? this.lastRenderedMeasures.filter((m) => !excluded.has(m.id)) : this.lastRenderedMeasures;
-		if (!visible.some(measureUsesAdapterResolution)) return;
+		if (!visible.some(measureRendersFromViewState)) return;
 		this.renderMeasuresToGraphics(visible);
 	};
 	/**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@orbat-mapper/tactical-draw",
-  "version": "0.2.0-alpha.12",
+  "version": "0.2.0-alpha.13",
   "description": "Engine-agnostic draw/edit core for tactical control measures (MIL-STD-2525 / APP-6). The MapAdapter ABI and bring-your-own-engine entry point for the tactical-draw package family.",
   "license": "MIT",
   "author": "Orbat Mapper",
@@ -38,7 +38,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@orbat-mapper/control-measures": "^0.2.0-alpha.9"
+    "@orbat-mapper/control-measures": "^0.2.0-alpha.10"
   },
   "devDependencies": {
     "@arethetypeswrong/core": "^0.18.3",