From e19ce732a9494dc3eb05e0c8702cd802abc0af9a Mon Sep 17 00:00:00 2001
From: Puru Vijay <47742487+PuruVJ@users.noreply.github.com>
Date: Tue, 9 Apr 2024 14:00:43 +0530
Subject: [PATCH] fix: ignoreMultitouch (#145)

* Push

* Renegerate sizes
---
 .changeset/tasty-dodos-live.md | 10 ++++++++++
 docs/src/data/sizes.json       | 28 ++++++++++++++--------------
 packages/core/src/index.ts     | 22 ++++++++++++++--------
 3 files changed, 38 insertions(+), 22 deletions(-)
 create mode 100644 .changeset/tasty-dodos-live.md

diff --git a/.changeset/tasty-dodos-live.md b/.changeset/tasty-dodos-live.md
new file mode 100644
index 00000000..4ebc7994
--- /dev/null
+++ b/.changeset/tasty-dodos-live.md
@@ -0,0 +1,10 @@
+---
+"@neodrag/core": patch
+"@neodrag/react": patch
+"@neodrag/solid": patch
+"@neodrag/svelte": patch
+"@neodrag/vanilla": patch
+"@neodrag/vue": patch
+---
+
+fix: ignoreMultitouch now behaves correctly
diff --git a/docs/src/data/sizes.json b/docs/src/data/sizes.json
index d37960b4..00993ff5 100644
--- a/docs/src/data/sizes.json
+++ b/docs/src/data/sizes.json
@@ -1,22 +1,22 @@
 {
-  "solid": {
-    "size": "1.77",
-    "version": "2.0.2"
+  "react": {
+    "size": "2.00",
+    "version": "2.0.3"
   },
-  "svelte": {
-    "size": "1.70",
-    "version": "2.0.2"
+  "solid": {
+    "size": "1.80",
+    "version": "2.0.3"
   },
   "vanilla": {
-    "size": "1.81",
-    "version": "2.0.2"
+    "size": "1.83",
+    "version": "2.0.3"
   },
-  "vue": {
-    "size": "1.79",
-    "version": "2.0.2"
+  "svelte": {
+    "size": "1.72",
+    "version": "2.0.3"
   },
-  "react": {
-    "size": "1.98",
-    "version": "2.0.2"
+  "vue": {
+    "size": "1.81",
+    "version": "2.0.3"
   }
 }
\ No newline at end of file
diff --git a/packages/core/src/index.ts b/packages/core/src/index.ts
index 59a1aaae..65b84dd7 100644
--- a/packages/core/src/index.ts
+++ b/packages/core/src/index.ts
@@ -305,6 +305,8 @@ export const draggable = (node: HTMLElement, options: DragOptions = {}) => {
 	// Set proper defaults for recomputeBounds
 	recomputeBounds = { ...DEFAULT_RECOMPUTE_BOUNDS, ...recomputeBounds };
 
+	let activePointers = new Set<number>();
+
 	// Arbitrary constants for better minification
 	const bodyStyle = document.body.style;
 	const nodeClassList = node.classList;
@@ -316,7 +318,7 @@ export const draggable = (node: HTMLElement, options: DragOptions = {}) => {
 				return setStyle(
 					node,
 					'transform',
-					gpuAcceleration ? `translate3d(${common}, 0)` : `translate(${common})`
+					gpuAcceleration ? `translate3d(${common}, 0)` : `translate(${common})`,
 				);
 			}
 
@@ -376,7 +378,9 @@ export const draggable = (node: HTMLElement, options: DragOptions = {}) => {
 
 		if (e.button === 2) return;
 
-		if (ignoreMultitouch && !e.isPrimary) return;
+		activePointers.add(e.pointerId);
+
+		if (ignoreMultitouch && activePointers.size > 1) return e.preventDefault();
 
 		// Compute bounds
 		if (recomputeBounds.dragStart) computedBounds = computeBoundRect(bounds, node);
@@ -394,7 +398,7 @@ export const draggable = (node: HTMLElement, options: DragOptions = {}) => {
 
 		if (cancelElementContains(cancelEls, dragEls))
 			throw new Error(
-				"Element being dragged can't be a child of the element on which `cancel` is applied"
+				"Element being dragged can't be a child of the element on which `cancel` is applied",
 			);
 
 		const eventTarget = e.composedPath()[0] as HTMLElement;
@@ -433,7 +437,9 @@ export const draggable = (node: HTMLElement, options: DragOptions = {}) => {
 		}
 	}
 
-	function dragEnd() {
+	function dragEnd(e: PointerEvent) {
+		activePointers.delete(e.pointerId);
+
 		if (!active) return;
 
 		if (recomputeBounds.dragEnd) computedBounds = computeBoundRect(bounds, node);
@@ -453,7 +459,7 @@ export const draggable = (node: HTMLElement, options: DragOptions = {}) => {
 	}
 
 	function drag(e: PointerEvent) {
-		if (!active) return;
+		if (!active || (ignoreMultitouch && activePointers.size > 1)) return;
 
 		if (recomputeBounds.drag) computedBounds = computeBoundRect(bounds, node);
 
@@ -564,7 +570,7 @@ const isString = (val: unknown): val is string => typeof val === 'string';
 const snapToGrid = (
 	[xSnap, ySnap]: [number, number],
 	pendingX: number,
-	pendingY: number
+	pendingY: number,
 ): [number, number] => {
 	const calc = (val: number, snap: number) => (snap === 0 ? 0 : Math.ceil(val / snap) * snap);
 
@@ -584,7 +590,7 @@ function getHandleEls(handle: DragOptions['handle'], node: HTMLElement): HTMLEle
 	const handleEls = node.querySelectorAll<HTMLElement>(handle);
 	if (handleEls === null)
 		throw new Error(
-			'Selector passed for `handle` option should be child of the element on which the action is applied'
+			'Selector passed for `handle` option should be child of the element on which the action is applied',
 		);
 
 	return Array.from(handleEls.values());
@@ -600,7 +606,7 @@ function getCancelElements(cancel: DragOptions['cancel'], node: HTMLElement): HT
 
 	if (cancelEls === null)
 		throw new Error(
-			'Selector passed for `cancel` option should be child of the element on which the action is applied'
+			'Selector passed for `cancel` option should be child of the element on which the action is applied',
 		);
 
 	return Array.from(cancelEls.values());