@kerebron/extension-yjs 0.7.0 → 0.7.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (40) hide show
  1. package/esm/ExtensionYjs.d.ts.map +1 -1
  2. package/esm/ExtensionYjs.js +33 -0
  3. package/esm/ExtensionYjs.js.map +1 -1
  4. package/esm/WebsocketProvider.d.ts +1 -0
  5. package/esm/WebsocketProvider.d.ts.map +1 -1
  6. package/esm/WebsocketProvider.js +64 -41
  7. package/esm/WebsocketProvider.js.map +1 -1
  8. package/esm/binding/DiffViewer.d.ts +17 -0
  9. package/esm/binding/DiffViewer.d.ts.map +1 -0
  10. package/esm/binding/DiffViewer.js +96 -0
  11. package/esm/binding/DiffViewer.js.map +1 -0
  12. package/esm/binding/PmYjsBinding.d.ts +4 -0
  13. package/esm/binding/PmYjsBinding.d.ts.map +1 -1
  14. package/esm/binding/PmYjsBinding.js +49 -9
  15. package/esm/binding/PmYjsBinding.js.map +1 -1
  16. package/esm/binding/createNodeFromYElement.d.ts +1 -1
  17. package/esm/binding/createNodeFromYElement.d.ts.map +1 -1
  18. package/esm/binding/createNodeFromYElement.js.map +1 -1
  19. package/esm/debug.d.ts.map +1 -1
  20. package/esm/debug.js +11 -0
  21. package/esm/debug.js.map +1 -1
  22. package/esm/ui/selection.d.ts.map +1 -1
  23. package/esm/ui/selection.js +3 -3
  24. package/esm/ui/selection.js.map +1 -1
  25. package/esm/utils.d.ts +1 -1
  26. package/esm/utils.d.ts.map +1 -1
  27. package/esm/utils.js.map +1 -1
  28. package/esm/ySyncPlugin.d.ts.map +1 -1
  29. package/esm/ySyncPlugin.js +45 -14
  30. package/esm/ySyncPlugin.js.map +1 -1
  31. package/package.json +3 -3
  32. package/src/ExtensionYjs.ts +43 -0
  33. package/src/WebsocketProvider.ts +73 -61
  34. package/src/binding/DiffViewer.ts +138 -0
  35. package/src/binding/PmYjsBinding.ts +70 -10
  36. package/src/binding/createNodeFromYElement.ts +1 -1
  37. package/src/debug.ts +21 -0
  38. package/src/ui/selection.ts +5 -3
  39. package/src/utils.ts +1 -1
  40. package/src/ySyncPlugin.ts +58 -19
package/esm/ExtensionYjs.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"ExtensionYjs.d.ts","sourceRoot":"","sources":["../src/ExtensionYjs.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAe,MAAM,EAAe,MAAM,mBAAmB,CAAC;AAI1E,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC7C,OAAO,KAAK,EACV,gBAAgB,EAEhB,gBAAgB,EACjB,MAAM,2BAA2B,CAAC;AAOnC,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAE1D,MAAM,WAAW,SAAS;IACxB,iBAAiB,EAAE,iBAAiB,CAAC;CACtC;AAED,qBAAa,YAAa,SAAQ,SAAS;IAiEb,MAAM,EAAE,SAAS;IAhE7C,IAAI,SAAS;IAEJ,SAAS,WAAe;IACjC,QAAQ,WAAwB;IAEvB,mBAAmB,IAAI,OAAO,CAAC,gBAAgB,CAAC;IAoDhD,oBAAoB,IAAI,OAAO,CAAC,gBAAgB,CAAC;gBAO9B,MAAM,EAAE,SAAS;IAIpC,qBAAqB,IAAI,MAAM,EAAE;CAO3C"}
1
+ {"version":3,"file":"ExtensionYjs.d.ts","sourceRoot":"","sources":["../src/ExtensionYjs.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAe,MAAM,EAAe,MAAM,mBAAmB,CAAC;AAI1E,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC7C,OAAO,KAAK,EACV,gBAAgB,EAEhB,gBAAgB,EACjB,MAAM,2BAA2B,CAAC;AAOnC,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAE1D,MAAM,WAAW,SAAS;IACxB,iBAAiB,EAAE,iBAAiB,CAAC;CACtC;AAED,qBAAa,YAAa,SAAQ,SAAS;IA4Gb,MAAM,EAAE,SAAS;IA3G7C,IAAI,SAAS;IAEJ,SAAS,WAAe;IACjC,QAAQ,WAAwB;IAEvB,mBAAmB,IAAI,OAAO,CAAC,gBAAgB,CAAC;IA+FhD,oBAAoB,IAAI,OAAO,CAAC,gBAAgB,CAAC;gBAO9B,MAAM,EAAE,SAAS;IAIpC,qBAAqB,IAAI,MAAM,EAAE;CAO3C"}
package/esm/ExtensionYjs.js CHANGED
@@ -39,12 +39,45 @@ export class ExtensionYjs extends Extension {
39
39
  return true;
40
40
  };
41
41
  };
42
+ const getYSnapshot = ({ resolve, reject }) => {
43
+ return (state, dispatch) => {
44
+ const tr = state.tr;
45
+ tr.setMeta(ySyncPluginKey, { getYSnapshot: { resolve, reject } });
46
+ if (dispatch) {
47
+ dispatch(tr);
48
+ }
49
+ return true;
50
+ };
51
+ };
52
+ const setYSnapshot = (opts) => {
53
+ return (state, dispatch) => {
54
+ const tr = state.tr;
55
+ tr.setMeta(ySyncPluginKey, { setYSnapshot: opts });
56
+ if (dispatch) {
57
+ dispatch(tr);
58
+ }
59
+ return true;
60
+ };
61
+ };
62
+ const resetYSnapshot = () => {
63
+ return (state, dispatch) => {
64
+ const tr = state.tr;
65
+ tr.setMeta(ySyncPluginKey, { resetYSnapshot: true });
66
+ if (dispatch) {
67
+ dispatch(tr);
68
+ }
69
+ return true;
70
+ };
71
+ };
42
72
  return {
43
73
  getYDoc,
44
74
  changeRoom,
45
75
  leaveRoom,
46
76
  'undo': () => undoCommand,
47
77
  'redo': () => redoCommand,
78
+ getYSnapshot,
79
+ setYSnapshot,
80
+ resetYSnapshot,
48
81
  };
