Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions .changeset/quiet-points-grow.md
Original file line number Diff line number Diff line change
@@ -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
25 changes: 13 additions & 12 deletions packages/dvz-ui/src/embeddable/new-time-line/timeline.jsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { getPointConfig } from "../time-line/point-config";
import React, {useEffect, useRef, useState} from "react";
import * as d3 from 'd3'

Expand Down Expand Up @@ -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(() => {
Expand Down Expand Up @@ -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)
Expand Down
27 changes: 14 additions & 13 deletions packages/dvz-ui/src/embeddable/time-line/desktop.jsx
Original file line number Diff line number Diff line change
@@ -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";
Expand Down Expand Up @@ -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) => {
Expand Down Expand Up @@ -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)
Expand Down
17 changes: 9 additions & 8 deletions packages/dvz-ui/src/embeddable/time-line/mobile.jsx
Original file line number Diff line number Diff line change
@@ -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";
Expand Down Expand Up @@ -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) => {
Expand Down Expand Up @@ -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 = () => {
Expand Down Expand Up @@ -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();
Expand Down Expand Up @@ -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 (
Expand Down
28 changes: 28 additions & 0 deletions packages/dvz-ui/src/embeddable/time-line/point-config.js
Original file line number Diff line number Diff line change
@@ -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 };
};
Loading