@jsenv/dom 0.17.67 → 0.17.69

package/dist/jsenv_dom.js

@@ -319,11 +319,14 @@ const chainEvent = (customEvent, parentEvent) => {
  * which one WAS used — a tap brings the on-screen keyboard up, the trackpad
  * next to it does not.
  *
- * Three readings, because no single one covers every path from a finger to an
+ * Four readings, because no single one covers every path from a finger to an
  * event:
  * - a touch* event says it outright;
  * - `pointerType` says it on a PointerEvent, which "click" also is in some
  *   engines and not in others — hence not the only reading;
+ * - the click WebKit dispatches for a tap is a PointerEvent whose `pointerType`
+ *   says "mouse" while its `pointerId` is the finger's: the press last seen
+ *   down with that id answers for it (see lastPress below);
  * - `sourceCapabilities.firesTouchEvents` is what is left for the compatibility
  *   mouse events a tap synthesizes, where nothing else remembers the finger.
  *   Absent outside Chromium, where it costs nothing: the readings above have
@@ -339,10 +342,30 @@ const isTouchDrivenEvent = (event) => {
   // "" on a pointer event the engine could not attribute — not an answer, so
   // it falls through to the last reading rather than being read as "not touch".
   if (event.pointerType) {
-    return event.pointerType === "touch";
+    if (event.pointerType === "touch") {
+      return true;
+    }
+    if (lastPress && event.pointerId === lastPress.pointerId) {
+      return lastPress.pointerType === "touch";
+    }
+    return false;
   }
   return event.sourceCapabilities?.firesTouchEvents === true;
 };
+// The press behind the next click: a click follows the pointerup of its own
+// press, and no other press comes between the two. Recorded on window in
+// capture so that nothing lower can hide a press from it.
+let lastPress = null;
+window.addEventListener(
+  "pointerdown",
+  (pointerdownEvent) => {
+    lastPress = {
+      pointerId: pointerdownEvent.pointerId,
+      pointerType: pointerdownEvent.pointerType,
+    };
+  },
+  { capture: true, passive: true },
+);
 
 /**
  * Whether `event` is a click a pointer press produced, as opposed to one
@@ -12507,6 +12530,7 @@ const travelsAfter = ({
   size,
   velocity,
   towardsSomething,
+  cancelled,
   commitRatio,
 }) => {
   if (!towardsSomething) {
@@ -12516,10 +12540,17 @@ const travelsAfter = ({
   // carries on. Answered on the distance alone, a travel a hand merely touched
   // is undone BY the touch — it was stopped where it stood, and where it stood
   // is not far enough to count as an intention. Nobody asked it to stop; it was
-  // asked to wait.
-  if (slack && Math.abs(pulled - slack) < DRAG_START_THRESHOLD) {
+  // asked to wait. A gesture TAKEN AWAY said nothing either (the browser
+  // scrolling something else, a call coming in): its end was decided before
+  // the press, and it is that end it goes on to.
+  if (slack && (cancelled || Math.abs(pulled - slack) < DRAG_START_THRESHOLD)) {
     return true;
   }
+  // Taken away from a travel this gesture began: things go back rather than
+  // landing wherever the hand happened to be.
+  if (cancelled) {
+    return false;
+  }
   const sign = pulled > 0 ? 1 : -1;
   // A hand that is still moving says where it is going, and it says it about
   // BOTH answers. Going away from what it was bringing in fast is "put it
@@ -12907,9 +12938,6 @@ const startDragToTravel = (
       const towardsSomething = pulled > 0 ? travel.travelBack : travel.travelOn;
       const velocity =
         axis === "x" ? gestureInfo.velocityX : gestureInfo.velocityY;
-      // A gesture taken away rather than let go of (the browser scrolling
-      // something else, a call coming in, another gesture taking the pointer)
-      // said nothing: things go back.
       const releaseEvent = gestureInfo.releaseEvent || gestureInfo.dragEvent;
       const { cancelled } = gestureInfo;
       onEnd({
@@ -12917,16 +12945,15 @@ const startDragToTravel = (
         pulled,
         size,
         sign: pulled > 0 ? 1 : -1,
-        travels:
-          !cancelled &&
-          travelsAfter({
-            pulled,
-            slack,
-            size,
-            velocity,
-            towardsSomething,
-            commitRatio,
-          }),
+        travels: travelsAfter({
+          pulled,
+          slack,
+          size,
+          velocity,
+          towardsSomething,
+          cancelled,
+          commitRatio,
+        }),
         cancelled,
         event: releaseEvent,
       });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/dom",
-  "version": "0.17.67",
+  "version": "0.17.69",
   "type": "module",
   "description": "DOM utilities for writing frontend code",
   "repository": {