[pull] main from tldraw:main

apps/dotcom/client/src/utils/analytics.tsx

@@ -178,6 +178,12 @@ function getGA4() {
 
 export function trackEvent(name: string, data?: { [key: string]: any }) {
 	getPosthog()?.capture(name, data)
+
+	// For GA4, rename 'source' to 'event_source' to avoid session attribution
+	if (data) {
+		const { source, ...rest } = data
+		data = source !== undefined ? { ...rest, event_source: source } : rest
+	}
 	getGA4()?.event(name, data)
 }
 

packages/sync-core/src/lib/TLSocketRoom.ts

@@ -24,6 +24,10 @@ export class TLSocketRoom<R extends UnknownRecord = UnknownRecord, SessionMeta =
 		{ assembler: JsonChunkAssembler; socket: WebSocketMinimal; unlisten: () => void }
 	>()
 	readonly log?: TLSyncLog
+	private readonly syncCallbacks: {
+		onDataChange?(): void
+		onPresenceChange?(): void
+	}
 
 	constructor(
 		public readonly opts: {
@@ -65,11 +69,14 @@ export class TLSocketRoom<R extends UnknownRecord = UnknownRecord, SessionMeta =
 				? convertStoreSnapshotToRoomSnapshot(opts.initialSnapshot!)
 				: opts.initialSnapshot
 
+		this.syncCallbacks = {
+			onDataChange: opts.onDataChange,
+			onPresenceChange: opts.onPresenceChange,
+		}
 		this.room = new TLSyncRoom<R, SessionMeta>({
+			...this.syncCallbacks,
 			schema: opts.schema ?? (createTLSchema() as any),
 			snapshot: initialSnapshot,
-			onDataChange: opts.onDataChange,
-			onPresenceChange: opts.onPresenceChange,
 			log: opts.log,
 		})
 		this.room.events.on('session_removed', (args) => {
@@ -314,6 +321,7 @@ export class TLSocketRoom<R extends UnknownRecord = UnknownRecord, SessionMeta =
 		})
 
 		const newRoom = new TLSyncRoom<R, SessionMeta>({
+			...this.syncCallbacks,
 			schema: oldRoom.schema,
 			snapshot: {
 				clock: oldRoom.clock + 1,

packages/sync-core/src/test/TLSocketRoom.test.ts

@@ -1,5 +1,5 @@
 import { InstancePresenceRecordType, PageRecordType } from '@tldraw/tlschema'
-import { createTLSchema, createTLStore } from 'tldraw'
+import { createTLSchema, createTLStore, ZERO_INDEX_KEY } from 'tldraw'
 import { WebSocketMinimal } from '../lib/ServerSocketAdapter'
 import { TLSocketRoom } from '../lib/TLSocketRoom'
 import { RecordOpType } from '../lib/diff'
@@ -241,4 +241,28 @@ describe(TLSocketRoom, () => {
 		)
 		expect(documentRecordIds).toHaveLength(0)
 	})
+
+	it('passes onDataChange handler through', async () => {
+		const addPage = (room: TLSocketRoom) =>
+			room.updateStore((store) => {
+				store.put(
+					PageRecordType.create({ id: PageRecordType.createId(), name: '', index: ZERO_INDEX_KEY })
+				)
+			})
+		const store = getStore()
+		store.ensureStoreIsUsable()
+		let called = 0
+
+		const room = new TLSocketRoom({ onDataChange: () => ++called })
+		expect(called).toEqual(0)
+
+		await addPage(room)
+		expect(called).toEqual(1)
+
+		room.loadSnapshot(room.getCurrentSnapshot())
+		expect(called).toEqual(1)
+
+		await addPage(room)
+		expect(called).toEqual(2)
+	})
 })