Skip to content

The open alternative to Salesforce, designed for AI.

fix: prevent duplicate junction rows from double-fired checkbox clicks in multi-select menu items (#22737)

Thomas Trompettea22fdf1d8e04
diff --git a/packages/twenty-ui/src/navigation/MenuItem/parts/MenuItemMultiSelectCheckbox.module.scss b/packages/twenty-ui/src/navigation/MenuItem/parts/MenuItemMultiSelectCheckbox.module.scss
new file mode 100644
index 00000000000..7775d22c6ba
--- /dev/null
+++ b/packages/twenty-ui/src/navigation/MenuItem/parts/MenuItemMultiSelectCheckbox.module.scss
@@ -0,0 +1,4 @@
+.container {
+ align-items: center;
+ display: flex;
+}
diff --git a/packages/twenty-ui/src/navigation/MenuItem/parts/MenuItemMultiSelectCheckbox.module.scss.d.ts b/packages/twenty-ui/src/navigation/MenuItem/parts/MenuItemMultiSelectCheckbox.module.scss.d.ts
new file mode 100644
index 00000000000..8df71b4dead
--- /dev/null
+++ b/packages/twenty-ui/src/navigation/MenuItem/parts/MenuItemMultiSelectCheckbox.module.scss.d.ts
@@ -0,0 +1,4 @@
+declare const classNames: {
+ readonly container: 'container';
+};
+export default classNames;
diff --git a/packages/twenty-ui/src/navigation/MenuItem/parts/MenuItemMultiSelectCheckbox.tsx b/packages/twenty-ui/src/navigation/MenuItem/parts/MenuItemMultiSelectCheckbox.tsx
new file mode 100644
index 00000000000..29e3e695669
--- /dev/null
+++ b/packages/twenty-ui/src/navigation/MenuItem/parts/MenuItemMultiSelectCheckbox.tsx
@@ -0,0 +1,32 @@
+import { Checkbox } from '@ui/input/Checkbox/Checkbox';
+
+import styles from './MenuItemMultiSelectCheckbox.module.scss';
+
+type MenuItemMultiSelectCheckboxProps = {
+ selected: boolean;
+ onSelectChange?: (selected: boolean) => void;
+ ariaLabel?: string;
+};
+
+export const MenuItemMultiSelectCheckbox = ({
+ selected,
+ onSelectChange,
+ ariaLabel,
+}: MenuItemMultiSelectCheckboxProps) => {
+ // The checkbox handles its own toggle via onCheckedChange. Base UI
+ // re-dispatches a bubbling click on its hidden input, so we stop propagation
+ // here to keep the surrounding row's onClick from toggling twice.
+ return (
+ // oxlint-disable-next-line jsx-a11y/no-static-element-interactions, jsx-a11y/click-events-have-key-events
+ <div
+ className={styles.container}
+ onClick={(event) => event.stopPropagation()}
+ >
+ <Checkbox
+ checked={selected}
+ onCheckedChange={onSelectChange}
+ aria-label={ariaLabel}
+ />
+ </div>
+ );
+};
diff --git a/packages/twenty-ui/src/navigation/MenuItemMultiSelect/MenuItemMultiSelect.tsx b/packages/twenty-ui/src/navigation/MenuItemMultiSelect/MenuItemMultiSelect.tsx
index 20e3a896ee3..53c8aeb1bf7 100644
--- a/packages/twenty-ui/src/navigation/MenuItemMultiSelect/MenuItemMultiSelect.tsx
+++ b/packages/twenty-ui/src/navigation/MenuItemMultiSelect/MenuItemMultiSelect.tsx
@@ -1,7 +1,7 @@
import { Tag } from '@ui/data-display';
import { type IconComponent } from '@ui/icon';
-import { Checkbox } from '@ui/input/Checkbox/Checkbox';
import { MenuItemLeftContent } from '@ui/navigation/MenuItem/parts/MenuItemLeftContent';
+import { MenuItemMultiSelectCheckbox } from '@ui/navigation/MenuItem/parts/MenuItemMultiSelectCheckbox';
import { type ThemeColor } from '@ui/theme';
import { StyledMenuItemBase } from '@ui/navigation/MenuItem/parts/StyledMenuItemBase';
@@ -41,7 +41,11 @@ export const MenuItemMultiSelect = ({
onClick={handleOnClick}
>
<div className={styles.leftContentWithCheckboxContainer}>
- <Checkbox checked={selected} aria-label={text} />
+ <MenuItemMultiSelectCheckbox
+ selected={selected}
+ onSelectChange={onSelectChange}
+ ariaLabel={text}
+ />
{color ? (
<Tag color={color} text={text} Icon={LeftIcon} />
) : (
diff --git a/packages/twenty-ui/src/navigation/MenuItemMultiSelectAvatar/MenuItemMultiSelectAvatar.tsx b/packages/twenty-ui/src/navigation/MenuItemMultiSelectAvatar/MenuItemMultiSelectAvatar.tsx
index f18396268ea..c0963e05c3d 100644
--- a/packages/twenty-ui/src/navigation/MenuItemMultiSelectAvatar/MenuItemMultiSelectAvatar.tsx
+++ b/packages/twenty-ui/src/navigation/MenuItemMultiSelectAvatar/MenuItemMultiSelectAvatar.tsx
@@ -1,7 +1,7 @@
import { type ReactNode } from 'react';
import { OverflowingTextWithTooltip } from '@ui/surfaces';
-import { Checkbox } from '@ui/input/Checkbox/Checkbox';
+import { MenuItemMultiSelectCheckbox } from '@ui/navigation/MenuItem/parts/MenuItemMultiSelectCheckbox';
import {
StyledMenuItemBase,
StyledMenuItemLabel,
@@ -41,9 +41,10 @@ export const MenuItemMultiSelectAvatar = ({
isKeySelected={isKeySelected}
>
<div className={styles.leftContentWithCheckboxContainer}>
- <Checkbox
- checked={selected}
- aria-label={text ?? contextualText ?? 'Select item'}
+ <MenuItemMultiSelectCheckbox
+ selected={selected}
+ onSelectChange={onSelectChange}
+ ariaLabel={text ?? contextualText ?? 'Select item'}
/>
<StyledMenuItemLeftContent>
{avatar}
diff --git a/packages/twenty-ui/src/navigation/MenuItemMultiSelectAvatar/__stories__/MenuItemMultiSelectAvatar.stories.tsx b/packages/twenty-ui/src/navigation/MenuItemMultiSelectAvatar/__stories__/MenuItemMultiSelectAvatar.stories.tsx
index d70b633dd47..e23c8c49dd4 100644
--- a/packages/twenty-ui/src/navigation/MenuItemMultiSelectAvatar/__stories__/MenuItemMultiSelectAvatar.stories.tsx
+++ b/packages/twenty-ui/src/navigation/MenuItemMultiSelectAvatar/__stories__/MenuItemMultiSelectAvatar.stories.tsx
@@ -1,4 +1,5 @@
import { type Meta, type StoryObj } from '@storybook/react-vite';
+import { expect, fn, userEvent, within } from 'storybook/test';
import { Avatar } from '@ui/data-display';
import {
@@ -31,6 +32,24 @@ export const Default: Story = {
decorators: [ComponentDecorator],
};
+export const ClickingCheckboxSelectsOnce: Story = {
+ parameters: { a11y: A11Y_DEFER_COLOR_CONTRAST },
+ args: {
+ text: 'First option',
+ selected: false,
+ onSelectChange: fn(),
+ },
+ decorators: [ComponentDecorator],
+ play: async ({ args, canvasElement }) => {
+ const canvas = within(canvasElement);
+
+ await userEvent.click(canvas.getByRole('checkbox'));
+
+ await expect(args.onSelectChange).toHaveBeenCalledTimes(1);
+ await expect(args.onSelectChange).toHaveBeenCalledWith(true);
+ },
+};
+
export const Catalog: CatalogStory<Story, typeof MenuItemMultiSelectAvatar> = {
args: { text: 'Menu item' },
argTypes: {
diff --git a/packages/twenty-ui/src/navigation/MenuItemMultiSelectTag/MenuItemMultiSelectTag.tsx b/packages/twenty-ui/src/navigation/MenuItemMultiSelectTag/MenuItemMultiSelectTag.tsx
index 26e662c65cb..5abe2ca233c 100644
--- a/packages/twenty-ui/src/navigation/MenuItemMultiSelectTag/MenuItemMultiSelectTag.tsx
+++ b/packages/twenty-ui/src/navigation/MenuItemMultiSelectTag/MenuItemMultiSelectTag.tsx
@@ -1,7 +1,7 @@
import { Tag } from '@ui/data-display';
import { type IconComponent } from '@ui/icon';
-import { Checkbox, CheckboxShape, CheckboxSize } from '@ui/input';
import { type ThemeColor } from '@ui/theme';
+import { MenuItemMultiSelectCheckbox } from '@ui/navigation/MenuItem/parts/MenuItemMultiSelectCheckbox';
import {
StyledMenuItemBase,
StyledMenuItemLeftContent,
@@ -33,10 +33,10 @@ export const MenuItemMultiSelectTag = ({
className={className}
>
<StyledMenuItemLeftContent>
- <Checkbox
- size={CheckboxSize.Small}
- shape={CheckboxShape.Squared}
- checked={selected}
+ <MenuItemMultiSelectCheckbox
+ selected={selected}
+ onSelectChange={() => onClick?.()}
+ ariaLabel={text}
/>
<Tag color={color} text={text} Icon={Icon} />
</StyledMenuItemLeftContent>