microboard-temp 0.12.0 → 0.12.2

package/dist/cjs/browser.js

@@ -18215,9 +18215,9 @@ class Transformation {
     }, timeStamp);
   }
   applyMatrixSilent(matrixData) {
-    this.previous = this.matrix.copy();
-    this.matrix.scale(matrixData.scaleX, matrixData.scaleY);
-    this.matrix.translate(matrixData.translateX, matrixData.translateY);
+    this.previous = this._matrix.copy();
+    this._matrix.scale(matrixData.scaleX, matrixData.scaleY);
+    this._matrix.translate(matrixData.translateX, matrixData.translateY);
     this.subject.publish(this, {
       class: "Transformation",
       method: "applyMatrix",
@@ -19367,13 +19367,18 @@ class Comment {
       userId
     });
   }
+  _syncing = false;
   transform() {
+    if (this._syncing)
+      return;
+    this._syncing = true;
     const { translateX, translateY } = this.transformation.getMatrixData();
     if (translateX && translateY) {
       this.anchor = new Point(translateX, translateY);
     } else {
       this.transformation.setLocal(this.anchor.x, this.anchor.y);
     }
+    this._syncing = false;
   }
   getUnreadMessages(userId = ANONYMOUS_ID) {
     const unreadMessages = this.thread.filter((mes) => mes && !mes.readers.includes(userId));
@@ -22200,7 +22205,6 @@ class RichText extends BaseItem {
   _onLimitReached = () => {};
   shrinkWidth = false;
   prevMbr = null;
-  worldMatrixGetter;
   rtCounter = 0;
   constructor(board, container, id = "", transformation = new Transformation(id, board.events), linkTo, placeholderText = conf.i18n?.t("board.textPlaceholder"), isInShape = false, autoSize = false, insideOf, initialTextStyles = conf.DEFAULT_TEXT_STYLES) {
     super(board, id);
@@ -22423,18 +22427,7 @@ class RichText extends BaseItem {
       top = container.top;
     }
     const point3 = new Point(left, top);
-    if (this.worldMatrixGetter) {
-      this.worldMatrixGetter().apply(point3);
-    } else if (this.isInShape) {
-      const item = this.board.items.getById(this.id);
-      if (item) {
-        item.getParentWorldMatrix().apply(point3);
-      } else {
-        this.getParentWorldMatrix().apply(point3);
-      }
-    } else {
-      this.getParentWorldMatrix().apply(point3);
-    }
+    this.getParentWorldMatrix().apply(point3);
     return {
       point: point3,
       width,
@@ -36538,6 +36531,11 @@ class AINode extends BaseItem {
     this.linkTo.setId(id);
     return this;
   }
+  onParentChanged(newParent) {
+    if (this.text) {
+      this.text.parent = newParent;
+    }
+  }
   getId() {
     return this.id;
   }
@@ -40062,6 +40060,11 @@ class Shape extends BaseItem {
     this.linkTo.setId(id);
     return this;
   }
+  onParentChanged(newParent) {
+    if (this.text) {
+      this.text.parent = newParent;
+    }
+  }
   getId() {
     return this.id;
   }
@@ -40594,6 +40597,11 @@ class Sticker extends BaseItem {
     this.transformation.setId(id);
     return this;
   }
+  onParentChanged(newParent) {
+    if (this.text) {
+      this.text.parent = newParent;
+    }
+  }
   getId() {
     return this.id;
   }
@@ -41121,15 +41129,6 @@ class Frame2 extends BaseItem {
       y: translateY
     }, timeStamp);
     const newMatrix = this.transformation.toMatrix();
-    if (newMatrix.translateX !== oldMatrix.translateX || newMatrix.translateY !== oldMatrix.translateY) {
-      const dx = newMatrix.translateX - oldMatrix.translateX;
-      const dy = newMatrix.translateY - oldMatrix.translateY;
-      this.index?.list().forEach((child) => {
-        if (child instanceof BaseItem) {
-          child.transformation.translateBy(-dx, -dy, timeStamp);
-        }
-      });
-    }
     this.setLastFrameScale();
     res.mbr = this.getMbr();
     return res;
@@ -54297,14 +54296,18 @@ class BoardSelection {
   }
 }
 // src/Gravity/GravityEngine.ts
+var EXCLUDED_ITEM_TYPES = new Set(["Comment", "Connector"]);
+
 class GravityEngine {
   board;
   velocities = new Map;
   tickTimer = null;
   syncTimer = null;
   lastSyncedPositions = new Map;
-  G = 500;
-  DAMPING = 0.98;
+  G = 80;
+  G_CENTER = 120;
+  DAMPING = 0.92;
+  REPULSION = 60000;
   TICK_MS = 33;
   SYNC_MS = 300;
   MAX_DISTANCE = 3000;
@@ -54336,9 +54339,18 @@ class GravityEngine {
   }
   tick() {
     const dt = this.TICK_MS / 1000;
-    const items = this.board.items.listAll().filter((item) => !item.transformation.isLocked);
-    if (items.length < 2)
+    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 pos = item.transformation.getTranslation();
+      sumX += pos.x;
+      sumY += pos.y;
+    }
+    const centerX = sumX / items.length;
+    const centerY = sumY / items.length;
     for (const item of items) {
       const id = item.getId();
       if (!this.velocities.has(id)) {
@@ -54347,30 +54359,45 @@ class GravityEngine {
       const vel = this.velocities.get(id);
       const pos1 = item.transformation.getTranslation();
       const mbr1 = item.getMbr();
-      const mass1 = mbr1.getWidth() * mbr1.getHeight();
-      const nearby = this.board.items.getEnclosedOrCrossed(pos1.x - this.MAX_DISTANCE, pos1.y - this.MAX_DISTANCE, pos1.x + this.MAX_DISTANCE * 2, pos1.y + this.MAX_DISTANCE * 2).filter((other) => other.getId() !== id);
+      const w1 = mbr1.getWidth();
+      const h1 = mbr1.getHeight();
       let ax = 0;
       let ay = 0;
+      const dcx = centerX - pos1.x;
+      const dcy = centerY - pos1.y;
+      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(pos1.x - this.MAX_DISTANCE, pos1.y - this.MAX_DISTANCE, pos1.x + this.MAX_DISTANCE * 2, pos1.y + this.MAX_DISTANCE * 2).filter((other) => other.getId() !== id && !EXCLUDED_ITEM_TYPES.has(other.itemType));
       for (const other of nearby) {
         const pos2 = other.transformation.getTranslation();
         const mbr2 = other.getMbr();
-        const mass2 = mbr2.getWidth() * mbr2.getHeight();
-        const dx2 = pos2.x - pos1.x;
-        const dy2 = pos2.y - pos1.y;
-        const distSq = dx2 * dx2 + dy2 * dy2 + this.SOFTENING_SQ;
-        const dist = Math.sqrt(distSq);
-        const acc = this.G * mass2 / distSq;
-        ax += acc * dx2 / dist;
-        ay += acc * dy2 / dist;
+        const w2 = mbr2.getWidth();
+        const h2 = mbr2.getHeight();
+        const mass2 = w2 * h2;
+        const dx = pos2.x - pos1.x;
+        const dy = pos2.y - pos1.y;
+        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;
+        } else {
+          const gravAcc = this.G * mass2 / (distSq + this.SOFTENING_SQ);
+          ax += gravAcc * dx / dist;
+          ay += gravAcc * dy / dist;
+        }
       }
       vel.vx = (vel.vx + ax * dt) * this.DAMPING;
       vel.vy = (vel.vy + ay * dt) * this.DAMPING;
-      const dx = vel.vx * dt;
-      const dy = vel.vy * dt;
-      if (Math.abs(dx) >= this.MIN_MOVE_PX || Math.abs(dy) >= this.MIN_MOVE_PX) {
+      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({
-          translateX: dx,
-          translateY: dy,
+          translateX: moveX,
+          translateY: moveY,
           scaleX: 1,
           scaleY: 1,
           shearX: 0,
@@ -54380,7 +54407,7 @@ class GravityEngine {
     }
   }
   syncPositions() {
-    const items = this.board.items.listAll().filter((item) => !item.transformation.isLocked);
+    const items = this.board.items.listAll().filter((item) => !item.transformation.isLocked && !EXCLUDED_ITEM_TYPES.has(item.itemType));
     if (items.length === 0)
       return;
     const movedItems = items.map((item) => {

package/dist/cjs/index.js

@@ -18215,9 +18215,9 @@ class Transformation {
     }, timeStamp);
   }
   applyMatrixSilent(matrixData) {
-    this.previous = this.matrix.copy();
-    this.matrix.scale(matrixData.scaleX, matrixData.scaleY);
-    this.matrix.translate(matrixData.translateX, matrixData.translateY);
+    this.previous = this._matrix.copy();
+    this._matrix.scale(matrixData.scaleX, matrixData.scaleY);
+    this._matrix.translate(matrixData.translateX, matrixData.translateY);
     this.subject.publish(this, {
       class: "Transformation",
       method: "applyMatrix",
@@ -19367,13 +19367,18 @@ class Comment {
       userId
     });
   }
+  _syncing = false;
   transform() {
+    if (this._syncing)
+      return;
+    this._syncing = true;
     const { translateX, translateY } = this.transformation.getMatrixData();
     if (translateX && translateY) {
       this.anchor = new Point(translateX, translateY);
     } else {
       this.transformation.setLocal(this.anchor.x, this.anchor.y);
     }
+    this._syncing = false;
   }
   getUnreadMessages(userId = ANONYMOUS_ID) {
     const unreadMessages = this.thread.filter((mes) => mes && !mes.readers.includes(userId));
@@ -22200,7 +22205,6 @@ class RichText extends BaseItem {
   _onLimitReached = () => {};
   shrinkWidth = false;
   prevMbr = null;
-  worldMatrixGetter;
   rtCounter = 0;
   constructor(board, container, id = "", transformation = new Transformation(id, board.events), linkTo, placeholderText = conf.i18n?.t("board.textPlaceholder"), isInShape = false, autoSize = false, insideOf, initialTextStyles = conf.DEFAULT_TEXT_STYLES) {
     super(board, id);
@@ -22423,18 +22427,7 @@ class RichText extends BaseItem {
       top = container.top;
     }
     const point3 = new Point(left, top);
-    if (this.worldMatrixGetter) {
-      this.worldMatrixGetter().apply(point3);
-    } else if (this.isInShape) {
-      const item = this.board.items.getById(this.id);
-      if (item) {
-        item.getParentWorldMatrix().apply(point3);
-      } else {
-        this.getParentWorldMatrix().apply(point3);
-      }
-    } else {
-      this.getParentWorldMatrix().apply(point3);
-    }
+    this.getParentWorldMatrix().apply(point3);
     return {
       point: point3,
       width,
@@ -36538,6 +36531,11 @@ class AINode extends BaseItem {
     this.linkTo.setId(id);
     return this;
   }
+  onParentChanged(newParent) {
+    if (this.text) {
+      this.text.parent = newParent;
+    }
+  }
   getId() {
     return this.id;
   }
@@ -40062,6 +40060,11 @@ class Shape extends BaseItem {
     this.linkTo.setId(id);
     return this;
   }
+  onParentChanged(newParent) {
+    if (this.text) {
+      this.text.parent = newParent;
+    }
+  }
   getId() {
     return this.id;
   }
@@ -40594,6 +40597,11 @@ class Sticker extends BaseItem {
     this.transformation.setId(id);
     return this;
   }
+  onParentChanged(newParent) {
+    if (this.text) {
+      this.text.parent = newParent;
+    }
+  }
   getId() {
     return this.id;
   }
@@ -41121,15 +41129,6 @@ class Frame2 extends BaseItem {
       y: translateY
     }, timeStamp);
     const newMatrix = this.transformation.toMatrix();
-    if (newMatrix.translateX !== oldMatrix.translateX || newMatrix.translateY !== oldMatrix.translateY) {
-      const dx = newMatrix.translateX - oldMatrix.translateX;
-      const dy = newMatrix.translateY - oldMatrix.translateY;
-      this.index?.list().forEach((child) => {
-        if (child instanceof BaseItem) {
-          child.transformation.translateBy(-dx, -dy, timeStamp);
-        }
-      });
-    }
     this.setLastFrameScale();
     res.mbr = this.getMbr();
     return res;
@@ -54297,14 +54296,18 @@ class BoardSelection {
   }
 }
 // src/Gravity/GravityEngine.ts
+var EXCLUDED_ITEM_TYPES = new Set(["Comment", "Connector"]);
+
 class GravityEngine {
   board;
   velocities = new Map;
   tickTimer = null;
   syncTimer = null;
   lastSyncedPositions = new Map;
-  G = 500;
-  DAMPING = 0.98;
+  G = 80;
+  G_CENTER = 120;
+  DAMPING = 0.92;
+  REPULSION = 60000;
   TICK_MS = 33;
   SYNC_MS = 300;
   MAX_DISTANCE = 3000;
@@ -54336,9 +54339,18 @@ class GravityEngine {
   }
   tick() {
     const dt = this.TICK_MS / 1000;
-    const items = this.board.items.listAll().filter((item) => !item.transformation.isLocked);
-    if (items.length < 2)
+    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 pos = item.transformation.getTranslation();
+      sumX += pos.x;
+      sumY += pos.y;
+    }
+    const centerX = sumX / items.length;
+    const centerY = sumY / items.length;
     for (const item of items) {
       const id = item.getId();
       if (!this.velocities.has(id)) {
@@ -54347,30 +54359,45 @@ class GravityEngine {
       const vel = this.velocities.get(id);
       const pos1 = item.transformation.getTranslation();
       const mbr1 = item.getMbr();
-      const mass1 = mbr1.getWidth() * mbr1.getHeight();
-      const nearby = this.board.items.getEnclosedOrCrossed(pos1.x - this.MAX_DISTANCE, pos1.y - this.MAX_DISTANCE, pos1.x + this.MAX_DISTANCE * 2, pos1.y + this.MAX_DISTANCE * 2).filter((other) => other.getId() !== id);
+      const w1 = mbr1.getWidth();
+      const h1 = mbr1.getHeight();
       let ax = 0;
       let ay = 0;
+      const dcx = centerX - pos1.x;
+      const dcy = centerY - pos1.y;
+      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(pos1.x - this.MAX_DISTANCE, pos1.y - this.MAX_DISTANCE, pos1.x + this.MAX_DISTANCE * 2, pos1.y + this.MAX_DISTANCE * 2).filter((other) => other.getId() !== id && !EXCLUDED_ITEM_TYPES.has(other.itemType));
       for (const other of nearby) {
         const pos2 = other.transformation.getTranslation();
         const mbr2 = other.getMbr();
-        const mass2 = mbr2.getWidth() * mbr2.getHeight();
-        const dx2 = pos2.x - pos1.x;
-        const dy2 = pos2.y - pos1.y;
-        const distSq = dx2 * dx2 + dy2 * dy2 + this.SOFTENING_SQ;
-        const dist = Math.sqrt(distSq);
-        const acc = this.G * mass2 / distSq;
-        ax += acc * dx2 / dist;
-        ay += acc * dy2 / dist;
+        const w2 = mbr2.getWidth();
+        const h2 = mbr2.getHeight();
+        const mass2 = w2 * h2;
+        const dx = pos2.x - pos1.x;
+        const dy = pos2.y - pos1.y;
+        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;
+        } else {
+          const gravAcc = this.G * mass2 / (distSq + this.SOFTENING_SQ);
+          ax += gravAcc * dx / dist;
+          ay += gravAcc * dy / dist;
+        }
       }
       vel.vx = (vel.vx + ax * dt) * this.DAMPING;
       vel.vy = (vel.vy + ay * dt) * this.DAMPING;
-      const dx = vel.vx * dt;
-      const dy = vel.vy * dt;
-      if (Math.abs(dx) >= this.MIN_MOVE_PX || Math.abs(dy) >= this.MIN_MOVE_PX) {
+      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({
-          translateX: dx,
-          translateY: dy,
+          translateX: moveX,
+          translateY: moveY,
           scaleX: 1,
           scaleY: 1,
           shearX: 0,
@@ -54380,7 +54407,7 @@ class GravityEngine {
     }
   }
   syncPositions() {
-    const items = this.board.items.listAll().filter((item) => !item.transformation.isLocked);
+    const items = this.board.items.listAll().filter((item) => !item.transformation.isLocked && !EXCLUDED_ITEM_TYPES.has(item.itemType));
     if (items.length === 0)
       return;
     const movedItems = items.map((item) => {

package/dist/cjs/node.js

@@ -20755,9 +20755,9 @@ class Transformation {
     }, timeStamp);
   }
   applyMatrixSilent(matrixData) {
-    this.previous = this.matrix.copy();
-    this.matrix.scale(matrixData.scaleX, matrixData.scaleY);
-    this.matrix.translate(matrixData.translateX, matrixData.translateY);
+    this.previous = this._matrix.copy();
+    this._matrix.scale(matrixData.scaleX, matrixData.scaleY);
+    this._matrix.translate(matrixData.translateX, matrixData.translateY);
     this.subject.publish(this, {
       class: "Transformation",
       method: "applyMatrix",
@@ -21906,13 +21906,18 @@ class Comment {
       userId
     });
   }
+  _syncing = false;
   transform() {
+    if (this._syncing)
+      return;
+    this._syncing = true;
     const { translateX, translateY } = this.transformation.getMatrixData();
     if (translateX && translateY) {
       this.anchor = new Point(translateX, translateY);
     } else {
       this.transformation.setLocal(this.anchor.x, this.anchor.y);
     }
+    this._syncing = false;
   }
   getUnreadMessages(userId = ANONYMOUS_ID) {
     const unreadMessages = this.thread.filter((mes) => mes && !mes.readers.includes(userId));
@@ -24672,7 +24677,6 @@ class RichText extends BaseItem {
   _onLimitReached = () => {};
   shrinkWidth = false;
   prevMbr = null;
-  worldMatrixGetter;
   rtCounter = 0;
   constructor(board, container, id = "", transformation = new Transformation(id, board.events), linkTo, placeholderText = conf.i18n?.t("board.textPlaceholder"), isInShape = false, autoSize = false, insideOf, initialTextStyles = conf.DEFAULT_TEXT_STYLES) {
     super(board, id);
@@ -24895,18 +24899,7 @@ class RichText extends BaseItem {
       top = container.top;
     }
     const point3 = new Point(left, top);
-    if (this.worldMatrixGetter) {
-      this.worldMatrixGetter().apply(point3);
-    } else if (this.isInShape) {
-      const item = this.board.items.getById(this.id);
-      if (item) {
-        item.getParentWorldMatrix().apply(point3);
-      } else {
-        this.getParentWorldMatrix().apply(point3);
-      }
-    } else {
-      this.getParentWorldMatrix().apply(point3);
-    }
+    this.getParentWorldMatrix().apply(point3);
     return {
       point: point3,
       width,
@@ -39011,6 +39004,11 @@ class AINode extends BaseItem {
     this.linkTo.setId(id);
     return this;
   }
+  onParentChanged(newParent) {
+    if (this.text) {
+      this.text.parent = newParent;
+    }
+  }
   getId() {
     return this.id;
   }
@@ -42535,6 +42533,11 @@ class Shape extends BaseItem {
     this.linkTo.setId(id);
     return this;
   }
+  onParentChanged(newParent) {
+    if (this.text) {
+      this.text.parent = newParent;
+    }
+  }
   getId() {
     return this.id;
   }
@@ -43067,6 +43070,11 @@ class Sticker extends BaseItem {
     this.transformation.setId(id);
     return this;
   }
+  onParentChanged(newParent) {
+    if (this.text) {
+      this.text.parent = newParent;
+    }
+  }
   getId() {
     return this.id;
   }
@@ -43594,15 +43602,6 @@ class Frame2 extends BaseItem {
       y: translateY
     }, timeStamp);
     const newMatrix = this.transformation.toMatrix();
-    if (newMatrix.translateX !== oldMatrix.translateX || newMatrix.translateY !== oldMatrix.translateY) {
-      const dx = newMatrix.translateX - oldMatrix.translateX;
-      const dy = newMatrix.translateY - oldMatrix.translateY;
-      this.index?.list().forEach((child) => {
-        if (child instanceof BaseItem) {
-          child.transformation.translateBy(-dx, -dy, timeStamp);
-        }
-      });
-    }
     this.setLastFrameScale();
     res.mbr = this.getMbr();
     return res;
@@ -56770,14 +56769,18 @@ class BoardSelection {
   }
 }
 // src/Gravity/GravityEngine.ts
+var EXCLUDED_ITEM_TYPES = new Set(["Comment", "Connector"]);
+
 class GravityEngine {
   board;
   velocities = new Map;
   tickTimer = null;
   syncTimer = null;
   lastSyncedPositions = new Map;
-  G = 500;
-  DAMPING = 0.98;
+  G = 80;
+  G_CENTER = 120;
+  DAMPING = 0.92;
+  REPULSION = 60000;
   TICK_MS = 33;
   SYNC_MS = 300;
   MAX_DISTANCE = 3000;
@@ -56809,9 +56812,18 @@ class GravityEngine {
   }
   tick() {
     const dt = this.TICK_MS / 1000;
-    const items = this.board.items.listAll().filter((item) => !item.transformation.isLocked);
-    if (items.length < 2)
+    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 pos = item.transformation.getTranslation();
+      sumX += pos.x;
+      sumY += pos.y;
+    }
+    const centerX = sumX / items.length;
+    const centerY = sumY / items.length;
     for (const item of items) {
       const id = item.getId();
       if (!this.velocities.has(id)) {
@@ -56820,30 +56832,45 @@ class GravityEngine {
       const vel = this.velocities.get(id);
       const pos1 = item.transformation.getTranslation();
       const mbr1 = item.getMbr();
-      const mass1 = mbr1.getWidth() * mbr1.getHeight();
-      const nearby = this.board.items.getEnclosedOrCrossed(pos1.x - this.MAX_DISTANCE, pos1.y - this.MAX_DISTANCE, pos1.x + this.MAX_DISTANCE * 2, pos1.y + this.MAX_DISTANCE * 2).filter((other) => other.getId() !== id);
+      const w1 = mbr1.getWidth();
+      const h1 = mbr1.getHeight();
       let ax = 0;
       let ay = 0;
+      const dcx = centerX - pos1.x;
+      const dcy = centerY - pos1.y;
+      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(pos1.x - this.MAX_DISTANCE, pos1.y - this.MAX_DISTANCE, pos1.x + this.MAX_DISTANCE * 2, pos1.y + this.MAX_DISTANCE * 2).filter((other) => other.getId() !== id && !EXCLUDED_ITEM_TYPES.has(other.itemType));
       for (const other of nearby) {
         const pos2 = other.transformation.getTranslation();
         const mbr2 = other.getMbr();
-        const mass2 = mbr2.getWidth() * mbr2.getHeight();
-        const dx2 = pos2.x - pos1.x;
-        const dy2 = pos2.y - pos1.y;
-        const distSq = dx2 * dx2 + dy2 * dy2 + this.SOFTENING_SQ;
-        const dist = Math.sqrt(distSq);
-        const acc = this.G * mass2 / distSq;
-        ax += acc * dx2 / dist;
-        ay += acc * dy2 / dist;
+        const w2 = mbr2.getWidth();
+        const h2 = mbr2.getHeight();
+        const mass2 = w2 * h2;
+        const dx = pos2.x - pos1.x;
+        const dy = pos2.y - pos1.y;
+        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;
+        } else {
+          const gravAcc = this.G * mass2 / (distSq + this.SOFTENING_SQ);
+          ax += gravAcc * dx / dist;
+          ay += gravAcc * dy / dist;
+        }
       }
       vel.vx = (vel.vx + ax * dt) * this.DAMPING;
       vel.vy = (vel.vy + ay * dt) * this.DAMPING;
-      const dx = vel.vx * dt;
-      const dy = vel.vy * dt;
-      if (Math.abs(dx) >= this.MIN_MOVE_PX || Math.abs(dy) >= this.MIN_MOVE_PX) {
+      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({
-          translateX: dx,
-          translateY: dy,
+          translateX: moveX,
+          translateY: moveY,
           scaleX: 1,
           scaleY: 1,
           shearX: 0,
@@ -56853,7 +56880,7 @@ class GravityEngine {
     }
   }
   syncPositions() {
-    const items = this.board.items.listAll().filter((item) => !item.transformation.isLocked);
+    const items = this.board.items.listAll().filter((item) => !item.transformation.isLocked && !EXCLUDED_ITEM_TYPES.has(item.itemType));
     if (items.length === 0)
       return;
     const movedItems = items.map((item) => {