@textbus/xnote 0.0.10 → 0.0.11

package/bundles/index.esm.js

@@ -1834,11 +1834,18 @@ function findNonIntersectingRectangles(rectangles) {
 function getMaxRectangle(start, rectangles) {
     let merged = start;
     const remaining = [...rectangles];
+    const unMerged = [];
     while (remaining.length > 0) {
         const current = remaining.shift();
         if (current.intersects(merged)) {
             merged = current.merge(merged);
         }
+        else {
+            unMerged.push(current);
+        }
+    }
+    if (unMerged.length && merged !== start) {
+        return getMaxRectangle(merged, unMerged);
     }
     return merged;
 }
@@ -2073,13 +2080,13 @@ class TableComponent extends Component {
                 endIndex: i.length
             };
         });
-        this.selection.setSelectedRanges(slotRanges);
         this.tableSelection.set({
             startColumn: 0,
             endColumn: this.state.columnsConfig.length,
             startRow: startIndex,
             endRow: endIndex,
         });
+        this.selection.setSelectedRanges(slotRanges);
         this.focus.next(true);
         if (slotRanges.length) {
             setTimeout(() => {
@@ -2108,13 +2115,13 @@ class TableComponent extends Component {
                 endIndex: i.length
             };
         });
-        this.selection.setSelectedRanges(slotRanges);
         this.tableSelection.set({
             startColumn: startIndex,
             endColumn: endIndex,
             startRow: 0,
             endRow: this.state.rows.length,
         });
+        this.selection.setSelectedRanges(slotRanges);
         this.focus.next(true);
         this.selection.restore();
         this.textbus.focus();
@@ -6204,24 +6211,25 @@ let TableSelectionAwarenessDelegate = class TableSelectionAwarenessDelegate exte
             return false;
         }
         const rect = data.data || commonAncestorComponent.getMaxRectangle(findFocusCell(commonAncestorComponent, startSlot), findFocusCell(commonAncestorComponent, endSlot));
-        const renderer = this.domAdapter;
         if (!rect) {
             return false;
         }
-        const normalizedSlots = commonAncestorComponent.getSelectedNormalizedSlotsByRectangle(rect);
-        const rects = normalizedSlots.map(row => {
-            return row.cells.filter(i => i.visible).map(i => {
-                const td = renderer.getNativeNodeBySlot(i.raw.slot);
-                return td.getBoundingClientRect();
-            });
-        }).flat();
-        const left = Math.min(...rects.map(i => i.left));
-        const top = Math.min(...rects.map(i => i.top));
+        const dom = this.domAdapter.getNativeNodeByComponent(commonAncestorComponent);
+        const content = dom.querySelector('.xnote-table-content');
+        const trs = content.querySelectorAll('tr');
+        const cols = content.querySelectorAll('col');
+        const top = trs[rect.y1].getBoundingClientRect().top;
+        const left = cols[rect.x1].getBoundingClientRect().left;
+        let height = trs[rect.y2 - 1].getBoundingClientRect().bottom - top;
+        if (height === 0) {
+            height = trs[rect.y2 - 1].children.item(0).getBoundingClientRect().bottom - top;
+        }
+        const width = cols[rect.x2 - 1].getBoundingClientRect().right - left;
         return [{
                 left,
                 top,
-                width: Math.max(...rects.map(i => i.right)) - left,
-                height: Math.max(...rects.map(i => i.bottom)) - top
+                width,
+                height
             }];
     }
 };