49
82
  }
50
83
  getKeyboardShortcuts() {
package/esm/ExtensionYjs.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"ExtensionYjs.js","sourceRoot":"","sources":["../src/ExtensionYjs.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAO7C,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,EAAE,WAAW,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AACzE,OAAO,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAQ3C,MAAM,OAAO,YAAa,SAAQ,SAAS;IAiEb;IAhE5B,IAAI,GAAG,KAAK,CAAC;IAEJ,SAAS,GAAG,CAAC,SAAS,CAAC,CAAC;IACjC,QAAQ,GAAG,CAAC,kBAAkB,CAAC,CAAC;IAEvB,mBAAmB;QAC1B,MAAM,UAAU,GAAmB,CAAC,MAAc,EAAE,EAAE;YACpD,OAAO,CAAC,KAAkB,EAAE,QAAoC,EAAE,EAAE;gBAClE,MAAM,EAAE,GAAG,KAAK,CAAC,EAAE,CAAC;gBACpB,EAAE,CAAC,OAAO,CAAC,cAAc,EAAE,EAAE,UAAU,EAAE,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC;gBAEvD,IAAI,QAAQ,EAAE,CAAC;oBACb,QAAQ,CAAC,EAAE,CAAC,CAAC;gBACf,CAAC;gBAED,OAAO,IAAI,CAAC;YACd,CAAC,CAAC;QACJ,CAAC,CAAC;QAEF,MAAM,SAAS,GAAmB,GAAG,EAAE;YACrC,OAAO,CAAC,KAAkB,EAAE,QAAoC,EAAE,EAAE;gBAClE,MAAM,EAAE,GAAG,KAAK,CAAC,EAAE,CAAC;gBACpB,EAAE,CAAC,OAAO,CAAC,cAAc,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;gBAEhD,IAAI,QAAQ,EAAE,CAAC;oBACb,QAAQ,CAAC,EAAE,CAAC,CAAC;gBACf,CAAC;gBAED,OAAO,IAAI,CAAC;YACd,CAAC,CAAC;QACJ,CAAC,CAAC;QAEF,MAAM,OAAO,GAAmB,CAC9B,EAAE,OAAO,EAAE,MAAM,EAGhB,EACD,EAAE;YACF,OAAO,CAAC,KAAkB,EAAE,QAAoC,EAAE,EAAE;gBAClE,MAAM,EAAE,GAAG,KAAK,CAAC,EAAE,CAAC;gBACpB,EAAE,CAAC,OAAO,CAAC,cAAc,EAAE,EAAE,OAAO,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC;gBAC7D,IAAI,QAAQ,EAAE,CAAC;oBACb,QAAQ,CAAC,EAAE,CAAC,CAAC;gBACf,CAAC;gBACD,OAAO,IAAI,CAAC;YACd,CAAC,CAAC;QACJ,CAAC,CAAC;QAEF,OAAO;YACL,OAAO;YACP,UAAU;YACV,SAAS;YACT,MAAM,EAAE,GAAG,EAAE,CAAC,WAAW;YACzB,MAAM,EAAE,GAAG,EAAE,CAAC,WAAW;SAC1B,CAAC;IACJ,CAAC;IAEQ,oBAAoB;QAC3B,OAAO;YACL,OAAO,EAAE,MAAM;YACf,OAAO,EAAE,MAAM;SAChB,CAAC;IACJ,CAAC;IAED,YAA4B,MAAiB;QAC3C,KAAK,EAAE,CAAC;QADkB,WAAM,GAAN,MAAM,CAAW;IAE7C,CAAC;IAEQ,qBAAqB;QAC5B,OAAO;YACL,WAAW,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,iBAAiB,CAAC;YACvD,eAAe,CAAC,IAAI,CAAC,MAAM,CAAC;YAC5B,WAAW,EAAE;SACd,CAAC;IACJ,CAAC;CACF"}
1
+ {"version":3,"file":"ExtensionYjs.js","sourceRoot":"","sources":["../src/ExtensionYjs.ts"],"names":[],"mappings":"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"}
package/esm/WebsocketProvider.d.ts CHANGED
@@ -48,6 +48,7 @@ export declare class WebsocketProvider extends EventTarget implements YjsProvide
48
48
  wsUnsuccessfulReconnects: number;
49
49
  messageHandlers: MessageHandler<WebsocketProvider>[];
50
50
  wsLastMessageReceived: number;
51
+ readonly bc: BroadcastChannel;
51
52
  private _bcSubscriber;
52
53
  private _updateHandler;
53
54
  private _awarenessUpdateHandler;
package/esm/WebsocketProvider.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"WebsocketProvider.d.ts","sourceRoot":"","sources":["../src/WebsocketProvider.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,KAAK,CAAC;AAOzB,OAAO,KAAK,iBAAiB,MAAM,uBAAuB,CAAC;AAI3D,OAAO,EAGL,cAAc,EAId,WAAW,EACZ,MAAM,kBAAkB,CAAC;AA4I1B,UAAU,qBAAqB;IAC7B,OAAO,EAAE,OAAO,CAAC;IACjB,SAAS,EAAE,iBAAiB,CAAC,SAAS,CAAC;IACvC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC/B,SAAS,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IACzB,iBAAiB,EAAE,OAAO,SAAS,CAAC;IACpC,cAAc,EAAE,MAAM,CAAC;IACvB,cAAc,EAAE,MAAM,CAAC;IACvB,SAAS,EAAE,OAAO,CAAC;CACpB;AAED;;;;;;;;;;GAUG;AACH,qBAAa,iBAAkB,SAAQ,WAAY,YAAW,WAAW;IACvE,QAAQ,EAAE,MAAM,CAAC;IACjB,GAAG,EAAE,CAAC,CAAC,GAAG,CAAC;IAEX,OAAO,UAAS;IAChB,aAAa,EAAE,OAAO,CAAC;IACvB,EAAE,EAAE,SAAS,GAAG,SAAS,CAAC;IAC1B,eAAe,SAAK;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,cAAc,EAAE,MAAM,CAAC;IACvB;;;OAGG;IACH,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC/B,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,GAAG,EAAE,OAAO,SAAS,CAAC;IACtB,SAAS,EAAE,iBAAiB,CAAC,SAAS,CAAC;IACvC,SAAS,UAAS;IAClB,WAAW,UAAS;IACpB,YAAY,UAAS;IACrB,WAAW,UAAS;IACpB,SAAS,EAAE,OAAO,CAAC;IACnB,wBAAwB,EAAE,MAAM,CAAC;IACjC,eAAe,EAAE,cAAc,CAAC,iBAAiB,CAAC,EAAE,CAAC;IACrD,qBAAqB,EAAE,MAAM,CAAC;IAC9B,OAAO,CAAC,aAAa,CAAmC;IACxD,OAAO,CAAC,cAAc,CAAqC;IAC3D,OAAO,CAAC,uBAAuB,CAGrB;IACV,OAAO,CAAC,YAAY,CAAa;IACjC,OAAO,CAAC,cAAc,CAAS;IAC/B,cAAc,EAAE,MAAM,GAAG,SAAS,CAAC;gBAGjC,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,GAAG,EAAE,CAAC,CAAC,GAAG,EACV,IAAI,GAAE,qBASL;IAoGH,IAAI,GAAG,WAIN;IAED,IAAI,MAAM,IAAI,OAAO,CAEpB;IAED,IAAI,MAAM,CAAC,KAAK,EAAE,OAAO,EAMxB;IAED,OAAO;IAmBP,SAAS;IA2CT,YAAY;IAiBZ,UAAU;IAQV,OAAO;IAQP,OAAO,CAAC,oBAAoB;CAuE7B"}
1
+ {"version":3,"file":"WebsocketProvider.d.ts","sourceRoot":"","sources":["../src/WebsocketProvider.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,KAAK,CAAC;AAMzB,OAAO,KAAK,iBAAiB,MAAM,uBAAuB,CAAC;AAI3D,OAAO,EAGL,cAAc,EAId,WAAW,EACZ,MAAM,kBAAkB,CAAC;AAoJ1B,UAAU,qBAAqB;IAC7B,OAAO,EAAE,OAAO,CAAC;IACjB,SAAS,EAAE,iBAAiB,CAAC,SAAS,CAAC;IACvC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC/B,SAAS,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IACzB,iBAAiB,EAAE,OAAO,SAAS,CAAC;IACpC,cAAc,EAAE,MAAM,CAAC;IACvB,cAAc,EAAE,MAAM,CAAC;IACvB,SAAS,EAAE,OAAO,CAAC;CACpB;AAED;;;;;;;;;;GAUG;AACH,qBAAa,iBAAkB,SAAQ,WAAY,YAAW,WAAW;IACvE,QAAQ,EAAE,MAAM,CAAC;IACjB,GAAG,EAAE,CAAC,CAAC,GAAG,CAAC;IAEX,OAAO,UAAS;IAChB,aAAa,EAAE,OAAO,CAAC;IACvB,EAAE,EAAE,SAAS,GAAG,SAAS,CAAC;IAC1B,eAAe,SAAK;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,cAAc,EAAE,MAAM,CAAC;IACvB;;;OAGG;IACH,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC/B,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,GAAG,EAAE,OAAO,SAAS,CAAC;IACtB,SAAS,EAAE,iBAAiB,CAAC,SAAS,CAAC;IACvC,SAAS,UAAS;IAClB,WAAW,UAAS;IACpB,YAAY,UAAS;IACrB,WAAW,UAAS;IACpB,SAAS,EAAE,OAAO,CAAC;IACnB,wBAAwB,EAAE,MAAM,CAAC;IACjC,eAAe,EAAE,cAAc,CAAC,iBAAiB,CAAC,EAAE,CAAC;IACrD,qBAAqB,EAAE,MAAM,CAAC;IAC9B,SAAgB,EAAE,EAAE,gBAAgB,CAAC;IACrC,OAAO,CAAC,aAAa,CAAuC;IAC5D,OAAO,CAAC,cAAc,CAAqC;IAC3D,OAAO,CAAC,uBAAuB,CAGrB;IACV,OAAO,CAAC,YAAY,CAAa;IACjC,OAAO,CAAC,cAAc,CAAS;IAC/B,cAAc,EAAE,MAAM,GAAG,SAAS,CAAC;gBAGjC,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,GAAG,EAAE,CAAC,CAAC,GAAG,EACV,IAAI,GAAE,qBASL;IAoGH,IAAI,GAAG,WAIN;IAED,IAAI,MAAM,IAAI,OAAO,CAEpB;IAED,IAAI,MAAM,CAAC,KAAK,EAAE,OAAO,EAMxB;IAED,OAAO;IAmBP,SAAS;IAyCT,YAAY;IAuBZ,UAAU;IAQV,OAAO;IAQP,OAAO,CAAC,oBAAoB;CAuE7B"}
package/esm/WebsocketProvider.js CHANGED
@@ -1,4 +1,3 @@
1
- import * as bc from 'lib0/broadcastchannel';
2
1
  import * as time from 'lib0/time';
3
2
  import * as encoding from 'lib0/encoding';
4
3
  import * as decoding from 'lib0/decoding';
@@ -71,7 +70,12 @@ const setupWS = (provider) => {
71
70
  provider.dispatchEvent(new CustomEvent('connection-error', { detail: { event, provider } }));
72
71
  };
73
72
  websocket.onclose = (event) => {
74
- closeWebsocketConnection(provider, websocket, event);
73
+ try {
74
+ closeWebsocketConnection(provider, websocket, event);
75
+ }
76
+ catch (err) {
77
+ console.error(err);
78
+ }
75
79
  };
76
80
  websocket.onopen = () => {
77
81
  provider.wsLastMessageReceived = time.getUnixTime();
@@ -103,7 +107,12 @@ const broadcastMessage = (provider, buf) => {
103
107
  ws.send(buf);
104
108
  }
105
109
  if (provider.bcconnected) {
106
- bc.publish(provider.bcChannel, buf, provider);
110
+ try {
111
+ provider.bc.postMessage(buf);
112
+ }
113
+ catch (err) {
114
+ console.trace(err);
115
+ }
107
116
  }
108
117
  };
109
118
  /**
@@ -143,6 +152,7 @@ export class WebsocketProvider extends EventTarget {
143
152
  wsUnsuccessfulReconnects;
144
153
  messageHandlers;
145
154
  wsLastMessageReceived;
155
+ bc;
146
156
  _bcSubscriber;
147
157
  _updateHandler;
148
158
  _awarenessUpdateHandler;
@@ -168,6 +178,7 @@ export class WebsocketProvider extends EventTarget {
168
178
  this.serverUrl = this.serverUrl.slice(0, this.serverUrl.length - 1);
169
179
  }
170
180
  this.bcChannel = this.serverUrl + '/' + roomname;
181
+ this.bc = new BroadcastChannel(this.bcChannel);
171
182
  this.maxBackoffTime = opts.maxBackoffTime;
172
183
  this.params = opts.params;
173
184
  this.protocols = opts.protocols;
@@ -189,13 +200,8 @@ export class WebsocketProvider extends EventTarget {
189
200
  }
190
201
  }, opts.resyncInterval);
191
202
  }
192
- this._bcSubscriber = (data, origin) => {
193
- if (origin !== this) {
194
- const encoder = readMessage(this, new Uint8Array(data), false);
195
- if (encoding.length(encoder) > 1) {
196
- bc.publish(this.bcChannel, encoding.toUint8Array(encoder), this);
197
- }
198
- }
203
+ this._bcSubscriber = (event) => {
204
+ readMessage(this, new Uint8Array(event.data), false);
199
205
  };
200
206
  /**
201
207
  * Listens to Yjs updates and sends them to remote peers (ws and broadcastchannel)
@@ -224,15 +230,20 @@ export class WebsocketProvider extends EventTarget {
224
230
  // }
225
231
  opts.awareness.on('update', this._awarenessUpdateHandler);
226
232
  this._checkInterval = /** @type {any} */ (setInterval(() => {
227
- if (this.wsconnected &&
228
- messageReconnectTimeout <
229
- time.getUnixTime() - this.wsLastMessageReceived) {
230
- // no message received in a long time - not even your own awareness
231
- // updates (which are updated every 15 seconds)
232
- if (this.ws) {
233
- closeWebsocketConnection(this, this.ws, null);
233
+ try {
234
+ if (this.wsconnected &&
235
+ messageReconnectTimeout <
236
+ time.getUnixTime() - this.wsLastMessageReceived) {
237
+ // no message received in a long time - not even your own awareness
238
+ // updates (which are updated every 15 seconds)
239
+ if (this.ws) {
240
+ closeWebsocketConnection(this, this.ws, null);
241
+ }
234
242
  }
235
243
  }
244
+ catch (err) {
245
+ console.error(err);
246
+ }
236
247
  }, messageReconnectTimeout / 10));
237
248
  if (opts.connect) {
238
249
  this.connect();
@@ -275,31 +286,36 @@ export class WebsocketProvider extends EventTarget {
275
286
  return;
276
287
  }
277
288
  if (!this.bcconnected) {
278
- bc.subscribe(this.bcChannel, this._bcSubscriber);
289
+ this.bc.addEventListener('message', this._bcSubscriber);
279
290
  this.bcconnected = true;
280
291
  }
281
- // send sync step1 to bc
282
- // write sync step 1
283
- const encoderSync = encoding.createEncoder();
284
- encoding.writeVarUint(encoderSync, messageSync);
285
- syncProtocol.writeSyncStep1(encoderSync, this.doc);
286
- bc.publish(this.bcChannel, encoding.toUint8Array(encoderSync), this);
287
- // broadcast local state
288
- const encoderState = encoding.createEncoder();
289
- encoding.writeVarUint(encoderState, messageSync);
290
- syncProtocol.writeSyncStep2(encoderState, this.doc);
291
- bc.publish(this.bcChannel, encoding.toUint8Array(encoderState), this);
292
- // write queryAwareness
293
- const encoderAwarenessQuery = encoding.createEncoder();
294
- encoding.writeVarUint(encoderAwarenessQuery, messageQueryAwareness);
295
- bc.publish(this.bcChannel, encoding.toUint8Array(encoderAwarenessQuery), this);
296
- // broadcast local awareness state
297
- const encoderAwarenessState = encoding.createEncoder();
298
- encoding.writeVarUint(encoderAwarenessState, messageAwareness);
299
- encoding.writeVarUint8Array(encoderAwarenessState, awarenessProtocol.encodeAwarenessUpdate(this.awareness, [
300
- this.doc.clientID,
301
- ]));
302
- bc.publish(this.bcChannel, encoding.toUint8Array(encoderAwarenessState), this);
292
+ try {
293
+ // send sync step1 to bc
294
+ // write sync step 1
295
+ const encoderSync = encoding.createEncoder();
296
+ encoding.writeVarUint(encoderSync, messageSync);
297
+ syncProtocol.writeSyncStep1(encoderSync, this.doc);
298
+ this.bc.postMessage(encoding.toUint8Array(encoderSync));
299
+ // broadcast local state
300
+ const encoderState = encoding.createEncoder();
301
+ encoding.writeVarUint(encoderState, messageSync);
302
+ syncProtocol.writeSyncStep2(encoderState, this.doc);
303
+ this.bc.postMessage(encoding.toUint8Array(encoderState));
304
+ // write queryAwareness
305
+ const encoderAwarenessQuery = encoding.createEncoder();
306
+ encoding.writeVarUint(encoderAwarenessQuery, messageQueryAwareness);
307
+ this.bc.postMessage(encoding.toUint8Array(encoderAwarenessQuery));
308
+ // broadcast local awareness state
309
+ const encoderAwarenessState = encoding.createEncoder();
310
+ encoding.writeVarUint(encoderAwarenessState, messageAwareness);
311
+ encoding.writeVarUint8Array(encoderAwarenessState, awarenessProtocol.encodeAwarenessUpdate(this.awareness, [
312
+ this.doc.clientID,
313
+ ]));
314
+ this.bc.postMessage(encoding.toUint8Array(encoderAwarenessState));
315
+ }
316
+ catch (err) {
317
+ console.trace(err);
318
+ }
303
319
  }
304
320
  disconnectBc() {
305
321
  // broadcast message with local awareness state set to null (indicating disconnect)
@@ -310,7 +326,14 @@ export class WebsocketProvider extends EventTarget {
310
326
  ], new Map()));
311
327
  broadcastMessage(this, encoding.toUint8Array(encoder));
312
328
  if (this.bcconnected) {
313
- bc.unsubscribe(this.bcChannel, this._bcSubscriber);
329
+ setTimeout(() => {
330
+ try {
331
+ this.bc.close();
332
+ }
333
+ catch (err) {
334
+ console.trace(err);
335
+ }
336
+ }, 0);
314
337
  this.bcconnected = false;
315
338
  }
316
339
  }
package/esm/WebsocketProvider.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"WebsocketProvider.js","sourceRoot":"","sources":["../src/WebsocketProvider.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"WebsocketProvider.js","sourceRoot":"","sources":["../src/WebsocketProvider.ts"],"names":[],"mappings":"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"}
package/esm/binding/DiffViewer.d.ts ADDED
@@ -0,0 +1,17 @@
1
+ import * as Y from 'yjs';
2
+ import { Node } from 'prosemirror-model';
3
+ import { EditorState } from 'prosemirror-state';
4
+ import { YjsData } from './PmYjsBinding.js';
5
+ export declare class DiffViewer {
6
+ prevSnapshot?: Y.Snapshot;
7
+ snapshot?: Y.Snapshot;
8
+ private historyYXmlFragment;
9
+ private historyDoc;
10
+ constructor();
11
+ isActive(): boolean;
12
+ setSnapshot(yjs: YjsData, uSnapshot: Uint8Array, uPrevSnapshot?: Uint8Array): void;
13
+ reset(): void;
14
+ getFragmentContent(state: EditorState, ytr: Y.Transaction): Node[] | undefined;
15
+ getHistoryDoc(): Y.Doc | undefined;
16
+ }
17
+ //# sourceMappingURL=DiffViewer.d.ts.map
package/esm/binding/DiffViewer.d.ts.map ADDED
@@ -0,0 +1 @@
1
+ {"version":3,"file":"DiffViewer.d.ts","sourceRoot":"","sources":["../../src/binding/DiffViewer.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,KAAK,CAAC;AAEzB,OAAO,EAAE,IAAI,EAAE,MAAM,mBAAmB,CAAC;AACzC,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAGhD,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAG5C,qBAAa,UAAU;IACrB,YAAY,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC;IAC1B,QAAQ,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC;IAEtB,OAAO,CAAC,mBAAmB,CAA4B;IACvD,OAAO,CAAC,UAAU,CAAoB;;IAKtC,QAAQ;IAIR,WAAW,CAAC,GAAG,EAAE,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,aAAa,CAAC,EAAE,UAAU;IA4C3E,KAAK;IAOL,kBAAkB,CAChB,KAAK,EAAE,WAAW,EAClB,GAAG,EAAE,CAAC,CAAC,WAAW,GACjB,IAAI,EAAE,GAAG,SAAS;IAyDrB,aAAa,IAAI,CAAC,CAAC,GAAG,GAAG,SAAS;CAGnC"}
package/esm/binding/DiffViewer.js ADDED
@@ -0,0 +1,96 @@
1
+ import * as Y from 'yjs';
2
+ import { isVisible } from '../utils.js';
3
+ import { createNodeFromYElement } from './createNodeFromYElement.js';
4
+ export class DiffViewer {
5
+ prevSnapshot;
6
+ snapshot;
7
+ historyYXmlFragment;
8
+ historyDoc;
9
+ constructor() {
10
+ }
11
+ isActive() {
12
+ return !!this.snapshot || !!this.prevSnapshot;
13
+ }
14
+ setSnapshot(yjs, uSnapshot, uPrevSnapshot) {
15
+ this.prevSnapshot = undefined;
16
+ if (uPrevSnapshot) {
17
+ this.prevSnapshot = Y.decodeSnapshotV2(uPrevSnapshot);
18
+ }
19
+ this.snapshot = Y.decodeSnapshotV2(uSnapshot);
20
+ this.historyDoc = Y.createDocFromSnapshot(yjs.ydoc, this.snapshot, new Y.Doc({ gc: false }));
21
+ if (yjs.xmlFragment._item === null) {
22
+ /**
23
+ * If is a root type, we need to find the root key in the initial document
24
+ * and use it to get the history type.
25
+ */
26
+ const share = yjs.ydoc.share;
27
+ const rootKey = Array.from(share.keys()).find((key) => share.get(key) === yjs.xmlFragment);
28
+ this.historyYXmlFragment = this.historyDoc.getXmlFragment(rootKey);
29
+ }
30
+ else {
31
+ /**
32
+ * If it is a sub type, we use the item id to find the history type.
33
+ */
34
+ const historyStructs = this.historyDoc.store.clients.get(yjs.xmlFragment._item.id.client) ??
35
+ [];
36
+ const itemIndex = Y.findIndexSS(historyStructs, yjs.xmlFragment._item.id.clock);
37
+ if (historyStructs[itemIndex] instanceof Y.GC) {
38
+ throw new Error('Incorrect type Y.GC');
39
+ }
40
+ const item = historyStructs[itemIndex];
41
+ const content = item.content;
42
+ this.historyYXmlFragment = content.type;
43
+ }
44
+ }
45
+ reset() {
46
+ this.snapshot = undefined;
47
+ this.prevSnapshot = undefined;
48
+ this.historyDoc = undefined;
49
+ this.historyYXmlFragment = undefined;
50
+ }
51
+ getFragmentContent(state, ytr) {
52
+ if (!this.historyYXmlFragment || !this.snapshot) {
53
+ return;
54
+ }
55
+ // before rendering, we are going to sanitize ops and split deleted ops
56
+ // if they were deleted by seperate users.
57
+ const pud = undefined;
58
+ // pluginState.permanentUserData;
59
+ if (pud) {
60
+ pud.dss.forEach((ds) => {
61
+ Y.iterateDeletedStructs(ytr, ds, (_item) => { });
62
+ });
63
+ }
64
+ const computeYChange = (type, id) => {
65
+ const user = pud
66
+ ? (type === 'added'
67
+ ? pud.getUserByClientId(id.client)
68
+ : pud.getUserByDeletedId(id))
69
+ : undefined;
70
+ return {
71
+ user,
72
+ type,
73
+ };
74
+ };
75
+ const deleteSet = this.prevSnapshot
76
+ ? this.prevSnapshot.ds
77
+ : Y.emptySnapshot.ds;
78
+ // Create document fragment and render
79
+ const fragmentContent = Y.typeListToArraySnapshot(this.historyYXmlFragment, new Y.Snapshot(deleteSet, this.snapshot.sv)).map((t) => {
80
+ if (!t._item.deleted || isVisible(t._item, this.snapshot) ||
81
+ isVisible(t._item, this.prevSnapshot)) {
82
+ return createNodeFromYElement(t, state.schema, { mapping: new Map(), isOverlappingMark: new Map() }, this.snapshot, this.prevSnapshot, computeYChange);
83
+ }
84
+ else {
85
+ // No need to render elements that are not visible by either snapshot.
86
+ // If a client adds and deletes content in the same snapshot the element is not visible by either snapshot.
87
+ return null;
88
+ }
89
+ }).filter((n) => n !== null);
90
+ return fragmentContent;
91
+ }
92
+ getHistoryDoc() {
93
+ return this.historyDoc;
94
+ }
95
+ }
96
+ //# sourceMappingURL=DiffViewer.js.map
package/esm/binding/DiffViewer.js.map ADDED
@@ -0,0 +1 @@
1
+ {"version":3,"file":"DiffViewer.js","sourceRoot":"","sources":["../../src/binding/DiffViewer.ts"],"names":[],"mappings":"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"}
package/esm/binding/PmYjsBinding.d.ts CHANGED
@@ -5,6 +5,7 @@ import { User } from '@kerebron/editor/user';
5
5
  import { CreateYjsProvider } from '../YjsProvider.js';
6
6
  import { ProsemirrorMapping } from '../lib.js';
7
7
  import { SelectionStash } from '../ui/selection.js';
8
+ import { DiffViewer } from './DiffViewer.js';
8
9
  type Mutex = (f: () => void, g?: () => void) => void;
9
10
  export declare const createMutex: () => Mutex;
10
11
  export type YjsData = {
@@ -17,6 +18,7 @@ export declare class PmYjsBinding extends EventTarget {
17
18
  private connectionState;
18
19
  private yjs;
19
20
  private selectionStash;
21
+ readonly diffViewer: DiffViewer;
20
22
  addToYjsHistory: boolean;
21
23
  private hasImported;
22
24
  private mux;
@@ -36,6 +38,8 @@ export declare class PmYjsBinding extends EventTarget {
36
38
  getYjs(): YjsData | undefined;
37
39
  getMapping(): ProsemirrorMapping;
38
40
  getSelectionStash(): SelectionStash | undefined;
41
+ isEditable(): boolean;
42
+ setSnapshot(snapshot: Uint8Array<ArrayBufferLike>, prevSnapshot: Uint8Array<ArrayBufferLike> | undefined): void;
39
43
  }
40
44
  export {};
41
45
  //# sourceMappingURL=PmYjsBinding.d.ts.map
package/esm/binding/PmYjsBinding.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"PmYjsBinding.d.ts","sourceRoot":"","sources":["../../src/binding/PmYjsBinding.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,KAAK,CAAC;AAGzB,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAEhD,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,IAAI,EAAE,MAAM,uBAAuB,CAAC;AAE7C,OAAO,EAAE,iBAAiB,EAAe,MAAM,mBAAmB,CAAC;AACnE,OAAO,EAAE,kBAAkB,EAAE,MAAM,WAAW,CAAC;AAC/C,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAQpD,KAAK,KAAK,GAAG,CAAC,CAAC,EAAE,MAAM,IAAI,EAAE,CAAC,CAAC,EAAE,MAAM,IAAI,KAAK,IAAI,CAAC;AAErD,eAAO,MAAM,WAAW,QAAO,KAc9B,CAAC;AAIF,MAAM,MAAM,OAAO,GAAG;IAAE,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC;IAAC,WAAW,EAAE,CAAC,CAAC,WAAW,CAAA;CAAE,CAAC;AAElE,qBAAa,YAAa,SAAQ,WAAW;IAsB/B,OAAO,CAAC,QAAQ,CAAC,MAAM;IArBnC,OAAO,CAAC,QAAQ,CAA0B;IAC1C,OAAO,CAAC,eAAe,CAA2B;IAElD,OAAO,CAAC,GAAG,CAAsB;IACjC,OAAO,CAAC,cAAc,CAA6B;IAE5C,eAAe,UAAQ;IAC9B,OAAO,CAAC,WAAW,CAAS;IAC5B,OAAO,CAAC,GAAG,CAAQ;IACnB,OAAO,CAAC,eAAe,CAAkB;IAEzC,OAAO,CAAC,aAAa,CAIX;IACV,OAAO,CAAC,gBAAgB,CAGd;gBAEmB,MAAM,EAAE,UAAU;IAyB/C,OAAO;IAOP,UAAU,CAAC,IAAI,EAAE,IAAI;IAOrB,UAAU,CACR,MAAM,EAAE,MAAM,EACd,iBAAiB,EAAE,iBAAiB,EACpC,EAAE,EAAE,WAAW;IAkCjB,SAAS,CAAC,EAAE,EAAE,WAAW;IAsBzB,gBAAgB;IAiBhB,WAAW,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC,WAAW;IAoD5D,SAAS;IA6BT,qBAAqB,CAAC,GAAG,EAAE,OAAO;IAYlC,oBAAoB,CAAC,YAAY,EAAE,CAAC,CAAC,WAAW;IAkBhD,MAAM,IAAI,OAAO,GAAG,SAAS;IAI7B,UAAU,IAAI,kBAAkB;IAIhC,iBAAiB,IAAI,cAAc,GAAG,SAAS;CAGhD"}
1
+ {"version":3,"file":"PmYjsBinding.d.ts","sourceRoot":"","sources":["../../src/binding/PmYjsBinding.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,KAAK,CAAC;AAGzB,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAEhD,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,IAAI,EAAE,MAAM,uBAAuB,CAAC;AAE7C,OAAO,EAAE,iBAAiB,EAAe,MAAM,mBAAmB,CAAC;AACnE,OAAO,EAAE,kBAAkB,EAAE,MAAM,WAAW,CAAC;AAC/C,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAOpD,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAE7C,KAAK,KAAK,GAAG,CAAC,CAAC,EAAE,MAAM,IAAI,EAAE,CAAC,CAAC,EAAE,MAAM,IAAI,KAAK,IAAI,CAAC;AAErD,eAAO,MAAM,WAAW,QAAO,KAc9B,CAAC;AAIF,MAAM,MAAM,OAAO,GAAG;IAAE,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC;IAAC,WAAW,EAAE,CAAC,CAAC,WAAW,CAAA;CAAE,CAAC;AAElE,qBAAa,YAAa,SAAQ,WAAW;IAuB/B,OAAO,CAAC,QAAQ,CAAC,MAAM;IAtBnC,OAAO,CAAC,QAAQ,CAA0B;IAC1C,OAAO,CAAC,eAAe,CAA2B;IAElD,OAAO,CAAC,GAAG,CAAsB;IACjC,OAAO,CAAC,cAAc,CAA6B;IACnD,SAAgB,UAAU,EAAE,UAAU,CAAC;IAEhC,eAAe,UAAQ;IAC9B,OAAO,CAAC,WAAW,CAAS;IAC5B,OAAO,CAAC,GAAG,CAAQ;IACnB,OAAO,CAAC,eAAe,CAAkB;IAEzC,OAAO,CAAC,aAAa,CAIX;IACV,OAAO,CAAC,gBAAgB,CAGd;gBAEmB,MAAM,EAAE,UAAU;IA0B/C,OAAO;IASP,UAAU,CAAC,IAAI,EAAE,IAAI;IAOrB,UAAU,CACR,MAAM,EAAE,MAAM,EACd,iBAAiB,EAAE,iBAAiB,EACpC,EAAE,EAAE,WAAW;IAqCjB,SAAS,CAAC,EAAE,EAAE,WAAW;IA0BzB,gBAAgB;IAiBhB,WAAW,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC,WAAW;IAmD5D,SAAS;IAiCT,qBAAqB,CAAC,GAAG,EAAE,OAAO;IAYlC,oBAAoB,CAAC,YAAY,EAAE,CAAC,CAAC,WAAW;IAkBhD,MAAM,IAAI,OAAO,GAAG,SAAS;IAI7B,UAAU,IAAI,kBAAkB;IAIhC,iBAAiB,IAAI,cAAc,GAAG,SAAS;IAI/C,UAAU;IAIV,WAAW,CACT,QAAQ,EAAE,UAAU,CAAC,eAAe,CAAC,EACrC,YAAY,EAAE,UAAU,CAAC,eAAe,CAAC,GAAG,SAAS;CAsCxD"}
package/esm/binding/PmYjsBinding.js CHANGED
@@ -5,6 +5,7 @@ import { ySyncPluginKey } from '../keys.js';
5
5
  import { yXmlFragmentToProseMirrorRootNode } from './convertUtils.js';
6
6
  import { updateYFragment } from './updateYFragment.js';
7
7
  import { createNodeIfNotExists } from './createNodeFromYElement.js';
8
+ import { DiffViewer } from './DiffViewer.js';
8
9
  export const createMutex = () => {
9
10
  let token = true;
10
11
  return (f, g) => {
@@ -28,6 +29,7 @@ export class PmYjsBinding extends EventTarget {
28
29
  connectionState = 'idle';
29
30
  yjs;
30
31
  selectionStash;
32
+ diffViewer;
31
33
  addToYjsHistory = true;
32
34
  hasImported = false;
33
35
  mux;
@@ -37,6 +39,7 @@ export class PmYjsBinding extends EventTarget {
37
39
  constructor(editor) {
38
40
  super();
39
41
  this.editor = editor;
42
+ this.diffViewer = new DiffViewer();
40
43
  this.bindingMetadata = { mapping: new Map(), isOverlappingMark: new Map() };
41
44
  this.mux = createMutex();
42
45
  this.syncedHandler = (event) => {
@@ -57,6 +60,8 @@ export class PmYjsBinding extends EventTarget {
57
60
  const tr = this.editor.state.tr;
58
61
  this.leaveRoom(tr);
59
62
  this.editor.dispatchTransaction(tr);
63
+ this.diffViewer.reset();
64
+ this.selectionStash?.destroy();
60
65
  }
61
66
  changeUser(user) {
62
67
  if (!this.provider) {
@@ -65,18 +70,19 @@ export class PmYjsBinding extends EventTarget {
65
70
  this.provider.awareness.setLocalStateField('kerebron:user', user);
66
71
  }
67
72
  changeRoom(roomId, createYjsProvider, tr) {
73
+ this.connectionState = 'joining';
74
+ this.hasImported = false;
68
75
  if (this.provider) {
69
76
  this.provider.removeEventListener('synced', this.syncedHandler);
70
77
  this.provider.destroy();
71
- this.hasImported = false;
72
78
  this.provider = undefined;
73
79
  }
74
- this.addToYjsHistory = true;
75
- this.connectionState = 'joining';
76
80
  const [provider, ydoc] = createYjsProvider(roomId);
81
+ this.addToYjsHistory = true;
82
+ this.provider = provider;
77
83
  this.bindingMetadata.mapping.clear();
78
84
  this.bindingMetadata.isOverlappingMark.clear();
79
- this.provider = provider;
85
+ this.diffViewer.reset();
80
86
  const fieldName = 'kerebron:' + this.editor.schema.topNodeType.name;
81
87
  this.yjs = { ydoc, xmlFragment: ydoc.getXmlFragment(fieldName) };
82
88
  this.selectionStash = new SelectionStash(this.yjs, this.getMapping(), this.editor);
@@ -93,6 +99,9 @@ export class PmYjsBinding extends EventTarget {
93
99
  }
94
100
  this.addToYjsHistory = true;
95
101
  this.provider = undefined;
102
+ this.bindingMetadata.mapping.clear();
103
+ this.bindingMetadata.isOverlappingMark.clear();
104
+ this.diffViewer.reset();
96
105
  this.selectionStash?.destroy();
97
106
  this.selectionStash = undefined;
98
107
  this.yjs?.xmlFragment.unobserveDeep(this._observeFunction);
@@ -121,9 +130,11 @@ export class PmYjsBinding extends EventTarget {
121
130
  if (!this.yjs) {
122
131
  return;
123
132
  }
133
+ if (this.diffViewer.isActive()) {
134
+ return;
135
+ }
124
136
  const state = this.editor.state;
125
137
  const { xmlFragment } = this.yjs;
126
- // TODO handleSnapShot
127
138
  const mapping = this.bindingMetadata.mapping;
128
139
  const delType = (_, type) => mapping.delete(type);
129
140
  Y.iterateDeletedStructs(ytr, ytr.deleteSet, (struct) => {
@@ -136,10 +147,6 @@ export class PmYjsBinding extends EventTarget {
136
147
  ytr.changedParentTypes.forEach(delType);
137
148
  const fragmentContent = xmlFragment.toArray().map((t) => createNodeIfNotExists(t, state.schema, this.bindingMetadata)).filter((n) => n !== null);
138
149
  const tr = state.tr;
139
- if (ytr.origin instanceof Y.UndoManager) {
140
- }
141
- else {
142
- }
143
150
  tr.setMeta('addToYjsHistory', false);
144
151
  tr.replace(0, state.doc.content.size, new Slice(Fragment.from(fragmentContent), 0, 0));
145
152
  this.selectionStash?.restore(tr);
@@ -153,6 +160,9 @@ export class PmYjsBinding extends EventTarget {
153
160
  if (!this.yjs) {
154
161
  return;
155
162
  }
163
+ if (this.diffViewer.isActive()) {
164
+ return;
165
+ }
156
166
  const doc = this.editor.state.doc;
157
167
  const { ydoc, xmlFragment } = this.yjs;
158
168
  this.mux(() => {
@@ -186,5 +196,35 @@ export class PmYjsBinding extends EventTarget {
186
196
  getSelectionStash() {
187
197
  return this.selectionStash;
188
198
  }
199
+ isEditable() {
200
+ return !this.diffViewer.isActive();
201
+ }
202
+ setSnapshot(snapshot, prevSnapshot) {
203
+ if (!this.yjs) {
204
+ return;
205
+ }
206
+ this.diffViewer.setSnapshot(this.yjs, snapshot, prevSnapshot);
207
+ // clear mapping because we are going to rerender
208
+ this.bindingMetadata.mapping.clear();
209
+ this.bindingMetadata.isOverlappingMark.clear();
210
+ this.mux(() => {
211
+ const historyDoc = this.diffViewer.getHistoryDoc();
212
+ if (!historyDoc) {
213
+ return;
214
+ }
215
+ historyDoc.transact((ytr) => {
216
+ const state = this.editor.state;
217
+ const fragmentContent = this.diffViewer.getFragmentContent(state, ytr);
218
+ if (!fragmentContent) {
219
+ return;
220
+ }
221
+ const tr = state.tr;
222
+ tr.replace(0, state.doc.content.size, new Slice(Fragment.from(fragmentContent), 0, 0));
223
+ tr.setMeta('addToHistory', false);
224
+ tr.setMeta(ySyncPluginKey, { isChangeOrigin: true }),
225
+ this.editor.dispatchTransaction(tr);
226
+ }, ySyncPluginKey);
227
+ });
228
+ }
189
229
  }
190
230
  //# sourceMappingURL=PmYjsBinding.js.map