Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
14 changes: 14 additions & 0 deletions apps/storybook/src/Dropdown.stories.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -129,3 +129,17 @@ ItemClickHandler.args = {
</>
),
};

export const onToggleHandler = Template.bind({});
onToggleHandler.storyName = "onToggle handlers";
onToggleHandler.args = {
onToggle: action("Dropdown toggled"),
children: (
<>
<DropdownItem onClick={action("Dashboard!")}>Dashboard</DropdownItem>
<DropdownItem onClick={action("Settings!")}>Settings</DropdownItem>
<DropdownItem onClick={action("Earnings!")}>Earnings</DropdownItem>
<DropdownItem onClick={action("Sign out!")}>Sign out</DropdownItem>
</>
),
};
28 changes: 22 additions & 6 deletions packages/ui/src/components/Dropdown/Dropdown.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ export interface DropdownTheme {

export interface DropdownProps
extends Pick<FloatingProps, "placement" | "trigger">,
Omit<ButtonProps, keyof ThemingProps<DropdownTheme>>,
Omit<ButtonProps, keyof ThemingProps<DropdownTheme> | "onToggle">,
ThemingProps<DropdownTheme> {
arrowIcon?: boolean;
dismissOnClick?: boolean;
Expand All @@ -54,6 +54,7 @@ export interface DropdownProps
label?: ReactNode;
enableTypeAhead?: boolean;
renderTrigger?: (theme: DropdownTheme) => ReactElement;
onToggle?: (open: boolean) => void;
"data-testid"?: string;
}

Expand Down Expand Up @@ -130,6 +131,7 @@ export function Dropdown(props: DropdownProps) {
dismissOnClick = true,
enableTypeAhead = true,
renderTrigger,
onToggle,
...restProps
} = resolveProps(props, provider.props?.dropdown);

Expand All @@ -143,10 +145,21 @@ export function Dropdown(props: DropdownProps) {
} = restProps;
const dataTestId = restProps["data-testid"] || "flowbite-dropdown-target";

const handleSelect = useCallback((index: number | null) => {
setSelectedIndex(index);
setOpen(false);
}, []);
const handleOpenChange = useCallback(
(newOpen: boolean) => {
setOpen(newOpen);
onToggle?.(newOpen);
},
[onToggle],
);

const handleSelect = useCallback(
(index: number | null) => {
setSelectedIndex(index);
handleOpenChange(false);
},
[handleOpenChange],
);

const handleTypeaheadMatch = useCallback(
(index: number | null) => {
Expand All @@ -161,7 +174,10 @@ export function Dropdown(props: DropdownProps) {

const { context, floatingStyles, refs } = useBaseFLoating<HTMLButtonElement>({
open,
setOpen,
setOpen: (value) => {
const newOpen = typeof value === "function" ? value(open) : value;
handleOpenChange(newOpen);
},
placement,
});

Expand Down
Loading