address comments

Author: jsilll

src/core/formatters.tsx

@@ -3,7 +3,7 @@
 
 import type Highcharts from "highcharts";
 
-import { InternalXAxisOptions, InternalYAxisOptions } from "./interfaces";
+import { CoreXAxisOptions, CoreYAxisOptions } from "./interfaces";
 
 // Takes value formatter from the axis options (InternalXAxisOptions.valueFormatter or InternalYAxisOptions.valueFormatter),
 // or provides a default formatter for numeric and datetime values.
@@ -21,7 +21,7 @@ export function getFormatter(axis?: Highcharts.Axis) {
     if (axis.options.type === "category") {
       return axis.categories?.[value] ?? value.toString();
     }
-    const axisOptions = axis.userOptions as InternalXAxisOptions | InternalYAxisOptions;
+    const axisOptions = axis.userOptions as CoreXAxisOptions | CoreYAxisOptions;
     if (axisOptions.valueFormatter) {
       return axisOptions.valueFormatter(value);
     }

src/core/interfaces.ts

@@ -286,7 +286,7 @@ export interface CoreChartProps
    * overridden with explicitly provided options. An exception is event handlers - those are
    * not overridden, but merged with Cloudscape event handlers so that both are getting called.
    */
-  options: InternalChartOptions;
+  options: CoreChartOptions;
   /**
    * The Cloudscape tooltip, that comes with a vertical cursor when used on cartesian series.
    * The tooltip content is only shown when `getContent` property is defined, which is called
@@ -446,13 +446,13 @@ export interface TooltipPointFormatted {
 
 // The extended version of Highcharts.Options. The axes types are extended with Cloudscape value formatter.
 // We use a custom formatter because we cannot use the built-in Highcharts formatter for our tooltip.
-export type InternalChartOptions = Omit<Highcharts.Options, "xAxis" | "yAxis"> & {
-  xAxis?: InternalXAxisOptions | InternalXAxisOptions[];
-  yAxis?: InternalYAxisOptions | InternalYAxisOptions[];
+export type CoreChartOptions = Omit<Highcharts.Options, "xAxis" | "yAxis"> & {
+  xAxis?: CoreXAxisOptions | CoreXAxisOptions[];
+  yAxis?: CoreYAxisOptions | CoreYAxisOptions[];
 };
 
-export type InternalXAxisOptions = Highcharts.XAxisOptions & { valueFormatter?: (value: null | number) => string };
-export type InternalYAxisOptions = Highcharts.YAxisOptions & { valueFormatter?: (value: null | number) => string };
+export type CoreXAxisOptions = Highcharts.XAxisOptions & { valueFormatter?: (value: null | number) => string };
+export type CoreYAxisOptions = Highcharts.YAxisOptions & { valueFormatter?: (value: null | number) => string };
 
 export interface VisibleItemsChangeDetail {
   items: readonly CoreLegendItem[];

src/internal-do-not-use/core-chart.tsx

@@ -16,26 +16,23 @@ applyDisplayName(CoreChart, "CoreChart");
 export default CoreChart;
 
 export namespace CoreChartTypes {
-  export type BaseChartOptions = CoreInterfaces.BaseChartOptions;
-  export type BaseFilterOptions = CoreInterfaces.BaseFilterOptions;
-  export type BaseI18nStrings = CoreInterfaces.BaseI18nStrings;
-  export type BaseLegendOptions = CoreInterfaces.BaseLegendOptions;
-  export type BaseNoDataOptions = CoreInterfaces.BaseNoDataOptions;
-
   export type CartesianI18nStrings = CoreInterfaces.CartesianI18nStrings;
-  export type PieI18nStrings = CoreInterfaces.PieI18nStrings;
   export type CoreI18nStrings = CoreInterfaces.CoreI18nStrings;
+  export type PieI18nStrings = CoreInterfaces.PieI18nStrings;
 
   export type CoreCartesianOptions = CoreInterfaces.CoreCartesianOptions;
   export type CoreChartAPI = CoreInterfaces.CoreChartAPI;
+  export type CoreChartOptions = CoreInterfaces.CoreChartOptions;
   export type CoreChartProps = CoreInterfaces.CoreChartProps;
   export type CoreFooterOptions = CoreInterfaces.CoreFooterOptions;
   export type CoreHeaderOptions = CoreInterfaces.CoreHeaderOptions;
   export type CoreLegendItem = CoreInterfaces.CoreLegendItem;
   export type CoreLegendOptions = CoreInterfaces.CoreLegendOptions;
-
   export type CoreTooltipContent = CoreInterfaces.CoreTooltipContent;
   export type CoreTooltipOptions = CoreInterfaces.CoreTooltipOptions;
+  export type CoreXAxisOptions = CoreInterfaces.CoreXAxisOptions;
+  export type CoreYAxisOptions = CoreInterfaces.CoreYAxisOptions;
+
   export type GetLegendTooltipContent = CoreInterfaces.GetLegendTooltipContent;
   export type GetLegendTooltipContentProps = CoreInterfaces.GetLegendTooltipContentProps;
   export type GetTooltipContent = CoreInterfaces.GetTooltipContent;
@@ -46,9 +43,5 @@ export namespace CoreChartTypes {
   export type TooltipPointProps = CoreInterfaces.TooltipPointProps;
   export type TooltipSlotProps = CoreInterfaces.TooltipSlotProps;
 
-  export type InternalChartOptions = CoreInterfaces.InternalChartOptions;
-  export type InternalXAxisOptions = CoreInterfaces.InternalXAxisOptions;
-  export type InternalYAxisOptions = CoreInterfaces.InternalYAxisOptions;
-
-  export type ChartHighlightProps = CoreInterfaces.ChartHighlightProps;
+  export type ChartHighlightProps = CoreInterfaces.HighlightChangeDetail;
 }