test: resolve boxSeriesData types

nhn · Feb 25, 2021 · 28d5da9 · 28d5da9
1 parent d9a9df3
commit 28d5da9
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 19 deletions.
diff --git a/apps/chart/src/charts/barChart.ts b/apps/chart/src/charts/barChart.ts
@@ -29,7 +29,13 @@ import * as labelBrush from '@src/brushes/label';
 import * as dataLabelBrush from '@src/brushes/dataLabel';
 import * as exportMenuBrush from '@src/brushes/exportMenu';
 
-import { BoxSeriesDataType, BarChartOptions, BoxSeriesInput, BoxSeriesData } from '@t/options';
+import {
+  BoxSeriesDataType,
+  BarChartOptions,
+  BoxSeriesInput,
+  BoxSeriesData,
+  BoxSeriesType,
+} from '@t/options';
 
 export interface BarChartProps {
   el: HTMLElement;
@@ -119,7 +125,7 @@ export default class BarChart extends Chart<BarChartOptions> {
       el,
       options,
       series: {
-        bar: data.series,
+        bar: data.series as BoxSeriesType<BoxSeriesDataType>[],
       },
       categories: data.categories,
       modules: [stackSeriesData, dataRange, scale, axes, plot],

diff --git a/apps/chart/src/charts/columnChart.ts b/apps/chart/src/charts/columnChart.ts
@@ -28,7 +28,13 @@ import * as labelBrush from '@src/brushes/label';
 import * as exportMenuBrush from '@src/brushes/exportMenu';
 import * as dataLabelBrush from '@src/brushes/dataLabel';
 
-import { ColumnChartOptions, BoxSeriesData, BoxSeriesDataType, BoxSeriesInput } from '@t/options';
+import {
+  ColumnChartOptions,
+  BoxSeriesData,
+  BoxSeriesDataType,
+  BoxSeriesInput,
+  BoxSeriesType,
+} from '@t/options';
 
 export interface ColumnChartProps {
   el: HTMLElement;
@@ -119,7 +125,7 @@ export default class ColumnChart extends Chart<ColumnChartOptions> {
       el,
       options,
       series: {
-        column: data.series,
+        column: data.series as BoxSeriesType<BoxSeriesDataType>[],
       },
       categories: data.categories,
       modules: [stackSeriesData, dataRange, scale, axes, plot],

diff --git a/apps/chart/src/component/boxSeries.ts b/apps/chart/src/component/boxSeries.ts
@@ -84,7 +84,7 @@ export function isLeftBottomSide(seriesIndex: number) {
   return !!(seriesIndex % 2);
 }
 
-function calculateBarLength(value: BoxSeriesDataType, min: number, max: number) {
+function calculateBarLength(value: Exclude<BoxSeriesDataType, null>, min: number, max: number) {
   if (isRangeValue(value)) {
     let [start, end] = value;
 
@@ -540,23 +540,25 @@ export default class BoxSeries extends Component {
 
     seriesData.forEach(({ data, name, color }) => {
       data.forEach((value, dataIndex) => {
-        const barLength = this.makeBarLength(value, renderOptions);
-
-        if (isNumber(barLength)) {
-          tooltipData.push({
-            label: name,
-            color,
-            value: this.getTooltipValue(value),
-            category: categories.length ? categories[dataIndex] : '',
-          });
+        if (!isNull(value)) {
+          const barLength = this.makeBarLength(value, renderOptions);
+
+          if (isNumber(barLength)) {
+            tooltipData.push({
+              label: name,
+              color,
+              value: this.getTooltipValue(value),
+              category: categories.length ? categories[dataIndex] : '',
+            });
+          }
         }
       });
     });
 
     return tooltipData;
   }
 
-  private getTooltipValue(value: BoxSeriesDataType): string | number {
+  private getTooltipValue(value: Exclude<BoxSeriesDataType, null>): string | number {
     return isRangeValue(value) ? `${value[0]} ~ ${value[1]}` : value;
   }
 
@@ -628,7 +630,7 @@ export default class BoxSeries extends Component {
 
   getStartPosition(
     barLength: number,
-    value: BoxSeriesDataType,
+    value: Exclude<BoxSeriesDataType, null>,
     renderOptions: RenderOptions,
     isLBSideWithDiverging: boolean
   ): number {

diff --git a/apps/chart/stories/column.stories.ts b/apps/chart/stories/column.stories.ts
@@ -144,13 +144,13 @@ export const positiveAndNegativeWithMinMax = () => {
 };
 
 export const range = () => {
-  const { el } = createChart(temperatureRangeData);
+  const { el } = createChart(temperatureRangeData as BoxSeriesData);
 
   return el;
 };
 
 export const rangeWithMinMax = () => {
-  const { el } = createChart(temperatureRangeData, {
+  const { el } = createChart(temperatureRangeData as BoxSeriesData, {
     yAxis: {
       scale: {
         min: -4,
@@ -163,7 +163,7 @@ export const rangeWithMinMax = () => {
 };
 
 export const rangeWithDataLabels = () => {
-  const { el } = createChart(temperatureRangeData, {
+  const { el } = createChart(temperatureRangeData as BoxSeriesData, {
     series: { dataLabels: { visible: true } },
   });