@jbpark/live-editor 4.0.0 → 4.0.1

package/dist/dnd/index.js

@@ -1,2 +1,2 @@
-import { a as Panel, c as useChildrenEditor, d as useDndPanel, f as DraggableItem, i as Palette, l as useDndLayout, n as Canvas, o as Field, r as Layout, s as useItemsEditor, t as Dnd, u as useDndPalette } from "../dnd-ClnGRNaY.js";
+import { a as Panel, c as useChildrenEditor, d as useDndPanel, f as DraggableItem, i as Palette, l as useDndLayout, n as Canvas, o as Field, r as Layout, s as useItemsEditor, t as Dnd, u as useDndPalette } from "../dnd-_0jfnnVB.js";
 export { Canvas, DraggableItem, Field, Layout, Palette, Panel, Dnd as default, useChildrenEditor, useDndLayout, useDndPalette, useDndPanel, useItemsEditor };

package/dist/{dnd-ClnGRNaY.js → dnd-_0jfnnVB.js}

@@ -229,21 +229,65 @@ const Node = ({ data, onChange }) => {
 	});
 };
 //#endregion
+//#region src/components/dnd/panel/use-structural-selection.ts
+const selectionAfter = (command, selected, count) => {
+	switch (command.type) {
+		case "append":
+		case "duplicate": return new Set(selected);
+		case "move-selected": return moveSelectedIndices(Array.from({ length: count }, (_, index) => index), new Set(command.indices), command.direction).indices;
+		default: return /* @__PURE__ */ new Set();
+	}
+};
+const useStructuralSelection = (count, revision) => {
+	const selection = useMultiSelect(count);
+	const [seen, setSeen] = useState(revision);
+	const [pending, setPending] = useState(null);
+	if (revision !== seen) {
+		setSeen(revision);
+		setPending(null);
+		if (pending?.matches(revision) && pending.selection.size > 0) selection.replace(pending.selection);
+		else selection.clear();
+	}
+	const record = (next, matches, { now = false } = {}) => {
+		setPending({
+			matches,
+			selection: next
+		});
+		if (!now) return;
+		if (next.size > 0) selection.replace(next);
+		else selection.clear();
+	};
+	return {
+		selection,
+		record
+	};
+};
+//#endregion
 //#region src/components/dnd/panel/use-children-editor.ts
