Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

🐛 (line) unselected lines don't disappear #4417

Merged
merged 1 commit into from
Jan 9, 2025
Merged

🐛 (line) unselected lines don't disappear #4417

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions packages/@ourworldindata/grapher/src/chart/ChartUtils.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,11 @@ export const getDefaultFailMessage = (manager: ChartManager): string => {

export const getSeriesKey = (
series: LineChartSeries,
suffix?: string
index: number
): string => {
return `${series.seriesName}-${series.color}-${
series.isProjection ? "projection" : ""
}${suffix ? "-" + suffix : ""}`
}-${index}`
}

export const autoDetectSeriesStrategy = (
Expand Down
8 changes: 4 additions & 4 deletions packages/@ourworldindata/grapher/src/lineCharts/LineChart.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,8 +279,8 @@ class Lines extends React.Component<LinesProps> {
private renderLines(): React.ReactElement {
return (
<>
{this.props.series.map((series) => (
<React.Fragment key={getSeriesKey(series)}>
{this.props.series.map((series, index) => (
<React.Fragment key={getSeriesKey(series, index)}>
{this.renderLine(series)}
{this.renderLineMarkers(series)}
</React.Fragment>
Expand Down Expand Up @@ -556,7 +556,7 @@ export class LineChart
y2={verticalAxis.range[1]}
stroke="rgba(180,180,180,.4)"
/>
{this.renderSeries.map((series) => {
{this.renderSeries.map((series, index) => {
const value = series.points.find(
(point) => point.x === activeX
)
Expand All @@ -574,7 +574,7 @@ export class LineChart

return (
<circle
key={getSeriesKey(series)}
key={getSeriesKey(series, index)}
cx={horizontalAxis.place(value.x)}
cy={verticalAxis.place(value.y)}
r={this.lineStrokeWidth / 2 + 3.5}
Expand Down
17 changes: 9 additions & 8 deletions packages/@ourworldindata/grapher/src/lineLegend/LineLegend.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ import {
MARKER_MARGIN,
NON_FOCUSED_TEXT_COLOR,
} from "./LineLegendConstants.js"
import { getSeriesKey } from "./LineLegendHelpers"

export interface LineLabelSeries extends ChartSeries {
label: string
Expand Down Expand Up @@ -150,7 +151,7 @@ class LineLabels extends React.Component<{
@computed private get textLabels(): React.ReactElement {
return (
<g id={makeIdForHumanConsumption("text-labels")}>
{this.markers.map(({ series, labelText }) => {
{this.markers.map(({ series, labelText }, index) => {
const textColor =
!series.focus?.background || series.hover?.active
? darkenColorForText(series.color)
Expand All @@ -164,7 +165,7 @@ class LineLabels extends React.Component<{
return series.textWrap instanceof TextWrap ? (
<Halo
id={series.seriesName}
key={series.seriesName}
key={getSeriesKey(series, index)}
show={this.showTextOutline}
outlineColor={this.textOutlineColor}
>
Expand Down Expand Up @@ -197,12 +198,12 @@ class LineLabels extends React.Component<{
if (!markersWithAnnotations) return
return (
<g id={makeIdForHumanConsumption("text-annotations")}>
{markersWithAnnotations.map(({ series, labelText }) => {
{markersWithAnnotations.map(({ series, labelText }, index) => {
if (!series.annotationTextWrap) return
return (
<Halo
id={series.seriesName}
key={series.seriesName}
key={getSeriesKey(series, index)}
show={this.showTextOutline}
outlineColor={this.textOutlineColor}
>
Expand Down Expand Up @@ -232,7 +233,7 @@ class LineLabels extends React.Component<{
if (!this.props.needsConnectorLines) return
return (
<g id={makeIdForHumanConsumption("connectors")}>
{this.markers.map(({ series, connectorLine }) => {
{this.markers.map(({ series, connectorLine }, index) => {
const { x1, x2 } = connectorLine
const {
level,
Expand All @@ -253,7 +254,7 @@ class LineLabels extends React.Component<{
return (
<path
id={makeIdForHumanConsumption(series.seriesName)}
key={series.seriesName}
key={getSeriesKey(series, index)}
d={d}
stroke={lineColor}
strokeWidth={0.5}
Expand All @@ -268,14 +269,14 @@ class LineLabels extends React.Component<{
@computed private get interactions(): React.ReactElement | void {
return (
<g>
{this.props.series.map((series) => {
{this.props.series.map((series, index) => {
const x =
this.anchor === "start"
? series.origBounds.x
: series.origBounds.x - series.bounds.width
return (
<g
key={series.seriesName}
key={getSeriesKey(series, index)}
onMouseOver={() => this.props.onMouseOver?.(series)}
onMouseLeave={() =>
this.props.onMouseLeave?.(series)
Expand Down
4 changes: 4 additions & 0 deletions packages/@ourworldindata/grapher/src/lineLegend/LineLegendHelpers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,3 +245,7 @@ export function computeCandidateScores(

return scoreMap
}

export function getSeriesKey(series: PlacedSeries, index: number): string {
return `${series.seriesName}-${index}`
}
Loading