@kerebron/extension-yjs 0.7.4 → 0.7.6
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.
- package/esm/binding/DiffViewer.d.ts +1 -1
- package/esm/binding/DiffViewer.d.ts.map +1 -1
- package/esm/binding/DiffViewer.js +6 -7
- package/esm/binding/DiffViewer.js.map +1 -1
- package/esm/binding/PmYjsBinding.d.ts +2 -0
- package/esm/binding/PmYjsBinding.d.ts.map +1 -1
- package/esm/binding/PmYjsBinding.js +17 -1
- package/esm/binding/PmYjsBinding.js.map +1 -1
- package/esm/binding/updateYFragment.d.ts.map +1 -1
- package/esm/binding/updateYFragment.js +3 -2
- package/esm/binding/updateYFragment.js.map +1 -1
- package/package.json +3 -3
- package/src/binding/DiffViewer.ts +6 -6
- package/src/binding/PmYjsBinding.ts +24 -1
- package/src/binding/updateYFragment.ts +4 -3
|
@@ -11,7 +11,7 @@ export declare class DiffViewer {
|
|
|
11
11
|
isActive(): boolean;
|
|
12
12
|
setSnapshot(yjs: YjsData, uSnapshot: Uint8Array, uPrevSnapshot?: Uint8Array): void;
|
|
13
13
|
reset(): void;
|
|
14
|
-
getFragmentContent(state: EditorState, ytr: Y.Transaction): Node[] | undefined;
|
|
14
|
+
getFragmentContent(state: EditorState, ytr: Y.Transaction, permanentUserData?: Y.PermanentUserData): Node[] | undefined;
|
|
15
15
|
getHistoryDoc(): Y.Doc | undefined;
|
|
16
16
|
}
|
|
17
17
|
//# sourceMappingURL=DiffViewer.d.ts.map
|
|
@@ -1 +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,
|
|
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,EAClB,iBAAiB,CAAC,EAAE,CAAC,CAAC,iBAAiB,GACtC,IAAI,EAAE,GAAG,SAAS;IAwDrB,aAAa,IAAI,CAAC,CAAC,GAAG,GAAG,SAAS;CAGnC"}
|
|
@@ -48,24 +48,23 @@ export class DiffViewer {
|
|
|
48
48
|
this.historyDoc = undefined;
|
|
49
49
|
this.historyYXmlFragment = undefined;
|
|
50
50
|
}
|
|
51
|
-
getFragmentContent(state, ytr) {
|
|
51
|
+
getFragmentContent(state, ytr, permanentUserData) {
|
|
52
52
|
if (!this.historyYXmlFragment || !this.snapshot) {
|
|
53
53
|
return;
|
|
54
54
|
}
|
|
55
55
|
// before rendering, we are going to sanitize ops and split deleted ops
|
|
56
56
|
// if they were deleted by seperate users.
|
|
57
|
-
const pud = undefined;
|
|
58
57
|
// pluginState.permanentUserData;
|
|
59
|
-
if (
|
|
60
|
-
|
|
58
|
+
if (permanentUserData) {
|
|
59
|
+
permanentUserData.dss.forEach((ds) => {
|
|
61
60
|
Y.iterateDeletedStructs(ytr, ds, (_item) => { });
|
|
62
61
|
});
|
|
63
62
|
}
|
|
64
63
|
const computeYChange = (type, id) => {
|
|
65
|
-
const user =
|
|
64
|
+
const user = permanentUserData
|
|
66
65
|
? (type === 'added'
|
|
67
|
-
?
|
|
68
|
-
:
|
|
66
|
+
? permanentUserData.getUserByClientId(id.client)
|
|
67
|
+
: permanentUserData.getUserByDeletedId(id))
|
|
69
68
|
: undefined;
|
|
70
69
|
return {
|
|
71
70
|
user,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DiffViewer.js","sourceRoot":"","sources":["../../src/binding/DiffViewer.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,KAAK,CAAC;AAKzB,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAExC,OAAO,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AAErE,MAAM,OAAO,UAAU;IACrB,YAAY,CAAc;IAC1B,QAAQ,CAAc;IAEd,mBAAmB,CAA4B;IAC/C,UAAU,CAAoB;IAEtC;IACA,CAAC;IAED,QAAQ;QACN,OAAO,CAAC,CAAC,IAAI,CAAC,QAAQ,IAAI,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC;IAChD,CAAC;IAED,WAAW,CAAC,GAAY,EAAE,SAAqB,EAAE,aAA0B;QACzE,IAAI,CAAC,YAAY,GAAG,SAAS,CAAC;QAC9B,IAAI,aAAa,EAAE,CAAC;YAClB,IAAI,CAAC,YAAY,GAAG,CAAC,CAAC,gBAAgB,CAAC,aAAa,CAAC,CAAC;QACxD,CAAC;QAED,IAAI,CAAC,QAAQ,GAAG,CAAC,CAAC,gBAAgB,CAAC,SAAS,CAAC,CAAC;QAE9C,IAAI,CAAC,UAAU,GAAG,CAAC,CAAC,qBAAqB,CACvC,GAAG,CAAC,IAAI,EACR,IAAI,CAAC,QAAQ,EACb,IAAI,CAAC,CAAC,GAAG,CAAC,EAAE,EAAE,EAAE,KAAK,EAAE,CAAC,CACzB,CAAC;QAEF,IAAI,GAAG,CAAC,WAAW,CAAC,KAAK,KAAK,IAAI,EAAE,CAAC;YACnC;;;eAGG;YACH,MAAM,KAAK,GAA+C,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC;YACzE,MAAM,OAAO,GAAG,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,CAC3C,CAAC,GAAG,EAAE,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,GAAG,CAAC,WAAkC,CACnE,CAAC;YACF,IAAI,CAAC,mBAAmB,GAAG,IAAI,CAAC,UAAU,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;QACrE,CAAC;aAAM,CAAC;YACN;;eAEG;YACH,MAAM,cAAc,GAClB,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,WAAW,CAAC,KAAK,CAAC,EAAE,CAAC,MAAM,CAAC;gBAChE,EAAE,CAAC;YACP,MAAM,SAAS,GAAG,CAAC,CAAC,WAAW,CAC7B,cAAc,EACd,GAAG,CAAC,WAAW,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAC/B,CAAC;YACF,IAAI,cAAc,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC,EAAE,EAAE,CAAC;gBAC9C,MAAM,IAAI,KAAK,CAAC,qBAAqB,CAAC,CAAC;YACzC,CAAC;YACD,MAAM,IAAI,GAAW,cAAc,CAAC,SAAS,CAAC,CAAC;YAC/C,MAAM,OAAO,GAAkB,IAAI,CAAC,OAAO,CAAC;YAC5C,IAAI,CAAC,mBAAmB,GAAG,OAAO,CAAC,IAAqB,CAAC;QAC3D,CAAC;IACH,CAAC;IAED,KAAK;QACH,IAAI,CAAC,QAAQ,GAAG,SAAS,CAAC;QAC1B,IAAI,CAAC,YAAY,GAAG,SAAS,CAAC;QAC9B,IAAI,CAAC,UAAU,GAAG,SAAS,CAAC;QAC5B,IAAI,CAAC,mBAAmB,GAAG,SAAS,CAAC;IACvC,CAAC;IAED,kBAAkB,CAChB,KAAkB,EAClB,GAAkB;
|
|
1
|
+
{"version":3,"file":"DiffViewer.js","sourceRoot":"","sources":["../../src/binding/DiffViewer.ts"],"names":[],"mappings":"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"}
|
|
@@ -25,6 +25,8 @@ export declare class PmYjsBinding extends EventTarget {
|
|
|
25
25
|
private bindingMetadata;
|
|
26
26
|
private syncedHandler;
|
|
27
27
|
private _observeFunction;
|
|
28
|
+
private permanentUserData;
|
|
29
|
+
private user;
|
|
28
30
|
constructor(editor: CoreEditor);
|
|
29
31
|
destroy(): void;
|
|
30
32
|
changeUser(user: User): void;
|
|
@@ -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;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;
|
|
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;IAyB/B,OAAO,CAAC,QAAQ,CAAC,MAAM;IAxBnC,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;IACV,OAAO,CAAC,iBAAiB,CAAkC;IAC3D,OAAO,CAAC,IAAI,CAAmB;gBAEF,MAAM,EAAE,UAAU;IA0B/C,OAAO;IASP,UAAU,CAAC,IAAI,EAAE,IAAI;IAerB,UAAU,CACR,MAAM,EAAE,MAAM,EACd,iBAAiB,EAAE,iBAAiB,EACpC,EAAE,EAAE,WAAW;IA0CjB,SAAS,CAAC,EAAE,EAAE,WAAW;IA2BzB,gBAAgB;IAoBhB,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;CA0CxD"}
|
|
@@ -36,6 +36,8 @@ export class PmYjsBinding extends EventTarget {
|
|
|
36
36
|
bindingMetadata;
|
|
37
37
|
syncedHandler;
|
|
38
38
|
_observeFunction;
|
|
39
|
+
permanentUserData;
|
|
40
|
+
user;
|
|
39
41
|
constructor(editor) {
|
|
40
42
|
super();
|
|
41
43
|
this.editor = editor;
|
|
@@ -64,9 +66,15 @@ export class PmYjsBinding extends EventTarget {
|
|
|
64
66
|
this.selectionStash?.destroy();
|
|
65
67
|
}
|
|
66
68
|
changeUser(user) {
|
|
69
|
+
this.user = user;
|
|
67
70
|
if (!this.provider) {
|
|
68
71
|
return;
|
|
69
72
|
}
|
|
73
|
+
if (this.yjs && user.id) {
|
|
74
|
+
const { ydoc } = this.yjs;
|
|
75
|
+
this.permanentUserData = new Y.PermanentUserData(ydoc);
|
|
76
|
+
this.permanentUserData.setUserMapping(ydoc, ydoc.clientID, user.id);
|
|
77
|
+
}
|
|
70
78
|
this.provider.awareness.setLocalStateField('kerebron:user', user);
|
|
71
79
|
}
|
|
72
80
|
changeRoom(roomId, createYjsProvider, tr) {
|
|
@@ -85,6 +93,10 @@ export class PmYjsBinding extends EventTarget {
|
|
|
85
93
|
this.diffViewer.reset();
|
|
86
94
|
const fieldName = 'kerebron:' + this.editor.schema.topNodeType.name;
|
|
87
95
|
this.yjs = { ydoc, xmlFragment: ydoc.getXmlFragment(fieldName) };
|
|
96
|
+
this.permanentUserData = new Y.PermanentUserData(ydoc);
|
|
97
|
+
if (this.user?.id) {
|
|
98
|
+
this.permanentUserData.setUserMapping(ydoc, ydoc.clientID, this.user.id);
|
|
99
|
+
}
|
|
88
100
|
this.selectionStash = new SelectionStash(this.yjs, this.getMapping(), this.editor);
|
|
89
101
|
this.yjs.xmlFragment.observeDeep(this._observeFunction);
|
|
90
102
|
this.provider.addEventListener('synced', this.syncedHandler);
|
|
@@ -106,6 +118,7 @@ export class PmYjsBinding extends EventTarget {
|
|
|
106
118
|
this.selectionStash = undefined;
|
|
107
119
|
this.yjs?.xmlFragment.unobserveDeep(this._observeFunction);
|
|
108
120
|
this.yjs = undefined;
|
|
121
|
+
this.permanentUserData = undefined;
|
|
109
122
|
this.hasImported = false;
|
|
110
123
|
tr.setMeta('addToYjsHistory', false);
|
|
111
124
|
tr.setMeta('yjs:removeAwareness', true);
|
|
@@ -115,6 +128,9 @@ export class PmYjsBinding extends EventTarget {
|
|
|
115
128
|
if (!this.yjs) {
|
|
116
129
|
return;
|
|
117
130
|
}
|
|
131
|
+
if (this.diffViewer.isActive()) {
|
|
132
|
+
return;
|
|
133
|
+
}
|
|
118
134
|
this.addToYjsHistory = this.editor.state.doc.content.size > 2; // Non empty para
|
|
119
135
|
if (this.yjs.xmlFragment.length === 0) {
|
|
120
136
|
this.createFromProseMirror(this.yjs);
|
|
@@ -214,7 +230,7 @@ export class PmYjsBinding extends EventTarget {
|
|
|
214
230
|
}
|
|
215
231
|
historyDoc.transact((ytr) => {
|
|
216
232
|
const state = this.editor.state;
|
|
217
|
-
const fragmentContent = this.diffViewer.getFragmentContent(state, ytr);
|
|
233
|
+
const fragmentContent = this.diffViewer.getFragmentContent(state, ytr, this.permanentUserData);
|
|
218
234
|
if (!fragmentContent) {
|
|
219
235
|
return;
|
|
220
236
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PmYjsBinding.js","sourceRoot":"","sources":["../../src/binding/PmYjsBinding.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,KAAK,CAAC;AAEzB,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAQpD,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAE5C,OAAO,EAAE,iCAAiC,EAAE,MAAM,mBAAmB,CAAC;AACtE,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAEvD,OAAO,EAAE,qBAAqB,EAAE,MAAM,6BAA6B,CAAC;AACpE,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAI7C,MAAM,CAAC,MAAM,WAAW,GAAG,GAAU,EAAE;IACrC,IAAI,KAAK,GAAG,IAAI,CAAC;IACjB,OAAO,CAAC,CAAa,EAAE,CAAc,EAAE,EAAE;QACvC,IAAI,KAAK,EAAE,CAAC;YACV,KAAK,GAAG,KAAK,CAAC;YACd,IAAI,CAAC;gBACH,CAAC,EAAE,CAAC;YACN,CAAC;oBAAS,CAAC;gBACT,KAAK,GAAG,IAAI,CAAC;YACf,CAAC;QACH,CAAC;aAAM,IAAI,CAAC,KAAK,SAAS,EAAE,CAAC;YAC3B,CAAC,EAAE,CAAC;QACN,CAAC;IACH,CAAC,CAAC;AACJ,CAAC,CAAC;AAMF,MAAM,OAAO,YAAa,SAAQ,WAAW;
|
|
1
|
+
{"version":3,"file":"PmYjsBinding.js","sourceRoot":"","sources":["../../src/binding/PmYjsBinding.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"updateYFragment.d.ts","sourceRoot":"","sources":["../../src/binding/updateYFragment.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,KAAK,CAAC;AAEzB,OAAO,EAAQ,IAAI,
|
|
1
|
+
{"version":3,"file":"updateYFragment.d.ts","sourceRoot":"","sources":["../../src/binding/updateYFragment.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,KAAK,CAAC;AAEzB,OAAO,EAAQ,IAAI,EAAE,MAAM,mBAAmB,CAAC;AAM/C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAC5D,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AAGzC,eAAO,MAAM,cAAc,GAAI,UAAU,MAAM,WACM,CAAC;AAiQtD;;;;;;;GAOG;AACH,eAAO,MAAM,eAAe,GAC1B,MAAM;IAAE,QAAQ,EAAE,YAAY,CAAC,IAAI,CAAC,CAAA;CAAE,EACtC,cAAc,CAAC,CAAC,WAAW,EAC3B,OAAO,IAAI,EACX,MAAM,eAAe,EACrB,kBAAkB,OAAO,SAmK1B,CAAC"}
|
|
@@ -259,8 +259,9 @@ export const updateYFragment = (ydoc, yDomFragment, pNode, meta, addToYjsHistory
|
|
|
259
259
|
}
|
|
260
260
|
}
|
|
261
261
|
ydoc.transact((ytr) => {
|
|
262
|
-
ytr
|
|
263
|
-
|
|
262
|
+
if (ytr) {
|
|
263
|
+
ytr.meta.set('addToYjsHistory', addToYjsHistory);
|
|
264
|
+
}
|
|
264
265
|
// try to compare and update
|
|
265
266
|
while (yChildCnt - left - right > 0 && pChildCnt - left - right > 0) {
|
|
266
267
|
const leftY = yChildren[left];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"updateYFragment.js","sourceRoot":"","sources":["../../src/binding/updateYFragment.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"updateYFragment.js","sourceRoot":"","sources":["../../src/binding/updateYFragment.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@kerebron/extension-yjs",
|
|
3
|
-
"version": "0.7.
|
|
3
|
+
"version": "0.7.6",
|
|
4
4
|
"license": "MIT",
|
|
5
5
|
"module": "./esm/ExtensionYjs.js",
|
|
6
6
|
"exports": {
|
|
@@ -26,8 +26,8 @@
|
|
|
26
26
|
"src"
|
|
27
27
|
],
|
|
28
28
|
"dependencies": {
|
|
29
|
-
"@kerebron/editor": "0.7.
|
|
30
|
-
"@kerebron/extension-basic-editor": "0.7.
|
|
29
|
+
"@kerebron/editor": "0.7.6",
|
|
30
|
+
"@kerebron/extension-basic-editor": "0.7.6",
|
|
31
31
|
"lib0": "0.2.109",
|
|
32
32
|
"prosemirror-model": "1.25.3",
|
|
33
33
|
"prosemirror-state": "1.4.3",
|
|
@@ -75,6 +75,7 @@ export class DiffViewer {
|
|
|
75
75
|
getFragmentContent(
|
|
76
76
|
state: EditorState,
|
|
77
77
|
ytr: Y.Transaction,
|
|
78
|
+
permanentUserData?: Y.PermanentUserData,
|
|
78
79
|
): Node[] | undefined {
|
|
79
80
|
if (!this.historyYXmlFragment || !this.snapshot) {
|
|
80
81
|
return;
|
|
@@ -82,18 +83,17 @@ export class DiffViewer {
|
|
|
82
83
|
|
|
83
84
|
// before rendering, we are going to sanitize ops and split deleted ops
|
|
84
85
|
// if they were deleted by seperate users.
|
|
85
|
-
const pud: Y.PermanentUserData | undefined = undefined;
|
|
86
86
|
// pluginState.permanentUserData;
|
|
87
|
-
if (
|
|
88
|
-
|
|
87
|
+
if (permanentUserData) {
|
|
88
|
+
permanentUserData.dss.forEach((ds) => {
|
|
89
89
|
Y.iterateDeletedStructs(ytr, ds, (_item) => {});
|
|
90
90
|
});
|
|
91
91
|
}
|
|
92
92
|
const computeYChange = (type: 'removed' | 'added', id: Y.ID) => {
|
|
93
|
-
const user =
|
|
93
|
+
const user = permanentUserData
|
|
94
94
|
? (type === 'added'
|
|
95
|
-
?
|
|
96
|
-
:
|
|
95
|
+
? permanentUserData.getUserByClientId(id.client)
|
|
96
|
+
: permanentUserData.getUserByDeletedId(id))
|
|
97
97
|
: undefined;
|
|
98
98
|
return {
|
|
99
99
|
user,
|
|
@@ -61,6 +61,8 @@ export class PmYjsBinding extends EventTarget {
|
|
|
61
61
|
events: Array<Y.YEvent<any>>,
|
|
62
62
|
transaction: Y.Transaction,
|
|
63
63
|
) => void;
|
|
64
|
+
private permanentUserData: Y.PermanentUserData | undefined;
|
|
65
|
+
private user: User | undefined;
|
|
64
66
|
|
|
65
67
|
constructor(private readonly editor: CoreEditor) {
|
|
66
68
|
super();
|
|
@@ -98,9 +100,17 @@ export class PmYjsBinding extends EventTarget {
|
|
|
98
100
|
}
|
|
99
101
|
|
|
100
102
|
changeUser(user: User) {
|
|
103
|
+
this.user = user;
|
|
101
104
|
if (!this.provider) {
|
|
102
105
|
return;
|
|
103
106
|
}
|
|
107
|
+
|
|
108
|
+
if (this.yjs && user.id) {
|
|
109
|
+
const { ydoc } = this.yjs;
|
|
110
|
+
this.permanentUserData = new Y.PermanentUserData(ydoc);
|
|
111
|
+
this.permanentUserData.setUserMapping(ydoc, ydoc.clientID, user.id);
|
|
112
|
+
}
|
|
113
|
+
|
|
104
114
|
this.provider.awareness.setLocalStateField('kerebron:user', user);
|
|
105
115
|
}
|
|
106
116
|
|
|
@@ -131,6 +141,11 @@ export class PmYjsBinding extends EventTarget {
|
|
|
131
141
|
|
|
132
142
|
const fieldName = 'kerebron:' + this.editor.schema.topNodeType.name;
|
|
133
143
|
this.yjs = { ydoc, xmlFragment: ydoc.getXmlFragment(fieldName) };
|
|
144
|
+
this.permanentUserData = new Y.PermanentUserData(ydoc);
|
|
145
|
+
if (this.user?.id) {
|
|
146
|
+
this.permanentUserData.setUserMapping(ydoc, ydoc.clientID, this.user.id);
|
|
147
|
+
}
|
|
148
|
+
|
|
134
149
|
this.selectionStash = new SelectionStash(
|
|
135
150
|
this.yjs,
|
|
136
151
|
this.getMapping(),
|
|
@@ -162,6 +177,7 @@ export class PmYjsBinding extends EventTarget {
|
|
|
162
177
|
this.selectionStash = undefined;
|
|
163
178
|
this.yjs?.xmlFragment.unobserveDeep(this._observeFunction);
|
|
164
179
|
this.yjs = undefined;
|
|
180
|
+
this.permanentUserData = undefined;
|
|
165
181
|
|
|
166
182
|
this.hasImported = false;
|
|
167
183
|
|
|
@@ -174,6 +190,9 @@ export class PmYjsBinding extends EventTarget {
|
|
|
174
190
|
if (!this.yjs) {
|
|
175
191
|
return;
|
|
176
192
|
}
|
|
193
|
+
if (this.diffViewer.isActive()) {
|
|
194
|
+
return;
|
|
195
|
+
}
|
|
177
196
|
|
|
178
197
|
this.addToYjsHistory = this.editor.state.doc.content.size > 2; // Non empty para
|
|
179
198
|
|
|
@@ -338,7 +357,11 @@ export class PmYjsBinding extends EventTarget {
|
|
|
338
357
|
|
|
339
358
|
historyDoc.transact((ytr) => {
|
|
340
359
|
const state = this.editor.state;
|
|
341
|
-
const fragmentContent = this.diffViewer.getFragmentContent(
|
|
360
|
+
const fragmentContent = this.diffViewer.getFragmentContent(
|
|
361
|
+
state,
|
|
362
|
+
ytr,
|
|
363
|
+
this.permanentUserData,
|
|
364
|
+
);
|
|
342
365
|
|
|
343
366
|
if (!fragmentContent) {
|
|
344
367
|
return;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import * as Y from 'yjs';
|
|
2
2
|
import * as PModel from 'prosemirror-model';
|
|
3
|
-
import { Mark, Node
|
|
3
|
+
import { Mark, Node } from 'prosemirror-model';
|
|
4
4
|
|
|
5
5
|
import { simpleDiff } from 'lib0/diff';
|
|
6
6
|
|
|
@@ -348,8 +348,9 @@ export const updateYFragment = (
|
|
|
348
348
|
}
|
|
349
349
|
}
|
|
350
350
|
ydoc.transact((ytr) => {
|
|
351
|
-
ytr
|
|
352
|
-
|
|
351
|
+
if (ytr) {
|
|
352
|
+
ytr.meta.set('addToYjsHistory', addToYjsHistory);
|
|
353
|
+
}
|
|
353
354
|
// try to compare and update
|
|
354
355
|
while (yChildCnt - left - right > 0 && pChildCnt - left - right > 0) {
|
|
355
356
|
const leftY: Y.XmlElement | Y.XmlText = yChildren[left];
|