@textbus/collaborate 5.0.0-alpha.1 → 5.0.0-alpha.10

package/bundles/base/collab-history.d.ts

@@ -1,4 +1,4 @@
-import { History, RootComponentRef, Scheduler, Selection } from '@textbus/core';
+import { History, RootComponentRef, Scheduler } from '@textbus/core';
 import { Observable } from '@tanbo/stream';
 import { Item, Transaction } from 'yjs';
 import { Collaborate } from './collaborate';
@@ -10,7 +10,6 @@ export declare class CollabHistory implements History {
     private rootComponentRef;
     private collaborate;
     private scheduler;
-    private selection;
     private stackSize;
     private undoManagerConfig;
     onBack: Observable<void>;
@@ -27,7 +26,7 @@ export declare class CollabHistory implements History {
     private forwardEvent;
     private changeEvent;
     private pushEvent;
-    constructor(rootComponentRef: RootComponentRef, collaborate: Collaborate, scheduler: Scheduler, selection: Selection, stackSize: number, undoManagerConfig: CustomUndoManagerConfig);
+    constructor(rootComponentRef: RootComponentRef, collaborate: Collaborate, scheduler: Scheduler, stackSize: number, undoManagerConfig: CustomUndoManagerConfig);
     listen(): void;
     back(): void;
     forward(): void;

package/bundles/collaborate-module.d.ts

@@ -4,11 +4,13 @@ import { Doc as YDoc } from 'yjs';
 import { SyncConnector } from './base/_api';
 export interface CollaborateConfig {
     createConnector(yDoc: YDoc): SyncConnector;
+    onlyLoad?: boolean;
 }
 export declare class CollaborateModule implements Module {
     config: CollaborateConfig;
     private subscription;
     providers: Provider[];
+    private timer;
     constructor(config: CollaborateConfig);
     setup(textbus: Textbus): Promise<(() => void) | void> | (() => void) | void;
     onDestroy(textbus: Textbus): void;

package/bundles/index.esm.js

@@ -356,11 +356,8 @@ let Collaborate = class Collaborate {
                             if (formats.length) {
                                 localSlot.retain(action.retain, formats);
                             }
-                            localSlot.retain(localSlot.index + action.retain);
-                        }
-                        else {
-                            localSlot.retain(action.retain);
                         }
+                        localSlot.retain(localSlot.index + action.retain);
                     }
                     else if (action.insert) {
                         const index = localSlot.index;
@@ -521,6 +518,8 @@ let Collaborate = class Collaborate {
                     return;
                 }
                 const content = subDocument.getText('content');
+                const state = subDocument.getMap('state');
+                this.syncLocalMapToSharedMap(localSlot.state, state);
                 this.initSharedSlotByLocalSlot(content, localSlot);
                 this.syncSlot(content, localSlot);
                 this.addSubModelEvent.next({
@@ -535,6 +534,9 @@ let Collaborate = class Collaborate {
             });
             return sharedSlot;
         }
+        const sharedSlotState = new Map();
+        this.syncLocalMapToSharedMap(localSlot.state, sharedSlotState);
+        sharedSlot.setAttribute('state', sharedSlotState);
         const sharedContent = new Text();
         this.initSharedSlotByLocalSlot(sharedContent, localSlot);
         sharedSlot.insertEmbed(0, sharedContent);
@@ -572,11 +574,13 @@ let Collaborate = class Collaborate {
         const schema = sharedSlot.getAttribute('schema');
         if (type === 'async') {
             const metadata = sharedSlot.getAttribute('metadata');
-            const slot = new AsyncSlot(schema || [], {});
+            const slot = new AsyncSlot(schema || [], {}, {});
             this.syncSharedMapToLocalMap(metadata, slot.metadata);
             const loadedSubDocument = this.subModelLoader.getLoadedModelBySlot(slot);
             if (loadedSubDocument) {
                 const subContent = loadedSubDocument.getText('content');
+                const data = loadedSubDocument.getMap('state');
+                this.syncSharedMapToLocalMap(data, slot.state);
                 this.syncRootSlot(loadedSubDocument, subContent, slot);
                 this.addSubModelEvent.next({
                     yDoc: loadedSubDocument,
@@ -592,13 +596,15 @@ let Collaborate = class Collaborate {
                 if (isDestroyed) {
                     return;
                 }
-                slot.loader.markAsLoaded();
                 const subContent = subDocument.getText('content');
+                const state = subDocument.getMap('state');
+                this.syncSharedMapToLocalMap(state, slot.state);
                 this.syncRootSlot(subDocument, subContent, slot);
                 this.addSubModelEvent.next({
                     yDoc: subDocument,
                     yType: subContent
                 });
+                slot.loader.markAsLoaded();
             });
             slot.__changeMarker__.addDetachCallback(() => {
                 isDestroyed = true;
@@ -610,7 +616,9 @@ let Collaborate = class Collaborate {
         if (!(content instanceof Text)) {
             throw collaborateErrorFn('shared slot content type is not `YText`.');
         }
-        const localSlot = new Slot(schema || []);
+        const localSlot = new Slot(schema || [], {});
+        const sharedSlotState = sharedSlot.getAttribute('state');
+        this.syncSharedMapToLocalMap(sharedSlotState, localSlot.state);
         this.initLocalSlotBySharedSlot(content, localSlot);
         this.syncSlot(content, localSlot);
         return localSlot;
@@ -726,13 +734,13 @@ let Collaborate = class Collaborate {
                     if (isDestroyed) {
                         return;
                     }
-                    instance.loader.markAsLoaded();
                     const state = subDocument.getMap('state');
                     this.syncComponent(subDocument, state, instance);
                     this.addSubModelEvent.next({
                         yType: state,
                         yDoc: subDocument
                     });
+                    instance.loader.markAsLoaded();
                 });
                 state.__changeMarker__.addDetachCallback(() => {
                     isDestroyed = true;
@@ -946,7 +954,7 @@ let CollabHistory = class CollabHistory {
         var _a;
         return ((_a = this.manager) === null || _a === void 0 ? void 0 : _a.canRedo()) || false;
     }
-    constructor(rootComponentRef, collaborate, scheduler, selection, stackSize, undoManagerConfig) {
+    constructor(rootComponentRef, collaborate, scheduler, stackSize, undoManagerConfig) {
         Object.defineProperty(this, "rootComponentRef", {
             enumerable: true,
             configurable: true,
@@ -965,12 +973,6 @@ let CollabHistory = class CollabHistory {
             writable: true,
             value: scheduler
         });
-        Object.defineProperty(this, "selection", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: selection
-        });
         Object.defineProperty(this, "stackSize", {
             enumerable: true,
             configurable: true,
@@ -1157,12 +1159,11 @@ let CollabHistory = class CollabHistory {
 };
 CollabHistory = __decorate([
     Injectable(),
-    __param(4, Inject(HISTORY_STACK_SIZE)),
-    __param(5, Optional()),
+    __param(3, Inject(HISTORY_STACK_SIZE)),
+    __param(4, Optional()),
     __metadata("design:paramtypes", [RootComponentRef,
         Collaborate,
-        Scheduler,
-        Selection, Number, CustomUndoManagerConfig])
+        Scheduler, Number, CustomUndoManagerConfig])
 ], CollabHistory);
 
 /**
@@ -1644,10 +1645,17 @@ class CollaborateModule {
                 }
             ]
         });
+        Object.defineProperty(this, "timer", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: null
+        });
     }
     setup(textbus) {
         const messageBus = textbus.get(MessageBus, null);
         const connector = textbus.get(SyncConnector);
+        const collab = textbus.get(Collaborate);
         if (messageBus) {
             const selection = textbus.get(Selection);
             connector.setLocalStateField('message', messageBus.get(textbus));
@@ -1659,13 +1667,33 @@ class CollaborateModule {
                 messageBus.consume(states, textbus);
             }));
         }
-        return connector.onLoad.toPromise();
+        return connector.onLoad.toPromise().then(() => {
+            if (!this.config.onlyLoad) {
+                return;
+            }
+            const root = collab.yDoc.getMap('RootComponent');
+            if (root.has('state')) {
+                return;
+            }
+            return new Promise(resolve => {
+                const testing = () => {
+                    if (root.has('state')) {
+                        resolve();
+                    }
+                    else {
+                        this.timer = setTimeout(testing, 1000);
+                    }
+                };
+                this.timer = setTimeout(testing, 1000);
+            });
+        });
     }
     onDestroy(textbus) {
         this.subscription.unsubscribe();
         textbus.get(Collaborate).destroy();
         textbus.get(History).destroy();
         textbus.get(SyncConnector).onDestroy();
+        clearTimeout(this.timer);
     }
 }
 
@@ -1707,10 +1735,17 @@ class MultipleDocumentCollaborateModule {
                 }
             ]
         });
+        Object.defineProperty(this, "timer", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: null
+        });
     }
     setup(textbus) {
         const messageBus = textbus.get(MessageBus, null);
         const connector = textbus.get(SyncConnector);
+        const collab = textbus.get(Collaborate);
         if (messageBus) {
             const selection = textbus.get(Selection);
             connector.setLocalStateField('message', messageBus.get(textbus));
@@ -1722,13 +1757,33 @@ class MultipleDocumentCollaborateModule {
                 messageBus.consume(states, textbus);
             }));
         }
-        return connector.onLoad.toPromise();
+        return connector.onLoad.toPromise().then(() => {
+            if (!this.config.onlyLoad) {
+                return;
+            }
+            const root = collab.yDoc.getMap('RootComponent');
+            if (root.has('state')) {
+                return;
+            }
+            return new Promise(resolve => {
+                const testing = () => {
+                    if (root.has('state')) {
+                        resolve();
+                    }
+                    else {
+                        this.timer = setTimeout(testing, 1000);
+                    }
+                };
+                this.timer = setTimeout(testing, 1000);
+            });
+        });
     }
     onDestroy(textbus) {
         this.subscription.unsubscribe();
         textbus.get(Collaborate).destroy();
         textbus.get(History).destroy();
         textbus.get(SyncConnector).onDestroy();
+        clearTimeout(this.timer);
     }
 }
 

package/bundles/index.js

@@ -358,11 +358,8 @@ exports.Collaborate = class Collaborate {
                             if (formats.length) {
                                 localSlot.retain(action.retain, formats);
                             }
-                            localSlot.retain(localSlot.index + action.retain);
-                        }
-                        else {
-                            localSlot.retain(action.retain);
                         }
+                        localSlot.retain(localSlot.index + action.retain);
                     }
                     else if (action.insert) {
                         const index = localSlot.index;
@@ -523,6 +520,8 @@ exports.Collaborate = class Collaborate {
                     return;
                 }
                 const content = subDocument.getText('content');
+                const state = subDocument.getMap('state');
+                this.syncLocalMapToSharedMap(localSlot.state, state);
                 this.initSharedSlotByLocalSlot(content, localSlot);
                 this.syncSlot(content, localSlot);
                 this.addSubModelEvent.next({
@@ -537,6 +536,9 @@ exports.Collaborate = class Collaborate {
             });
             return sharedSlot;
         }
+        const sharedSlotState = new yjs.Map();
+        this.syncLocalMapToSharedMap(localSlot.state, sharedSlotState);
+        sharedSlot.setAttribute('state', sharedSlotState);
         const sharedContent = new yjs.Text();
         this.initSharedSlotByLocalSlot(sharedContent, localSlot);
         sharedSlot.insertEmbed(0, sharedContent);
@@ -574,11 +576,13 @@ exports.Collaborate = class Collaborate {
         const schema = sharedSlot.getAttribute('schema');
         if (type === 'async') {
             const metadata = sharedSlot.getAttribute('metadata');
-            const slot = new core.AsyncSlot(schema || [], {});
+            const slot = new core.AsyncSlot(schema || [], {}, {});
             this.syncSharedMapToLocalMap(metadata, slot.metadata);
             const loadedSubDocument = this.subModelLoader.getLoadedModelBySlot(slot);
             if (loadedSubDocument) {
                 const subContent = loadedSubDocument.getText('content');
+                const data = loadedSubDocument.getMap('state');
+                this.syncSharedMapToLocalMap(data, slot.state);
                 this.syncRootSlot(loadedSubDocument, subContent, slot);
                 this.addSubModelEvent.next({
                     yDoc: loadedSubDocument,
@@ -594,13 +598,15 @@ exports.Collaborate = class Collaborate {
                 if (isDestroyed) {
                     return;
                 }
-                slot.loader.markAsLoaded();
                 const subContent = subDocument.getText('content');
+                const state = subDocument.getMap('state');
+                this.syncSharedMapToLocalMap(state, slot.state);
                 this.syncRootSlot(subDocument, subContent, slot);
                 this.addSubModelEvent.next({
                     yDoc: subDocument,
                     yType: subContent
                 });
+                slot.loader.markAsLoaded();
             });
             slot.__changeMarker__.addDetachCallback(() => {
                 isDestroyed = true;
@@ -612,7 +618,9 @@ exports.Collaborate = class Collaborate {
         if (!(content instanceof yjs.Text)) {
             throw collaborateErrorFn('shared slot content type is not `YText`.');
         }
-        const localSlot = new core.Slot(schema || []);
+        const localSlot = new core.Slot(schema || [], {});
+        const sharedSlotState = sharedSlot.getAttribute('state');
+        this.syncSharedMapToLocalMap(sharedSlotState, localSlot.state);
         this.initLocalSlotBySharedSlot(content, localSlot);
         this.syncSlot(content, localSlot);
         return localSlot;
@@ -728,13 +736,13 @@ exports.Collaborate = class Collaborate {
                     if (isDestroyed) {
                         return;
                     }
-                    instance.loader.markAsLoaded();
                     const state = subDocument.getMap('state');
                     this.syncComponent(subDocument, state, instance);
                     this.addSubModelEvent.next({
                         yType: state,
                         yDoc: subDocument
                     });
+                    instance.loader.markAsLoaded();
                 });
                 state.__changeMarker__.addDetachCallback(() => {
                     isDestroyed = true;
@@ -948,7 +956,7 @@ exports.CollabHistory = class CollabHistory {
         var _a;
         return ((_a = this.manager) === null || _a === void 0 ? void 0 : _a.canRedo()) || false;
     }
-    constructor(rootComponentRef, collaborate, scheduler, selection, stackSize, undoManagerConfig) {
+    constructor(rootComponentRef, collaborate, scheduler, stackSize, undoManagerConfig) {
         Object.defineProperty(this, "rootComponentRef", {
             enumerable: true,
             configurable: true,
@@ -967,12 +975,6 @@ exports.CollabHistory = class CollabHistory {
             writable: true,
             value: scheduler
         });
-        Object.defineProperty(this, "selection", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: selection
-        });
         Object.defineProperty(this, "stackSize", {
             enumerable: true,
             configurable: true,
@@ -1159,12 +1161,11 @@ exports.CollabHistory = class CollabHistory {
 };
 exports.CollabHistory = __decorate([
     core$1.Injectable(),
-    __param(4, core$1.Inject(core.HISTORY_STACK_SIZE)),
-    __param(5, core$1.Optional()),
+    __param(3, core$1.Inject(core.HISTORY_STACK_SIZE)),
+    __param(4, core$1.Optional()),
     __metadata("design:paramtypes", [core.RootComponentRef,
         exports.Collaborate,
-        core.Scheduler,
-        core.Selection, Number, CustomUndoManagerConfig])
+        core.Scheduler, Number, CustomUndoManagerConfig])
 ], exports.CollabHistory);
 
 /**
@@ -1646,10 +1647,17 @@ class CollaborateModule {
                 }
             ]
         });
+        Object.defineProperty(this, "timer", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: null
+        });
     }
     setup(textbus) {
         const messageBus = textbus.get(MessageBus, null);
         const connector = textbus.get(SyncConnector);
+        const collab = textbus.get(exports.Collaborate);
         if (messageBus) {
             const selection = textbus.get(core.Selection);
             connector.setLocalStateField('message', messageBus.get(textbus));
@@ -1661,13 +1669,33 @@ class CollaborateModule {
                 messageBus.consume(states, textbus);
             }));
         }
-        return connector.onLoad.toPromise();
+        return connector.onLoad.toPromise().then(() => {
+            if (!this.config.onlyLoad) {
+                return;
+            }
+            const root = collab.yDoc.getMap('RootComponent');
+            if (root.has('state')) {
+                return;
+            }
+            return new Promise(resolve => {
+                const testing = () => {
+                    if (root.has('state')) {
+                        resolve();
+                    }
+                    else {
+                        this.timer = setTimeout(testing, 1000);
+                    }
+                };
+                this.timer = setTimeout(testing, 1000);
+            });
+        });
     }
     onDestroy(textbus) {
         this.subscription.unsubscribe();
         textbus.get(exports.Collaborate).destroy();
         textbus.get(core.History).destroy();
         textbus.get(SyncConnector).onDestroy();
+        clearTimeout(this.timer);
     }
 }
 
@@ -1709,10 +1737,17 @@ class MultipleDocumentCollaborateModule {
                 }
             ]
         });
+        Object.defineProperty(this, "timer", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: null
+        });
     }
     setup(textbus) {
         const messageBus = textbus.get(MessageBus, null);
         const connector = textbus.get(SyncConnector);
+        const collab = textbus.get(exports.Collaborate);
         if (messageBus) {
             const selection = textbus.get(core.Selection);
             connector.setLocalStateField('message', messageBus.get(textbus));
@@ -1724,13 +1759,33 @@ class MultipleDocumentCollaborateModule {
                 messageBus.consume(states, textbus);
             }));
         }
-        return connector.onLoad.toPromise();
+        return connector.onLoad.toPromise().then(() => {
+            if (!this.config.onlyLoad) {
+                return;
+            }
+            const root = collab.yDoc.getMap('RootComponent');
+            if (root.has('state')) {
+                return;
+            }
+            return new Promise(resolve => {
+                const testing = () => {
+                    if (root.has('state')) {
+                        resolve();
+                    }
+                    else {
+                        this.timer = setTimeout(testing, 1000);
+                    }
+                };
+                this.timer = setTimeout(testing, 1000);
+            });
+        });
     }
     onDestroy(textbus) {
         this.subscription.unsubscribe();
         textbus.get(exports.Collaborate).destroy();
         textbus.get(core.History).destroy();
         textbus.get(SyncConnector).onDestroy();
+        clearTimeout(this.timer);
     }
 }
 

package/bundles/multiple-document-collaborate-module.d.ts

@@ -9,6 +9,7 @@ export declare class MultipleDocumentCollaborateModule implements Module {
     config: MultipleDocCollaborateConfig;
     private subscription;
     providers: Provider[];
+    private timer;
     constructor(config: MultipleDocCollaborateConfig);
     setup(textbus: Textbus): Promise<(() => void) | void> | (() => void) | void;
     onDestroy(textbus: Textbus): void;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@textbus/collaborate",
-  "version": "5.0.0-alpha.1",
+  "version": "5.0.0-alpha.10",
   "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,16 +27,16 @@
   "dependencies": {
     "@hocuspocus/provider": "^2.15.2",
     "@tanbo/stream": "^1.2.7",
-    "@textbus/core": "^5.0.0-alpha.1",
+    "@textbus/core": "^5.0.0-alpha.10",
     "@viewfly/core": "^2.0.0-alpha.3",
     "y-websocket": "^2.1.0",
     "yjs": "^13.6.23"
   },
   "devDependencies": {
-    "@rollup/plugin-commonjs": "^23.0.2",
-    "@rollup/plugin-typescript": "^9.0.2",
+    "@rollup/plugin-commonjs": "^28.0.2",
+    "@rollup/plugin-typescript": "^12.1.2",
     "rimraf": "^3.0.2",
-    "rollup": "^3.2.5",
+    "rollup": "4.22.4",
     "tslib": "^2.4.1"
   },
   "author": {
@@ -50,5 +50,5 @@
   "bugs": {
     "url": "https://github.com/textbus/textbus.git/issues"
   },
-  "gitHead": "97fad583844a41a761a107ff8500039c178ec321"
+  "gitHead": "438501b25fd5388d8e55c1a693f25bf282a90a86"
 }