Skip to content
Open
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: 13 additions & 1 deletion packages/fuselage/src/components/MultiSelect/MultiSelect.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,7 @@ const MultiSelect = forwardRef<HTMLInputElement, MultiSelectProps>(
useEffect(reset, [filter]);

const innerRef = useRef<HTMLElement>(null);
const wasVisibleOnMouseDownRef = useRef(false);
const anchorRef = useMergedRefs(ref, innerRef);

const { ref: containerRef, borderBoxSize } = useResizeObserver();
Expand All @@ -136,8 +137,18 @@ const MultiSelect = forwardRef<HTMLInputElement, MultiSelectProps>(
return null;
};

const handleMouseDown = useStableCallback(() => {
wasVisibleOnMouseDownRef.current = visible === AnimatedVisibility.VISIBLE;
});

const handleClick = useStableCallback(() => {
if (visible === AnimatedVisibility.VISIBLE) {
const shouldHide =
wasVisibleOnMouseDownRef.current ||
visible === AnimatedVisibility.VISIBLE;

wasVisibleOnMouseDownRef.current = false;

if (shouldHide) {
return hide();
}
innerRef.current?.focus();
Expand All @@ -150,6 +161,7 @@ const MultiSelect = forwardRef<HTMLInputElement, MultiSelectProps>(
rcx-select
className={[error && 'invalid', disabled && 'disabled']}
ref={containerRef}
onMouseDown={handleMouseDown}
onClick={handleClick}
disabled={disabled}
{...props}
Expand Down