@orbat-mapper/tactical-draw 0.2.0-alpha.26 → 0.2.0-alpha.27

package/dist/index.d.mts

@@ -180,6 +180,12 @@ interface MapAdapter {
    * silently ignored.
    */
   removeFeatures(layerId: LayerId, ids: readonly string[]): void;
+  /**
+   * Defer an upcoming removal from `layerId` until the most recent update to
+   * `updatedLayerId` has completed in the engine. Optional because synchronous
+   * adapters already make cross-layer write order visible atomically.
+   */
+  deferLayerRemovalUntilLayerUpdate?(layerId: LayerId, updatedLayerId: LayerId): void;
   /**
    * Subscribe to click-style "pick" events for a specific layer. Basemap and
    * other-layer clicks never fire the handler.
@@ -1518,7 +1524,7 @@ declare class TacticalDraw {
    * Routes every measure through [[renderMeasureForAdapter]] so pixel sizing is
    * resolved against the live map. Callers own any edit-exclusion policy — see
    * `render()` (excludes the edited measure, owned by the preview layer) versus
-   * `restoreOriginalToGraphics` (no exclusion, the edit is ending).
+   * `settleToGraphics` (no exclusion, the edit is ending).
    */
   private renderMeasuresToGraphics;
   /**

package/dist/index.mjs

@@ -1897,6 +1897,38 @@ function runEditInteraction(spec) {
 		attach(interaction) {
 			ctx = interaction;
 			driver = adapter.createEditPointerDriver();
+			let beforeTeardownRan = false;
+			const runBeforeTeardown = (settlement) => {
+				if (beforeTeardownRan) return;
+				beforeTeardownRan = true;
+				try {
+					spec.onBeforeTeardown?.(settlement);
+				} catch {}
+			};
+			const controllerContext = {
+				get settled() {
+					return interaction.settled;
+				},
+				commit(produce) {
+					return interaction.commit(() => {
+						const value = produce();
+						runBeforeTeardown({
+							status: "committed",
+							value
+						});
+						return value;
+					});
+				},
+				fail(error) {
+					if (!interaction.settled) runBeforeTeardown({
+						status: "rejected",
+						error
+					});
+					interaction.fail(error);
+				},
+				writeLayer: interaction.writeLayer,
+				onTeardown: interaction.onTeardown
+			};
 			const unsubDown = driver.onPointerDown(spec.onDown);
 			const unsubMove = driver.onPointerMove(spec.onMove);
 			const unsubUp = driver.onPointerUp(spec.onUp);
@@ -1905,6 +1937,10 @@ function runEditInteraction(spec) {
 			const unsubGraphics = adapter.onPick(graphicsLayer, onGraphicsPick);
 			adapter.on("click", onClick);
 			interaction.onTeardown(() => {
+				runBeforeTeardown({
+					status: "rejected",
+					error: void 0
+				});
 				adapter.off("click", onClick);
 				unsubPreview();
 				unsubHandles();
@@ -1915,7 +1951,7 @@ function runEditInteraction(spec) {
 				spec.extraTeardown?.();
 				driver.dispose();
 			}, spec.onAbort);
-			spec.attach(interaction, driver, shell);
+			spec.attach(controllerContext, driver, shell);
 		}
 	});
 }
@@ -2983,7 +3019,7 @@ const ALLOWED_EDIT_MODES = new Set([
 *  - close / abort / signal / preempt / destroy paths
 */
 function runEdit(opts) {
-	const { adapter, measure, graphicsLayer, previewLayer, guideLayer, handlesLayer, graphicsStyle, signal, closeOnClickAway = true, modes: initialModes, interactionStyle, onSession, handleIdPrefix, guide: guideOpt, restoreOriginalToGraphics, wasOnGraphicsLayer, onSettled, onClickAwayGraphicsPick, snap } = opts;
+	const { adapter, measure, graphicsLayer, previewLayer, guideLayer, handlesLayer, graphicsStyle, signal, closeOnClickAway = true, modes: initialModes, interactionStyle, onSession, handleIdPrefix, guide: guideOpt, settleToGraphics, wasOnGraphicsLayer, onSettled, onClickAwayGraphicsPick, snap } = opts;
 	const renderOpts = graphicsStyle ? { graphicsStyle } : void 0;
 	let sizeAnchor = opts.sizeAnchor ?? "ground";
 	const metadata = getControlMeasureMetadata(measure.kind);
@@ -3858,6 +3894,9 @@ function runEdit(opts) {
 		previewLayer,
 		handlesLayer,
 		closeOnClickAway,
+		onBeforeTeardown: (settlement) => {
+			settleToGraphics(settlement.status === "committed" ? settlement.value.graphic : void 0);
+		},
 		onViewChange: rescaleOnViewChange,
 		onDown: onDriverDown,
 		onMove: onDriverMove,
@@ -3879,13 +3918,15 @@ function runEdit(opts) {
 				dragInFlight = false;
 			}
 		},
-		onAbort: wasOnGraphicsLayer ? restoreOriginalToGraphics : void 0,
 		attach(interaction, createdDriver, createdShell) {
 			ctx = interaction;
 			driver = createdDriver;
 			shell = createdShell;
-			liftOriginalFromGraphics();
 			renderPreview();
+			if (wasOnGraphicsLayer) {
+				adapter.deferLayerRemovalUntilLayerUpdate?.(graphicsLayer, previewLayer);
+				liftOriginalFromGraphics();
+			}
 			renderHandlesLayer();
 			recomputeDirty();
 			if (onSession) onSession(session);
@@ -4878,7 +4919,7 @@ function symbolBox(adapter, capability, symbol, padding = 0) {
 	};
 }
 function runPointSymbolEdit(opts) {
-	const { adapter, capability, symbol, graphicsLayer, previewLayer, handlesLayer, signal, closeOnClickAway = true, interactionStyle, onSession, handleIdPrefix, restoreOriginalToGraphics, wasOnGraphicsLayer, onSettled, onClickAwayGraphicsPick, snap } = opts;
+	const { adapter, capability, symbol, graphicsLayer, previewLayer, handlesLayer, signal, closeOnClickAway = true, interactionStyle, onSession, handleIdPrefix, settleToGraphics, wasOnGraphicsLayer, onSettled, onClickAwayGraphicsPick, snap } = opts;
 	let modes = normalisePointModes(opts.modes);
 	let working = clonePointSymbol(symbol);
 	let dirty = false;
@@ -5063,6 +5104,9 @@ function runPointSymbolEdit(opts) {
 		handlesLayer,
 		closeOnClickAway,
 		onViewChange: render,
+		onBeforeTeardown: (settlement) => {
+			settleToGraphics(settlement.status === "committed" ? settlement.value.graphic : void 0);
+		},
 		onDown,
 		onMove,
 		onUp,
@@ -5075,15 +5119,15 @@ function runPointSymbolEdit(opts) {
 		facadeOnSettled: onSettled,
 		emitSettle: (settlement) => settleFromInteraction(settlement, commitEmitter, settleEmitter),
 		extraTeardown: () => adapter.reconcileLayerIconResources(previewLayer, []),
-		onAbort: () => {
-			if (wasOnGraphicsLayer) restoreOriginalToGraphics();
-		},
 		attach(interaction, createdDriver, createdShell) {
 			ctx = interaction;
 			driver = createdDriver;
 			shell = createdShell;
-			if (wasOnGraphicsLayer) adapter.removeFeatures(graphicsLayer, [`${symbol.id}:point-symbol`]);
 			render();
+			if (wasOnGraphicsLayer) {
+				adapter.deferLayerRemovalUntilLayerUpdate?.(graphicsLayer, previewLayer);
+				adapter.removeFeatures(graphicsLayer, [`${symbol.id}:point-symbol`]);
+			}
 			onSession?.(session);
 		}
 	});
@@ -5205,7 +5249,7 @@ var TacticalDraw = class {
 	* Routes every measure through [[renderMeasureForAdapter]] so pixel sizing is
 	* resolved against the live map. Callers own any edit-exclusion policy — see
 	* `render()` (excludes the edited measure, owned by the preview layer) versus
-	* `restoreOriginalToGraphics` (no exclusion, the edit is ending).
+	* `settleToGraphics` (no exclusion, the edit is ending).
 	*/
 	renderMeasuresToGraphics(graphics) {
 		const features = [];
@@ -5501,7 +5545,12 @@ var TacticalDraw = class {
 			const preempt = this.guardAndPreempt();
 			if (preempt) return preempt;
 			const wasOnGraphicsLayer = this.lastRenderedMeasures.some((m) => m.id === measure.id);
-			const restoreOriginalToGraphics = () => this.renderMeasuresToGraphics(this.lastRenderedMeasures);
+			const settleToGraphics = (settledSymbol) => {
+				if (!wasOnGraphicsLayer) return;
+				const graphics = settledSymbol ? this.lastRenderedMeasures.map((graphic) => graphic.id === measure.id ? settledSymbol : graphic) : this.lastRenderedMeasures;
+				this.renderMeasuresToGraphics(graphics);
+				this.adapter.deferLayerRemovalUntilLayerUpdate?.(this.previewLayer, this.graphicsLayer);
+			};
 			const handleIdPrefix = `__td_edit_${++this.editCounter}__`;
 			return this.runWithSlot((onSettled) => runPointSymbolEdit({
 				adapter: this.adapter,
@@ -5516,7 +5565,7 @@ var TacticalDraw = class {
 				interactionStyle: this.resolveInteractionStyle(options?.interactionStyle),
 				onSession: options?.onSession,
 				handleIdPrefix,
-				restoreOriginalToGraphics,
+				settleToGraphics,
 				wasOnGraphicsLayer,
 				onSettled,
 				onClickAwayGraphicsPick: (event) => this.dispatchHostPick(this.graphicsLayer, event),
@@ -5532,8 +5581,11 @@ var TacticalDraw = class {
 		const preempt = this.guardAndPreempt();
 		if (preempt) return preempt;
 		const wasOnGraphicsLayer = this.lastRenderedMeasures.some((m) => m.id === measure.id);
-		const restoreOriginalToGraphics = () => {
-			this.renderMeasuresToGraphics(this.lastRenderedMeasures);
+		const settleToGraphics = (settledMeasure) => {
+			if (!wasOnGraphicsLayer) return;
+			const graphics = settledMeasure ? this.lastRenderedMeasures.map((graphic) => graphic.id === measure.id ? settledMeasure : graphic) : this.lastRenderedMeasures;
+			this.renderMeasuresToGraphics(graphics);
+			this.adapter.deferLayerRemovalUntilLayerUpdate?.(this.previewLayer, this.graphicsLayer);
 		};
 		const handleIdPrefix = `__td_edit_${++this.editCounter}__`;
 		const mergedInteractionStyle = this.resolveInteractionStyle(options?.interactionStyle);
@@ -5557,7 +5609,7 @@ var TacticalDraw = class {
 			handleIdPrefix,
 			guide: options?.guide,
 			sizeAnchor: options?.sizeAnchor,
-			restoreOriginalToGraphics,
+			settleToGraphics,
 			wasOnGraphicsLayer,
 			onSettled,
 			onClickAwayGraphicsPick,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@orbat-mapper/tactical-draw",
-  "version": "0.2.0-alpha.26",
+  "version": "0.2.0-alpha.27",
   "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",