From 69e5b248ca4b667fe8af298e27c0622ac4c3c307 Mon Sep 17 00:00:00 2001
From: Shahriar Shojib <shahriar-shojib@users.noreply.github.com>
Date: Tue, 13 Jun 2023 23:05:28 +0600
Subject: [PATCH] fix: properly remove awareness from store (#1565)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Describe what your pull request does. If appropriate, add GIFs or images
showing the before and after.

### Change Type
This pr updates yjs example to remove awareness when a peer disconnects

<!-- 💡 Indicate the type of change your pull request is. -->
<!-- 🤷‍♀️ If you're not sure, don't select anything -->
<!-- ✂️ Feel free to delete unselected options -->

<!-- To select one, put an x in the box: [x] -->

- [ ] `patch` — Bug Fix
- [ ] `minor` — New Feature
- [ ] `major` — Breaking Change
- [ ] `dependencies` — Dependency Update (publishes a `patch` release,
for devDependencies use `internal`)
- [x] `documentation` — Changes to the documentation only (will not
publish a new version)
- [ ] `tests` — Changes to any testing-related code only (will not
publish a new version)
- [ ] `internal` — Any other changes that don't affect the published
package (will not publish a new version)

### Test Plan

1. Add a step-by-step description of how to test your PR here.
2.

- [ ] Unit Tests
- [ ] Webdriver tests

### Release Notes

- Add a brief release note for your PR here.

---------

Co-authored-by: Steve Ruiz <steveruizok@gmail.com>
---
 apps/examples/src/yjs/y.ts | 47 ++++++++++++++++++++++----------------
 1 file changed, 27 insertions(+), 20 deletions(-)

diff --git a/apps/examples/src/yjs/y.ts b/apps/examples/src/yjs/y.ts
index 5fe30ba60..d06d8b8af 100644
--- a/apps/examples/src/yjs/y.ts
+++ b/apps/examples/src/yjs/y.ts
@@ -6,12 +6,10 @@ import {
 	TLRecord,
 	TLStore,
 	TLStoreEventInfo,
-	uniqueId,
 } from '@tldraw/tldraw'
 import { WebsocketProvider } from 'y-websocket'
 import * as Y from 'yjs'
 
-const USER_ID = uniqueId()
 const ROOM_ID = 'tldraw-20'
 const HOST_URL =
 	process.env.NODE_ENV === 'development' ? 'ws://localhost:1234' : 'wss://demos.yjs.dev'
@@ -96,23 +94,23 @@ export function syncYjsDocChangesToStore(store: TLStore) {
 function syncStoreChangesToYjsAwareness({ changes }: TLStoreEventInfo) {
 	roomAwareness.doc.transact(() => {
 		Object.values(changes.added).forEach((record) => {
+			const idWithUserId = record.id.split(':')[0] + ':' + roomAwareness.clientID
 			roomAwareness.setLocalStateField(record.typeName, {
 				...record,
-				id: record.id.split(':')[0] + ':' + USER_ID,
+				id: idWithUserId,
 			})
 		})
 
 		Object.values(changes.updated).forEach(([_, record]) => {
+			const idWithUserId = record.id.split(':')[0] + ':' + roomAwareness.clientID
 			roomAwareness.setLocalStateField(record.typeName, {
 				...record,
-				id: record.id.split(':')[0] + ':' + USER_ID,
+				id: idWithUserId,
 			})
 		})
 
 		Object.values(changes.removed).forEach((record) => {
-			const current = { ...roomAwareness.getLocalState() }
-			delete current[record.typeName]
-			roomAwareness.setLocalState(current)
+			roomAwareness.setLocalStateField(record.typeName, null)
 		})
 	})
 }
@@ -130,22 +128,31 @@ export function syncYjsAwarenessChangesToStore(store: TLStore) {
 		'update',
 		({ added, updated, removed }: { added: number[]; updated: number[]; removed: number[] }) => {
 			const states = roomAwareness.getStates()
-			// roomAwareness.getStates(update)
+
 			store.mergeRemoteChanges(() => {
-				added.forEach((id: number) => {
-					const record = states.get(id) as TLRecord
-					store.put(Object.values(record))
+				added.forEach((id) => {
+					const state = states.get(id) as Record<TLRecord['id'], TLRecord>
+					const records = Object.values(state)
+					store.put(records)
 				})
-				updated.forEach((id: number) => {
-					const record = states.get(id) as TLRecord
-					store.put(Object.values(record))
-				})
-				removed.forEach((id: number) => {
-					const record = states.get(id) as TLRecord
-					if (record) {
-						store.remove(Object.values(record))
-					}
+
+				updated.forEach((id) => {
+					const state = states.get(id) as Record<TLRecord['id'], TLRecord>
+					const records = Object.values(state)
+					store.put(records)
 				})
+
+				if (removed.length) {
+					const allRecords = store.allRecords()
+
+					removed.forEach((id) => {
+						const recordsToRemove = allRecords
+							.filter((record) => record.id.split(':')[1] === id.toString())
+							.map((record) => record.id)
+
+						store.remove(recordsToRemove)
+					})
+				}
 			})
 		}
 	)