🐛 fix #262

Vanessa219 · Apr 2, 2020 · af95e01 · af95e01
1 parent 2b7880a
commit af95e01
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -51,6 +51,7 @@
 
 ### v3.0.8 / 2020-04-0x
 
+* [262](https://github.com/Vanessa219/vditor/issues/262) ctrl+m... delete, and enter `修复缺陷`
 * [260](https://github.com/Vanessa219/vditor/issues/260) Not working typewritermode at code block `修复缺陷`
 
 ### v3.0.7 / 2020-04-01

diff --git a/src/ts/util/fixBrowserBehavior.ts b/src/ts/util/fixBrowserBehavior.ts
@@ -604,7 +604,7 @@ export const fixTable = (vditor: IVditor, event: KeyboardEvent, range: Range) =>
             && range.startOffset === 0 && range.toString() === "") {
             const previousCellElement = goPreviousCell(cellElement, range, false);
             if (!previousCellElement && tableElement) {
-                tableElement.outerHTML = `<p data-block="0"><wbr>${tableElement.textContent}</p>`;
+                tableElement.outerHTML = `<p data-block="0"><wbr>${tableElement.textContent.trim()}</p>`;
                 setRangeByWbr(vditor[vditor.currentMode].element, range);
                 execAfterRender(vditor);
             }

diff --git a/src/ts/util/selection.ts b/src/ts/util/selection.ts
@@ -31,11 +31,13 @@ export const getCursorPosition = (editor: HTMLElement) => {
             children[range.startOffset].getClientRects().length > 0) {
             // markdown 模式回车
             cursorRect = children[range.startOffset].getClientRects()[0];
-        } else {
+        } else if (range.startContainer.childNodes.length > 0) {
             // in table or code block
             range.selectNode(range.startContainer.childNodes[Math.max(0, range.startOffset - 1)])
             cursorRect = range.getClientRects()[0];
             range.collapse(false);
+        } else {
+            cursorRect = (range.startContainer as HTMLElement).getClientRects()[0];
         }
         if (!cursorRect) {
             let parentElement = range.startContainer.childNodes[range.startOffset] as HTMLElement;
@@ -169,6 +171,9 @@ export const setRangeByWbr = (element: HTMLElement, range: Range) => {
         if (wbrElement.previousSibling) {
             // text<wbr>
             range.setStart(wbrElement.previousSibling, wbrElement.previousSibling.textContent.length);
+        } else if (wbrElement.nextSibling) {
+            // <wbr>text
+            range.setStart(wbrElement.nextSibling, 0);
         } else {
             // 内容为空
             range.setStart(wbrElement.parentElement, 0);