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

Jump to bottom

fix(dropdown): respect closeOnSelect prop on DropdownItem(#2290) #2598

Open
wants to merge 9 commits into
base: canary
Choose a base branch
from
Open

fix(dropdown): respect closeOnSelect prop on DropdownItem(#2290) #2598

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
8e21dc2
fix(dropdown): fix dropdown menu unexpected close when closeOnSelect …
gtoxlili Mar 27, 2024
e65e9fa
feat(changeset): Updated DropdownMenu to respect closeOnSelect prop o…
gtoxlili Mar 28, 2024
d5802f5
Merge branch 'main' into pr/2598
wingkwong Apr 21, 2024
45f895b
fix(dropdown): add Template
gtoxlili Apr 26, 2024
0bc509a
fix(dropdown): add tests
gtoxlili Apr 26, 2024
6d1df63
Merge branch 'nextui-org:main' into fix/dropdown-close-on-select
gtoxlili Apr 26, 2024
0f24d08
Merge remote-tracking branch 'origin/canary' into fix/dropdown-close-…
gtoxlili May 6, 2024
4b39f0b
fix(dropdown): fixing logic gaps
gtoxlili May 8, 2024
0b82163
fix(changeset): incorrect package name
wingkwong May 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/warm-planets-smile.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@nextui-org/menu": patch
---

fix(dropdown): respect closeOnSelect prop on DropdownItem(#2290)
gtoxlili marked this conversation as resolved.
Show resolved Hide resolved
10 changes: 8 additions & 2 deletions packages/components/menu/src/menu.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {forwardRef} from "@nextui-org/system";
import {ForwardedRef, ReactElement, Ref} from "react";
import {ForwardedRef, Key, ReactElement, Ref} from "react";

import {UseMenuProps, useMenu} from "./use-menu";
import MenuSection from "./menu-section";
Expand All @@ -18,7 +18,7 @@ function Menu<T extends object>(props: Props<T>, ref: ForwardedRef<HTMLUListElem
hideEmptyContent,
variant,
onClose,
onAction,
onAction: onTopAction,
topContent,
bottomContent,
itemClasses,
Expand All @@ -27,6 +27,12 @@ function Menu<T extends object>(props: Props<T>, ref: ForwardedRef<HTMLUListElem
getEmptyContentProps,
} = useMenu<T>({...props, ref});

const onAction = (key: Key) => {
if (closeOnSelect) {
onTopAction?.(key);
}
};

const content = (
<Component {...getListProps()}>
{!state.collection.size && !hideEmptyContent && (
Expand Down