diff --git a/src/plugins/vis_type_vislib/public/vislib/components/legend/_legend.scss b/src/plugins/vis_type_vislib/public/vislib/components/legend/_legend.scss index f5b93730fb75..c114c07f17b9 100644 --- a/src/plugins/vis_type_vislib/public/vislib/components/legend/_legend.scss +++ b/src/plugins/vis_type_vislib/public/vislib/components/legend/_legend.scss @@ -84,7 +84,7 @@ $visLegendLineHeight: $euiSize; } .visLegend__valueColorPicker { - width: ($euiSizeL * 8); // 8 columns + width: ($euiSizeL * 10); // 10 columns } .visLegend__valueColorPickerDot { diff --git a/src/plugins/vis_type_vislib/public/vislib/components/legend/legend.test.tsx b/src/plugins/vis_type_vislib/public/vislib/components/legend/legend.test.tsx index 18192c3faa34..1038c663d0dc 100644 --- a/src/plugins/vis_type_vislib/public/vislib/components/legend/legend.test.tsx +++ b/src/plugins/vis_type_vislib/public/vislib/components/legend/legend.test.tsx @@ -35,7 +35,7 @@ import { I18nProvider } from '@osd/i18n/react'; import { EuiButtonGroup } from '@elastic/eui'; import { VisLegend, VisLegendProps } from './legend'; -import { legendColors } from './models'; +import { legendColors } from './legend_item'; jest.mock('@elastic/eui', () => { const original = jest.requireActual('@elastic/eui'); diff --git a/src/plugins/vis_type_vislib/public/vislib/components/legend/legend_item.tsx b/src/plugins/vis_type_vislib/public/vislib/components/legend/legend_item.tsx index f6e79b74841c..b228f32c7596 100644 --- a/src/plugins/vis_type_vislib/public/vislib/components/legend/legend_item.tsx +++ b/src/plugins/vis_type_vislib/public/vislib/components/legend/legend_item.tsx @@ -42,9 +42,14 @@ import { EuiPopoverProps, EuiButtonGroup, EuiButtonGroupOptionProps, + euiPaletteColorBlind, } from '@elastic/eui'; -import { legendColors, LegendItem } from './models'; +import { LegendItem } from './models'; + +// starting from the default categorical colors, we generate 6 additional variants, +// 3 lighter and 3 darker +export const legendColors = euiPaletteColorBlind({ rotations: 7, direction: 'both' }); interface Props { item: LegendItem; diff --git a/src/plugins/vis_type_vislib/public/vislib/components/legend/models.ts b/src/plugins/vis_type_vislib/public/vislib/components/legend/models.ts index 1d86703b5c38..48a0cfc9b2af 100644 --- a/src/plugins/vis_type_vislib/public/vislib/components/legend/models.ts +++ b/src/plugins/vis_type_vislib/public/vislib/components/legend/models.ts @@ -34,62 +34,3 @@ export interface LegendItem { } export const CUSTOM_LEGEND_VIS_TYPES = ['heatmap', 'gauge']; - -export const legendColors: string[] = [ - '#3F6833', - '#967302', - '#2F575E', - '#99440A', - '#58140C', - '#052B51', - '#511749', - '#3F2B5B', // 6 - '#508642', - '#CCA300', - '#447EBC', - '#C15C17', - '#890F02', - '#0A437C', - '#6D1F62', - '#584477', // 2 - '#629E51', - '#E5AC0E', - '#64B0C8', - '#E0752D', - '#BF1B00', - '#0A50A1', - '#962D82', - '#614D93', // 4 - '#7EB26D', - '#EAB839', - '#6ED0E0', - '#EF843C', - '#E24D42', - '#1F78C1', - '#BA43A9', - '#705DA0', // Normal - '#9AC48A', - '#F2C96D', - '#65C5DB', - '#F9934E', - '#EA6460', - '#5195CE', - '#D683CE', - '#806EB7', // 5 - '#B7DBAB', - '#F4D598', - '#70DBED', - '#F9BA8F', - '#F29191', - '#82B5D8', - '#E5A8E2', - '#AEA2E0', // 3 - '#E0F9D7', - '#FCEACA', - '#CFFAFF', - '#F9E2D2', - '#FCE2DE', - '#BADFF4', - '#F9D9F9', - '#DEDAF7', // 7 -]; diff --git a/test/functional/apps/dashboard/dashboard_state.js b/test/functional/apps/dashboard/dashboard_state.js index 2974f2024a4e..5beca47f9cae 100644 --- a/test/functional/apps/dashboard/dashboard_state.js +++ b/test/functional/apps/dashboard/dashboard_state.js @@ -75,14 +75,14 @@ export default function ({ getService, getPageObjects }) { await PageObjects.dashboard.switchToEditMode(); await PageObjects.visChart.openLegendOptionColors('Count'); - await PageObjects.visChart.selectNewLegendColorChoice('#EA6460'); + await PageObjects.visChart.selectNewLegendColorChoice('#8d4059'); await PageObjects.dashboard.saveDashboard('Overridden colors'); await PageObjects.dashboard.gotoDashboardLandingPage(); await PageObjects.dashboard.loadSavedDashboard('Overridden colors'); const colorChoiceRetained = await PageObjects.visChart.doesSelectedLegendColorExist( - '#EA6460' + '#8d4059' ); expect(colorChoiceRetained).to.be(true); @@ -245,9 +245,9 @@ export default function ({ getService, getPageObjects }) { it('updates a pie slice color on a soft refresh', async function () { await dashboardAddPanel.addVisualization(PIE_CHART_VIS_NAME); await PageObjects.visChart.openLegendOptionColors('80,000'); - await PageObjects.visChart.selectNewLegendColorChoice('#F9D9F9'); + await PageObjects.visChart.selectNewLegendColorChoice('#e9b0c3'); const currentUrl = await browser.getCurrentUrl(); - const newUrl = currentUrl.replace('F9D9F9', 'FFFFFF'); + const newUrl = currentUrl.replace('e9b0c3', 'FFFFFF'); await browser.get(newUrl.toString(), false); await PageObjects.header.waitUntilLoadingHasFinished(); diff --git a/test/functional/page_objects/visualize_chart_page.ts b/test/functional/page_objects/visualize_chart_page.ts index e13d8eed6081..975da7cc552a 100644 --- a/test/functional/page_objects/visualize_chart_page.ts +++ b/test/functional/page_objects/visualize_chart_page.ts @@ -286,7 +286,7 @@ export function VisualizeChartPageProvider({ getService, getPageObjects }: FtrPr await testSubjects.click(`legend-${name}`); await this.waitForVisualizationRenderingStabilized(); // arbitrary color chosen, any available would do - const isOpen = await this.doesLegendColorChoiceExist('#EF843C'); + const isOpen = await this.doesLegendColorChoiceExist('#e09e64'); if (!isOpen) { throw new Error('legend color selector not open'); }