feat(clerk-js): Apply changes to ui.retheme

octoper · octoper · commit cfb3015a90d0 · 2023-11-21T21:19:33.000+02:00
diff --git a/packages/clerk-js/src/ui.retheme/components/OrganizationSwitcher/OrganizationSwitcherPopover.tsx b/packages/clerk-js/src/ui.retheme/components/OrganizationSwitcher/OrganizationSwitcherPopover.tsx
@@ -141,7 +141,7 @@ export const OrganizationSwitcherPopover = React.forwardRef<HTMLDivElement, Orga
             {currentOrg ? (
               <>
                 <OrganizationPreview
-                  elementId={'organizationSwitcher'}
+                  elementId={'organizationSwitcherActiveOrganization'}
                   gap={4}
                   organization={currentOrg}
                   user={user}
diff --git a/packages/clerk-js/src/ui.retheme/components/OrganizationSwitcher/OrganizationSwitcherTrigger.tsx b/packages/clerk-js/src/ui.retheme/components/OrganizationSwitcher/OrganizationSwitcherTrigger.tsx
@@ -40,7 +40,7 @@ export const OrganizationSwitcherTrigger = withAvatarShimmer(
       >
         {organization && (
           <OrganizationPreview
-            elementId={'organizationSwitcher'}
+            elementId={'organizationSwitcherTrigger'}
             gap={3}
             size={'sm'}
             organization={organization}
diff --git a/packages/clerk-js/src/ui.retheme/components/OrganizationSwitcher/UserInvitationSuggestionList.tsx b/packages/clerk-js/src/ui.retheme/components/OrganizationSwitcher/UserInvitationSuggestionList.tsx
@@ -120,7 +120,7 @@ const InvitationPreview = withCardStateProvider(
         })}
       >
         <OrganizationPreview
-          elementId='organizationSwitcher'
+          elementId='organizationSwitcherTrigger'
           avatarSx={t => ({ margin: `0 calc(${t.space.$3}/2)` })}
           organization={publicOrganizationData}
           size='sm'
diff --git a/packages/clerk-js/src/ui.retheme/components/OrganizationSwitcher/UserMembershipList.tsx b/packages/clerk-js/src/ui.retheme/components/OrganizationSwitcher/UserMembershipList.tsx
@@ -94,7 +94,7 @@ export const UserMembershipList = (props: UserMembershipListProps) => {
           role='menuitem'
         >
           <OrganizationPreview
-            elementId='organizationSwitcher'
+            elementId='organizationSwitcherListedOrganization'
             avatarSx={t => ({ margin: `0 calc(${t.space.$3}/2)` })}
             organization={organization}
             size='sm'

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ export const OrganizationSwitcherTrigger = withAvatarShimmer(`
`40`	`40`	`>`
`41`	`41`	`{organization && (`
`42`	`42`	`<OrganizationPreview`
`43`		`- elementId={'organizationSwitcher'}`
	`43`	`+ elementId={'organizationSwitcherTrigger'}`
`44`	`44`	`gap={3}`
`45`	`45`	`size={'sm'}`
`46`	`46`	`organization={organization}`
Original file line number	Diff line number	Diff line change
`@@ -120,7 +120,7 @@ const InvitationPreview = withCardStateProvider(`
`120`	`120`	`})}`
`121`	`121`	`>`
`122`	`122`	`<OrganizationPreview`
`123`		`- elementId='organizationSwitcher'`
	`123`	`+ elementId='organizationSwitcherTrigger'`
`124`	`124`	avatarSx={t => ({ margin: `0 calc(${t.space.$3}/2)` })}
`125`	`125`	`organization={publicOrganizationData}`
`126`	`126`	`size='sm'`
Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,7 @@ export const UserMembershipList = (props: UserMembershipListProps) => {`
`94`	`94`	`role='menuitem'`
`95`	`95`	`>`
`96`	`96`	`<OrganizationPreview`
`97`		`- elementId='organizationSwitcher'`
	`97`	`+ elementId='organizationSwitcherListedOrganization'`
`98`	`98`	avatarSx={t => ({ margin: `0 calc(${t.space.$3}/2)` })}
`99`	`99`	`organization={organization}`
`100`	`100`	`size='sm'`