@textbus/collaborate 4.3.8 → 4.3.10

package/bundles/index.esm.js

@@ -1,5 +1,5 @@
 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 { makeError, ChangeOrigin, Slot, observe, AsyncSlot, AsyncComponent, Component, Scheduler, Registry, Selection, HISTORY_STACK_SIZE, RootComponentRef, History } from '@textbus/core';
 import { Subject, map, filter, Subscription } from '@tanbo/stream';
 import { Doc, createAbsolutePositionFromRelativePosition, createRelativePositionFromTypeIndex, Map, Array as Array$1, Text, UndoManager } from 'yjs';
 import { HocuspocusProvider } from '@hocuspocus/provider';
@@ -461,7 +461,7 @@ let Collaborate = class Collaborate {
             });
         });
         this.slotMap.set(localSlot, sharedSlot);
-        localSlot.__changeMarker__.destroyCallbacks.push(() => {
+        localSlot.__changeMarker__.addDetachCallback(() => {
             this.slotMap.delete(localSlot);
             sharedSlot.unobserve(syncRemote);
             sub.unsubscribe();
@@ -469,6 +469,7 @@ let Collaborate = class Collaborate {
     }
     destroy() {
         this.subscriptions.forEach(i => i.unsubscribe());
+        this.subscriptions = [];
     }
     syncSharedMapToLocalMap(sharedMap, localMap) {
         sharedMap.forEach((value, key) => {
@@ -477,12 +478,12 @@ let Collaborate = class Collaborate {
         this.syncObject(sharedMap, localMap);
     }
     createLocalMapBySharedMap(sharedMap) {
-        const localMap = createObjectProxy({});
+        const localMap = observe({});
         this.syncSharedMapToLocalMap(sharedMap, localMap);
         return localMap;
     }
     createLocalArrayBySharedArray(sharedArray) {
-        const localArray = createArrayProxy([]);
+        const localArray = observe([]);
         localArray.push(...sharedArray.map(item => this.createLocalModelBySharedByModel(item)));
         this.syncArray(sharedArray, localArray);
         return localArray;
@@ -529,7 +530,7 @@ let Collaborate = class Collaborate {
                 this.initSyncEvent(subDocument);
                 localSlot.loader.markAsLoaded();
             });
-            localSlot.__changeMarker__.destroyCallbacks.push(() => {
+            localSlot.__changeMarker__.addDetachCallback(() => {
                 isDestroyed = true;
             });
             return sharedSlot;
@@ -599,7 +600,7 @@ let Collaborate = class Collaborate {
                     yType: subContent
                 });
             });
-            slot.__changeMarker__.destroyCallbacks.push(() => {
+            slot.__changeMarker__.addDetachCallback(() => {
                 isDestroyed = true;
             });
             return slot;
@@ -673,7 +674,7 @@ let Collaborate = class Collaborate {
             sharedComponent.set('metadata', sharedMetadata);
             const state = component.state;
             let isDestroyed = false;
-            state.__changeMarker__.destroyCallbacks.push(() => {
+            state.__changeMarker__.addDetachCallback(() => {
                 isDestroyed = true;
             });
             this.subModelLoader.createSubModelByComponent(component).then(subDocument => {
@@ -733,7 +734,7 @@ let Collaborate = class Collaborate {
                         yDoc: subDocument
                     });
                 });
-                state.__changeMarker__.destroyCallbacks.push(() => {
+                state.__changeMarker__.addDetachCallback(() => {
                     isDestroyed = true;
                 });
             }
@@ -813,7 +814,7 @@ let Collaborate = class Collaborate {
             });
         };
         sharedArray.observe(syncRemote);
-        localArray.__changeMarker__.destroyCallbacks.push(() => {
+        localArray.__changeMarker__.addDetachCallback(() => {
             sub.unsubscribe();
             sharedArray.unobserve(syncRemote);
         });
@@ -853,7 +854,7 @@ let Collaborate = class Collaborate {
                 }
             });
         });
-        localObject.__changeMarker__.destroyCallbacks.push(function () {
+        localObject.__changeMarker__.addDetachCallback(function () {
             sharedObject.unobserve(syncRemote);
             sub.unsubscribe();
         });

package/bundles/index.js

@@ -463,7 +463,7 @@ exports.Collaborate = class Collaborate {
             });
         });
         this.slotMap.set(localSlot, sharedSlot);
-        localSlot.__changeMarker__.destroyCallbacks.push(() => {
+        localSlot.__changeMarker__.addDetachCallback(() => {
             this.slotMap.delete(localSlot);
             sharedSlot.unobserve(syncRemote);
             sub.unsubscribe();
@@ -471,6 +471,7 @@ exports.Collaborate = class Collaborate {
     }
     destroy() {
         this.subscriptions.forEach(i => i.unsubscribe());
+        this.subscriptions = [];
     }
     syncSharedMapToLocalMap(sharedMap, localMap) {
         sharedMap.forEach((value, key) => {
@@ -479,12 +480,12 @@ exports.Collaborate = class Collaborate {
         this.syncObject(sharedMap, localMap);
     }
     createLocalMapBySharedMap(sharedMap) {
-        const localMap = core.createObjectProxy({});
+        const localMap = core.observe({});
         this.syncSharedMapToLocalMap(sharedMap, localMap);
         return localMap;
     }
     createLocalArrayBySharedArray(sharedArray) {
-        const localArray = core.createArrayProxy([]);
+        const localArray = core.observe([]);
         localArray.push(...sharedArray.map(item => this.createLocalModelBySharedByModel(item)));
         this.syncArray(sharedArray, localArray);
         return localArray;
@@ -531,7 +532,7 @@ exports.Collaborate = class Collaborate {
                 this.initSyncEvent(subDocument);
                 localSlot.loader.markAsLoaded();
             });
-            localSlot.__changeMarker__.destroyCallbacks.push(() => {
+            localSlot.__changeMarker__.addDetachCallback(() => {
                 isDestroyed = true;
             });
             return sharedSlot;
@@ -601,7 +602,7 @@ exports.Collaborate = class Collaborate {
                     yType: subContent
                 });
             });
-            slot.__changeMarker__.destroyCallbacks.push(() => {
+            slot.__changeMarker__.addDetachCallback(() => {
                 isDestroyed = true;
             });
             return slot;
@@ -675,7 +676,7 @@ exports.Collaborate = class Collaborate {
             sharedComponent.set('metadata', sharedMetadata);
             const state = component.state;
             let isDestroyed = false;
-            state.__changeMarker__.destroyCallbacks.push(() => {
+            state.__changeMarker__.addDetachCallback(() => {
                 isDestroyed = true;
             });
             this.subModelLoader.createSubModelByComponent(component).then(subDocument => {
@@ -735,7 +736,7 @@ exports.Collaborate = class Collaborate {
                         yDoc: subDocument
                     });
                 });
-                state.__changeMarker__.destroyCallbacks.push(() => {
+                state.__changeMarker__.addDetachCallback(() => {
                     isDestroyed = true;
                 });
             }
@@ -815,7 +816,7 @@ exports.Collaborate = class Collaborate {
             });
         };
         sharedArray.observe(syncRemote);
-        localArray.__changeMarker__.destroyCallbacks.push(() => {
+        localArray.__changeMarker__.addDetachCallback(() => {
             sub.unsubscribe();
             sharedArray.unobserve(syncRemote);
         });
@@ -855,7 +856,7 @@ exports.Collaborate = class Collaborate {
                 }
             });
         });
-        localObject.__changeMarker__.destroyCallbacks.push(function () {
+        localObject.__changeMarker__.addDetachCallback(function () {
             sharedObject.unobserve(syncRemote);
             sub.unsubscribe();
         });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@textbus/collaborate",
-  "version": "4.3.8",
+  "version": "4.3.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",
@@ -26,8 +26,8 @@
   ],
   "dependencies": {
     "@hocuspocus/provider": "^2.13.6",
-    "@tanbo/stream": "^1.2.6",
-    "@textbus/core": "^4.3.8",
+    "@tanbo/stream": "^1.2.7",
+    "@textbus/core": "^4.3.4",
     "@viewfly/core": "^1.1.10",
     "y-websocket": "^1.4.3",
     "yjs": "^13.6.14"
@@ -50,5 +50,5 @@
   "bugs": {
     "url": "https://github.com/textbus/textbus.git/issues"
   },
-  "gitHead": "a2eb21a78bc8f1fc18cb0a75c4d1093de539eebf"
+  "gitHead": "472be3e304f6778ae993fda938d660c628b3d2e9"
 }