@jsenv/dom 0.17.21 → 0.17.23

package/dist/jsenv_dom.js

@@ -4295,41 +4295,77 @@ const createPreviousNodeIterator = (fromNode, rootNode, skipRoot = null) => {
  * link or a button that click means "follow me", which is not what the hand
  * asked for: the press was already answered, by the gesture.
  *
- * So it is swallowed, once, in capture on the document — before any handler an
- * element may have, and without anyone having to know which element that is.
+ * So it is swallowed, once, before any other listener sees it. Being first is
+ * earned twice, because both orderings matter:
+ *
+ * - on `window`, the first target of the capture phase — a listener anywhere
+ *   lower (document included) comes after, no matter when it was registered.
+ * - registered at module load — among listeners on the same target and phase,
+ *   registration order decides. A listener added when the gesture ends would
+ *   lose to any window-capture listener registered at startup (@jsenv/navi's
+ *   link interception is one), so the listener is permanent and merely armed
+ *   by each gesture.
+ *
+ * A window-capture listener that this module's evaluation cannot be proven to
+ * precede must not bet on that order: it checks `clickIsSuppressed()` and
+ * stands aside on its own.
  */
 
+let suppressing = false;
+let disarmAtNextPress = false;
+
+const suppressClick = (clickEvent) => {
+  if (!suppressing) {
+    return;
+  }
+  suppressing = false;
+  disarmAtNextPress = false;
+  clickEvent.preventDefault();
+  clickEvent.stopImmediatePropagation();
+};
+const onPointerDown = () => {
+  if (disarmAtNextPress) {
+    suppressing = false;
+    disarmAtNextPress = false;
+  }
+};
+window.addEventListener("click", suppressClick, { capture: true });
+window.addEventListener("pointerdown", onPointerDown, { capture: true });
+
 /**
  * Swallows the next click, for a gesture that has just answered the press.
  *
- * @returns {() => void} the gesture is over. The suppressor cannot be taken
- *   down with it — the click is dispatched AFTER the pointerup that ends the
+ * @returns {() => void} the gesture is over. The suppression cannot be lifted
+ *   with it — the click is dispatched AFTER the pointerup that ends the
  *   gesture, so it would be gone one event too early, and the drag would end on
- *   the link it started from being followed. It goes once it has swallowed a
+ *   the link it started from being followed. It lifts once it has swallowed a
  *   click, or at the next press if the gesture produced none: a click is always
- *   preceded by a press, so a suppressor that outlives one press can never
+ *   preceded by a press, so a suppression that outlives one press can never
  *   reach the click of another.
  */
 const suppressClickAfterGesture = () => {
-  const suppressClick = (clickEvent) => {
-    clickEvent.stopPropagation();
-    clickEvent.preventDefault();
-    stopSuppressing();
-  };
-  const stopSuppressing = () => {
-    document.removeEventListener("click", suppressClick, { capture: true });
-    document.removeEventListener("pointerdown", stopSuppressing, {
-      capture: true,
-    });
-  };
-  document.addEventListener("click", suppressClick, { capture: true });
+  suppressing = true;
+  disarmAtNextPress = false;
   return () => {
-    document.addEventListener("pointerdown", stopSuppressing, {
-      capture: true,
-    });
+    disarmAtNextPress = true;
   };
 };
 
+/**
+ * Whether the click being dispatched is one a gesture left behind — armed by
+ * `suppressClickAfterGesture`, waiting to be swallowed by this module.
+ *
+ * A last resort, not a convenience. The suppressor already swallows the click
+ * before anyone else sees it; the one listener that legitimately needs to ask
+ * is a `click` listener in capture on `window` whose registration cannot be
+ * proven to come after this module's evaluation — that one may run before the
+ * suppressor and must stand aside on its own. Everywhere else (an element,
+ * `document`, the bubble phase) the click never arrives and checking this is
+ * dead code. Reach for it only when you are sure that is your situation and
+ * no other ordering is available.
+ */
+const clickIsSuppressed = () => suppressing;
+
 /**
  * A press that says something by NOT moving.
  *
@@ -8159,6 +8195,18 @@ const css$5 = /* css */`
   }
 `;
 import.meta.css = [css$5, "@jsenv/dom/src/interaction/drag/drag_gesture.js"];
+
+/*
+ * Who asked for the capture of a pointer, last. This module is the only place
+ * that ever takes one, so the answer says whether a capture that goes was HANDED
+ * OVER — somebody here took it — or simply LET GO OF by the browser, which does
+ * that on its own more often than the specification suggests, in the middle of a
+ * gesture whose hand is still down and still moving.
+ *
+ * The two must not be answered the same way, and nothing in the event tells them
+ * apart: `lostpointercapture` says the same thing either way.
+ */
+const captureHolderByPointerId = new Map();
 const createDragGestureController = (options = {}) => {
   const {
     name,
@@ -8786,6 +8834,11 @@ const createDragGestureController = (options = {}) => {
         let captured = false;
         dragGesture.capturePointer = () => {
           captured = true;
+          // Written down before it is taken: this is the only place a capture
+          // is ever taken from, so what this map says is who asked for it
+          // last — which is what tells a hand-over from a capture the browser
+          // dropped on its own (see onCaptureLost).
+          captureHolderByPointerId.set(grabEvent.pointerId, dragGesture);
           target.setPointerCapture(grabEvent.pointerId);
         };
         if (!options?.pointerCaptureDeferred) {
@@ -8833,16 +8886,46 @@ const createDragGestureController = (options = {}) => {
         // above it), and taken as our own it kills the new gesture one
         // millisecond after it started.
         //
-        // And when it IS ours, it is a loss, never an end: the ends a gesture
-        // has are the pointer going up and the pointer being cancelled, both
-        // listened for below. A capture that goes while the pointer is still
-        // down was taken — by another gesture, or by the element it was held
-        // on leaving the document — and what was being carried must go back
-        // rather than land wherever the hand happened to be.
+        // And when it IS ours, it is a loss and never an end: the ends a
+        // gesture has are the pointer going up and the pointer being
+        // cancelled, both listened for below. What a loss MEANS is the
+        // question, and the event does not answer it — two very different
+        // things arrive as the same one:
+        //
+        // - it was HANDED OVER: another gesture took the pointer, or the
+        //   element it was held on left the document. There is nothing to go
+        //   on with, and what was being carried must go back rather than land
+        //   wherever the hand happened to be.
+        // - it was simply LET GO OF by the browser, with the hand still down
+        //   and still moving. It happens, and not rarely: the capture is a
+        //   guarantee that events keep coming to one element, and the browser
+        //   drops it for reasons of its own that no code here can see. Killing
+        //   the gesture for that is dropping an object mid-air — the copy
+        //   vanishes, the place the hint had lit up is thrown away, and the
+        //   hand is left having done nothing.
+        //
+        // They are told apart by who asked (see captureHolderByPointerId): a
+        // capture nobody here took, on an element still in the document, was
+        // let go of. The gesture does not need it — every move and the release
+        // are read at the WINDOW, not at the element — so it goes on.
         const onCaptureLost = pointerEvent => {
           if (!captured || pointerEvent.target !== target) {
             return;
           }
+          const handedOver = captureHolderByPointerId.get(grabEvent.pointerId) !== dragGesture;
+          if (!handedOver && target.isConnected) {
+            // Nobody took it and the element it was held on is still there:
+            // the browser let the capture go by itself, which it does — a
+            // node moved by a re-render and put straight back, a decision of
+            // its own we are not told the reason for. The hand has not let go
+            // of anything, so neither does the gesture: it is a guarantee that
+            // was lost, not the gesture. Every move and the release are read
+            // at the window (see below), so it goes on without it rather than
+            // dropping what is still being carried — and the drop the hand was
+            // aiming at, which the hint had already lit up, still happens.
+            captured = false;
+            return;
+          }
           onRelease(pointerEvent, {
             cancelled: true
           });
@@ -8902,6 +8985,9 @@ const createDragGestureController = (options = {}) => {
           // that is up no longer exists — the browser has already dropped the
           // capture with it, and asking again throws ("No active pointer with
           // the given id is found") on the most ordinary release there is.
+          if (captureHolderByPointerId.get(grabEvent.pointerId) === dragGesture) {
+            captureHolderByPointerId.delete(grabEvent.pointerId);
+          }
           if (captured && target.hasPointerCapture(grabEvent.pointerId)) {
             target.releasePointerCapture(grabEvent.pointerId);
           }
@@ -11064,7 +11150,10 @@ const roundForConstraints = (value) => {
 
 /**
  * Detects the drop target based on what element is actually under the mouse cursor.
- * Uses document.elementsFromPoint() to respect visual stacking order naturally.
+ * Uses document.elementsFromPoint() to respect visual stacking order naturally,
+ * and falls back on the rectangles alone when the hit test cannot answer — which
+ * is not only "over nothing": during a view transition the browser hands back the
+ * root for every point of the page (see findTargetByGeometry).
  *
  * @param {Object} gestureInfo - Gesture information
  * @param {Element[]} targetElements - Array of potential drop target elements
@@ -11203,8 +11292,20 @@ const getDropTargetInfo = (
     }
   }
   if (!targetElement) {
-    targetElement = intersectingTargets[0];
-    intersectingIndex = 0;
+    // Nothing in the stack answered. The point may be over no target at all —
+    // and it may also be over one the hit test cannot see: a view transition
+    // covers the page with its pictures, and from then on every point of the
+    // document reads as the root, whatever is really under it. Taking the first
+    // of the overlapped targets then means taking the first one in DOM ORDER,
+    // which has nothing to do with where the hand is: a piece carried onto the
+    // place next door comes back down on the place it left, and the hint says so
+    // by lighting up the wrong one.
+    //
+    // Geometry is what is left, and it is the reading the eye makes anyway: the
+    // place the middle of the carried thing is IN, or — the middle being over a
+    // gap — the one it covers most of.
+    targetElement = findTargetByGeometry(intersectingTargets, dragElementRect);
+    intersectingIndex = intersectingTargets.indexOf(targetElement);
   }
   targetIndex = targetElements.indexOf(targetElement);
 
@@ -11257,6 +11358,41 @@ const getDropTargetInfo = (
   return result;
 };
 
+/**
+ * Which of the overlapped targets the carried thing is on, said with rectangles
+ * alone: the one holding its centre, or the one it covers the most of. Used when
+ * the hit test cannot answer (see its caller).
+ */
+const findTargetByGeometry = (targetElements, dragElementRect) => {
+  const dragCenterX = dragElementRect.left + dragElementRect.width / 2;
+  const dragCenterY = dragElementRect.top + dragElementRect.height / 2;
+  let bestElement = null;
+  let bestOverlapArea = -1;
+  for (const targetElement of targetElements) {
+    const targetRect = targetElement.getBoundingClientRect();
+    if (
+      dragCenterX >= targetRect.left &&
+      dragCenterX <= targetRect.right &&
+      dragCenterY >= targetRect.top &&
+      dragCenterY <= targetRect.bottom
+    ) {
+      return targetElement;
+    }
+    const overlapWidth =
+      Math.min(targetRect.right, dragElementRect.right) -
+      Math.max(targetRect.left, dragElementRect.left);
+    const overlapHeight =
+      Math.min(targetRect.bottom, dragElementRect.bottom) -
+      Math.max(targetRect.top, dragElementRect.top);
+    const overlapArea = overlapWidth * overlapHeight;
+    if (overlapArea > bestOverlapArea) {
+      bestOverlapArea = overlapArea;
+      bestElement = targetElement;
+    }
+  }
+  return bestElement;
+};
+
 const rectangleAreIntersecting = (r1, r2) => {
   return !(
     r2.left > r1.right ||
@@ -19523,4 +19659,4 @@ const useResizeStatus = (elementRef, { as = "number" } = {}) => {
   };
 };
 
-export { EASING, ELEMENT_SIZE_CHANGE, activeElementSignal, addActiveElementEffect, addAttributeEffect, allowWheelThrough, appendStyles, applyNewPosition, canScroll, captureScrollState, chainEvent, claimWheelGesture, closestOpenableAncestor, contrastColor, createBackgroundColorTransition, createBackgroundTransition, createBorderRadiusTransition, createBorderTransition, createDragGestureController, createDragToMoveGestureController, createEventGroupLogger, createGroupTransitionController, createHeightTransition, createIterableWeakSet, createOpacityTransition, createPubSub, createStyleController, createTimelineTransition, createTransition, createTranslateXTransition, createValueEffect, createWidthTransition, cubicBezier, dispatchCustomEvent, dispatchInternalCustomEvent, dispatchPublicCustomEvent, dragAfterIntent, elementIsFocusable, elementIsVisibleForFocus, elementIsVisuallyVisible, findAfter, findAncestor, findBefore, findDescendant, findEvent, findFocusDelegateTarget, findFocusable, findSelfOrAncestorFixedPosition, formatEventSideEffect, getAncestorOpenType, getAvailableHeight, getAvailableWidth, getBackground, getBackgroundColor, getBorder, getBorderRadius, getBorderSizes, getContrastRatio, getDefaultStyles, getDragCoordinates, getDropTargetInfo, getElementSignature, getFirstVisuallyVisibleAncestor, getFocusVisibilityInfo, getHeight, getHeightWithoutTransition, getInnerHeight, getInnerWidth, getKeyboardEventDefaultAction, getLuminance, getMarginSizes, getMaxHeight, getMaxWidth, getMinHeight, getMinWidth, getOpacity, getOpacityWithoutTransition, getPaddingSizes, getPositionedParent, getPositioningScrollOffset, getPreferedColorScheme, getScrollBox, getScrollContainer, getScrollContainerSet, getScrollRelativeRect, getSelfAndAncestorScrolls, getStyle, getTranslateX, getTranslateXWithoutTransition, getTranslateY, getVirtualKeyboardOverlayHeight, getVisuallyVisibleInfo, getWidth, getWidthWithoutTransition, hasCSSSizeUnit, initFlexDetailsSet, initFocusGroup, initPositionSticky, isAncestorOpen, isPrimaryButtonEvent, isSameColor, isScrollable, markDragSource, measureLongestVisualLineWidth, measureScrollbar, measureWidestChildRow, mergeOneStyle, mergeTwoStyles, normalizeKeyboardKey, normalizeStyle, normalizeStyles, observeAncestorOpenState, onAncestorReopen, parsePositionArea, parseStyle, performTabNavigation, pickPositionRelativeTo, prefersDarkColors, prefersLightColors, preventFocusNav, preventFocusNavViaKeyboard, preventIntermediateScrollbar, releaseWheelGesture, resolveCSSColor, resolveCSSSize, resolveColorLuminance, resolveOklchLightness, scrollIntoViewScoped, scrollIntoViewWithStickyAwareness, scrollRoomTowards, setAttribute, setAttributes, setStyles, setVirtualKeyboardOverlaysContent, snapToPixel, startDragTo, startDragToResizeGesture, startDragToTravel, stickyAsRelativeCoords, stringifyStyle, subscribeVirtualKeyboardGeometryChange, subscribeVisualViewportResizeSettled, subscribeWindowResizeSettled, suppressClickAfterGesture, trapFocusInside, trapScrollInside, useActiveElement, useAvailableHeight, useAvailableWidth, useMaxHeight, useMaxWidth, useResizeStatus, visibleRectEffect, waitForPressHeld, watchWheelTravel, wheelGestureIsTakenFrom };
+export { EASING, ELEMENT_SIZE_CHANGE, activeElementSignal, addActiveElementEffect, addAttributeEffect, allowWheelThrough, appendStyles, applyNewPosition, canScroll, captureScrollState, chainEvent, claimWheelGesture, clickIsSuppressed, closestOpenableAncestor, contrastColor, createBackgroundColorTransition, createBackgroundTransition, createBorderRadiusTransition, createBorderTransition, createDragGestureController, createDragToMoveGestureController, createEventGroupLogger, createGroupTransitionController, createHeightTransition, createIterableWeakSet, createOpacityTransition, createPubSub, createStyleController, createTimelineTransition, createTransition, createTranslateXTransition, createValueEffect, createWidthTransition, cubicBezier, dispatchCustomEvent, dispatchInternalCustomEvent, dispatchPublicCustomEvent, dragAfterIntent, elementIsFocusable, elementIsVisibleForFocus, elementIsVisuallyVisible, findAfter, findAncestor, findBefore, findDescendant, findEvent, findFocusDelegateTarget, findFocusable, findSelfOrAncestorFixedPosition, formatEventSideEffect, getAncestorOpenType, getAvailableHeight, getAvailableWidth, getBackground, getBackgroundColor, getBorder, getBorderRadius, getBorderSizes, getContrastRatio, getDefaultStyles, getDragCoordinates, getDropTargetInfo, getElementSignature, getFirstVisuallyVisibleAncestor, getFocusVisibilityInfo, getHeight, getHeightWithoutTransition, getInnerHeight, getInnerWidth, getKeyboardEventDefaultAction, getLuminance, getMarginSizes, getMaxHeight, getMaxWidth, getMinHeight, getMinWidth, getOpacity, getOpacityWithoutTransition, getPaddingSizes, getPositionedParent, getPositioningScrollOffset, getPreferedColorScheme, getScrollBox, getScrollContainer, getScrollContainerSet, getScrollRelativeRect, getSelfAndAncestorScrolls, getStyle, getTranslateX, getTranslateXWithoutTransition, getTranslateY, getVirtualKeyboardOverlayHeight, getVisuallyVisibleInfo, getWidth, getWidthWithoutTransition, hasCSSSizeUnit, initFlexDetailsSet, initFocusGroup, initPositionSticky, isAncestorOpen, isPrimaryButtonEvent, isSameColor, isScrollable, markDragSource, measureLongestVisualLineWidth, measureScrollbar, measureWidestChildRow, mergeOneStyle, mergeTwoStyles, normalizeKeyboardKey, normalizeStyle, normalizeStyles, observeAncestorOpenState, onAncestorReopen, parsePositionArea, parseStyle, performTabNavigation, pickPositionRelativeTo, prefersDarkColors, prefersLightColors, preventFocusNav, preventFocusNavViaKeyboard, preventIntermediateScrollbar, releaseWheelGesture, resolveCSSColor, resolveCSSSize, resolveColorLuminance, resolveOklchLightness, scrollIntoViewScoped, scrollIntoViewWithStickyAwareness, scrollRoomTowards, setAttribute, setAttributes, setStyles, setVirtualKeyboardOverlaysContent, snapToPixel, startDragTo, startDragToResizeGesture, startDragToTravel, stickyAsRelativeCoords, stringifyStyle, subscribeVirtualKeyboardGeometryChange, subscribeVisualViewportResizeSettled, subscribeWindowResizeSettled, suppressClickAfterGesture, trapFocusInside, trapScrollInside, useActiveElement, useAvailableHeight, useAvailableWidth, useMaxHeight, useMaxWidth, useResizeStatus, visibleRectEffect, waitForPressHeld, watchWheelTravel, wheelGestureIsTakenFrom };

package/package.json

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