@textbus/platform-browser 4.1.0 → 4.2.1

package/bundles/collaborate-cursor.d.ts

@@ -14,7 +14,7 @@ export interface RemoteSelectionCursor {
  * 远程光标绘制范围计算代理类，可用于定制特定场景下的远程选区绘制，如表格有选区，不会遵守常见的文档流形式
  */
 export declare abstract class CollaborateSelectionAwarenessDelegate {
-    abstract getRects(abstractSelection: AbstractSelection, nativeRange: Range): false | Rect[];
+    abstract getRects(abstractSelection: AbstractSelection, nativeRange: Range, selectionCursor: UserSelectionCursor): false | Rect[];
 }
 /**
  * 协作用户虚拟光标信息
@@ -23,6 +23,7 @@ export interface UserSelectionCursor {
     username: string;
     color: string;
     selection: SelectionPaths;
+    data?: any;
 }
 /**
  * 协作光标绘制类

package/bundles/index.esm.js

@@ -1043,7 +1043,7 @@ class ExperimentalCaret {
             nativeRange.collapse();
         }
         const rect = getLayoutRectByRange(nativeRange);
-        const { fontSize, lineHeight, color } = getComputedStyle(node);
+        const { fontSize, lineHeight, color, writingMode } = getComputedStyle(node);
         let height;
         if (isNaN(+lineHeight)) {
             const f = parseFloat(lineHeight);
@@ -1072,7 +1072,8 @@ class ExperimentalCaret {
             rotate = Math.round(Math.atan2(rect.width, rect.height) * 180 / Math.PI);
             if (rotate !== 0) {
                 const hackEle = document.createElement('span');
-                hackEle.style.cssText = 'display: inline-block; width: 10px; height: 10px; position: relative; contain: layout style size;';
+                // eslint-disable-next-line max-len
+                hackEle.style.cssText = 'display: inline-block; width: 10px; height: 10px; position: relative; contain: layout style size; writing-mode: inherit';
                 const pointEle = document.createElement('span');
                 pointEle.style.cssText = 'position: absolute; left: 0; top: 0; width:0;height:0';
                 hackEle.append(pointEle);
@@ -1087,6 +1088,9 @@ class ExperimentalCaret {
                 hackEle.remove();
             }
         }
+        if (rotate === 0 && (writingMode === 'vertical-lr' || writingMode === 'vertical-rl')) {
+            rotate += 90;
+        }
         Object.assign(this.elementRef.style, {
             left: left + 'px',
             top: top + 'px',
@@ -1348,7 +1352,12 @@ let MagicInput = class MagicInput extends Input {
                 key: key,
                 altKey: ev.altKey,
                 shiftKey: ev.shiftKey,
-                modKey: this.isMac ? ev.metaKey : ev.ctrlKey
+                modKey: this.isMac ? ev.metaKey : ev.ctrlKey,
+                agent: {
+                    key: ev.key,
+                    code: ev.code,
+                    keyCode: ev.keyCode,
+                }
             });
             if (is) {
                 this.ignoreComposition = true;
@@ -1614,7 +1623,7 @@ let CollaborateCursor = class CollaborateCursor {
                     anchorOffset,
                     focusSlot,
                     anchorSlot
-                }, nativeRange);
+                }, nativeRange, item);
             }
             if (!rects) {
                 rects = nativeRange.getClientRects();
@@ -1942,7 +1951,12 @@ let NativeInput = class NativeInput extends Input {
                 key: key,
                 altKey: ev.altKey,
                 shiftKey: ev.shiftKey,
-                modKey: this.isMac ? ev.metaKey : ev.ctrlKey
+                modKey: this.isMac ? ev.metaKey : ev.ctrlKey,
+                agent: {
+                    key: ev.key,
+                    keyCode: ev.keyCode,
+                    code: ev.code
+                }
             });
             if (is) {
                 this.ignoreComposition = true;

package/bundles/index.js

@@ -1045,7 +1045,7 @@ class ExperimentalCaret {
             nativeRange.collapse();
         }
         const rect = getLayoutRectByRange(nativeRange);
-        const { fontSize, lineHeight, color } = getComputedStyle(node);
+        const { fontSize, lineHeight, color, writingMode } = getComputedStyle(node);
         let height;
         if (isNaN(+lineHeight)) {
             const f = parseFloat(lineHeight);
@@ -1074,7 +1074,8 @@ class ExperimentalCaret {
             rotate = Math.round(Math.atan2(rect.width, rect.height) * 180 / Math.PI);
             if (rotate !== 0) {
                 const hackEle = document.createElement('span');
-                hackEle.style.cssText = 'display: inline-block; width: 10px; height: 10px; position: relative; contain: layout style size;';
+                // eslint-disable-next-line max-len
+                hackEle.style.cssText = 'display: inline-block; width: 10px; height: 10px; position: relative; contain: layout style size; writing-mode: inherit';
                 const pointEle = document.createElement('span');
                 pointEle.style.cssText = 'position: absolute; left: 0; top: 0; width:0;height:0';
                 hackEle.append(pointEle);
@@ -1089,6 +1090,9 @@ class ExperimentalCaret {
                 hackEle.remove();
             }
         }
+        if (rotate === 0 && (writingMode === 'vertical-lr' || writingMode === 'vertical-rl')) {
+            rotate += 90;
+        }
         Object.assign(this.elementRef.style, {
             left: left + 'px',
             top: top + 'px',
@@ -1350,7 +1354,12 @@ exports.MagicInput = class MagicInput extends Input {
                 key: key,
                 altKey: ev.altKey,
                 shiftKey: ev.shiftKey,
-                modKey: this.isMac ? ev.metaKey : ev.ctrlKey
+                modKey: this.isMac ? ev.metaKey : ev.ctrlKey,
+                agent: {
+                    key: ev.key,
+                    code: ev.code,
+                    keyCode: ev.keyCode,
+                }
             });
             if (is) {
                 this.ignoreComposition = true;
@@ -1616,7 +1625,7 @@ exports.CollaborateCursor = class CollaborateCursor {
                     anchorOffset,
                     focusSlot,
                     anchorSlot
-                }, nativeRange);
+                }, nativeRange, item);
             }
             if (!rects) {
                 rects = nativeRange.getClientRects();
@@ -1944,7 +1953,12 @@ exports.NativeInput = class NativeInput extends Input {
                 key: key,
                 altKey: ev.altKey,
                 shiftKey: ev.shiftKey,
-                modKey: this.isMac ? ev.metaKey : ev.ctrlKey
+                modKey: this.isMac ? ev.metaKey : ev.ctrlKey,
+                agent: {
+                    key: ev.key,
+                    keyCode: ev.keyCode,
+                    code: ev.code
+                }
             });
             if (is) {
                 this.ignoreComposition = true;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@textbus/platform-browser",
-  "version": "4.1.0",
+  "version": "4.2.1",
   "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,7 +26,7 @@
   ],
   "dependencies": {
     "@tanbo/stream": "^1.2.5",
-    "@textbus/core": "^4.1.0",
+    "@textbus/core": "^4.2.1",
     "@viewfly/core": "^1.0.5"
   },
   "devDependencies": {