fix: rename alwaysTriggerPointerEventOnCanvas

antvis · Apr 17, 2023 · 72e9073 · 72e9073
1 parent 0530def
commit 72e9073
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 7 deletions.
diff --git a/packages/g-lite/src/Canvas.ts b/packages/g-lite/src/Canvas.ts
@@ -159,7 +159,7 @@ export class Canvas extends EventTarget implements ICanvas {
       supportsTouchEvents,
       supportsCSSTransform,
       useNativeClickEvent,
-      alwaysTriggerPointermoveEvent,
+      alwaysTriggerPointerEventOnCanvas,
       isTouchEvent,
       isMouseEvent,
     } = config;
@@ -223,7 +223,7 @@ export class Canvas extends EventTarget implements ICanvas {
       document,
       supportsCSSTransform,
       useNativeClickEvent,
-      alwaysTriggerPointermoveEvent,
+      alwaysTriggerPointerEventOnCanvas,
     });
 
     this.initDefaultCamera(canvasWidth, canvasHeight);

diff --git a/packages/g-lite/src/services/EventService.ts b/packages/g-lite/src/services/EventService.ts
@@ -209,7 +209,14 @@ export class EventService {
     // }
 
     const now = performance.now();
-    const e = this.createPointerEvent(from);
+    const e = this.createPointerEvent(
+      from,
+      undefined,
+      undefined,
+      this.context.config.alwaysTriggerPointerEventOnCanvas
+        ? this.rootTarget
+        : undefined,
+    );
 
     this.dispatchEvent(e, 'pointerup');
 
@@ -317,7 +324,7 @@ export class EventService {
       from,
       undefined,
       undefined,
-      this.context.config.alwaysTriggerPointermoveEvent
+      this.context.config.alwaysTriggerPointerEventOnCanvas
         ? this.rootTarget
         : undefined,
     );
@@ -605,7 +612,14 @@ export class EventService {
   };
 
   onPointerCancel = (from: FederatedPointerEvent) => {
-    const e = this.createPointerEvent(from);
+    const e = this.createPointerEvent(
+      from,
+      undefined,
+      undefined,
+      this.context.config.alwaysTriggerPointerEventOnCanvas
+        ? this.rootTarget
+        : undefined,
+    );
 
     this.dispatchEvent(e);
     this.freeEvent(e);

diff --git a/packages/g-lite/src/types.ts b/packages/g-lite/src/types.ts
@@ -458,9 +458,9 @@ export interface CanvasConfig {
   useNativeClickEvent?: boolean;
 
   /**
-   * Pointermove event will get triggered even outside Canvas.
+   * Pointermove / up / cancel event will get triggered even outside Canvas.
    */
-  alwaysTriggerPointermoveEvent?: boolean;
+  alwaysTriggerPointerEventOnCanvas?: boolean;
 
   /**
    * Should we account for CSS Transform applied on container?

diff --git a/packages/g-plugin-dom-interaction/src/DOMInteractionPlugin.ts b/packages/g-plugin-dom-interaction/src/DOMInteractionPlugin.ts
@@ -64,6 +64,11 @@ export class DOMInteractionPlugin implements RenderingPlugin {
       $el.addEventListener('pointerleave', onPointerOut, true);
       $el.addEventListener('pointerover', onPointerOver, true);
       runtime.globalThis.addEventListener('pointerup', onPointerUp, true);
+      runtime.globalThis.addEventListener(
+        'pointercancel',
+        onPointerCancel,
+        true,
+      );
     };
 
     const addTouchEventListener = ($el: HTMLElement) => {