@deck.gl/arcgis 9.4.0-alpha.1 → 9.4.0-alpha.2

package/dist/index.cjs

@@ -797,14 +797,6 @@ var PROJECTION_MODE = {
    */
   IDENTITY: 0
 };
-var RECOGNIZERS = {
-  multipan: [import_mjolnir.Pan, { threshold: 10, direction: import_mjolnir.InputDirection.Vertical, pointers: 2 }],
-  pinch: [import_mjolnir.Pinch, {}, null, ["multipan"]],
-  pan: [import_mjolnir.Pan, { threshold: 1 }, ["pinch"], ["multipan"]],
-  dblclick: [import_mjolnir.Tap, { event: "dblclick", taps: 2, enable: false }],
-  dblclickdrag: [import_mjolnir.DoubleClickDrag, { event: "dblclickdrag", enable: false }, ["dblclick"], null],
-  click: [import_mjolnir.Tap, { event: "click" }, ["dblclickdrag"], ["dblclick", "dblclickdrag"]]
-};
 
 // ../core/src/viewports/viewport.ts
 var DEGREES_TO_RADIANS = Math.PI / 180;
@@ -1864,6 +1856,8 @@ var Controller = class {
     this._customEvents = [];
     this._eventStartBlocked = null;
     this._panMove = false;
+    this._multiPanMode = null;
+    this._multiPanStartCenter = null;
     this._doubleClickDragAnchor = null;
     this._suppressDoubleClickUntil = 0;
     this.invertPan = false;
@@ -1876,6 +1870,8 @@ var Controller = class {
     this.doubleClickDragZoom = true;
     this.touchZoom = true;
     this.touchRotate = false;
+    this.multiTouchDrag = null;
+    this.trackpadGesture = false;
     this.keyboard = true;
     this.transitionManager = new TransitionManager({
       ...opts,
@@ -1923,11 +1919,11 @@ var Controller = class {
       case "panend":
         return this._onPanEnd(event);
       case "pinchstart":
-        return eventStartBlocked ? false : this._onPinchStart(event);
+        return eventStartBlocked || !this._isTrackpadGestureAllowed(event) ? false : this._onPinchStart(event);
       case "pinchmove":
-        return this._onPinch(event);
+        return this._isTrackpadGestureAllowed(event) ? this._onPinch(event) : false;
       case "pinchend":
-        return this._onPinchEnd(event);
+        return this._isTrackpadGestureAllowed(event) ? this._onPinchEnd(event) : false;
       case "multipanstart":
         return eventStartBlocked ? false : this._onMultiPanStart(event);
       case "multipanmove":
@@ -2018,13 +2014,18 @@ var Controller = class {
       doubleClickDragZoom = false,
       touchZoom = true,
       touchRotate = false,
+      multiTouchDrag = touchRotate ? "rotate" : null,
+      trackpadGesture = false,
       keyboard = true
     } = props;
     const isInteractive = Boolean(this.onViewStateChange);
     this.toggleEvents(EVENT_TYPES.WHEEL, isInteractive && scrollZoom);
     this.toggleEvents(EVENT_TYPES.PAN, isInteractive);
-    this.toggleEvents(EVENT_TYPES.PINCH, isInteractive && (touchZoom || touchRotate));
-    this.toggleEvents(EVENT_TYPES.MULTI_PAN, isInteractive && touchRotate);
+    this.toggleEvents(
+      EVENT_TYPES.PINCH,
+      isInteractive && (touchZoom || multiTouchDrag === "rotate")
+    );
+    this.toggleEvents(EVENT_TYPES.MULTI_PAN, isInteractive && Boolean(multiTouchDrag));
     this.toggleEvents(EVENT_TYPES.DOUBLE_CLICK, isInteractive && doubleClickZoom);
     this.toggleEvents(EVENT_TYPES.DOUBLE_CLICK_DRAG, isInteractive && doubleClickDragZoom);
     this.toggleEvents(EVENT_TYPES.KEYBOARD, isInteractive && keyboard);
@@ -2034,7 +2035,9 @@ var Controller = class {
     this.doubleClickZoom = doubleClickZoom;
     this.doubleClickDragZoom = doubleClickDragZoom;
     this.touchZoom = touchZoom;
-    this.touchRotate = touchRotate;
+    this.touchRotate = multiTouchDrag === "rotate";
+    this.multiTouchDrag = multiTouchDrag;
+    this.trackpadGesture = trackpadGesture;
     this.keyboard = keyboard;
     const dimensionChanged = !oldProps || oldProps.height !== props.height || oldProps.width !== props.width || oldProps.maxBounds !== props.maxBounds;
     if (dimensionChanged && props.maxBounds) {
@@ -2209,6 +2212,9 @@ var Controller = class {
     if (!this.scrollZoom) {
       return false;
     }
+    if (this.trackpadGesture && event.device !== "mouse") {
+      return false;
+    }
     const pos = this.getCenter(event);
     if (!this.isPointInBounds(pos, event)) {
       return false;
@@ -2236,60 +2242,73 @@ var Controller = class {
     return true;
   }
   _onMultiPanStart(event) {
-    const pos = this.getCenter(event);
-    if (!this.isPointInBounds(pos, event)) {
+    const { multiTouchDrag } = this;
+    if (!multiTouchDrag || !this._isMultiPanEventAllowed(event, multiTouchDrag)) {
       return false;
     }
-    const newControllerState = this.controllerState.rotateStart({ pos });
+    const currentCenter = event.offsetCenter;
+    if (!this.isPointInBounds(this.getCenter(event), event)) {
+      return false;
+    }
+    const isTrackpad = event.pointerType === "trackpad";
+    const startCenter = {
+      x: currentCenter.x - (isTrackpad ? 0 : event.deltaX),
+      y: currentCenter.y - (isTrackpad ? 0 : event.deltaY)
+    };
+    const startEvent = { ...event, offsetCenter: startCenter };
+    const pos = this.getCenter(startEvent);
+    const newControllerState = multiTouchDrag === "pan" ? this.controllerState.panStart({ pos }) : this.controllerState.rotateStart({ pos });
+    this._multiPanMode = multiTouchDrag;
+    this._multiPanStartCenter = startCenter;
     this.updateViewport(newControllerState, NO_TRANSITION_PROPS, { isDragging: true });
     return true;
   }
   _onMultiPan(event) {
-    if (!this.touchRotate) {
-      return false;
-    }
-    if (!this.isDragging()) {
+    const { mode, event: panEvent } = this._getMultiPanEvent(event);
+    if (!mode || !panEvent || !this.isDragging()) {
       return false;
     }
-    const pos = this.getCenter(event);
-    pos[0] -= event.deltaX;
-    const newControllerState = this.controllerState.rotate({ pos });
-    this.updateViewport(newControllerState, NO_TRANSITION_PROPS, {
-      isDragging: true,
-      isRotating: true
-    });
-    return true;
+    return mode === "pan" ? this._onPanMove(panEvent) : this._onPanRotate(panEvent);
   }
   _onMultiPanEnd(event) {
-    if (!this.isDragging()) {
+    const { mode, event: panEvent } = this._getMultiPanEvent(event);
+    if (!mode || !panEvent || !this.isDragging()) {
+      this._resetMultiPan();
       return false;
     }
-    const { inertia } = this;
-    if (this.touchRotate && inertia && event.velocityY) {
-      const pos = this.getCenter(event);
-      const endPos = [pos[0], pos[1] += event.velocityY * inertia / 2];
-      const newControllerState = this.controllerState.rotate({ pos: endPos });
-      this.updateViewport(
-        newControllerState,
-        {
-          ...this._getTransitionProps(),
-          transitionDuration: inertia,
-          transitionEasing: INERTIA_EASING
-        },
-        {
-          isDragging: false,
-          isRotating: true
-        }
-      );
-      this.blockEvents(inertia);
-    } else {
-      const newControllerState = this.controllerState.rotateEnd();
-      this.updateViewport(newControllerState, null, {
-        isDragging: false,
-        isRotating: false
-      });
+    const handled = mode === "pan" ? this._onPanMoveEnd(panEvent) : this._onPanRotateEnd(panEvent);
+    this._resetMultiPan();
+    return handled;
+  }
+  _isTrackpadGestureAllowed(event) {
+    return event.pointerType !== "trackpad" || this.trackpadGesture;
+  }
+  _isMultiPanEventAllowed(event, mode) {
+    if (event.pointerType === "trackpad") {
+      return this.trackpadGesture && (mode === "pan" ? this.dragPan : this.dragRotate);
     }
-    return true;
+    return event.pointerType === "touch" && (mode === "pan" ? this.dragPan : this.dragRotate);
+  }
+  _getMultiPanEvent(event) {
+    const mode = this._multiPanMode;
+    const startCenter = this._multiPanStartCenter;
+    if (!mode || !startCenter) {
+      return { mode: null, event: null };
+    }
+    return {
+      mode,
+      event: {
+        ...event,
+        offsetCenter: {
+          x: startCenter.x + event.deltaX,
+          y: startCenter.y + event.deltaY
+        }
+      }
+    };
+  }
+  _resetMultiPan() {
+    this._multiPanMode = null;
+    this._multiPanStartCenter = null;
   }
   // Default handler for the `pinchstart` event.
   _onPinchStart(event) {