🐛 #361

Vanessa219 · May 5, 2020 · 7bf742d · 7bf742d
1 parent 44dcebb
commit 7bf742d
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/src/ts/ir/expandMarker.ts b/src/ts/ir/expandMarker.ts
@@ -1,27 +1,30 @@
 import {hasClosestByClassName, hasTopClosestByClassName} from "../util/hasClosest";
 
 const nextIsNode = (range: Range) => {
-    if (range.startContainer.nodeType === 3 && range.startContainer.nodeValue.length !== range.startOffset) {
+    const startContainer = range.startContainer;
+    if (startContainer.nodeType === 3 && startContainer.nodeValue.length !== range.startOffset) {
         return false;
     }
-    let nextNode: HTMLElement = range.startContainer.nextSibling as HTMLElement;
+
+    let nextNode: HTMLElement = startContainer.nextSibling as HTMLElement;
 
     while (nextNode && nextNode.textContent === "") {
         nextNode = nextNode.nextSibling as HTMLElement;
     }
 
     if (!nextNode) {
         // *em*|**string**
-        const markerElement = hasClosestByClassName(range.startContainer, "vditor-ir__marker");
+        const markerElement = hasClosestByClassName(startContainer, "vditor-ir__marker");
         if (markerElement && !markerElement.nextSibling) {
-            const parentNextNode = range.startContainer.parentElement.parentElement.nextSibling as HTMLElement;
+            const parentNextNode = startContainer.parentElement.parentElement.nextSibling as HTMLElement;
             if (parentNextNode && parentNextNode.nodeType !== 3 &&
                 parentNextNode.classList.contains("vditor-ir__node")) {
                 return parentNextNode;
             }
         }
         return false;
-    } else if (nextNode && nextNode.nodeType !== 3 && nextNode.classList.contains("vditor-ir__node")) {
+    } else if (nextNode && nextNode.nodeType !== 3 && nextNode.classList.contains("vditor-ir__node") &&
+        !nextNode.getAttribute("data-block")) {
         // test|*em*
         return nextNode;
     }