microboard-temp 0.12.4 → 0.12.6

package/dist/cjs/browser.js

@@ -21809,6 +21809,7 @@ class BaseItem extends Mbr {
   updateChildrenIds() {
     this.children = this.index?.items.listAll().map((item) => item.getId()) || [];
   }
+  onParentChanged(_newParent) {}
   getId() {
     return this.id;
   }
@@ -21944,6 +21945,7 @@ class BaseItem extends Mbr {
           const localMatrix = foundItem.transformation.toMatrix().toLocalOf(containerNestingMatrix);
           this.board.items.index.remove(foundItem);
           foundItem.parent = this.getId();
+          foundItem.onParentChanged(this.getId());
           foundItem.transformation.setLocalMatrix(localMatrix);
           this.index?.insert(foundItem);
         }
@@ -21965,6 +21967,7 @@ class BaseItem extends Mbr {
           const worldMatrix = foundItem.transformation.toMatrix().composeWith(containerNestingMatrix);
           this.index?.remove(foundItem);
           foundItem.parent = "Board";
+          foundItem.onParentChanged("Board");
           foundItem.transformation.setLocalMatrix(worldMatrix);
           this.board.items.index.insert(foundItem);
         }
@@ -22437,7 +22440,7 @@ class RichText extends BaseItem {
       height,
       maxWidth: maxWidth ? maxWidth + 1 : undefined,
       maxHeight,
-      textScale: this.getScale()
+      textScale: this.isInShape && !this.autoSize ? 1 : this.getScale()
     };
   }
   transformCanvas() {
@@ -54310,7 +54313,7 @@ class GravityEngine {
   G = 80;
   G_CENTER = 120;
   DAMPING = 0.92;
-  REPULSION = 60000;
+  REPULSION = 800;
   TICK_MS = 33;
   SYNC_MS = 300;
   MAX_DISTANCE = 3000;
@@ -54345,13 +54348,18 @@ class GravityEngine {
     const items = this.board.items.listAll().filter((item) => !item.transformation.isLocked && !EXCLUDED_ITEM_TYPES.has(item.itemType));
     if (items.length < 1)
       return;
-    const snapshot = items.map((item) => {
+    const snap = items.map((item, idx) => {
       const pos = item.transformation.getTranslation();
       const mbr = item.getMbr();
       const w = Math.max(mbr.getWidth(), 1);
       const h2 = Math.max(mbr.getHeight(), 1);
       return {
+        idx,
         id: item.getId(),
+        left: pos.x,
+        top: pos.y,
+        right: pos.x + w,
+        bottom: pos.y + h2,
         cx: pos.x + w * 0.5,
         cy: pos.y + h2 * 0.5,
         w,
@@ -54359,16 +54367,15 @@ class GravityEngine {
         mass: w * h2
       };
     });
-    let sumX = 0;
-    let sumY = 0;
-    for (const s2 of snapshot) {
+    let sumX = 0, sumY = 0;
+    for (const s2 of snap) {
       sumX += s2.cx;
       sumY += s2.cy;
     }
-    const centerX = sumX / snapshot.length;
-    const centerY = sumY / snapshot.length;
-    for (let i = 0;i < snapshot.length; i++) {
-      const s1 = snapshot[i];
+    const centerX = sumX / snap.length;
+    const centerY = sumY / snap.length;
+    for (let i = 0;i < snap.length; i++) {
+      const s1 = snap[i];
       if (!this.velocities.has(s1.id)) {
         this.velocities.set(s1.id, { vx: 0, vy: 0 });
       }
@@ -54380,22 +54387,28 @@ class GravityEngine {
       const distCenter = Math.sqrt(dcx * dcx + dcy * dcy) + 1;
       ax += this.G_CENTER * dcx / distCenter;
       ay += this.G_CENTER * dcy / distCenter;
-      for (let j = 0;j < snapshot.length; j++) {
+      for (let j = 0;j < snap.length; j++) {
         if (i === j)
           continue;
-        const s2 = snapshot[j];
+        const s2 = snap[j];
         const dx = s2.cx - s1.cx;
         const dy = s2.cy - s1.cy;
-        const distSq = dx * dx + dy * dy;
-        const dist = Math.sqrt(distSq) + 0.001;
+        const dist = Math.sqrt(dx * dx + dy * dy) + 0.001;
         if (dist > this.MAX_DISTANCE)
           continue;
-        const minDist = (s1.w + s2.w + s1.h + s2.h) * 0.25;
-        if (dist < minDist) {
-          const repAcc = this.REPULSION / (distSq + this.SOFTENING_SQ);
-          ax -= repAcc * dx / dist;
-          ay -= repAcc * dy / dist;
+        const overlapping = s1.right > s2.left && s2.right > s1.left && s1.bottom > s2.top && s2.bottom > s1.top;
+        if (overlapping) {
+          const overlapX = Math.min(s1.right, s2.right) - Math.max(s1.left, s2.left);
+          const overlapY = Math.min(s1.bottom, s2.bottom) - Math.max(s1.top, s2.top);
+          if (overlapX < overlapY) {
+            const sign = s1.cx < s2.cx ? -1 : 1;
+            ax += sign * this.REPULSION * overlapX;
+          } else {
+            const sign = s1.cy < s2.cy ? -1 : 1;
+            ay += sign * this.REPULSION * overlapY;
+          }
         } else {
+          const distSq = dx * dx + dy * dy;
           const gravAcc = this.G * s2.mass / (distSq + this.SOFTENING_SQ);
           ax += gravAcc * dx / dist;
           ay += gravAcc * dy / dist;
@@ -54437,14 +54450,7 @@ class GravityEngine {
       method: "applyMatrix",
       items: movedItems.map(({ id, dx, dy }) => ({
         id,
-        matrix: {
-          translateX: dx,
-          translateY: dy,
-          scaleX: 1,
-          scaleY: 1,
-          shearX: 0,
-          shearY: 0
-        }
+        matrix: { translateX: dx, translateY: dy, scaleX: 1, scaleY: 1, shearX: 0, shearY: 0 }
       }))
     };
     this.board.events.emit(operation);

package/dist/cjs/index.js

@@ -21809,6 +21809,7 @@ class BaseItem extends Mbr {
   updateChildrenIds() {
     this.children = this.index?.items.listAll().map((item) => item.getId()) || [];
   }
+  onParentChanged(_newParent) {}
   getId() {
     return this.id;
   }
@@ -21944,6 +21945,7 @@ class BaseItem extends Mbr {
           const localMatrix = foundItem.transformation.toMatrix().toLocalOf(containerNestingMatrix);
           this.board.items.index.remove(foundItem);
           foundItem.parent = this.getId();
+          foundItem.onParentChanged(this.getId());
           foundItem.transformation.setLocalMatrix(localMatrix);
           this.index?.insert(foundItem);
         }
@@ -21965,6 +21967,7 @@ class BaseItem extends Mbr {
           const worldMatrix = foundItem.transformation.toMatrix().composeWith(containerNestingMatrix);
           this.index?.remove(foundItem);
           foundItem.parent = "Board";
+          foundItem.onParentChanged("Board");
           foundItem.transformation.setLocalMatrix(worldMatrix);
           this.board.items.index.insert(foundItem);
         }
@@ -22437,7 +22440,7 @@ class RichText extends BaseItem {
       height,
       maxWidth: maxWidth ? maxWidth + 1 : undefined,
       maxHeight,
-      textScale: this.getScale()
+      textScale: this.isInShape && !this.autoSize ? 1 : this.getScale()
     };
   }
   transformCanvas() {
@@ -54310,7 +54313,7 @@ class GravityEngine {
   G = 80;
   G_CENTER = 120;
   DAMPING = 0.92;
-  REPULSION = 60000;
+  REPULSION = 800;
   TICK_MS = 33;
   SYNC_MS = 300;
   MAX_DISTANCE = 3000;
@@ -54345,13 +54348,18 @@ class GravityEngine {
     const items = this.board.items.listAll().filter((item) => !item.transformation.isLocked && !EXCLUDED_ITEM_TYPES.has(item.itemType));
     if (items.length < 1)
       return;
-    const snapshot = items.map((item) => {
+    const snap = items.map((item, idx) => {
       const pos = item.transformation.getTranslation();
       const mbr = item.getMbr();
       const w = Math.max(mbr.getWidth(), 1);
       const h2 = Math.max(mbr.getHeight(), 1);
       return {
+        idx,
         id: item.getId(),
+        left: pos.x,
+        top: pos.y,
+        right: pos.x + w,
+        bottom: pos.y + h2,
         cx: pos.x + w * 0.5,
         cy: pos.y + h2 * 0.5,
         w,
@@ -54359,16 +54367,15 @@ class GravityEngine {
         mass: w * h2
       };
     });
-    let sumX = 0;
-    let sumY = 0;
-    for (const s2 of snapshot) {
+    let sumX = 0, sumY = 0;
+    for (const s2 of snap) {
       sumX += s2.cx;
       sumY += s2.cy;
     }
-    const centerX = sumX / snapshot.length;
-    const centerY = sumY / snapshot.length;
-    for (let i = 0;i < snapshot.length; i++) {
-      const s1 = snapshot[i];
+    const centerX = sumX / snap.length;
+    const centerY = sumY / snap.length;
+    for (let i = 0;i < snap.length; i++) {
+      const s1 = snap[i];
       if (!this.velocities.has(s1.id)) {
         this.velocities.set(s1.id, { vx: 0, vy: 0 });
       }
@@ -54380,22 +54387,28 @@ class GravityEngine {
       const distCenter = Math.sqrt(dcx * dcx + dcy * dcy) + 1;
       ax += this.G_CENTER * dcx / distCenter;
       ay += this.G_CENTER * dcy / distCenter;
-      for (let j = 0;j < snapshot.length; j++) {
+      for (let j = 0;j < snap.length; j++) {
         if (i === j)
           continue;
-        const s2 = snapshot[j];
+        const s2 = snap[j];
         const dx = s2.cx - s1.cx;
         const dy = s2.cy - s1.cy;
-        const distSq = dx * dx + dy * dy;
-        const dist = Math.sqrt(distSq) + 0.001;
+        const dist = Math.sqrt(dx * dx + dy * dy) + 0.001;
         if (dist > this.MAX_DISTANCE)
           continue;
-        const minDist = (s1.w + s2.w + s1.h + s2.h) * 0.25;
-        if (dist < minDist) {
-          const repAcc = this.REPULSION / (distSq + this.SOFTENING_SQ);
-          ax -= repAcc * dx / dist;
-          ay -= repAcc * dy / dist;
+        const overlapping = s1.right > s2.left && s2.right > s1.left && s1.bottom > s2.top && s2.bottom > s1.top;
+        if (overlapping) {
+          const overlapX = Math.min(s1.right, s2.right) - Math.max(s1.left, s2.left);
+          const overlapY = Math.min(s1.bottom, s2.bottom) - Math.max(s1.top, s2.top);
+          if (overlapX < overlapY) {
+            const sign = s1.cx < s2.cx ? -1 : 1;
+            ax += sign * this.REPULSION * overlapX;
+          } else {
+            const sign = s1.cy < s2.cy ? -1 : 1;
+            ay += sign * this.REPULSION * overlapY;
+          }
         } else {
+          const distSq = dx * dx + dy * dy;
           const gravAcc = this.G * s2.mass / (distSq + this.SOFTENING_SQ);
           ax += gravAcc * dx / dist;
           ay += gravAcc * dy / dist;
@@ -54437,14 +54450,7 @@ class GravityEngine {
       method: "applyMatrix",
       items: movedItems.map(({ id, dx, dy }) => ({
         id,
-        matrix: {
-          translateX: dx,
-          translateY: dy,
-          scaleX: 1,
-          scaleY: 1,
-          shearX: 0,
-          shearY: 0
-        }
+        matrix: { translateX: dx, translateY: dy, scaleX: 1, scaleY: 1, shearX: 0, shearY: 0 }
       }))
     };
     this.board.events.emit(operation);

package/dist/cjs/node.js

@@ -24281,6 +24281,7 @@ class BaseItem extends Mbr {
   updateChildrenIds() {
     this.children = this.index?.items.listAll().map((item) => item.getId()) || [];
   }
+  onParentChanged(_newParent) {}
   getId() {
     return this.id;
   }
@@ -24416,6 +24417,7 @@ class BaseItem extends Mbr {
           const localMatrix = foundItem.transformation.toMatrix().toLocalOf(containerNestingMatrix);
           this.board.items.index.remove(foundItem);
           foundItem.parent = this.getId();
+          foundItem.onParentChanged(this.getId());
           foundItem.transformation.setLocalMatrix(localMatrix);
           this.index?.insert(foundItem);
         }
@@ -24437,6 +24439,7 @@ class BaseItem extends Mbr {
           const worldMatrix = foundItem.transformation.toMatrix().composeWith(containerNestingMatrix);
           this.index?.remove(foundItem);
           foundItem.parent = "Board";
+          foundItem.onParentChanged("Board");
           foundItem.transformation.setLocalMatrix(worldMatrix);
           this.board.items.index.insert(foundItem);
         }
@@ -24909,7 +24912,7 @@ class RichText extends BaseItem {
       height,
       maxWidth: maxWidth ? maxWidth + 1 : undefined,
       maxHeight,
-      textScale: this.getScale()
+      textScale: this.isInShape && !this.autoSize ? 1 : this.getScale()
     };
   }
   transformCanvas() {
@@ -56783,7 +56786,7 @@ class GravityEngine {
   G = 80;
   G_CENTER = 120;
   DAMPING = 0.92;
-  REPULSION = 60000;
+  REPULSION = 800;
   TICK_MS = 33;
   SYNC_MS = 300;
   MAX_DISTANCE = 3000;
@@ -56818,13 +56821,18 @@ class GravityEngine {
     const items = this.board.items.listAll().filter((item) => !item.transformation.isLocked && !EXCLUDED_ITEM_TYPES.has(item.itemType));
     if (items.length < 1)
       return;
-    const snapshot = items.map((item) => {
+    const snap = items.map((item, idx) => {
       const pos = item.transformation.getTranslation();
       const mbr = item.getMbr();
       const w = Math.max(mbr.getWidth(), 1);
       const h2 = Math.max(mbr.getHeight(), 1);
       return {
+        idx,
         id: item.getId(),
+        left: pos.x,
+        top: pos.y,
+        right: pos.x + w,
+        bottom: pos.y + h2,
         cx: pos.x + w * 0.5,
         cy: pos.y + h2 * 0.5,
         w,
@@ -56832,16 +56840,15 @@ class GravityEngine {
         mass: w * h2
       };
     });
-    let sumX = 0;
-    let sumY = 0;
-    for (const s2 of snapshot) {
+    let sumX = 0, sumY = 0;
+    for (const s2 of snap) {
       sumX += s2.cx;
       sumY += s2.cy;
     }
-    const centerX = sumX / snapshot.length;
-    const centerY = sumY / snapshot.length;
-    for (let i = 0;i < snapshot.length; i++) {
-      const s1 = snapshot[i];
+    const centerX = sumX / snap.length;
+    const centerY = sumY / snap.length;
+    for (let i = 0;i < snap.length; i++) {
+      const s1 = snap[i];
       if (!this.velocities.has(s1.id)) {
         this.velocities.set(s1.id, { vx: 0, vy: 0 });
       }
@@ -56853,22 +56860,28 @@ class GravityEngine {
       const distCenter = Math.sqrt(dcx * dcx + dcy * dcy) + 1;
       ax += this.G_CENTER * dcx / distCenter;
       ay += this.G_CENTER * dcy / distCenter;
-      for (let j = 0;j < snapshot.length; j++) {
+      for (let j = 0;j < snap.length; j++) {
         if (i === j)
           continue;
-        const s2 = snapshot[j];
+        const s2 = snap[j];
         const dx = s2.cx - s1.cx;
         const dy = s2.cy - s1.cy;
-        const distSq = dx * dx + dy * dy;
-        const dist = Math.sqrt(distSq) + 0.001;
+        const dist = Math.sqrt(dx * dx + dy * dy) + 0.001;
         if (dist > this.MAX_DISTANCE)
           continue;
-        const minDist = (s1.w + s2.w + s1.h + s2.h) * 0.25;
-        if (dist < minDist) {
-          const repAcc = this.REPULSION / (distSq + this.SOFTENING_SQ);
-          ax -= repAcc * dx / dist;
-          ay -= repAcc * dy / dist;
+        const overlapping = s1.right > s2.left && s2.right > s1.left && s1.bottom > s2.top && s2.bottom > s1.top;
+        if (overlapping) {
+          const overlapX = Math.min(s1.right, s2.right) - Math.max(s1.left, s2.left);
+          const overlapY = Math.min(s1.bottom, s2.bottom) - Math.max(s1.top, s2.top);
+          if (overlapX < overlapY) {
+            const sign = s1.cx < s2.cx ? -1 : 1;
+            ax += sign * this.REPULSION * overlapX;
+          } else {
+            const sign = s1.cy < s2.cy ? -1 : 1;
+            ay += sign * this.REPULSION * overlapY;
+          }
         } else {
+          const distSq = dx * dx + dy * dy;
           const gravAcc = this.G * s2.mass / (distSq + this.SOFTENING_SQ);
           ax += gravAcc * dx / dist;
           ay += gravAcc * dy / dist;
@@ -56910,14 +56923,7 @@ class GravityEngine {
       method: "applyMatrix",
       items: movedItems.map(({ id, dx, dy }) => ({
         id,
-        matrix: {
-          translateX: dx,
-          translateY: dy,
-          scaleX: 1,
-          scaleY: 1,
-          shearX: 0,
-          shearY: 0
-        }
+        matrix: { translateX: dx, translateY: dy, scaleX: 1, scaleY: 1, shearX: 0, shearY: 0 }
       }))
     };
     this.board.events.emit(operation);

package/dist/esm/browser.js

@@ -21638,6 +21638,7 @@ class BaseItem extends Mbr {
   updateChildrenIds() {
     this.children = this.index?.items.listAll().map((item) => item.getId()) || [];
   }
+  onParentChanged(_newParent) {}
   getId() {
     return this.id;
   }
@@ -21773,6 +21774,7 @@ class BaseItem extends Mbr {
           const localMatrix = foundItem.transformation.toMatrix().toLocalOf(containerNestingMatrix);
           this.board.items.index.remove(foundItem);
           foundItem.parent = this.getId();
+          foundItem.onParentChanged(this.getId());
           foundItem.transformation.setLocalMatrix(localMatrix);
           this.index?.insert(foundItem);
         }
@@ -21794,6 +21796,7 @@ class BaseItem extends Mbr {
           const worldMatrix = foundItem.transformation.toMatrix().composeWith(containerNestingMatrix);
           this.index?.remove(foundItem);
           foundItem.parent = "Board";
+          foundItem.onParentChanged("Board");
           foundItem.transformation.setLocalMatrix(worldMatrix);
           this.board.items.index.insert(foundItem);
         }
@@ -22266,7 +22269,7 @@ class RichText extends BaseItem {
       height,
       maxWidth: maxWidth ? maxWidth + 1 : undefined,
       maxHeight,
-      textScale: this.getScale()
+      textScale: this.isInShape && !this.autoSize ? 1 : this.getScale()
     };
   }
   transformCanvas() {
@@ -54139,7 +54142,7 @@ class GravityEngine {
   G = 80;
   G_CENTER = 120;
   DAMPING = 0.92;
-  REPULSION = 60000;
+  REPULSION = 800;
   TICK_MS = 33;
   SYNC_MS = 300;
   MAX_DISTANCE = 3000;
@@ -54174,13 +54177,18 @@ class GravityEngine {
     const items = this.board.items.listAll().filter((item) => !item.transformation.isLocked && !EXCLUDED_ITEM_TYPES.has(item.itemType));
     if (items.length < 1)
       return;
-    const snapshot = items.map((item) => {
+    const snap = items.map((item, idx) => {
       const pos = item.transformation.getTranslation();
       const mbr = item.getMbr();
       const w = Math.max(mbr.getWidth(), 1);
       const h2 = Math.max(mbr.getHeight(), 1);
       return {
+        idx,
         id: item.getId(),
+        left: pos.x,
+        top: pos.y,
+        right: pos.x + w,
+        bottom: pos.y + h2,
         cx: pos.x + w * 0.5,
         cy: pos.y + h2 * 0.5,
         w,
@@ -54188,16 +54196,15 @@ class GravityEngine {
         mass: w * h2
       };
     });
-    let sumX = 0;
-    let sumY = 0;
-    for (const s2 of snapshot) {
+    let sumX = 0, sumY = 0;
+    for (const s2 of snap) {
       sumX += s2.cx;
       sumY += s2.cy;
     }
-    const centerX = sumX / snapshot.length;
-    const centerY = sumY / snapshot.length;
-    for (let i = 0;i < snapshot.length; i++) {
-      const s1 = snapshot[i];
+    const centerX = sumX / snap.length;
+    const centerY = sumY / snap.length;
+    for (let i = 0;i < snap.length; i++) {
+      const s1 = snap[i];
       if (!this.velocities.has(s1.id)) {
         this.velocities.set(s1.id, { vx: 0, vy: 0 });
       }
@@ -54209,22 +54216,28 @@ class GravityEngine {
       const distCenter = Math.sqrt(dcx * dcx + dcy * dcy) + 1;
       ax += this.G_CENTER * dcx / distCenter;
       ay += this.G_CENTER * dcy / distCenter;
-      for (let j = 0;j < snapshot.length; j++) {
+      for (let j = 0;j < snap.length; j++) {
         if (i === j)
           continue;
-        const s2 = snapshot[j];
+        const s2 = snap[j];
         const dx = s2.cx - s1.cx;
         const dy = s2.cy - s1.cy;
-        const distSq = dx * dx + dy * dy;
-        const dist = Math.sqrt(distSq) + 0.001;
+        const dist = Math.sqrt(dx * dx + dy * dy) + 0.001;
         if (dist > this.MAX_DISTANCE)
           continue;
-        const minDist = (s1.w + s2.w + s1.h + s2.h) * 0.25;
-        if (dist < minDist) {
-          const repAcc = this.REPULSION / (distSq + this.SOFTENING_SQ);
-          ax -= repAcc * dx / dist;
-          ay -= repAcc * dy / dist;
+        const overlapping = s1.right > s2.left && s2.right > s1.left && s1.bottom > s2.top && s2.bottom > s1.top;
+        if (overlapping) {
+          const overlapX = Math.min(s1.right, s2.right) - Math.max(s1.left, s2.left);
+          const overlapY = Math.min(s1.bottom, s2.bottom) - Math.max(s1.top, s2.top);
+          if (overlapX < overlapY) {
+            const sign = s1.cx < s2.cx ? -1 : 1;
+            ax += sign * this.REPULSION * overlapX;
+          } else {
+            const sign = s1.cy < s2.cy ? -1 : 1;
+            ay += sign * this.REPULSION * overlapY;
+          }
         } else {
+          const distSq = dx * dx + dy * dy;
           const gravAcc = this.G * s2.mass / (distSq + this.SOFTENING_SQ);
           ax += gravAcc * dx / dist;
           ay += gravAcc * dy / dist;
@@ -54266,14 +54279,7 @@ class GravityEngine {
       method: "applyMatrix",
       items: movedItems.map(({ id, dx, dy }) => ({
         id,
-        matrix: {
-          translateX: dx,
-          translateY: dy,
-          scaleX: 1,
-          scaleY: 1,
-          shearX: 0,
-          shearY: 0
-        }
+        matrix: { translateX: dx, translateY: dy, scaleX: 1, scaleY: 1, shearX: 0, shearY: 0 }
       }))
     };
     this.board.events.emit(operation);

package/dist/esm/index.js

@@ -21631,6 +21631,7 @@ class BaseItem extends Mbr {
   updateChildrenIds() {
     this.children = this.index?.items.listAll().map((item) => item.getId()) || [];
   }
+  onParentChanged(_newParent) {}
   getId() {
     return this.id;
   }
@@ -21766,6 +21767,7 @@ class BaseItem extends Mbr {
           const localMatrix = foundItem.transformation.toMatrix().toLocalOf(containerNestingMatrix);
           this.board.items.index.remove(foundItem);
           foundItem.parent = this.getId();
+          foundItem.onParentChanged(this.getId());
           foundItem.transformation.setLocalMatrix(localMatrix);
           this.index?.insert(foundItem);
         }
@@ -21787,6 +21789,7 @@ class BaseItem extends Mbr {
           const worldMatrix = foundItem.transformation.toMatrix().composeWith(containerNestingMatrix);
           this.index?.remove(foundItem);
           foundItem.parent = "Board";
+          foundItem.onParentChanged("Board");
           foundItem.transformation.setLocalMatrix(worldMatrix);
           this.board.items.index.insert(foundItem);
         }
@@ -22259,7 +22262,7 @@ class RichText extends BaseItem {
       height,
       maxWidth: maxWidth ? maxWidth + 1 : undefined,
       maxHeight,
-      textScale: this.getScale()
+      textScale: this.isInShape && !this.autoSize ? 1 : this.getScale()
     };
   }
   transformCanvas() {
@@ -54132,7 +54135,7 @@ class GravityEngine {
   G = 80;
   G_CENTER = 120;
   DAMPING = 0.92;
-  REPULSION = 60000;
+  REPULSION = 800;
   TICK_MS = 33;
   SYNC_MS = 300;
   MAX_DISTANCE = 3000;
@@ -54167,13 +54170,18 @@ class GravityEngine {
     const items = this.board.items.listAll().filter((item) => !item.transformation.isLocked && !EXCLUDED_ITEM_TYPES.has(item.itemType));
     if (items.length < 1)
       return;
-    const snapshot = items.map((item) => {
+    const snap = items.map((item, idx) => {
       const pos = item.transformation.getTranslation();
       const mbr = item.getMbr();
       const w = Math.max(mbr.getWidth(), 1);
       const h2 = Math.max(mbr.getHeight(), 1);
       return {
+        idx,
         id: item.getId(),
+        left: pos.x,
+        top: pos.y,
+        right: pos.x + w,
+        bottom: pos.y + h2,
         cx: pos.x + w * 0.5,
         cy: pos.y + h2 * 0.5,
         w,
@@ -54181,16 +54189,15 @@ class GravityEngine {
         mass: w * h2
       };
     });
-    let sumX = 0;
-    let sumY = 0;
-    for (const s2 of snapshot) {
+    let sumX = 0, sumY = 0;
+    for (const s2 of snap) {
       sumX += s2.cx;
       sumY += s2.cy;
     }
-    const centerX = sumX / snapshot.length;
-    const centerY = sumY / snapshot.length;
-    for (let i = 0;i < snapshot.length; i++) {
-      const s1 = snapshot[i];
+    const centerX = sumX / snap.length;
+    const centerY = sumY / snap.length;
+    for (let i = 0;i < snap.length; i++) {
+      const s1 = snap[i];
       if (!this.velocities.has(s1.id)) {
         this.velocities.set(s1.id, { vx: 0, vy: 0 });
       }
@@ -54202,22 +54209,28 @@ class GravityEngine {
       const distCenter = Math.sqrt(dcx * dcx + dcy * dcy) + 1;
       ax += this.G_CENTER * dcx / distCenter;
       ay += this.G_CENTER * dcy / distCenter;
-      for (let j = 0;j < snapshot.length; j++) {
+      for (let j = 0;j < snap.length; j++) {
         if (i === j)
           continue;
-        const s2 = snapshot[j];
+        const s2 = snap[j];
         const dx = s2.cx - s1.cx;
         const dy = s2.cy - s1.cy;
-        const distSq = dx * dx + dy * dy;
-        const dist = Math.sqrt(distSq) + 0.001;
+        const dist = Math.sqrt(dx * dx + dy * dy) + 0.001;
         if (dist > this.MAX_DISTANCE)
           continue;
-        const minDist = (s1.w + s2.w + s1.h + s2.h) * 0.25;
-        if (dist < minDist) {
-          const repAcc = this.REPULSION / (distSq + this.SOFTENING_SQ);
-          ax -= repAcc * dx / dist;
-          ay -= repAcc * dy / dist;
+        const overlapping = s1.right > s2.left && s2.right > s1.left && s1.bottom > s2.top && s2.bottom > s1.top;
+        if (overlapping) {
+          const overlapX = Math.min(s1.right, s2.right) - Math.max(s1.left, s2.left);
+          const overlapY = Math.min(s1.bottom, s2.bottom) - Math.max(s1.top, s2.top);
+          if (overlapX < overlapY) {
+            const sign = s1.cx < s2.cx ? -1 : 1;
+            ax += sign * this.REPULSION * overlapX;
+          } else {
+            const sign = s1.cy < s2.cy ? -1 : 1;
+            ay += sign * this.REPULSION * overlapY;
+          }
         } else {
+          const distSq = dx * dx + dy * dy;
           const gravAcc = this.G * s2.mass / (distSq + this.SOFTENING_SQ);
           ax += gravAcc * dx / dist;
           ay += gravAcc * dy / dist;
@@ -54259,14 +54272,7 @@ class GravityEngine {
       method: "applyMatrix",
       items: movedItems.map(({ id, dx, dy }) => ({
         id,
-        matrix: {
-          translateX: dx,
-          translateY: dy,
-          scaleX: 1,
-          scaleY: 1,
-          shearX: 0,
-          shearY: 0
-        }
+        matrix: { translateX: dx, translateY: dy, scaleX: 1, scaleY: 1, shearX: 0, shearY: 0 }
       }))
     };
     this.board.events.emit(operation);

package/dist/esm/node.js

@@ -24098,6 +24098,7 @@ class BaseItem extends Mbr {
   updateChildrenIds() {
     this.children = this.index?.items.listAll().map((item) => item.getId()) || [];
   }
+  onParentChanged(_newParent) {}
   getId() {
     return this.id;
   }
@@ -24233,6 +24234,7 @@ class BaseItem extends Mbr {
           const localMatrix = foundItem.transformation.toMatrix().toLocalOf(containerNestingMatrix);
           this.board.items.index.remove(foundItem);
           foundItem.parent = this.getId();
+          foundItem.onParentChanged(this.getId());
           foundItem.transformation.setLocalMatrix(localMatrix);
           this.index?.insert(foundItem);
         }
@@ -24254,6 +24256,7 @@ class BaseItem extends Mbr {
           const worldMatrix = foundItem.transformation.toMatrix().composeWith(containerNestingMatrix);
           this.index?.remove(foundItem);
           foundItem.parent = "Board";
+          foundItem.onParentChanged("Board");
           foundItem.transformation.setLocalMatrix(worldMatrix);
           this.board.items.index.insert(foundItem);
         }
@@ -24726,7 +24729,7 @@ class RichText extends BaseItem {
       height,
       maxWidth: maxWidth ? maxWidth + 1 : undefined,
       maxHeight,
-      textScale: this.getScale()
+      textScale: this.isInShape && !this.autoSize ? 1 : this.getScale()
     };
   }
   transformCanvas() {
@@ -56600,7 +56603,7 @@ class GravityEngine {
   G = 80;
   G_CENTER = 120;
   DAMPING = 0.92;
-  REPULSION = 60000;
+  REPULSION = 800;
   TICK_MS = 33;
   SYNC_MS = 300;
   MAX_DISTANCE = 3000;
@@ -56635,13 +56638,18 @@ class GravityEngine {
     const items = this.board.items.listAll().filter((item) => !item.transformation.isLocked && !EXCLUDED_ITEM_TYPES.has(item.itemType));
     if (items.length < 1)
       return;
-    const snapshot = items.map((item) => {
+    const snap = items.map((item, idx) => {
       const pos = item.transformation.getTranslation();
       const mbr = item.getMbr();
       const w = Math.max(mbr.getWidth(), 1);
       const h2 = Math.max(mbr.getHeight(), 1);
       return {
+        idx,
         id: item.getId(),
+        left: pos.x,
+        top: pos.y,
+        right: pos.x + w,
+        bottom: pos.y + h2,
         cx: pos.x + w * 0.5,
         cy: pos.y + h2 * 0.5,
         w,
@@ -56649,16 +56657,15 @@ class GravityEngine {
         mass: w * h2
       };
     });
-    let sumX = 0;
-    let sumY = 0;
-    for (const s2 of snapshot) {
+    let sumX = 0, sumY = 0;
+    for (const s2 of snap) {
       sumX += s2.cx;
       sumY += s2.cy;
     }
-    const centerX = sumX / snapshot.length;
-    const centerY = sumY / snapshot.length;
-    for (let i = 0;i < snapshot.length; i++) {
-      const s1 = snapshot[i];
+    const centerX = sumX / snap.length;
+    const centerY = sumY / snap.length;
+    for (let i = 0;i < snap.length; i++) {
+      const s1 = snap[i];
       if (!this.velocities.has(s1.id)) {
         this.velocities.set(s1.id, { vx: 0, vy: 0 });
       }
@@ -56670,22 +56677,28 @@ class GravityEngine {
       const distCenter = Math.sqrt(dcx * dcx + dcy * dcy) + 1;
       ax += this.G_CENTER * dcx / distCenter;
       ay += this.G_CENTER * dcy / distCenter;
-      for (let j = 0;j < snapshot.length; j++) {
+      for (let j = 0;j < snap.length; j++) {
         if (i === j)
           continue;
-        const s2 = snapshot[j];
+        const s2 = snap[j];
         const dx = s2.cx - s1.cx;
         const dy = s2.cy - s1.cy;
-        const distSq = dx * dx + dy * dy;
-        const dist = Math.sqrt(distSq) + 0.001;
+        const dist = Math.sqrt(dx * dx + dy * dy) + 0.001;
         if (dist > this.MAX_DISTANCE)
           continue;
-        const minDist = (s1.w + s2.w + s1.h + s2.h) * 0.25;
-        if (dist < minDist) {
-          const repAcc = this.REPULSION / (distSq + this.SOFTENING_SQ);
-          ax -= repAcc * dx / dist;
-          ay -= repAcc * dy / dist;
+        const overlapping = s1.right > s2.left && s2.right > s1.left && s1.bottom > s2.top && s2.bottom > s1.top;
+        if (overlapping) {
+          const overlapX = Math.min(s1.right, s2.right) - Math.max(s1.left, s2.left);
+          const overlapY = Math.min(s1.bottom, s2.bottom) - Math.max(s1.top, s2.top);
+          if (overlapX < overlapY) {
+            const sign = s1.cx < s2.cx ? -1 : 1;
+            ax += sign * this.REPULSION * overlapX;
+          } else {
+            const sign = s1.cy < s2.cy ? -1 : 1;
+            ay += sign * this.REPULSION * overlapY;
+          }
         } else {
+          const distSq = dx * dx + dy * dy;
           const gravAcc = this.G * s2.mass / (distSq + this.SOFTENING_SQ);
           ax += gravAcc * dx / dist;
           ay += gravAcc * dy / dist;
@@ -56727,14 +56740,7 @@ class GravityEngine {
       method: "applyMatrix",
       items: movedItems.map(({ id, dx, dy }) => ({
         id,
-        matrix: {
-          translateX: dx,
-          translateY: dy,
-          scaleX: 1,
-          scaleY: 1,
-          shearX: 0,
-          shearY: 0
-        }
+        matrix: { translateX: dx, translateY: dy, scaleX: 1, scaleY: 1, shearX: 0, shearY: 0 }
       }))
     };
     this.board.events.emit(operation);

package/dist/types/Gravity/GravityEngine.d.ts

@@ -8,7 +8,7 @@ export declare class GravityEngine {
     readonly G = 80;
     readonly G_CENTER = 120;
     readonly DAMPING = 0.92;
-    readonly REPULSION = 60000;
+    readonly REPULSION = 800;
     readonly TICK_MS = 33;
     readonly SYNC_MS = 300;
     readonly MAX_DISTANCE = 3000;

package/dist/types/Items/BaseItem/BaseItem.d.ts

@@ -47,6 +47,11 @@ export declare class BaseItem extends Mbr implements Geometry {
     static readonly HOVER_HIGHLIGHT_COLOR = "rgba(71, 120, 245, 0.7)";
     constructor(board: Board, id?: string, defaultItemData?: BaseItemData | undefined, isGroupItem?: boolean);
     updateChildrenIds(): void;
+    /**
+     * Called when this item's parent changes. Subclasses override this to
+     * propagate the new parent to child objects (e.g. text.parent in Sticker/Shape).
+     */
+    protected onParentChanged(_newParent: string): void;
     getId(): string;
     /**
      * Returns the parent's world matrix. For Frames, only the translation component

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "microboard-temp",
-  "version": "0.12.4",
+  "version": "0.12.6",
   "description": "A flexible interactive whiteboard library",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",