@textbus/platform-browser 5.0.0-alpha.14 → 5.0.0-alpha.16

package/bundles/index.esm.js

@@ -552,8 +552,8 @@ let SelectionBridge = class SelectionBridge {
         nativeRange.collapse();
         return getLayoutRectByRange(nativeRange);
     }
-    restore(abstractSelection, formLocal) {
-        this.changeFromUser = formLocal;
+    restore(abstractSelection, fromLocal) {
+        this.changeFromUser = fromLocal;
         if (this.ignoreSelectionChange || !this.connector) {
             return;
         }
@@ -611,6 +611,10 @@ let SelectionBridge = class SelectionBridge {
                 this.listen(this.connector);
             }
         };
+        if (fromLocal) {
+            Promise.resolve().then(bind);
+            return;
+        }
         if (typeof requestIdleCallback === 'function') {
             requestIdleCallback(bind);
         }
@@ -803,7 +807,7 @@ let SelectionBridge = class SelectionBridge {
             isUpdating = true;
         }), this.scheduler.onDocChanged.pipe(delay()).subscribe(() => {
             isUpdating = false;
-        }), fromEvent(document, 'selectionchange').pipe().subscribe(() => {
+        }), fromEvent(document, 'selectionchange').subscribe(() => {
             if (isUpdating) {
                 return;
             }
@@ -1318,13 +1322,13 @@ class ExperimentalCaret {
                 pointEle.style.cssText = 'position: absolute; left: 0; top: 0; width:0;height:0';
                 hackEle.append(pointEle);
                 node.append(hackEle);
-                const t1 = pointEle.getBoundingClientRect().top;
+                const p1 = pointEle.getBoundingClientRect();
                 pointEle.style.right = '0';
                 pointEle.style.left = '';
-                const t2 = pointEle.getBoundingClientRect().top;
-                if (t2 < t1) {
-                    rotate = -rotate;
-                }
+                const p2 = pointEle.getBoundingClientRect();
+                const x = p1.x - p2.x;
+                const y = p1.y - p2.y;
+                rotate = Math.atan2(y, x) * 180 / Math.PI;
                 hackEle.remove();
             }
         }
@@ -1339,7 +1343,7 @@ class ExperimentalCaret {
             fontSize,
             transform: `rotate(${rotate}deg)`,
         });
-        this.caret.style.backgroundColor = color;
+        this.caret.style.backgroundColor = color === 'rgba(0, 0, 0, 0)' ? '#000' : color;
         this.styleChangeEvent.next({
             height: boxHeight + 'px',
             lineHeight: boxHeight + 'px',

package/bundles/index.js

@@ -554,8 +554,8 @@ exports.SelectionBridge = class SelectionBridge {
         nativeRange.collapse();
         return getLayoutRectByRange(nativeRange);
     }
-    restore(abstractSelection, formLocal) {
-        this.changeFromUser = formLocal;
+    restore(abstractSelection, fromLocal) {
+        this.changeFromUser = fromLocal;
         if (this.ignoreSelectionChange || !this.connector) {
             return;
         }
@@ -613,6 +613,10 @@ exports.SelectionBridge = class SelectionBridge {
                 this.listen(this.connector);
             }
         };
+        if (fromLocal) {
+            Promise.resolve().then(bind);
+            return;
+        }
         if (typeof requestIdleCallback === 'function') {
             requestIdleCallback(bind);
         }
@@ -805,7 +809,7 @@ exports.SelectionBridge = class SelectionBridge {
             isUpdating = true;
         }), this.scheduler.onDocChanged.pipe(stream.delay()).subscribe(() => {
             isUpdating = false;
-        }), stream.fromEvent(document, 'selectionchange').pipe().subscribe(() => {
+        }), stream.fromEvent(document, 'selectionchange').subscribe(() => {
             if (isUpdating) {
                 return;
             }
@@ -1320,13 +1324,13 @@ class ExperimentalCaret {
                 pointEle.style.cssText = 'position: absolute; left: 0; top: 0; width:0;height:0';
                 hackEle.append(pointEle);
                 node.append(hackEle);
-                const t1 = pointEle.getBoundingClientRect().top;
+                const p1 = pointEle.getBoundingClientRect();
                 pointEle.style.right = '0';
                 pointEle.style.left = '';
-                const t2 = pointEle.getBoundingClientRect().top;
-                if (t2 < t1) {
-                    rotate = -rotate;
-                }
+                const p2 = pointEle.getBoundingClientRect();
+                const x = p1.x - p2.x;
+                const y = p1.y - p2.y;
+                rotate = Math.atan2(y, x) * 180 / Math.PI;
                 hackEle.remove();
             }
         }
@@ -1341,7 +1345,7 @@ class ExperimentalCaret {
             fontSize,
             transform: `rotate(${rotate}deg)`,
         });
-        this.caret.style.backgroundColor = color;
+        this.caret.style.backgroundColor = color === 'rgba(0, 0, 0, 0)' ? '#000' : color;
         this.styleChangeEvent.next({
             height: boxHeight + 'px',
             lineHeight: boxHeight + 'px',

package/bundles/selection-bridge.d.ts

@@ -30,7 +30,7 @@ export declare class SelectionBridge implements NativeSelectionBridge {
     connect(connector: NativeSelectionConnector): void;
     disConnect(): void;
     getRect(location: SelectionPosition): Rect | null;
-    restore(abstractSelection: AbstractSelection | null, formLocal: boolean): void;
+    restore(abstractSelection: AbstractSelection | null, fromLocal: boolean): void;
     destroy(): void;
     getPositionByRange(abstractSelection: AbstractSelection): {
         focus: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@textbus/platform-browser",
-  "version": "5.0.0-alpha.14",
+  "version": "5.0.0-alpha.16",
   "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",
@@ -47,5 +47,5 @@
   "bugs": {
     "url": "https://github.com/textbus/textbus.git/issues"
   },
-  "gitHead": "647efcf47cb3568d711075db36ffed6eb3d602bb"
+  "gitHead": "8c9e90bd1a3effc96dcbbd455f24a8b263087e90"
 }