@textbus/collaborate 3.0.0-alpha.30 → 3.0.0-alpha.31

package/bundles/collaborate.d.ts

@@ -1,5 +1,5 @@
 import { Observable, Subject, Subscription } from '@tanbo/stream';
-import { ComponentInstance, Controller, Factory, History, RootComponentRef, Scheduler, Selection, SelectionPaths, Slot, Starter } from '@textbus/core';
+import { AbstractSelection, ComponentInstance, Controller, Factory, History, RootComponentRef, Scheduler, Selection, SelectionPaths, Slot, Starter } from '@textbus/core';
 import { Array as YArray, Doc as YDoc, Map as YMap, RelativePosition, Text as YText, Transaction, UndoManager } from 'yjs';
 interface CursorPosition {
     anchor: RelativePosition;
@@ -50,6 +50,8 @@ export declare class Collaborate implements History {
     protected contentMap: ContentMap;
     protected updateRemoteActions: Array<UpdateItem>;
     protected noRecord: {};
+    protected historyItems: Array<CursorPosition | null>;
+    protected index: number;
     constructor(stackSize: number, rootComponentRef: RootComponentRef, controller: Controller, scheduler: Scheduler, factory: Factory, selection: Selection, starter: Starter);
     listen(): void;
     back(): void;
@@ -57,7 +59,7 @@ export declare class Collaborate implements History {
     clear(): void;
     destroy(): void;
     protected syncRootComponent(root: YMap<any>, rootComponent: ComponentInstance): void;
-    protected restoreCursorLocation(position: CursorPosition): void;
+    protected getAbstractSelection(position: CursorPosition): AbstractSelection | null;
     protected getRelativeCursorLocation(): CursorPosition | null;
     protected syncSlotContent(content: YText, slot: Slot): void;
     protected syncSlotState(remoteSlot: YMap<any>, slot: Slot): void;

package/bundles/index.esm.js

@@ -98,6 +98,8 @@ let Collaborate = class Collaborate {
         this.contentMap = new ContentMap();
         this.updateRemoteActions = [];
         this.noRecord = {};
+        this.historyItems = [];
+        this.index = 0;
         this.onBack = this.backEvent.asObservable();
         this.onForward = this.forwardEvent.asObservable();
         this.onChange = this.changeEvent.asObservable();
@@ -115,25 +117,43 @@ let Collaborate = class Collaborate {
     listen() {
         const root = this.yDoc.getMap('RootComponent');
         const rootComponent = this.rootComponentRef.component;
-        this.manager = new UndoManager(root, {
+        const manager = new UndoManager(root, {
             trackedOrigins: new Set([this.yDoc])
         });
-        const cursorKey = 'cursor-position';
-        this.manager.on('stack-item-added', event => {
-            event.stackItem.meta.set(cursorKey, this.getRelativeCursorLocation());
-            if (this.manager.undoStack.length > this.stackSize) {
-                this.manager.undoStack.shift();
+        this.manager = manager;
+        manager.on('stack-item-added', event => {
+            if (event.type === 'undo') {
+                if (event.origin === manager) {
+                    this.index++;
+                }
+                else {
+                    this.historyItems.length = this.index;
+                    this.historyItems.push(this.getRelativeCursorLocation());
+                    this.index++;
+                }
+            }
+            else {
+                this.index--;
+            }
+            if (manager.undoStack.length > this.stackSize) {
+                this.historyItems.shift();
+                manager.undoStack.shift();
             }
             if (event.origin === this.yDoc) {
                 this.pushEvent.next();
             }
             this.changeEvent.next();
         });
-        this.manager.on('stack-item-popped', event => {
-            const position = event.stackItem.meta.get(cursorKey);
+        manager.on('stack-item-popped', () => {
+            const position = this.historyItems[this.index - 1];
             if (position) {
-                this.restoreCursorLocation(position);
+                const selection = this.getAbstractSelection(position);
+                if (selection) {
+                    this.selection.setBaseAndExtent(selection.anchorSlot, selection.anchorOffset, selection.focusSlot, selection.focusOffset);
+                    return;
+                }
             }
+            this.selection.unSelect();
         });
         this.subscriptions.push(this.selection.onChange.subscribe(() => {
             const paths = this.selection.getPaths();
@@ -194,11 +214,15 @@ let Collaborate = class Collaborate {
     }
     clear() {
         var _a;
+        this.index = 0;
+        this.historyItems = [];
         (_a = this.manager) === null || _a === void 0 ? void 0 : _a.clear();
         this.changeEvent.next();
     }
     destroy() {
         var _a;
+        this.index = 0;
+        this.historyItems = [];
         this.subscriptions.forEach(i => i.unsubscribe());
         (_a = this.manager) === null || _a === void 0 ? void 0 : _a.destroy();
     }
@@ -241,18 +265,22 @@ let Collaborate = class Collaborate {
         this.syncComponentState(root, rootComponent);
         this.syncComponentSlots(slots, rootComponent);
     }
-    restoreCursorLocation(position) {
+    getAbstractSelection(position) {
         const anchorPosition = createAbsolutePositionFromRelativePosition(position.anchor, this.yDoc);
         const focusPosition = createAbsolutePositionFromRelativePosition(position.focus, this.yDoc);
         if (anchorPosition && focusPosition) {
             const focusSlot = this.contentMap.get(focusPosition.type);
             const anchorSlot = this.contentMap.get(anchorPosition.type);
             if (focusSlot && anchorSlot) {
-                this.selection.setBaseAndExtent(anchorSlot, anchorPosition.index, focusSlot, focusPosition.index);
-                return;
+                return {
+                    anchorSlot,
+                    anchorOffset: anchorPosition.index,
+                    focusSlot,
+                    focusOffset: focusPosition.index
+                };
             }
         }
-        this.selection.unSelect();
+        return null;
     }
     getRelativeCursorLocation() {
         const { anchorSlot, anchorOffset, focusSlot, focusOffset } = this.selection;

package/bundles/index.js

@@ -100,6 +100,8 @@ exports.Collaborate = class Collaborate {
         this.contentMap = new ContentMap();
         this.updateRemoteActions = [];
         this.noRecord = {};
+        this.historyItems = [];
+        this.index = 0;
         this.onBack = this.backEvent.asObservable();
         this.onForward = this.forwardEvent.asObservable();
         this.onChange = this.changeEvent.asObservable();
@@ -117,25 +119,43 @@ exports.Collaborate = class Collaborate {
     listen() {
         const root = this.yDoc.getMap('RootComponent');
         const rootComponent = this.rootComponentRef.component;
-        this.manager = new yjs.UndoManager(root, {
+        const manager = new yjs.UndoManager(root, {
             trackedOrigins: new Set([this.yDoc])
         });
-        const cursorKey = 'cursor-position';
-        this.manager.on('stack-item-added', event => {
-            event.stackItem.meta.set(cursorKey, this.getRelativeCursorLocation());
-            if (this.manager.undoStack.length > this.stackSize) {
-                this.manager.undoStack.shift();
+        this.manager = manager;
+        manager.on('stack-item-added', event => {
+            if (event.type === 'undo') {
+                if (event.origin === manager) {
+                    this.index++;
+                }
+                else {
+                    this.historyItems.length = this.index;
+                    this.historyItems.push(this.getRelativeCursorLocation());
+                    this.index++;
+                }
+            }
+            else {
+                this.index--;
+            }
+            if (manager.undoStack.length > this.stackSize) {
+                this.historyItems.shift();
+                manager.undoStack.shift();
             }
             if (event.origin === this.yDoc) {
                 this.pushEvent.next();
             }
             this.changeEvent.next();
         });
-        this.manager.on('stack-item-popped', event => {
-            const position = event.stackItem.meta.get(cursorKey);
+        manager.on('stack-item-popped', () => {
+            const position = this.historyItems[this.index - 1];
             if (position) {
-                this.restoreCursorLocation(position);
+                const selection = this.getAbstractSelection(position);
+                if (selection) {
+                    this.selection.setBaseAndExtent(selection.anchorSlot, selection.anchorOffset, selection.focusSlot, selection.focusOffset);
+                    return;
+                }
             }
+            this.selection.unSelect();
         });
         this.subscriptions.push(this.selection.onChange.subscribe(() => {
             const paths = this.selection.getPaths();
@@ -196,11 +216,15 @@ exports.Collaborate = class Collaborate {
     }
     clear() {
         var _a;
+        this.index = 0;
+        this.historyItems = [];
         (_a = this.manager) === null || _a === void 0 ? void 0 : _a.clear();
         this.changeEvent.next();
     }
     destroy() {
         var _a;
+        this.index = 0;
+        this.historyItems = [];
         this.subscriptions.forEach(i => i.unsubscribe());
         (_a = this.manager) === null || _a === void 0 ? void 0 : _a.destroy();
     }
@@ -243,18 +267,22 @@ exports.Collaborate = class Collaborate {
         this.syncComponentState(root, rootComponent);
         this.syncComponentSlots(slots, rootComponent);
     }
-    restoreCursorLocation(position) {
+    getAbstractSelection(position) {
         const anchorPosition = yjs.createAbsolutePositionFromRelativePosition(position.anchor, this.yDoc);
         const focusPosition = yjs.createAbsolutePositionFromRelativePosition(position.focus, this.yDoc);
         if (anchorPosition && focusPosition) {
             const focusSlot = this.contentMap.get(focusPosition.type);
             const anchorSlot = this.contentMap.get(anchorPosition.type);
             if (focusSlot && anchorSlot) {
-                this.selection.setBaseAndExtent(anchorSlot, anchorPosition.index, focusSlot, focusPosition.index);
-                return;
+                return {
+                    anchorSlot,
+                    anchorOffset: anchorPosition.index,
+                    focusSlot,
+                    focusOffset: focusPosition.index
+                };
             }
         }
-        this.selection.unSelect();
+        return null;
     }
     getRelativeCursorLocation() {
         const { anchorSlot, anchorOffset, focusSlot, focusOffset } = this.selection;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@textbus/collaborate",
-  "version": "3.0.0-alpha.30",
+  "version": "3.0.0-alpha.31",
   "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.8",
-    "@textbus/core": "^3.0.0-alpha.30",
+    "@textbus/core": "^3.0.0-alpha.31",
     "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": "5e6ca16bf169e611d816d58b9a98118073a41e47"
+  "gitHead": "341e11b65b5c82b1f4815f33831b2dfa5d49e1bc"
 }