From 043a5211476c0ea622e5d24e9da2348386eb13b8 Mon Sep 17 00:00:00 2001 From: Timothy Mugo Date: Tue, 3 Nov 2026 13:21:21 +0300 Subject: [PATCH] fix(timeline): don't crash when posts outnumber saved point configs Per-point settings were read as config[idx].x, which throws once a post is added beyond the saved data-config array. Add getPointConfig() that falls back to the last configured point, then defaults, and make subtitle reads null-safe. --- .changeset/quiet-points-grow.md | 5 ++++ .../src/embeddable/new-time-line/timeline.jsx | 25 +++++++++-------- .../src/embeddable/time-line/desktop.jsx | 27 +++++++++--------- .../src/embeddable/time-line/mobile.jsx | 17 +++++------ .../src/embeddable/time-line/point-config.js | 28 +++++++++++++++++++ 5 files changed, 69 insertions(+), 33 deletions(-) create mode 100644 .changeset/quiet-points-grow.md create mode 100644 packages/dvz-ui/src/embeddable/time-line/point-config.js diff --git a/.changeset/quiet-points-grow.md b/.changeset/quiet-points-grow.md new file mode 100644 index 000000000..8ff71c84e --- /dev/null +++ b/.changeset/quiet-points-grow.md @@ -0,0 +1,5 @@ +--- +"@devgateway/dvz-ui-react": patch +--- + +Fix timeline crashing when more posts exist than saved per-point configs by falling back to the last configured point and defaults diff --git a/packages/dvz-ui/src/embeddable/new-time-line/timeline.jsx b/packages/dvz-ui/src/embeddable/new-time-line/timeline.jsx index 12a9dac58..43a1bcbd8 100644 --- a/packages/dvz-ui/src/embeddable/new-time-line/timeline.jsx +++ b/packages/dvz-ui/src/embeddable/new-time-line/timeline.jsx @@ -1,3 +1,4 @@ +import { getPointConfig } from "../time-line/point-config"; import React, {useEffect, useRef, useState} from "react"; import * as d3 from 'd3' @@ -36,42 +37,42 @@ const TimeLine = ({ const pointPosition = (idx) => { - return config[idx].position + return getPointConfig(config, idx).position } const tickLength = (idx) => { - return config[idx].connectorLineHeight + return getPointConfig(config, idx).connectorLineHeight } const subtitleOffset = (idx) => { - return config[idx].subtitleOffset + return getPointConfig(config, idx).subtitleOffset } const connectorLineHeight = (idx) => { - return config[idx].connectorLineHeight + return getPointConfig(config, idx).connectorLineHeight } const titleOffset = (idx) => { - return config[idx].titleOffset + return getPointConfig(config, idx).titleOffset } const circleColor = (idx) => { - return config[idx].circleColor + return getPointConfig(config, idx).circleColor } const pointLineColor = (idx) => { - return config[idx].lineColor + return getPointConfig(config, idx).lineColor } const titleColor = (idx) => { - return config[idx].titleColor + return getPointConfig(config, idx).titleColor } const labelColor = (idx) => { - return config[idx].labelColor + return getPointConfig(config, idx).labelColor } const size = (idx) => { - return config[idx].size + return getPointConfig(config, idx).size } const readMoreLabel = (idx) => { - return config[idx].readMoreLabel + return getPointConfig(config, idx).readMoreLabel } useEffect(() => { @@ -189,7 +190,7 @@ const TimeLine = ({ .style('line-height', '100%') .style('text-align', 'center') .html((d, i) => { - return d["meta_fields"]["subtitle"] + return d?.meta_fields?.subtitle ?? "" }) .on("mouseover", (d, i) => { onMouseOver(d, i) diff --git a/packages/dvz-ui/src/embeddable/time-line/desktop.jsx b/packages/dvz-ui/src/embeddable/time-line/desktop.jsx index 264cd8144..c1bcebe3e 100644 --- a/packages/dvz-ui/src/embeddable/time-line/desktop.jsx +++ b/packages/dvz-ui/src/embeddable/time-line/desktop.jsx @@ -1,3 +1,4 @@ +import { getPointConfig } from "./point-config"; import { PostConsumer, PostProvider } from "@devgateway/wp-react-lib"; import PostIntro from "../connected-templates/PostIntro"; import React, { useEffect, useRef, useState } from "react"; @@ -48,46 +49,46 @@ const TimeLine = (props) => { const [tooltipData, setTooltipData] = useState(null); const pointPosition = (idx) => { - return config[idx].position; + return getPointConfig(config, idx).position; }; const tickLength = (idx) => { - return config[idx].connectorLineHeight; + return getPointConfig(config, idx).connectorLineHeight; }; const subtitleOffset = (idx) => { - return config[idx].subtitleOffset; + return getPointConfig(config, idx).subtitleOffset; }; const connectorLineHeight = (idx) => { - return config[idx].connectorLineHeight; + return getPointConfig(config, idx).connectorLineHeight; }; const titleOffset = (idx) => { - return config[idx].titleOffset; + return getPointConfig(config, idx).titleOffset; }; const circleColor = (idx) => { - return config[idx]?.circleColor; + return getPointConfig(config, idx).circleColor; }; const pointLineColor = (idx) => { - return config[idx].lineColor; + return getPointConfig(config, idx).lineColor; }; const titleColor = (idx) => { - return config[idx].titleColor; + return getPointConfig(config, idx).titleColor; }; const labelColor = (idx) => { - return config[idx].labelColor; + return getPointConfig(config, idx).labelColor; }; const tooltipFontColor = (idx) => { - return config[idx].tooltipFontColor || "#fff"; + return getPointConfig(config, idx).tooltipFontColor || "#fff"; }; const size = (idx) => { - return config[idx].size; + return getPointConfig(config, idx).size; }; const readMoreLabel = (idx) => { - return config[idx].readMoreLabel; + return getPointConfig(config, idx).readMoreLabel; }; const getCircleId = (idx) => { @@ -276,7 +277,7 @@ const TimeLine = (props) => { .style("line-height", "100%") .style("text-align", "center") .html((d, i) => { - return d["meta_fields"]["subtitle"]; + return d?.meta_fields?.subtitle ?? ""; }) .on("mouseover", (event, d, i) => { //onMouseOver(d, i) diff --git a/packages/dvz-ui/src/embeddable/time-line/mobile.jsx b/packages/dvz-ui/src/embeddable/time-line/mobile.jsx index 366a65f21..32ffd5c9a 100644 --- a/packages/dvz-ui/src/embeddable/time-line/mobile.jsx +++ b/packages/dvz-ui/src/embeddable/time-line/mobile.jsx @@ -1,3 +1,4 @@ +import { getPointConfig } from "./point-config"; import { PostConsumer, PostProvider } from "@devgateway/wp-react-lib"; import PostIntro from "../connected-templates/PostIntro"; import React, { useCallback, useLayoutEffect, useRef, useState } from "react"; @@ -51,7 +52,7 @@ const TimeLine = (props) => { const getCircleId = useCallback((idx) => `circle${unique}${idx}`, [unique]); const getTitleId = useCallback((idx) => `title${unique}${idx}`, [unique]); - const size = (idx) => config[idx]?.size || 10; + const size = (idx) => getPointConfig(config, idx).size || 10; const TooltipModal = ({ content, isOpen, style }) => { const addInlineStylesToHTML = (html) => { @@ -94,23 +95,23 @@ const TimeLine = (props) => { }; const circleColor = (idx) => { - return config[idx]?.circleColor; + return getPointConfig(config, idx).circleColor; }; const titleColor = (idx) => { - return config[idx].titleColor; + return getPointConfig(config, idx).titleColor; }; const pointLineColor = (idx) => { - return config[idx].lineColor; + return getPointConfig(config, idx).lineColor; }; const tooltipFontColor = (idx) => { - return config[idx].tooltipFontColor || "#fff"; + return getPointConfig(config, idx).tooltipFontColor || "#fff"; }; const readMoreLabel = (idx) => { - return config[idx].readMoreLabel; + return getPointConfig(config, idx).readMoreLabel; }; const isTouchDevice = () => { @@ -243,7 +244,7 @@ const TimeLine = (props) => { .attr("class", "timeline-circle") .attr("cy", (d, i) => yScale(i)) .attr("r", (d, i) => size(i)) - .style("fill", (d, i) => config[i]?.circleColor || "#000") + .style("fill", (d, i) => getPointConfig(config, i).circleColor || "#000") .style("cursor", enableCirclePopup ? "pointer" : "default") .on("click", (event, d) => { event.preventDefault(); @@ -334,7 +335,7 @@ const TimeLine = (props) => { .style("line-height", "1em") .style("font-weight", "400") .style("color", "#4C4D50") - .html((d) => d.meta_fields.subtitle); + .html((d) => d?.meta_fields?.subtitle ?? ""); }, [deviceType, orientation, height]); return ( diff --git a/packages/dvz-ui/src/embeddable/time-line/point-config.js b/packages/dvz-ui/src/embeddable/time-line/point-config.js new file mode 100644 index 000000000..d72a8acd4 --- /dev/null +++ b/packages/dvz-ui/src/embeddable/time-line/point-config.js @@ -0,0 +1,28 @@ +/** + * Fallback settings for timeline points that have no saved entry in the + * block's `data-config` array (e.g. posts added after the config was saved). + */ +export const DEFAULT_POINT_CONFIG = { + position: "bottom", + connectorLineHeight: 50, + subtitleOffset: 55, + titleOffset: 75, + circleColor: "#000", + lineColor: "#000", + titleColor: "#000", + labelColor: "#000", + tooltipFontColor: "#fff", + size: 10, + readMoreLabel: "", +}; + +/** + * Returns the configuration for the point at `idx`. The config array may be + * shorter than the list of posts (or not an array at all), so fall back to the + * last configured point and finally to the defaults instead of throwing. + */ +export const getPointConfig = (config, idx) => { + const list = Array.isArray(config) ? config : []; + const entry = list[idx] || list[list.length - 1] || {}; + return { ...DEFAULT_POINT_CONFIG, ...entry }; +};