Skip to content

Commit 915d8f6

Browse files
desiprisgnikosdouvlis
authored andcommitted
fix(clerk-js): Disable scroll to top for OrganizationProfile navbar
1 parent eea559f commit 915d8f6

3 files changed

Lines changed: 11 additions & 6 deletions

File tree

packages/clerk-js/src/ui/components/OrganizationProfile/OrganizationMembers.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ export const OrganizationMembers = () => {
4141
justify={'between'}
4242
align={'center'}
4343
>
44-
<Header.Root id='cl-section-members'>
44+
<Header.Root>
4545
<Header.Title
4646
localizationKey={localizationKeys('organizationProfile.start.headerTitle__members')}
4747
textVariant='xxlargeMedium'

packages/clerk-js/src/ui/components/OrganizationProfile/OrganizationSettings.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ export const OrganizationSettings = () => {
2020
// elementId={descriptors.profilePage.setId('account')}
2121
gap={8}
2222
>
23-
<Header.Root id='cl-section-settings'>
23+
<Header.Root>
2424
<Header.Title
2525
localizationKey={localizationKeys('organizationProfile.start.headerTitle__settings')}
2626
textVariant='xxlargeMedium'

packages/clerk-js/src/ui/elements/Navbar.tsx

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,20 @@ type NavbarContextValue = { isOpen: boolean; open: () => void; close: () => void
2222
export const [NavbarContext, useNavbarContext, useUnsafeNavbarContext] =
2323
createContextAndHook<NavbarContextValue>('NavbarContext');
2424

25-
export const NavbarContextProvider = (props: React.PropsWithChildren<{}>) => {
25+
export const NavbarContextProvider = (props: React.PropsWithChildren<Record<never, never>>) => {
2626
const [isOpen, setIsOpen] = React.useState(false);
2727
const open = React.useCallback(() => setIsOpen(true), []);
2828
const close = React.useCallback(() => setIsOpen(false), []);
2929
const value = React.useMemo(() => ({ value: { isOpen, open, close } }), [isOpen]);
3030
return <NavbarContext.Provider value={value}>{props.children}</NavbarContext.Provider>;
3131
};
3232

33-
export type NavbarRoute = { name: LocalizationKey; id: string; icon: React.ComponentType; path: string };
33+
export type NavbarRoute = {
34+
name: LocalizationKey;
35+
id: string;
36+
icon: React.ComponentType;
37+
path: string;
38+
};
3439
type RouteId = NavbarRoute['id'];
3540
type NavBarProps = {
3641
contentRef: React.RefObject<HTMLDivElement>;
@@ -135,7 +140,7 @@ export const NavBar = (props: NavBarProps) => {
135140
);
136141
};
137142

138-
const NavbarContainer = (props: React.PropsWithChildren<{}>) => {
143+
const NavbarContainer = (props: React.PropsWithChildren<Record<never, never>>) => {
139144
return (
140145
<Col
141146
elementDescriptor={descriptors.navbar}
@@ -154,7 +159,7 @@ const NavbarContainer = (props: React.PropsWithChildren<{}>) => {
154159
);
155160
};
156161

157-
const MobileNavbarContainer = (props: React.PropsWithChildren<{}>) => {
162+
const MobileNavbarContainer = (props: React.PropsWithChildren<Record<never, never>>) => {
158163
const navbarContext = useNavbarContext();
159164
const { floating, isOpen, open, close } = usePopover({ defaultOpen: false, autoUpdate: false });
160165

0 commit comments

Comments
 (0)