@craftile/core 1.3.1 → 1.3.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@craftile/core",
-  "version": "1.3.1",
+  "version": "1.3.2",
   "description": "Framework-agnostic block editor engine for Craftile",
   "keywords": [
     "craftile",
@@ -26,8 +26,8 @@
     "src"
   ],
   "dependencies": {
-    "@craftile/event-bus": "1.3.1",
-    "@craftile/types": "1.3.1"
+    "@craftile/event-bus": "1.3.2",
+    "@craftile/types": "1.3.2"
   },
   "devDependencies": {
     "vitest": "^3.2.4",

package/src/commands/duplicate-block.ts

@@ -13,16 +13,20 @@ export class DuplicateBlockCommand implements Command {
   private blockId: string;
 
   // State for reverting
-  private duplicatedBlockId!: string;
+  private duplicatedBlockId: string;
   private duplicatedBlock?: Block;
   private parentId?: string | null;
   private insertIndex!: number;
   private regionId?: string | null;
   private emit: EngineEmitFn;
 
+  // Original descendant ID -> copy ID, reused on redo so the copy keeps its IDs
+  private cloneIds = new Map<string, string>();
+
   constructor(getPage: () => Page, options: DuplicateBlockOptions) {
     this.getPage = getPage;
     this.blockId = options.blockId;
+    this.duplicatedBlockId = generateId();
     this.emit = options.emit;
   }
 
@@ -33,8 +37,6 @@ export class DuplicateBlockCommand implements Command {
       throw new Error(`Block not found: ${this.blockId}`);
     }
 
-    this.duplicatedBlockId = generateId();
-
     this.duplicatedBlock = this.cloneBlockWithNewIds(
       page,
       originalBlock,
@@ -62,6 +64,13 @@ export class DuplicateBlockCommand implements Command {
     }
 
     this.removeDuplicatedBlock(this.getPage());
+
+    this.emit('block:remove', {
+      blockId: this.duplicatedBlockId,
+      block: this.duplicatedBlock,
+      parentId: this.parentId || undefined,
+      regionId: this.regionId || undefined,
+    });
   }
 
   getBlockId(): string {
@@ -100,7 +109,11 @@ export class DuplicateBlockCommand implements Command {
       for (const childId of block.children) {
         const childBlock = page.blocks[childId];
         if (childBlock) {
-          const newChildId = generateId();
+          let newChildId = this.cloneIds.get(childId);
+          if (!newChildId) {
+            newChildId = generateId();
+            this.cloneIds.set(childId, newChildId);
+          }
           this.cloneBlockWithNewIds(page, childBlock, newChildId, newId);
           clonedBlock.children.push(newChildId);
         }

package/src/commands/insert-block-from-preset.ts

@@ -31,6 +31,10 @@ export class InsertBlockFromPresetCommand implements Command {
   private emit: EngineEmitFn;
   private createdBlockIds: string[] = [];
 
+  // Child IDs in creation order, reused on redo so children keep their IDs
+  private childIds: string[] = [];
+  private childIdIndex = 0;
+
   constructor(getPage: () => Page, options: InsertBlockFromPresetOptions) {
     this.getPage = getPage;
     this.blockType = options.blockType;
@@ -75,6 +79,9 @@ export class InsertBlockFromPresetCommand implements Command {
 
     const blockSchema = this.blocksManager.get(this.blockType);
 
+    this.createdBlockIds = [];
+    this.childIdIndex = 0;
+
     if (this.presetData) {
       this.insertedBlock = {
         ...structuredClone(this.presetData),
@@ -185,7 +192,7 @@ export class InsertBlockFromPresetCommand implements Command {
     const childIds: string[] = [];
 
     for (const structure of structures) {
-      const childId = generateId();
+      const childId = this.nextChildId();
       const childSchema = this.blocksManager.get(structure.type);
 
       if (!childSchema) {
@@ -220,6 +227,14 @@ export class InsertBlockFromPresetCommand implements Command {
     return childIds;
   }
 
+  private nextChildId(): string {
+    if (this.childIdIndex === this.childIds.length) {
+      this.childIds.push(generateId());
+    }
+
+    return this.childIds[this.childIdIndex++];
+  }
+
   private buildProperties(blockSchema?: BlockSchema, presetProperties?: Record<string, any>): Record<string, any> {
     const properties: Record<string, any> = {};
 

package/src/commands/move-block.ts

@@ -23,6 +23,8 @@ export class MoveBlockCommand implements Command {
   private originalParentId?: string;
   private originalIndex!: number;
   private originalRegionId?: string;
+  private resolvedIndex!: number;
+  private resolvedRegionId?: string;
 
   private emit: EngineEmitFn;
 
@@ -66,12 +68,14 @@ export class MoveBlockCommand implements Command {
     }
 
     this.moved = true;
+    this.resolvedIndex = target.index;
+    this.resolvedRegionId = target.kind === 'region' ? target.regionId : undefined;
 
     this.emit('block:move', {
       blockId: this.blockId,
       targetParentId: this.targetParentId,
-      targetIndex: this.targetIndex,
-      targetRegionId: target.kind === 'region' ? target.regionId : undefined,
+      targetIndex: this.resolvedIndex,
+      targetRegionId: this.resolvedRegionId,
       sourceParentId: this.originalParentId || null,
       sourceRegionId: this.originalRegionId || null,
       sourceIndex: this.originalIndex,
@@ -185,8 +189,8 @@ export class MoveBlockCommand implements Command {
       targetIndex: this.originalIndex,
       targetRegionId: this.originalRegionId,
       sourceParentId: this.targetParentId || null,
-      sourceRegionId: this.targetRegionId || null,
-      sourceIndex: this.targetIndex || 0,
+      sourceRegionId: this.resolvedRegionId || null,
+      sourceIndex: this.resolvedIndex,
     });
   }
 

package/src/commands/remove-block.ts

@@ -11,6 +11,7 @@ export class RemoveBlockCommand implements Command {
   private getPage: () => Page;
   private blockId: string;
   private removedBlock?: Block;
+  private removedDescendants: Block[] = [];
   private originalIndex?: number;
   private originalParentId?: string;
   private regionId?: string;
@@ -49,6 +50,11 @@ export class RemoveBlockCommand implements Command {
       }
     }
 
+    this.removedDescendants = this.collectDescendants(page, this.removedBlock);
+    for (const descendant of this.removedDescendants) {
+      delete page.blocks[descendant.id];
+    }
+
     delete page.blocks[this.blockId];
 
     this.emit('block:remove', {
@@ -67,6 +73,9 @@ export class RemoveBlockCommand implements Command {
     const page = this.getPage();
 
     page.blocks[this.blockId] = this.removedBlock;
+    for (const descendant of this.removedDescendants) {
+      page.blocks[descendant.id] = descendant;
+    }
 
     if (this.originalParentId) {
       const parent = page.blocks[this.originalParentId];
@@ -96,4 +105,17 @@ export class RemoveBlockCommand implements Command {
   getRemovedBlock(): Block | undefined {
     return this.removedBlock;
   }
+
+  private collectDescendants(page: Page, block: Block): Block[] {
+    const descendants: Block[] = [];
+
+    for (const childId of block.children) {
+      const child = page.blocks[childId];
+      if (child) {
+        descendants.push(child, ...this.collectDescendants(page, child));
+      }
+    }
+
+    return descendants;
+  }
 }