From b596c93ea0d264b8e3b21896f9ff28119e83339a Mon Sep 17 00:00:00 2001
From: George Desipris <george.desipris.56@gmail.com>
Date: Thu, 3 Nov 2022 18:14:52 +0200
Subject: [PATCH] fix(clerk-js): Disable scroll to top for OrganizationProfile
 navbar

---
 .../OrganizationProfile/OrganizationMembers.tsx     |  2 +-
 .../OrganizationProfile/OrganizationSettings.tsx    |  2 +-
 packages/clerk-js/src/ui/elements/Navbar.tsx        | 13 +++++++++----
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/packages/clerk-js/src/ui/components/OrganizationProfile/OrganizationMembers.tsx b/packages/clerk-js/src/ui/components/OrganizationProfile/OrganizationMembers.tsx
index 0556e093a0c..7d5b8069e17 100644
--- a/packages/clerk-js/src/ui/components/OrganizationProfile/OrganizationMembers.tsx
+++ b/packages/clerk-js/src/ui/components/OrganizationProfile/OrganizationMembers.tsx
@@ -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'
diff --git a/packages/clerk-js/src/ui/components/OrganizationProfile/OrganizationSettings.tsx b/packages/clerk-js/src/ui/components/OrganizationProfile/OrganizationSettings.tsx
index 2515b68c095..4f04a466d04 100644
--- a/packages/clerk-js/src/ui/components/OrganizationProfile/OrganizationSettings.tsx
+++ b/packages/clerk-js/src/ui/components/OrganizationProfile/OrganizationSettings.tsx
@@ -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'
diff --git a/packages/clerk-js/src/ui/elements/Navbar.tsx b/packages/clerk-js/src/ui/elements/Navbar.tsx
index bac89232ddb..f290215b4e6 100644
--- a/packages/clerk-js/src/ui/elements/Navbar.tsx
+++ b/packages/clerk-js/src/ui/elements/Navbar.tsx
@@ -22,7 +22,7 @@ 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), []);
@@ -30,7 +30,12 @@ export const NavbarContextProvider = (props: React.PropsWithChildren<{}>) => {
   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>;
@@ -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}
@@ -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 });