Skip to content

Fix/dropdown label optional #1474

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

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Fix/dropdown label optional #1474

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c07f1a3
madeLabelOptionalInDropdownComponent
Aug 18, 2024
8b19b34
addedMouseEventInDropdownItemComponent
Aug 25, 2024
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
2 changes: 1 addition & 1 deletion packages/ui/src/components/Dropdown/Dropdown.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ export interface DropdownProps extends Pick<FloatingProps, "placement" | "trigge
dismissOnClick?: boolean;
floatingArrow?: boolean;
inline?: boolean;
label: ReactNode;
label?: ReactNode;
theme?: DeepPartial<FlowbiteDropdownTheme>;
enableTypeAhead?: boolean;
renderTrigger?: (theme: FlowbiteDropdownTheme) => ReactElement;
Expand Down
8 changes: 4 additions & 4 deletions packages/ui/src/components/Dropdown/DropdownItem.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
"use client";

import { useListItem, useMergeRefs } from "@floating-ui/react";
import { forwardRef, type ComponentProps, type ElementType, type FC, type RefCallback } from "react";
import { forwardRef, type ComponentProps, type ElementType, type FC, type RefCallback, MouseEvent } from "react";
import { twMerge } from "tailwind-merge";
import type { PolymorphicComponentPropWithRef, PolymorphicRef } from "../../helpers/generic-as-prop";
import { mergeDeep } from "../../helpers/merge-deep";
Expand All @@ -20,7 +20,7 @@ export type DropdownItemProps<T extends ElementType = "button"> = PolymorphicCom
{
href?: string;
icon?: FC<ComponentProps<"svg">>;
onClick?: () => void;
onClick?: (event: MouseEvent<HTMLElement>) => void;
theme?: DeepPartial<FlowbiteDropdownItemTheme>;
}
>;
Expand Down Expand Up @@ -49,8 +49,8 @@ export const DropdownItem = forwardRef(
className={twMerge(theme.base, className)}
{...theirProps}
{...getItemProps({
onClick: () => {
onClick?.();
onClick: (event) => {
onClick?.(event);
dismissOnClick && handleSelect(null);
},
})}
Expand Down
Loading