From 120250152f032f1d65de8ba1cef8621c241e7964 Mon Sep 17 00:00:00 2001
From: Tsuneo Yoshioka <yoshiokatsuneo@gmail.com>
Date: Tue, 9 Sep 2025 08:54:11 +0900
Subject: [PATCH] Add "Missing and NULL values" option to scatter chart (#7523)

---
 viz-lib/src/visualizations/chart/Editor/GeneralSettings.tsx  | 2 +-
 .../src/visualizations/chart/plotly/prepareDefaultData.ts    | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/viz-lib/src/visualizations/chart/Editor/GeneralSettings.tsx b/viz-lib/src/visualizations/chart/Editor/GeneralSettings.tsx
index 4ca741583..64455cd01 100644
--- a/viz-lib/src/visualizations/chart/Editor/GeneralSettings.tsx
+++ b/viz-lib/src/visualizations/chart/Editor/GeneralSettings.tsx
@@ -336,7 +336,7 @@ export default function GeneralSettings({ options, data, onOptionsChange }: any)
         </Section>
       )}
 
-      {!includes(["custom", "heatmap", "bubble", "scatter"], options.globalSeriesType) && (
+      {!includes(["custom", "heatmap", "bubble"], options.globalSeriesType) && (
         // @ts-expect-error ts-migrate(2745) FIXME: This JSX tag's 'children' prop expects type 'never... Remove this comment to see the full error message
         <Section>
           <Select
diff --git a/viz-lib/src/visualizations/chart/plotly/prepareDefaultData.ts b/viz-lib/src/visualizations/chart/plotly/prepareDefaultData.ts
index 03c4bf582..9ff06f6a2 100644
--- a/viz-lib/src/visualizations/chart/plotly/prepareDefaultData.ts
+++ b/viz-lib/src/visualizations/chart/plotly/prepareDefaultData.ts
@@ -96,7 +96,10 @@ function prepareSeries(series: any, options: any, numSeries: any, additionalOpti
   // For bubble/scatter charts `y` may be any (similar to `x`) - numeric is only bubble size;
   // for other types `y` is always number
   const cleanYValue = includes(["bubble", "scatter"], seriesOptions.type)
-    ? normalizeValue
+    ? (v: any, axixType: any) => {
+        v = normalizeValue(v, axixType);
+        return includes(["scatter"], seriesOptions.type) && options.missingValuesAsZero && isNil(v) ? 0.0 : v;
+      }
     : (v: any) => {
         v = cleanNumber(v);
         return options.missingValuesAsZero && isNil(v) ? 0.0 : v;