Skip to content
Closed
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
22 changes: 18 additions & 4 deletions src/lib/components/Dropdown/Dropdown.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* eslint-disable @typescript-eslint/ban-ts-comment */
import type { ComponentProps, FC, PropsWithChildren, ReactElement, ReactNode } from 'react';
import React, { Children, useCallback, useMemo, useState } from 'react';
import React, { Children, useCallback, useMemo, useRef, useState } from 'react';
import { HiOutlineChevronDown, HiOutlineChevronLeft, HiOutlineChevronRight, HiOutlineChevronUp } from 'react-icons/hi';
import type { DeepPartial } from '..';
import { mergeDeep } from '../../helpers/mergeDeep';
Expand Down Expand Up @@ -75,6 +75,8 @@ const DropdownComponent: FC<DropdownProps> = ({
}, [placement]);

const [closeRequestKey, setCloseRequestKey] = useState<string | undefined>(undefined);
const triggerRef = useRef<HTMLButtonElement>(null);
const buttonWidth = triggerRef.current?.offsetWidth;

// Extends DropdownItem's onClick to trigger a close request to the Floating component
const attachCloseListener = useCallback(
Expand All @@ -101,12 +103,24 @@ const DropdownComponent: FC<DropdownProps> = ({
);

const content = useMemo(
() => <ul className={theme.content}>{Children.map(children, attachCloseListener)}</ul>,
[attachCloseListener, children, theme.content],
() => (
<ul className={theme.content} style={{ minWidth: buttonWidth ? `${buttonWidth}px` : 'auto' }}>
{Children.map(children, attachCloseListener)}
</ul>
),
[children, theme, triggerRef.current, attachCloseListener, buttonWidth],
);

const TriggerWrapper: FC<ButtonProps> = ({ children }) =>
inline ? <button className={theme.inlineWrapper}>{children}</button> : <Button {...buttonProps}>{children}</Button>;
inline ? (
<button ref={triggerRef} className={theme.inlineWrapper}>
{children}
</button>
) : (
<Button ref={triggerRef} {...buttonProps}>
{children}
</Button>
);

return (
<Floating
Expand Down