Skip to content
Merged
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
38 changes: 31 additions & 7 deletions packages/react/src/select/trigger/SelectTrigger.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -102,13 +102,19 @@ describe('<Select.Trigger />', () => {
});

describe('releasing the opening press', () => {
async function pressTrigger(container?: ShadowRoot) {
async function pressTrigger(
options: {
container?: ShadowRoot;
onOpenChange?: Select.Root.Props<string>['onOpenChange'];
release?: boolean;
} = {},
) {
await render(
<Select.Root>
<Select.Root onOpenChange={options.onOpenChange}>
<Select.Trigger data-testid="trigger">
<Select.Value />
</Select.Trigger>
<Select.Portal container={container}>
<Select.Portal container={options.container}>
<Select.Positioner alignItemWithTrigger={false}>
<Select.Popup>
<Select.Item value="a">a</Select.Item>
Expand All @@ -124,15 +130,33 @@ describe('<Select.Trigger />', () => {

fireEvent.pointerDown(trigger, { pointerType: 'mouse', button: 0 });
fireEvent.mouseDown(trigger, { button: 0 });
if (options.release) {
fireEvent.mouseUp(trigger, { button: 0, clientX: 150, clientY: 120 });
}
await waitFor(() => {
expect(trigger).toHaveAttribute('aria-expanded', 'true');
});
// The press is held long enough for the trigger to start watching its release.
return trigger;
}

it('ignores a later release when the opening press was released immediately', async () => {
const onOpenChange = vi.fn();
const trigger = await pressTrigger({ onOpenChange, release: true });
await act(async () => {
await wait(20);
});
return trigger;
}
onOpenChange.mockClear();
expect(trigger).toHaveAttribute('aria-expanded', 'true');

// e.g. a press that started inside the popup and was dragged off it
fireEvent.mouseUp(document.body, { button: 0, clientX: 10, clientY: 10 });
await act(async () => {
await wait(20);
});

expect(trigger).toHaveAttribute('aria-expanded', 'true');
expect(onOpenChange).not.toHaveBeenCalled();
});

it('keeps the popup open when the press slips up to 5px off the trigger', async () => {
const trigger = await pressTrigger();
Expand Down Expand Up @@ -161,7 +185,7 @@ describe('<Select.Trigger />', () => {
const shadowRoot = host.attachShadow({ mode: 'open' });

try {
const trigger = await pressTrigger(shadowRoot);
const trigger = await pressTrigger({ container: shadowRoot });
const popup = shadowRoot.querySelector('[role="listbox"]');
expect(popup).not.toBe(null);

Expand Down
10 changes: 2 additions & 8 deletions packages/react/src/select/trigger/SelectTrigger.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,6 @@ export const SelectTrigger = React.forwardRef(function SelectTrigger(
const setTriggerElement = store.useStateSetter('triggerElement');

const timeoutFocus = useTimeout();
const timeoutMouseDown = useTimeout();
const selectedDelayTimeout = useTimeout();

React.useEffect(() => {
Expand All @@ -124,10 +123,8 @@ export const SelectTrigger = React.forwardRef(function SelectTrigger(
dragY: 0,
};

timeoutMouseDown.clear();

return undefined;
}, [open, store, timeoutMouseDown, selectedDelayTimeout]);
}, [open, store, selectedDelayTimeout]);

const mergedProps: HTMLProps = mergeProps<'button'>(
triggerProps,
Expand Down Expand Up @@ -201,10 +198,7 @@ export const SelectTrigger = React.forwardRef(function SelectTrigger(
store.setOpen(false, createChangeEventDetails(REASONS.cancelOpen, mouseEvent));
}

// Firefox can fire this upon mousedown
timeoutMouseDown.start(0, () => {
doc.addEventListener('mouseup', handleMouseUp, { once: true });
});
doc.addEventListener('mouseup', handleMouseUp, { once: true });
},
},
elementProps,
Expand Down
Loading