@@ -109,7 +109,7 @@ function requiredPopup() {
109109const reading = ( ...names : string [ ] ) =>
110110 within ( requiredPopup ( ) )
111111 . queryAllByText ( new RegExp ( `^(${ names . join ( '|' ) } )$` ) )
112- . filter ( node => ! node . closest ( '.cl-user-button -header' ) )
112+ . filter ( node => ! node . closest ( '.cl-switcher -header' ) )
113113 . map ( node => node . textContent ) ;
114114
115115const current = ( ) =>
@@ -214,7 +214,7 @@ describe('Switcher', () => {
214214 await open ( ) ;
215215
216216 expect ( await screen . findByRole ( 'button' , { name : 'Other' } ) ) . toBeInTheDocument ( ) ;
217- expect ( requiredPopup ( ) . querySelector ( '.cl-user-button -header-description' ) ) . toHaveTextContent ( 'alice' ) ;
217+ expect ( requiredPopup ( ) . querySelector ( '.cl-switcher -header-description' ) ) . toHaveTextContent ( 'alice' ) ;
218218 } ) ;
219219
220220 describe ( 'switching organization' , ( ) => {
@@ -904,6 +904,16 @@ describe('Switcher', () => {
904904 } ) ;
905905
906906 describe ( 'in user mode' , ( ) => {
907+ it ( 'themes its parts through user-button slots' , async ( ) => {
908+ await renderSwitcher ( { mode : 'user' } ) ;
909+ await open ( ) ;
910+
911+ for ( const slot of [ 'trigger' , 'popover' , 'header' , 'item' , 'group' ] ) {
912+ expect ( document . querySelector ( `.cl-user-button-${ slot } ` ) ) . not . toBeNull ( ) ;
913+ }
914+ expect ( document . querySelector ( '[class*="cl-switcher"]' ) ) . toBeNull ( ) ;
915+ } ) ;
916+
907917 it ( 'heads the surface with the account, never the active organization' , async ( ) => {
908918 await renderSwitcher ( { mode : 'user' } ) ;
909919 await open ( ) ;
@@ -964,21 +974,28 @@ describe('Switcher', () => {
964974 } ) ;
965975
966976 describe ( 'in combined mode' , ( ) => {
977+ it ( 'themes its parts through switcher slots' , async ( ) => {
978+ await renderSwitcher ( ) ;
979+ await openWithList ( ) ;
980+
981+ for ( const slot of [ 'trigger' , 'trigger-label' , 'popover' , 'header' , 'item' , 'group' , 'separator' ] ) {
982+ expect ( document . querySelector ( `.cl-switcher-${ slot } ` ) ) . not . toBeNull ( ) ;
983+ }
984+ expect ( document . querySelector ( '[class*="cl-user-button"]' ) ) . toBeNull ( ) ;
985+ } ) ;
986+
967987 it ( 'heads the surface with the active organization, badged with the account, managing both' , async ( ) => {
968988 const { clerk } = await renderSwitcher ( ) ;
969989 const openOrganizationProfile = vi . spyOn ( clerk , 'openOrganizationProfile' ) . mockImplementation ( ( ) => { } ) ;
970990
971991 expect ( trigger ( ) ) . toHaveAccessibleName ( 'Open account menu for Alice Smith' ) ;
972992 const user = await open ( ) ;
973993
974- const header = requiredPopup ( ) . querySelector ( '.cl-user-button-header' ) ;
975- expect ( header ?. querySelector ( '.cl-user-button-header-title' ) ) . toHaveTextContent ( 'Acme' ) ;
976- expect ( header ?. querySelector ( '.cl-user-button-header-description' ) ) . toHaveTextContent ( 'alice' ) ;
977- expect ( header ?. querySelector ( '.cl-user-button-avatar > [data-shape]' ) ) . toHaveAttribute ( 'data-shape' , 'square' ) ;
978- expect ( header ?. querySelector ( '.cl-user-button-avatar-badge > [data-shape]' ) ) . toHaveAttribute (
979- 'data-shape' ,
980- 'circle' ,
981- ) ;
994+ const header = requiredPopup ( ) . querySelector ( '.cl-switcher-header' ) ;
995+ expect ( header ?. querySelector ( '.cl-switcher-header-title' ) ) . toHaveTextContent ( 'Acme' ) ;
996+ expect ( header ?. querySelector ( '.cl-switcher-header-description' ) ) . toHaveTextContent ( 'alice' ) ;
997+ expect ( header ?. querySelector ( '.cl-switcher-avatar > [data-shape]' ) ) . toHaveAttribute ( 'data-shape' , 'square' ) ;
998+ expect ( header ?. querySelector ( '.cl-switcher-avatar-badge > [data-shape]' ) ) . toHaveAttribute ( 'data-shape' , 'circle' ) ;
982999 expect ( within ( header ?? requiredPopup ( ) ) . queryAllByRole ( 'button' ) ) . toEqual ( [ ] ) ;
9831000 expect ( reading ( 'Add organization' , 'Settings' , 'Invite members' , 'Switch account' , 'Sign out' ) ) . toEqual ( [
9841001 'Add organization' ,
@@ -998,8 +1015,8 @@ describe('Switcher', () => {
9981015 expect ( trigger ( ) ) . toHaveAccessibleName ( 'Open account menu for alice' ) ;
9991016 await open ( ) ;
10001017
1001- expect ( requiredPopup ( ) . querySelector ( '.cl-user-button -header-title' ) ) . toHaveTextContent ( 'Acme' ) ;
1002- expect ( requiredPopup ( ) . querySelector ( '.cl-user-button -header-description' ) ) . toHaveTextContent ( 'alice' ) ;
1018+ expect ( requiredPopup ( ) . querySelector ( '.cl-switcher -header-title' ) ) . toHaveTextContent ( 'Acme' ) ;
1019+ expect ( requiredPopup ( ) . querySelector ( '.cl-switcher -header-description' ) ) . toHaveTextContent ( 'alice' ) ;
10031020 } ) ;
10041021
10051022 it ( 'trails the foot with sign-out, behind the flyout of accounts' , async ( ) => {
@@ -1171,7 +1188,7 @@ describe('Switcher', () => {
11711188
11721189 expect ( await screen . findByText ( 'Loading organizations…' ) ) . toBeInTheDocument ( ) ;
11731190 expect ( reading ( 'Personal account' , 'Other' ) ) . toEqual ( [ ] ) ;
1174- expect ( requiredPopup ( ) . querySelector ( '.cl-user-button -header-title' ) ) . toHaveTextContent ( 'Acme' ) ;
1191+ expect ( requiredPopup ( ) . querySelector ( '.cl-switcher -header-title' ) ) . toHaveTextContent ( 'Acme' ) ;
11751192
11761193 invitations . release ( ) ;
11771194 await waitFor ( ( ) => expect ( screen . queryByText ( 'Loading organizations…' ) ) . toBeNull ( ) ) ;
@@ -1183,7 +1200,7 @@ describe('Switcher', () => {
11831200 const terms = { id : 'terms' , label : 'Terms of service' , onClick : ( ) => { } } ;
11841201 const support = { id : 'support' , label : 'Support' , href : '/support' } ;
11851202 const group = ( name : string ) =>
1186- screen . getByRole ( name === 'Support' ? 'link' : 'button' , { name } ) . closest ( '.cl-user-button -group' ) ;
1203+ screen . getByRole ( name === 'Support' ? 'link' : 'button' , { name } ) . closest ( '.cl-switcher -group' ) ;
11871204
11881205 it ( 'follow Settings and Invite members in their group, above the foot' , async ( ) => {
11891206 await renderSwitcher ( { customMenuItems : [ terms , support ] } ) ;
@@ -1351,8 +1368,8 @@ describe('Switcher', () => {
13511368 expect ( within ( trigger ( ) ) . getByText ( 'Acme' ) ) . toBeInTheDocument ( ) ;
13521369 expect ( within ( trigger ( ) ) . queryByText ( 'alice' ) ) . toBeNull ( ) ;
13531370 expect ( within ( trigger ( ) ) . queryByText ( 'Alice Smith' ) ) . toBeNull ( ) ;
1354- expect ( trigger ( ) . querySelector ( '.cl-user-button -avatar > [data-shape]' ) ) . toHaveAttribute ( 'data-shape' , 'square' ) ;
1355- expect ( trigger ( ) . querySelector ( '.cl-user-button -avatar-badge > [data-shape]' ) ) . toHaveAttribute (
1371+ expect ( trigger ( ) . querySelector ( '.cl-switcher -avatar > [data-shape]' ) ) . toHaveAttribute ( 'data-shape' , 'square' ) ;
1372+ expect ( trigger ( ) . querySelector ( '.cl-switcher -avatar-badge > [data-shape]' ) ) . toHaveAttribute (
13561373 'data-shape' ,
13571374 'circle' ,
13581375 ) ;
@@ -1363,7 +1380,7 @@ describe('Switcher', () => {
13631380
13641381 expect ( trigger ( ) ) . toHaveAttribute ( 'data-variant' , 'condensed' ) ;
13651382 expect ( within ( trigger ( ) ) . getByText ( 'Acme' ) ) . toBeInTheDocument ( ) ;
1366- expect ( trigger ( ) . querySelector ( '.cl-user-button -avatar-badge' ) ) . toBeNull ( ) ;
1383+ expect ( trigger ( ) . querySelector ( '.cl-switcher -avatar-badge' ) ) . toBeNull ( ) ;
13671384 } ) ;
13681385
13691386 it ( 'leads a full trigger with the account alone when no organization is active' , async ( ) => {
@@ -1372,7 +1389,7 @@ describe('Switcher', () => {
13721389 expect ( trigger ( ) ) . toHaveAttribute ( 'data-variant' , 'full' ) ;
13731390 expect ( within ( trigger ( ) ) . getByText ( 'Alice Smith' ) ) . toBeInTheDocument ( ) ;
13741391 expect ( trigger ( ) . querySelector ( '[data-shape]' ) ) . toHaveAttribute ( 'data-shape' , 'circle' ) ;
1375- expect ( trigger ( ) . querySelector ( '.cl-user-button -avatar-badge' ) ) . toBeNull ( ) ;
1392+ expect ( trigger ( ) . querySelector ( '.cl-switcher -avatar-badge' ) ) . toBeNull ( ) ;
13761393 } ) ;
13771394
13781395 it ( 'keeps the condensed trigger in user mode' , async ( ) => {
@@ -1388,7 +1405,7 @@ describe('Switcher', () => {
13881405
13891406 expect ( trigger ( ) ) . toHaveAccessibleName ( 'Open account menu for Alice Smith' ) ;
13901407 expect ( trigger ( ) . querySelector ( '[data-shape]' ) ) . toHaveAttribute ( 'data-shape' , 'square' ) ;
1391- expect ( trigger ( ) . querySelector ( '.cl-user-button -avatar-badge' ) ) . toBeNull ( ) ;
1408+ expect ( trigger ( ) . querySelector ( '.cl-switcher -avatar-badge' ) ) . toBeNull ( ) ;
13921409 } ) ;
13931410
13941411 it ( 'names no organization beneath the account in user mode' , async ( ) => {
0 commit comments