Skip to content
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

Use different MenuItem props for plain text and rich text labels #6752

Closed
wants to merge 1 commit into from
Closed

Use different MenuItem props for plain text and rich text labels #6752

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
3 changes: 2 additions & 1 deletion src/sidebar/components/GroupList/GroupListItem.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,8 @@ function GroupListItem({
isExpanded={hasActionMenu ? isExpanded : false}
isSelected={isSelected}
isSubmenuVisible={hasActionMenu ? isExpanded : undefined}
label={
label={group.name}
richLabel={
<div className="grow flex items-center justify-between gap-x-2">
{group.name}
<GroupIcon type={group.type} />
Expand Down
15 changes: 13 additions & 2 deletions src/sidebar/components/MenuItem.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,17 @@ export type MenuItemProps = {
*/
isSubmenuVisible?: boolean;

label: ComponentChildren;
/**
* Main text of the menu item.
* This is also used as part of the submenu toggle's title, if any.
*/
label: string;

/**
* An alternative to `label`, in case you need to render more complex/rich
* content in this item.
*/
richLabel?: ComponentChildren;

/**
* Optional content to render into a left channel. This accommodates small
Expand Down Expand Up @@ -146,6 +156,7 @@ export default function MenuItem({
isSubmenuItem,
isSubmenuVisible,
label,
richLabel = label,
leftChannelContent,
onClick,
onToggleSubmenu,
Expand Down Expand Up @@ -214,7 +225,7 @@ export default function MenuItem({
</div>
)}
<span className="flex items-center grow whitespace-nowrap px-1">
{label}
{richLabel}
</span>
{hasRightContent && (
<div
Expand Down
Loading