forked from github/plane
style: custom analytics bar graph label overlapping (#2636)
* style: custom analytics bar graph label overlapping fix: Bar graph avatar image rendering & tooltip * fix: import
This commit is contained in:
parent
0d2c399555
commit
c233e6e3b6
@ -3,7 +3,7 @@ import { BarDatum } from "@nivo/bar";
|
||||
// components
|
||||
import { CustomTooltip } from "./custom-tooltip";
|
||||
// ui
|
||||
import { BarGraph } from "components/ui";
|
||||
import { BarGraph, Tooltip } from "components/ui";
|
||||
// helpers
|
||||
import { findStringWithMostCharacters } from "helpers/array.helper";
|
||||
import { generateBarColor, generateDisplayName } from "helpers/analytics.helper";
|
||||
@ -72,25 +72,26 @@ export const AnalyticsGraph: React.FC<Props> = ({ analytics, barGraphData, param
|
||||
renderTick:
|
||||
params.x_axis === "assignees__id"
|
||||
? (datum) => {
|
||||
const avatar = analytics.extras.assignee_details?.find(
|
||||
(a) => a?.assignees__display_name === datum?.value
|
||||
)?.assignees__avatar;
|
||||
const assignee = analytics.extras.assignee_details?.find((a) => a?.assignees__id === datum?.value);
|
||||
|
||||
if (avatar && avatar !== "")
|
||||
if (assignee?.assignees__avatar && assignee?.assignees__avatar !== "")
|
||||
return (
|
||||
<Tooltip tooltipContent={assignee?.assignees__display_name}>
|
||||
<g transform={`translate(${datum.x},${datum.y})`}>
|
||||
<image
|
||||
x={-8}
|
||||
y={10}
|
||||
width={16}
|
||||
height={16}
|
||||
xlinkHref={avatar}
|
||||
xlinkHref={assignee?.assignees__avatar}
|
||||
style={{ clipPath: "circle(50%)" }}
|
||||
/>
|
||||
</g>
|
||||
</Tooltip>
|
||||
);
|
||||
else
|
||||
return (
|
||||
<Tooltip tooltipContent={assignee?.assignees__display_name}>
|
||||
<g transform={`translate(${datum.x},${datum.y})`}>
|
||||
<circle cy={18} r={8} fill="#374151" />
|
||||
<text x={0} y={21} textAnchor="middle" fontSize={9} fill="#ffffff">
|
||||
@ -103,11 +104,18 @@ export const AnalyticsGraph: React.FC<Props> = ({ analytics, barGraphData, param
|
||||
: "?"}
|
||||
</text>
|
||||
</g>
|
||||
</Tooltip>
|
||||
);
|
||||
}
|
||||
: (datum) => (
|
||||
<g transform={`translate(${datum.x},${datum.y})`}>
|
||||
<text x={0} y={21} textAnchor="middle" fontSize={10}>
|
||||
<g transform={`translate(${datum.x},${datum.y + 10})`}>
|
||||
<text
|
||||
x={0}
|
||||
y={datum.y}
|
||||
textAnchor="end"
|
||||
fontSize={10}
|
||||
className={`${barGraphData.data.length > 7 ? "-rotate-45" : ""}`}
|
||||
>
|
||||
{generateDisplayName(datum.value, analytics, params, "x_axis")}
|
||||
</text>
|
||||
</g>
|
||||
|
Loading…
Reference in New Issue
Block a user