chore: converting more any to real type 10

elastic · Sep 16, 2021 · bb93b5a · bb93b5a
1 parent ae17f5c
commit bb93b5a
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 19 deletions.
diff --git a/packages/charts/src/chart_types/xy_chart/annotations/utils.ts b/packages/charts/src/chart_types/xy_chart/annotations/utils.ts
@@ -118,8 +118,8 @@ export function invertTransformedCursor(
 export function computeAnnotationDimensions(
   annotations: AnnotationSpec[],
   chartRotation: Rotation,
-  yScales: Map<GroupId, Scale<any>>,
-  xScale: Scale<any>,
+  yScales: Map<GroupId, Scale<number>>,
+  xScale: Scale<unknown>,
   axesSpecs: AxisSpec[],
   isHistogramModeEnabled: boolean,
   smallMultipleScales: SmallMultipleScales,
@@ -145,22 +145,22 @@ export function computeAnnotationDimensions(
         annotationDimensions.set(id, dimensions);
       }
       return annotationDimensions;
-    }
-
-    const dimensions = computeRectAnnotationDimensions(
-      annotationSpec,
-      yScales,
-      xScale,
-      axesSpecs,
-      smallMultipleScales,
-      chartRotation,
-      getAxisStyle,
-      isHistogramModeEnabled,
-    );
+    } else {
+      const dimensions = computeRectAnnotationDimensions(
+        annotationSpec,
+        yScales,
+        xScale as Scale<number>,
+        axesSpecs,
+        smallMultipleScales,
+        chartRotation,
+        getAxisStyle,
+        isHistogramModeEnabled,
+      );
 
-    if (dimensions) {
-      annotationDimensions.set(id, dimensions);
+      if (dimensions) {
+        annotationDimensions.set(id, dimensions);
+      }
+      return annotationDimensions;
     }
-    return annotationDimensions;
   }, new Map());
 }
diff --git a/packages/charts/src/chart_types/xy_chart/state/selectors/compute_annotations.ts b/packages/charts/src/chart_types/xy_chart/state/selectors/compute_annotations.ts
@@ -6,10 +6,11 @@
  * Side Public License, v 1.
  */
 
+import { Scale } from '../../../../scales';
 import { createCustomCachedSelector } from '../../../../state/create_selector';
 import { getChartThemeSelector } from '../../../../state/selectors/get_chart_theme';
 import { getSettingsSpecSelector } from '../../../../state/selectors/get_settings_specs';
-import { AnnotationId, AxisId } from '../../../../utils/ids';
+import { AnnotationId, AxisId, GroupId } from '../../../../utils/ids';
 import { AnnotationDimensions } from '../../annotations/types';
 import { computeAnnotationDimensions } from '../../annotations/utils';
 import { computeSeriesGeometriesSelector } from './compute_series_geometries';
@@ -44,7 +45,7 @@ export const computeAnnotationDimensionsSelector = createCustomCachedSelector(
     return computeAnnotationDimensions(
       annotationSpecs,
       settingsSpec.rotation,
-      yScales,
+      yScales as Map<GroupId, Scale<number>>,
       xScale,
       axesSpecs,
       isHistogramMode,