🐛 thx fix #418

Vanessa219 · May 17, 2020 · c382a13 · c382a13
1 parent 8c114cb
commit c382a13
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -66,6 +66,7 @@
 
 ### v3.2.7 / 2020-05-xx
 
+* [418](https://github.com/Vanessa219/vditor/issues/418) 点击侧边空白，光标会挪到尾部 `修复缺陷`
 * [415](https://github.com/Vanessa219/vditor/issues/415) using local JS file `修复缺陷`
 
 ### v3.2.6 / 2020-05-15

diff --git a/src/ts/ir/index.ts b/src/ts/ir/index.ts
@@ -106,9 +106,11 @@ class IR {
                 processAfterRender(vditor);
                 return;
             }
-            const range = getEditorRange(this.element);
 
-            if (event.target.isEqualNode(this.element) && this.element.lastElementChild && range.collapsed) {
+            const range = getEditorRange(this.element);
+            const lastRect = this.element.lastElementChild.getBoundingClientRect();
+            if (event.target.isEqualNode(this.element) && this.element.lastElementChild && range.collapsed &&
+                event.y > lastRect.top + lastRect.height) {
                 if (this.element.lastElementChild.tagName === "P") {
                     range.selectNodeContents(this.element.lastElementChild);
                     range.collapse(false);

diff --git a/src/ts/wysiwyg/index.ts b/src/ts/wysiwyg/index.ts
@@ -249,7 +249,9 @@ class WYSIWYG {
             }
 
             const range = getEditorRange(this.element);
-            if (event.target.isEqualNode(this.element) && this.element.lastElementChild && range.collapsed) {
+            const lastRect = this.element.lastElementChild.getBoundingClientRect();
+            if (event.target.isEqualNode(this.element) && this.element.lastElementChild && range.collapsed &&
+                event.y > lastRect.top + lastRect.height) {
                 if (this.element.lastElementChild.tagName === "P") {
                     range.selectNodeContents(this.element.lastElementChild);
                     range.collapse(false);