@textbus/xnote 0.2.1 → 0.2.2

package/README.md

@@ -108,7 +108,7 @@ const editor = new Editor({
 export abstract class Organization {
   abstract getMembers(name?: string): Promise<Member[]>
 
-  abstract getMemberById(id: string): Promise<Member | null>
+  abstract atMember(member: Member): void
 }
 ```
 然后在编辑器初始化时传入你的实现

package/bundles/index.esm.js

@@ -691,7 +691,13 @@ const DropdownMenuPortal = withAnnotation({
             const documentClientHeight = document.documentElement.clientHeight;
             const bottomDistance = documentClientHeight - triggerRect.bottom;
             const isToTop = bottomDistance < 200 && triggerRect.top > bottomDistance;
-            menuElement.style.left = triggerRect.left - containerRect.left + 'px';
+            let left = triggerRect.left - containerRect.left;
+            const clientWidth = document.documentElement.clientWidth;
+            const menuWidth = menuElement.offsetWidth;
+            const maxLeft = clientWidth - menuWidth - 20;
+            left = Math.min(maxLeft, left);
+            // left = Math.max(left, 20)
+            menuElement.style.left = left + 'px';
             if (isToTop) {
                 const maxHeight = Math.max(menuElement.scrollHeight, menuElement.offsetHeight);
                 const height = Math.min(triggerRect.top - 20, maxHeight, 400);
@@ -2607,7 +2613,7 @@ class TableComponent extends Component {
         };
         const start = getSelfSlot(this.selection.startSlot);
         const end = getSelfSlot(this.selection.endSlot);
-        if (start && end) {
+        if (start && end && start !== end) {
             return this.getMaxRectangle(start, end);
         }
         return null;
@@ -5641,30 +5647,41 @@ const InlineToolbar = withAnnotation({
     const toolbarRef = createRef();
     function getTop() {
         const docRect = viewDocument.getBoundingClientRect();
+        // const toolbarRect = toolbarRef.current!.getBoundingClientRect()
         const toolbarHeight = 36;
         // const documentHeight = document.documentElement.clientHeight
         let selectionFocusRect = null;
         const commonAncestorComponent = selection.commonAncestorComponent;
         if (commonAncestorComponent instanceof TableComponent) {
-            const slots = commonAncestorComponent.getSelectedNormalizedSlots().map(item => {
-                return item.cells.filter(i => {
-                    return i.visible;
-                }).map(cell => {
-                    return cell.raw.slot;
+            const normalizedSlots = commonAncestorComponent.getSelectedNormalizedSlots();
+            if (normalizedSlots) {
+                const slots = normalizedSlots.map(item => {
+                    return item.cells.filter(i => {
+                        return i.visible;
+                    }).map(cell => {
+                        return cell.raw.slot;
+                    });
+                }).flat();
+                const startSlot = slots.at(0);
+                const endSlot = slots.at(-1);
+                const rect = commonAncestorComponent.getSelectedRect();
+                const startRect = adapter.getNativeNodeBySlot(startSlot).getBoundingClientRect();
+                const endEle = adapter.getNativeNodeBySlot(endSlot).getBoundingClientRect();
+                const width = sum(commonAncestorComponent.state.columnsConfig.slice(rect.x1, rect.x2));
+                selectionFocusRect = {
+                    left: startRect.left + width / 2,
+                    // left: Math.max(startRect.left + width / 2, toolbarRect.width / 2 + 10 - docRect.left),
+                    top: startRect.top,
+                    height: endEle.bottom - startRect.top,
+                    width
+                };
+            }
+            else {
+                selectionFocusRect = bridge.getRect({
+                    slot: selection.focusSlot,
+                    offset: selection.focusOffset
                 });
-            }).flat();
-            const startSlot = slots.at(0);
-            const endSlot = slots.at(-1);
-            const rect = commonAncestorComponent.getSelectedRect();
-            const startRect = adapter.getNativeNodeBySlot(startSlot).getBoundingClientRect();
-            const endEle = adapter.getNativeNodeBySlot(endSlot).getBoundingClientRect();
-            const width = sum(commonAncestorComponent.state.columnsConfig.slice(rect.x1, rect.x2));
-            selectionFocusRect = {
-                left: startRect.left + width / 2,
-                top: startRect.top,
-                height: endEle.bottom - startRect.top,
-                width
-            };
+            }
         }
         else {
             selectionFocusRect = bridge.getRect({
@@ -5683,6 +5700,7 @@ const InlineToolbar = withAnnotation({
         updateViewPosition(draft => {
             draft.transitionDuration = .15;
             draft.left = centerLeft - docRect.left;
+            // draft.left = Math.max(centerLeft - docRect.left, toolbarRect.width / 2 + 10 - docRect.left)
             draft.top = top + 10;
         });
         return top;

package/bundles/index.js

@@ -693,7 +693,13 @@ const DropdownMenuPortal = core.withAnnotation({
             const documentClientHeight = document.documentElement.clientHeight;
             const bottomDistance = documentClientHeight - triggerRect.bottom;
             const isToTop = bottomDistance < 200 && triggerRect.top > bottomDistance;
-            menuElement.style.left = triggerRect.left - containerRect.left + 'px';
+            let left = triggerRect.left - containerRect.left;
+            const clientWidth = document.documentElement.clientWidth;
+            const menuWidth = menuElement.offsetWidth;
+            const maxLeft = clientWidth - menuWidth - 20;
+            left = Math.min(maxLeft, left);
+            // left = Math.max(left, 20)
+            menuElement.style.left = left + 'px';
             if (isToTop) {
                 const maxHeight = Math.max(menuElement.scrollHeight, menuElement.offsetHeight);
                 const height = Math.min(triggerRect.top - 20, maxHeight, 400);
@@ -2609,7 +2615,7 @@ class TableComponent extends core$1.Component {
         };
         const start = getSelfSlot(this.selection.startSlot);
         const end = getSelfSlot(this.selection.endSlot);
-        if (start && end) {
+        if (start && end && start !== end) {
             return this.getMaxRectangle(start, end);
         }
         return null;
@@ -5643,30 +5649,41 @@ const InlineToolbar = core.withAnnotation({
     const toolbarRef = core.createRef();
     function getTop() {
         const docRect = viewDocument.getBoundingClientRect();
+        // const toolbarRect = toolbarRef.current!.getBoundingClientRect()
         const toolbarHeight = 36;
         // const documentHeight = document.documentElement.clientHeight
         let selectionFocusRect = null;
         const commonAncestorComponent = selection.commonAncestorComponent;
         if (commonAncestorComponent instanceof TableComponent) {
-            const slots = commonAncestorComponent.getSelectedNormalizedSlots().map(item => {
-                return item.cells.filter(i => {
-                    return i.visible;
-                }).map(cell => {
-                    return cell.raw.slot;
+            const normalizedSlots = commonAncestorComponent.getSelectedNormalizedSlots();
+            if (normalizedSlots) {
+                const slots = normalizedSlots.map(item => {
+                    return item.cells.filter(i => {
+                        return i.visible;
+                    }).map(cell => {
+                        return cell.raw.slot;
+                    });
+                }).flat();
+                const startSlot = slots.at(0);
+                const endSlot = slots.at(-1);
+                const rect = commonAncestorComponent.getSelectedRect();
+                const startRect = adapter.getNativeNodeBySlot(startSlot).getBoundingClientRect();
+                const endEle = adapter.getNativeNodeBySlot(endSlot).getBoundingClientRect();
+                const width = sum(commonAncestorComponent.state.columnsConfig.slice(rect.x1, rect.x2));
+                selectionFocusRect = {
+                    left: startRect.left + width / 2,
+                    // left: Math.max(startRect.left + width / 2, toolbarRect.width / 2 + 10 - docRect.left),
+                    top: startRect.top,
+                    height: endEle.bottom - startRect.top,
+                    width
+                };
+            }
+            else {
+                selectionFocusRect = bridge.getRect({
+                    slot: selection.focusSlot,
+                    offset: selection.focusOffset
                 });
-            }).flat();
-            const startSlot = slots.at(0);
-            const endSlot = slots.at(-1);
-            const rect = commonAncestorComponent.getSelectedRect();
-            const startRect = adapter.getNativeNodeBySlot(startSlot).getBoundingClientRect();
-            const endEle = adapter.getNativeNodeBySlot(endSlot).getBoundingClientRect();
-            const width = sum(commonAncestorComponent.state.columnsConfig.slice(rect.x1, rect.x2));
-            selectionFocusRect = {
-                left: startRect.left + width / 2,
-                top: startRect.top,
-                height: endEle.bottom - startRect.top,
-                width
-            };
+            }
         }
         else {
             selectionFocusRect = bridge.getRect({
@@ -5685,6 +5702,7 @@ const InlineToolbar = core.withAnnotation({
         updateViewPosition(draft => {
             draft.transitionDuration = .15;
             draft.left = centerLeft - docRect.left;
+            // draft.left = Math.max(centerLeft - docRect.left, toolbarRect.width / 2 + 10 - docRect.left)
             draft.top = top + 10;
         });
         return top;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@textbus/xnote",
-  "version": "0.2.1",
+  "version": "0.2.2",
   "description": "A high-performance rich text editor that supports multiplayer online collaboration.",
   "main": "./bundles/index.js",
   "module": "./bundles/index.esm.js",
@@ -31,10 +31,10 @@
     "@textbus/collaborate": "^4.2.4",
     "@textbus/core": "^4.2.4",
     "@textbus/platform-browser": "^4.2.5",
-    "@viewfly/core": "^1.1.0",
-    "@viewfly/hooks": "^1.1.0",
-    "@viewfly/platform-browser": "^1.1.0",
-    "@viewfly/scoped-css": "^1.1.0",
+    "@viewfly/core": "^1.1.1",
+    "@viewfly/hooks": "^1.1.1",
+    "@viewfly/platform-browser": "^1.1.1",
+    "@viewfly/scoped-css": "^1.1.1",
     "highlight.js": "^11.9.0",
     "katex": "^0.16.10",
     "uuid": "^10.0.0"
@@ -47,7 +47,7 @@
     "@types/uuid": "^10.0.0",
     "@typescript-eslint/eslint-plugin": "^5.8.0",
     "@typescript-eslint/parser": "^5.8.0",
-    "@viewfly/devtools": "^1.0.8",
+    "@viewfly/devtools": "^1.1.1",
     "autoprefixer": "^10.4.0",
     "babel-plugin-transform-es2015-modules-commonjs": "^6.26.2",
     "core-js": "^3.20.1",