@fiduswriter/editor 0.1.23 → 0.1.26

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 (39) hide show
  1. package/dist/collab/doc.js +7 -7
  2. package/dist/collab/doc.js.map +1 -1
  3. package/dist/collab/merge/index.d.ts.map +1 -1
  4. package/dist/collab/merge/index.js.map +1 -1
  5. package/dist/collab/merge/state_plugins/diff.d.ts.map +1 -1
  6. package/dist/collab/merge/state_plugins/diff.js +3 -0
  7. package/dist/collab/merge/state_plugins/diff.js.map +1 -1
  8. package/dist/menus/headerbar/model.d.ts +0 -3
  9. package/dist/menus/headerbar/model.d.ts.map +1 -1
  10. package/dist/menus/headerbar/model.js +2 -7
  11. package/dist/menus/headerbar/model.js.map +1 -1
  12. package/dist/state_plugins/collab_carets.d.ts.map +1 -1
  13. package/dist/state_plugins/collab_carets.js +14 -4
  14. package/dist/state_plugins/collab_carets.js.map +1 -1
  15. package/dist/state_plugins/comments.d.ts.map +1 -1
  16. package/dist/state_plugins/comments.js +25 -5
  17. package/dist/state_plugins/comments.js.map +1 -1
  18. package/dist/state_plugins/contributor_input/plugin.d.ts.map +1 -1
  19. package/dist/state_plugins/contributor_input/plugin.js +5 -1
  20. package/dist/state_plugins/contributor_input/plugin.js.map +1 -1
  21. package/dist/state_plugins/links.d.ts.map +1 -1
  22. package/dist/state_plugins/links.js +5 -1
  23. package/dist/state_plugins/links.js.map +1 -1
  24. package/dist/state_plugins/track/plugin.d.ts.map +1 -1
  25. package/dist/state_plugins/track/plugin.js +8 -1
  26. package/dist/state_plugins/track/plugin.js.map +1 -1
  27. package/dist/types.d.ts +16 -0
  28. package/dist/types.d.ts.map +1 -1
  29. package/package.json +1 -1
  30. package/src/collab/doc.ts +7 -7
  31. package/src/collab/merge/index.ts +2 -2
  32. package/src/collab/merge/state_plugins/diff.ts +4 -1
  33. package/src/menus/headerbar/model.ts +10 -25
  34. package/src/state_plugins/collab_carets.ts +15 -6
  35. package/src/state_plugins/comments.ts +25 -5
  36. package/src/state_plugins/contributor_input/plugin.ts +5 -2
  37. package/src/state_plugins/links.ts +5 -1
  38. package/src/state_plugins/track/plugin.ts +9 -2
  39. package/src/types.ts +16 -0
