jingrow/charts
1
0
Fork 0
Code Pull Requests Activity

- Adjust getColor to support RGB (TODO: HSL colors)

Browse Source 
- Add Test to verify changes
This commit is contained in:
Bart Van Houtte 2020-10-13 15:45:08 +02:00
parent f644e19a5b
commit 869c747be1
4 changed files with 37 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dist/frappe-charts.esm.js vendored
View File

@ -520,6 +520,12 @@ function isValidColor(string) {
}
const getColor = (color) => {
// When RGB color, convert to hexadecimal (alpha value is omitted)
if((/rgb[a]{0,1}\([\d, ]+\)/gim).test(color)) {
return (/\D+(\d*)\D+(\d*)\D+(\d*)/gim).exec(color)
.map((x, i) => (i !== 0 ? Number(x).toString(16) : '#'))
.reduce((c, ch) => `${c}${ch}`);
}
return PRESET_COLOR_MAP[color] || color;
};

6
src/js/utils/colors.js
View File

@ -43,5 +43,11 @@ export function isValidColor(string) {
}
export const getColor = (color) => {
// When RGB color, convert to hexadecimal (alpha value is omitted)
if((/rgb[a]{0,1}\([\d, ]+\)/gim).test(color)) {
return (/\D+(\d*)\D+(\d*)\D+(\d*)/gim).exec(color)
.map((x, i) => (i !== 0 ? Number(x).toString(16) : '#'))
.reduce((c, ch) => `${c}${ch}`);
}
return PRESET_COLOR_MAP[color] || color;
};

14
src/js/utils/test/colors.test.js Normal file
View File

@ -0,0 +1,14 @@
const assert = require('assert');
const colors = require('../colors');
describe('utils.colors', () => {
it('should return #aaabac for RGB()', () => {
assert.equal(colors.getColor('rgb(170, 171, 172)', '#aaabac'));
});
it('should return #ff5858 for the named color red', () => {
assert.equal(colors.getColor('red', '#ff5858d'));
});
it('should return #1a5c29 for the hex color #1a5c29', () => {
assert.equal(colors.getColor('#1a5c29', '#1a5c29'));
});
});

14
src/js/utils/test/helpers.test.js
View File

@ -1,10 +1,10 @@
const assert = require('assert')
const helpers = require('../helpers')
const assert = require('assert');
const helpers = require('../helpers');
describe('utils.helpers', () => {
it('should return a value fixed upto 2 decimals', () => {
assert.equal(helpers.floatTwo(1.234), 1.23);
assert.equal(helpers.floatTwo(1.456), 1.46);
assert.equal(helpers.floatTwo(1), 1.00);
});
it('should return a value fixed upto 2 decimals', () => {
assert.equal(helpers.floatTwo(1.234), 1.23);
assert.equal(helpers.floatTwo(1.456), 1.46);
assert.equal(helpers.floatTwo(1), 1.00);
});
});