Skip to content

fix(graph): fix toggle click and multiple dropdown issues #16874

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

Merged
charlesBochet merged 3 commits into from
Jan 8, 2026
Merged

fix(graph): fix toggle click and multiple dropdown issues #16874

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f01d0e1
fix(graph): fix multiple dropdowns opening and toggle click issues
aditya-cherukuru Dec 31, 2025
512664c
fix: prettier formatting
aditya-cherukuru Dec 31, 2025
3777604
Merge branch 'main' into fix/graph-small-bugs
charlesBochet Jan 8, 2026
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
3 changes: 3 additions & 0 deletions ...src/modules/command-menu/pages/page-layout/components/chart-settings/ChartSettingItem.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import { type ChartSettingsItem } from '@/command-menu/pages/page-layout/types/C
import { isMinMaxRangeValid } from '@/command-menu/pages/page-layout/utils/isMinMaxRangeValid';
import { CommandMenuPages } from '@/command-menu/types/CommandMenuPages';
import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
import { useCloseAnyOpenDropdown } from '@/ui/layout/dropdown/hooks/useCloseAnyOpenDropdown';
import { useOpenDropdown } from '@/ui/layout/dropdown/hooks/useOpenDropdown';
import { SelectableListItem } from '@/ui/layout/selectable-list/components/SelectableListItem';
import { useSelectableList } from '@/ui/layout/selectable-list/hooks/useSelectableList';
Expand All @@ -35,6 +36,7 @@ export const ChartSettingItem = ({
configuration,
}: ChartSettingItemProps) => {
const { pageLayoutId } = usePageLayoutIdFromContextStoreTargetedRecord();
const { closeAnyOpenDropdown } = useCloseAnyOpenDropdown();
const { openDropdown } = useOpenDropdown();
const { setSelectedItemId } = useSelectableList(
COMMAND_MENU_LIST_SELECTABLE_LIST_ID,
Expand Down Expand Up @@ -71,6 +73,7 @@ export const ChartSettingItem = ({
};

const handleDropdownOpen = () => {
closeAnyOpenDropdown();
openDropdown({
dropdownComponentInstanceIdFromProps: item.id,
});
Expand Down
7 changes: 2 additions & 5 deletions packages/twenty-ui/src/navigation/menu/menu-item/components/MenuItemToggle.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
import styled from '@emotion/styled';
import { type IconComponent } from '@ui/display';
import { Toggle, type ToggleSize } from '@ui/input';
import { useId } from 'react';
import { MenuItemLeftContent } from '../internals/components/MenuItemLeftContent';
import {
StyledMenuItemBase,
StyledMenuItemRightContent,
} from '../internals/components/StyledMenuItemBase';

const StyledToggleContainer = styled.label`
const StyledToggleContainer = styled.div`
align-items: center;
cursor: pointer;
display: flex;
Expand Down Expand Up @@ -39,14 +38,13 @@ export const MenuItemToggle = ({
toggleSize,
disabled = false,
}: MenuItemToggleProps) => {
const instanceId = useId();
return (
<StyledMenuItemBase
className={className}
focused={focused}
disabled={disabled}
>
<StyledToggleContainer htmlFor={instanceId}>
<StyledToggleContainer>
<MenuItemLeftContent
LeftIcon={LeftIcon}
text={text}
Expand All @@ -55,7 +53,6 @@ export const MenuItemToggle = ({
/>
<StyledMenuItemRightContent>
<Toggle
id={instanceId}
value={toggled}
onChange={disabled ? undefined : onToggleChange}
toggleSize={toggleSize}
Expand Down