Rallly is an open-source scheduling and collaboration tool designed to make organizing events and meetings easier.
TypeScript i18nextnext-authnextjspostgresqlprismareact-emailt3-stacktailwindcsstrpcturborepotypescriptzod
⚡️ Optimistic updates for space switcher
Luke Velladc0ed1ec7465
diff --git a/apps/web/src/app/[locale]/(space)/(dashboard)/layout.tsx b/apps/web/src/app/[locale]/(space)/(dashboard)/layout.tsxindex 0c1bbfdf4..70bd6b684 100644--- a/apps/web/src/app/[locale]/(space)/(dashboard)/layout.tsx+++ b/apps/web/src/app/[locale]/(space)/(dashboard)/layout.tsx@@ -38,7 +38,7 @@ export default async function Layout({<CommandMenu /><Sidebar variant="inset"><SidebarHeader>- <SpaceDropdown spaces={spaces} activeSpaceId={activeSpace.id} />+ <SpaceDropdown spaces={spaces} initialSpaceId={activeSpace.id} /></SidebarHeader><SidebarContent><SpaceSidebarMenu />diff --git a/apps/web/src/features/space/components/space-dropdown.tsx b/apps/web/src/features/space/components/space-dropdown.tsxindex 8f0f36722..427085d22 100644--- a/apps/web/src/features/space/components/space-dropdown.tsx+++ b/apps/web/src/features/space/components/space-dropdown.tsx@@ -1,5 +1,6 @@"use client";+import { cn } from "@rallly/ui";import { Button } from "@rallly/ui/button";import { useDialog } from "@rallly/ui/dialog";import {@@ -14,6 +15,7 @@ import {} from "@rallly/ui/dropdown-menu";import { Icon } from "@rallly/ui/icon";import { ChevronsUpDownIcon, CirclePlusIcon } from "lucide-react";+import React from "react";import { RouterLoadingIndicator } from "@/components/router-loading-indicator";import { Trans } from "@/components/trans";import { setActiveSpaceAction } from "@/features/space/actions";@@ -24,7 +26,7 @@ import { SpaceIcon } from "./space-icon";export function SpaceDropdown({spaces,- activeSpaceId,+ initialSpaceId,}: {spaces: {id: string;@@ -32,11 +34,14 @@ export function SpaceDropdown({tier: "hobby" | "pro";image?: string;}[];- activeSpaceId: string;+ initialSpaceId: string;}) {+ const [selectedSpaceId, setSelectedSpaceId] = React.useState(initialSpaceId);+ const [isPending, startTransition] = React.useTransition();+const setActiveSpace = useSafeAction(setActiveSpaceAction);const newSpaceDialog = useDialog();- const activeSpace = spaces.find((space) => space.id === activeSpaceId);+ const activeSpace = spaces.find((space) => space.id === selectedSpaceId);if (!activeSpace) {return null;@@ -46,7 +51,13 @@ export function SpaceDropdown({<><DropdownMenu><DropdownMenuTrigger asChild={true}>- <Button className="flex h-auto w-full p-2" variant="ghost">+ <Button+ className={cn("flex h-auto w-full p-2", {+ "pointer-events-none animate-pulse":+ setActiveSpace.isPending || isPending,+ })}+ variant="ghost"+ ><SpaceIcon src={activeSpace.image} name={activeSpace.name} /><div className="min-w-0 flex-1 px-0.5 text-left"><div className="truncate font-medium text-sm">@@ -69,10 +80,13 @@ export function SpaceDropdown({<Trans i18nKey="spaces" defaults="Spaces" /></DropdownMenuLabel><DropdownMenuRadioGroup- value={activeSpaceId}+ value={selectedSpaceId}onValueChange={(value) => {- if (value === activeSpaceId) return;- setActiveSpace.execute({ spaceId: value });+ if (value === selectedSpaceId) return;+ setSelectedSpaceId(value);+ startTransition(() => {+ setActiveSpace.execute({ spaceId: value });+ });}}>{spaces.map((space) => (@@ -95,7 +109,7 @@ export function SpaceDropdown({</DropdownMenuItem></DropdownMenuContent></DropdownMenu>- {setActiveSpace.isExecuting ? <RouterLoadingIndicator /> : null}+ {isPending ? <RouterLoadingIndicator /> : null}<CreateSpaceDialog {...newSpaceDialog.dialogProps} /></>);