test(xy): scale type improvements

packages/charts/src/chart_types/xy_chart/annotations/line/dimensions.ts

@@ -7,7 +7,7 @@
  */
 
 import { Line } from '../../../../geoms/types';
-import { Scale } from '../../../../scales';
+import { Scale, ScaleBand } from '../../../../scales';
 import { isContinuousScale, isBandScale } from '../../../../scales/types';
 import { isNil, Position, Rotation } from '../../../../utils/common';
 import { Dimensions, Size } from '../../../../utils/dimensions';
@@ -118,7 +118,7 @@ function computeYDomainLineAnnotationDimensions(
 
 function computeXDomainLineAnnotationDimensions(
   annotationSpec: LineAnnotationSpec,
-  xScale: Scale<unknown>,
+  xScale: Scale<string | number>,
   { vertical, horizontal }: SmallMultipleScales,
   chartRotation: Rotation,
   isHistogramMode: boolean,
@@ -164,10 +164,10 @@ function computeXDomainLineAnnotationDimensions(
       }
     } else if (isBandScale(xScale)) {
       if (isHistogramMode) {
-        const padding = (xScale.step - xScale.originalBandwidth) / 2;
+        const padding = (xScale.step - (xScale as ScaleBand<string | number>).originalBandwidth) / 2;
         annotationValueXPosition -= padding;
       } else {
-        annotationValueXPosition += xScale.originalBandwidth / 2;
+        annotationValueXPosition += (xScale as ScaleBand<string | number>).originalBandwidth / 2;
       }
     } else {
       return;
@@ -234,7 +234,7 @@ export function computeLineAnnotationDimensions(
   annotationSpec: LineAnnotationSpec,
   chartRotation: Rotation,
   yScales: Map<GroupId, Scale<number>>,
-  xScale: Scale<unknown>,
+  xScale: Scale<string | number>,
   smallMultipleScales: SmallMultipleScales,
   isHistogramMode: boolean,
   axisPosition?: Position,

packages/charts/src/chart_types/xy_chart/annotations/rect/dimensions.ts

@@ -64,7 +64,7 @@ export function computeRectAnnotationDimensions(
     let xAndWidth: { x: number; width: number } | null = null;
 
     if (isBandScale(xScale)) {
-      xAndWidth = scaleXonBandScale(xScale, x0, x1);
+      xAndWidth = scaleXonBandScale(xScale as ScaleBand<number>, x0, x1);
     } else if (isContinuousScale(xScale)) {
       xAndWidth = scaleXonContinuousScale(xScale, x0, x1, isHistogram);
     }
@@ -162,7 +162,7 @@ export function computeRectAnnotationDimensions(
 }
 
 function scaleXonBandScale(
-  xScale: ScaleBand,
+  xScale: ScaleBand<string | number>,
   x0: PrimitiveValue,
   x1: PrimitiveValue,
 ): { x: number; width: number } | null {

packages/charts/src/chart_types/xy_chart/annotations/utils.ts

@@ -119,7 +119,7 @@ export function computeAnnotationDimensions(
   annotations: AnnotationSpec[],
   chartRotation: Rotation,
   yScales: Map<GroupId, Scale<number>>,
-  xScale: Scale<unknown>,
+  xScale: Scale<string | number>,
   axesSpecs: AxisSpec[],
   isHistogramModeEnabled: boolean,
   smallMultipleScales: SmallMultipleScales,

packages/charts/src/chart_types/xy_chart/state/selectors/compute_annotations.ts

@@ -46,7 +46,7 @@ export const computeAnnotationDimensionsSelector = createCustomCachedSelector(
       annotationSpecs,
       settingsSpec.rotation,
       yScales as Map<GroupId, Scale<number>>,
-      xScale,
+      xScale as Scale<string | number>,
       axesSpecs,
       isHistogramMode,
       smallMultipleScales,

packages/charts/src/chart_types/xy_chart/state/selectors/get_projected_pointer_position.ts

@@ -64,7 +64,10 @@ function getProjectedPointerPosition(
   };
 }
 
-function getPosRelativeToPanel(panelScale: ScaleBand, pos: number): { pos: number; value: PrimitiveValue } {
+function getPosRelativeToPanel(
+  panelScale: ScaleBand<string | number>,
+  pos: number,
+): { pos: number; value: PrimitiveValue } {
   const outerPadding = panelScale.outerPadding * panelScale.step;
   const innerPadding = panelScale.innerPadding * panelScale.step;
   const numOfDomainSteps = panelScale.domain.length;

packages/charts/src/scales/index.ts

@@ -28,16 +28,18 @@ export type ScaleBandType = ScaleOrdinalType;
  * The the value is mapped depending on the `type` (linear, log, sqrt, time, ordinal)
  * @internal
  */
-export interface Scale<D> {
-  domain: D[];
+export interface Scale<T> {
+  domain: T[];
   range: number[];
   /**
    * Returns the distance between the starts of adjacent bands.
    */
   step: number;
-  ticks: () => number[];
+  ticks: () => T[];
   scale: (value?: PrimitiveValue) => number | null;
+
   scaleOrThrow(value?: PrimitiveValue): number;
+
   pureScale: (value?: PrimitiveValue) => number | null;
   invert: (value: number) => any;
   invertWithStep: (

packages/charts/src/scales/scale_band.ts

@@ -35,13 +35,13 @@ export class ScaleBand<T extends number | string> implements Scale<T> {
 
   readonly type: ScaleBandType;
 
-  readonly domain: any[];
+  readonly domain: T[];
 
   readonly range: number[];
 
   readonly isInverted: boolean;
 
-  readonly invertedScale: ScaleQuantize<number>;
+  readonly invertedScale: ScaleQuantize<T>;
 
   readonly minInterval: number;
 
@@ -89,7 +89,7 @@ export class ScaleBand<T extends number | string> implements Scale<T> {
     this.bandwidthPadding = this.bandwidth;
     // TO FIX: we are assuming that it's ordered
     this.isInverted = this.domain[0] > this.domain[1];
-    this.invertedScale = scaleQuantize().domain(range).range(this.domain);
+    this.invertedScale = scaleQuantize<T>().domain(range).range(this.domain);
     this.minInterval = 0;
   }
 

packages/charts/src/scales/types.ts

@@ -23,7 +23,7 @@ export function isLogarithmicScale(scale: Scale<unknown>): scale is ScaleContinu
  * Check if a scale is Band
  * @internal
  */
-export function isBandScale(scale: Scale<unknown>): scale is ScaleBand {
+export function isBandScale(scale: Scale<unknown>): scale is ScaleBand<string | number> {
   return scale.type === ScaleType.Ordinal;
 }