diff --git a/packages/twenty-front/src/modules/command-menu/pages/page-layout/components/dropdown-content/ChartColorGradientOption.tsx b/packages/twenty-front/src/modules/command-menu/pages/page-layout/components/dropdown-content/ChartColorGradientOption.tsx index 8a17ab0318..d0e38cd4ef 100644 --- a/packages/twenty-front/src/modules/command-menu/pages/page-layout/components/dropdown-content/ChartColorGradientOption.tsx +++ b/packages/twenty-front/src/modules/command-menu/pages/page-layout/components/dropdown-content/ChartColorGradientOption.tsx @@ -1,3 +1,4 @@ +import { CHART_SETTINGS_PALETTE_COLOR_GROUP_COUNT } from '@/command-menu/pages/page-layout/constants/ChartSettingsPaletteColorGroupCount'; import { createGraphColorRegistry } from '@/page-layout/widgets/graph/utils/createGraphColorRegistry'; import { generateGroupColor } from '@/page-layout/widgets/graph/utils/generateGroupColor'; import { SelectableListItem } from '@/ui/layout/selectable-list/components/SelectableListItem'; @@ -24,8 +25,6 @@ const StyledColorSamplesContainer = styled.div` gap: ${({ theme }) => theme.spacing(0.5)}; `; -const COLOR_GROUP_COUNT = 5; - export const ChartColorGradientOption = ({ colorOption, selectedItemId, @@ -38,18 +37,21 @@ export const ChartColorGradientOption = ({ const colorSamples = ( - {Array.from({ length: COLOR_GROUP_COUNT }).map((_, index) => { - const colorScheme = colorRegistry[colorName]; - const reversedIndex = COLOR_GROUP_COUNT - 1 - index; - const groupColor = generateGroupColor({ - colorScheme, - groupIndex: reversedIndex, - totalGroups: COLOR_GROUP_COUNT, - }); - return ( - - ); - })} + {Array.from({ length: CHART_SETTINGS_PALETTE_COLOR_GROUP_COUNT }).map( + (_, index) => { + const colorScheme = colorRegistry[colorName]; + const reversedIndex = + CHART_SETTINGS_PALETTE_COLOR_GROUP_COUNT - 1 - index; + const groupColor = generateGroupColor({ + colorScheme, + groupIndex: reversedIndex, + totalGroups: CHART_SETTINGS_PALETTE_COLOR_GROUP_COUNT, + }); + return ( + + ); + }, + )} ); diff --git a/packages/twenty-front/src/modules/command-menu/pages/page-layout/components/dropdown-content/ChartColorPaletteOption.tsx b/packages/twenty-front/src/modules/command-menu/pages/page-layout/components/dropdown-content/ChartColorPaletteOption.tsx index e9d8ac263d..e536ae5943 100644 --- a/packages/twenty-front/src/modules/command-menu/pages/page-layout/components/dropdown-content/ChartColorPaletteOption.tsx +++ b/packages/twenty-front/src/modules/command-menu/pages/page-layout/components/dropdown-content/ChartColorPaletteOption.tsx @@ -1,3 +1,6 @@ +import { CHART_SETTINGS_PALETTE_COLOR_GROUP_COUNT } from '@/command-menu/pages/page-layout/constants/ChartSettingsPaletteColorGroupCount'; +import { createGraphColorRegistry } from '@/page-layout/widgets/graph/utils/createGraphColorRegistry'; +import { getColorSchemeByIndex } from '@/page-layout/widgets/graph/utils/getColorSchemeByIndex'; import { SelectableListItem } from '@/ui/layout/selectable-list/components/SelectableListItem'; import { useTheme } from '@emotion/react'; import styled from '@emotion/styled'; @@ -26,26 +29,31 @@ export const ChartColorPaletteOption = ({ }: ChartColorPaletteOptionProps) => { const theme = useTheme(); - const paletteColors: Array = [ - 'purple', - 'pink', - 'red', - 'orange', - 'yellow', - ]; + const colorRegistry = createGraphColorRegistry(theme); + + const paletteColors = Array.from( + { length: CHART_SETTINGS_PALETTE_COLOR_GROUP_COUNT }, + (_, index) => { + const colorScheme = getColorSchemeByIndex(colorRegistry, index); + + return { + colorName: colorScheme.name, + color: colorScheme.solid, + }; + }, + ); const colorSamples = ( - {paletteColors.map((paletteColorName) => { - const baseColor = theme.color[paletteColorName] as string; - return ( - - ); - })} + {paletteColors.map((paletteColor) => ( + + ))} ); @@ -58,7 +66,7 @@ export const ChartColorPaletteOption = ({ }} > { const colorOptions: ColorOption[] = [ { id: 'auto', - name: 'Palette', + name: 'Default palette', colorName: 'auto', }, ...MAIN_COLOR_NAMES.map((colorName) => ({ diff --git a/packages/twenty-front/src/modules/command-menu/pages/page-layout/constants/ChartSettingsPaletteColorGroupCount.ts b/packages/twenty-front/src/modules/command-menu/pages/page-layout/constants/ChartSettingsPaletteColorGroupCount.ts new file mode 100644 index 0000000000..29633db390 --- /dev/null +++ b/packages/twenty-front/src/modules/command-menu/pages/page-layout/constants/ChartSettingsPaletteColorGroupCount.ts @@ -0,0 +1 @@ +export const CHART_SETTINGS_PALETTE_COLOR_GROUP_COUNT = 5;