Skip to content

fix(clerk-js): Disable scroll to top for OrganizationProfile navbar #500

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nikosdouvlis merged 1 commit into from
Nov 4, 2022
Merged

fix(clerk-js): Disable scroll to top for OrganizationProfile navbar #500

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion packages/clerk-js/src/ui/components/OrganizationProfile/OrganizationMembers.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ export const OrganizationMembers = () => {
justify={'between'}
align={'center'}
>
<Header.Root id='cl-section-members'>
<Header.Root>
<Header.Title
localizationKey={localizationKeys('organizationProfile.start.headerTitle__members')}
textVariant='xxlargeMedium'
Expand Down
2 changes: 1 addition & 1 deletion packages/clerk-js/src/ui/components/OrganizationProfile/OrganizationSettings.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ export const OrganizationSettings = () => {
// elementId={descriptors.profilePage.setId('account')}
gap={8}
>
<Header.Root id='cl-section-settings'>
<Header.Root>
<Header.Title
localizationKey={localizationKeys('organizationProfile.start.headerTitle__settings')}
textVariant='xxlargeMedium'
Expand Down
13 changes: 9 additions & 4 deletions packages/clerk-js/src/ui/elements/Navbar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,20 @@ type NavbarContextValue = { isOpen: boolean; open: () => void; close: () => void
export const [NavbarContext, useNavbarContext, useUnsafeNavbarContext] =
createContextAndHook<NavbarContextValue>('NavbarContext');

export const NavbarContextProvider = (props: React.PropsWithChildren<{}>) => {
export const NavbarContextProvider = (props: React.PropsWithChildren<Record<never, never>>) => {
const [isOpen, setIsOpen] = React.useState(false);
const open = React.useCallback(() => setIsOpen(true), []);
const close = React.useCallback(() => setIsOpen(false), []);
const value = React.useMemo(() => ({ value: { isOpen, open, close } }), [isOpen]);
return <NavbarContext.Provider value={value}>{props.children}</NavbarContext.Provider>;
};

export type NavbarRoute = { name: LocalizationKey; id: string; icon: React.ComponentType; path: string };
export type NavbarRoute = {
name: LocalizationKey;
id: string;
icon: React.ComponentType;
path: string;
};
type RouteId = NavbarRoute['id'];
type NavBarProps = {
contentRef: React.RefObject<HTMLDivElement>;
Expand Down Expand Up @@ -135,7 +140,7 @@ export const NavBar = (props: NavBarProps) => {
);
};

const NavbarContainer = (props: React.PropsWithChildren<{}>) => {
const NavbarContainer = (props: React.PropsWithChildren<Record<never, never>>) => {
return (
<Col
elementDescriptor={descriptors.navbar}
Expand All @@ -154,7 +159,7 @@ const NavbarContainer = (props: React.PropsWithChildren<{}>) => {
);
};

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

Expand Down