@textbus/collaborate 3.1.13 → 3.1.15

package/bundles/collaborate.d.ts

@@ -22,6 +22,10 @@ export declare abstract class CustomUndoManagerConfig {
     abstract captureTransaction?(arg0: Transaction): boolean;
     abstract deleteFilter?(arg0: Item): boolean;
 }
+interface CollaborateHistorySelectionPosition {
+    before: CursorPosition | null;
+    after: CursorPosition | null;
+}
 export declare class Collaborate implements History {
     protected stackSize: number;
     protected rootComponentRef: RootComponentRef;
@@ -55,7 +59,7 @@ export declare class Collaborate implements History {
     protected contentMap: ContentMap;
     protected updateRemoteActions: Array<UpdateItem>;
     protected noRecord: {};
-    protected historyItems: Array<CursorPosition | null>;
+    protected historyItems: Array<CollaborateHistorySelectionPosition>;
     protected index: number;
     constructor(stackSize: number, rootComponentRef: RootComponentRef, controller: Controller, scheduler: Scheduler, registry: Registry, selection: Selection, starter: Starter, undoManagerConfig: CustomUndoManagerConfig);
     listen(): void;

package/bundles/index.esm.js

@@ -137,7 +137,10 @@ let Collaborate = class Collaborate {
             }
         });
         this.manager = manager;
-        // manager.on()
+        let beforePosition = null;
+        this.subscriptions.push(this.scheduler.onLocalChangeBefore.subscribe(() => {
+            beforePosition = this.getRelativeCursorLocation();
+        }));
         manager.on('stack-item-added', event => {
             if (event.type === 'undo') {
                 if (event.origin === manager) {
@@ -145,7 +148,10 @@ let Collaborate = class Collaborate {
                 }
                 else {
                     this.historyItems.length = this.index;
-                    this.historyItems.push(this.getRelativeCursorLocation());
+                    this.historyItems.push({
+                        before: beforePosition,
+                        after: this.getRelativeCursorLocation()
+                    });
                     this.index++;
                 }
             }
@@ -161,10 +167,12 @@ let Collaborate = class Collaborate {
             }
             this.changeEvent.next();
         });
-        manager.on('stack-item-popped', () => {
-            const position = this.historyItems[this.index - 1];
-            if (position) {
-                const selection = this.getAbstractSelection(position);
+        manager.on('stack-item-popped', (ev) => {
+            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;
@@ -172,10 +180,7 @@ let Collaborate = class Collaborate {
             }
             this.selection.unSelect();
         });
-        this.subscriptions.push(this.scheduler.onDocFirstChangeFromLocal.subscribe(() => {
-            this.historyItems.push(this.getRelativeCursorLocation());
-            this.index++;
-        }), this.selection.onChange.subscribe(() => {
+        this.subscriptions.push(this.selection.onChange.subscribe(() => {
             const paths = this.selection.getPaths();
             this.selectionChangeEvent.next(paths);
         }), this.scheduler.onDocChanged.pipe(map(item => {

package/bundles/index.js

@@ -139,7 +139,10 @@ exports.Collaborate = class Collaborate {
             }
         });
         this.manager = manager;
-        // manager.on()
+        let beforePosition = null;
+        this.subscriptions.push(this.scheduler.onLocalChangeBefore.subscribe(() => {
+            beforePosition = this.getRelativeCursorLocation();
+        }));
         manager.on('stack-item-added', event => {
             if (event.type === 'undo') {
                 if (event.origin === manager) {
@@ -147,7 +150,10 @@ exports.Collaborate = class Collaborate {
                 }
                 else {
                     this.historyItems.length = this.index;
-                    this.historyItems.push(this.getRelativeCursorLocation());
+                    this.historyItems.push({
+                        before: beforePosition,
+                        after: this.getRelativeCursorLocation()
+                    });
                     this.index++;
                 }
             }
@@ -163,10 +169,12 @@ exports.Collaborate = class Collaborate {
             }
             this.changeEvent.next();
         });
-        manager.on('stack-item-popped', () => {
-            const position = this.historyItems[this.index - 1];
-            if (position) {
-                const selection = this.getAbstractSelection(position);
+        manager.on('stack-item-popped', (ev) => {
+            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;
@@ -174,10 +182,7 @@ exports.Collaborate = class Collaborate {
             }
             this.selection.unSelect();
         });
-        this.subscriptions.push(this.scheduler.onDocFirstChangeFromLocal.subscribe(() => {
-            this.historyItems.push(this.getRelativeCursorLocation());
-            this.index++;
-        }), this.selection.onChange.subscribe(() => {
+        this.subscriptions.push(this.selection.onChange.subscribe(() => {
             const paths = this.selection.getPaths();
             this.selectionChangeEvent.next(paths);
         }), this.scheduler.onDocChanged.pipe(stream.map(item => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@textbus/collaborate",
-  "version": "3.1.13",
+  "version": "3.1.15",
   "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,7 +27,7 @@
   "dependencies": {
     "@tanbo/di": "^1.1.4",
     "@tanbo/stream": "^1.1.9",
-    "@textbus/core": "^3.1.13",
+    "@textbus/core": "^3.1.15",
     "reflect-metadata": "^0.1.13",
     "y-protocols": "^1.0.5",
     "yjs": "^13.5.39"
@@ -50,5 +50,5 @@
   "bugs": {
     "url": "https://github.com/textbus/textbus.git/issues"
   },
-  "gitHead": "55f6225a13070e5dd341cff13a3afc9e43dc104e"
+  "gitHead": "8d233f9dec8ad9a268197a39f7840f368322f063"
 }