microboard-temp 0.13.37 → 0.13.40

package/dist/cjs/browser.js

@@ -21073,8 +21073,8 @@ class SpatialIndex {
     }
     this.subject.publish(this.items);
   };
-  remove(item) {
-    if ("index" in item && item.index) {
+  remove(item, preserveChildren = false) {
+    if (!preserveChildren && "index" in item && item.index) {
       item.removeChildItems(item.index.list());
     }
     this.itemsArray.splice(this.itemsArray.indexOf(item), 1);
@@ -21314,6 +21314,9 @@ class SpatialIndex {
           return false;
         }
       }
+      if (item.itemType === "Group") {
+        return false;
+      }
       return true;
     });
     return [...clearItems, ...children];
@@ -21635,8 +21638,8 @@ class SimpleSpatialIndex {
     }
     this.subject.publish(this.items);
   };
-  remove(item) {
-    if ("index" in item && item.index) {
+  remove(item, preserveChildren = false) {
+    if (!preserveChildren && "index" in item && item.index) {
       item.removeChildItems(item.index.list());
     }
     this.itemsArray.splice(this.itemsArray.indexOf(item), 1);
@@ -22019,7 +22022,7 @@ class BaseItem extends Mbr {
       if (this.parent !== childId && this.getId() !== childId && !this.hasAncestor(childId)) {
         if (!this.index?.getById(childId) && foundItem) {
           const localMatrix = foundItem.transformation.toMatrix().toLocalOf(containerNestingMatrix);
-          this.board.items.index.remove(foundItem);
+          this.board.items.index.remove(foundItem, true);
           foundItem.parent = this.getId();
           foundItem.onParentChanged(this.getId());
           foundItem.transformation.setLocalMatrix(localMatrix);
@@ -22041,7 +22044,7 @@ class BaseItem extends Mbr {
       if (this.parent !== childId && this.getId() !== childId) {
         if (foundItem) {
           const worldMatrix = foundItem.transformation.toMatrix().composeWith(containerNestingMatrix);
-          this.index?.remove(foundItem);
+          this.index?.remove(foundItem, true);
           foundItem.parent = "Board";
           foundItem.onParentChanged("Board");
           foundItem.transformation.setLocalMatrix(worldMatrix);
@@ -48159,8 +48162,8 @@ class Tools extends ToolContext {
     const zoomOffset = 25;
     this.board.camera.zoomToFit(frameMbr, zoomOffset, 0);
     this.board.selection.removeAll();
-    this.board.selection.items.removeAll();
-    this.board.selection.items.add(frames[newFrameIndex]);
+    this.board.selection.add(frames[newFrameIndex]);
+    this.board.selection.setContext("SelectUnderPointer");
     localStorage.setItem(`lastVisitedFrame`, frames[newFrameIndex].getId());
     this.publish();
   }
@@ -49310,9 +49313,9 @@ function createDeck(event, board) {
     const deck = new Deck(board, "");
     deck.transformation.setLocal(cardsOrDecks[cardsOrDecks.length - 1].left, cardsOrDecks[cardsOrDecks.length - 1].top);
     const addedDeck = board.add(deck);
-    board.selection.items.removeAll();
+    board.selection.removeAll();
     addedDeck.addChildItems(cardsOrDecks);
-    board.selection.items.add(addedDeck);
+    board.selection.add(addedDeck);
   } else {
     let mainDeck = null;
     const cards = [];
@@ -49329,9 +49332,9 @@ function createDeck(event, board) {
         }
       }
     });
-    board.selection.items.removeAll();
+    board.selection.removeAll();
     mainDeck.addChildItems(cards);
-    board.selection.items.add(mainDeck);
+    board.selection.add(mainDeck);
   }
 }
 registerHotkey({
@@ -53401,7 +53404,7 @@ class BoardSelection {
     selectedItems.forEach((itemId) => {
       const item = this.board.items.getById(itemId);
       if (item) {
-        this.items.add(item);
+        this.add(item);
       }
     });
   }
@@ -53488,13 +53491,22 @@ class BoardSelection {
   };
   decoratedItemObserver = this.decorateObserverToScheduleUpdate(this.itemObserver);
   add(value) {
-    this.items.add(value);
-    if (Array.isArray(value)) {
-      for (const item of value) {
-        item.subject.subscribe(this.itemObserver);
-      }
-    } else {
-      value.subject.subscribe(this.itemObserver);
+    const values2 = Array.isArray(value) ? value : [value];
+    const nextItems = this.normalizeSelectionItems([
+      ...this.items.list(),
+      ...values2
+    ]);
+    const currentIds = new Set(this.items.ids());
+    const nextIds = new Set(nextItems.map((item) => item.getId()));
+    const removed = this.items.list().filter((item) => !nextIds.has(item.getId()));
+    const added = nextItems.filter((item) => !currentIds.has(item.getId()));
+    if (removed.length > 0) {
+      this.items.remove(removed);
+      removed.forEach((item) => item.subject.unsubscribe(this.itemObserver));
+    }
+    if (added.length > 0) {
+      this.items.add(added);
+      added.forEach((item) => item.subject.subscribe(this.itemObserver));
     }
     this.subject.publish(this);
     this.itemsSubject.publish([]);
@@ -53574,15 +53586,54 @@ class BoardSelection {
     if (!item) {
       return null;
     }
-    if (!(item instanceof BaseItem) || item.parent === "Board") {
-      return item;
-    }
-    const parent = this.board.items.getById(item.parent);
-    if (parent instanceof Group) {
-      return parent;
+    if (item instanceof Group) {
+      return null;
     }
     return item;
   }
+  getParentItem(item) {
+    const resolved = typeof item === "string" ? this.board.items.getById(item) : item || null;
+    if (!resolved || !(resolved instanceof BaseItem) || resolved.parent === "Board") {
+      return null;
+    }
+    return this.board.items.getById(resolved.parent) || null;
+  }
+  isAncestor(candidate, descendant) {
+    if (!(descendant instanceof BaseItem)) {
+      return false;
+    }
+    let parentId = descendant.parent;
+    while (parentId && parentId !== "Board") {
+      if (parentId === candidate.getId()) {
+        return true;
+      }
+      const parent = this.board.items.getById(parentId);
+      if (!parent || parent.parent === parentId) {
+        return false;
+      }
+      parentId = parent.parent;
+    }
+    return false;
+  }
+  normalizeSelectionItems(items) {
+    const normalized = [];
+    for (const item of items) {
+      const alreadyCovered = normalized.some((selected) => selected.getId() === item.getId() || this.isAncestor(selected, item));
+      if (alreadyCovered) {
+        continue;
+      }
+      for (let i = normalized.length - 1;i >= 0; i -= 1) {
+        if (this.isAncestor(item, normalized[i])) {
+          normalized.splice(i, 1);
+        }
+      }
+      normalized.push(item);
+    }
+    return normalized;
+  }
+  getCanvasSelectableItems(items) {
+    return items.filter((item) => !(item instanceof Group));
+  }
   selectUnderPointer() {
     this.removeAll();
     const stack = this.board.items.getUnderPointer();
@@ -53720,7 +53771,7 @@ class BoardSelection {
   }
   selectEnclosedBy(rect) {
     this.removeAll();
-    const list6 = this.board.items.getEnclosed(rect.left, rect.top, rect.right, rect.bottom);
+    const list6 = this.getCanvasSelectableItems(this.board.items.getEnclosed(rect.left, rect.top, rect.right, rect.bottom));
     if (list6.length !== 0) {
       this.add(list6);
       this.setContext("SelectByRect");
@@ -53731,7 +53782,7 @@ class BoardSelection {
   selectEnclosedOrCrossedBy(rect) {
     this.removeAll();
     const enclosedFrames = this.board.items.getEnclosed(rect.left, rect.top, rect.right, rect.bottom).filter((item) => !item.transformation.isLocked);
-    const list6 = this.board.items.getEnclosedOrCrossed(rect.left, rect.top, rect.right, rect.bottom).filter((item) => (!(item instanceof Frame2) || enclosedFrames.includes(item)) && !item.transformation.isLocked);
+    const list6 = this.getCanvasSelectableItems(this.board.items.getEnclosedOrCrossed(rect.left, rect.top, rect.right, rect.bottom).filter((item) => (!(item instanceof Frame2) || enclosedFrames.includes(item)) && !item.transformation.isLocked));
     if (list6.length !== 0) {
       this.add(list6);
       this.setContext("SelectByRect");
@@ -53930,6 +53981,79 @@ class BoardSelection {
     }
     return this.textToEdit;
   }
+  getParent(item) {
+    return this.getParentItem(item);
+  }
+  getParentChain(item) {
+    const chain = [];
+    let parent = this.getParentItem(item);
+    while (parent) {
+      chain.push(parent);
+      parent = this.getParentItem(parent);
+    }
+    return chain;
+  }
+  getHierarchyPath(item) {
+    const resolved = typeof item === "string" ? this.board.items.getById(item) : item || null;
+    if (!resolved) {
+      return [];
+    }
+    const nodes = [...this.getParentChain(resolved).reverse(), resolved];
+    return nodes.filter((node2) => node2 instanceof BaseItem).map((node2) => ({
+      id: node2.getId(),
+      itemType: node2.itemType,
+      parentId: node2.parent === "Board" ? null : node2.parent,
+      hasChildren: (node2.getChildrenIds()?.length || 0) > 0,
+      isCanvasSelectable: !(node2 instanceof Group)
+    }));
+  }
+  getSelectionHierarchyPaths() {
+    return this.items.list().map((item) => this.getHierarchyPath(item));
+  }
+  getCommonParent() {
+    const selected = this.items.list();
+    if (selected.length === 0) {
+      return null;
+    }
+    const firstParent = this.getParentItem(selected[0]);
+    if (!firstParent) {
+      return null;
+    }
+    const firstParentId = firstParent.getId();
+    const hasSameParent = selected.every((item) => this.getParentItem(item)?.getId() === firstParentId);
+    return hasSameParent ? firstParent : null;
+  }
+  canPromoteSelectionToParent() {
+    return this.getCommonParent() !== null;
+  }
+  selectParent() {
+    const parent = this.getCommonParent();
+    if (!parent) {
+      return null;
+    }
+    this.removeAll();
+    this.add(parent);
+    this.setContext("SelectUnderPointer");
+    return parent;
+  }
+  selectAncestorById(ancestorId) {
+    const selected = this.items.list();
+    if (selected.length === 0) {
+      return null;
+    }
+    const ancestor = this.board.items.getById(ancestorId);
+    if (!(ancestor instanceof BaseItem)) {
+      return null;
+    }
+    const isSharedAncestor = selected.every((item) => item.getId() === ancestorId || this.isAncestor(ancestor, item));
+    if (!isSharedAncestor) {
+      return null;
+    }
+    this.removeAll();
+    this.add(ancestor);
+    this.setContext("SelectUnderPointer");
+    return ancestor;
+  }
   nestSelectedItems(unselectedItem, checkFrames = true) {
     const selected = this.board.selection.items.list();
     if (unselectedItem && !selected.find((item) => item.getId() === unselectedItem.getId())) {

package/dist/cjs/index.js

@@ -21073,8 +21073,8 @@ class SpatialIndex {
     }
     this.subject.publish(this.items);
   };
-  remove(item) {
-    if ("index" in item && item.index) {
+  remove(item, preserveChildren = false) {
+    if (!preserveChildren && "index" in item && item.index) {
       item.removeChildItems(item.index.list());
     }
     this.itemsArray.splice(this.itemsArray.indexOf(item), 1);
@@ -21314,6 +21314,9 @@ class SpatialIndex {
           return false;
         }
       }
+      if (item.itemType === "Group") {
+        return false;
+      }
       return true;
     });
     return [...clearItems, ...children];
@@ -21635,8 +21638,8 @@ class SimpleSpatialIndex {
     }
     this.subject.publish(this.items);
   };
-  remove(item) {
-    if ("index" in item && item.index) {
+  remove(item, preserveChildren = false) {
+    if (!preserveChildren && "index" in item && item.index) {
       item.removeChildItems(item.index.list());
     }
     this.itemsArray.splice(this.itemsArray.indexOf(item), 1);
@@ -22019,7 +22022,7 @@ class BaseItem extends Mbr {
       if (this.parent !== childId && this.getId() !== childId && !this.hasAncestor(childId)) {
         if (!this.index?.getById(childId) && foundItem) {
           const localMatrix = foundItem.transformation.toMatrix().toLocalOf(containerNestingMatrix);
-          this.board.items.index.remove(foundItem);
+          this.board.items.index.remove(foundItem, true);
           foundItem.parent = this.getId();
           foundItem.onParentChanged(this.getId());
           foundItem.transformation.setLocalMatrix(localMatrix);
@@ -22041,7 +22044,7 @@ class BaseItem extends Mbr {
       if (this.parent !== childId && this.getId() !== childId) {
         if (foundItem) {
           const worldMatrix = foundItem.transformation.toMatrix().composeWith(containerNestingMatrix);
-          this.index?.remove(foundItem);
+          this.index?.remove(foundItem, true);
           foundItem.parent = "Board";
           foundItem.onParentChanged("Board");
           foundItem.transformation.setLocalMatrix(worldMatrix);
@@ -48159,8 +48162,8 @@ class Tools extends ToolContext {
     const zoomOffset = 25;
     this.board.camera.zoomToFit(frameMbr, zoomOffset, 0);
     this.board.selection.removeAll();
-    this.board.selection.items.removeAll();
-    this.board.selection.items.add(frames[newFrameIndex]);
+    this.board.selection.add(frames[newFrameIndex]);
+    this.board.selection.setContext("SelectUnderPointer");
     localStorage.setItem(`lastVisitedFrame`, frames[newFrameIndex].getId());
     this.publish();
   }
@@ -49310,9 +49313,9 @@ function createDeck(event, board) {
     const deck = new Deck(board, "");
     deck.transformation.setLocal(cardsOrDecks[cardsOrDecks.length - 1].left, cardsOrDecks[cardsOrDecks.length - 1].top);
     const addedDeck = board.add(deck);
-    board.selection.items.removeAll();
+    board.selection.removeAll();
     addedDeck.addChildItems(cardsOrDecks);
-    board.selection.items.add(addedDeck);
+    board.selection.add(addedDeck);
   } else {
     let mainDeck = null;
     const cards = [];
@@ -49329,9 +49332,9 @@ function createDeck(event, board) {
         }
       }
     });
-    board.selection.items.removeAll();
+    board.selection.removeAll();
     mainDeck.addChildItems(cards);
-    board.selection.items.add(mainDeck);
+    board.selection.add(mainDeck);
   }
 }
 registerHotkey({
@@ -53401,7 +53404,7 @@ class BoardSelection {
     selectedItems.forEach((itemId) => {
       const item = this.board.items.getById(itemId);
       if (item) {
-        this.items.add(item);
+        this.add(item);
       }
     });
   }
@@ -53488,13 +53491,22 @@ class BoardSelection {
   };
   decoratedItemObserver = this.decorateObserverToScheduleUpdate(this.itemObserver);
   add(value) {
-    this.items.add(value);
-    if (Array.isArray(value)) {
-      for (const item of value) {
-        item.subject.subscribe(this.itemObserver);
-      }
-    } else {
-      value.subject.subscribe(this.itemObserver);
+    const values2 = Array.isArray(value) ? value : [value];
+    const nextItems = this.normalizeSelectionItems([
+      ...this.items.list(),
+      ...values2
+    ]);
+    const currentIds = new Set(this.items.ids());
+    const nextIds = new Set(nextItems.map((item) => item.getId()));
+    const removed = this.items.list().filter((item) => !nextIds.has(item.getId()));
+    const added = nextItems.filter((item) => !currentIds.has(item.getId()));
+    if (removed.length > 0) {
+      this.items.remove(removed);
+      removed.forEach((item) => item.subject.unsubscribe(this.itemObserver));
+    }
+    if (added.length > 0) {
+      this.items.add(added);
+      added.forEach((item) => item.subject.subscribe(this.itemObserver));
     }
     this.subject.publish(this);
     this.itemsSubject.publish([]);
@@ -53574,15 +53586,54 @@ class BoardSelection {
     if (!item) {
       return null;
     }
-    if (!(item instanceof BaseItem) || item.parent === "Board") {
-      return item;
-    }
-    const parent = this.board.items.getById(item.parent);
-    if (parent instanceof Group) {
-      return parent;
+    if (item instanceof Group) {
+      return null;
     }
     return item;
   }
+  getParentItem(item) {
+    const resolved = typeof item === "string" ? this.board.items.getById(item) : item || null;
+    if (!resolved || !(resolved instanceof BaseItem) || resolved.parent === "Board") {
+      return null;
+    }
+    return this.board.items.getById(resolved.parent) || null;
+  }
+  isAncestor(candidate, descendant) {
+    if (!(descendant instanceof BaseItem)) {
+      return false;
+    }
+    let parentId = descendant.parent;
+    while (parentId && parentId !== "Board") {
+      if (parentId === candidate.getId()) {
+        return true;
+      }
+      const parent = this.board.items.getById(parentId);
+      if (!parent || parent.parent === parentId) {
+        return false;
+      }
+      parentId = parent.parent;
+    }
+    return false;
+  }
+  normalizeSelectionItems(items) {
+    const normalized = [];
+    for (const item of items) {
+      const alreadyCovered = normalized.some((selected) => selected.getId() === item.getId() || this.isAncestor(selected, item));
+      if (alreadyCovered) {
+        continue;
+      }
+      for (let i = normalized.length - 1;i >= 0; i -= 1) {
+        if (this.isAncestor(item, normalized[i])) {
+          normalized.splice(i, 1);
+        }
+      }
+      normalized.push(item);
+    }
+    return normalized;
+  }
+  getCanvasSelectableItems(items) {
+    return items.filter((item) => !(item instanceof Group));
+  }
   selectUnderPointer() {
     this.removeAll();
     const stack = this.board.items.getUnderPointer();
@@ -53720,7 +53771,7 @@ class BoardSelection {
   }
   selectEnclosedBy(rect) {
     this.removeAll();
-    const list6 = this.board.items.getEnclosed(rect.left, rect.top, rect.right, rect.bottom);
+    const list6 = this.getCanvasSelectableItems(this.board.items.getEnclosed(rect.left, rect.top, rect.right, rect.bottom));
     if (list6.length !== 0) {
       this.add(list6);
       this.setContext("SelectByRect");
@@ -53731,7 +53782,7 @@ class BoardSelection {
   selectEnclosedOrCrossedBy(rect) {
     this.removeAll();
     const enclosedFrames = this.board.items.getEnclosed(rect.left, rect.top, rect.right, rect.bottom).filter((item) => !item.transformation.isLocked);
-    const list6 = this.board.items.getEnclosedOrCrossed(rect.left, rect.top, rect.right, rect.bottom).filter((item) => (!(item instanceof Frame2) || enclosedFrames.includes(item)) && !item.transformation.isLocked);
+    const list6 = this.getCanvasSelectableItems(this.board.items.getEnclosedOrCrossed(rect.left, rect.top, rect.right, rect.bottom).filter((item) => (!(item instanceof Frame2) || enclosedFrames.includes(item)) && !item.transformation.isLocked));
     if (list6.length !== 0) {
       this.add(list6);
       this.setContext("SelectByRect");
@@ -53930,6 +53981,79 @@ class BoardSelection {
     }
     return this.textToEdit;
   }
+  getParent(item) {
+    return this.getParentItem(item);
+  }
+  getParentChain(item) {
+    const chain = [];
+    let parent = this.getParentItem(item);
+    while (parent) {
+      chain.push(parent);
+      parent = this.getParentItem(parent);
+    }
+    return chain;
+  }
+  getHierarchyPath(item) {
+    const resolved = typeof item === "string" ? this.board.items.getById(item) : item || null;
+    if (!resolved) {
+      return [];
+    }
+    const nodes = [...this.getParentChain(resolved).reverse(), resolved];
+    return nodes.filter((node2) => node2 instanceof BaseItem).map((node2) => ({
+      id: node2.getId(),
+      itemType: node2.itemType,
+      parentId: node2.parent === "Board" ? null : node2.parent,
+      hasChildren: (node2.getChildrenIds()?.length || 0) > 0,
+      isCanvasSelectable: !(node2 instanceof Group)
+    }));
+  }
+  getSelectionHierarchyPaths() {
+    return this.items.list().map((item) => this.getHierarchyPath(item));
+  }
+  getCommonParent() {
+    const selected = this.items.list();
+    if (selected.length === 0) {
+      return null;
+    }
+    const firstParent = this.getParentItem(selected[0]);
+    if (!firstParent) {
+      return null;
+    }
+    const firstParentId = firstParent.getId();
+    const hasSameParent = selected.every((item) => this.getParentItem(item)?.getId() === firstParentId);
+    return hasSameParent ? firstParent : null;
+  }
+  canPromoteSelectionToParent() {
+    return this.getCommonParent() !== null;
+  }
+  selectParent() {
+    const parent = this.getCommonParent();
+    if (!parent) {
+      return null;
+    }
+    this.removeAll();
+    this.add(parent);
+    this.setContext("SelectUnderPointer");
+    return parent;
+  }
+  selectAncestorById(ancestorId) {
+    const selected = this.items.list();
+    if (selected.length === 0) {
+      return null;
+    }
+    const ancestor = this.board.items.getById(ancestorId);
+    if (!(ancestor instanceof BaseItem)) {
+      return null;
+    }
+    const isSharedAncestor = selected.every((item) => item.getId() === ancestorId || this.isAncestor(ancestor, item));
+    if (!isSharedAncestor) {
+      return null;
+    }
+    this.removeAll();
+    this.add(ancestor);
+    this.setContext("SelectUnderPointer");
+    return ancestor;
+  }
   nestSelectedItems(unselectedItem, checkFrames = true) {
     const selected = this.board.selection.items.list();
     if (unselectedItem && !selected.find((item) => item.getId() === unselectedItem.getId())) {