Fix graph editor and small text editor bug

vezwork · Oct 16, 2023 · 6f4e7cc · 6f4e7cc
1 parent 6c75a7c
commit 6f4e7cc
Show file tree

Hide file tree

Showing 14 changed files with 47 additions and 502 deletions.
diff --git a/lib/dist/editors/ColoredGraphEditorElement.js b/lib/dist/editors/ColoredGraphEditorElement.js
@@ -114,7 +114,7 @@ export class ColoredGraphEditorElement extends EditorElement {
             this.shadowRoot.append(editor);
             this.blur();
             setTimeout(() => editor.focusEditor());
-            this.fromNode = node;
+            //this.fromNode = node;
             this.render();
             this.parentEditor?.dispatchEvent(new CustomEvent("childEditorUpdate", {
                 detail: {
@@ -124,7 +124,7 @@ export class ColoredGraphEditorElement extends EditorElement {
             }));
         });
         this.addEventListener("mouseup", (e) => {
-            const targetEl = e.path[0];
+            const targetEl = e.composedPath()[0];
             const targetNode = this.nodes.find(({ editor }) => editor.contains(targetEl) || editor.shadowRoot.contains(targetEl));
             if (targetNode) {
                 if (this.fromNode &&

diff --git a/lib/dist/editors/ForceColoredGraphEditorElement.js b/lib/dist/editors/ForceColoredGraphEditorElement.js
@@ -115,7 +115,7 @@ export class ForceColoredGraphEditorElement extends EditorElement {
             this.shadowRoot.append(editor);
             this.blur();
             setTimeout(() => editor.focusEditor());
-            this.fromNode = node;
+            //this.fromNode = node;
             this.render();
             this.parentEditor?.dispatchEvent(new CustomEvent("childEditorUpdate", {
                 detail: {
@@ -125,7 +125,7 @@ export class ForceColoredGraphEditorElement extends EditorElement {
             }));
         });
         this.addEventListener("mouseup", (e) => {
-            const targetEl = e.path[0];
+            const targetEl = e.composedPath()[0];
             const targetNode = this.nodes.find(({ editor }) => editor.contains(targetEl) || editor.shadowRoot.contains(targetEl));
             if (targetNode) {
                 if (this.fromNode &&

diff --git a/lib/dist/editors/ForceGraphEditorElement.js b/lib/dist/editors/ForceGraphEditorElement.js
@@ -97,7 +97,7 @@ export class ForceGraphEditorElement extends EditorElement {
             this.shadowRoot.append(editor);
             this.blur();
             setTimeout(() => editor.focusEditor());
-            this.fromNode = node;
+            //this.fromNode = node;
             this.render();
             new CustomEvent("childEditorUpdate", {
                 detail: {
@@ -107,8 +107,10 @@ export class ForceGraphEditorElement extends EditorElement {
             });
         });
         this.addEventListener("mouseup", (e) => {
-            const targetEl = e.path[0];
-            const targetNode = this.nodes.find(({ editor }) => editor.contains(targetEl) || editor.shadowRoot.contains(targetEl));
+            const targetEl = e.composedPath()[0];
+            const targetNode = this.nodes.find(({ editor }) => editor === targetEl ||
+                editor.contains(targetEl) ||
+                editor.shadowRoot.contains(targetEl));
             if (targetNode) {
                 if (this.fromNode &&
                     this.fromNode !== targetNode &&

diff --git a/lib/dist/editors/MakeGraphEditorElement.js b/lib/dist/editors/MakeGraphEditorElement.js
@@ -103,7 +103,7 @@ export const MakeGraphEditorElement = (NestedEditorConstructor = TextEditorEleme
                 this.shadowRoot.append(editor);
                 this.blur();
                 setTimeout(() => editor.focusEditor());
-                this.fromNode = node;
+                //this.fromNode = node;
                 this.render();
                 this.parentEditor?.dispatchEvent(new CustomEvent("childEditorUpdate", {
                     detail: {
@@ -113,7 +113,7 @@ export const MakeGraphEditorElement = (NestedEditorConstructor = TextEditorEleme
                 }));
             });
             this.addEventListener("mouseup", (e) => {
-                const targetEl = e.path[0];
+                const targetEl = e.composedPath()[0];
                 const targetNode = this.nodes.find(({ editor }) => editor.contains(targetEl) || editor.shadowRoot.contains(targetEl));
                 if (targetNode) {
                     if (this.fromNode &&

diff --git a/lib/dist/editors/TextEditorElement.js b/lib/dist/editors/TextEditorElement.js
@@ -84,18 +84,23 @@ export class TextEditorElement extends EditorElement {
         this.addEventListener("mousedown", (e) => {
             if (e.buttons === 1) {
                 const pos = this.cursorPosFromMouseEvent(e);
-                this.caret = pos;
-                this.minorCaret = pos;
-                this.render();
-                setTimeout(() => this.focusEditor());
+                if (pos !== -1) {
+                    this.caret = pos;
+                    this.minorCaret = pos;
+                    this.render();
+                    setTimeout(() => this.focusEditor());
+                }
+                //
             }
         });
         this.addEventListener("mousemove", (e) => {
             if (this.isFocused) {
                 if (e.buttons === 1) {
                     const pos = this.cursorPosFromMouseEvent(e);
-                    this.caret = pos;
-                    this.render();
+                    if (pos !== -1) {
+                        this.caret = pos;
+                        this.render();
+                    }
                 }
             }
         });

diff --git a/lib/dist/editors/TextLikeEditor.js b/lib/dist/editors/TextLikeEditor.js