Skip to content

Add saturation adjustment for generated color palette #491

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
merged 3 commits into from
Aug 1, 2019
Merged

Add saturation adjustment for generated color palette #491

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
345c436
Add saturation adjustment for generated color palette
Inbal-Tish Jul 30, 2019
a1c89e9
adding tests
Inbal-Tish Jul 31, 2019
94c153e
shorting method
Inbal-Tish Jul 31, 2019
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
12 changes: 11 additions & 1 deletion src/style/__tests__/colors.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,16 @@ describe('style/Colors', () => {
expect(cachedPalette).toBeDefined();
expect(cachedPalette.length).toBe(8);
expect(cachedPalette.includes('#3F88C5')).toBe(true);
})
});

it('should generateColorPalette', () => {
const palette = uut.generateColorPalette('#3F88C5');
expect(palette).toEqual(['#193852', '#255379', '#316EA1', '#3F88C5', '#66A0D1', '#8DB9DD', '#B5D1E9', '#DCE9F4']);
});

it('should generateColorPalette with adjusted saturation', () => {
const palette = uut.generateColorPalette('#FFE5FF');
expect(palette).toEqual(['#661A66', '#8F248F', '#B82EB7', '#D148D1', '#DB71DB', '#E699E6', '#F0C2F0', '#FFE5FF']);
});
});
});
27 changes: 25 additions & 2 deletions src/style/colors.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,11 +123,34 @@ class Colors {
tints.push(tint);
});

const sliced = tints.slice(0, 8);
return sliced;
let sliced = tints.slice(0, 8);
const adjusted = adjustSaturation(sliced, color);
return adjusted || sliced;
});
}

function adjustSaturation(colors, color) {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's add some test to cover these logic

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok

let array;
const lightnessLevel = 80;
const saturationLevel = 60;
const hsl = Color(color).hsl();
const lightness = Math.round(hsl.color[2]);

if (lightness > lightnessLevel) {
const saturation = Math.round(hsl.color[1]);
if (saturation > saturationLevel) {
array = _.map(colors, e => e !== color ? addSaturation(e, saturationLevel) : e)
}
}
return array;
}

function addSaturation(color, saturation) {
const hsl = Color(color).hsl();
hsl.color[1] = saturation;
return hsl.hex();
}

function generateColorTint(color, tintLevel) {
const hsl = Color(color).hsl();
hsl.color[2] = tintLevel;
Expand Down