Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/all-doors-sing.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@clerk/clerk-js': patch
---

Fix browser back / forward navigation for tabs
12 changes: 10 additions & 2 deletions packages/clerk-js/src/ui/hooks/useTabState.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React from 'react';
import { useEffect, useState } from 'react';

import { useRouter } from '../router';

Expand All @@ -15,7 +15,15 @@ export const useTabState = (tabMap: TabMap, defaultTab = 0) => {
return tabIndex ? parseInt(tabIndex, 10) : defaultTab;
};

const [selectedTab, setSelectedTab] = React.useState(getInitialTab());
const [selectedTab, setSelectedTab] = useState(getInitialTab());

// Listen for URL changes (browser back/forward)
useEffect(() => {
const currentTab = getInitialTab();
if (currentTab !== selectedTab) {
setSelectedTab(currentTab);
}
}, [router.queryParams.tab]);

const handleTabChange = (index: number) => {
setSelectedTab(index);
Expand Down
Loading