lakelib 0.1.9 → 0.1.11

package/lib/lake.css

@@ -872,6 +872,8 @@ lake-box[name="image"] .lake-box-selected .lake-image-error {
   box-sizing: content-box;
   border: 1px solid transparent;
   border-radius: 4px;
+  cursor: default;
+  user-select: none;
 }
 .lake-file .lake-file-info {
   display: flex;
@@ -888,10 +890,13 @@ lake-box[name="image"] .lake-box-selected .lake-image-error {
   color: var(--link-color);
 }
 lake-box[name="file"] .lake-box-hovered .lake-file {
-  border-color: var(--box-border-color);
+  background-color: var(--box-background-color);
+}
+lake-box[name="file"] .lake-box-selected .lake-file {
+  background-color: var(--selection-background-color);
 }
 lake-box[name="file"] .lake-box-focused .lake-file {
-  border-color: var(--box-border-focus-color);
+  background-color: var(--selection-background-color);
 }
 /* uploading status */
 .lake-file-uploading .lake-progress {

package/lib/lake.js

@@ -2718,18 +2718,14 @@ function nodeAndView(node) {
     if (container.length > 0) {
         const viewport = container.closestScroller();
         if (viewport.length > 0) {
-            const containerWrapper = container.parent();
-            if (containerWrapper.length > 0) {
-                const nativeContainerWrapper = containerWrapper.get(0);
-                const offsetLeft = nativeContainerWrapper.offsetLeft - window.scrollX;
-                const offsetTop = nativeContainerWrapper.offsetTop - window.scrollY;
-                left -= offsetLeft;
-                right -= offsetLeft;
-                top -= offsetTop;
-                bottom -= offsetTop;
-            }
             const nativeViewport = viewport.get(0);
             const viewportRect = nativeViewport.getBoundingClientRect();
+            const offsetLeft = viewportRect.x;
+            const offsetTop = viewportRect.y;
+            left -= offsetLeft;
+            right -= offsetLeft;
+            top -= offsetTop;
+            bottom -= offsetTop;
             viewportWidth = viewportRect.width;
             viewportHeight = viewportRect.height;
         }
@@ -3686,7 +3682,8 @@ function setBlocks(range, value) {
         return;
     }
     if (range.isCollapsed) {
-        if (range.isBox) {
+        const boxNode = range.commonAncestor.closest('lake-box');
+        if (boxNode.isBlockBox) {
             return;
         }
     }
@@ -4791,7 +4788,7 @@ class Dropdown {
     }
 }
 
-var version = "0.1.9";
+var version = "0.1.11";
 
 // Inserts a box into the specified range.
 function insertBox(range, boxName, boxValue) {
@@ -8346,6 +8343,7 @@ var list = (editor) => {
                 }
             }
             editor.history.save();
+            editor.selection.sync();
         },
     });
     editor.container.on('click', event => {
@@ -9681,6 +9679,12 @@ var backspaceKey = (editor) => {
                 range.shrinkAfter(prevNode);
                 return;
             }
+            if (prevNode.isText && prevNode.text().length === 1) {
+                event.preventDefault();
+                prevNode.remove();
+                editor.history.save();
+                return;
+            }
             range.adaptBox();
         }
         if (range.isBox) {
@@ -9706,6 +9710,19 @@ var backspaceKey = (editor) => {
             editor.history.save();
             return;
         }
+        if (prevNode.isText && prevNode.text().length === 1) {
+            event.preventDefault();
+            const block = prevNode.closestBlock();
+            range.setStartBefore(prevNode);
+            range.collapseToStart();
+            prevNode.remove();
+            if (block.isEmpty) {
+                appendDeepest(block, query('<br />'));
+                range.shrinkAfter(block);
+            }
+            editor.history.save();
+            return;
+        }
         if (prevNode.name === 'br' && prevNode.prev().length > 0) {
             event.preventDefault();
             range.setStartBefore(prevNode);