From 51bb732606f4a131a5ad2b61b9ea3809fd625aea Mon Sep 17 00:00:00 2001 From: Yifeng Wang Date: Wed, 5 Jan 2022 01:20:57 +0800 Subject: [PATCH 1/6] fix minor typos --- INTERNALS.md | 4 ++-- src/structs/ContentType.js | 2 +- src/structs/Item.js | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/INTERNALS.md b/INTERNALS.md index 45e987b6..a0014568 100644 --- a/INTERNALS.md +++ b/INTERNALS.md @@ -153,7 +153,7 @@ an incremental document updates that allows clients to sync with each other. The update object is an Uint8Array that efficiently encodes `Item` objects and the delete set. * `state vector`: A state vector defines the know state of each user (a set of - tubles `(client, clock)`). This object is also efficiently encoded as a + tuples `(client, clock)`). This object is also efficiently encoded as a Uint8Array. The client can ask a remote client for missing document updates by sending @@ -168,7 +168,7 @@ An implementation of the syncing process is in ## Snapshots A snapshot can be used to restore an old document state. It is a `state vector` -\+ `delete set`. I client can restore an old document state by iterating through +\+ `delete set`. A client can restore an old document state by iterating through the sequence CRDT and ignoring all Items that have an `id.clock > stateVector[id.client].clock`. Instead of using `item.deleted` the client will use the delete set to find out if an item was deleted or not. diff --git a/src/structs/ContentType.js b/src/structs/ContentType.js index 30851077..8b5dabae 100644 --- a/src/structs/ContentType.js +++ b/src/structs/ContentType.js @@ -109,7 +109,7 @@ export class ContentType { if (!item.deleted) { item.delete(transaction) } else { - // Whis will be gc'd later and we want to merge it if possible + // This will be gc'd later and we want to merge it if possible // We try to merge all deleted items after each transaction, // but we have no knowledge about that this needs to be merged // since it is not in transaction.ds. Hence we add it to transaction._mergeStructs diff --git a/src/structs/Item.js b/src/structs/Item.js index 656f5e5b..06b2f968 100644 --- a/src/structs/Item.js +++ b/src/structs/Item.js @@ -281,7 +281,7 @@ export class Item extends AbstractStruct { */ this.parentSub = parentSub /** - * If this type's effect is reundone this type refers to the type that undid + * If this type's effect is redone this type refers to the type that undid * this operation. * @type {ID | null} */ From 8fec835338f3ec06c4ffc4ae5b962fd7624726a1 Mon Sep 17 00:00:00 2001 From: Yousef Date: Tue, 18 Jan 2022 18:41:06 +0100 Subject: [PATCH 2/6] Update README.md --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index 80d8ff47..f6a21923 100644 --- a/README.md +++ b/README.md @@ -141,6 +141,10 @@ Also includes a peer-sync mechanism to catch up on missed updates. multifeed. Each client has an append-only log of CRDT local updates (hypercore). Multifeed manages and sync hypercores and y-dat listens to changes and applies them to the Yjs document. + +
Matrix-CRDT
+
+ Use Matrix as an off-the-shelf backend for Yjs by using the MatrixProvider. Use Matrix as transport and storage of Yjs updates, so you can focus building your client app and Matrix can provide powerful features like Authentication, Authorization, Federation, hosting (self-hosting or SaaS) and even End-to-End Encryption (E2EE).
From 532d5fccb2bdd9ba62d7cf90c14762b0530c9b72 Mon Sep 17 00:00:00 2001 From: Carlos Galarza Date: Thu, 20 Jan 2022 17:32:02 -0500 Subject: [PATCH 3/6] fix typo in README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index f6a21923..7e198ab8 100644 --- a/README.md +++ b/README.md @@ -984,7 +984,7 @@ undoManager.on('stack-item-popped', event => { *Conflict-free replicated data types* (CRDT) for collaborative editing are an alternative approach to *operational transformation* (OT). A very simple -differenciation between the two approaches is that OT attempts to transform +differentiation between the two approaches is that OT attempts to transform index positions to ensure convergence (all clients end up with the same content), while CRDTs use mathematical models that usually do not involve index transformations, like linked lists. OT is currently the de-facto standard for From 8f0d7cdfc26d991f2d4bfea84cf6593cea9c0492 Mon Sep 17 00:00:00 2001 From: Roeland Bosch Date: Mon, 24 Jan 2022 16:55:02 +0100 Subject: [PATCH 4/6] Update Pluxbox RadioManager location --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 7e198ab8..e0091426 100644 --- a/README.md +++ b/README.md @@ -63,7 +63,7 @@ Sponsorship also comes with special perks! [![Become a Sponsor](https://img.shie * [Nimbus Note](https://nimbusweb.me/note.php) A note-taking app designed by Nimbus Web. * [JoeDocs](https://joedocs.com/) An open collaborative wiki. -* [Pluxbox RadioManager](https://pluxbox.com/) A web-based app to +* [Pluxbox RadioManager](https://getradiomanager.com/) A web-based app to collaboratively organize radio broadcasts. * [Alldone](https://alldone.app/) A next-gen project management and collaboration platform. From 99326f67b869dd41f502ebb8be2dac6ed28cae10 Mon Sep 17 00:00:00 2001 From: Kevin Jahns Date: Tue, 25 Jan 2022 12:31:22 +0100 Subject: [PATCH 5/6] Closes #377 --- README.md | 4 ---- 1 file changed, 4 deletions(-) diff --git a/README.md b/README.md index e0091426..9a6c3f29 100644 --- a/README.md +++ b/README.md @@ -56,10 +56,6 @@ Sponsorship also comes with special perks! [![Become a Sponsor](https://img.shie * [Input](https://input.com/) A collaborative note taking app. :star2: * [Room.sh](https://room.sh/) A meeting application with integrated collaborative drawing, editing, and coding tools. :star: -* [https://coronavirustechhandbook.com/](https://coronavirustechhandbook.com/) - A collaborative wiki that is edited by thousands of different people to work - on a rapid and sophisticated response to the coronavirus outbreak and - subsequent impacts. :star: * [Nimbus Note](https://nimbusweb.me/note.php) A note-taking app designed by Nimbus Web. * [JoeDocs](https://joedocs.com/) An open collaborative wiki. From b6562f3e80b50c77f8c756130f5622668876e671 Mon Sep 17 00:00:00 2001 From: Yousef Date: Tue, 1 Feb 2022 16:54:06 +0100 Subject: [PATCH 6/6] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 9a6c3f29..fc7a7635 100644 --- a/README.md +++ b/README.md @@ -95,7 +95,7 @@ are implemented in separate modules. | [Monaco](https://microsoft.github.io/monaco-editor/) | ✔ | [y-monaco](https://github.com/yjs/y-monaco) | [demo](https://demos.yjs.dev/monaco/monaco.html) | | [Slate](https://github.com/ianstormtaylor/slate) | ✔ | [slate-yjs](https://github.com/bitphinix/slate-yjs) | [demo](https://bitphinix.github.io/slate-yjs-example) | | [valtio](https://github.com/pmndrs/valtio) | | [valtio-yjs](https://github.com/dai-shi/valtio-yjs) | [demo](https://codesandbox.io/s/valtio-yjs-demo-ox3iy) | -| React / Vue / MobX | | [SyncedStore](https://syncedstore.org) | [demo](https://syncedstore.org/docs/react) | +| React / Vue / Svelte / MobX | | [SyncedStore](https://syncedstore.org) | [demo](https://syncedstore.org/docs/react) | ### Providers