+const producedBy = (expected, action) => {
+	if (action.type === "move-selected") {
+		const moved = JSON.stringify(moveSelectedIndices(expected, new Set(action.indices), action.direction).items);
+		return (revision) => revision === moved;
+	}
+	const added = action.type === "append" ? 1 : action.type === "duplicate" ? action.indices.length : 0;
+	return (revision) => {
+		const next = JSON.parse(revision);
+		return next.length === expected.length + added && expected.every((signature, index) => next[index] === signature);
+	};
+};
 const useChildrenEditor = (items, { onChange } = {}) => {
-	const selection = useMultiSelect(items.length);
 	const expected = useMemo(() => getChildrenSignatures(items), [items]);
 	const revision = JSON.stringify(expected);
-	const clear = selection.clear;
-	useEffect(() => {
-		clear();
-	}, [revision, clear]);
+	const { selection, record } = useStructuralSelection(items.length, revision);
 	const commit = (action) => {
-		onChange?.(JSON.stringify({
+		const edit = {
 			kind: "children-edit",
 			expected,
 			action
-		}));
+		};
+		const next = selectionAfter(action, selection.selected, items.length);
+		if (next.size > 0) record(next, producedBy(expected, action));
+		onChange?.(JSON.stringify(edit));
 	};
 	return {
 		items,
@@ -527,8 +571,8 @@ const useItemsEditor = (value, { render, onChange, onNodeChange } = {}) => {
 		rawItems,
 		value
 	]);
-	const selection = useMultiSelect(isPrimitive ? primitiveItems.length : objectItems.length);
-	const commit = (next, nextIds) => {
+	const { selection, record } = useStructuralSelection(isPrimitive ? primitiveItems.length : objectItems.length, value);
+	const commit = (next, nextIds, nextSelection) => {
 		if (next === null) {
 			reportError({
 				type: "items",
@@ -541,6 +585,7 @@ const useItemsEditor = (value, { render, onChange, onNodeChange } = {}) => {
 		const nextItems = kind === "primitive" ? parsed.primitiveItems : parsed.objectItems;
 		if (nextIds) setIdentityState(createIdentityState(next, kind, nextItems, nextIds));
 		else setIdentityState(createIdentityState(next, kind, nextItems, identity.ids));
+		record(nextSelection, (revision) => revision === next, { now: true });
 		onChange?.(next);
 		return true;
 	};
@@ -548,7 +593,7 @@ const useItemsEditor = (value, { render, onChange, onNodeChange } = {}) => {
 		return new Set((isPrimitive ? primitiveItems : objectItems).filter((item) => indices.has(item.index)).map((item) => item.elementIndex));
 	};
 	const updateProperty = (elementIndex, propertyKey, next) => {
-		commit(updateArrayItemProperty(value, elementIndex, propertyKey, next, render));
+		commit(updateArrayItemProperty(value, elementIndex, propertyKey, next, render), void 0, new Set(selection.selected));
 	};
 	return {
 		kind,
@@ -565,7 +610,7 @@ const useItemsEditor = (value, { render, onChange, onNodeChange } = {}) => {
 				value: item.value ?? "",
 				rawValue: item.type === "unknown" ? item.source : String(item.value ?? ""),
 				canEditValue: canLosslesslyEvaluateSource(item.source),
-				onChange: (next) => commit(updateArrayItemValue(value, item.elementIndex, next))
+				onChange: (next) => commit(updateArrayItemValue(value, item.elementIndex, next), void 0, new Set(selection.selected))
 			}
 		})) : objectItems.map((item) => {
 			const id = identity.ids[item.index] ?? item.id;
@@ -622,38 +667,40 @@ const useItemsEditor = (value, { render, onChange, onNodeChange } = {}) => {
 		actions: {
 			add: () => {
 				const next = appendArrayItem(value, kind);
-				commit(next, next ? [...identity.ids, nanoid(6)] : void 0);
+				commit(next, next ? [...identity.ids, nanoid(6)] : void 0, selectionAfter({ type: "append" }, selection.selected, rawItems.length));
 			},
 			move: (elementIndex, toIndex) => {
 				const items = isPrimitive ? primitiveItems : objectItems;
 				const from = items.find((item) => item.elementIndex === elementIndex);
 				const target = items.find((item) => item.index === toIndex);
 				if (!from || !target) return;
-				if (commit(moveArrayItem(value, elementIndex, target.elementIndex), moveId(identity.ids, from.index, target.index))) selection.clear();
+				commit(moveArrayItem(value, elementIndex, target.elementIndex), moveId(identity.ids, from.index, target.index), /* @__PURE__ */ new Set());
 			},
 			remove: (elementIndex) => {
 				const removed = (isPrimitive ? primitiveItems : objectItems).find((item) => item.elementIndex === elementIndex);
-				if (commit(removeArrayItems(value, /* @__PURE__ */ new Set([elementIndex]), kind), removed ? removeIds(identity.ids, /* @__PURE__ */ new Set([removed.index])) : void 0)) selection.clear();
+				commit(removeArrayItems(value, /* @__PURE__ */ new Set([elementIndex]), kind), removed ? removeIds(identity.ids, /* @__PURE__ */ new Set([removed.index])) : void 0, /* @__PURE__ */ new Set());
 			},
 			duplicateSelected: () => {
 				const selected = elementIndicesOf(selection.selected);
 				const next = duplicateArrayItems(value, selected);
 				const copied = rawItems.filter((item) => selected.has(item.elementIndex)).sort((a, b) => a.elementIndex - b.elementIndex).map(() => nanoid(6));
-				commit(next, next ? [...identity.ids, ...copied] : void 0);
+				commit(next, next ? [...identity.ids, ...copied] : void 0, selectionAfter({
+					type: "duplicate",
+					indices: [...selection.selected]
+				}, selection.selected, rawItems.length));
 			},
 			moveSelected: (direction) => {
 				const nextIdentity = moveSelectedIndices(identity.ids, selection.selected, direction);
 				const result = moveArrayItems(value, elementIndicesOf(selection.selected), direction);
 				if (!result) {
-					commit(null);
+					commit(null, void 0, selection.selected);
 					return;
 				}
 				const visible = parseArrayExpression(result.code)?.elements.flatMap((node, index) => import_lib.isExpression(node) && import_lib.isObjectExpression(node) === !isPrimitive ? [index] : []) ?? [];
-				selection.replace(new Set(visible.flatMap((position, index) => result.indices.has(position) ? [index] : [])));
-				commit(result.code, nextIdentity.items);
+				commit(result.code, nextIdentity.items, new Set(visible.flatMap((position, index) => result.indices.has(position) ? [index] : [])));
 			},
 			removeSelected: () => {
-				if (commit(removeArrayItems(value, elementIndicesOf(selection.selected), kind), removeIds(identity.ids, selection.selected))) selection.clear();
+				commit(removeArrayItems(value, elementIndicesOf(selection.selected), kind), removeIds(identity.ids, selection.selected), /* @__PURE__ */ new Set());
 			}
 		},
 		canEditStructure,
@@ -1825,4 +1872,4 @@ Dnd.Layout = Layout;
 //#endregion
 export { Panel as a, useChildrenEditor as c, useDndPanel as d, DraggableItem as f, Palette as i, useDndLayout as l, Canvas as n, Field as o, Layout as r, useItemsEditor as s, Dnd as t, useDndPalette as u };
 
-//# sourceMappingURL=dnd-ClnGRNaY.js.map
+//# sourceMappingURL=dnd-_0jfnnVB.js.map