@cloud-ru/ds-uikit-product-header 2.1.7 → 2.1.8-preview-04e34550.0

package/src/components/UserMenu/UserMenu.tsx

@@ -1,14 +1,13 @@
 import { Avatar } from '@cloud-ru/ds-avatar';
 import { BaseItemProps, Droplist, DroplistProps, SNAP_POINTS_PRESET } from '@cloud-ru/ds-list';
 import { useValueControl } from '@cloud-ru/ds-utils';
-import cn from 'classnames';
 import { useCallback, useMemo } from 'react';
 
 import { TEST_IDS } from '../../constants';
-import { useDesktopComfortClassName } from '../../hooks/useDesktopComfortClassName';
 import { useMobileLayout } from '../../hooks/useMobileLayout';
 import { headerLocale } from '../../locale';
 import { HeaderButton } from '../HeaderButton';
+import { renderListItemCustom, renderListItemGroupCustom } from '../ListCustom';
 import { useUserMenuItems } from './hooks/useUserMenuItems';
 import styles from './styles.module.scss';
 import { ThemeProps, UserProfileProps } from './types';
@@ -75,7 +74,6 @@ export function UserMenu({
 }: UserMenuProps) {
   const { t } = headerLocale.useTranslations();
   const isMobile = useMobileLayout();
-  const comfortClassName = useDesktopComfortClassName();
 
   const [open = false, setOpen] = useValueControl<boolean>({ value: openProp, onChange: setOpenProp });
 
@@ -130,7 +128,7 @@ export function UserMenu({
     <Droplist
       open={open}
       onOpenChange={setOpen}
-      size='m'
+      size='s'
       selection={SELECTION_STUB}
       pinTop={pinTop}
       items={menuItems}
@@ -138,13 +136,15 @@ export function UserMenu({
       scroll={!isMobile}
       trigger='click'
       placement='bottom-end'
-      className={cn(styles.userMenuDroplist, comfortClassName)}
+      className={styles.userMenuDroplist}
       closeOnPopstate
       data-test-id={TEST_IDS.userMenu.root}
       label={t('user')}
       snapPoints={SNAP_POINTS_PRESET.full}
       withDividers={false}
       triggerClassName={styles.userMenuDroplistTrigger}
+      itemRender={renderListItemCustom}
+      groupItemRender={renderListItemGroupCustom}
     >
       {trigger}
     </Droplist>

package/src/components/UserMenu/hooks/useThemeItem.tsx

@@ -3,7 +3,6 @@ import { DroplistProps } from '@cloud-ru/ds-list';
 import { useCallback, useMemo } from 'react';
 
 import { TEST_IDS } from '../../../constants';
-import { useDesktopComfortClassName } from '../../../hooks/useDesktopComfortClassName';
 import { headerLocale } from '../../../locale';
 import { THEME_MODE, ThemeMode, ThemeProps } from '../types';
 
@@ -14,7 +13,6 @@ export function useThemeItem({
   onClose,
 }: ThemeProps & { isMobile?: boolean; onClose?(): void }): DroplistProps['items'][0] {
   const { t } = headerLocale.useTranslations();
-  const comfortClassName = useDesktopComfortClassName();
 
   const handleClick = useCallback(
     (themeMode: ThemeMode) => () => {
@@ -67,8 +65,7 @@ export function useThemeItem({
       beforeContent: <ThemeContrastSVG />,
       'data-test-id': TEST_IDS.userMenu.themeMode,
       items: themeModeOptions,
-      listClassName: comfortClassName,
     }),
-    [comfortClassName, t, themeModeOptions],
+    [t, themeModeOptions],
   );
 }

package/src/components/index.ts

@@ -1,5 +1,6 @@
 export * from './HeaderButton';
 export * from './HeaderLayout';
+export * from './ListCustom';
 export * from './MainMenu';
 export * from './UserMenu';
 export * from './Logo';