fix: support cancel editor no mobile

antvis · Oct 12, 2023 · 1d532ea · 1d532ea
1 parent f99f0c0
commit 1d532ea
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 10 deletions.
diff --git a/packages/x6/src/registry/router/manhattan/obstacle-map.ts b/packages/x6/src/registry/router/manhattan/obstacle-map.ts
@@ -87,7 +87,7 @@ export class ObstacleMap {
       const excluded =
         excludedShape || excludedTerminal || excludedNode || excludedAncestor
 
-      if (!excluded) {
+      if (node.isVisible() && !excluded) {
         const bbox = node.getBBox().moveAndExpand(options.paddingBox)
         const origin = bbox.getOrigin().snapToGrid(mapGridSize)
         const corner = bbox.getCorner().snapToGrid(mapGridSize)

diff --git a/packages/x6/src/registry/tool/editor.ts b/packages/x6/src/registry/tool/editor.ts
@@ -160,7 +160,7 @@ export class CellEditor extends ToolsView.ToolItem<
     style.transform = `scale(${scale.sx}, ${scale.sy}) translate(-50%, -50%)`
   }
 
-  onDocumentMouseDown(e: Dom.MouseDownEvent) {
+  onDocumentMouseUp(e: Dom.MouseDownEvent) {
     if (this.editor && e.target !== this.editor) {
       const value = this.editor.innerText.replace(/\n$/, '') || ''
       // set value, when value is null, we will remove label in edge
@@ -171,13 +171,15 @@ export class CellEditor extends ToolsView.ToolItem<
   }
 
   onCellDblClick({ e }: { e: Dom.DoubleClickEvent }) {
-    e.stopPropagation()
-    this.removeElement()
-    this.event = e
-    this.createElement()
-    this.updateEditor()
-    this.autoFocus()
-    this.delegateDocumentEvents(this.options.documentEvents!)
+    if (!this.editor) {
+      e.stopPropagation()
+      this.removeElement()
+      this.event = e
+      this.createElement()
+      this.updateEditor()
+      this.autoFocus()
+      this.delegateDocumentEvents(this.options.documentEvents!)
+    }
   }
 
   onMouseDown(e: Dom.MouseDownEvent) {
@@ -316,9 +318,12 @@ export namespace CellEditor {
     isSVGElement: false,
     events: {
       mousedown: 'onMouseDown',
+      touchstart: 'onMouseDown',
     },
     documentEvents: {
-      mousedown: 'onDocumentMouseDown',
+      mouseup: 'onDocumentMouseUp',
+      touchend: 'onDocumentMouseUp',
+      touchcancel: 'onDocumentMouseUp',
     },
   })
 }