package/dist/types.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,KAAK,EAAC,IAAI,EAAE,MAAM,EAAC,MAAM,mBAAmB,CAAA;AACnD,OAAO,KAAK,EAAC,MAAM,EAAE,WAAW,EAAC,MAAM,mBAAmB,CAAA;AAC1D,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAA;AAChD,OAAO,KAAK,EAAC,GAAG,IAAI,SAAS,EAAE,IAAI,EAAC,MAAM,qBAAqB,CAAA;AAC/D,OAAO,KAAK,EACR,KAAK,EACL,YAAY,EACZ,WAAW,EACX,GAAG,EACH,OAAO,EACP,cAAc,EACjB,MAAM,uBAAuB,CAAA;AAE9B,YAAY,EAAC,KAAK,EAAE,YAAY,EAAE,WAAW,EAAE,GAAG,EAAE,OAAO,EAAE,cAAc,EAAC,CAAA;AAC5E,YAAY,EAAC,IAAI,EAAC,MAAM,qBAAqB,CAAA;AAE7C,2EAA2E;AAC3E,MAAM,WAAW,aAAc,SAAQ,OAAO;IAC1C,SAAS,CAAC,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC,CAAA;IAC9D,QAAQ,CAAC,EAAE,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAAA;CACjE;AAED,mDAAmD;AACnD,MAAM,WAAW,GAAI,SAAQ,SAAS;IAClC,SAAS,IAAI,OAAO,CAAA;IACpB,GAAG,EAAE,GAAG,CAAA;IACR,OAAO,EAAE,aAAa,CAAA;CACzB;AAED,YAAY,EAAC,GAAG,IAAI,SAAS,EAAC,CAAA;AAE9B,sCAAsC;AACtC,MAAM,MAAM,eAAe,GAAG,QAAQ,GAAG,SAAS,CAAA;AAClD,MAAM,MAAM,YAAY,GAAG,MAAM,GAAG,uBAAuB,CAAA;AAC3D,MAAM,MAAM,UAAU,GAAG,QAAQ,GAAG,gBAAgB,CAAA;AACpD,MAAM,MAAM,SAAS,GAAG,OAAO,GAAG,eAAe,GAAG,gBAAgB,CAAA;AACpE,MAAM,MAAM,UAAU,GAChB,OAAO,GACP,eAAe,GACf,QAAQ,GACR,gBAAgB,GAChB,SAAS,GACT,MAAM,GACN,uBAAuB,CAAA;AAE7B,eAAO,MAAM,kBAAkB,EAAE,eAAe,EAA0B,CAAA;AAC1E,eAAO,MAAM,eAAe,EAAE,YAAY,EAAsC,CAAA;AAChF,eAAO,MAAM,YAAY,EAAE,UAAU,EAAiC,CAAA;AACtE,eAAO,MAAM,WAAW,EAAE,SAAS,EAIlC,CAAA;AAED,uDAAuD;AACvD,MAAM,WAAW,OAAO;IACpB,EAAE,EAAE,MAAM,GAAG,MAAM,CAAA;IACnB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,MAAM,EAAE,MAAM,CAAA;IACd,KAAK,CAAC,EAAE;QACJ,EAAE,EAAE,MAAM,CAAA;QACV,IAAI,CAAC,EAAE,MAAM,CAAA;QACb,IAAI,CAAC,EAAE,MAAM,CAAA;QACb,MAAM,CAAC,EAAE,MAAM,CAAA;QACf,QAAQ,EAAE,KAAK,CAAC;YAAC,EAAE,EAAE,MAAM,GAAG,MAAM,CAAC;YAAC,IAAI,EAAE,MAAM,CAAC;YAAC,IAAI,EAAE,MAAM,CAAC;YAAC,MAAM,CAAC,EAAE,MAAM,CAAA;SAAC,CAAC,CAAA;KACtF,CAAA;IACD,QAAQ,EAAE,OAAO,CAAA;IACjB,YAAY,EAAE,IAAI,GAAG,KAAK,CAAA;IAC1B,OAAO,EAAE,IAAI,GAAG,KAAK,CAAA;IACrB,GAAG,EAAE,KAAK,GAAG,KAAK,CAAA;IAClB,IAAI,EAAE,MAAM,CAAA;IACZ,aAAa,CAAC,EAAE,UAAU,CAAA;IAC1B,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,IAAI,CAAC,EAAE,OAAO,CAAA;CACjB;AAED,4EAA4E;AAC5E,MAAM,WAAW,SAAS;IACtB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAA;IACtB,MAAM,CAAC,EAAE;QACL,GAAG,EAAE;YACD,mBAAmB,IAAI,IAAI,CAAA;YAC3B,cAAc,CAAC,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;YAC/B,WAAW,CAAC,IAAI,EAAE,OAAO,GAAG,IAAI,CAAA;YAChC,sBAAsB,CAAC,IAAI,EAAE,OAAO,GAAG,IAAI,CAAA;YAC3C,YAAY,CAAC,OAAO,CAAC,EAAE,OAAO,GAAG,IAAI,CAAA;YACrC,8BAA8B,IAAI,IAAI,CAAA;YACtC,WAAW,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,CAAA;YAC9B,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,CAAA;YAC7B,oBAAoB,EAAE,OAAO,CAAA;YAC7B,cAAc,EAAE,OAAO,CAAA;SAC1B,CAAA;QACD,YAAY,EAAE,KAAK,CAAC;YAAC,EAAE,EAAE,MAAM,CAAC;YAAC,IAAI,CAAC,EAAE,MAAM,CAAC;YAAC,UAAU,CAAC,EAAE,MAAM,CAAC;YAAC,UAAU,CAAC,EAAE,MAAM,EAAE,CAAA;SAAC,CAAC,CAAA;QAC5F,gBAAgB,EAAE,KAAK,CAAC;YAAC,EAAE,EAAE,MAAM,CAAC;YAAC,IAAI,CAAC,EAAE,MAAM,CAAA;SAAC,CAAC,CAAA;QACpD,qBAAqB,CAAC,YAAY,EAAE,OAAO,EAAE,GAAG,IAAI,CAAA;QACpD,MAAM,EAAE;YACJ,eAAe,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI,CAAA;SACpC,CAAA;QACD,IAAI,EAAE;YACF,UAAU,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAAA;YAClC,QAAQ,CAAC,YAAY,EAAE,OAAO,EAAE,GAAG,IAAI,CAAA;SAC1C,CAAA;KACJ,CAAA;IACD,WAAW,CAAC,EAAE;QACV,SAAS,IAAI,IAAI,CAAA;QACjB,IAAI,CAAC,IAAI,EAAE,UAAU,GAAG,IAAI,CAAA;QAC5B,IAAI,IAAI,IAAI,CAAA;QACZ,WAAW,EAAE,KAAK,CAAC;YAAC,IAAI,CAAC,EAAE,MAAM,CAAC;YAAC,IAAI,CAAC,EAAE,MAAM,CAAC;YAAC,GAAG,CAAC,EAAE,MAAM,CAAA;SAAC,CAAC,CAAA;KACnE,CAAA;IACD,SAAS,CAAC,EAAE;QACR,QAAQ,EAAE;YACN,IAAI,EAAE,UAAU,CAAA;YAChB,kBAAkB,IAAI,IAAI,CAAA;YAC1B,UAAU,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE,GAAG,EAAE,OAAO,GAAG,IAAI,CAAA;YAChD,MAAM,EAAE;gBAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;aAAC,CAAA;SAC5C,CAAA;QACD,IAAI,IAAI,IAAI,CAAA;QACZ,MAAM,CAAC,EAAE;YAAC,SAAS,IAAI,IAAI,CAAA;SAAC,CAAA;KAC/B,CAAA;IACD,QAAQ,CAAC,EAAE;QACP,KAAK,EAAE;YACH,KAAK,IAAI,IAAI,CAAA;YACb,YAAY,CAAC,QAAQ,EAAE,OAAO,GAAG,IAAI,CAAA;YACrC,YAAY,IAAI,OAAO,EAAE,CAAA;YACzB,UAAU,CAAC,MAAM,EAAE,OAAO,EAAE,GAAG,IAAI,CAAA;YACnC,OAAO,CAAC,MAAM,EAAE,OAAO,EAAE,GAAG,IAAI,CAAA;YAChC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;SACpC,CAAA;QACD,YAAY,EAAE;YACV,gBAAgB,IAAI,IAAI,CAAA;YACxB,kBAAkB,IAAI,OAAO,CAAA;YAC7B,aAAa,IAAI,IAAI,CAAA;YACrB,yBAAyB,IAAI,IAAI,CAAA;SACpC,CAAA;KACJ,CAAA;IACD,gBAAgB,CAAC,EAAE;QACf,cAAc,EAAE,KAAK,CAAC;YAAC,IAAI,EAAE,MAAM,CAAA;SAAC,CAAC,CAAA;QACrC,iBAAiB,IAAI,OAAO,CAAC,OAAO,CAAC,CAAA;QACrC,SAAS,CAAC,MAAM,EAAE,OAAO,GAAG,IAAI,CAAA;QAChC,kBAAkB,IAAI,IAAI,CAAA;QAC1B,4BAA4B,IAAI,IAAI,CAAA;KACvC,CAAA;IACD,SAAS,CAAC,EAAE;QACR,IAAI,IAAI,IAAI,CAAA;QACZ,cAAc,IAAI,IAAI,CAAA;QACtB,eAAe,IAAI,IAAI,CAAA;KAC1B,CAAA;IACD,SAAS,CAAC,EAAE;QACR,IAAI,IAAI,IAAI,CAAA;KACf,CAAA;IACD,KAAK,CAAC,EAAE,OAAO,CAAA;IACf,EAAE,CAAC,EAAE;QACD,KAAK,EAAE;YACH,EAAE,EAAE,YAAY,CAAA;YAChB,MAAM,EAAE,OAAO,EAAE,CAAA;YACjB,KAAK,CAAC,KAAK,EAAE,KAAK,GAAG,IAAI,CAAA;YACzB,YAAY,IAAI,OAAO,EAAE,CAAA;YACzB,UAAU,CAAC,MAAM,EAAE,OAAO,EAAE,GAAG,IAAI,CAAA;YACnC,OAAO,CAAC,MAAM,EAAE,OAAO,EAAE,GAAG,IAAI,CAAA;YAChC,YAAY,CAAC,GAAG,EAAE,OAAO,GAAG,OAAO,CAAA;YACnC,YAAY,CAAC,GAAG,EAAE,OAAO,EAAE,EAAE,EAAE,MAAM,GAAG,MAAM,CAAA;SACjD,CAAA;QACD,OAAO,EAAE;YACL,EAAE,EAAE,cAAc,CAAA;YAClB,MAAM,EAAE,OAAO,EAAE,CAAA;YACjB,KAAK,CAAC,KAAK,EAAE,OAAO,GAAG,IAAI,CAAA;YAC3B,YAAY,IAAI,OAAO,EAAE,CAAA;YACzB,UAAU,CAAC,MAAM,EAAE,OAAO,EAAE,GAAG,IAAI,CAAA;YACnC,OAAO,CAAC,MAAM,EAAE,OAAO,EAAE,GAAG,IAAI,CAAA;SACnC,CAAA;QACD,KAAK,CAAC,IAAI,IAAI,CAAA;KACjB,CAAA;CACJ;AAED,yDAAyD;AACzD,MAAM,WAAW,UAAU;IACvB,GAAG,CAAC,EAAE,SAAS,CAAA;IACf,eAAe,CAAC,EAAE;QACd,MAAM,CAAC,GAAG,EAAE,SAAS,GAAG,IAAI,CAAA;QAC5B,mBAAmB,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,GAAG,IAAI,CAAA;QAC7C,qBAAqB,CAAC,IAAI,EAAE,OAAO,GAAG,IAAI,CAAA;QAC1C,sBAAsB,CAAC,IAAI,EAAE,OAAO,GAAG,IAAI,CAAA;QAC3C,oBAAoB,IAAI,OAAO,CAAC,GAAG,GAAG,IAAI,CAAC,CAAA;QAC3C,mBAAmB,CACf,MAAM,EAAE,SAAS,EACjB,aAAa,EAAE,MAAM,EACrB,aAAa,EAAE,MAAM,GACtB,OAAO,CAAC,IAAI,CAAC,CAAA;KACnB,CAAA;IACD,SAAS,CAAC,EAAE,OAAO,CAAA;IACnB,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,oBAAoB,CAAC,EAAE,MAAM,CAAA;IAC7B,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,cAAc,CAAC,EAAE,OAAO,CAAA;CAC3B;AAED,8DAA8D;AAC9D,MAAM,WAAW,UAAU;IACvB,cAAc,EAAE,OAAO,CAAA;IACvB,UAAU,CAAC,EAAE;QAAC,MAAM,IAAI,IAAI,CAAC;QAAC,OAAO,IAAI,IAAI,CAAA;KAAC,CAAA;IAC9C,cAAc,EAAE,OAAO,CAAA;IACvB,oBAAoB,EAAE,OAAO,CAAA;IAC7B,oBAAoB,EAAE,OAAO,CAAA;IAC7B,kBAAkB,EAAE,OAAO,CAAA;IAC3B,cAAc,EAAE,OAAO,CAAA;IACvB,cAAc,EAAE,OAAO,CAAA;IACvB,eAAe,EAAE,OAAO,CAAA;IACxB,YAAY,EAAE,OAAO,CAAA;IACrB,YAAY,CAAC,EAAE,KAAK,CAAC;QAAC,MAAM,IAAI,IAAI,CAAC;QAAC,OAAO,IAAI,IAAI,CAAC;QAAC,QAAQ,CAAC,IAAI,IAAI,CAAA;KAAC,CAAC,CAAA;IAC1E,oBAAoB,EAAE,OAAO,CAAA;IAC7B,kBAAkB,EAAE,OAAO,CAAA;IAC3B,kBAAkB,CAAC,EAAE,KAAK,CAAC;QAAC,OAAO,IAAI,IAAI,CAAA;KAAC,CAAC,CAAA;CAChD;AAED,gFAAgF;AAChF,MAAM,WAAW,UAAW,SAAQ,IAAI;IACpC,EAAE,EAAE,MAAM,CAAA;IACV,gBAAgB,CAAC,EAAE,OAAO,CAAA;CAC7B;AAED,gDAAgD;AAChD,MAAM,WAAW,aAAa;IAC1B,GAAG,EAAE,GAAG,CAAA;IACR,IAAI,EAAE,UAAU,CAAA;CACnB;AAED,+DAA+D;AAC/D,MAAM,MAAM,iBAAiB,GACvB,CAAC,MAAM,GAAG,CAAC,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,MAAM,CAAC,CAAC,GAC3C;IACI,MAAM,GAAG,CAAC,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,MAAM,CAAC;IACzC,MAAM,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;CAChC,CAAA;AAEP,2EAA2E;AAC3E,MAAM,WAAW,MAAM;IACnB,GAAG,EAAE,GAAG,CAAA;IACR,IAAI,EAAE,UAAU,CAAA;IAChB,aAAa,EAAE,iBAAiB,EAAE,CAAA;IAClC,qBAAqB,EAAE,iBAAiB,EAAE,GAAG,IAAI,CAAA;IACjD,GAAG,EAAE,SAAS,CAAA;IACd,kBAAkB,EAAE,OAAO,CAAA;IAC3B,OAAO,EAAE,OAAO,CAAA;IAChB,MAAM,EAAE,MAAM,GAAG;QAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;KAAC,CAAA;IAClD,IAAI,EAAE,UAAU,CAAA;IAChB,SAAS,EAAE,MAAM,CAAA;IACjB,oBAAoB,EAAE,MAAM,CAAA;IAC5B,IAAI,EAAE,UAAU,GAAG,IAAI,CAAA;IACvB,YAAY,EAAE,OAAO,CAAA;IACrB,YAAY,EAAE,iBAAiB,EAAE,CAAA;IACjC,IAAI,EAAE,UAAU,CAAA;IAChB,WAAW,EAAE,UAAU,CAAA;IACvB,GAAG,EAAE,WAAW,CAAA;IAChB,EAAE,CAAC,EAAE;QACD,eAAe,CAAC,EAAE,MAAM,CAAA;QACxB,MAAM,CAAC,EAAE,OAAO,CAAA;QAChB,SAAS,CAAC,EAAE,OAAO,CAAA;QACnB,EAAE,CAAC,EAAE,SAAS,CAAA;QACd,IAAI,IAAI,IAAI,CAAA;QACZ,KAAK,IAAI,IAAI,CAAA;QACb,IAAI,CAAC,IAAI,EAAE,MAAM,GAAG,CAAC,MAAM,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,KAAK,GAAG,SAAS,CAAC,GAAG,IAAI,CAAA;KACjF,CAAA;IAED,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAAA;IACrB,cAAc,IAAI,IAAI,CAAA;IACtB,MAAM,CAAC,OAAO,CAAC,EAAE;QAAC,gBAAgB,CAAC,EAAE,OAAO,CAAC;QAAC,OAAO,CAAC,EAAE,MAAM,CAAA;KAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IACzF,KAAK,IAAI,IAAI,CAAA;IACb,iBAAiB,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,UAAU,GAAG,IAAI,CAAA;IACtD,0BAA0B,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;IAClD,gBAAgB,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI,CAAA;CACrC;AAED,sEAAsE;AACtE,MAAM,WAAW,mBAAmB;IAChC,MAAM,EAAE,MAAM,CAAA;IACd,QAAQ,CAAC,EAAE,MAAM,CAAA;CACpB;AAED,sDAAsD;AACtD,MAAM,MAAM,SAAS,GACf,uBAAuB,GACvB,sBAAsB,GACtB,aAAa,GACb,aAAa,GACb,YAAY,GACZ,iBAAiB,GACjB,MAAM,CAAA;AAEZ,MAAM,WAAW,wBAAyB,SAAQ,WAAW;IACzD,OAAO,CAAC,GAAG,EAAE,WAAW,EAAE,KAAK,EAAE,SAAS,GAAG,IAAI,CAAA;CACpD"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@fiduswriter/editor",
3
- "version": "0.1.23",
3
+ "version": "0.1.26",
4
4
  "description": "Fidus Writer browser editor",
