Fix custom color handling (#1929)

This commit is contained in:
maniarathi
2020-10-13 15:47:56 -07:00
committed by GitHub
parent 5325495123
commit 798976e4c1
2 changed files with 8 additions and 9 deletions
@@ -168,12 +168,7 @@ const renderLinks = (projectLinks, aboutURL) => {
}; };
const InfoFormat = React.memo( const InfoFormat = React.memo(
({ ({ datasetTitle, singleValueCategories, aboutURL, dataPortalProps = {} }) => {
datasetTitle,
singleValueCategories,
aboutURL,
dataPortalProps = {},
}) => {
if (dataPortalProps.version?.["corpora_schema_version"] !== "1.0.0") { if (dataPortalProps.version?.["corpora_schema_version"] !== "1.0.0") {
dataPortalProps = {}; dataPortalProps = {};
} }
+7 -3
View File
@@ -106,15 +106,19 @@ export function loadUserColorConfig(userColors) {
return -1; return -1;
}) })
.reduce( .reduce(
(acc, label, i) => { (acc, label) => {
const color = parseRGB(userColors[category][label]); const color = parseRGB(userColors[category][label]);
acc[0][label] = color; acc[0][label] = color;
acc[1][i] = d3.rgb(255 * color[0], 255 * color[1], 255 * color[2]); acc[1][label] = d3.rgb(
255 * color[0],
255 * color[1],
255 * color[2]
);
return acc; return acc;
}, },
[{}, {}] [{}, {}]
); );
const scale = (i) => scaleMap[i]; const scale = (label) => scaleMap[label];
convertedUserColors[category] = { colors, scale }; convertedUserColors[category] = { colors, scale };
}); });
return convertedUserColors; return convertedUserColors;