@craftile/editor 1.1.1 → 1.1.2

package/dist/index.js

@@ -12,10 +12,12 @@ const ao = () => crypto.randomUUID ? crypto.randomUUID() : Date.now().toString(3
     return { kind: "parent", parent: i, index: c };
   }
   const r = ti(e, o), s = e.regions.find((i) => ne(i) === r);
+  if (!s)
+    throw new Error(`Region not found: ${r}`);
   return {
     kind: "region",
     regionId: r,
-    index: gn(s?.blocks.length ?? 0, n)
+    index: gn(s.blocks.length, n)
   };
 }, At = (e, t, o) => {
   if (o > 0 && o < e.length) {
@@ -247,26 +249,23 @@ class Ya {
   blockSchema;
   insertedBlock;
   actualIndex;
+  resolvedRegionId;
   emit;
   constructor(t, o) {
     this.page = t, this.blockType = o.blockType, this.parentId = o.parentId, this.regionId = o.regionId, this.index = o.index, this.blockId = ao(), this.emit = o.emit, this.blockSchema = o.blockSchema, this.properties = this.buildProperties(o.blockSchema);
   }
   apply() {
-    const t = oi(this.page, this.parentId, this.regionId, this.index), o = this.blockSchema?.meta?.name || this.blockType;
-    if (this.insertedBlock = {
+    const t = oi(this.page, this.parentId, this.regionId, this.index);
+    this.resolvedRegionId = t.kind === "region" ? t.regionId : void 0;
+    const o = this.blockSchema?.meta?.name || this.blockType;
+    this.insertedBlock = {
       type: this.blockType,
       id: this.blockId,
       name: o,
       properties: this.properties,
       children: [],
       parentId: void 0
-    }, this.page.blocks[this.blockId] = this.insertedBlock, this.actualIndex = t.index, t.kind === "parent")
-      this.insertedBlock.parentId = t.parent.id, t.parent.children.splice(t.index, 0, this.blockId);
-    else {
-      let n = this.page.regions.find((r) => ne(r) === t.regionId);
-      n || (n = { id: t.regionId, name: t.regionId, blocks: [] }, this.page.regions.push(n)), n.blocks.splice(t.index, 0, this.blockId);
-    }
-    this.emit("block:insert", {
+    }, this.page.blocks[this.blockId] = this.insertedBlock, this.actualIndex = t.index, t.kind === "parent" ? (this.insertedBlock.parentId = t.parent.id, t.parent.children.splice(t.index, 0, this.blockId)) : this.page.regions.find((r) => ne(r) === t.regionId).blocks.splice(t.index, 0, this.blockId), this.emit("block:insert", {
       blockId: this.blockId,
       block: this.insertedBlock,
       parentId: this.parentId,
@@ -279,14 +278,15 @@ class Ya {
       if (delete this.page.blocks[this.blockId], this.parentId) {
         const t = this.page.blocks[this.parentId];
         t && this.actualIndex !== void 0 && t.children.splice(this.actualIndex, 1);
-      } else {
-        const t = this.regionId || ne(this.page.regions[0]), o = this.page.regions.find((n) => ne(n) === t);
-        o && this.actualIndex !== void 0 && o.blocks.splice(this.actualIndex, 1);
+      } else if (this.resolvedRegionId) {
+        const t = this.page.regions.find((o) => ne(o) === this.resolvedRegionId);
+        t && this.actualIndex !== void 0 && t.blocks.splice(this.actualIndex, 1);
       }
       this.emit("block:remove", {
         blockId: this.blockId,
         block: this.insertedBlock,
-        parentId: this.parentId
+        parentId: this.parentId,
+        regionId: this.resolvedRegionId
       });
     }
   }
@@ -316,6 +316,7 @@ class Zr {
   properties;
   insertedBlock;
   actualIndex;
+  resolvedRegionId;
   blocksManager;
   emit;
   createdBlockIds = [];
@@ -337,7 +338,9 @@ class Zr {
     this.properties = this.buildProperties(n, r);
   }
   apply() {
-    const t = oi(this.page, this.parentId, this.regionId, this.index), o = this.blocksManager.get(this.blockType);
+    const t = oi(this.page, this.parentId, this.regionId, this.index);
+    this.resolvedRegionId = t.kind === "region" ? t.regionId : void 0;
+    const o = this.blocksManager.get(this.blockType);
     if (this.presetData)
       this.insertedBlock = {
         type: this.blockType,
@@ -367,13 +370,7 @@ class Zr {
     }
     if (!this.insertedBlock)
       throw new Error("Failed to create block");
-    if (this.actualIndex = t.index, t.kind === "parent")
-      this.insertedBlock.parentId = t.parent.id, t.parent.children.splice(t.index, 0, this.blockId);
-    else {
-      let n = this.page.regions.find((r) => ne(r) === t.regionId);
-      n || (n = { id: t.regionId, name: t.regionId, blocks: [] }, this.page.regions.push(n)), n.blocks.splice(t.index, 0, this.blockId);
-    }
-    this.emit("block:insert", {
+    this.actualIndex = t.index, t.kind === "parent" ? (this.insertedBlock.parentId = t.parent.id, t.parent.children.splice(t.index, 0, this.blockId)) : this.page.regions.find((r) => ne(r) === t.regionId).blocks.splice(t.index, 0, this.blockId), this.emit("block:insert", {
       blockId: this.blockId,
       block: this.insertedBlock,
       parentId: this.parentId,
@@ -388,14 +385,15 @@ class Zr {
       if (this.parentId) {
         const t = this.page.blocks[this.parentId];
         t && this.actualIndex !== void 0 && t.children.splice(this.actualIndex, 1);
-      } else {
-        const t = this.regionId || ne(this.page.regions[0]), o = this.page.regions.find((n) => ne(n) === t);
-        o && this.actualIndex !== void 0 && o.blocks.splice(this.actualIndex, 1);
+      } else if (this.resolvedRegionId) {
+        const t = this.page.regions.find((o) => ne(o) === this.resolvedRegionId);
+        t && this.actualIndex !== void 0 && t.blocks.splice(this.actualIndex, 1);
       }
       this.emit("block:remove", {
         blockId: this.blockId,
         block: this.insertedBlock,
-        parentId: this.parentId
+        parentId: this.parentId,
+        regionId: this.resolvedRegionId
       });
     }
   }
@@ -462,7 +460,8 @@ class Ja {
     delete this.page.blocks[this.blockId], this.emit("block:remove", {
       blockId: this.blockId,
       block: this.removedBlock,
-      parentId: this.originalParentId
+      parentId: this.originalParentId,
+      regionId: this.regionId
     });
   }
   revert() {
@@ -514,18 +513,11 @@ class Qa {
       const o = this.page.regions.find((n) => ne(n) === this.originalRegionId);
       o && this.originalIndex !== -1 && o.blocks.splice(this.originalIndex, 1);
     }
-    if (t.kind === "parent")
-      this.blockToMove.parentId = t.parent.id, t.parent.children.splice(t.index, 0, this.blockId);
-    else {
-      this.blockToMove.parentId = void 0;
-      let o = this.page.regions.find((n) => ne(n) === t.regionId);
-      o || (o = { id: t.regionId, name: t.regionId, blocks: [] }, this.page.regions.push(o)), o.blocks.splice(t.index, 0, this.blockId);
-    }
-    this.emit("block:move", {
+    t.kind === "parent" ? (this.blockToMove.parentId = t.parent.id, t.parent.children.splice(t.index, 0, this.blockId)) : (this.blockToMove.parentId = void 0, this.page.regions.find((n) => ne(n) === t.regionId).blocks.splice(t.index, 0, this.blockId)), this.emit("block:move", {
       blockId: this.blockId,
       targetParentId: this.targetParentId,
       targetIndex: this.targetIndex,
-      targetRegionId: this.targetRegionId,
+      targetRegionId: t.kind === "region" ? t.regionId : void 0,
       sourceParentId: this.originalParentId || null,
       sourceRegionId: this.originalRegionId || null,
       sourceIndex: this.originalIndex
@@ -558,7 +550,10 @@ class Qa {
         );
       return { kind: "parent", parent: s, index: l };
     }
-    const t = ti(this.page, this.targetRegionId), o = this.page.regions.find((s) => ne(s) === t), n = this.originalRegionId === t, r = o ? n ? o.blocks.filter((s) => s !== this.blockId) : o.blocks : [];
+    const t = ti(this.page, this.targetRegionId), o = this.page.regions.find((s) => ne(s) === t);
+    if (!o)
+      throw new Error(`Region not found: ${t}`);
+    const r = this.originalRegionId === t ? o.blocks.filter((s) => s !== this.blockId) : o.blocks;
     return { kind: "region", regionId: t, index: gn(r.length, this.targetIndex) };
   }
   revert() {
@@ -760,8 +755,6 @@ class tl {
   }
   determineInsertLocation() {
     const t = this.page.blocks[this.blockId];
-    if (!t)
-      throw new Error(`Block not found: ${this.blockId}`);
     if (this.parentId = t.parentId || null, this.parentId) {
       const o = this.page.blocks[this.parentId];
       if (o) {
@@ -786,7 +779,7 @@ class tl {
           throw new Error(`Parent block not found: ${this.parentId}`);
         t.children.splice(this.insertIndex, 0, this.duplicatedBlockId);
       } else {
-        let t = this.page.regions.find((o) => o.name === this.regionId);
+        let t = this.page.regions.find((o) => ne(o) === this.regionId);
         t || (t = { name: this.regionId || "main", blocks: [] }, this.page.regions.push(t)), t.blocks.splice(this.insertIndex, 0, this.duplicatedBlockId);
       }
   }
@@ -799,7 +792,7 @@ class tl {
           o !== -1 && t.children.splice(o, 1);
         }
       } else if (this.page.regions) {
-        const t = this.page.regions.find((o) => o.name === this.regionId);
+        const t = this.page.regions.find((o) => ne(o) === this.regionId);
         if (t) {
           const o = t.blocks.indexOf(this.duplicatedBlockId);
           o !== -1 && t.blocks.splice(o, 1);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@craftile/editor",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "description": "Vue.js-based editor UI components for craftile blocks engine",
   "keywords": [
     "craftile",
@@ -38,10 +38,10 @@
   "dependencies": {
     "vue": "^3.5.17",
     "vue-draggable-plus": "^0.6.0",
-    "@craftile/core": "1.1.1",
-    "@craftile/event-bus": "1.1.1",
-    "@craftile/messenger": "1.1.1",
-    "@craftile/types": "1.1.1"
+    "@craftile/core": "1.1.2",
+    "@craftile/event-bus": "1.1.2",
+    "@craftile/messenger": "1.1.2",
+    "@craftile/types": "1.1.2"
   },
   "devDependencies": {
     "@ark-ui/vue": "^5.24.1",