vue-editify 0.0.28 → 0.0.29

package/lib/editify.es.js

@@ -2969,9 +2969,11 @@ const emptyDefaultBehaviorInblock = function(element2) {
   }
 };
 const setRangeInVisible = function() {
-  const fn = async (root2) => {
-    const scrollHeight = obj$1.element.getScrollHeight(root2);
-    if (root2.clientHeight < scrollHeight) {
+  var _a;
+  const fn = async (root) => {
+    const scrollHeight = obj$1.element.getScrollHeight(root);
+    const scrollWidth = obj$1.element.getScrollWidth(root);
+    if (root.clientHeight < scrollHeight || root.clientWidth < scrollWidth) {
       const selection = window.getSelection();
       if (selection.rangeCount == 0) {
         return;
@@ -2983,36 +2985,65 @@ const setRangeInVisible = function() {
         target = this.range.focus.element.elm;
       }
       const childRect = target.getBoundingClientRect();
-      const parentRect = root2.getBoundingClientRect();
-      if (childRect.top < parentRect.top) {
-        await obj$1.element.setScrollTop({
-          el: root2,
-          number: 0
-        });
-        const tempChildRect = target.getBoundingClientRect();
-        const tempParentRect = root2.getBoundingClientRect();
-        obj$1.element.setScrollTop({
-          el: root2,
-          number: tempChildRect.top - tempParentRect.top - tempChildRect.height * 2
-        });
-      } else if (childRect.bottom > parentRect.bottom) {
-        await obj$1.element.setScrollTop({
-          el: root2,
-          number: 0
-        });
-        const tempChildRect = target.getBoundingClientRect();
-        const tempParentRect = root2.getBoundingClientRect();
-        obj$1.element.setScrollTop({
-          el: root2,
-          number: tempChildRect.bottom - tempParentRect.bottom + tempChildRect.height * 2
-        });
+      const parentRect = root.getBoundingClientRect();
+      if (root.clientHeight < scrollHeight) {
+        if (childRect.top < parentRect.top) {
+          await obj$1.element.setScrollTop({
+            el: root,
+            number: 0
+          });
+          const tempChildRect = target.getBoundingClientRect();
+          const tempParentRect = root.getBoundingClientRect();
+          obj$1.element.setScrollTop({
+            el: root,
+            number: tempChildRect.top - tempParentRect.top - tempChildRect.height * 2
+          });
+        } else if (childRect.bottom > parentRect.bottom) {
+          await obj$1.element.setScrollTop({
+            el: root,
+            number: 0
+          });
+          const tempChildRect = target.getBoundingClientRect();
+          const tempParentRect = root.getBoundingClientRect();
+          obj$1.element.setScrollTop({
+            el: root,
+            number: tempChildRect.bottom - tempParentRect.bottom + tempChildRect.height * 2
+          });
+        }
+      }
+      if (root.clientWidth < scrollWidth) {
+        if (childRect.left < parentRect.left) {
+          await obj$1.element.setScrollLeft({
+            el: root,
+            number: 0
+          });
+          const tempChildRect = target.getBoundingClientRect();
+          const tempParentRect = root.getBoundingClientRect();
+          obj$1.element.setScrollLeft({
+            el: root,
+            number: tempChildRect.left - tempParentRect.left - tempChildRect.width * 2 - (tempChildRect.width * 2 > 20 ? 0 : 20)
+          });
+        } else if (childRect.right > parentRect.right) {
+          await obj$1.element.setScrollLeft({
+            el: root,
+            number: 0
+          });
+          const tempChildRect = target.getBoundingClientRect();
+          const tempParentRect = root.getBoundingClientRect();
+          obj$1.element.setScrollLeft({
+            el: root,
+            number: tempChildRect.right - tempParentRect.right + tempChildRect.width * 2 + (tempChildRect.width * 2 > 20 ? 0 : 20)
+          });
+        }
       }
     }
   };
-  let root = this.$el;
-  while (obj$1.element.isElement(root) && root != document.documentElement) {
-    fn(root);
-    root = root.parentNode;
+  if ((_a = this.range) == null ? void 0 : _a.focus.element.elm) {
+    let root = this.range.focus.element.elm;
+    while (obj$1.element.isElement(root) && root != document.documentElement) {
+      fn(root);
+      root = root.parentNode;
+    }
   }
 };
 const handleStackEmpty = function() {
@@ -3089,6 +3120,7 @@ const handleSelectionChange = function() {
       } else {
         this.range = new AlexRange(anchor, focus);
       }
+      this.history.updateCurrentRange(this.range);
       this.emit("rangeUpdate", this.range);
     }
   }
@@ -4124,6 +4156,7 @@ class AlexEditor {
     setTimeout(() => {
       setRangeInVisible.apply(this);
       this.__innerSelectionChange = false;
+      this.history.updateCurrentRange(this.range);
       this.emit("rangeUpdate", this.range);
     }, 0);
   }
@@ -22929,7 +22962,7 @@ const i18n = (locale) => {
     return translations[locale][key];
   };
 };
-const version = "0.0.28";
+const version = "0.0.29";
 const install = (app, props) => {
   const locale = (props ? props.locale : "zh_CN") || "zh_CN";
   app.provide("$editTrans", i18n(locale));