@textbus/platform-browser 4.0.0-alpha.55 → 4.0.0-alpha.57

package/bundles/index.esm.js

@@ -418,7 +418,33 @@ let SelectionBridge = class SelectionBridge {
             this.listen(this.connector);
             return;
         }
-        this.nativeSelection.setBaseAndExtent(anchor.node, anchor.offset, focus.node, focus.offset);
+        function tryOffset(position) {
+            if (!position.node) {
+                return;
+            }
+            if (position.node.nodeType === Node.TEXT_NODE) {
+                const len = position.node.textContent.length;
+                if (position.offset > len) {
+                    position.offset = len;
+                }
+            }
+            else if (position.node.nodeType === Node.ELEMENT_NODE) {
+                const len = position.node.childNodes.length;
+                if (position.offset > len) {
+                    position.offset = len;
+                }
+            }
+        }
+        try {
+            tryOffset(focus);
+            tryOffset(anchor);
+            this.nativeSelection.setBaseAndExtent(anchor.node, anchor.offset, focus.node, focus.offset);
+        }
+        catch (e) {
+            setTimeout(() => {
+                throw e;
+            });
+        }
         if (this.nativeSelection.rangeCount) {
             const nativeRange = this.nativeSelection.getRangeAt(0);
             this.selectionChangeEvent.next(nativeRange);
@@ -523,10 +549,10 @@ let SelectionBridge = class SelectionBridge {
                 }
                 minLeft = rect2.left;
                 minTop = rect2.top;
-                oldPosition = position;
+                // oldPosition = position
             }
             if (isToPrevLine) {
-                if (rect2.left < startLeft) {
+                if (rect2.left <= startLeft) {
                     return position;
                 }
                 if (oldPosition) {
@@ -1259,6 +1285,7 @@ let MagicInput = class MagicInput extends Input {
         }), fromEvent(textarea, 'compositionend').subscribe(() => {
             isWriting = false;
         }), fromEvent(textarea, 'beforeinput').subscribe(ev => {
+            this.ignoreComposition = false;
             if (this.isSafari) {
                 if (ev.inputType === 'insertFromComposition') {
                     isIgnore = true;

package/bundles/index.js

@@ -420,7 +420,33 @@ exports.SelectionBridge = class SelectionBridge {
             this.listen(this.connector);
             return;
         }
-        this.nativeSelection.setBaseAndExtent(anchor.node, anchor.offset, focus.node, focus.offset);
+        function tryOffset(position) {
+            if (!position.node) {
+                return;
+            }
+            if (position.node.nodeType === Node.TEXT_NODE) {
+                const len = position.node.textContent.length;
+                if (position.offset > len) {
+                    position.offset = len;
+                }
+            }
+            else if (position.node.nodeType === Node.ELEMENT_NODE) {
+                const len = position.node.childNodes.length;
+                if (position.offset > len) {
+                    position.offset = len;
+                }
+            }
+        }
+        try {
+            tryOffset(focus);
+            tryOffset(anchor);
+            this.nativeSelection.setBaseAndExtent(anchor.node, anchor.offset, focus.node, focus.offset);
+        }
+        catch (e) {
+            setTimeout(() => {
+                throw e;
+            });
+        }
         if (this.nativeSelection.rangeCount) {
             const nativeRange = this.nativeSelection.getRangeAt(0);
             this.selectionChangeEvent.next(nativeRange);
@@ -525,10 +551,10 @@ exports.SelectionBridge = class SelectionBridge {
                 }
                 minLeft = rect2.left;
                 minTop = rect2.top;
-                oldPosition = position;
+                // oldPosition = position
             }
             if (isToPrevLine) {
-                if (rect2.left < startLeft) {
+                if (rect2.left <= startLeft) {
                     return position;
                 }
                 if (oldPosition) {
@@ -1261,6 +1287,7 @@ exports.MagicInput = class MagicInput extends Input {
         }), stream.fromEvent(textarea, 'compositionend').subscribe(() => {
             isWriting = false;
         }), stream.fromEvent(textarea, 'beforeinput').subscribe(ev => {
+            this.ignoreComposition = false;
             if (this.isSafari) {
                 if (ev.inputType === 'insertFromComposition') {
                     isIgnore = true;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@textbus/platform-browser",
-  "version": "4.0.0-alpha.55",
+  "version": "4.0.0-alpha.57",
   "description": "Textbus is a rich text editor and framework that is highly customizable and extensible to achieve rich wysiwyg effects.",
   "main": "./bundles/index.js",
   "module": "./bundles/index.esm.js",
@@ -26,9 +26,9 @@
   ],
   "dependencies": {
     "@tanbo/stream": "^1.2.4",
-    "@textbus/collaborate": "^4.0.0-alpha.55",
-    "@textbus/core": "^4.0.0-alpha.55",
-    "@viewfly/core": "^1.0.0-alpha.6"
+    "@textbus/collaborate": "^4.0.0-alpha.57",
+    "@textbus/core": "^4.0.0-alpha.57",
+    "@viewfly/core": "^1.0.0-alpha.9"
   },
   "devDependencies": {
     "@rollup/plugin-commonjs": "^23.0.2",
@@ -48,5 +48,5 @@
   "bugs": {
     "url": "https://github.com/textbus/textbus.git/issues"
   },
-  "gitHead": "22e85887dd98c3689799dfd217bfc1f845cb28a8"
+  "gitHead": "0a8d42b5be9e2fd24dcbdf31de32e820fadfbe41"
 }