Skip to content

feat(react,SortingMenu): add desktop multisort information tooltip #285

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
feerzlay merged 1 commit into from
Apr 6, 2026
Merged

feat(react,SortingMenu): add desktop multisort information tooltip #285

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
10 changes: 10 additions & 0 deletions packages/react/src/components/SortingMenu/SortingMenu.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,13 @@ import Popover from '@mui/material/Popover';
import { IconSortAscendingLineW200, IconSortDescendingLineW200 } from '../../icons';
import { Button } from '../Button';
import { Divider } from '../Divider';
import { InformationIcon } from '../InformationIcon';
import { Kbd } from '../Kbd';
import { Link } from '../Link';
import { ListItemText } from '../ListItem';
import { MenuItem } from '../MenuItem';
import { Switch } from '../Switch';
import { Tooltip } from '../Tooltip';

const isMacintosh = () => {
return navigator.userAgent.indexOf('Macintosh') > 0;
Expand Down Expand Up @@ -47,6 +49,8 @@ export const SortingMenu = memo(function SortingMenu(inProps: SortingMenuProps)
labelSortOrder,
labelSortTooltip,
labelMultisortTitle,
labelMultisortTooltip,
labelMultisortTooltipMacintosh,
labelMultisortLMB,
labelMultisortMobileOn,
labelMultisortMobileOff,
Expand Down Expand Up @@ -282,6 +286,12 @@ export const SortingMenu = memo(function SortingMenu(inProps: SortingMenuProps)
<span className="es-sorting-menu__plus-sign caption">+</span>
<Kbd variant="outlined">{labelMultisortLMB}</Kbd>
<span className="es-sorting-menu__caption caption">{labelMultisortTitle}</span>
<Tooltip
className="es-sorting-menu__information-icon"
title={isMacintosh() ? labelMultisortTooltipMacintosh : labelMultisortTooltip}
>
<InformationIcon variant="question" />
</Tooltip>
</>
)}
<Switch checked={isMultiple} size="small" type="button" onChange={onChangeSortMode} />
Expand Down
4 changes: 4 additions & 0 deletions packages/react/src/components/SortingMenu/SortingMenu.types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,10 @@ export type SortingMenuProps = {
labelSortTooltip?: string;
/** Text for the switch label. */
labelMultisortTitle?: string;
/** Text for the multisort tooltip. */
labelMultisortTooltip?: string;
/** Text for the multisort tooltip on macintosh. */
labelMultisortTooltipMacintosh?: string;
/** Text for the left mouse button. */
labelMultisortLMB?: string;
/** Text for the switch label. */
Expand Down
10 changes: 10 additions & 0 deletions packages/react/src/components/locale/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,8 @@ export interface Localization {
| 'labelSortOrder'
| 'labelSortTooltip'
| 'labelMultisortTitle'
| 'labelMultisortTooltip'
| 'labelMultisortTooltipMacintosh'
| 'labelMultisortLMB'
| 'labelMultisortMobileOn'
| 'labelMultisortMobileOff'
Expand Down Expand Up @@ -354,6 +356,10 @@ export const en: Localization = {
labelSortOrder: 'The sort order',
labelSortTooltip: 'Sort by properties',
labelMultisortTitle: 'Multisort',
labelMultisortTooltip:
'Turn on the switch or hold down the "Ctrl" key and select multiple properties to sort by multiple criteria.',
labelMultisortTooltipMacintosh:
'Turn on the switch or hold down the "⌘" key and select multiple properties to sort by multiple criteria.',
labelMultisortLMB: 'LMB',
labelMultisortMobileOn: 'Multisort enabled',
labelMultisortMobileOff: 'Hold to multisort',
Expand Down Expand Up @@ -578,6 +584,10 @@ export const ru: Localization = {
labelSortOrder: 'Порядок сортировки',
labelSortTooltip: 'Сортировка по свойствам',
labelMultisortTitle: 'Мультисортировка',
labelMultisortTooltip:
'Включите переключатель или, удерживая клавишу "Ctrl", выберите несколько свойств для сортировки по нескольким критериям.',
labelMultisortTooltipMacintosh:
'Включите переключатель или, удерживая клавишу "⌘", выберите несколько свойств для сортировки по нескольким критериям.',
labelMultisortLMB: 'ЛКМ',
labelMultisortMobileOn: 'Мультисортировка включена',
labelMultisortMobileOff: 'Удерживайте для мультисортировки',
Expand Down
4 changes: 4 additions & 0 deletions packages/theme/lib/components/_sorting-menu.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,5 +158,9 @@
margin-top: 14px;
padding-left: 16px;
}

&__information-icon {
margin-left: 4px;
}
}
}
Loading