From 33972be2da96617b10e8750403a75276b6247b8d Mon Sep 17 00:00:00 2001 From: Matt Margolin Date: Fri, 8 Mar 2024 21:19:33 -0800 Subject: [PATCH 1/2] Add null check for utils.getMorePropsForChart --- packages/interactive/src/utils.ts | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/packages/interactive/src/utils.ts b/packages/interactive/src/utils.ts index cc284117d..5d0d64730 100644 --- a/packages/interactive/src/utils.ts +++ b/packages/interactive/src/utils.ts @@ -74,15 +74,17 @@ function getMouseXY(moreProps: any, [ox, oy]: any) { export function getMorePropsForChart(moreProps: any, chartId: any) { const { chartConfig: chartConfigList } = moreProps; - const chartConfig = chartConfigList.find((each: any) => each.id === chartId); - - const { origin } = chartConfig; - const mouseXY = getMouseXY(moreProps, origin); - return { - ...moreProps, - chartConfig, - mouseXY, - }; + if (chartConfigList && Array.isArray(chartConfigList)) { + const chartConfig = chartConfigList.find((each: any) => each.id === chartId); + if (chartConfig) { + const { origin } = chartConfig; + const mouseXY = getMouseXY(moreProps, origin); + return { + ...moreProps, + chartConfig, + mouseXY, + }; + } } export function getSelected(interactives: any) { From 2d52dbeec79da0d1727c9aa7f07338f91e48ad57 Mon Sep 17 00:00:00 2001 From: Matt Margolin Date: Fri, 8 Mar 2024 21:25:37 -0800 Subject: [PATCH 2/2] Update utils.ts --- packages/interactive/src/utils.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/interactive/src/utils.ts b/packages/interactive/src/utils.ts index 5d0d64730..0fabf179f 100644 --- a/packages/interactive/src/utils.ts +++ b/packages/interactive/src/utils.ts @@ -84,6 +84,7 @@ export function getMorePropsForChart(moreProps: any, chartId: any) { chartConfig, mouseXY, }; + } } }