@@ -6349,9 +6357,22 @@ class XNoteMessageBug extends MessageBus {
     get() {
         const selection = this.selection;
         const c = selection.commonAncestorComponent;
-        return Object.assign(Object.assign({}, this.userinfo), { selection: selection.getPaths(), data: (!selection.isCollapsed && c instanceof TableComponent) ? c.getSelectedRect() : null });
+        const msg = Object.assign(Object.assign({}, this.userinfo), { selection: selection.getPaths() });
+        if (!selection.isCollapsed && c instanceof TableComponent) {
+            const selection = c.tableSelection();
+            if (selection) {
+                msg.data = {
+                    x1: selection.startColumn,
+                    x2: selection.endColumn,
+                    y1: selection.startRow,
+                    y2: selection.endRow,
+                };
+            }
+        }
+        return msg;
     }
     consume(message) {
+        message = message.filter(i => i.message);
         this.messageChangeEvent.next([...message]);
         this.collaborateCursor.draw(message.filter(item => {
             return item.message.id !== this.userinfo.id;

package/bundles/index.js

@@ -1836,11 +1836,18 @@ function findNonIntersectingRectangles(rectangles) {
 function getMaxRectangle(start, rectangles) {
     let merged = start;
     const remaining = [...rectangles];
+    const unMerged = [];
     while (remaining.length > 0) {
         const current = remaining.shift();
         if (current.intersects(merged)) {
             merged = current.merge(merged);
         }
+        else {
+            unMerged.push(current);
+        }
+    }
+    if (unMerged.length && merged !== start) {
+        return getMaxRectangle(merged, unMerged);
     }
     return merged;
 }
@@ -2075,13 +2082,13 @@ class TableComponent extends core$1.Component {
                 endIndex: i.length
             };
         });
-        this.selection.setSelectedRanges(slotRanges);
         this.tableSelection.set({
             startColumn: 0,
             endColumn: this.state.columnsConfig.length,
             startRow: startIndex,
             endRow: endIndex,
         });
+        this.selection.setSelectedRanges(slotRanges);
         this.focus.next(true);
         if (slotRanges.length) {
             setTimeout(() => {
@@ -2110,13 +2117,13 @@ class TableComponent extends core$1.Component {
                 endIndex: i.length
             };
         });
-        this.selection.setSelectedRanges(slotRanges);
         this.tableSelection.set({
             startColumn: startIndex,
             endColumn: endIndex,
             startRow: 0,
             endRow: this.state.rows.length,
         });
+        this.selection.setSelectedRanges(slotRanges);
         this.focus.next(true);
         this.selection.restore();
         this.textbus.focus();
@@ -6206,24 +6213,25 @@ let TableSelectionAwarenessDelegate = class TableSelectionAwarenessDelegate exte
             return false;
         }
         const rect = data.data || commonAncestorComponent.getMaxRectangle(findFocusCell(commonAncestorComponent, startSlot), findFocusCell(commonAncestorComponent, endSlot));
-        const renderer = this.domAdapter;
         if (!rect) {
             return false;
         }
-        const normalizedSlots = commonAncestorComponent.getSelectedNormalizedSlotsByRectangle(rect);
-        const rects = normalizedSlots.map(row => {
-            return row.cells.filter(i => i.visible).map(i => {
-                const td = renderer.getNativeNodeBySlot(i.raw.slot);
-                return td.getBoundingClientRect();
-            });
-        }).flat();
-        const left = Math.min(...rects.map(i => i.left));
-        const top = Math.min(...rects.map(i => i.top));
+        const dom = this.domAdapter.getNativeNodeByComponent(commonAncestorComponent);
+        const content = dom.querySelector('.xnote-table-content');
+        const trs = content.querySelectorAll('tr');
+        const cols = content.querySelectorAll('col');
+        const top = trs[rect.y1].getBoundingClientRect().top;
+        const left = cols[rect.x1].getBoundingClientRect().left;
+        let height = trs[rect.y2 - 1].getBoundingClientRect().bottom - top;
+        if (height === 0) {
+            height = trs[rect.y2 - 1].children.item(0).getBoundingClientRect().bottom - top;
+        }
+        const width = cols[rect.x2 - 1].getBoundingClientRect().right - left;
         return [{
                 left,
                 top,
-                width: Math.max(...rects.map(i => i.right)) - left,
-                height: Math.max(...rects.map(i => i.bottom)) - top
+                width,
+                height
             }];
     }
 };
@@ -6351,9 +6359,22 @@ class XNoteMessageBug extends collaborate.MessageBus {
     get() {
         const selection = this.selection;
         const c = selection.commonAncestorComponent;
-        return Object.assign(Object.assign({}, this.userinfo), { selection: selection.getPaths(), data: (!selection.isCollapsed && c instanceof TableComponent) ? c.getSelectedRect() : null });
+        const msg = Object.assign(Object.assign({}, this.userinfo), { selection: selection.getPaths() });
+        if (!selection.isCollapsed && c instanceof TableComponent) {
+            const selection = c.tableSelection();
+            if (selection) {
+                msg.data = {
+                    x1: selection.startColumn,
+                    x2: selection.endColumn,
+                    y1: selection.startRow,
+                    y2: selection.endRow,
+                };
+            }
+        }
+        return msg;
     }
     consume(message) {
+        message = message.filter(i => i.message);
         this.messageChangeEvent.next([...message]);
         this.collaborateCursor.draw(message.filter(item => {
             return item.message.id !== this.userinfo.id;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@textbus/xnote",
-  "version": "0.0.10",
+  "version": "0.0.11",
   "description": "A high-performance rich text editor that supports multiplayer online collaboration.",
   "main": "./bundles/index.js",
   "module": "./bundles/index.esm.js",