microboard-ui-temp 0.1.124 → 0.1.126

package/dist/index.js

@@ -274086,10 +274086,10 @@ class Select extends Tool {
         return false;
       }
       const draggingMbr = draggingItem.getMbr();
-      const frames = this.board.items.getEnclosedOrCrossed(draggingMbr.left, draggingMbr.top, draggingMbr.right, draggingMbr.bottom).filter((item) => item instanceof Frame2);
-      frames.forEach((frame) => {
-        if (frame.handleNesting(draggingItem)) {
-          this.nestingHighlighter.add(frame, draggingItem);
+      const groups = this.board.items.getEnclosedOrCrossed(draggingMbr.left, draggingMbr.top, draggingMbr.right, draggingMbr.bottom).filter((item) => !!(("index" in item) && item.index));
+      groups.forEach((group) => {
+        if (group.handleNesting(draggingItem)) {
+          this.nestingHighlighter.add(group, draggingItem);
         } else {
           this.nestingHighlighter.remove(draggingItem);
         }
@@ -274140,13 +274140,13 @@ class Select extends Tool {
     }
   }
   updateFramesNesting(selectionMbr, selection) {
-    const frames = this.board.items.getEnclosedOrCrossed(selectionMbr.left, selectionMbr.top, selectionMbr.right, selectionMbr.bottom).filter((item) => item instanceof Frame2).filter((frame) => !selection.items.list().includes(frame));
-    const draggingFramesIds = selection.list().filter((item) => item instanceof Frame2).map((frame) => frame.getId());
+    const groups = this.board.items.getEnclosedOrCrossed(selectionMbr.left, selectionMbr.top, selectionMbr.right, selectionMbr.bottom).filter((item) => !!(("index" in item) && item.index)).filter((group) => !selection.items.list().includes(group));
+    const draggingGroupsIds = selection.list().filter((item) => !!(("index" in item) && item.index)).map((group) => group.getId());
     selection.list().forEach((item) => {
-      if (!(item instanceof Frame2) && !draggingFramesIds.includes(item.parent)) {
-        frames.forEach((frame) => {
-          if (frame.handleNesting(item)) {
-            this.nestingHighlighter.add(frame, item);
+      if (!(("index" in item) && item.index) && !draggingGroupsIds.includes(item.parent)) {
+        groups.forEach((group) => {
+          if (group.handleNesting(item)) {
+            this.nestingHighlighter.add(group, item);
           } else {
             this.nestingHighlighter.remove(item);
           }
@@ -276383,8 +276383,25 @@ class AddScreen extends ShapeTool {
     super(board, name, Screen, { cursorName: "crosshair", fixedRatio: false });
   }
   pointerUp() {
-    this.item.applyOwnerId(localStorage.getItem("currentUser") || "");
-    return super.pointerUp();
+    let screenOwnerId = localStorage.getItem("currentUser") || localStorage.getItem("screenOwnerId");
+    if (!screenOwnerId) {
+      screenOwnerId = v4_default();
+      localStorage.setItem("screenOwnerId", screenOwnerId);
+    }
+    this.item.applyOwnerId(screenOwnerId);
+    const currMbr = this.item.getMbr();
+    const screenChildren = this.board.items.getEnclosedOrCrossed(currMbr.left, currMbr.top, currMbr.right, currMbr.bottom).filter((item) => item.parent === "Board").filter((item) => this.item.handleNesting(item));
+    const width2 = this.bounds.getWidth() < 2 ? 100 : this.bounds.getWidth();
+    const height3 = this.bounds.getHeight() < 2 ? 100 : this.bounds.getHeight();
+    this.initTransformation(width2 / 100, height3 / 100);
+    const screen = this.board.add(this.item);
+    screen.emitNesting(screenChildren);
+    this.isDown = false;
+    this.board.selection.removeAll();
+    this.board.selection.add(screen);
+    this.board.tools.select();
+    this.board.tools.publish();
+    return true;
   }
 }
 var handPath = new Path2([
@@ -276513,7 +276530,7 @@ class Screen extends BaseItem {
       return;
     }
     this.path.render(context);
-    if (localStorage.getItem("currentUser") === this.ownerId || !this.ownerId) {
+    if (localStorage.getItem("currentUser") === this.ownerId || localStorage.getItem("screenOwnerId") === this.ownerId || !this.ownerId) {
       super.render(context);
     }
   }
@@ -279390,7 +279407,7 @@ function updateFrameChildren({
 }) {
   const groups = board.items.getGroupItemsEnclosedOrCrossed(mbr.left, mbr.top, mbr.right, mbr.bottom);
   board.selection.items.list().forEach((item) => {
-    if ("getChildrenIds" in item && item.getChildrenIds()) {
+    if ("index" in item && item.index) {
       const currMbr = item.getMbr();
       const itemsToCheck = board.items.getEnclosedOrCrossed(currMbr.left, currMbr.top, currMbr.right, currMbr.bottom);
       itemsToCheck.forEach((currItem) => {

package/dist/spa.js

@@ -274086,10 +274086,10 @@ class Select extends Tool {
         return false;
       }
       const draggingMbr = draggingItem.getMbr();
-      const frames = this.board.items.getEnclosedOrCrossed(draggingMbr.left, draggingMbr.top, draggingMbr.right, draggingMbr.bottom).filter((item) => item instanceof Frame2);
-      frames.forEach((frame) => {
-        if (frame.handleNesting(draggingItem)) {
-          this.nestingHighlighter.add(frame, draggingItem);
+      const groups = this.board.items.getEnclosedOrCrossed(draggingMbr.left, draggingMbr.top, draggingMbr.right, draggingMbr.bottom).filter((item) => !!(("index" in item) && item.index));
+      groups.forEach((group) => {
+        if (group.handleNesting(draggingItem)) {
+          this.nestingHighlighter.add(group, draggingItem);
         } else {
           this.nestingHighlighter.remove(draggingItem);
         }
@@ -274140,13 +274140,13 @@ class Select extends Tool {
     }
   }
   updateFramesNesting(selectionMbr, selection) {
-    const frames = this.board.items.getEnclosedOrCrossed(selectionMbr.left, selectionMbr.top, selectionMbr.right, selectionMbr.bottom).filter((item) => item instanceof Frame2).filter((frame) => !selection.items.list().includes(frame));
-    const draggingFramesIds = selection.list().filter((item) => item instanceof Frame2).map((frame) => frame.getId());
+    const groups = this.board.items.getEnclosedOrCrossed(selectionMbr.left, selectionMbr.top, selectionMbr.right, selectionMbr.bottom).filter((item) => !!(("index" in item) && item.index)).filter((group) => !selection.items.list().includes(group));
+    const draggingGroupsIds = selection.list().filter((item) => !!(("index" in item) && item.index)).map((group) => group.getId());
     selection.list().forEach((item) => {
-      if (!(item instanceof Frame2) && !draggingFramesIds.includes(item.parent)) {
-        frames.forEach((frame) => {
-          if (frame.handleNesting(item)) {
-            this.nestingHighlighter.add(frame, item);
+      if (!(("index" in item) && item.index) && !draggingGroupsIds.includes(item.parent)) {
+        groups.forEach((group) => {
+          if (group.handleNesting(item)) {
+            this.nestingHighlighter.add(group, item);
           } else {
             this.nestingHighlighter.remove(item);
           }
@@ -276383,8 +276383,25 @@ class AddScreen extends ShapeTool {
     super(board, name, Screen, { cursorName: "crosshair", fixedRatio: false });
   }
   pointerUp() {
-    this.item.applyOwnerId(localStorage.getItem("currentUser") || "");
-    return super.pointerUp();
+    let screenOwnerId = localStorage.getItem("currentUser") || localStorage.getItem("screenOwnerId");
+    if (!screenOwnerId) {
+      screenOwnerId = v4_default();
+      localStorage.setItem("screenOwnerId", screenOwnerId);
+    }
+    this.item.applyOwnerId(screenOwnerId);
+    const currMbr = this.item.getMbr();
+    const screenChildren = this.board.items.getEnclosedOrCrossed(currMbr.left, currMbr.top, currMbr.right, currMbr.bottom).filter((item) => item.parent === "Board").filter((item) => this.item.handleNesting(item));
+    const width2 = this.bounds.getWidth() < 2 ? 100 : this.bounds.getWidth();
+    const height3 = this.bounds.getHeight() < 2 ? 100 : this.bounds.getHeight();
+    this.initTransformation(width2 / 100, height3 / 100);
+    const screen = this.board.add(this.item);
+    screen.emitNesting(screenChildren);
+    this.isDown = false;
+    this.board.selection.removeAll();
+    this.board.selection.add(screen);
+    this.board.tools.select();
+    this.board.tools.publish();
+    return true;
   }
 }
 var handPath = new Path2([
@@ -276513,7 +276530,7 @@ class Screen extends BaseItem {
       return;
     }
     this.path.render(context);
-    if (localStorage.getItem("currentUser") === this.ownerId || !this.ownerId) {
+    if (localStorage.getItem("currentUser") === this.ownerId || localStorage.getItem("screenOwnerId") === this.ownerId || !this.ownerId) {
       super.render(context);
     }
   }
@@ -279390,7 +279407,7 @@ function updateFrameChildren({
 }) {
   const groups = board.items.getGroupItemsEnclosedOrCrossed(mbr.left, mbr.top, mbr.right, mbr.bottom);
   board.selection.items.list().forEach((item) => {
-    if ("getChildrenIds" in item && item.getChildrenIds()) {
+    if ("index" in item && item.index) {
       const currMbr = item.getMbr();
       const itemsToCheck = board.items.getEnclosedOrCrossed(currMbr.left, currMbr.top, currMbr.right, currMbr.bottom);
       itemsToCheck.forEach((currItem) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "microboard-ui-temp",
-  "version": "0.1.124",
+  "version": "0.1.126",
   "main": "dist/index.js",
   "module": "dist/index.js",
   "type": "module",
@@ -66,7 +66,7 @@
     "i18next-browser-languagedetector": "^8.2.0",
     "js-cookie": "^3.0.5",
     "jwt-decode": "^4.0.0",
-    "microboard-temp": "^0.5.51",
+    "microboard-temp": "^0.5.53",
     "nanoid": "^5.1.5",
     "prop-types": "^15.8.1",
     "react-hot-toast": "2.4.1",