5
5
  "repository": {
6
6
  "type": "git",
package/src/collab/doc.ts CHANGED
@@ -694,23 +694,23 @@ export class ModCollabDoc {
694
694
  }
695
695
 
696
696
  // Store the E2EE state on the editor
697
- this.mod.editor.e2ee = {
697
+ const e2ee = this.mod.editor.e2ee = {
698
698
  encrypted: true,
699
699
  encryptionSalt: salt,
700
700
  encryptionIterations: iterations || 600000,
701
701
  key: key,
702
- snapshotManager: this.mod.editor.e2ee?.snapshotManager || null
702
+ snapshotManager: this.mod.editor.e2ee?.snapshotManager || undefined
703
703
  }
704
704
  // Initialize snapshot manager now that we have the key
705
- if (!this.mod.editor.e2ee.snapshotManager) {
705
+ if (!e2ee.snapshotManager) {
706
706
  const {E2EESnapshotManager} = await import(
707
707
  "../e2ee/snapshot-manager.js"
708
708
  )
709
- this.mod.editor.e2ee.snapshotManager = new E2EESnapshotManager(
709
+ e2ee.snapshotManager = new E2EESnapshotManager(
710
710
  this.mod.editor
711
711
  )
712
712
  }
713
- ;(this.mod.editor.e2ee.snapshotManager as any).setKey(key)
713
+ ;(e2ee.snapshotManager as any).setKey(key)
714
714
 
715
715
  // Cache the key in sessionStorage so the user doesn't have to
716
716
  // re-enter the password when reopening the document this session.
@@ -794,8 +794,8 @@ export class ModCollabDoc {
794
794
  // (not a Base64 string) and this is the initial load.
795
795
  const isNewE2EEDocument =
796
796
  isInitialLoad && typeof doc.content !== "string"
797
- if (isNewE2EEDocument && this.mod.editor.e2ee.snapshotManager) {
798
- ;(this.mod.editor.e2ee.snapshotManager as any).sendInitialSnapshot(
797
+ if (isNewE2EEDocument && e2ee.snapshotManager) {
798
+ ;(e2ee.snapshotManager as any).sendInitialSnapshot(
799
799
  decryptedContent,
800
800
  decryptedComments,
801
801
  decryptedBibliography,
package/src/collab/merge/index.ts CHANGED
@@ -1,7 +1,7 @@
1
1
  import type {Node} from "prosemirror-model"
2
2
  import {EditorState, type Selection, type Transaction} from "prosemirror-state"
3
3
  import {Mapping, Step, StepMap, Transform} from "prosemirror-transform"
4
- import type {BibDB, ExportDoc, ImageDB} from "@fiduswriter/document"
4
+ import type {BibDB, ExportDoc, FidusDoc, ImageDB} from "@fiduswriter/document"
5
5
  import {getSettings} from "@fiduswriter/document/schema/convert"
6
6
  import {Dialog, addAlert, showSystemMessage} from "fwtoolkit"
7
7
  import {receiveTransaction, sendableSteps} from "prosemirror-collab"
@@ -411,7 +411,7 @@ export class Merge {
411
411
  content: (pmArticle?.toJSON() || {type: "article"}) as {
412
412
  type: string
413
413
  },
414
- settings: getSettings(pmArticle as Node),
414
+ settings: getSettings(pmArticle as unknown as FidusDoc),
415
415
  title: title,
416
416
  version: String(this.mod.editor.docInfo.version),
417
417
  comments: ((this.mod.editor.mod.comments as any).store as any)
package/src/collab/merge/state_plugins/diff.ts CHANGED
@@ -657,7 +657,10 @@ export const diffPlugin = (options: {merge: MergeEditorLike}) =>
657
657
  }
658
658
  },
659
659
  apply(tr, _prev, oldState, state): DiffPluginState {
660
- const oldPluginState = key.getState(oldState)!
660
+ const oldPluginState = key.getState(oldState)
661
+ if (!oldPluginState) {
662
+ return _prev
663
+ }
661
664
  let {decos} = oldPluginState
662
665
  const {baseTr, deletionClass} = oldPluginState
663
666
 
package/src/menus/headerbar/model.ts CHANGED
@@ -30,14 +30,6 @@ interface AccessRightLike {
30
30
  rights?: string
31
31
  }
32
32
 
33
- interface SnapshotManagerLike {
34
- reEncryptWithNewKey(
35
- newKey: CryptoKey,
36
- newSaltBase64: string,
37
- newIterations: number
38
- ): Promise<void>
39
- }
40
-
41
33
  interface DocumentStyle {
42
34
  slug: string
43
35
  contents: string
@@ -61,7 +53,7 @@ function getDB(editor: Editor): {
61
53
  }
62
54
 
63
55
  function getDocumentTemplate(editor: Editor): DocumentTemplateLike {
64
- return editor.mod.documentTemplate as DocumentTemplateLike
56
+ return editor.mod.documentTemplate as unknown as DocumentTemplateLike
65
57
  }
66
58
 
67
59
  function getTrack(editor: Editor): TrackLike {
@@ -407,7 +399,7 @@ export const headerbarModel = () => ({
407
399
  db.bibDB,
408
400
  db.imageDB,
409
401
  editor.app.csl,
410
- editor.docInfo.updated,
402
+ editor.docInfo.updated as Date as Date,
411
403
  getDocumentTemplate(editor).documentStyles,
412
404
  exportProgress(doc)
413
405
  )
@@ -537,9 +529,8 @@ export const headerbarModel = () => ({
537
529
  )
538
530
 
539
531
  // Re-encrypt the document with the new key
540
- await (
541
- e2ee.snapshotManager as SnapshotManagerLike
542
- ).reEncryptWithNewKey(
532
+ await e2ee.snapshotManager!
533
+ .reEncryptWithNewKey(
543
534
  newKey,
544
535
  newSaltBase64,
545
536
  newIterations
@@ -638,7 +629,7 @@ export const headerbarModel = () => ({
638
629
  db.bibDB,
639
630
  db.imageDB,
640
631
  editor.app.csl,
641
- editor.docInfo.updated,
632
+ editor.docInfo.updated as Date,
642
633
  getDocumentTemplate(editor).documentStyles
643
634
  )
644
635
  exporter.progressCallback = exportProgress(doc)
@@ -666,7 +657,7 @@ export const headerbarModel = () => ({
666
657
  db.bibDB,
667
658
  db.imageDB,
668
659
  editor.app.csl,
669
- editor.docInfo.updated,
660
+ editor.docInfo.updated as Date,
670
661
  getDocumentTemplate(editor).documentStyles
671
662
  )
672
663
  exporter.progressCallback = exportProgress(doc)
@@ -692,7 +683,7 @@ export const headerbarModel = () => ({
692
683
  doc,
693
684
  db.bibDB,
694
685
  db.imageDB,
695
- editor.docInfo.updated
686
+ editor.docInfo.updated as Date
696
687
  )
697
688
  exporter.progressCallback = exportProgress(doc)
698
689
  exporter.init()
@@ -720,7 +711,7 @@ export const headerbarModel = () => ({
720
711
  db.bibDB,
721
712
  db.imageDB,
722
713
  editor.app.csl,
723
- editor.docInfo.updated,
714
+ editor.docInfo.updated as Date,
724
715
  "article"
725
716
  )
726
717
  exporter.progressCallback = exportProgress(doc)
@@ -749,7 +740,7 @@ export const headerbarModel = () => ({
749
740
  db.bibDB,
750
741
  db.imageDB,
751
742
  editor.app.csl,
752
- editor.docInfo.updated,
743
+ editor.docInfo.updated as Date,
753
744
  "book-part-wrapper"
754
745
  )
755
746
  exporter.progressCallback = exportProgress(doc)
@@ -778,7 +769,7 @@ export const headerbarModel = () => ({
778
769
  db.bibDB,
779
770
  db.imageDB,
780
771
  editor.app.csl,
781
- editor.docInfo.updated
772
+ editor.docInfo.updated as Date
782
773
  )
783
774
  exporter.progressCallback = exportProgress(doc)
784
775
  exporter.init()
@@ -1061,12 +1052,6 @@ export const headerbarModel = () => ({
1061
1052
  return editor.view.state.doc.attrs.copyright
1062
1053
  ? true
1063
1054
  : false
1064
- },
1065
- available: (editor: Editor) => {
1066
- return editor.view.state.doc.attrs.copyrights &&
1067
- editor.view.state.doc.attrs.copyrights.length
1068
- ? true
1069
- : false
1070
1055
  }
1071
1056
  }
1072
1057
  ]
package/src/state_plugins/collab_carets.ts CHANGED
@@ -22,8 +22,8 @@ interface CollabCaretsState {
22
22
  export const getSelectionUpdate = (
23
23
  state: EditorState
24
24
  ): false | {anchor: number; head: number} => {
25
- const pluginState = key.getState(state) as CollabCaretsState
26
- return pluginState.caretUpdate
25
+ const pluginState = key.getState(state) as CollabCaretsState | undefined
26
+ return pluginState?.caretUpdate || false
27
27
  }
28
28
 
29
29
  export const updateCollaboratorSelection = (
@@ -31,7 +31,10 @@ export const updateCollaboratorSelection = (
31
31
  collaborator: {id: number; name: string},
32
32
  data: {session_id: string; anchor: number; head: number}
33
33
  ): Transaction => {
34
- let pluginState = key.getState(state) as CollabCaretsState
34
+ const pluginState = key.getState(state) as CollabCaretsState | undefined
35
+ if (!pluginState) {
36
+ return state.tr.setMeta(key, {decos: DecorationSet.empty, caretPositions: [], caretUpdate: false})
37
+ }
35
38
  let {decos, caretPositions} = pluginState
36
39
 
37
40
  const oldCarPos = caretPositions.find(
@@ -95,7 +98,10 @@ export const removeCollaboratorSelection = (
95
98
  state: EditorState,
96
99
  data: {session_id: string}
97
100
  ): Transaction | false => {
98
- let pluginState = key.getState(state) as CollabCaretsState
101
+ const pluginState = key.getState(state) as CollabCaretsState | undefined
102
+ if (!pluginState) {
103
+ return false
104
+ }
99
105
  let {decos, caretPositions} = pluginState
100
106
 
101
107
  const caretPosition = caretPositions.find(
@@ -138,8 +144,11 @@ export const collabCaretsPlugin = (_options: {editor: unknown}) =>
138
144
  // of previous values
139
145
  return meta
140
146
  }
141
- let pluginState = key.getState(oldState) as CollabCaretsState,
142
- {decos, caretPositions} = pluginState,
147
+ const pluginState = key.getState(oldState) as CollabCaretsState | undefined
148
+ if (!pluginState) {
149
+ return {decos: DecorationSet.empty, caretPositions: [], caretUpdate: false}
150
+ }
151
+ let {decos, caretPositions} = pluginState,
143
152
  caretUpdate: false | {anchor: number; head: number} = false
144
153
 
145
154
  decos = decos.map(tr.mapping, tr.doc, {
package/src/state_plugins/comments.ts CHANGED
@@ -77,7 +77,11 @@ export const addCommentDuringCreationDecoration = (
77
77
  if (!tr.selection.from || tr.selection.from === tr.selection.to) {
78
78
  return false
79
79
  }
80
- let {decos} = key.getState(state) as {decos: DecorationSet}
80
+ const pluginState = key.getState(state) as {decos: DecorationSet} | undefined
81
+ if (!pluginState) {
82
+ return false
83
+ }
84
+ let {decos} = pluginState
81
85
 
82
86
  const commentDuringCreationDeco = (
83
87
  decos.find(
@@ -107,7 +111,11 @@ export const removeCommentDuringCreationDecoration = (
107
111
  state: EditorState,
108
112
  tr: Transaction
109
113
  ): Transaction | false => {
110
- let {decos} = key.getState(state) as {decos: DecorationSet}
114
+ const pluginState = key.getState(state) as {decos: DecorationSet} | undefined
115
+ if (!pluginState) {
116
+ return false
117
+ }
118
+ let {decos} = pluginState
111
119
 
112
120
  const commentDuringCreationDecos = decos.find(
113
121
  undefined,
@@ -126,7 +134,11 @@ export const removeCommentDuringCreationDecoration = (
126
134
  export const getCommentDuringCreationDecoration = (
127
135
  state: EditorState
128
136
  ): Decoration | false => {
129
- const {decos} = key.getState(state) as {decos: DecorationSet}
137
+ const pluginState = key.getState(state) as {decos: DecorationSet} | undefined
138
+ if (!pluginState) {
139
+ return false
140
+ }
141
+ const {decos} = pluginState
130
142
 
131
143
  const deco = decos.find(
132
144
  undefined,
@@ -157,7 +169,11 @@ export const commentsPlugin = (options: CommentPluginOptions) =>
157
169
  // of previous values
158
170
  return meta
159
171
  }
160
- let {decos} = key.getState(oldState) as {decos: DecorationSet}
172
+ const oldPluginState = key.getState(oldState) as {decos: DecorationSet} | undefined
173
+ if (!oldPluginState) {
174
+ return {decos: DecorationSet.empty}
175
+ }
176
+ let {decos} = oldPluginState
161
177
 
162
178
  decos = decos.map(tr.mapping, tr.doc, {
163
179
  onRemove: _decoSpec => {
@@ -282,7 +298,11 @@ export const commentsPlugin = (options: CommentPluginOptions) =>
282
298
  },
283
299
  props: {
284
300
  decorations(state: EditorState) {
285
- const {decos} = this.getState(state) as {decos: DecorationSet}
301
+ const pluginState = this.getState(state) as {decos: DecorationSet} | undefined
302
+ if (!pluginState) {
303
+ return DecorationSet.empty
304
+ }
305
+ const {decos} = pluginState
286
306
  return decos
287
307
  }
288
308
  }
package/src/state_plugins/contributor_input/plugin.ts CHANGED
@@ -187,8 +187,11 @@ export const contributorInputPlugin = (
187
187
  props: {
188
188
  nodeViews: {},
189
189
  decorations(state: EditorState) {
190
- const {decos} = key.getState(state) as ContributorInputState
191
-
190
+ const pluginState = key.getState(state) as ContributorInputState | undefined
191
+ if (!pluginState) {
192
+ return DecorationSet.empty
193
+ }
194
+ const {decos} = pluginState
192
195
  return decos
193
196
  },
194
197
  /**
package/src/state_plugins/links.ts CHANGED
@@ -876,7 +876,11 @@ ${
876
876
  return false
877
877
  },
878
878
  decorations(state: EditorState) {
879
- const {decos} = key.getState(state) as LinksPluginState
879
+ const pluginState = key.getState(state) as LinksPluginState | undefined
880
+ if (!pluginState) {
881
+ return DecorationSet.empty
882
+ }
883
+ const {decos} = pluginState
880
884
  return decos
881
885
  }
882
886
  }
package/src/state_plugins/track/plugin.ts CHANGED
@@ -92,7 +92,11 @@ export function trackPlugin(options: {editor: Editor}) {
92
92
  return meta
93
93
  }
94
94
 
95
- let {decos} = key.getState(state) as {decos: DecorationSet}
95
+ const oldPluginState = key.getState(state) as {decos: DecorationSet} | undefined
96
+ if (!oldPluginState) {
97
+ return {decos: DecorationSet.empty}
98
+ }
99
+ let {decos} = oldPluginState
96
100
 
97
101
  if (tr.selectionSet) {
98
102
  const {insertion, deletion, formatChange} =
@@ -147,7 +151,10 @@ export function trackPlugin(options: {editor: Editor}) {
147
151
  },
148
152
  props: {
149
153
  decorations(state) {
150
- const pluginState = this.getState(state) as {decos: DecorationSet}
154
+ const pluginState = this.getState(state) as {decos: DecorationSet} | undefined
155
+ if (!pluginState) {
156
+ return DecorationSet.empty
157
+ }
151
158
  return pluginState.decos
152
159
  },
153
160
  handleDOMEvents: {
package/src/types.ts CHANGED
@@ -105,6 +105,9 @@ export interface EditorMod {
105
105
  participants: Array<{id: number; name?: string; session_id?: string; sessionIds?: string[]}>
106
106
  pastParticipants: Array<{id: number; name?: string}>
107
107
  updateParticipantList(participants: unknown[]): void
108
+ colors: {
109
+ ensureUserColor(id: number): void
110
+ }
108
111
  chat: {
109
112
  newMessage(message: unknown): void
110
113
  showChat(participants: unknown[]): void
@@ -114,6 +117,7 @@ export interface EditorMod {
114
117
  updateDOM(): void
115
118
  view(view: EditorView): void
116
119
  init(): void
120
+ marginBoxes: Array<{view?: string; type?: string; pos?: number}>
117
121
  }
118
122
  footnotes?: {
119
123
  fnEditor: {
@@ -134,6 +138,12 @@ export interface EditorMod {
134
138
  receive(events: unknown[]): void
135
139
  comments: Record<string, unknown>
136
140
  }
141
+ interactions: {
142
+ createNewComment(): void
143
+ isCurrentlyEditing(): boolean
144
+ deactivateAll(): void
145
+ deactivateSelectedChanges(): void
146
+ }
137
147
  }
138
148
  documentTemplate?: {
139
149
  documentStyles: Array<{slug: string}>
@@ -182,6 +192,12 @@ export interface EditorE2EE {
182
192
  sendInitialSnapshot(...args: unknown[]): void
183
193
  handleRequestSnapshot(data: unknown): void
184
194
  handleSnapshotReceived(data: unknown): void
195
+ getEncryptedSnapshot(): Promise<any | null>
196
+ reEncryptWithNewKey(
197
+ newKey: CryptoKey,
198
+ newSaltBase64: string,
199
+ newIterations: number
200
+ ): Promise<void>
185
201
  }
186
202
  encrypted?: boolean
187
203
  encryptionSalt?: string