prosthetic-hand 2.0.0 → 2.1.0

package/README.md

@@ -15,7 +15,7 @@ npm install prosthetic-hand
 import Hand from 'prosthetic-hand';
 
 const hand = new Hand();
-const finger = h.growFinger('pointer', { pointerType: 'touch', pressure: 0.9 });
+const finger = hand.growFinger('pointer', { pointerType: 'touch', pressure: 0.9 });
 
 finger
   .wait(500)

package/lib/Finger.js

@@ -6,7 +6,7 @@ import * as capabilities from './Capabilities.js';
 // Self-incrementing identifier for touch ID and pointer ID.
 // Fingers can either keep the same ID for their life, or request a new
 //   ID whenever they go down.
-var fingerIdSequence = 1;
+var fingerIdSequence = 1000;
 
 // 🖐️class Finger
 // Represents a finger, capable of performing single touch/pointer/mouse synthetic
@@ -334,7 +334,10 @@ export default class Finger {
 
 			if (previousState.x !== this._state.x || previousState.y !== this._state.y) {
 				evType = 'move'
-				this._currentTarget = document.elementFromPoint(this._state.x, this._state.y);
+
+				this._currentTarget =
+					this._hand._capturedTargets.get(this._id) ??
+					document.elementFromPoint(this._state.x, this._state.y);
 			}
 			/// TODO: Detect over/out events when the event target changes.
 
@@ -345,7 +348,9 @@ export default class Finger {
 				// TODO: Optionally reset the finger ID and grab a fresh one
 
 				this._graphic.style.display = 'block';
-				this._touchTargetWhenDowned = this._currentTarget = document.elementFromPoint(this._state.x, this._state.y);
+				this._touchTargetWhenDowned = this._currentTarget =
+					this._hand._capturedTargets.get(this._id) ??
+					document.elementFromPoint(this._state.x, this._state.y);
 				evType = 'down';
 			}
 

package/lib/Hand.js

@@ -3,11 +3,11 @@ import Finger from './Finger.js';
 import * as capabilities from './Capabilities.js';
 
 const TimingMode = {
-	Interval: 'INTERVAL',
-	Minimal: 'MINIMAL',
-	Instant: 'INSTANT',
-	Frame: 'FRAME',
-	FastFrame: 'FAST_FRAME'
+	Interval: Symbol('INTERVAL'),
+	Minimal: Symbol('MINIMAL'),
+	Instant: Symbol('INSTANT'),
+	Frame: Symbol('FRAME'),
+	FastFrame: Symbol('FAST_FRAME')
 };
 
 // 🖐️class Hand
@@ -34,7 +34,7 @@ export default class Hand {
 		this._fingers = [];
 
 		this._fingersAreIdle = true;
-
+		this._capturedTargets = new Map(),
 
 		/// TODO: Timing modes: minimal, interval, frames
 
@@ -261,7 +261,14 @@ export default class Hand {
 		// Fire all `MouseEvent`s and `PointerEvent`s
 		events.forEach( ev => {
 // 			console.log('Dispatching: ', ev.type);
-			document.elementFromPoint(ev.clientX, ev.clientY).dispatchEvent(ev);
+			let el;
+			if (this._capturedTargets.has(ev.pointerId)) {
+				el = this._capturedTargets.get(ev.pointerId);
+			} else {
+				el = document.elementFromPoint(ev.clientX, ev.clientY);
+				this._hookProstheticCapture(el);
+			}
+			el.dispatchEvent(ev);
 		});
 
 
@@ -493,8 +500,32 @@ export default class Hand {
 		}
 	}
 
-}
+
+	_hookProstheticCapture(el) {
+		if (el.__prostheticPointerCapture) { return; }
+
+		const captureFn = el.setPointerCapture;
+		const releaseFn = el.releasePointerCapture;
+		el.setPointerCapture = ((id)=> {
+			if (id >= 1000) {
+				console.log('capture', id, el)
+				this._capturedTargets.set(id, el);
+			} else
+				return captureFn.call(el, id);
+		} );
+
+		el.releasePointerCapture = ((id)=> {
+			if (this._capturedTargets.get(id) === el) {
+				console.log('release', id, el)
+				this._capturedTargets.delete(id);
+			} else
+				return releaseFn.call(el, id);
+		} );
+
+		el.__prostheticPointerCapture = true;
+	}
 
 
+}
 
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "type": "module",
   "name": "prosthetic-hand",
-  "version": "2.0.0",
+  "version": "2.1.0",
   "description": "Automate synthetic touch/pointer events",
   "exports": "./lib/Hand.js",
   "files": [
@@ -13,7 +13,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/IvanSanchez/prosthetic-hand.git"
+    "url": "https://github.com/Leaflet/prosthetic-hand/.git"
   },
   "author": "Iván Sánchez Ortega <ivan@sanchezortega.es>",
   "license": "Beerware",