microboard-temp 0.13.12 → 0.13.14

package/dist/cjs/browser.js

@@ -4993,6 +4993,13 @@ class BoardCommand {
           item: [operation.item]
         };
       }
+      case "addGroup": {
+        return {
+          class: "Board",
+          method: "removeGroup",
+          item: [operation.item]
+        };
+      }
       case "removeLockedGroup": {
         const items = this.board.items;
         const reverse = [];
@@ -5010,6 +5017,23 @@ class BoardCommand {
         }
         return reverse;
       }
+      case "removeGroup": {
+        const items = this.board.items;
+        const reverse = [];
+        for (const itemId of operation.item) {
+          const item = items.getById(itemId);
+          if (!item || item.itemType !== "Group") {
+            throw new Error("Get reverse board operation. Item not found");
+          }
+          reverse.push({
+            class: "Board",
+            method: "addGroup",
+            item: itemId,
+            data: item.serialize()
+          });
+        }
+        return reverse;
+      }
       case "duplicate":
       case "paste": {
         const item = [];
@@ -19533,7 +19557,7 @@ class GroupCommand {
           const operation = {
             ...this.operation,
             method: "removeChild",
-            childId: group2.getId()
+            childId: this.operation.childId
           };
           return {
             item: group2,
@@ -19547,7 +19571,33 @@ class GroupCommand {
           const operation = {
             ...this.operation,
             method: "addChild",
-            childId: group2.getId()
+            childId: this.operation.childId
+          };
+          return {
+            item: group2,
+            operation
+          };
+        });
+      }
+      case "addChildren": {
+        const groups = Array.isArray(group) ? group : [group];
+        return groups.map((group2) => {
+          const operation = {
+            ...this.operation,
+            method: "removeChildren"
+          };
+          return {
+            item: group2,
+            operation
+          };
+        });
+      }
+      case "removeChildren": {
+        const groups = Array.isArray(group) ? group : [group];
+        return groups.map((group2) => {
+          const operation = {
+            ...this.operation,
+            method: "addChildren"
           };
           return {
             item: group2,
@@ -43587,6 +43637,7 @@ class Group extends BaseItem {
   transformation;
   subject = new Subject;
   transformationRenderBlock = undefined;
+  isLockedGroup = false;
   constructor(board, events, children = [], id = "") {
     super(board, id, undefined, true);
     this.events = events;
@@ -43607,21 +43658,15 @@ class Group extends BaseItem {
     return null;
   }
   apply(op) {
+    super.apply(op);
     switch (op.class) {
       case "Group":
         if (op.method === "addChild") {
           this.applyAddChildren([op.childId]);
         } else if (op.method === "removeChild") {
           this.applyRemoveChildren([op.childId]);
-        } else if (op.method === "addChildren") {
-          this.applyAddChildren(op.newData.childIds);
-        } else if (op.method === "removeChildren") {
-          this.applyRemoveChildren(op.newData.childIds);
         }
         break;
-      case "Transformation":
-        super.apply(op);
-        break;
       default:
         return;
     }
@@ -43654,10 +43699,10 @@ class Group extends BaseItem {
     for (const child of children) {
       const childLocalMbr = child.getMbr();
       const corners = [
-        { x: childLocalMbr.left, y: childLocalMbr.top },
-        { x: childLocalMbr.right, y: childLocalMbr.top },
-        { x: childLocalMbr.right, y: childLocalMbr.bottom },
-        { x: childLocalMbr.left, y: childLocalMbr.bottom }
+        new Point(childLocalMbr.left, childLocalMbr.top),
+        new Point(childLocalMbr.right, childLocalMbr.top),
+        new Point(childLocalMbr.right, childLocalMbr.bottom),
+        new Point(childLocalMbr.left, childLocalMbr.bottom)
       ];
       for (const corner of corners) {
         groupWorldMatrix.apply(corner);
@@ -43694,7 +43739,8 @@ class Group extends BaseItem {
     return {
       itemType: "Group",
       children: this.getChildrenIds(),
-      transformation: this.transformation.serialize()
+      transformation: this.transformation.serialize(),
+      isLockedGroup: this.isLockedGroup
     };
   }
   deserialize(data) {
@@ -43704,6 +43750,9 @@ class Group extends BaseItem {
     if (data.children && data.children.length > 0) {
       this.applyAddChildren(data.children);
     }
+    if (data.isLockedGroup !== undefined) {
+      this.isLockedGroup = data.isLockedGroup;
+    }
     this.subject.publish(this);
     return this;
   }
@@ -43842,7 +43891,7 @@ function createGroup(id, data, board) {
   if (!isGroupData(data)) {
     throw new Error("Invalid data for Group");
   }
-  const group = new Group(board, board.events, data.children, "").setId(id).deserialize(data);
+  const group = new Group(board, board.events, data.children, id).setId(id).deserialize(data);
   return group;
 }
 function isStickerData(data) {
@@ -54655,12 +54704,17 @@ class Board {
         return this.applyAddItems(op);
       case "addLockedGroup":
         return this.applyAddLockedGroupOperation(op);
+      case "addGroup":
+        return this.applyAddGroupOperation(op);
       case "remove": {
         return this.applyRemoveOperation(op);
       }
       case "removeLockedGroup": {
         return this.applyRemoveLockedGroupOperation(op);
       }
+      case "removeGroup": {
+        return this.applyRemoveGroupOperation(op);
+      }
       case "paste": {
         return this.applyPasteOperation(op.itemsMap);
       }
@@ -54698,11 +54752,23 @@ class Board {
       const zIndex = this.index.getZIndex(lastChildrenId) + 1;
       this.index.moveToZIndex(item, zIndex);
     }
+    item.isLockedGroup = true;
     item.getChildren().forEach((item2) => {
       item2.transformation.isLocked = true;
     });
     item.transformation.isLocked = true;
   }
+  applyAddGroupOperation(op) {
+    const item = this.createItem(op.item, op.data);
+    const groupChildrenIds = item.getChildrenIds();
+    this.index.insert(item);
+    const lastChildrenId = this.index.getById(groupChildrenIds[groupChildrenIds.length - 1]);
+    if (lastChildrenId) {
+      const zIndex = this.index.getZIndex(lastChildrenId) + 1;
+      this.index.moveToZIndex(item, zIndex);
+    }
+    item.isLockedGroup = false;
+  }
   applyRemoveOperation(op) {
     const removedItems = [];
     this.findItemAndApply(op.item, (item) => {
@@ -54731,6 +54797,21 @@ class Board {
       removedItems.push(item2);
     });
   }
+  applyRemoveGroupOperation(op) {
+    const item = this.index.getById(op.item[0]);
+    if (!item || !(item instanceof Group)) {
+      return;
+    }
+    item.getChildren().forEach((item2) => {
+      item2.parent = "Board";
+    });
+    const removedItems = [];
+    this.findItemAndApply(op.item, (item2) => {
+      this.index.remove(item2);
+      this.selection.remove(item2);
+      removedItems.push(item2);
+    });
+  }
   applyItemOperation(op) {
     if ("item" in op) {
       this.findItemAndApply(op.item, (item) => {
@@ -54805,20 +54886,21 @@ class Board {
     this.handleNesting(newItem);
     return newItem;
   }
-  addLockedGroup(item) {
+  addLockedGroup(items) {
     const id = this.getNewItemId();
+    const groupData = {
+      itemType: "Group",
+      children: items.map((i) => i.getId()),
+      transformation: { translateX: 0, translateY: 0, scaleX: 1, scaleY: 1, rotate: 0, isLocked: false },
+      isLockedGroup: true
+    };
     this.emit({
       class: "Board",
       method: "addLockedGroup",
       item: id,
-      data: item.serialize()
+      data: groupData
     });
-    const newItem = this.items.getById(id);
-    if (!newItem) {
-      throw new Error(`Add item. Item ${id} was not created.`);
-    }
-    this.handleNesting(newItem);
-    return newItem;
+    return this.items.getById(id);
   }
   remove(item, withConnectors = true) {
     let connectors = [];
@@ -54846,11 +54928,12 @@ class Board {
     const groupData = {
       itemType: "Group",
       children: items.map((i) => i.getId()),
-      transformation: { translateX: 0, translateY: 0, scaleX: 1, scaleY: 1, shearX: 0, shearY: 0 }
+      transformation: { translateX: 0, translateY: 0, scaleX: 1, scaleY: 1, rotate: 0, isLocked: false },
+      isLockedGroup: false
     };
     this.emit({
       class: "Board",
-      method: "addLockedGroup",
+      method: "addGroup",
       item: id,
       data: groupData
     });
@@ -54859,7 +54942,7 @@ class Board {
   ungroup(group) {
     this.emit({
       class: "Board",
-      method: "removeLockedGroup",
+      method: "removeGroup",
       item: [group.getId()]
     });
   }

package/dist/cjs/index.js

@@ -4993,6 +4993,13 @@ class BoardCommand {
           item: [operation.item]
         };
       }
+      case "addGroup": {
+        return {
+          class: "Board",
+          method: "removeGroup",
+          item: [operation.item]
+        };
+      }
       case "removeLockedGroup": {
         const items = this.board.items;
         const reverse = [];
@@ -5010,6 +5017,23 @@ class BoardCommand {
         }
         return reverse;
       }
+      case "removeGroup": {
+        const items = this.board.items;
+        const reverse = [];
+        for (const itemId of operation.item) {
+          const item = items.getById(itemId);
+          if (!item || item.itemType !== "Group") {
+            throw new Error("Get reverse board operation. Item not found");
+          }
+          reverse.push({
+            class: "Board",
+            method: "addGroup",
+            item: itemId,
+            data: item.serialize()
+          });
+        }
+        return reverse;
+      }
       case "duplicate":
       case "paste": {
         const item = [];
@@ -19533,7 +19557,7 @@ class GroupCommand {
           const operation = {
             ...this.operation,
             method: "removeChild",
-            childId: group2.getId()
+            childId: this.operation.childId
           };
           return {
             item: group2,
@@ -19547,7 +19571,33 @@ class GroupCommand {
           const operation = {
             ...this.operation,
             method: "addChild",
-            childId: group2.getId()
+            childId: this.operation.childId
+          };
+          return {
+            item: group2,
+            operation
+          };
+        });
+      }
+      case "addChildren": {
+        const groups = Array.isArray(group) ? group : [group];
+        return groups.map((group2) => {
+          const operation = {
+            ...this.operation,
+            method: "removeChildren"
+          };
+          return {
+            item: group2,
+            operation
+          };
+        });
+      }
+      case "removeChildren": {
+        const groups = Array.isArray(group) ? group : [group];
+        return groups.map((group2) => {
+          const operation = {
+            ...this.operation,
+            method: "addChildren"
           };
           return {
             item: group2,
@@ -43587,6 +43637,7 @@ class Group extends BaseItem {
   transformation;
   subject = new Subject;
   transformationRenderBlock = undefined;
+  isLockedGroup = false;
   constructor(board, events, children = [], id = "") {
     super(board, id, undefined, true);
     this.events = events;
@@ -43607,21 +43658,15 @@ class Group extends BaseItem {
     return null;
   }
   apply(op) {
+    super.apply(op);
     switch (op.class) {
       case "Group":
         if (op.method === "addChild") {
           this.applyAddChildren([op.childId]);
         } else if (op.method === "removeChild") {
           this.applyRemoveChildren([op.childId]);
-        } else if (op.method === "addChildren") {
-          this.applyAddChildren(op.newData.childIds);
-        } else if (op.method === "removeChildren") {
-          this.applyRemoveChildren(op.newData.childIds);
         }
         break;
-      case "Transformation":
-        super.apply(op);
-        break;
       default:
         return;
     }
@@ -43654,10 +43699,10 @@ class Group extends BaseItem {
     for (const child of children) {
       const childLocalMbr = child.getMbr();
       const corners = [
-        { x: childLocalMbr.left, y: childLocalMbr.top },
-        { x: childLocalMbr.right, y: childLocalMbr.top },
-        { x: childLocalMbr.right, y: childLocalMbr.bottom },
-        { x: childLocalMbr.left, y: childLocalMbr.bottom }
+        new Point(childLocalMbr.left, childLocalMbr.top),
+        new Point(childLocalMbr.right, childLocalMbr.top),
+        new Point(childLocalMbr.right, childLocalMbr.bottom),
+        new Point(childLocalMbr.left, childLocalMbr.bottom)
       ];
       for (const corner of corners) {
         groupWorldMatrix.apply(corner);
@@ -43694,7 +43739,8 @@ class Group extends BaseItem {
     return {
       itemType: "Group",
       children: this.getChildrenIds(),
-      transformation: this.transformation.serialize()
+      transformation: this.transformation.serialize(),
+      isLockedGroup: this.isLockedGroup
     };
   }
   deserialize(data) {
@@ -43704,6 +43750,9 @@ class Group extends BaseItem {
     if (data.children && data.children.length > 0) {
       this.applyAddChildren(data.children);
     }
+    if (data.isLockedGroup !== undefined) {
+      this.isLockedGroup = data.isLockedGroup;
+    }
     this.subject.publish(this);
     return this;
   }
@@ -43842,7 +43891,7 @@ function createGroup(id, data, board) {
   if (!isGroupData(data)) {
     throw new Error("Invalid data for Group");
   }
-  const group = new Group(board, board.events, data.children, "").setId(id).deserialize(data);
+  const group = new Group(board, board.events, data.children, id).setId(id).deserialize(data);
   return group;
 }
 function isStickerData(data) {
@@ -54655,12 +54704,17 @@ class Board {
         return this.applyAddItems(op);
       case "addLockedGroup":
         return this.applyAddLockedGroupOperation(op);
+      case "addGroup":
+        return this.applyAddGroupOperation(op);
       case "remove": {
         return this.applyRemoveOperation(op);
       }
       case "removeLockedGroup": {
         return this.applyRemoveLockedGroupOperation(op);
       }
+      case "removeGroup": {
+        return this.applyRemoveGroupOperation(op);
+      }
       case "paste": {
         return this.applyPasteOperation(op.itemsMap);
       }
@@ -54698,11 +54752,23 @@ class Board {
       const zIndex = this.index.getZIndex(lastChildrenId) + 1;
       this.index.moveToZIndex(item, zIndex);
     }
+    item.isLockedGroup = true;
     item.getChildren().forEach((item2) => {
       item2.transformation.isLocked = true;
     });
     item.transformation.isLocked = true;
   }
+  applyAddGroupOperation(op) {
+    const item = this.createItem(op.item, op.data);
+    const groupChildrenIds = item.getChildrenIds();
+    this.index.insert(item);
+    const lastChildrenId = this.index.getById(groupChildrenIds[groupChildrenIds.length - 1]);
+    if (lastChildrenId) {
+      const zIndex = this.index.getZIndex(lastChildrenId) + 1;
+      this.index.moveToZIndex(item, zIndex);
+    }
+    item.isLockedGroup = false;
+  }
   applyRemoveOperation(op) {
     const removedItems = [];
     this.findItemAndApply(op.item, (item) => {
@@ -54731,6 +54797,21 @@ class Board {
       removedItems.push(item2);
     });
   }
+  applyRemoveGroupOperation(op) {
+    const item = this.index.getById(op.item[0]);
+    if (!item || !(item instanceof Group)) {
+      return;
+    }
+    item.getChildren().forEach((item2) => {
+      item2.parent = "Board";
+    });
+    const removedItems = [];
+    this.findItemAndApply(op.item, (item2) => {
+      this.index.remove(item2);
+      this.selection.remove(item2);
+      removedItems.push(item2);
+    });
+  }
   applyItemOperation(op) {
     if ("item" in op) {
       this.findItemAndApply(op.item, (item) => {
@@ -54805,20 +54886,21 @@ class Board {
     this.handleNesting(newItem);
     return newItem;
   }
-  addLockedGroup(item) {
+  addLockedGroup(items) {
     const id = this.getNewItemId();
+    const groupData = {
+      itemType: "Group",
+      children: items.map((i) => i.getId()),
+      transformation: { translateX: 0, translateY: 0, scaleX: 1, scaleY: 1, rotate: 0, isLocked: false },
+      isLockedGroup: true
+    };
     this.emit({
       class: "Board",
       method: "addLockedGroup",
       item: id,
-      data: item.serialize()
+      data: groupData
     });
-    const newItem = this.items.getById(id);
-    if (!newItem) {
-      throw new Error(`Add item. Item ${id} was not created.`);
-    }
-    this.handleNesting(newItem);
-    return newItem;
+    return this.items.getById(id);
   }
   remove(item, withConnectors = true) {
     let connectors = [];
@@ -54846,11 +54928,12 @@ class Board {
     const groupData = {
       itemType: "Group",
       children: items.map((i) => i.getId()),
-      transformation: { translateX: 0, translateY: 0, scaleX: 1, scaleY: 1, shearX: 0, shearY: 0 }
+      transformation: { translateX: 0, translateY: 0, scaleX: 1, scaleY: 1, rotate: 0, isLocked: false },
+      isLockedGroup: false
     };
     this.emit({
       class: "Board",
-      method: "addLockedGroup",
+      method: "addGroup",
       item: id,
       data: groupData
     });
@@ -54859,7 +54942,7 @@ class Board {
   ungroup(group) {
     this.emit({
       class: "Board",
-      method: "removeLockedGroup",
+      method: "removeGroup",
       item: [group.getId()]
     });
   }