microboard-temp 0.12.3 → 0.12.5

package/dist/cjs/browser.js

@@ -54310,7 +54310,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,52 +54345,68 @@ class GravityEngine {
     const items = this.board.items.listAll().filter((item) => !item.transformation.isLocked && !EXCLUDED_ITEM_TYPES.has(item.itemType));
     if (items.length < 1)
       return;
-    let sumX = 0;
-    let sumY = 0;
-    for (const item of items) {
+    const snap = items.map((item, idx) => {
+      const pos = item.transformation.getTranslation();
       const mbr = item.getMbr();
-      sumX += mbr.left + mbr.getWidth() * 0.5;
-      sumY += mbr.top + mbr.getHeight() * 0.5;
+      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,
+        h: h2,
+        mass: w * h2
+      };
+    });
+    let sumX = 0, sumY = 0;
+    for (const s2 of snap) {
+      sumX += s2.cx;
+      sumY += s2.cy;
     }
-    const centerX = sumX / items.length;
-    const centerY = sumY / items.length;
-    for (const item of items) {
-      const id = item.getId();
-      if (!this.velocities.has(id)) {
-        this.velocities.set(id, { vx: 0, vy: 0 });
+    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 });
       }
-      const vel = this.velocities.get(id);
-      const mbr1 = item.getMbr();
-      const w1 = mbr1.getWidth();
-      const h1 = mbr1.getHeight();
+      const vel = this.velocities.get(s1.id);
       let ax = 0;
       let ay = 0;
-      const cx1 = mbr1.left + w1 * 0.5;
-      const cy1 = mbr1.top + h1 * 0.5;
-      const dcx = centerX - cx1;
-      const dcy = centerY - cy1;
+      const dcx = centerX - s1.cx;
+      const dcy = centerY - s1.cy;
       const distCenter = Math.sqrt(dcx * dcx + dcy * dcy) + 1;
       ax += this.G_CENTER * dcx / distCenter;
       ay += this.G_CENTER * dcy / distCenter;
