Commit ed208f2b by Dominik Prokop

Fix error caused by named colors that are not part of named colors palette

parent b590c4da
...@@ -44,10 +44,6 @@ describe('colors', () => { ...@@ -44,10 +44,6 @@ describe('colors', () => {
}); });
describe('getColorFromHexRgbOrName', () => { describe('getColorFromHexRgbOrName', () => {
it('returns undefined for unknown color', () => {
expect(() => getColorFromHexRgbOrName('aruba-sunshine')).toThrow();
});
it('returns dark hex variant for known color if theme not specified', () => { it('returns dark hex variant for known color if theme not specified', () => {
expect(getColorFromHexRgbOrName(SemiDarkBlue.name)).toBe(SemiDarkBlue.variants.dark); expect(getColorFromHexRgbOrName(SemiDarkBlue.name)).toBe(SemiDarkBlue.variants.dark);
}); });
...@@ -64,5 +60,9 @@ describe('colors', () => { ...@@ -64,5 +60,9 @@ describe('colors', () => {
expect(getColorFromHexRgbOrName('rgb(0,0,0)')).toBe('rgb(0,0,0)'); expect(getColorFromHexRgbOrName('rgb(0,0,0)')).toBe('rgb(0,0,0)');
expect(getColorFromHexRgbOrName('rgba(0,0,0,1)')).toBe('rgba(0,0,0,1)'); expect(getColorFromHexRgbOrName('rgba(0,0,0,1)')).toBe('rgba(0,0,0,1)');
}); });
it('returns hex for named color that is not a part of named colors palette', () => {
expect(getColorFromHexRgbOrName('lime')).toBe('#00ff00');
});
}); });
}); });
import { flatten } from 'lodash'; import { flatten } from 'lodash';
import { GrafanaThemeType } from '../types'; import { GrafanaThemeType } from '../types';
import tinycolor from 'tinycolor2';
type Hue = 'green' | 'yellow' | 'red' | 'blue' | 'orange' | 'purple'; type Hue = 'green' | 'yellow' | 'red' | 'blue' | 'orange' | 'purple';
...@@ -106,7 +107,7 @@ export const getColorFromHexRgbOrName = (color: string, theme?: GrafanaThemeType ...@@ -106,7 +107,7 @@ export const getColorFromHexRgbOrName = (color: string, theme?: GrafanaThemeType
const colorDefinition = getColorByName(color); const colorDefinition = getColorByName(color);
if (!colorDefinition) { if (!colorDefinition) {
throw new Error('Unknown color'); return new tinycolor(color).toHexString();
} }
return theme ? colorDefinition.variants[theme] : colorDefinition.variants.dark; return theme ? colorDefinition.variants[theme] : colorDefinition.variants.dark;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment