@y/y 14.0.0-rc.20 → 14.0.0-rc.21
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/README.md +1 -1
- package/dist/src/utils/Doc.d.ts.map +1 -1
- package/dist/src/utils/Transaction.d.ts.map +1 -1
- package/dist/src/utils/YEvent.d.ts +1 -1
- package/dist/src/utils/transaction-helpers.d.ts +2 -2
- package/dist/src/utils/transaction-helpers.d.ts.map +1 -1
- package/dist/src/ytype.d.ts +96 -24
- package/dist/src/ytype.d.ts.map +1 -1
- package/package.json +3 -3
- package/src/utils/Doc.js +3 -0
- package/src/utils/Transaction.js +31 -19
- package/src/utils/YEvent.js +2 -2
- package/src/utils/transaction-helpers.js +15 -15
- package/src/ytype.js +327 -164
package/README.md
CHANGED
|
@@ -175,7 +175,7 @@ are implemented in separate modules.
|
|
|
175
175
|
| [Superdoc](https://superdoc.dev/) | ✔ | (native) | [demo](https://superdoc.dev/) |
|
|
176
176
|
| [valtio](https://github.com/pmndrs/valtio) | | [valtio-yjs](https://github.com/dai-shi/valtio-yjs) | [demo](https://codesandbox.io/s/valtio-yjs-demo-ox3iy) |
|
|
177
177
|
| [immer](https://github.com/immerjs/immer) | | [immer-yjs](https://github.com/sep2/immer-yjs) | [demo](https://codesandbox.io/s/immer-yjs-demo-6e0znb) |
|
|
178
|
-
| [mutative](https://github.com/unadlib/mutative) |
|
|
178
|
+
| [mutative](https://github.com/unadlib/mutative) | | [mutative-yjs](https://github.com/mutativejs/mutative-yjs) | [demo](https://codesandbox.io/p/sandbox/fjrwk3) |
|
|
179
179
|
| React | | [react-yjs](https://github.com/nikgraf/react-yjs) | [demo](https://react-yjs-example.vercel.app/) |
|
|
180
180
|
| React / Vue / Svelte / MobX | | [SyncedStore](https://syncedstore.org) | [demo](https://syncedstore.org/docs/react) |
|
|
181
181
|
| [mobx-keystone](https://mobx-keystone.js.org/) | | [mobx-keystone-yjs](https://github.com/xaviergonz/mobx-keystone/tree/master/packages/mobx-keystone-yjs) | [demo](https://mobx-keystone.js.org/examples/yjs-binding) |
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Doc.d.ts","sourceRoot":"","sources":["../../../src/utils/Doc.js"],"names":[],"mappings":"AAeA;;;;;;;;;;;;GAYG;AAEH;;;;;;;;;;;;;;GAcG;AAEH;;;GAGG;AACH;IACE;;OAEG;IACH,gGAFW,OAAO,EAwFjB;IApFC,YAAY;IACZ,iBAtCmB,IAAI,KAAE,OAAO,CAsCR;IACxB,iBAAqC;IACrC,aAAgB;IAChB,4BAAgC;IAChC,yBAAsC;IACtC,2BAAyC;IACzC;;OAEG;IACH,OAFU,GAAG,CAAC,MAAM,EAAE,KAAK,CAAC,CAEN;IACtB,mBAA8B;IAC9B;;OAEG;IACH,cAFU,WAAW,GAAG,IAAI,CAEJ;IACxB;;OAEG;IACH,sBAFU,KAAK,CAAC,WAAW,CAAC,CAEE;IAC9B;;OAEG;IACH,SAFU,GAAG,CAAC,GAAG,CAAC,CAEM;IACxB;;;OAGG;IACH,OAFU,IAAI,OAAC,CAEE;IACjB,oBAA4B;IAC5B,kBAAwB;IACxB,UAAgB;IAChB;;;;;OAKG;IACH,UAFU,OAAO,CAEI;IACrB;;;;;;OAMG;IACH,kBAAqB;IACrB,qBAAwB;IACxB;;OAEG;IACH,yBAKE;IAeE,yBAAwC;IAe9C;;;;;;OAMG;IACH,aAQC;IAED,uBAEC;IAED,8BAEC;IAED;;;;;;;;;;;OAWG;IACH,SANa,CAAC,KACH,CAAS,IAAW,EAAX,WAAW,KAAE,CAAC,WACvB,GAAG,UACH,OAAO,KAKjB;IAED;;;;;;;;;;;;;OAaG;IACH,UALW,MAAM,SACN,MAAM,OAAC,GAEN,KAAK,CAQhB;IAED;;;;;;;OAOG;IACH;;MASC;
|
|
1
|
+
{"version":3,"file":"Doc.d.ts","sourceRoot":"","sources":["../../../src/utils/Doc.js"],"names":[],"mappings":"AAeA;;;;;;;;;;;;GAYG;AAEH;;;;;;;;;;;;;;GAcG;AAEH;;;GAGG;AACH;IACE;;OAEG;IACH,gGAFW,OAAO,EAwFjB;IApFC,YAAY;IACZ,iBAtCmB,IAAI,KAAE,OAAO,CAsCR;IACxB,iBAAqC;IACrC,aAAgB;IAChB,4BAAgC;IAChC,yBAAsC;IACtC,2BAAyC;IACzC;;OAEG;IACH,OAFU,GAAG,CAAC,MAAM,EAAE,KAAK,CAAC,CAEN;IACtB,mBAA8B;IAC9B;;OAEG;IACH,cAFU,WAAW,GAAG,IAAI,CAEJ;IACxB;;OAEG;IACH,sBAFU,KAAK,CAAC,WAAW,CAAC,CAEE;IAC9B;;OAEG;IACH,SAFU,GAAG,CAAC,GAAG,CAAC,CAEM;IACxB;;;OAGG;IACH,OAFU,IAAI,OAAC,CAEE;IACjB,oBAA4B;IAC5B,kBAAwB;IACxB,UAAgB;IAChB;;;;;OAKG;IACH,UAFU,OAAO,CAEI;IACrB;;;;;;OAMG;IACH,kBAAqB;IACrB,qBAAwB;IACxB;;OAEG;IACH,yBAKE;IAeE,yBAAwC;IAe9C;;;;;;OAMG;IACH,aAQC;IAED,uBAEC;IAED,8BAEC;IAED;;;;;;;;;;;OAWG;IACH,SANa,CAAC,KACH,CAAS,IAAW,EAAX,WAAW,KAAE,CAAC,WACvB,GAAG,UACH,OAAO,KAKjB;IAED;;;;;;;;;;;;;OAaG;IACH,UALW,MAAM,SACN,MAAM,OAAC,GAEN,KAAK,CAQhB;IAED;;;;;;;OAOG;IACH;;MASC;IAiCH,yCAAmB;CAFlB;;;;;;;;;uBA1OsB,IAAI,KAAE,OAAO;;;;;;;;;;;;WAGtB,GAAG;;;;;;;;;;;;;;;;;aAUH,CAAS,IAAG,EAAH,GAAG,KAAE,IAAI;UAClB,CAAS,IAAG,EAAH,GAAG,KAAE,IAAI;UAClB,CAAS,IAAO,EAAP,OAAO,EAAE,IAAG,EAAH,GAAG,KAAE,IAAI;YAC3B,CAAS,IAAuB,EAAvB,UAAU,CAAC,WAAW,CAAC,EAAE,IAAG,EAAH,GAAG,EAAE,IAAG,EAAH,GAAG,EAAE,IAAW,EAAX,WAAW,KAAE,IAAI;cAC7D,CAAS,IAAuB,EAAvB,UAAU,CAAC,WAAW,CAAC,EAAE,IAAG,EAAH,GAAG,EAAE,IAAG,EAAH,GAAG,EAAE,IAAW,EAAX,WAAW,KAAE,IAAI;2BAC7D,CAAS,IAAG,EAAH,GAAG,KAAE,IAAI;uBAClB,CAAS,IAAW,EAAX,WAAW,EAAE,IAAG,EAAH,GAAG,KAAE,IAAI;yBAC/B,CAAS,IAAW,EAAX,WAAW,EAAE,IAAG,EAAH,GAAG,KAAE,IAAI;sBAC/B,CAAS,IAAW,EAAX,WAAW,EAAE,IAAG,EAAH,GAAG,KAAE,IAAI;6BAC/B,CAAS,IAAW,EAAX,WAAW,EAAE,IAAG,EAAH,GAAG,KAAE,IAAI;0BAC/B,CAAS,IAAG,EAAH,GAAG,EAAE,IAAkB,EAAlB,KAAK,CAAC,WAAW,CAAC,KAAE,IAAI;aACtC,CAAS,IAAwD,EAAxD;QAAE,MAAM,EAAE,GAAG,CAAC,GAAG,CAAC,CAAC;QAAC,KAAK,EAAE,GAAG,CAAC,GAAG,CAAC,CAAC;QAAC,OAAO,EAAE,GAAG,CAAC,GAAG,CAAC,CAAA;KAAE,EAAE,IAAG,EAAH,GAAG,EAAE,IAAW,EAAX,WAAW,KAAE,IAAI;;6BAtC1E,iBAAiB;sBAQxB,aAAa;4BAFP,kBAAkB"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Transaction.d.ts","sourceRoot":"","sources":["../../../src/utils/Transaction.js"],"names":[],"mappings":"AAiBA,uDAAgD;AAEhD;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH;IACE;;;;OAIG;IACH,iBAJW,GAAG,UACH,GAAG,SACH,OAAO,EA+EjB;IA5EC;;;OAGG;IACH,KAFU,GAAG,CAEC;IACd;;OAEG;IACH,oCAA8B;IAC9B;;;OAGG;IACH,mCAA6B;IAC7B;;OAEG;IACH,oCAA8B;IAC9B;;;OAGG;IACH,cAFU,GAAG,gBAAe,OAAC,CAEL;IACxB;;;OAGG;IACH,aAFU,GAAG,gBAAe,OAAC,CAEN;IACvB;;;;;OAKG;IACH,SAFU,GAAG,CAAC,KAAK,EAAC,GAAG,CAAC,SAAO,IAAI,CAAC,CAAC,CAEb;IACxB;;;;OAIG;IACH,oBAFU,GAAG,CAAC,KAAK,EAAC,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAEJ;IACnC;;OAEG;IACH,eAFU,KAAK,CAAC,cAAc,CAAC,CAER;IACvB;;OAEG;IACH,QAFU,GAAG,CAEO;IACpB;;;OAGG;IACH,MAFU,GAAG,CAAC,GAAG,EAAC,GAAG,CAAC,CAED;IACrB;;;OAGG;IACH,OAFU,OAAO,CAEC;IAClB;;OAEG;IACH,cAFU,GAAG,CAAC,GAAG,CAAC,CAEW;IAC7B;;OAEG;IACH,gBAFU,GAAG,CAAC,GAAG,CAAC,CAEa;IAC/B;;OAEG;IACH,eAFU,GAAG,CAAC,GAAG,CAAC,CAEY;IAC9B;;OAEG;IACH,wBAFU,OAAO,CAEkB;IACnC,eAAkB;IAGpB;;;;;OAKG;IACH,mBAFU,GAAG,gBAAe,CAW3B;IAED;;;;;OAKG;IACH,kBAFU,GAAG,gBAAe,CAc3B;CACF;AAcM,6CAHI,KAAK,GACJ,MAAM,CA2BjB;
|
|
1
|
+
{"version":3,"file":"Transaction.d.ts","sourceRoot":"","sources":["../../../src/utils/Transaction.js"],"names":[],"mappings":"AAiBA,uDAAgD;AAEhD;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH;IACE;;;;OAIG;IACH,iBAJW,GAAG,UACH,GAAG,SACH,OAAO,EA+EjB;IA5EC;;;OAGG;IACH,KAFU,GAAG,CAEC;IACd;;OAEG;IACH,oCAA8B;IAC9B;;;OAGG;IACH,mCAA6B;IAC7B;;OAEG;IACH,oCAA8B;IAC9B;;;OAGG;IACH,cAFU,GAAG,gBAAe,OAAC,CAEL;IACxB;;;OAGG;IACH,aAFU,GAAG,gBAAe,OAAC,CAEN;IACvB;;;;;OAKG;IACH,SAFU,GAAG,CAAC,KAAK,EAAC,GAAG,CAAC,SAAO,IAAI,CAAC,CAAC,CAEb;IACxB;;;;OAIG;IACH,oBAFU,GAAG,CAAC,KAAK,EAAC,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAEJ;IACnC;;OAEG;IACH,eAFU,KAAK,CAAC,cAAc,CAAC,CAER;IACvB;;OAEG;IACH,QAFU,GAAG,CAEO;IACpB;;;OAGG;IACH,MAFU,GAAG,CAAC,GAAG,EAAC,GAAG,CAAC,CAED;IACrB;;;OAGG;IACH,OAFU,OAAO,CAEC;IAClB;;OAEG;IACH,cAFU,GAAG,CAAC,GAAG,CAAC,CAEW;IAC7B;;OAEG;IACH,gBAFU,GAAG,CAAC,GAAG,CAAC,CAEa;IAC/B;;OAEG;IACH,eAFU,GAAG,CAAC,GAAG,CAAC,CAEY;IAC9B;;OAEG;IACH,wBAFU,OAAO,CAEkB;IACnC,eAAkB;IAGpB;;;;;OAKG;IACH,mBAFU,GAAG,gBAAe,CAW3B;IAED;;;;;OAKG;IACH,kBAFU,GAAG,gBAAe,CAc3B;CACF;AAcM,6CAHI,KAAK,GACJ,MAAM,CA2BjB;AAoJM,0DAFI,WAAW,QAsCrB;AAcM,yBATM,CAAC,OACH,GAAG,KACH,CAAS,IAAW,EAAX,WAAW,KAAE,CAAC,WACvB,GAAG,UACH,OAAO,GACN,CAAC,CAwCZ;wBAvauB,aAAa;uBAJd,aAAa"}
|
|
@@ -64,7 +64,7 @@ export class YEvent<DConf extends DeltaConf> {
|
|
|
64
64
|
/**
|
|
65
65
|
* @template {boolean} [Deep=false]
|
|
66
66
|
* @param {object} [opts]
|
|
67
|
-
* @param {AbstractRenderer} [opts.renderer] - renders the content (with attributions); defaults to `baseRenderer`
|
|
67
|
+
* @param {AbstractRenderer} [opts.renderer] - renders the content (with attributions); defaults to the target type's active renderer (see {@link YType#useRenderer}), i.e. `baseRenderer` unless changed
|
|
68
68
|
* @param {Deep} [opts.deep]
|
|
69
69
|
* @return {Deep extends true ? Delta<DConf> : Delta<import('../ytype.js').DeltaConfDeltaToYType<DConf>>} The Delta representation of this type.
|
|
70
70
|
*
|
|
@@ -13,6 +13,6 @@ export function tryGcDeleteSet(tr: Transaction, ds: IdSet, gcFilter: (arg0: Item
|
|
|
13
13
|
export function tryMerge(ds: IdSet, store: StructStore): void;
|
|
14
14
|
export function tryGc(tr: Transaction, idset: IdSet, gcFilter: (arg0: Item) => boolean): void;
|
|
15
15
|
export function cleanupContextlessFormattingGap(transaction: Transaction, item: Item | null): 0 | undefined;
|
|
16
|
-
export function
|
|
17
|
-
export function cleanupFormattingGap(transaction: Transaction, start: Item, curr: Item | null,
|
|
16
|
+
export function updateCurrentFormats(currentFormats: Map<string, any>, { key, value }: ContentFormat): void;
|
|
17
|
+
export function cleanupFormattingGap(transaction: Transaction, start: Item, curr: Item | null, startFormats: Map<string, any>, currFormats: Map<string, any>): number;
|
|
18
18
|
//# sourceMappingURL=transaction-helpers.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transaction-helpers.d.ts","sourceRoot":"","sources":["../../../src/utils/transaction-helpers.js"],"names":[],"mappings":"AAqBO,qCAPI,KAAK,CAAC,IAAI,GAAC,EAAE,GAAC,IAAI,CAAC,SACnB,MAAM,GACL,MAAM,CAiCjB;AAOM,iDAJI,WAAW,OAAC,WACZ,KAAK,CAAC,IAAI,GAAC,EAAE,GAAC,IAAI,CAAC,SACnB,MAAM,UAUhB;AAYM,+CAPI,WAAW,MACX,EAAE,GACD,IAAI,CAQf;AAaM,6CARI,WAAW,SACX,WAAW,MACX,EAAE,GACD,IAAI,CAaf;AAWM,kCAPI,WAAW,UACX,EAAE,GAAC,IAAI,aACP,EAAE,GAAC,IAAI,QASjB;AAaM,4CARI,WAAW,WACX,KAAK,CAAC,IAAI,GAAC,EAAE,CAAC,cACd,MAAM,OACN,MAAM,KACN,CAAS,IAAO,EAAP,EAAE,GAAC,IAAI,KAAE,IAAI,QAkBhC;AAaM,qDAPI,KAAK,CAAC,IAAI,GAAC,EAAE,CAAC,cACd,MAAM,OACN,MAAM,KACN,CAAC,MAAM,EAAE,EAAE,GAAC,IAAI,GAAC,IAAI,EAAE,MAAM,EAAC,MAAM,EAAE,GAAG,EAAC,MAAM,KAAG,IAAI,QAkBjE;AAYM,yCARI,WAAW,OAAC,cACZ,IAAI,GAAC,EAAE,GAAC,IAAI,QACZ,MAAM,GACL,EAAE,GAAC,IAAI,GAAC,IAAI,CAavB;AAQM,oCALI,WAAW,wBAQrB;AAUM,yDAJI,WAAW,QACX,KAAK,aACL,MAAM,GAAC,IAAI,QAOrB;AAOM,6CAJI,KAAK,CAAC,EAAE,GAAG,IAAI,GAAG,IAAI,CAAC,OACvB,MAAM,GACL,MAAM,CAuBjB;AAOM,mCAJI,WAAW,MACX,KAAK,YACL,CAAS,IAAI,EAAJ,IAAI,KAAE,OAAO,QAwBhC;AAMM,6BAHI,KAAK,SACL,WAAW,QAqBrB;AAOM,0BAJI,WAAW,SACX,KAAK,YACL,CAAS,IAAI,EAAJ,IAAI,KAAE,OAAO,QAKhC;AAMM,6DAHI,WAAW,QACX,IAAI,GAAG,IAAI,iBAsBrB;AASM,
|
|
1
|
+
{"version":3,"file":"transaction-helpers.d.ts","sourceRoot":"","sources":["../../../src/utils/transaction-helpers.js"],"names":[],"mappings":"AAqBO,qCAPI,KAAK,CAAC,IAAI,GAAC,EAAE,GAAC,IAAI,CAAC,SACnB,MAAM,GACL,MAAM,CAiCjB;AAOM,iDAJI,WAAW,OAAC,WACZ,KAAK,CAAC,IAAI,GAAC,EAAE,GAAC,IAAI,CAAC,SACnB,MAAM,UAUhB;AAYM,+CAPI,WAAW,MACX,EAAE,GACD,IAAI,CAQf;AAaM,6CARI,WAAW,SACX,WAAW,MACX,EAAE,GACD,IAAI,CAaf;AAWM,kCAPI,WAAW,UACX,EAAE,GAAC,IAAI,aACP,EAAE,GAAC,IAAI,QASjB;AAaM,4CARI,WAAW,WACX,KAAK,CAAC,IAAI,GAAC,EAAE,CAAC,cACd,MAAM,OACN,MAAM,KACN,CAAS,IAAO,EAAP,EAAE,GAAC,IAAI,KAAE,IAAI,QAkBhC;AAaM,qDAPI,KAAK,CAAC,IAAI,GAAC,EAAE,CAAC,cACd,MAAM,OACN,MAAM,KACN,CAAC,MAAM,EAAE,EAAE,GAAC,IAAI,GAAC,IAAI,EAAE,MAAM,EAAC,MAAM,EAAE,GAAG,EAAC,MAAM,KAAG,IAAI,QAkBjE;AAYM,yCARI,WAAW,OAAC,cACZ,IAAI,GAAC,EAAE,GAAC,IAAI,QACZ,MAAM,GACL,EAAE,GAAC,IAAI,GAAC,IAAI,CAavB;AAQM,oCALI,WAAW,wBAQrB;AAUM,yDAJI,WAAW,QACX,KAAK,aACL,MAAM,GAAC,IAAI,QAOrB;AAOM,6CAJI,KAAK,CAAC,EAAE,GAAG,IAAI,GAAG,IAAI,CAAC,OACvB,MAAM,GACL,MAAM,CAuBjB;AAOM,mCAJI,WAAW,MACX,KAAK,YACL,CAAS,IAAI,EAAJ,IAAI,KAAE,OAAO,QAwBhC;AAMM,6BAHI,KAAK,SACL,WAAW,QAqBrB;AAOM,0BAJI,WAAW,SACX,KAAK,YACL,CAAS,IAAI,EAAJ,IAAI,KAAE,OAAO,QAKhC;AAMM,6DAHI,WAAW,QACX,IAAI,GAAG,IAAI,iBAsBrB;AASM,qDANI,GAAG,CAAC,MAAM,EAAC,GAAG,CAAC,kBACf,aAAa,QAWvB;AAeM,kDATI,WAAW,SACX,IAAI,QACJ,IAAI,GAAC,IAAI,gBACT,GAAG,CAAC,MAAM,EAAC,GAAG,CAAC,eACf,GAAG,CAAC,MAAM,EAAC,GAAG,CAAC,GACd,MAAM,CAqDjB"}
|
package/dist/src/ytype.d.ts
CHANGED
|
@@ -1,18 +1,18 @@
|
|
|
1
1
|
export function warnPrematureAccess(): void;
|
|
2
|
-
export function createAttributionFromAttributionItems(attrs: Array<ContentAttribute<any>> | null, deleted: boolean): Attribution |
|
|
2
|
+
export function createAttributionFromAttributionItems(attrs: Array<ContentAttribute<any>> | null, deleted: boolean): Attribution | undefined;
|
|
3
3
|
export class ItemTextListPosition {
|
|
4
4
|
/**
|
|
5
5
|
* @param {Item|null} left
|
|
6
6
|
* @param {Item|null} right
|
|
7
7
|
* @param {number} index
|
|
8
|
-
* @param {Map<string,any>}
|
|
8
|
+
* @param {Map<string,any>} currentFormats
|
|
9
9
|
* @param {AbstractRenderer} renderer
|
|
10
10
|
*/
|
|
11
|
-
constructor(left: Item | null, right: Item | null, index: number,
|
|
11
|
+
constructor(left: Item | null, right: Item | null, index: number, currentFormats: Map<string, any>, renderer: AbstractRenderer);
|
|
12
12
|
left: Item | null;
|
|
13
13
|
right: Item | null;
|
|
14
14
|
index: number;
|
|
15
|
-
|
|
15
|
+
currentFormats: Map<string, any>;
|
|
16
16
|
renderer: import("./utils/renderer-helpers.js").AbstractRenderer;
|
|
17
17
|
/**
|
|
18
18
|
* Only call this if you know that this.right is defined
|
|
@@ -22,18 +22,18 @@ export class ItemTextListPosition {
|
|
|
22
22
|
* @param {Transaction} transaction
|
|
23
23
|
* @param {YType} parent
|
|
24
24
|
* @param {number} length
|
|
25
|
-
* @param {Object<string,any>}
|
|
25
|
+
* @param {Object<string,any>} formats
|
|
26
26
|
*
|
|
27
27
|
* @function
|
|
28
28
|
*/
|
|
29
|
-
formatText(transaction: Transaction, parent: YType, length: number,
|
|
29
|
+
formatText(transaction: Transaction, parent: YType, length: number, formats: {
|
|
30
30
|
[x: string]: any;
|
|
31
31
|
}): void;
|
|
32
32
|
}
|
|
33
|
-
export function insertContent(transaction: Transaction, parent: YType, currPos: ItemTextListPosition, content: import("./structs/Item.js").AbstractContent,
|
|
33
|
+
export function insertContent(transaction: Transaction, parent: YType, currPos: ItemTextListPosition, content: import("./structs/Item.js").AbstractContent, formats: {
|
|
34
34
|
[x: string]: any;
|
|
35
35
|
}): void;
|
|
36
|
-
export function insertContentHelper(transaction: Transaction, parent: YType, currPos: ItemTextListPosition, insert: Array<any> | string,
|
|
36
|
+
export function insertContentHelper(transaction: Transaction, parent: YType, currPos: ItemTextListPosition, insert: Array<any> | string, formats: {
|
|
37
37
|
[x: string]: any;
|
|
38
38
|
}): void;
|
|
39
39
|
export function deleteText(transaction: Transaction, currPos: ItemTextListPosition, length: number): ItemTextListPosition;
|
|
@@ -52,10 +52,23 @@ export function updateMarkerChanges(searchMarker: Array<ArraySearchMarker>, inde
|
|
|
52
52
|
export function getTypeChildren(t: YType): Array<Item>;
|
|
53
53
|
export function callTypeObservers(type: YType, transaction: Transaction, event: YEvent<any>): void;
|
|
54
54
|
/**
|
|
55
|
-
* Abstract Yjs Type class
|
|
55
|
+
* Abstract Yjs Type class.
|
|
56
|
+
*
|
|
57
|
+
* A `YType` is a {@link https://github.com/dmonad/lib0 lib0} `RDT` ("replicated data type", see
|
|
58
|
+
* `lib0/delta/rdt.js`): it emits a `'delta'` event whenever its state changes, accepts foreign
|
|
59
|
+
* changes via {@link YType#applyDelta}, exposes its delta {@link YType#$delta schema}, and can be
|
|
60
|
+
* torn down via {@link YType#destroy}. This lets a `YType` be `bind()`-ed to any other RDT (another
|
|
61
|
+
* `YType`, an in-memory delta, a DOM subtree, …). The legacy {@link YType#observe `observe`} /
|
|
62
|
+
* {@link YType#observeDeep `observeDeep`} `YEvent` API continues to work alongside the `'delta'`
|
|
63
|
+
* channel.
|
|
64
|
+
*
|
|
56
65
|
* @template {delta.DeltaConf} [DConf=any]
|
|
66
|
+
* @extends {ObservableV2<{ delta: (delta: delta.Delta<DConf>) => void, destroy: (type: YType<DConf>) => void }>}
|
|
57
67
|
*/
|
|
58
|
-
export class YType<DConf extends delta.DeltaConf = any> {
|
|
68
|
+
export class YType<DConf extends delta.DeltaConf = any> extends ObservableV2<{
|
|
69
|
+
delta: (delta: delta.Delta<DConf>) => void;
|
|
70
|
+
destroy: (type: YType<DConf>) => void;
|
|
71
|
+
}> {
|
|
59
72
|
/**
|
|
60
73
|
* @template {delta.DeltaConf} DC
|
|
61
74
|
* @param {delta.Delta<DC>} d
|
|
@@ -102,16 +115,72 @@ export class YType<DConf extends delta.DeltaConf = any> {
|
|
|
102
115
|
*/
|
|
103
116
|
_searchMarker: null | Array<ArraySearchMarker>;
|
|
104
117
|
/**
|
|
105
|
-
* @
|
|
106
|
-
*
|
|
118
|
+
* Maintained deep-delta cache backing {@link YType#delta}. `null` until `delta` is first
|
|
119
|
+
* accessed; thereafter kept current on every event of this type (incrementally, by applying the
|
|
120
|
+
* deep change) and re-diffed by {@link YType#useRenderer}. Cleared by {@link YType#clearCache}.
|
|
121
|
+
* @type {delta.DeltaBuilderAny | null}
|
|
107
122
|
*/
|
|
108
|
-
|
|
123
|
+
_delta: delta.DeltaBuilderAny | null;
|
|
109
124
|
_legacyTypeRef: number;
|
|
110
125
|
/**
|
|
111
|
-
* Whether this YText contains
|
|
126
|
+
* Whether this YText contains formats.
|
|
112
127
|
* This flag is updated when a formatting item is integrated (see ContentFormat.integrate)
|
|
113
128
|
*/
|
|
114
129
|
_hasFormatting: boolean;
|
|
130
|
+
/**
|
|
131
|
+
* The active default renderer. Used by `toDelta`, `applyDelta`, and the events whenever no
|
|
132
|
+
* explicit renderer is passed. Change it via {@link YType#useRenderer}.
|
|
133
|
+
* @type {AbstractRenderer}
|
|
134
|
+
*/
|
|
135
|
+
_renderer: AbstractRenderer;
|
|
136
|
+
/**
|
|
137
|
+
* Schema of the deltas this type produces — part of the lib0 `RDT` interface.
|
|
138
|
+
*
|
|
139
|
+
* @type {s.Schema<delta.Delta<DConf>>}
|
|
140
|
+
*/
|
|
141
|
+
get $delta(): s.Schema<delta.Delta<DConf>>;
|
|
142
|
+
/**
|
|
143
|
+
* The deep delta of this type (the full nested content tree, children rendered as their own
|
|
144
|
+
* deltas).
|
|
145
|
+
*
|
|
146
|
+
* The returned value is the type's **live** maintained cache: it is materialized on first access
|
|
147
|
+
* and then kept current on every event fired on this type (and re-diffed by
|
|
148
|
+
* {@link YType#useRenderer}), so a reference held across edits keeps updating in place. Clone it
|
|
149
|
+
* (e.g. `type.delta.clone()`) if you need a stable snapshot, and call {@link YType#clearCache} to
|
|
150
|
+
* drop the cache.
|
|
151
|
+
*
|
|
152
|
+
* @type {delta.Delta<DConf>}
|
|
153
|
+
*/
|
|
154
|
+
get delta(): delta.Delta<DConf>;
|
|
155
|
+
/**
|
|
156
|
+
* Render the full deep current state into a fresh `isFinal` builder (so subsequent `.apply`s of
|
|
157
|
+
* deep changes update content in place). Uses this type's active renderer.
|
|
158
|
+
*
|
|
159
|
+
* @return {delta.DeltaBuilderAny}
|
|
160
|
+
*/
|
|
161
|
+
_renderDelta(): delta.DeltaBuilderAny;
|
|
162
|
+
/**
|
|
163
|
+
* Discard the cached deep delta backing {@link YType#delta}.
|
|
164
|
+
*
|
|
165
|
+
* After `delta` is first accessed, the cache is updated on every event fired on this type (and
|
|
166
|
+
* re-diffed by {@link YType#useRenderer}). Call this to drop it — e.g. to reclaim memory, or to
|
|
167
|
+
* force an exact recomputation after editing while a non-base renderer is active (the incremental
|
|
168
|
+
* updates can drift from a fresh deep render in that case).
|
|
169
|
+
*/
|
|
170
|
+
clearCache(): void;
|
|
171
|
+
/**
|
|
172
|
+
* Change the default renderer used by this type. After calling `useRenderer(renderer)`, the
|
|
173
|
+
* `toDelta`, `applyDelta`, and event methods all use `renderer` whenever no explicit renderer is
|
|
174
|
+
* passed (an explicit `{ renderer }` argument still overrides it per call).
|
|
175
|
+
*
|
|
176
|
+
* If the deep-delta cache ({@link YType#delta}) is being maintained, or a `'delta'` listener is
|
|
177
|
+
* attached, the content is re-rendered with the new renderer and the difference is emitted on the
|
|
178
|
+
* `'delta'` channel only (a renderer switch is not a CRDT change, so no `YEvent` is produced).
|
|
179
|
+
*
|
|
180
|
+
* @param {AbstractRenderer} renderer
|
|
181
|
+
* @return {this}
|
|
182
|
+
*/
|
|
183
|
+
useRenderer(renderer: AbstractRenderer): this;
|
|
115
184
|
get length(): number;
|
|
116
185
|
/**
|
|
117
186
|
* Returns a fresh delta that can be used to change this YType.
|
|
@@ -184,7 +253,7 @@ export class YType<DConf extends delta.DeltaConf = any> {
|
|
|
184
253
|
* @template {boolean} [Deep=false]
|
|
185
254
|
*
|
|
186
255
|
* @param {Object} [opts]
|
|
187
|
-
* @param {AbstractRenderer} [opts.renderer] - renders the content (with attributions); defaults to `baseRenderer`
|
|
256
|
+
* @param {AbstractRenderer} [opts.renderer] - renders the content (with attributions); defaults to this type's active renderer (see {@link YType#useRenderer}), i.e. `baseRenderer` unless changed
|
|
188
257
|
* @param {IdSet?} [opts.itemsToRender]
|
|
189
258
|
* @param {boolean} [opts.retainInserts] - if true, retain rendered inserts with attributions
|
|
190
259
|
* @param {boolean} [opts.retainDeletes] - if true, retain rendered+attributed deletes only
|
|
@@ -209,7 +278,7 @@ export class YType<DConf extends delta.DeltaConf = any> {
|
|
|
209
278
|
* attributions.
|
|
210
279
|
*
|
|
211
280
|
* @param {Object} [opts]
|
|
212
|
-
* @param {AbstractRenderer} [opts.renderer] - renders the content (with attributions); defaults to `baseRenderer`
|
|
281
|
+
* @param {AbstractRenderer} [opts.renderer] - renders the content (with attributions); defaults to this type's active renderer (see {@link YType#useRenderer}), i.e. `baseRenderer` unless changed
|
|
213
282
|
* @return {delta.Delta<DConf>}
|
|
214
283
|
*/
|
|
215
284
|
toDeltaDeep(opts?: {
|
|
@@ -220,13 +289,15 @@ export class YType<DConf extends delta.DeltaConf = any> {
|
|
|
220
289
|
*
|
|
221
290
|
* @param {delta.DeltaAny} d The changes to apply on this element.
|
|
222
291
|
* @param {Object} [opts]
|
|
223
|
-
* @param {AbstractRenderer} [opts.renderer] - renders the content (with attributions); defaults to `baseRenderer`
|
|
292
|
+
* @param {AbstractRenderer} [opts.renderer] - renders the content (with attributions); defaults to this type's active renderer (see {@link YType#useRenderer}), i.e. `baseRenderer` unless changed
|
|
293
|
+
* @return {null} The lib0 `RDT` "fix" of this apply — always `null`: a `YType` accepts every valid
|
|
294
|
+
* delta as-is and never needs to self-correct.
|
|
224
295
|
*
|
|
225
296
|
* @public
|
|
226
297
|
*/
|
|
227
298
|
public applyDelta(d: delta.DeltaAny, { renderer }?: {
|
|
228
299
|
renderer?: import("./utils/renderer-helpers.js").AbstractRenderer | undefined;
|
|
229
|
-
}):
|
|
300
|
+
}): null;
|
|
230
301
|
/**
|
|
231
302
|
* Makes a copy of this data type that can be included somewhere else.
|
|
232
303
|
*
|
|
@@ -302,9 +373,9 @@ export class YType<DConf extends delta.DeltaConf = any> {
|
|
|
302
373
|
*
|
|
303
374
|
* @param {number} index The index to insert content at.
|
|
304
375
|
* @param {Array<delta.DeltaConfGetChildren<DConf>>|delta.DeltaConfGetText<DConf>} content Array of content to append.
|
|
305
|
-
* @param {delta.
|
|
376
|
+
* @param {delta.Formats} [format]
|
|
306
377
|
*/
|
|
307
|
-
insert(index: number, content: Array<delta.DeltaConfGetChildren<DConf>> | delta.DeltaConfGetText<DConf>, format?: delta.
|
|
378
|
+
insert(index: number, content: Array<delta.DeltaConfGetChildren<DConf>> | delta.DeltaConfGetText<DConf>, format?: delta.Formats): void;
|
|
308
379
|
/**
|
|
309
380
|
* Inserts new content at an index.
|
|
310
381
|
*
|
|
@@ -320,10 +391,10 @@ export class YType<DConf extends delta.DeltaConf = any> {
|
|
|
320
391
|
*
|
|
321
392
|
* @param {number} index The index to insert content at.
|
|
322
393
|
* @param {number} length The index to insert content at.
|
|
323
|
-
* @param {delta.
|
|
394
|
+
* @param {delta.Formats} formats
|
|
324
395
|
*
|
|
325
396
|
*/
|
|
326
|
-
format(index: number, length: number, formats: delta.
|
|
397
|
+
format(index: number, length: number, formats: delta.Formats): void;
|
|
327
398
|
/**
|
|
328
399
|
* Appends content to this YArray.
|
|
329
400
|
*
|
|
@@ -452,7 +523,7 @@ export class YType<DConf extends delta.DeltaConf = any> {
|
|
|
452
523
|
export function $ytype<DConf extends import("lib0/delta").ReadableDeltaConf>(_dconf: DConf): s.Schema<YType<import("lib0/delta").ReadDeltaConf<DConf>>>;
|
|
453
524
|
export const $ytypeAny: s.Schema<YType<any>>;
|
|
454
525
|
export function computeModifiedFromItems(store: StructStore, items: IdSet): Map<YType<any>, Set<string | null>>;
|
|
455
|
-
export function
|
|
526
|
+
export function equalFormats(a: any, b: any): boolean;
|
|
456
527
|
export function typeListSlice(type: YType<any>, start: number, end: number): Array<any>;
|
|
457
528
|
export function typeListGet(type: YType, index: number): any;
|
|
458
529
|
export function typeListInsertGenericsAfter(transaction: Transaction, parent: YType, referenceItem: Item | null, content: Array<YValue>): void;
|
|
@@ -515,8 +586,9 @@ export type DeltaToYType<Data extends unknown> = Exclude<Data, delta.DeltaAny> |
|
|
|
515
586
|
import { Item } from './structs/Item.js';
|
|
516
587
|
import { YEvent } from './utils/YEvent.js';
|
|
517
588
|
import * as delta from 'lib0/delta';
|
|
518
|
-
import
|
|
589
|
+
import { ObservableV2 } from 'lib0/observable';
|
|
519
590
|
import * as s from 'lib0/schema';
|
|
591
|
+
import * as traits from 'lib0/traits';
|
|
520
592
|
import { ContentType } from './structs/Item.js';
|
|
521
593
|
import { ContentString } from './structs/Item.js';
|
|
522
594
|
import { ContentJSON } from './structs/Item.js';
|
package/dist/src/ytype.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ytype.d.ts","sourceRoot":"","sources":["../../src/ytype.js"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"ytype.d.ts","sourceRoot":"","sources":["../../src/ytype.js"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@y/y",
|
|
3
|
-
"version": "14.0.0-rc.
|
|
3
|
+
"version": "14.0.0-rc.21",
|
|
4
4
|
"description": "Shared Editing Library",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"sideEffects": false,
|
|
@@ -71,7 +71,7 @@
|
|
|
71
71
|
},
|
|
72
72
|
"homepage": "https://docs.yjs.dev",
|
|
73
73
|
"dependencies": {
|
|
74
|
-
"lib0": "^1.0.0-rc.
|
|
74
|
+
"lib0": "^1.0.0-rc.18"
|
|
75
75
|
},
|
|
76
76
|
"devDependencies": {
|
|
77
77
|
"@types/node": "^22.14.1",
|
|
@@ -79,7 +79,7 @@
|
|
|
79
79
|
"@y/y": ".",
|
|
80
80
|
"dpdm": "^4.0.1",
|
|
81
81
|
"markdownlint": "^0.40.0",
|
|
82
|
-
"markdownlint-cli": "^0.
|
|
82
|
+
"markdownlint-cli": "^0.49.0",
|
|
83
83
|
"standard": "^17.1.2",
|
|
84
84
|
"typescript": "^5.9.3"
|
|
85
85
|
},
|
package/src/utils/Doc.js
CHANGED
|
@@ -226,6 +226,9 @@ export class Doc extends ObservableV2 {
|
|
|
226
226
|
*/
|
|
227
227
|
destroy () {
|
|
228
228
|
this.isDestroyed = true
|
|
229
|
+
// Tear down the top-level shared types as RDTs (emits their `'destroy'` event so any bindings
|
|
230
|
+
// unsubscribe). Only top-level types are destroyed here; nested child types are not recursed.
|
|
231
|
+
this.share.forEach(type => type.destroy())
|
|
229
232
|
array.from(this.subdocs).forEach(subdoc => subdoc.destroy())
|
|
230
233
|
const item = this._item
|
|
231
234
|
if (item !== null) {
|
package/src/utils/Transaction.js
CHANGED
|
@@ -12,7 +12,7 @@ import { GC } from '../structs/GC.js'
|
|
|
12
12
|
import { YEvent } from './YEvent.js'
|
|
13
13
|
import { writeUpdateMessageFromTransaction } from './encoding-helpers.js'
|
|
14
14
|
import { UpdateEncoderV1, UpdateEncoderV2 } from './UpdateEncoder.js'
|
|
15
|
-
import { findIndexSS,
|
|
15
|
+
import { findIndexSS, updateCurrentFormats, cleanupFormattingGap, tryGcDeleteSet, tryMerge, tryToMergeWithLefts, cleanupContextlessFormattingGap } from './transaction-helpers.js'
|
|
16
16
|
import * as random from 'lib0/random'
|
|
17
17
|
|
|
18
18
|
export const generateNewClientId = random.uint53
|
|
@@ -168,14 +168,14 @@ export class Transaction {
|
|
|
168
168
|
/**
|
|
169
169
|
* This function is experimental and subject to change / be removed.
|
|
170
170
|
*
|
|
171
|
-
* Ideally, we don't need this function at all.
|
|
171
|
+
* Ideally, we don't need this function at all. Formats should be cleaned up
|
|
172
172
|
* automatically after each change. This function iterates twice over the complete YText type
|
|
173
|
-
* and removes unnecessary
|
|
173
|
+
* and removes unnecessary formats. This is also helpful for testing.
|
|
174
174
|
*
|
|
175
175
|
* This function won't be exported anymore as soon as there is confidence that the YText type works as intended.
|
|
176
176
|
*
|
|
177
177
|
* @param {YType} type
|
|
178
|
-
* @return {number} How many
|
|
178
|
+
* @return {number} How many formats have been cleaned up.
|
|
179
179
|
*/
|
|
180
180
|
export const cleanupYTextFormatting = type => {
|
|
181
181
|
if (!type.doc?.cleanupFormatting) return 0
|
|
@@ -183,17 +183,17 @@ export const cleanupYTextFormatting = type => {
|
|
|
183
183
|
transact(/** @type {Doc} */ (type.doc), transaction => {
|
|
184
184
|
let start = /** @type {Item} */ (type._start)
|
|
185
185
|
let end = type._start
|
|
186
|
-
let
|
|
187
|
-
const
|
|
186
|
+
let startFormats = map.create()
|
|
187
|
+
const currentFormats = map.copy(startFormats)
|
|
188
188
|
while (end) {
|
|
189
189
|
if (end.deleted === false) {
|
|
190
190
|
switch (end.content.constructor) {
|
|
191
191
|
case ContentFormat:
|
|
192
|
-
|
|
192
|
+
updateCurrentFormats(currentFormats, /** @type {ContentFormat} */ (end.content))
|
|
193
193
|
break
|
|
194
194
|
default:
|
|
195
|
-
res += cleanupFormattingGap(transaction, start, end,
|
|
196
|
-
|
|
195
|
+
res += cleanupFormattingGap(transaction, start, end, startFormats, currentFormats)
|
|
196
|
+
startFormats = map.copy(currentFormats)
|
|
197
197
|
start = end
|
|
198
198
|
break
|
|
199
199
|
}
|
|
@@ -236,17 +236,29 @@ const cleanupTransactions = (transactionCleanups, i) => {
|
|
|
236
236
|
})
|
|
237
237
|
)
|
|
238
238
|
fs.push(() => {
|
|
239
|
-
// deep observe events
|
|
239
|
+
// deep observe events + the RDT `'delta'` channel. `changedParentTypes` holds the changed
|
|
240
|
+
// type AND all of its ancestors, so both `observeDeep` and `'delta'` bubble identically.
|
|
240
241
|
transaction.changedParentTypes.forEach((events, type) => {
|
|
241
242
|
// We need to think about the possibility that the user transforms the
|
|
242
243
|
// Y.Doc in the event.
|
|
243
|
-
if (type.
|
|
244
|
-
|
|
245
|
-
|
|
246
|
-
|
|
247
|
-
|
|
244
|
+
if (type._item !== null && type._item.deleted) return
|
|
245
|
+
const hasDeep = type._dEH.l.length > 0
|
|
246
|
+
const hasDeltaListeners = (type._observers.get('delta')?.size ?? 0) > 0
|
|
247
|
+
const maintaining = type._delta !== null
|
|
248
|
+
if (!hasDeep && !hasDeltaListeners && !maintaining) return
|
|
249
|
+
/**
|
|
250
|
+
* @type {YEvent<any>}
|
|
251
|
+
*/
|
|
252
|
+
const deepEventHandler = events.find(event => event.target === type) || new YEvent(type, transaction, new Set(null))
|
|
253
|
+
if (hasDeep) {
|
|
248
254
|
callEventHandlerListeners(type._dEH, deepEventHandler, transaction)
|
|
249
255
|
}
|
|
256
|
+
if (hasDeltaListeners || maintaining) {
|
|
257
|
+
// the type-rooted deep delta of this transaction (a nested `modify` chain for ancestors)
|
|
258
|
+
const change = /** @type {any} */ (deepEventHandler.getDelta({ renderer: type._renderer, deep: true }).done())
|
|
259
|
+
type._delta?.apply(change) // keep the cache current (incl. ancestors and diff-renderer attributions)
|
|
260
|
+
if (hasDeltaListeners) type.emit('delta', [change])
|
|
261
|
+
}
|
|
250
262
|
})
|
|
251
263
|
})
|
|
252
264
|
fs.push(() => doc.emit('afterTransaction', [transaction, doc]))
|
|
@@ -334,7 +346,7 @@ const cleanupTransactions = (transactionCleanups, i) => {
|
|
|
334
346
|
|
|
335
347
|
/**
|
|
336
348
|
* This will be called by the transaction once the event handlers are called to potentially cleanup
|
|
337
|
-
*
|
|
349
|
+
* formats.
|
|
338
350
|
*
|
|
339
351
|
* @param {Transaction} transaction
|
|
340
352
|
*/
|
|
@@ -362,14 +374,14 @@ export const cleanupYTextAfterTransaction = transaction => {
|
|
|
362
374
|
if (item.content.constructor === ContentFormat) {
|
|
363
375
|
needFullCleanup.add(parent)
|
|
364
376
|
} else {
|
|
365
|
-
// If no
|
|
377
|
+
// If no format was inserted or deleted, we can make due with contextless
|
|
366
378
|
// formatting cleanups.
|
|
367
|
-
// Contextless: it is not necessary to compute
|
|
379
|
+
// Contextless: it is not necessary to compute currentFormats for the affected position.
|
|
368
380
|
cleanupContextlessFormattingGap(t, item)
|
|
369
381
|
}
|
|
370
382
|
})
|
|
371
383
|
// If a formatting item was inserted, we simply clean the whole type.
|
|
372
|
-
// We need to compute
|
|
384
|
+
// We need to compute currentFormats for the current position anyway.
|
|
373
385
|
for (const yText of needFullCleanup) {
|
|
374
386
|
cleanupYTextFormatting(yText)
|
|
375
387
|
}
|
package/src/utils/YEvent.js
CHANGED
|
@@ -86,13 +86,13 @@ export class YEvent {
|
|
|
86
86
|
/**
|
|
87
87
|
* @template {boolean} [Deep=false]
|
|
88
88
|
* @param {object} [opts]
|
|
89
|
-
* @param {AbstractRenderer} [opts.renderer] - renders the content (with attributions); defaults to `baseRenderer`
|
|
89
|
+
* @param {AbstractRenderer} [opts.renderer] - renders the content (with attributions); defaults to the target type's active renderer (see {@link YType#useRenderer}), i.e. `baseRenderer` unless changed
|
|
90
90
|
* @param {Deep} [opts.deep]
|
|
91
91
|
* @return {Deep extends true ? Delta<DConf> : Delta<import('../ytype.js').DeltaConfDeltaToYType<DConf>>} The Delta representation of this type.
|
|
92
92
|
*
|
|
93
93
|
* @public
|
|
94
94
|
*/
|
|
95
|
-
getDelta ({ renderer =
|
|
95
|
+
getDelta ({ renderer = this.target._renderer, deep } = {}) {
|
|
96
96
|
const itemsToRender = mergeIdSets([diffIdSet(this.transaction.insertSet, this.transaction.deleteSet), diffIdSet(this.transaction.deleteSet, this.transaction.insertSet)])
|
|
97
97
|
/**
|
|
98
98
|
* @todo this should be done only one in the transaction step
|
|
@@ -334,17 +334,17 @@ export const cleanupContextlessFormattingGap = (transaction, item) => {
|
|
|
334
334
|
}
|
|
335
335
|
|
|
336
336
|
/**
|
|
337
|
-
* @param {Map<string,any>}
|
|
337
|
+
* @param {Map<string,any>} currentFormats
|
|
338
338
|
* @param {ContentFormat} format
|
|
339
339
|
*
|
|
340
340
|
* @private
|
|
341
341
|
* @function
|
|
342
342
|
*/
|
|
343
|
-
export const
|
|
343
|
+
export const updateCurrentFormats = (currentFormats, { key, value }) => {
|
|
344
344
|
if (value === null) {
|
|
345
|
-
|
|
345
|
+
currentFormats.delete(key)
|
|
346
346
|
} else {
|
|
347
|
-
|
|
347
|
+
currentFormats.set(key, value)
|
|
348
348
|
}
|
|
349
349
|
}
|
|
350
350
|
|
|
@@ -355,13 +355,13 @@ export const updateCurrentAttributes = (currentAttributes, { key, value }) => {
|
|
|
355
355
|
* @param {Transaction} transaction
|
|
356
356
|
* @param {Item} start
|
|
357
357
|
* @param {Item|null} curr exclusive end, automatically iterates to the next Content Item
|
|
358
|
-
* @param {Map<string,any>}
|
|
359
|
-
* @param {Map<string,any>}
|
|
358
|
+
* @param {Map<string,any>} startFormats
|
|
359
|
+
* @param {Map<string,any>} currFormats
|
|
360
360
|
* @return {number} The amount of formatting Items deleted.
|
|
361
361
|
*
|
|
362
362
|
* @function
|
|
363
363
|
*/
|
|
364
|
-
export const cleanupFormattingGap = (transaction, start, curr,
|
|
364
|
+
export const cleanupFormattingGap = (transaction, start, curr, startFormats, currFormats) => {
|
|
365
365
|
if (!transaction.doc.cleanupFormatting) return 0
|
|
366
366
|
/**
|
|
367
367
|
* @type {Item|null}
|
|
@@ -388,22 +388,22 @@ export const cleanupFormattingGap = (transaction, start, curr, startAttributes,
|
|
|
388
388
|
const content = start.content
|
|
389
389
|
if (content.getRef() === 6) { // is ContentFormat
|
|
390
390
|
const { key, value } = /** @type {ContentFormat} */ (content)
|
|
391
|
-
const
|
|
392
|
-
if (endFormats.get(key) !== content ||
|
|
393
|
-
// Either this format is overwritten or it is not necessary because the
|
|
391
|
+
const startFormatValue = startFormats.get(key) ?? null
|
|
392
|
+
if (endFormats.get(key) !== content || startFormatValue === value) {
|
|
393
|
+
// Either this format is overwritten or it is not necessary because the format already existed.
|
|
394
394
|
start.delete(transaction)
|
|
395
395
|
transaction.cleanUps.add(start.id.client, start.id.clock, start.length)
|
|
396
396
|
cleanups++
|
|
397
|
-
if (!reachedCurr && (
|
|
398
|
-
if (
|
|
399
|
-
|
|
397
|
+
if (!reachedCurr && (currFormats.get(key) ?? null) === value && startFormatValue !== value) {
|
|
398
|
+
if (startFormatValue === null) {
|
|
399
|
+
currFormats.delete(key)
|
|
400
400
|
} else {
|
|
401
|
-
|
|
401
|
+
currFormats.set(key, startFormatValue)
|
|
402
402
|
}
|
|
403
403
|
}
|
|
404
404
|
}
|
|
405
405
|
if (!reachedCurr && !start.deleted) {
|
|
406
|
-
|
|
406
|
+
updateCurrentFormats(currFormats, /** @type {ContentFormat} */ (content))
|
|
407
407
|
}
|
|
408
408
|
}
|
|
409
409
|
}
|