@dnd-kit/collision 0.0.6-beta-20240716134007 → 0.0.6-beta-20240716203233

package/dist/index.cjs

@@ -21,6 +21,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var src_exports = {};
 __export(src_exports, {
   closestCenter: () => closestCenter,
+  closestCorners: () => closestCorners,
   defaultCollisionDetection: () => defaultCollisionDetection,
   directionBiased: () => directionBiased,
   pointerDistance: () => pointerDistance,
@@ -63,15 +64,16 @@ var shapeIntersection = ({
   dragOperation,
   droppable
 }) => {
-  if (!droppable.shape) {
+  const { shape } = dragOperation;
+  if (!droppable.shape || !(shape == null ? void 0 : shape.current)) {
     return null;
   }
-  const { shape } = dragOperation;
-  const intersectionArea = shape == null ? void 0 : shape.current.intersectionArea(droppable.shape);
+  const intersectionArea = shape.current.intersectionArea(droppable.shape);
   if (intersectionArea) {
     const { position } = dragOperation;
     const distance = import_geometry2.Point.distance(droppable.shape.center, position.current);
-    const value = 1 / distance;
+    const intersectionRatio = intersectionArea / (shape.current.area + droppable.shape.area - intersectionArea);
+    const value = intersectionRatio / distance;
     return {
       id: droppable.id,
       value,
@@ -88,9 +90,56 @@ var defaultCollisionDetection = (args) => {
   return (_a = pointerIntersection(args)) != null ? _a : shapeIntersection(args);
 };
 
-// src/algorithms/closestCenter.ts
+// src/algorithms/closestCorners.ts
 var import_abstract3 = require("@dnd-kit/abstract");
 var import_geometry3 = require("@dnd-kit/geometry");
+var closestCorners = (input) => {
+  const { dragOperation, droppable } = input;
+  const { shape, position } = dragOperation;
+  if (!droppable.shape) {
+    return null;
+  }
+  const { left, top, right, bottom } = droppable.shape.boundingRectangle;
+  const corners = [
+    {
+      x: left,
+      y: top
+    },
+    {
+      x: right,
+      y: top
+    },
+    {
+      x: left,
+      y: bottom
+    },
+    {
+      x: right,
+      y: bottom
+    }
+  ];
+  const distance = corners.reduce(
+    (acc, corner) => {
+      var _a;
+      return acc + import_geometry3.Point.distance(
+        import_geometry3.Point.from(corner),
+        (_a = shape == null ? void 0 : shape.current.center) != null ? _a : position.current
+      );
+    },
+    0
+  );
+  const value = distance / 4;
+  return {
+    id: droppable.id,
+    value: 1 / value,
+    type: import_abstract3.CollisionType.Collision,
+    priority: import_abstract3.CollisionPriority.Normal
+  };
+};
+
+// src/algorithms/closestCenter.ts
+var import_abstract4 = require("@dnd-kit/abstract");
+var import_geometry4 = require("@dnd-kit/geometry");
 var closestCenter = (input) => {
   var _a;
   const { dragOperation, droppable } = input;
@@ -102,7 +151,7 @@ var closestCenter = (input) => {
   if (collision) {
     return collision;
   }
-  const distance = import_geometry3.Point.distance(
+  const distance = import_geometry4.Point.distance(
     droppable.shape.center,
     (_a = shape == null ? void 0 : shape.current.center) != null ? _a : position.current
   );
@@ -110,14 +159,14 @@ var closestCenter = (input) => {
   return {
     id: droppable.id,
     value,
-    type: import_abstract3.CollisionType.Collision,
-    priority: import_abstract3.CollisionPriority.Normal
+    type: import_abstract4.CollisionType.Collision,
+    priority: import_abstract4.CollisionPriority.Normal
   };
 };
 
 // src/algorithms/directionBiased.ts
-var import_abstract4 = require("@dnd-kit/abstract");
-var import_geometry4 = require("@dnd-kit/geometry");
+var import_abstract5 = require("@dnd-kit/abstract");
+var import_geometry5 = require("@dnd-kit/geometry");
 var directionBiased = ({
   dragOperation,
   droppable
@@ -137,35 +186,36 @@ var directionBiased = ({
   if (direction === "down" && boundingRectangle.bottom >= droppable.shape.center.y || direction === "up" && boundingRectangle.top <= droppable.shape.center.y || direction === "left" && boundingRectangle.left <= droppable.shape.center.x || direction === "right" && boundingRectangle.right >= droppable.shape.center.x) {
     return {
       id: droppable.id,
-      value: 1 / import_geometry4.Point.distance(droppable.shape.center, center),
-      type: import_abstract4.CollisionType.Collision,
-      priority: import_abstract4.CollisionPriority.Normal
+      value: 1 / import_geometry5.Point.distance(droppable.shape.center, center),
+      type: import_abstract5.CollisionType.Collision,
+      priority: import_abstract5.CollisionPriority.Normal
     };
   }
   return null;
 };
 
 // src/algorithms/pointerDistance.ts
-var import_abstract5 = require("@dnd-kit/abstract");
-var import_geometry5 = require("@dnd-kit/geometry");
+var import_abstract6 = require("@dnd-kit/abstract");
+var import_geometry6 = require("@dnd-kit/geometry");
 var pointerDistance = (input) => {
   const { dragOperation, droppable } = input;
   const { position } = dragOperation;
   if (!droppable.shape) {
     return null;
   }
-  const distance = import_geometry5.Point.distance(droppable.shape.center, position.current);
+  const distance = import_geometry6.Point.distance(droppable.shape.center, position.current);
   const value = 1 / distance;
   return {
     id: droppable.id,
     value,
-    type: import_abstract5.CollisionType.Collision,
-    priority: import_abstract5.CollisionPriority.Normal
+    type: import_abstract6.CollisionType.Collision,
+    priority: import_abstract6.CollisionPriority.Normal
   };
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   closestCenter,
+  closestCorners,
   defaultCollisionDetection,
   directionBiased,
   pointerDistance,

package/dist/index.d.cts

@@ -9,6 +9,11 @@ export { CollisionDetector } from '@dnd-kit/abstract';
  */
 declare const defaultCollisionDetection: CollisionDetector;
 
+/**
+ * Returns the distance between the corners of the droppable shape and the drag operation shape.
+ */
+declare const closestCorners: CollisionDetector;
+
 /**
  * Returns the distance between the droppable shape and the drag operation shape.
  */
@@ -38,4 +43,4 @@ declare const directionBiased: CollisionDetector;
  */
 declare const pointerDistance: CollisionDetector;
 
-export { closestCenter, defaultCollisionDetection, directionBiased, pointerDistance, pointerIntersection, shapeIntersection };
+export { closestCenter, closestCorners, defaultCollisionDetection, directionBiased, pointerDistance, pointerIntersection, shapeIntersection };

package/dist/index.d.ts

@@ -9,6 +9,11 @@ export { CollisionDetector } from '@dnd-kit/abstract';
  */
 declare const defaultCollisionDetection: CollisionDetector;
 
+/**
+ * Returns the distance between the corners of the droppable shape and the drag operation shape.
+ */
+declare const closestCorners: CollisionDetector;
+
 /**
  * Returns the distance between the droppable shape and the drag operation shape.
  */
@@ -38,4 +43,4 @@ declare const directionBiased: CollisionDetector;
  */
 declare const pointerDistance: CollisionDetector;
 
-export { closestCenter, defaultCollisionDetection, directionBiased, pointerDistance, pointerIntersection, shapeIntersection };
+export { closestCenter, closestCorners, defaultCollisionDetection, directionBiased, pointerDistance, pointerIntersection, shapeIntersection };

package/dist/index.js

@@ -32,15 +32,16 @@ var shapeIntersection = ({
   dragOperation,
   droppable
 }) => {
-  if (!droppable.shape) {
+  const { shape } = dragOperation;
+  if (!droppable.shape || !(shape == null ? void 0 : shape.current)) {
     return null;
   }
-  const { shape } = dragOperation;
-  const intersectionArea = shape == null ? void 0 : shape.current.intersectionArea(droppable.shape);
+  const intersectionArea = shape.current.intersectionArea(droppable.shape);
   if (intersectionArea) {
     const { position } = dragOperation;
     const distance = Point2.distance(droppable.shape.center, position.current);
-    const value = 1 / distance;
+    const intersectionRatio = intersectionArea / (shape.current.area + droppable.shape.area - intersectionArea);
+    const value = intersectionRatio / distance;
     return {
       id: droppable.id,
       value,
@@ -57,9 +58,56 @@ var defaultCollisionDetection = (args) => {
   return (_a = pointerIntersection(args)) != null ? _a : shapeIntersection(args);
 };
 
-// src/algorithms/closestCenter.ts
+// src/algorithms/closestCorners.ts
 import { CollisionPriority as CollisionPriority3, CollisionType as CollisionType3 } from "@dnd-kit/abstract";
 import { Point as Point3 } from "@dnd-kit/geometry";
+var closestCorners = (input) => {
+  const { dragOperation, droppable } = input;
+  const { shape, position } = dragOperation;
+  if (!droppable.shape) {
+    return null;
+  }
+  const { left, top, right, bottom } = droppable.shape.boundingRectangle;
+  const corners = [
+    {
+      x: left,
+      y: top
+    },
+    {
+      x: right,
+      y: top
+    },
+    {
+      x: left,
+      y: bottom
+    },
+    {
+      x: right,
+      y: bottom
+    }
+  ];
+  const distance = corners.reduce(
+    (acc, corner) => {
+      var _a;
+      return acc + Point3.distance(
+        Point3.from(corner),
+        (_a = shape == null ? void 0 : shape.current.center) != null ? _a : position.current
+      );
+    },
+    0
+  );
+  const value = distance / 4;
+  return {
+    id: droppable.id,
+    value: 1 / value,
+    type: CollisionType3.Collision,
+    priority: CollisionPriority3.Normal
+  };
+};
+
+// src/algorithms/closestCenter.ts
+import { CollisionPriority as CollisionPriority4, CollisionType as CollisionType4 } from "@dnd-kit/abstract";
+import { Point as Point4 } from "@dnd-kit/geometry";
 var closestCenter = (input) => {
   var _a;
   const { dragOperation, droppable } = input;
@@ -71,7 +119,7 @@ var closestCenter = (input) => {
   if (collision) {
     return collision;
   }
-  const distance = Point3.distance(
+  const distance = Point4.distance(
     droppable.shape.center,
     (_a = shape == null ? void 0 : shape.current.center) != null ? _a : position.current
   );
@@ -79,14 +127,14 @@ var closestCenter = (input) => {
   return {
     id: droppable.id,
     value,
-    type: CollisionType3.Collision,
-    priority: CollisionPriority3.Normal
+    type: CollisionType4.Collision,
+    priority: CollisionPriority4.Normal
   };
 };
 
 // src/algorithms/directionBiased.ts
-import { CollisionPriority as CollisionPriority4, CollisionType as CollisionType4 } from "@dnd-kit/abstract";
-import { Point as Point4 } from "@dnd-kit/geometry";
+import { CollisionPriority as CollisionPriority5, CollisionType as CollisionType5 } from "@dnd-kit/abstract";
+import { Point as Point5 } from "@dnd-kit/geometry";
 var directionBiased = ({
   dragOperation,
   droppable
@@ -106,34 +154,35 @@ var directionBiased = ({
   if (direction === "down" && boundingRectangle.bottom >= droppable.shape.center.y || direction === "up" && boundingRectangle.top <= droppable.shape.center.y || direction === "left" && boundingRectangle.left <= droppable.shape.center.x || direction === "right" && boundingRectangle.right >= droppable.shape.center.x) {
     return {
       id: droppable.id,
-      value: 1 / Point4.distance(droppable.shape.center, center),
-      type: CollisionType4.Collision,
-      priority: CollisionPriority4.Normal
+      value: 1 / Point5.distance(droppable.shape.center, center),
+      type: CollisionType5.Collision,
+      priority: CollisionPriority5.Normal
     };
   }
   return null;
 };
 
 // src/algorithms/pointerDistance.ts
-import { CollisionPriority as CollisionPriority5, CollisionType as CollisionType5 } from "@dnd-kit/abstract";
-import { Point as Point5 } from "@dnd-kit/geometry";
+import { CollisionPriority as CollisionPriority6, CollisionType as CollisionType6 } from "@dnd-kit/abstract";
+import { Point as Point6 } from "@dnd-kit/geometry";
 var pointerDistance = (input) => {
   const { dragOperation, droppable } = input;
   const { position } = dragOperation;
   if (!droppable.shape) {
     return null;
   }
-  const distance = Point5.distance(droppable.shape.center, position.current);
+  const distance = Point6.distance(droppable.shape.center, position.current);
   const value = 1 / distance;
   return {
     id: droppable.id,
     value,
-    type: CollisionType5.Collision,
-    priority: CollisionPriority5.Normal
+    type: CollisionType6.Collision,
+    priority: CollisionPriority6.Normal
   };
 };
 export {
   closestCenter,
+  closestCorners,
   defaultCollisionDetection,
   directionBiased,
   pointerDistance,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@dnd-kit/collision",
   "type": "module",
-  "version": "0.0.6-beta-20240716134007",
+  "version": "0.0.6-beta-20240716203233",
   "main": "./dist/index.cjs",
   "module": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -24,8 +24,8 @@
     "clean": "rm -rf .turbo && rm -rf node_modules && rm -rf dist"
   },
   "dependencies": {
-    "@dnd-kit/abstract": "0.0.6-beta-20240716134007",
-    "@dnd-kit/geometry": "0.0.6-beta-20240716134007",
+    "@dnd-kit/abstract": "0.0.6-beta-20240716203233",
+    "@dnd-kit/geometry": "0.0.6-beta-20240716203233",
     "tslib": "^2.6.2"
   },
   "devDependencies": {