Change Grouped Bar Graph to use tooltips
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/push Build is passing
Details
This commit is contained in:
parent
6123616fe5
commit
50a637755b
|
@ -6,14 +6,6 @@
|
|||
fill: var(--primary-accent-light);
|
||||
}
|
||||
|
||||
.barText {
|
||||
visibility: hidden;
|
||||
|
||||
font-family: "Inconsolata", monospace;
|
||||
font-weight: 800;
|
||||
fill: var(--label);
|
||||
}
|
||||
|
||||
.barGroup:hover .bar {
|
||||
fill: var(--primary-accent);
|
||||
filter: drop-shadow(0 0 calc(4rem / 16) var(--primary-accent));
|
||||
|
|
|
@ -9,18 +9,6 @@
|
|||
fill: var(--card-background);
|
||||
}
|
||||
|
||||
.barText {
|
||||
visibility: hidden;
|
||||
|
||||
font-family: "Inconsolata", monospace;
|
||||
font-weight: 800;
|
||||
fill: var(--label);
|
||||
}
|
||||
|
||||
.singleBar:hover .barText {
|
||||
visibility: visible;
|
||||
}
|
||||
|
||||
.tickLabel {
|
||||
font-family: "Inconsolata", monospace;
|
||||
font-weight: 800;
|
||||
|
|
|
@ -1,16 +1,20 @@
|
|||
import { AxisBottom, AxisLeft } from "@visx/axis";
|
||||
import { bottomTickLabelProps } from "@visx/axis/lib/axis/AxisBottom";
|
||||
import { leftTickLabelProps } from "@visx/axis/lib/axis/AxisLeft";
|
||||
import { localPoint } from "@visx/event";
|
||||
import { GridColumns, GridRows } from "@visx/grid";
|
||||
import { Group } from "@visx/group";
|
||||
import { LegendOrdinal } from "@visx/legend";
|
||||
import { Point } from "@visx/point";
|
||||
import { scaleBand, scaleLinear, scaleOrdinal } from "@visx/scale";
|
||||
import { Bar, BarGroup, BarGroupHorizontal } from "@visx/shape";
|
||||
import { BarGroupBar as BarGroupBarType } from "@visx/shape/lib/types";
|
||||
import { Text } from "@visx/text";
|
||||
import { withTooltip } from "@visx/tooltip";
|
||||
import React, { useState } from "react";
|
||||
import { Color } from "utils/Color";
|
||||
|
||||
import { TooltipWrapper } from "./TooltipWrapper";
|
||||
|
||||
import styles from "./GroupedBarGraph.module.css";
|
||||
|
||||
interface GroupedBarGraphProps {
|
||||
|
@ -79,15 +83,20 @@ interface BarGroupData {
|
|||
|
||||
// BAR_PADDING must be in the range [0, 1)
|
||||
const BAR_PADDING = 0.2;
|
||||
const BAR_TEXT_PADDING = 12;
|
||||
|
||||
const DEFAULT_LABEL_SIZE = 16;
|
||||
|
||||
export function GroupedBarGraphVertical(props: GroupedBarGraphProps) {
|
||||
const {
|
||||
type TooltipData = string;
|
||||
|
||||
export const GroupedBarGraphVertical = withTooltip<
|
||||
GroupedBarGraphProps,
|
||||
TooltipData
|
||||
>(
|
||||
({
|
||||
data: propsData,
|
||||
barColors,
|
||||
barHoverColorsMap,
|
||||
width,
|
||||
height,
|
||||
margin,
|
||||
className,
|
||||
|
@ -106,8 +115,14 @@ export function GroupedBarGraphVertical(props: GroupedBarGraphProps) {
|
|||
alternatingLabelSpace = 80,
|
||||
defaultLabelDy = `0px`,
|
||||
lowerLabelDy = `30px`,
|
||||
} = props;
|
||||
const width = props.width < minWidth ? minWidth : props.width; // Ensuring graph's width >= minWidth
|
||||
tooltipOpen,
|
||||
tooltipLeft,
|
||||
tooltipTop,
|
||||
tooltipData,
|
||||
hideTooltip,
|
||||
showTooltip,
|
||||
}) => {
|
||||
width = width < minWidth ? minWidth : width; // Ensuring graph's width >= minWidth
|
||||
const alternatingLabel = width <= widthAlternatingLabel;
|
||||
const final_margin_bottom = alternatingLabel
|
||||
? margin.bottom + alternatingLabelSpace
|
||||
|
@ -163,7 +178,9 @@ export function GroupedBarGraphVertical(props: GroupedBarGraphProps) {
|
|||
|
||||
return (
|
||||
<div
|
||||
className={className ? `${className} ${styles.wrapper}` : styles.wrapper}
|
||||
className={
|
||||
className ? `${className} ${styles.wrapper}` : styles.wrapper
|
||||
}
|
||||
>
|
||||
<div className={styles.legend}>
|
||||
<LegendOrdinal
|
||||
|
@ -239,6 +256,21 @@ export function GroupedBarGraphVertical(props: GroupedBarGraphProps) {
|
|||
>
|
||||
{barGroup.bars.map((bar) => (
|
||||
<HoverableBar
|
||||
onMouseMove={(e) => {
|
||||
const eventSvgCoords = localPoint(
|
||||
// ownerSVGElement is given by visx docs but not recognized by typescript
|
||||
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
|
||||
// @ts-ignore
|
||||
e.target.ownerSVGElement as Element,
|
||||
e
|
||||
) as Point;
|
||||
showTooltip({
|
||||
tooltipData: bar.value.toString(),
|
||||
tooltipTop: eventSvgCoords.y,
|
||||
tooltipLeft: eventSvgCoords.x,
|
||||
});
|
||||
}}
|
||||
onMouseOut={hideTooltip}
|
||||
key={`bar-group-bar-${barGroup.x0}-${barGroup.index}-${bar.key}-${bar.index}`}
|
||||
bar={bar}
|
||||
valueMax={valueMax}
|
||||
|
@ -250,11 +282,9 @@ export function GroupedBarGraphVertical(props: GroupedBarGraphProps) {
|
|||
))
|
||||
}
|
||||
</BarGroup>
|
||||
</Group>
|
||||
<AxisBottom
|
||||
scale={categoryScale}
|
||||
top={valueMax + margin.top}
|
||||
left={margin.left}
|
||||
top={valueMax}
|
||||
hideAxisLine
|
||||
hideTicks
|
||||
tickLabelProps={(value, index) => {
|
||||
|
@ -278,8 +308,6 @@ export function GroupedBarGraphVertical(props: GroupedBarGraphProps) {
|
|||
/>
|
||||
<AxisLeft
|
||||
scale={valueScale}
|
||||
top={margin.top}
|
||||
left={margin.left}
|
||||
hideAxisLine
|
||||
hideTicks
|
||||
numTicks={5}
|
||||
|
@ -299,16 +327,30 @@ export function GroupedBarGraphVertical(props: GroupedBarGraphProps) {
|
|||
fontSize: `${valueAxisLabelSize / 16}rem`,
|
||||
}}
|
||||
/>
|
||||
</Group>
|
||||
</svg>
|
||||
|
||||
{tooltipOpen && (
|
||||
<TooltipWrapper
|
||||
top={tooltipTop}
|
||||
left={tooltipLeft}
|
||||
header={tooltipData as string}
|
||||
></TooltipWrapper>
|
||||
)}
|
||||
</div>
|
||||
);
|
||||
}
|
||||
}
|
||||
);
|
||||
|
||||
export function GroupedBarGraphHorizontal(props: GroupedBarGraphProps) {
|
||||
const {
|
||||
export const GroupedBarGraphHorizontal = withTooltip<
|
||||
GroupedBarGraphProps,
|
||||
TooltipData
|
||||
>(
|
||||
({
|
||||
data: propsData,
|
||||
barColors,
|
||||
barHoverColorsMap,
|
||||
width,
|
||||
height,
|
||||
margin,
|
||||
className,
|
||||
|
@ -324,8 +366,14 @@ export function GroupedBarGraphHorizontal(props: GroupedBarGraphProps) {
|
|||
valueAxisLabelOffset = 0,
|
||||
itemMargin = "0 0 0 15px",
|
||||
defaultLabelDy = "0",
|
||||
} = props;
|
||||
const width = props.width < minWidth ? minWidth : props.width; // Ensuring graph's width >= minWidth
|
||||
tooltipOpen,
|
||||
tooltipLeft,
|
||||
tooltipTop,
|
||||
tooltipData,
|
||||
hideTooltip,
|
||||
showTooltip,
|
||||
}) => {
|
||||
width = width < minWidth ? minWidth : width; // Ensuring graph's width >= minWidth
|
||||
|
||||
const data: BarGroupData[] = propsData.map((datum: GroupedBarGraphData) => {
|
||||
return { category: datum.category, ...datum.values };
|
||||
|
@ -377,7 +425,9 @@ export function GroupedBarGraphHorizontal(props: GroupedBarGraphProps) {
|
|||
|
||||
return (
|
||||
<div
|
||||
className={className ? `${className} ${styles.wrapper}` : styles.wrapper}
|
||||
className={
|
||||
className ? `${className} ${styles.wrapper}` : styles.wrapper
|
||||
}
|
||||
>
|
||||
<div className={styles.legend}>
|
||||
<LegendOrdinal
|
||||
|
@ -453,6 +503,21 @@ export function GroupedBarGraphHorizontal(props: GroupedBarGraphProps) {
|
|||
>
|
||||
{barGroup.bars.map((bar) => (
|
||||
<HoverableBar
|
||||
onMouseMove={(e) => {
|
||||
const eventSvgCoords = localPoint(
|
||||
// ownerSVGElement is given by visx docs but not recognized by typescript
|
||||
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
|
||||
// @ts-ignore
|
||||
e.target.ownerSVGElement as Element,
|
||||
e
|
||||
) as Point;
|
||||
showTooltip({
|
||||
tooltipData: bar.value.toString(),
|
||||
tooltipTop: eventSvgCoords.y,
|
||||
tooltipLeft: eventSvgCoords.x,
|
||||
});
|
||||
}}
|
||||
onMouseOut={hideTooltip}
|
||||
key={`bar-group-bar-${barGroup.y0}-${barGroup.index}-${bar.key}-${bar.index}`}
|
||||
bar={bar}
|
||||
valueMax={valueMax}
|
||||
|
@ -465,11 +530,8 @@ export function GroupedBarGraphHorizontal(props: GroupedBarGraphProps) {
|
|||
))
|
||||
}
|
||||
</BarGroupHorizontal>
|
||||
</Group>
|
||||
<AxisLeft
|
||||
scale={categoryScale}
|
||||
top={margin.top}
|
||||
left={margin.left}
|
||||
hideAxisLine
|
||||
hideTicks
|
||||
tickLabelProps={() => {
|
||||
|
@ -491,8 +553,7 @@ export function GroupedBarGraphHorizontal(props: GroupedBarGraphProps) {
|
|||
/>
|
||||
<AxisBottom
|
||||
scale={valueScale}
|
||||
top={categoryMax + margin.top}
|
||||
left={margin.left}
|
||||
top={categoryMax}
|
||||
hideAxisLine
|
||||
hideTicks
|
||||
numTicks={5}
|
||||
|
@ -512,10 +573,20 @@ export function GroupedBarGraphHorizontal(props: GroupedBarGraphProps) {
|
|||
fontSize: `${valueAxisLabelSize / 16}rem`,
|
||||
}}
|
||||
/>
|
||||
</Group>
|
||||
</svg>
|
||||
|
||||
{tooltipOpen && (
|
||||
<TooltipWrapper
|
||||
top={tooltipTop}
|
||||
left={tooltipLeft}
|
||||
header={tooltipData as string}
|
||||
></TooltipWrapper>
|
||||
)}
|
||||
</div>
|
||||
);
|
||||
}
|
||||
}
|
||||
);
|
||||
|
||||
interface HoverableBarProps {
|
||||
bar: BarGroupBarType<string>;
|
||||
|
@ -523,16 +594,12 @@ interface HoverableBarProps {
|
|||
hoverFillColor?: string;
|
||||
hoverLabelSize?: number;
|
||||
isHorizontal?: boolean;
|
||||
onMouseMove?: (e: React.MouseEvent<SVGPathElement, MouseEvent>) => void;
|
||||
onMouseOut?: () => void;
|
||||
}
|
||||
|
||||
function HoverableBar(props: HoverableBarProps) {
|
||||
const {
|
||||
bar,
|
||||
valueMax,
|
||||
hoverLabelSize,
|
||||
hoverFillColor,
|
||||
isHorizontal = false,
|
||||
} = props;
|
||||
const { bar, hoverFillColor, onMouseMove, onMouseOut } = props;
|
||||
|
||||
const [isHovered, setIsHovered] = useState(false);
|
||||
|
||||
|
@ -549,6 +616,8 @@ function HoverableBar(props: HoverableBarProps) {
|
|||
}}
|
||||
>
|
||||
<Bar
|
||||
onMouseMove={onMouseMove}
|
||||
onMouseOut={onMouseOut}
|
||||
x={bar.x}
|
||||
y={bar.y}
|
||||
width={bar.width}
|
||||
|
@ -557,22 +626,6 @@ function HoverableBar(props: HoverableBarProps) {
|
|||
// apply the glow effect when the bar is hovered
|
||||
filter={isHovered ? `url(#glow-${colorId})` : undefined}
|
||||
/>
|
||||
<Text
|
||||
className={styles.barText}
|
||||
x={isHorizontal ? bar.width - BAR_TEXT_PADDING : bar.x + bar.width / 2}
|
||||
y={
|
||||
isHorizontal
|
||||
? bar.y + bar.height / 2
|
||||
: valueMax - bar.height + BAR_TEXT_PADDING
|
||||
}
|
||||
fontSize={
|
||||
hoverLabelSize ?? (isHorizontal ? bar.height : bar.width) * 0.5
|
||||
}
|
||||
textAnchor={isHorizontal ? "end" : "middle"}
|
||||
verticalAnchor={isHorizontal ? "middle" : "start"}
|
||||
>
|
||||
{bar.value}
|
||||
</Text>
|
||||
</Group>
|
||||
);
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue