Skip to content

Commit 7771657

Browse files
authored
refactor: remove grayscale utility and update color handling in DatasetMenu and MultiSelectFilter (#379)
1 parent 5ad2d5b commit 7771657

File tree

3 files changed

+4
-5
lines changed

3 files changed

+4
-5
lines changed

apps/frontend/src/components/map-menu/DatasetMenu.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import { FilterField } from '../keplerGl/factories';
99
import { MenuIcon } from './MenuIcon';
1010
import { FilterFactory } from './FilterFactory';
1111
import { LayerConfigChange, MenuSectionHeading } from './MapMenu';
12-
import { grayscale, rgbToHsl, toCss } from '../../utils/color';
12+
import { rgbToHsl, toCss } from '../../utils/color';
1313

1414
const ToggleVisibilityMenuIcon = styled(({ visible, ...props }) => (
1515
<MenuIcon {...props}>{visible ? 'OUI' : 'NON'}</MenuIcon>
@@ -76,7 +76,7 @@ export const DatasetMenu = ({
7676
};
7777

7878
const hslLayerColor = rgbToHsl(layer.config.color);
79-
const hslColor = !layer.config.isVisible ? grayscale(hslLayerColor) : hslLayerColor;
79+
const hslColor = !layer.config.isVisible ? rgbToHsl([230, 230, 230]) : hslLayerColor;
8080
const hslCssColor = toCss(hslColor);
8181

8282
return (

apps/frontend/src/components/map-menu/MultiSelectFillter.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React, { useCallback } from 'react';
22
import styled from 'styled-components';
3-
import { grayscale, rgbToHsl, toCss } from '../../utils/color';
3+
import { rgbToHsl, toCss } from '../../utils/color';
44

55
export const MultiSelectFilterOption = styled(({ hslCssColor, selected, ...props }) => <button {...props} />)`
66
display: inline;
@@ -40,7 +40,7 @@ export const MultiSelectFilter = styled(({ idx, filter, setFilter, layer, ...pro
4040
);
4141

4242
const hslLayerColor = rgbToHsl(layer.config.color);
43-
const hslColor = !layer.config.isVisible ? grayscale(hslLayerColor) : hslLayerColor;
43+
const hslColor = !layer.config.isVisible ? rgbToHsl([230, 230, 230]) : hslLayerColor;
4444
const hslCssColor = toCss(hslColor);
4545

4646
return (

apps/frontend/src/utils/color.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,5 +40,4 @@ export function rgbToHsl([r, g, b]: [r: number, g: number, b: number]): [number,
4040
return [Math.round(h * 360), Math.round(s * 100), Math.round(l * 100)];
4141
}
4242

43-
export const grayscale = ([h, s, l]: [h: number, s: number, l: number]): [number, number, number] => [0, 0, l / 2];
4443
export const toCss = ([h, s, l]: [h: number, s: number, l: number]) => `${h}, ${s}%, ${l}%`;

0 commit comments

Comments
 (0)