[pull] main from tldraw:main

apps/dotcom/client/e2e/fixtures/Sidebar.ts

@@ -24,7 +24,7 @@ export class Sidebar {
 		this.helpMenu = this.page.getByTestId('tla-sidebar-help-menu-trigger')
 		this.themeButton = this.page.getByTestId('dialog-sub.help menu color-scheme-button')
 		this.darkModeButton = this.page.getByText('Dark')
-		this.signOutButton = this.page.getByText('Sign out')
+		this.signOutButton = this.page.getByTestId('dialog.sign-out')
 	}
 
 	async isVisible() {
@@ -62,6 +62,8 @@ export class Sidebar {
 	async openUserSettingsMenu() {
 		await this.userSettingsMenu.hover()
 		await this.userSettingsMenu.click()
+		// Wait for the dropdown content to mount before child-item clicks race the open animation.
+		await expect(this.page.getByRole('menu')).toBeVisible()
 	}
 
 	@step

apps/dotcom/client/src/main.tsx

@@ -44,7 +44,6 @@ createRoot(document.getElementById('root')!).render(
 )
 
 showConsoleBranding()
-
 try {
 	// we have a dummy service worker that unregisters itself immediately
 	// this was needed to remove the service worker we used to have from the cache

apps/dotcom/client/src/tla/components/TlaEditor/TlaEditorTopLeftPanel.tsx

@@ -44,6 +44,7 @@ import { TLAppUiEventSource, useTldrawAppUiEvents } from '../../utils/app-ui-eve
 import { getIsCoarsePointer } from '../../utils/getIsCoarsePointer'
 import { defineMessages, useIntl, useMsg } from '../../utils/i18n'
 import { TlaSignInDialog } from '../dialogs/TlaSignInDialog'
+import { ExternalLink } from '../ExternalLink/ExternalLink'
 import {
 	CookieConsentMenuItem,
 	GiveUsFeedbackMenuItem,
@@ -106,15 +107,14 @@ export function TlaEditorTopLeftPanelAnonymous() {
 
 	return (
 		<>
-			<a
-				href="https://tldraw.dev?utm_source=dotcom&utm_medium=organic&utm_campaign=top-left-logo"
-				target="_blank"
-				rel="noopener noreferrer"
+			<ExternalLink
+				to="https://tldraw.dev?utm_source=dotcom&utm_medium=organic&utm_campaign=top-left-logo"
+				eventName="top-left-logo-clicked"
 				aria-label="tldraw.dev"
 				className={styles.topLeftOfflineLogo}
 			>
 				<TlaLogo data-testid="tla-top-left-logo-icon" />
-			</a>
+			</ExternalLink>
 			{anonFileName && (
 				<>
 					<span

apps/dotcom/client/src/tla/components/TlaSidebar/components/TlaSidebarWorkspaceLink.tsx

@@ -1,10 +1,17 @@
+import { ExternalLink } from '../../ExternalLink/ExternalLink'
 import { TlaLogo } from '../../TlaLogo/TlaLogo'
 import styles from '../sidebar.module.css'
 
 export function TlaSidebarWorkspaceLink() {
 	return (
-		<div className={styles.sidebarWorkspaceButton} data-testid="tla-sidebar-workspace-link">
+		<ExternalLink
+			to="https://tldraw.dev?utm_source=dotcom&utm_medium=organic&utm_campaign=top-left-logo"
+			eventName="sidebar-logo-clicked"
+			aria-label="tldraw.dev"
+			className={styles.sidebarWorkspaceButton}
+			data-testid="tla-sidebar-workspace-link"
+		>
 			<TlaLogo data-testid="tla-sidebar-logo-icon" />
-		</div>
+		</ExternalLink>
 	)
 }

apps/dotcom/client/src/tla/components/TlaSidebar/sidebar.module.css

@@ -236,7 +236,7 @@
 	flex: 0 0 auto;
 }
 
-/* Workspace link (sort of) */
+/* Workspace link */
 
 .sidebarWorkspaceButton {
 	background: none;