Skip to content

Rallly is an open-source scheduling and collaboration tool designed to make organizing events and meetings easier.

⚡️ Handle tab change on client

Luke Vella5a4dac2548c2
diff --git a/apps/web/src/app/[locale]/(space)/(dashboard)/settings/components/settings-tabs.tsx b/apps/web/src/app/[locale]/(space)/(dashboard)/settings/components/settings-tabs.tsx
index aa251f717..b63b3e29e 100644
--- a/apps/web/src/app/[locale]/(space)/(dashboard)/settings/components/settings-tabs.tsx
+++ b/apps/web/src/app/[locale]/(space)/(dashboard)/settings/components/settings-tabs.tsx
@@ -3,15 +3,15 @@
import { Tabs, TabsContent, TabsList, TabsTrigger } from "@rallly/ui/page-tabs";
import Link from "next/link";
import { useSelectedLayoutSegments } from "next/navigation";
+import React from "react";
import { Trans } from "@/components/trans";
import { IfFeatureEnabled } from "@/lib/feature-flags/client";
export function SettingsTabs({ children }: { children: React.ReactNode }) {
const segments = useSelectedLayoutSegments();
- const activeTab = segments[0] || "general";
-
+ const [tab, setTab] = React.useState(segments[0] || "general");
return (
- <Tabs value={activeTab} className="w-full">
+ <Tabs value={tab} onValueChange={setTab} className="w-full">
<TabsList>
<TabsTrigger value="general" asChild>
<Link href="/settings/general">
@@ -31,7 +31,7 @@ export function SettingsTabs({ children }: { children: React.ReactNode }) {
</TabsTrigger>
</IfFeatureEnabled>
</TabsList>
- <TabsContent tabIndex={-1} value={activeTab}>
+ <TabsContent tabIndex={-1} value={tab}>
{children}
</TabsContent>
</Tabs>
diff --git a/apps/web/src/app/[locale]/(space)/(dashboard)/settings/loading.tsx b/apps/web/src/app/[locale]/(space)/(dashboard)/settings/loading.tsx
new file mode 100644
index 000000000..8516dc873
--- /dev/null
+++ b/apps/web/src/app/[locale]/(space)/(dashboard)/settings/loading.tsx
@@ -0,0 +1,5 @@
+import { Spinner } from "@/components/spinner";
+
+export default function Loading() {
+ return <Spinner />;
+}