Skip to content

✨(components) add bottomMessage to DropdownMenu component #297

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
AntoLC merged 1 commit into from
Aug 27, 2026
Merged

✨(components) add bottomMessage to DropdownMenu component #297

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
29 changes: 19 additions & 10 deletions packages/ui-components/src/components/dropdown-menu/DropdownMenu.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import {
Header,
Menu,
MenuItem,
Popover,
Expand Down Expand Up @@ -27,7 +26,8 @@ export type DropdownMenuProps = {
selectedValues?: string[];
onSelectValue?: (value: string) => void;
isOpen?: boolean;
topMessage?: string | ReactNode;
bottomMessage?: ReactNode;
topMessage?: ReactNode;
shouldCloseOnInteractOutside?: (element: Element) => boolean;
variant?: "default" | "tiny";
};
Expand All @@ -40,6 +40,7 @@ export const DropdownMenu = ({
selectedValues = [],
onSelectValue,
topMessage,
bottomMessage,
shouldCloseOnInteractOutside,
variant = "default",
}: PropsWithChildren<DropdownMenuProps>) => {
Expand Down Expand Up @@ -159,17 +160,25 @@ export const DropdownMenu = ({
shouldCloseOnInteractOutside={shouldCloseOnInteractOutside}
onOpenChange={onOpenChangeHandler}
>
<Menu className={menuClassName} aria-labelledby={id} autoFocus="first">
<div className={menuClassName}>
{topMessage && (
<Header
className="c__dropdown-menu-item-top-message"
role="presentation"
>
<div className="c__dropdown-menu-item-top-message">
{topMessage}
</Header>
</div>
)}
<Menu
className="c__dropdown-menu__list"
aria-labelledby={id}
autoFocus="first"
>
{renderMenuItems(options)}
</Menu>
{bottomMessage && (
<div className="c__dropdown-menu-item-bottom-message">
{bottomMessage}
</div>
)}
{renderMenuItems(options)}
</Menu>
</div>
</Popover>
</>
);
Expand Down
6 changes: 2 additions & 4 deletions packages/ui-components/src/components/dropdown-menu/dropdown.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -501,26 +501,24 @@ export const OpensInNewWindow: Story = {
},
};

export const WithTopMessage: Story = {
export const WithTopBottomMessage: Story = {
args: {
options: [
{
label: "Administrator",
value: "admin",
isDisabled: true,
},
{
label: "Editor",
value: "editor",
isDisabled: true,
},
{
label: "Viewer",
value: "viewer",
isDisabled: true,
},
],
topMessage: "You don't have permission to modify these roles",
bottomMessage: "Contact your administrator for access",
},
render: (args) => {
const { isOpen, setIsOpen } = useDropdownMenu();
Expand Down
11 changes: 7 additions & 4 deletions packages/ui-components/src/components/dropdown-menu/index.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,22 +18,25 @@
z-index: 1000;
max-width: min(320px, calc(100vw - 32px));
max-height: inherit;
box-sizing: border-box;
overflow: auto;
min-width: 150px;
box-sizing: border-box;
outline: none;
border-radius: 8px;
border: 1px solid var(--c--contextuals--border--surface--primary);
box-shadow: 0px 0px 6px 0px rgba(0, 0, 145, 0.1);
}

.c__dropdown-menu__list {
overflow: auto;
outline: none;

.react-aria-Separator {
height: 1px;
background: var(--c--contextuals--border--semantic--neutral--tertiary);
}
}

.c__dropdown-menu-item-top-message {
.c__dropdown-menu-item-top-message,
.c__dropdown-menu-item-bottom-message {
display: flex;
align-items: center;

Expand Down
Loading