lakelib 0.1.17 → 0.1.18

package/lib/lake.js

@@ -663,10 +663,18 @@ class Nodes {
         }
         const nodeText = this.text();
         const isEmptyText = nodeText === '' || /^[\r\n\u200B\u2060]+$/.test(nodeText);
-        if (this.isElement && isEmptyText) {
-            return this.find('lake-box').length === 0;
+        if (!isEmptyText) {
+            return false;
         }
-        return isEmptyText;
+        if (this.isElement) {
+            if (this.find('lake-box').length > 0) {
+                return false;
+            }
+            if (this.find('br').length > 1) {
+                return false;
+            }
+        }
+        return true;
     }
     // Returns a boolean value indicating whether the node and the target node are siblings.
     isSibling(target) {
@@ -5133,7 +5141,7 @@ function removeBox(range) {
     return box;
 }
 
-var version = "0.1.17";
+var version = "0.1.18";
 
 // Returns the attributes of the element as an key-value object.
 function getAttributes(node) {
@@ -5584,6 +5592,9 @@ class Keystroke {
         this.container = container;
         this.container.on('keydown', event => {
             const keyboardEvent = event;
+            if (keyboardEvent.isComposing) {
+                return;
+            }
             for (const item of this.keydownEventList) {
                 if (isKeyHotkey(item.type, keyboardEvent)) {
                     if (item.listener(keyboardEvent) === false) {
@@ -5594,6 +5605,9 @@ class Keystroke {
         });
         this.container.on('keyup', event => {
             const keyboardEvent = event;
+            if (keyboardEvent.isComposing) {
+                return;
+            }
             for (const item of this.keyupEventList) {
                 if (isKeyHotkey(item.type, keyboardEvent)) {
                     if (item.listener(keyboardEvent) === false) {
@@ -10139,6 +10153,12 @@ function mergeWithPreviousBlock(editor, block) {
         return;
     }
     removeEmptyMarks(range);
+    const nextNode = range.getNextNode();
+    if (nextNode.name === 'br' && prevBlock.name !== 'p') {
+        nextNode.remove();
+        range.shrinkAfter(prevBlock);
+        return;
+    }
     const bookmark = editor.selection.insertBookmark();
     mergeNodes(prevBlock, block);
     editor.selection.toBookmark(bookmark);