fix: 增加单元格单双击的判断范围

antvis · Oct 14, 2024 · 30999c4 · 30999c4
1 parent 5eed119
commit 30999c4
Show file tree

Hide file tree

Showing 8 changed files with 157 additions and 25 deletions.
diff --git a/packages/s2-core/package.json b/packages/s2-core/package.json
@@ -65,9 +65,9 @@
   },
   "dependencies": {
     "@antv/event-emitter": "^0.1.3",
-    "@antv/g": "^6.0.12",
-    "@antv/g-canvas": "^2.0.10",
-    "@antv/g-lite": "^2.0.8",
+    "@antv/g": "^6.0.14",
+    "@antv/g-canvas": "^2.0.15",
+    "@antv/g-lite": "^2.0.11",
     "d3-ease": "^3.0.1",
     "d3-interpolate": "^1.3.2",
     "d3-timer": "^1.0.9",

diff --git a/packages/s2-core/src/facet/base-facet.ts b/packages/s2-core/src/facet/base-facet.ts
@@ -1323,7 +1323,7 @@ export abstract class BaseFacet {
       event?.preventDefault?.();
     }
 
-    // 移动端的 prevent 存在于 originalEvent上
+    // 移动端的 prevent 存在于 originalEvent 上
     const mobileEvent = (event as unknown as GraphEvent)?.originalEvent;
 
     if (mobileEvent?.cancelable) {

diff --git a/packages/s2-core/src/interaction/base-interaction/click/data-cell-click.ts b/packages/s2-core/src/interaction/base-interaction/click/data-cell-click.ts
@@ -55,7 +55,11 @@ export class DataCellClick extends BaseEvent implements BaseEventImplement {
 
       if (interaction.isSelectedCell(cell)) {
         // https://developer.mozilla.org/en-US/docs/Web/API/UIEvent/detail，使用 detail 属性来判断是否是双击，双击时不触发选择态 reset
-        if ((event.originalEvent as UIEvent)?.detail === 1) {
+        if (
+          event.detail === 1 ||
+          event.nativeEvent?.detail === 1 ||
+          event.originalEvent?.detail === 1
+        ) {
           interaction.reset();
 
           // https://github.com/antvis/S2/issues/2447

diff --git a/packages/s2-core/src/interaction/brush-selection/base-brush-selection.ts b/packages/s2-core/src/interaction/brush-selection/base-brush-selection.ts
@@ -664,6 +664,8 @@ export class BaseBrushSelection
   };
 
   protected mouseDown(event: CanvasEvent) {
+    event?.preventDefault?.();
+
     if (this.spreadsheet.interaction.hasIntercepts([InterceptType.CLICK])) {
       return;
     }

diff --git a/packages/s2-core/src/interaction/event-controller.ts b/packages/s2-core/src/interaction/event-controller.ts
@@ -545,7 +545,11 @@ export class EventController {
     }
 
     // 双击的 detail 是 2
-    if (event.detail === 2) {
+    if (
+      event.detail === 2 ||
+      event.nativeEvent?.detail === 2 ||
+      event.originalEvent?.detail === 2
+    ) {
       this.onCanvasDoubleClick(event);
     }
   };

diff --git a/packages/s2-react/package.json b/packages/s2-react/package.json
@@ -66,9 +66,9 @@
   "devDependencies": {
     "@ant-design/icons": "^5.3.7",
     "@antv/event-emitter": "^0.1.3",
-    "@antv/g": "^6.0.12",
-    "@antv/g-plugin-a11y": "^1.0.9",
-    "@antv/g-plugin-rough-canvas-renderer": "^2.0.11",
+    "@antv/g": "^6.0.14",
+    "@antv/g-plugin-a11y": "^1.0.11",
+    "@antv/g-plugin-rough-canvas-renderer": "^2.0.15",
     "@antv/g2": "^5.1.20",
     "@antv/s2": "workspace:*",
     "@antv/s2-shared": "workspace:*",

diff --git a/packages/s2-react/playground/config.tsx b/packages/s2-react/playground/config.tsx
@@ -347,6 +347,7 @@ export const s2Options: SheetComponentOptions = {
   transformCanvasConfig() {
     return {
       supportsCSSTransform: true,
+      supportsPointerEvents: false,
       // dblClickSpeed: 500,
       // devicePixelRatio: 3,
       // cursor: 'crosshair',

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml