@textbus/collaborate 4.1.0-alpha.0 → 4.1.0

package/bundles/collab-history.d.ts

@@ -33,6 +33,4 @@ export declare class CollabHistory implements History {
     forward(): void;
     clear(): void;
     destroy(): void;
-    private getAbstractSelection;
-    private getRelativeCursorLocation;
 }

package/bundles/collaborate.d.ts

@@ -1,7 +1,19 @@
 import { Observable } from '@tanbo/stream';
-import { Component, Registry, Scheduler, Selection, Slot } from '@textbus/core';
-import { AbstractType, Doc as YDoc, Map as YMap, Text as YText } from 'yjs';
+import { Component, Registry, Scheduler, Selection, Slot, AbstractSelection } from '@textbus/core';
+import { AbstractType, Doc as YDoc, Map as YMap, RelativePosition, Text as YText } from 'yjs';
 import { SubModelLoader } from './sub-model-loader';
+export interface RelativePositionRecord {
+    doc: YDoc;
+    position: RelativePosition;
+}
+export interface CursorPosition {
+    anchor: RelativePositionRecord;
+    focus: RelativePositionRecord;
+}
+export interface CollaborateHistorySelectionPosition {
+    before: CursorPosition | null;
+    after: CursorPosition | null;
+}
 declare class SlotMap {
     private slotAndYTextMap;
     private yTextAndSlotMap;
@@ -31,6 +43,9 @@ export declare class Collaborate {
     constructor(scheduler: Scheduler, registry: Registry, selection: Selection, subModelLoader: SubModelLoader);
     syncRootComponent(yDoc: YDoc, sharedComponent: YMap<any>, localComponent: Component<any>): void;
     syncRootSlot(yDoc: YDoc, sharedSlot: YText, localSlot: Slot): void;
+    getAbstractSelection(position: CursorPosition): AbstractSelection | null;
+    getRelativeCursorLocation(): CursorPosition | null;
+    restoreCursorPosition(position: CursorPosition | null): void;
     private initSyncEvent;
     private syncComponent;
     private syncSlot;

package/bundles/connectors/hocuspocus-connector.d.ts

@@ -1,7 +1,8 @@
+import { HocuspocusProvider } from '@hocuspocus/provider';
 import { HocuspocusProviderConfiguration } from '@hocuspocus/provider';
 import { SyncConnector } from '../sync-connector';
 export declare class HocuspocusConnector extends SyncConnector {
-    private provide;
+    provide: HocuspocusProvider;
     constructor(config: HocuspocusProviderConfiguration);
     setLocalStateField(key: string, data: Record<string, any>): void;
     onDestroy(): void;

package/bundles/connectors/y-websocket-connector.d.ts

@@ -1,7 +1,8 @@
 import { Doc as YDoc } from 'yjs';
+import { WebsocketProvider } from 'y-websocket';
 import { SyncConnector } from '../sync-connector';
 export declare class YWebsocketConnector extends SyncConnector {
-    private provide;
+    provide: WebsocketProvider;
     constructor(url: string, roomName: string, yDoc: YDoc);
     setLocalStateField(key: string, data: Record<string, any>): void;
     onDestroy(): void;

package/bundles/index.esm.js

@@ -3,7 +3,7 @@ import { Subject, map, filter, Subscription } from '@tanbo/stream';
 import { WebsocketProvider } from 'y-websocket';
 import { Injectable, Inject, Optional } from '@viewfly/core';
 import { makeError, ChangeOrigin, Slot, createObjectProxy, createArrayProxy, AsyncSlot, AsyncComponent, Component, Scheduler, Registry, Selection, HISTORY_STACK_SIZE, RootComponentRef, History } from '@textbus/core';
-import { Doc, Map, Array as Array$1, Text, UndoManager, createAbsolutePositionFromRelativePosition, createRelativePositionFromTypeIndex } from 'yjs';
+import { Doc, createAbsolutePositionFromRelativePosition, createRelativePositionFromTypeIndex, Map, Array as Array$1, Text, UndoManager } from 'yjs';
 
 /**
  * 协作通信通用接口
@@ -209,11 +209,66 @@ let Collaborate = class Collaborate {
             this.initLocalSlotBySharedSlot(sharedSlot, localSlot);
         }
         else {
-            this.initSharedSlotByLocalSlot(sharedSlot, localSlot);
+            yDoc.transact(() => {
+                this.initSharedSlotByLocalSlot(sharedSlot, localSlot);
+            });
         }
         this.initSyncEvent(yDoc);
         this.syncSlot(sharedSlot, localSlot);
     }
+    getAbstractSelection(position) {
+        const anchorPosition = createAbsolutePositionFromRelativePosition(position.anchor.position, position.anchor.doc);
+        const focusPosition = createAbsolutePositionFromRelativePosition(position.focus.position, position.focus.doc);
+        if (anchorPosition && focusPosition) {
+            const focusSlot = this.slotMap.get(focusPosition.type);
+            const anchorSlot = this.slotMap.get(anchorPosition.type);
+            if (focusSlot && anchorSlot) {
+                return {
+                    anchorSlot,
+                    anchorOffset: anchorPosition.index,
+                    focusSlot,
+                    focusOffset: focusPosition.index
+                };
+            }
+        }
+        return null;
+    }
+    getRelativeCursorLocation() {
+        const { anchorSlot, anchorOffset, focusSlot, focusOffset } = this.selection;
+        if (anchorSlot) {
+            const anchorYText = this.slotMap.get(anchorSlot);
+            if (anchorYText) {
+                const anchorPosition = createRelativePositionFromTypeIndex(anchorYText, anchorOffset);
+                if (focusSlot) {
+                    const focusYText = this.slotMap.get(focusSlot);
+                    if (focusYText) {
+                        const focusPosition = createRelativePositionFromTypeIndex(focusYText, focusOffset);
+                        return {
+                            focus: {
+                                doc: focusYText.doc,
+                                position: focusPosition
+                            },
+                            anchor: {
+                                doc: anchorYText.doc,
+                                position: anchorPosition
+                            }
+                        };
+                    }
+                }
+            }
+        }
+        return null;
+    }
+    restoreCursorPosition(position) {
+        if (!position) {
+            this.selection.unSelect();
+            return;
+        }
+        const selection = this.getAbstractSelection(position);
+        if (selection) {
+            this.selection.setBaseAndExtent(selection.anchorSlot, selection.anchorOffset, selection.focusSlot, selection.focusOffset);
+        }
+    }
     initSyncEvent(yDoc) {
         this.subscriptions.push(this.scheduler.onDocChanged.pipe(map(item => {
             return item.filter(i => {
@@ -469,6 +524,7 @@ let Collaborate = class Collaborate {
                     yDoc: subDocument,
                     yType: content
                 });
+                this.initSyncEvent(subDocument);
                 localSlot.loader.markAsLoaded();
             });
             localSlot.__changeMarker__.destroyCallbacks.push(() => {
@@ -626,6 +682,7 @@ let Collaborate = class Collaborate {
                     yType: state,
                     yDoc: subDocument
                 });
+                this.initSyncEvent(subDocument);
                 component.loader.markAsLoaded();
             });
             return sharedComponent;
@@ -899,7 +956,7 @@ let CollabHistory = class CollabHistory {
         this.manager = manager;
         let beforePosition = null;
         this.subscriptions.push(this.scheduler.onLocalChangeBefore.subscribe(() => {
-            beforePosition = this.getRelativeCursorLocation();
+            beforePosition = this.collaborate.getRelativeCursorLocation();
         }), this.collaborate.onAddSubModel.subscribe(() => {
             throw collabHistoryErrorFn('single document does not support submodels.');
         }));
@@ -912,7 +969,7 @@ let CollabHistory = class CollabHistory {
                     this.historyItems.length = this.index;
                     this.historyItems.push({
                         before: beforePosition,
-                        after: this.getRelativeCursorLocation()
+                        after: this.collaborate.getRelativeCursorLocation()
                     });
                     this.index++;
                 }
@@ -933,14 +990,7 @@ let CollabHistory = class CollabHistory {
             const index = ev.type === 'undo' ? this.index : this.index - 1;
             const position = this.historyItems[index] || null;
             const p = ev.type === 'undo' ? position === null || position === void 0 ? void 0 : position.before : position === null || position === void 0 ? void 0 : position.after;
-            if (p) {
-                const selection = this.getAbstractSelection(p);
-                if (selection) {
-                    this.selection.setBaseAndExtent(selection.anchorSlot, selection.anchorOffset, selection.focusSlot, selection.focusOffset);
-                    return;
-                }
-            }
-            this.selection.unSelect();
+            this.collaborate.restoreCursorPosition(p);
         });
     }
     back() {
@@ -972,43 +1022,6 @@ let CollabHistory = class CollabHistory {
         this.subscriptions.forEach(i => i.unsubscribe());
         (_a = this.manager) === null || _a === void 0 ? void 0 : _a.destroy();
     }
-    getAbstractSelection(position) {
-        const anchorPosition = createAbsolutePositionFromRelativePosition(position.anchor, this.collaborate.yDoc);
-        const focusPosition = createAbsolutePositionFromRelativePosition(position.focus, this.collaborate.yDoc);
-        if (anchorPosition && focusPosition) {
-            const focusSlot = this.collaborate.slotMap.get(focusPosition.type);
-            const anchorSlot = this.collaborate.slotMap.get(anchorPosition.type);
-            if (focusSlot && anchorSlot) {
-                return {
-                    anchorSlot,
-                    anchorOffset: anchorPosition.index,
-                    focusSlot,
-                    focusOffset: focusPosition.index
-                };
-            }
-        }
-        return null;
-    }
-    getRelativeCursorLocation() {
-        const { anchorSlot, anchorOffset, focusSlot, focusOffset } = this.selection;
-        if (anchorSlot) {
-            const anchorYText = this.collaborate.slotMap.get(anchorSlot);
-            if (anchorYText) {
-                const anchorPosition = createRelativePositionFromTypeIndex(anchorYText, anchorOffset);
-                if (focusSlot) {
-                    const focusYText = this.collaborate.slotMap.get(focusSlot);
-                    if (focusYText) {
-                        const focusPosition = createRelativePositionFromTypeIndex(focusYText, focusOffset);
-                        return {
-                            focus: focusPosition,
-                            anchor: anchorPosition
-                        };
-                    }
-                }
-            }
-        }
-        return null;
-    }
 };
 CollabHistory = __decorate([
     Injectable(),
@@ -1105,8 +1118,9 @@ let MultipleDocCollabHistory = class MultipleDocCollabHistory {
     get canForward() {
         return this.actionStack.length > 0 && this.index < this.actionStack.length;
     }
-    constructor(collaborate, rootComponentRef, stackSize, undoManagerConfig) {
+    constructor(collaborate, scheduler, rootComponentRef, stackSize, undoManagerConfig) {
         this.collaborate = collaborate;
+        this.scheduler = scheduler;
         this.rootComponentRef = rootComponentRef;
         this.stackSize = stackSize;
         this.undoManagerConfig = undoManagerConfig;
@@ -1119,6 +1133,7 @@ let MultipleDocCollabHistory = class MultipleDocCollabHistory {
         this.index = 0;
         this.stackItem = null;
         this.timer = null;
+        this.beforePosition = null;
         this.subscription = new Subscription();
         this.subDocs = new Set();
         this.listenerCaches = new Set();
@@ -1141,6 +1156,8 @@ let MultipleDocCollabHistory = class MultipleDocCollabHistory {
             if (this.isListen) {
                 this.listenItem(yType, yDoc);
             }
+        }), this.scheduler.onLocalChangeBefore.subscribe(() => {
+            this.beforePosition = this.collaborate.getRelativeCursorLocation();
         }));
     }
     forward() {
@@ -1150,9 +1167,10 @@ let MultipleDocCollabHistory = class MultipleDocCollabHistory {
         clearTimeout(this.timer);
         const item = this.actionStack[this.index];
         if (item) {
-            for (const i of item) {
+            for (const i of item.undoManagers) {
                 i.redo();
             }
+            this.collaborate.restoreCursorPosition(item.after);
         }
         this.index++;
         this.forwardEvent.next();
@@ -1163,29 +1181,32 @@ let MultipleDocCollabHistory = class MultipleDocCollabHistory {
             return;
         }
         clearTimeout(this.timer);
-        let actions;
+        let historyStackItem;
         if (this.stackItem) {
-            actions = this.stackItem;
+            historyStackItem = this.stackItem;
             this.stackItem = null;
         }
         else {
             this.index--;
-            actions = this.actionStack[this.index];
+            historyStackItem = this.actionStack[this.index];
         }
-        let len = actions.length;
+        let len = historyStackItem.undoManagers.length;
         while (len > 0) {
             len--;
-            actions[len].undo();
+            historyStackItem.undoManagers[len].undo();
         }
-        if (actions) {
+        if (historyStackItem) {
+            const beforePosition = historyStackItem.before;
+            this.collaborate.restoreCursorPosition(beforePosition);
             this.backEvent.next();
             this.changeEvent.next();
         }
     }
     clear() {
         this.actionStack = [];
-        this.stackItem = [];
+        this.stackItem = null;
         this.index = 0;
+        this.beforePosition = null;
         clearTimeout(this.timer);
         this.listenerCaches.forEach((undoManager) => {
             undoManager.clear();
@@ -1194,6 +1215,7 @@ let MultipleDocCollabHistory = class MultipleDocCollabHistory {
     }
     destroy() {
         this.clear();
+        this.beforePosition = this.stackItem = null;
         this.subscription.unsubscribe();
         this.listenerCaches.forEach((undoManager) => {
             undoManager.destroy();
@@ -1224,7 +1246,7 @@ let MultipleDocCollabHistory = class MultipleDocCollabHistory {
                 if (this.index != this.actionStack.length) {
                     const redoStack = this.actionStack.slice(this.index);
                     redoStack.forEach(item => {
-                        item.forEach(i => {
+                        item.undoManagers.forEach(i => {
                             i.clear(false, true);
                         });
                     });
@@ -1232,7 +1254,11 @@ let MultipleDocCollabHistory = class MultipleDocCollabHistory {
                     this.changeEvent.next();
                 }
                 if (this.stackItem === null) {
-                    this.stackItem = [];
+                    this.stackItem = {
+                        before: this.beforePosition,
+                        after: null,
+                        undoManagers: []
+                    };
                     this.timer = setTimeout(() => {
                         if (this.actionStack.length >= this.stackSize) {
                             this.actionStack.shift();
@@ -1240,13 +1266,15 @@ let MultipleDocCollabHistory = class MultipleDocCollabHistory {
                         else {
                             this.index++;
                         }
+                        // this.beforePosition = this.collaborate.getRelativeCursorLocation()
+                        this.stackItem.after = this.beforePosition;
                         this.actionStack.push(this.stackItem);
                         this.stackItem = null;
                         this.pushEvent.next();
                         this.changeEvent.next();
                     }, 500);
                 }
-                this.stackItem.push(undoManager);
+                this.stackItem.undoManagers.push(undoManager);
             }
         });
         this.listenerCaches.add(undoManager);
@@ -1254,9 +1282,10 @@ let MultipleDocCollabHistory = class MultipleDocCollabHistory {
 };
 MultipleDocCollabHistory = __decorate([
     Injectable(),
-    __param(2, Inject(HISTORY_STACK_SIZE)),
-    __param(3, Optional()),
+    __param(3, Inject(HISTORY_STACK_SIZE)),
+    __param(4, Optional()),
     __metadata("design:paramtypes", [Collaborate,
+        Scheduler,
         RootComponentRef, Number, CustomUndoManagerConfig])
 ], MultipleDocCollabHistory);
 

package/bundles/index.js

@@ -211,11 +211,66 @@ exports.Collaborate = class Collaborate {
             this.initLocalSlotBySharedSlot(sharedSlot, localSlot);
         }
         else {
-            this.initSharedSlotByLocalSlot(sharedSlot, localSlot);
+            yDoc.transact(() => {
+                this.initSharedSlotByLocalSlot(sharedSlot, localSlot);
+            });
         }
         this.initSyncEvent(yDoc);
         this.syncSlot(sharedSlot, localSlot);
     }
+    getAbstractSelection(position) {
+        const anchorPosition = yjs.createAbsolutePositionFromRelativePosition(position.anchor.position, position.anchor.doc);
+        const focusPosition = yjs.createAbsolutePositionFromRelativePosition(position.focus.position, position.focus.doc);
+        if (anchorPosition && focusPosition) {
+            const focusSlot = this.slotMap.get(focusPosition.type);
+            const anchorSlot = this.slotMap.get(anchorPosition.type);
+            if (focusSlot && anchorSlot) {
+                return {
+                    anchorSlot,
+                    anchorOffset: anchorPosition.index,
+                    focusSlot,
+                    focusOffset: focusPosition.index
+                };
+            }
+        }
+        return null;
+    }
+    getRelativeCursorLocation() {
+        const { anchorSlot, anchorOffset, focusSlot, focusOffset } = this.selection;
+        if (anchorSlot) {
+            const anchorYText = this.slotMap.get(anchorSlot);
+            if (anchorYText) {
+                const anchorPosition = yjs.createRelativePositionFromTypeIndex(anchorYText, anchorOffset);
+                if (focusSlot) {
+                    const focusYText = this.slotMap.get(focusSlot);
+                    if (focusYText) {
+                        const focusPosition = yjs.createRelativePositionFromTypeIndex(focusYText, focusOffset);
+                        return {
+                            focus: {
+                                doc: focusYText.doc,
+                                position: focusPosition
+                            },
+                            anchor: {
+                                doc: anchorYText.doc,
+                                position: anchorPosition
+                            }
+                        };
+                    }
+                }
+            }
+        }
+        return null;
+    }
+    restoreCursorPosition(position) {
+        if (!position) {
+            this.selection.unSelect();
+            return;
+        }
+        const selection = this.getAbstractSelection(position);
+        if (selection) {
+            this.selection.setBaseAndExtent(selection.anchorSlot, selection.anchorOffset, selection.focusSlot, selection.focusOffset);
+        }
+    }
     initSyncEvent(yDoc) {
         this.subscriptions.push(this.scheduler.onDocChanged.pipe(stream.map(item => {
             return item.filter(i => {
@@ -471,6 +526,7 @@ exports.Collaborate = class Collaborate {
                     yDoc: subDocument,
                     yType: content
                 });
+                this.initSyncEvent(subDocument);
                 localSlot.loader.markAsLoaded();
             });
             localSlot.__changeMarker__.destroyCallbacks.push(() => {
@@ -628,6 +684,7 @@ exports.Collaborate = class Collaborate {
                     yType: state,
                     yDoc: subDocument
                 });
+                this.initSyncEvent(subDocument);
                 component.loader.markAsLoaded();
             });
             return sharedComponent;
@@ -901,7 +958,7 @@ exports.CollabHistory = class CollabHistory {
         this.manager = manager;
         let beforePosition = null;
         this.subscriptions.push(this.scheduler.onLocalChangeBefore.subscribe(() => {
-            beforePosition = this.getRelativeCursorLocation();
+            beforePosition = this.collaborate.getRelativeCursorLocation();
         }), this.collaborate.onAddSubModel.subscribe(() => {
             throw collabHistoryErrorFn('single document does not support submodels.');
         }));
@@ -914,7 +971,7 @@ exports.CollabHistory = class CollabHistory {
                     this.historyItems.length = this.index;
                     this.historyItems.push({
                         before: beforePosition,
-                        after: this.getRelativeCursorLocation()
+                        after: this.collaborate.getRelativeCursorLocation()
                     });
                     this.index++;
                 }
@@ -935,14 +992,7 @@ exports.CollabHistory = class CollabHistory {
             const index = ev.type === 'undo' ? this.index : this.index - 1;
             const position = this.historyItems[index] || null;
             const p = ev.type === 'undo' ? position === null || position === void 0 ? void 0 : position.before : position === null || position === void 0 ? void 0 : position.after;
-            if (p) {
-                const selection = this.getAbstractSelection(p);
-                if (selection) {
-                    this.selection.setBaseAndExtent(selection.anchorSlot, selection.anchorOffset, selection.focusSlot, selection.focusOffset);
-                    return;
-                }
-            }
-            this.selection.unSelect();
+            this.collaborate.restoreCursorPosition(p);
         });
     }
     back() {
@@ -974,43 +1024,6 @@ exports.CollabHistory = class CollabHistory {
         this.subscriptions.forEach(i => i.unsubscribe());
         (_a = this.manager) === null || _a === void 0 ? void 0 : _a.destroy();
     }
-    getAbstractSelection(position) {
-        const anchorPosition = yjs.createAbsolutePositionFromRelativePosition(position.anchor, this.collaborate.yDoc);
-        const focusPosition = yjs.createAbsolutePositionFromRelativePosition(position.focus, this.collaborate.yDoc);
-        if (anchorPosition && focusPosition) {
-            const focusSlot = this.collaborate.slotMap.get(focusPosition.type);
-            const anchorSlot = this.collaborate.slotMap.get(anchorPosition.type);
-            if (focusSlot && anchorSlot) {
-                return {
-                    anchorSlot,
-                    anchorOffset: anchorPosition.index,
-                    focusSlot,
-                    focusOffset: focusPosition.index
-                };
-            }
-        }
-        return null;
-    }
-    getRelativeCursorLocation() {
-        const { anchorSlot, anchorOffset, focusSlot, focusOffset } = this.selection;
-        if (anchorSlot) {
-            const anchorYText = this.collaborate.slotMap.get(anchorSlot);
-            if (anchorYText) {
-                const anchorPosition = yjs.createRelativePositionFromTypeIndex(anchorYText, anchorOffset);
-                if (focusSlot) {
-                    const focusYText = this.collaborate.slotMap.get(focusSlot);
-                    if (focusYText) {
-                        const focusPosition = yjs.createRelativePositionFromTypeIndex(focusYText, focusOffset);
-                        return {
-                            focus: focusPosition,
-                            anchor: anchorPosition
-                        };
-                    }
-                }
-            }
-        }
-        return null;
-    }
 };
 exports.CollabHistory = __decorate([
     core$1.Injectable(),
@@ -1107,8 +1120,9 @@ exports.MultipleDocCollabHistory = class MultipleDocCollabHistory {
     get canForward() {
         return this.actionStack.length > 0 && this.index < this.actionStack.length;
     }
-    constructor(collaborate, rootComponentRef, stackSize, undoManagerConfig) {
+    constructor(collaborate, scheduler, rootComponentRef, stackSize, undoManagerConfig) {
         this.collaborate = collaborate;
+        this.scheduler = scheduler;
         this.rootComponentRef = rootComponentRef;
         this.stackSize = stackSize;
         this.undoManagerConfig = undoManagerConfig;
@@ -1121,6 +1135,7 @@ exports.MultipleDocCollabHistory = class MultipleDocCollabHistory {
         this.index = 0;
         this.stackItem = null;
         this.timer = null;
+        this.beforePosition = null;
         this.subscription = new stream.Subscription();
         this.subDocs = new Set();
         this.listenerCaches = new Set();
@@ -1143,6 +1158,8 @@ exports.MultipleDocCollabHistory = class MultipleDocCollabHistory {
             if (this.isListen) {
                 this.listenItem(yType, yDoc);
             }
+        }), this.scheduler.onLocalChangeBefore.subscribe(() => {
+            this.beforePosition = this.collaborate.getRelativeCursorLocation();
         }));
     }
     forward() {
@@ -1152,9 +1169,10 @@ exports.MultipleDocCollabHistory = class MultipleDocCollabHistory {
         clearTimeout(this.timer);
         const item = this.actionStack[this.index];
         if (item) {
-            for (const i of item) {
+            for (const i of item.undoManagers) {
                 i.redo();
             }
+            this.collaborate.restoreCursorPosition(item.after);
         }
         this.index++;
         this.forwardEvent.next();
@@ -1165,29 +1183,32 @@ exports.MultipleDocCollabHistory = class MultipleDocCollabHistory {
             return;
         }
         clearTimeout(this.timer);
-        let actions;
+        let historyStackItem;
         if (this.stackItem) {
-            actions = this.stackItem;
+            historyStackItem = this.stackItem;
             this.stackItem = null;
         }
         else {
             this.index--;
-            actions = this.actionStack[this.index];
+            historyStackItem = this.actionStack[this.index];
         }
-        let len = actions.length;
+        let len = historyStackItem.undoManagers.length;
         while (len > 0) {
             len--;
-            actions[len].undo();
+            historyStackItem.undoManagers[len].undo();
         }
-        if (actions) {
+        if (historyStackItem) {
+            const beforePosition = historyStackItem.before;
+            this.collaborate.restoreCursorPosition(beforePosition);
             this.backEvent.next();
             this.changeEvent.next();
         }
     }
     clear() {
         this.actionStack = [];
-        this.stackItem = [];
+        this.stackItem = null;
         this.index = 0;
+        this.beforePosition = null;
         clearTimeout(this.timer);
         this.listenerCaches.forEach((undoManager) => {
             undoManager.clear();
@@ -1196,6 +1217,7 @@ exports.MultipleDocCollabHistory = class MultipleDocCollabHistory {
     }
     destroy() {
         this.clear();
+        this.beforePosition = this.stackItem = null;
         this.subscription.unsubscribe();
         this.listenerCaches.forEach((undoManager) => {
             undoManager.destroy();
@@ -1226,7 +1248,7 @@ exports.MultipleDocCollabHistory = class MultipleDocCollabHistory {
                 if (this.index != this.actionStack.length) {
                     const redoStack = this.actionStack.slice(this.index);
                     redoStack.forEach(item => {
-                        item.forEach(i => {
+                        item.undoManagers.forEach(i => {
                             i.clear(false, true);
                         });
                     });
@@ -1234,7 +1256,11 @@ exports.MultipleDocCollabHistory = class MultipleDocCollabHistory {
                     this.changeEvent.next();
                 }
                 if (this.stackItem === null) {
-                    this.stackItem = [];
+                    this.stackItem = {
+                        before: this.beforePosition,
+                        after: null,
+                        undoManagers: []
+                    };
                     this.timer = setTimeout(() => {
                         if (this.actionStack.length >= this.stackSize) {
                             this.actionStack.shift();
@@ -1242,13 +1268,15 @@ exports.MultipleDocCollabHistory = class MultipleDocCollabHistory {
                         else {
                             this.index++;
                         }
+                        // this.beforePosition = this.collaborate.getRelativeCursorLocation()
+                        this.stackItem.after = this.beforePosition;
                         this.actionStack.push(this.stackItem);
                         this.stackItem = null;
                         this.pushEvent.next();
                         this.changeEvent.next();
                     }, 500);
                 }
-                this.stackItem.push(undoManager);
+                this.stackItem.undoManagers.push(undoManager);
             }
         });
         this.listenerCaches.add(undoManager);
@@ -1256,9 +1284,10 @@ exports.MultipleDocCollabHistory = class MultipleDocCollabHistory {
 };
 exports.MultipleDocCollabHistory = __decorate([
     core$1.Injectable(),
-    __param(2, core$1.Inject(core.HISTORY_STACK_SIZE)),
-    __param(3, core$1.Optional()),
+    __param(3, core$1.Inject(core.HISTORY_STACK_SIZE)),
+    __param(4, core$1.Optional()),
     __metadata("design:paramtypes", [exports.Collaborate,
+        core.Scheduler,
         core.RootComponentRef, Number, CustomUndoManagerConfig])
 ], exports.MultipleDocCollabHistory);
 

package/bundles/multiple-doc-collab-history.d.ts

@@ -1,9 +1,10 @@
 import { Observable } from '@tanbo/stream';
-import { History, RootComponentRef } from '@textbus/core';
+import { History, RootComponentRef, Scheduler } from '@textbus/core';
 import { Collaborate } from './collaborate';
 import { CustomUndoManagerConfig } from './collab-history';
 export declare class MultipleDocCollabHistory implements History {
     private collaborate;
+    private scheduler;
     private rootComponentRef;
     private stackSize;
     private undoManagerConfig;
@@ -22,10 +23,11 @@ export declare class MultipleDocCollabHistory implements History {
     private index;
     private stackItem;
     private timer;
+    private beforePosition;
     private subscription;
     private subDocs;
     private listenerCaches;
-    constructor(collaborate: Collaborate, rootComponentRef: RootComponentRef, stackSize: number, undoManagerConfig: CustomUndoManagerConfig);
+    constructor(collaborate: Collaborate, scheduler: Scheduler, rootComponentRef: RootComponentRef, stackSize: number, undoManagerConfig: CustomUndoManagerConfig);
     listen(): void;
     forward(): void;
     back(): void;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@textbus/collaborate",
-  "version": "4.1.0-alpha.0",
+  "version": "4.1.0",
   "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",
@@ -27,8 +27,8 @@
   "dependencies": {
     "@hocuspocus/provider": "^2.13.6",
     "@tanbo/stream": "^1.2.5",
-    "@textbus/core": "^4.1.0-alpha.0",
-    "@viewfly/core": "^1.0.4",
+    "@textbus/core": "^4.1.0",
+    "@viewfly/core": "^1.0.5",
     "y-websocket": "^1.4.3",
     "yjs": "^13.6.14"
   },