-      const nearby = this.board.items.getEnclosedOrCrossed(cx1 - this.MAX_DISTANCE, cy1 - this.MAX_DISTANCE, cx1 + this.MAX_DISTANCE * 2, cy1 + this.MAX_DISTANCE * 2).filter((other) => other.getId() !== id && !EXCLUDED_ITEM_TYPES.has(other.itemType));
-      for (const other of nearby) {
-        const mbr2 = other.getMbr();
-        const w2 = mbr2.getWidth();
-        const h2 = mbr2.getHeight();
-        const mass2 = w2 * h2;
-        const cx2 = mbr2.left + w2 * 0.5;
-        const cy2 = mbr2.top + h2 * 0.5;
-        const dx = cx2 - cx1;
-        const dy = cy2 - cy1;
-        const distSq = dx * dx + dy * dy;
-        const dist = Math.sqrt(distSq) + 0.001;
-        const minDist = (w1 + w2) * 0.5 + (h1 + h2) * 0.5;
-        if (dist < minDist) {
-          const repAcc = this.REPULSION / (distSq + this.SOFTENING_SQ);
-          ax -= repAcc * dx / dist;
-          ay -= repAcc * dy / dist;
+      for (let j = 0;j < snap.length; j++) {
+        if (i === j)
+          continue;
+        const s2 = snap[j];
+        const dx = s2.cx - s1.cx;
+        const dy = s2.cy - s1.cy;
+        const dist = Math.sqrt(dx * dx + dy * dy) + 0.001;
+        if (dist > this.MAX_DISTANCE)
+          continue;
+        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 gravAcc = this.G * mass2 / (distSq + this.SOFTENING_SQ);
+          const distSq = dx * dx + dy * dy;
+          const gravAcc = this.G * s2.mass / (distSq + this.SOFTENING_SQ);
           ax += gravAcc * dx / dist;
           ay += gravAcc * dy / dist;
         }
@@ -54400,7 +54416,7 @@ class GravityEngine {
       const moveX = vel.vx * dt;
       const moveY = vel.vy * dt;
       if (Math.abs(moveX) >= this.MIN_MOVE_PX || Math.abs(moveY) >= this.MIN_MOVE_PX) {
-        item.transformation.applyMatrixSilent({
+        items[i].transformation.applyMatrixSilent({
           translateX: moveX,
           translateY: moveY,
           scaleX: 1,
@@ -54431,14 +54447,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

@@ -54310,7 +54310,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,52 +54345,68 @@ class GravityEngine {
     const items = this.board.items.listAll().filter((item) => !item.transformation.isLocked && !EXCLUDED_ITEM_TYPES.has(item.itemType));
     if (items.length < 1)
       return;
-    let sumX = 0;
-    let sumY = 0;
-    for (const item of items) {
+    const snap = items.map((item, idx) => {
+      const pos = item.transformation.getTranslation();
       const mbr = item.getMbr();
-      sumX += mbr.left + mbr.getWidth() * 0.5;
-      sumY += mbr.top + mbr.getHeight() * 0.5;
+      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,
+        h: h2,
+        mass: w * h2
+      };
+    });
+    let sumX = 0, sumY = 0;
+    for (const s2 of snap) {
+      sumX += s2.cx;
+      sumY += s2.cy;
     }
-    const centerX = sumX / items.length;
-    const centerY = sumY / items.length;
-    for (const item of items) {
-      const id = item.getId();
-      if (!this.velocities.has(id)) {
-        this.velocities.set(id, { vx: 0, vy: 0 });
+    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 });
       }
-      const vel = this.velocities.get(id);
-      const mbr1 = item.getMbr();
-      const w1 = mbr1.getWidth();
-      const h1 = mbr1.getHeight();
+      const vel = this.velocities.get(s1.id);
       let ax = 0;
       let ay = 0;
-      const cx1 = mbr1.left + w1 * 0.5;
-      const cy1 = mbr1.top + h1 * 0.5;
-      const dcx = centerX - cx1;
-      const dcy = centerY - cy1;
+      const dcx = centerX - s1.cx;
+      const dcy = centerY - s1.cy;
       const distCenter = Math.sqrt(dcx * dcx + dcy * dcy) + 1;
       ax += this.G_CENTER * dcx / distCenter;
       ay += this.G_CENTER * dcy / distCenter;
-      const nearby = this.board.items.getEnclosedOrCrossed(cx1 - this.MAX_DISTANCE, cy1 - this.MAX_DISTANCE, cx1 + this.MAX_DISTANCE * 2, cy1 + this.MAX_DISTANCE * 2).filter((other) => other.getId() !== id && !EXCLUDED_ITEM_TYPES.has(other.itemType));
-      for (const other of nearby) {
-        const mbr2 = other.getMbr();
-        const w2 = mbr2.getWidth();
-        const h2 = mbr2.getHeight();
-        const mass2 = w2 * h2;
-        const cx2 = mbr2.left + w2 * 0.5;
-        const cy2 = mbr2.top + h2 * 0.5;
-        const dx = cx2 - cx1;
-        const dy = cy2 - cy1;
-        const distSq = dx * dx + dy * dy;
-        const dist = Math.sqrt(distSq) + 0.001;
-        const minDist = (w1 + w2) * 0.5 + (h1 + h2) * 0.5;
-        if (dist < minDist) {
-          const repAcc = this.REPULSION / (distSq + this.SOFTENING_SQ);
-          ax -= repAcc * dx / dist;
-          ay -= repAcc * dy / dist;
+      for (let j = 0;j < snap.length; j++) {
+        if (i === j)
+          continue;
+        const s2 = snap[j];
+        const dx = s2.cx - s1.cx;
+        const dy = s2.cy - s1.cy;
+        const dist = Math.sqrt(dx * dx + dy * dy) + 0.001;
+        if (dist > this.MAX_DISTANCE)
+          continue;
+        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 gravAcc = this.G * mass2 / (distSq + this.SOFTENING_SQ);
+          const distSq = dx * dx + dy * dy;
+          const gravAcc = this.G * s2.mass / (distSq + this.SOFTENING_SQ);
           ax += gravAcc * dx / dist;
           ay += gravAcc * dy / dist;
         }
@@ -54400,7 +54416,7 @@ class GravityEngine {
       const moveX = vel.vx * dt;
       const moveY = vel.vy * dt;
       if (Math.abs(moveX) >= this.MIN_MOVE_PX || Math.abs(moveY) >= this.MIN_MOVE_PX) {
-        item.transformation.applyMatrixSilent({
+        items[i].transformation.applyMatrixSilent({
           translateX: moveX,
           translateY: moveY,
           scaleX: 1,
@@ -54431,14 +54447,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

@@ -56783,7 +56783,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,52 +56818,68 @@ class GravityEngine {
     const items = this.board.items.listAll().filter((item) => !item.transformation.isLocked && !EXCLUDED_ITEM_TYPES.has(item.itemType));
     if (items.length < 1)
       return;
-    let sumX = 0;
-    let sumY = 0;
-    for (const item of items) {
+    const snap = items.map((item, idx) => {
+      const pos = item.transformation.getTranslation();
       const mbr = item.getMbr();
-      sumX += mbr.left + mbr.getWidth() * 0.5;
-      sumY += mbr.top + mbr.getHeight() * 0.5;
+      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,
+        h: h2,
+        mass: w * h2
+      };
+    });
+    let sumX = 0, sumY = 0;
+    for (const s2 of snap) {
+      sumX += s2.cx;
+      sumY += s2.cy;
     }
-    const centerX = sumX / items.length;
-    const centerY = sumY / items.length;
-    for (const item of items) {
-      const id = item.getId();
-      if (!this.velocities.has(id)) {
-        this.velocities.set(id, { vx: 0, vy: 0 });
+    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 });
       }
-      const vel = this.velocities.get(id);
-      const mbr1 = item.getMbr();
-      const w1 = mbr1.getWidth();
-      const h1 = mbr1.getHeight();
+      const vel = this.velocities.get(s1.id);
       let ax = 0;
       let ay = 0;
-      const cx1 = mbr1.left + w1 * 0.5;
-      const cy1 = mbr1.top + h1 * 0.5;
-      const dcx = centerX - cx1;
-      const dcy = centerY - cy1;
+      const dcx = centerX - s1.cx;
+      const dcy = centerY - s1.cy;
       const distCenter = Math.sqrt(dcx * dcx + dcy * dcy) + 1;
       ax += this.G_CENTER * dcx / distCenter;
       ay += this.G_CENTER * dcy / distCenter;
-      const nearby = this.board.items.getEnclosedOrCrossed(cx1 - this.MAX_DISTANCE, cy1 - this.MAX_DISTANCE, cx1 + this.MAX_DISTANCE * 2, cy1 + this.MAX_DISTANCE * 2).filter((other) => other.getId() !== id && !EXCLUDED_ITEM_TYPES.has(other.itemType));
-      for (const other of nearby) {
-        const mbr2 = other.getMbr();
-        const w2 = mbr2.getWidth();
-        const h2 = mbr2.getHeight();
-        const mass2 = w2 * h2;
-        const cx2 = mbr2.left + w2 * 0.5;
-        const cy2 = mbr2.top + h2 * 0.5;
-        const dx = cx2 - cx1;
-        const dy = cy2 - cy1;
-        const distSq = dx * dx + dy * dy;
-        const dist = Math.sqrt(distSq) + 0.001;
-        const minDist = (w1 + w2) * 0.5 + (h1 + h2) * 0.5;
-        if (dist < minDist) {
-          const repAcc = this.REPULSION / (distSq + this.SOFTENING_SQ);
-          ax -= repAcc * dx / dist;
-          ay -= repAcc * dy / dist;
+      for (let j = 0;j < snap.length; j++) {
+        if (i === j)
+          continue;
+        const s2 = snap[j];
+        const dx = s2.cx - s1.cx;
+        const dy = s2.cy - s1.cy;
+        const dist = Math.sqrt(dx * dx + dy * dy) + 0.001;
+        if (dist > this.MAX_DISTANCE)
+          continue;
+        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 gravAcc = this.G * mass2 / (distSq + this.SOFTENING_SQ);
+          const distSq = dx * dx + dy * dy;
+          const gravAcc = this.G * s2.mass / (distSq + this.SOFTENING_SQ);
           ax += gravAcc * dx / dist;
           ay += gravAcc * dy / dist;
         }
@@ -56873,7 +56889,7 @@ class GravityEngine {
       const moveX = vel.vx * dt;
       const moveY = vel.vy * dt;
       if (Math.abs(moveX) >= this.MIN_MOVE_PX || Math.abs(moveY) >= this.MIN_MOVE_PX) {
-        item.transformation.applyMatrixSilent({
+        items[i].transformation.applyMatrixSilent({
           translateX: moveX,
           translateY: moveY,
           scaleX: 1,
@@ -56904,14 +56920,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

@@ -54139,7 +54139,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,52 +54174,68 @@ class GravityEngine {
     const items = this.board.items.listAll().filter((item) => !item.transformation.isLocked && !EXCLUDED_ITEM_TYPES.has(item.itemType));
     if (items.length < 1)
       return;
-    let sumX = 0;
-    let sumY = 0;
-    for (const item of items) {
+    const snap = items.map((item, idx) => {
+      const pos = item.transformation.getTranslation();
       const mbr = item.getMbr();
-      sumX += mbr.left + mbr.getWidth() * 0.5;
-      sumY += mbr.top + mbr.getHeight() * 0.5;
+      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,
+        h: h2,
+        mass: w * h2
+      };
+    });
+    let sumX = 0, sumY = 0;
+    for (const s2 of snap) {
+      sumX += s2.cx;
+      sumY += s2.cy;
     }
-    const centerX = sumX / items.length;
-    const centerY = sumY / items.length;
-    for (const item of items) {
-      const id = item.getId();
-      if (!this.velocities.has(id)) {
-        this.velocities.set(id, { vx: 0, vy: 0 });
+    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 });
       }
-      const vel = this.velocities.get(id);
-      const mbr1 = item.getMbr();
-      const w1 = mbr1.getWidth();
-      const h1 = mbr1.getHeight();
+      const vel = this.velocities.get(s1.id);
       let ax = 0;
       let ay = 0;
-      const cx1 = mbr1.left + w1 * 0.5;
-      const cy1 = mbr1.top + h1 * 0.5;
-      const dcx = centerX - cx1;
-      const dcy = centerY - cy1;
+      const dcx = centerX - s1.cx;
+      const dcy = centerY - s1.cy;
       const distCenter = Math.sqrt(dcx * dcx + dcy * dcy) + 1;
       ax += this.G_CENTER * dcx / distCenter;
       ay += this.G_CENTER * dcy / distCenter;
-      const nearby = this.board.items.getEnclosedOrCrossed(cx1 - this.MAX_DISTANCE, cy1 - this.MAX_DISTANCE, cx1 + this.MAX_DISTANCE * 2, cy1 + this.MAX_DISTANCE * 2).filter((other) => other.getId() !== id && !EXCLUDED_ITEM_TYPES.has(other.itemType));
-      for (const other of nearby) {
-        const mbr2 = other.getMbr();
-        const w2 = mbr2.getWidth();
-        const h2 = mbr2.getHeight();
-        const mass2 = w2 * h2;
-        const cx2 = mbr2.left + w2 * 0.5;
-        const cy2 = mbr2.top + h2 * 0.5;
-        const dx = cx2 - cx1;
-        const dy = cy2 - cy1;
-        const distSq = dx * dx + dy * dy;
-        const dist = Math.sqrt(distSq) + 0.001;
-        const minDist = (w1 + w2) * 0.5 + (h1 + h2) * 0.5;
-        if (dist < minDist) {
-          const repAcc = this.REPULSION / (distSq + this.SOFTENING_SQ);
-          ax -= repAcc * dx / dist;
-          ay -= repAcc * dy / dist;
+      for (let j = 0;j < snap.length; j++) {
+        if (i === j)
+          continue;
+        const s2 = snap[j];
+        const dx = s2.cx - s1.cx;
+        const dy = s2.cy - s1.cy;
+        const dist = Math.sqrt(dx * dx + dy * dy) + 0.001;
+        if (dist > this.MAX_DISTANCE)
+          continue;
+        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 gravAcc = this.G * mass2 / (distSq + this.SOFTENING_SQ);
+          const distSq = dx * dx + dy * dy;
+          const gravAcc = this.G * s2.mass / (distSq + this.SOFTENING_SQ);
           ax += gravAcc * dx / dist;
           ay += gravAcc * dy / dist;
         }
@@ -54229,7 +54245,7 @@ class GravityEngine {
       const moveX = vel.vx * dt;
       const moveY = vel.vy * dt;
       if (Math.abs(moveX) >= this.MIN_MOVE_PX || Math.abs(moveY) >= this.MIN_MOVE_PX) {
-        item.transformation.applyMatrixSilent({
+        items[i].transformation.applyMatrixSilent({
           translateX: moveX,
           translateY: moveY,
           scaleX: 1,
@@ -54260,14 +54276,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

@@ -54132,7 +54132,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,52 +54167,68 @@ class GravityEngine {
     const items = this.board.items.listAll().filter((item) => !item.transformation.isLocked && !EXCLUDED_ITEM_TYPES.has(item.itemType));
     if (items.length < 1)
       return;
-    let sumX = 0;
-    let sumY = 0;
-    for (const item of items) {
+    const snap = items.map((item, idx) => {
+      const pos = item.transformation.getTranslation();
       const mbr = item.getMbr();
-      sumX += mbr.left + mbr.getWidth() * 0.5;
-      sumY += mbr.top + mbr.getHeight() * 0.5;
+      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,
+        h: h2,
+        mass: w * h2
+      };
+    });
+    let sumX = 0, sumY = 0;
+    for (const s2 of snap) {
+      sumX += s2.cx;
+      sumY += s2.cy;
     }
-    const centerX = sumX / items.length;
-    const centerY = sumY / items.length;
-    for (const item of items) {
-      const id = item.getId();
-      if (!this.velocities.has(id)) {
-        this.velocities.set(id, { vx: 0, vy: 0 });
+    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 });
       }
-      const vel = this.velocities.get(id);
-      const mbr1 = item.getMbr();
-      const w1 = mbr1.getWidth();
-      const h1 = mbr1.getHeight();
+      const vel = this.velocities.get(s1.id);
       let ax = 0;
       let ay = 0;
-      const cx1 = mbr1.left + w1 * 0.5;
-      const cy1 = mbr1.top + h1 * 0.5;
-      const dcx = centerX - cx1;
-      const dcy = centerY - cy1;
+      const dcx = centerX - s1.cx;
+      const dcy = centerY - s1.cy;
       const distCenter = Math.sqrt(dcx * dcx + dcy * dcy) + 1;
       ax += this.G_CENTER * dcx / distCenter;
       ay += this.G_CENTER * dcy / distCenter;
-      const nearby = this.board.items.getEnclosedOrCrossed(cx1 - this.MAX_DISTANCE, cy1 - this.MAX_DISTANCE, cx1 + this.MAX_DISTANCE * 2, cy1 + this.MAX_DISTANCE * 2).filter((other) => other.getId() !== id && !EXCLUDED_ITEM_TYPES.has(other.itemType));
-      for (const other of nearby) {
-        const mbr2 = other.getMbr();
-        const w2 = mbr2.getWidth();
-        const h2 = mbr2.getHeight();
-        const mass2 = w2 * h2;
-        const cx2 = mbr2.left + w2 * 0.5;
-        const cy2 = mbr2.top + h2 * 0.5;
-        const dx = cx2 - cx1;
-        const dy = cy2 - cy1;
-        const distSq = dx * dx + dy * dy;
-        const dist = Math.sqrt(distSq) + 0.001;
-        const minDist = (w1 + w2) * 0.5 + (h1 + h2) * 0.5;
-        if (dist < minDist) {
-          const repAcc = this.REPULSION / (distSq + this.SOFTENING_SQ);
-          ax -= repAcc * dx / dist;
-          ay -= repAcc * dy / dist;
+      for (let j = 0;j < snap.length; j++) {
+        if (i === j)
+          continue;
+        const s2 = snap[j];
+        const dx = s2.cx - s1.cx;
+        const dy = s2.cy - s1.cy;
+        const dist = Math.sqrt(dx * dx + dy * dy) + 0.001;
+        if (dist > this.MAX_DISTANCE)
+          continue;
+        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 gravAcc = this.G * mass2 / (distSq + this.SOFTENING_SQ);
+          const distSq = dx * dx + dy * dy;
+          const gravAcc = this.G * s2.mass / (distSq + this.SOFTENING_SQ);
           ax += gravAcc * dx / dist;
           ay += gravAcc * dy / dist;
         }
@@ -54222,7 +54238,7 @@ class GravityEngine {
       const moveX = vel.vx * dt;
       const moveY = vel.vy * dt;
       if (Math.abs(moveX) >= this.MIN_MOVE_PX || Math.abs(moveY) >= this.MIN_MOVE_PX) {
-        item.transformation.applyMatrixSilent({
+        items[i].transformation.applyMatrixSilent({
           translateX: moveX,
           translateY: moveY,
           scaleX: 1,
@@ -54253,14 +54269,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

@@ -56600,7 +56600,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,52 +56635,68 @@ class GravityEngine {
     const items = this.board.items.listAll().filter((item) => !item.transformation.isLocked && !EXCLUDED_ITEM_TYPES.has(item.itemType));
     if (items.length < 1)
       return;
-    let sumX = 0;
-    let sumY = 0;
-    for (const item of items) {
+    const snap = items.map((item, idx) => {
+      const pos = item.transformation.getTranslation();
       const mbr = item.getMbr();
-      sumX += mbr.left + mbr.getWidth() * 0.5;
-      sumY += mbr.top + mbr.getHeight() * 0.5;
+      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,
+        h: h2,
+        mass: w * h2
+      };
+    });
+    let sumX = 0, sumY = 0;
+    for (const s2 of snap) {
+      sumX += s2.cx;
+      sumY += s2.cy;
     }
-    const centerX = sumX / items.length;
-    const centerY = sumY / items.length;
-    for (const item of items) {
-      const id = item.getId();
-      if (!this.velocities.has(id)) {
-        this.velocities.set(id, { vx: 0, vy: 0 });
+    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 });
       }
-      const vel = this.velocities.get(id);
-      const mbr1 = item.getMbr();
-      const w1 = mbr1.getWidth();
-      const h1 = mbr1.getHeight();
+      const vel = this.velocities.get(s1.id);
       let ax = 0;
       let ay = 0;
-      const cx1 = mbr1.left + w1 * 0.5;
-      const cy1 = mbr1.top + h1 * 0.5;
-      const dcx = centerX - cx1;
-      const dcy = centerY - cy1;
+      const dcx = centerX - s1.cx;
+      const dcy = centerY - s1.cy;
       const distCenter = Math.sqrt(dcx * dcx + dcy * dcy) + 1;
       ax += this.G_CENTER * dcx / distCenter;
       ay += this.G_CENTER * dcy / distCenter;
-      const nearby = this.board.items.getEnclosedOrCrossed(cx1 - this.MAX_DISTANCE, cy1 - this.MAX_DISTANCE, cx1 + this.MAX_DISTANCE * 2, cy1 + this.MAX_DISTANCE * 2).filter((other) => other.getId() !== id && !EXCLUDED_ITEM_TYPES.has(other.itemType));
-      for (const other of nearby) {
-        const mbr2 = other.getMbr();
-        const w2 = mbr2.getWidth();
-        const h2 = mbr2.getHeight();
-        const mass2 = w2 * h2;
-        const cx2 = mbr2.left + w2 * 0.5;
-        const cy2 = mbr2.top + h2 * 0.5;
-        const dx = cx2 - cx1;
-        const dy = cy2 - cy1;
-        const distSq = dx * dx + dy * dy;
-        const dist = Math.sqrt(distSq) + 0.001;
-        const minDist = (w1 + w2) * 0.5 + (h1 + h2) * 0.5;
-        if (dist < minDist) {
-          const repAcc = this.REPULSION / (distSq + this.SOFTENING_SQ);
-          ax -= repAcc * dx / dist;
-          ay -= repAcc * dy / dist;
+      for (let j = 0;j < snap.length; j++) {
+        if (i === j)
+          continue;
+        const s2 = snap[j];
+        const dx = s2.cx - s1.cx;
+        const dy = s2.cy - s1.cy;
+        const dist = Math.sqrt(dx * dx + dy * dy) + 0.001;
+        if (dist > this.MAX_DISTANCE)
+          continue;
+        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 gravAcc = this.G * mass2 / (distSq + this.SOFTENING_SQ);
+          const distSq = dx * dx + dy * dy;
+          const gravAcc = this.G * s2.mass / (distSq + this.SOFTENING_SQ);
           ax += gravAcc * dx / dist;
           ay += gravAcc * dy / dist;
         }
@@ -56690,7 +56706,7 @@ class GravityEngine {
       const moveX = vel.vx * dt;
       const moveY = vel.vy * dt;
       if (Math.abs(moveX) >= this.MIN_MOVE_PX || Math.abs(moveY) >= this.MIN_MOVE_PX) {
-        item.transformation.applyMatrixSilent({
+        items[i].transformation.applyMatrixSilent({
           translateX: moveX,
           translateY: moveY,
           scaleX: 1,
@@ -56721,14 +56737,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/package.json

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