From 408441c13aa039045a347a3eca07a103b23caeae Mon Sep 17 00:00:00 2001 From: Leonardo <leomilho@gmail.com> Date: Tue, 25 Jun 2024 18:58:32 +0200 Subject: [PATCH] fix: fix paohvis colors --- .../visualizations/paohvis/components/CustomLine.tsx | 1 + .../paohvis/components/HyperRangeBlock.tsx | 10 +++++----- .../visualizations/paohvis/components/RowLabels.tsx | 1 + 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/libs/shared/lib/vis/visualizations/paohvis/components/CustomLine.tsx b/libs/shared/lib/vis/visualizations/paohvis/components/CustomLine.tsx index 9299febe1..94354b436 100644 --- a/libs/shared/lib/vis/visualizations/paohvis/components/CustomLine.tsx +++ b/libs/shared/lib/vis/visualizations/paohvis/components/CustomLine.tsx @@ -18,6 +18,7 @@ export const CustomLine: React.FC<LineProps> = (props) => { y1={props.y1} y2={props.y2} strokeWidth={props.strokeWidth} + stroke={props.fill} fill={props.fill} className={props.className} /> diff --git a/libs/shared/lib/vis/visualizations/paohvis/components/HyperRangeBlock.tsx b/libs/shared/lib/vis/visualizations/paohvis/components/HyperRangeBlock.tsx index 24bb81d01..23be7bc61 100644 --- a/libs/shared/lib/vis/visualizations/paohvis/components/HyperRangeBlock.tsx +++ b/libs/shared/lib/vis/visualizations/paohvis/components/HyperRangeBlock.tsx @@ -2,8 +2,8 @@ import React, { useEffect, useState, useMemo } from 'react'; import { CustomLine } from './CustomLine'; import { PaohvisDataPaginated, RowInformation, LinesHyperEdges } from '../types'; import { ArrowDownward, ArrowUpward, ContactPageSharp, Sort } from '@mui/icons-material'; -import { index, select } from 'd3'; -import { c } from 'vite/dist/node/types.d-FdqQ54oU'; +import { select } from 'd3'; +import { visualizationColors, tailwindColors } from 'config'; interface HyperEdgeRangesBlockProps { dataModel: PaohvisDataPaginated; @@ -258,7 +258,7 @@ export const HyperEdgeRangesBlock: React.FC<HyperEdgeRangesBlockProps> = ({ ))} </g> {dataModel.pageData.hyperEdgeRanges.map((hyperEdgeRange, indexHyperEdgeRange) => ( - <> + <React.Fragment key={indexHyperEdgeRange}> <g className={'hyperEdgeBlockLinesRef hyperEdgeLines-col-' + indexHyperEdgeRange} transform={'translate(' + (rowLabelColumnWidth + indexHyperEdgeRange * rowHeight) + ',' + widthColumns + ')rotate(-90,0,0)'} @@ -294,7 +294,7 @@ export const HyperEdgeRangesBlock: React.FC<HyperEdgeRangesBlockProps> = ({ /> </g> )} - </> + </React.Fragment> ))} {dataModel.pageData.hyperEdgeRanges.map((hyperEdgeRange, indexHyperEdgeRange) => ( @@ -317,7 +317,7 @@ export const HyperEdgeRangesBlock: React.FC<HyperEdgeRangesBlockProps> = ({ x2={0} y2={(dataLinesHyperedges[indexHyperEdgeRange].y1 - currentPageRows.startIndexRow) * rowHeight} strokeWidth={0.075 * rowHeight} - fill="hsl(var(--clr-pri--600))" + fill={visualizationColors.GPNeutral.colors[1][0]} /> )} </g> diff --git a/libs/shared/lib/vis/visualizations/paohvis/components/RowLabels.tsx b/libs/shared/lib/vis/visualizations/paohvis/components/RowLabels.tsx index d653fef96..9f3f7fd1e 100644 --- a/libs/shared/lib/vis/visualizations/paohvis/components/RowLabels.tsx +++ b/libs/shared/lib/vis/visualizations/paohvis/components/RowLabels.tsx @@ -3,6 +3,7 @@ import { CustomLine } from './CustomLine'; import { RowInformation } from '../types'; import { ArrowDownward, ArrowUpward, Sort } from '@mui/icons-material'; import { select, selectAll } from 'd3'; +import { visualizationColors, tailwindColors } from 'config'; interface RowLabelsProps { dataRows: RowInformation; -- GitLab