Renamed OptionsLike and changed imports.

rikapo · May 19, 2021 · 72a8dcb · 72a8dcb
1 parent b78e20d
commit 72a8dcb
Show file tree

Hide file tree

Showing 79 changed files with 442 additions and 416 deletions.
diff --git a/ts/Accessibility/Accessibility.ts b/ts/Accessibility/Accessibility.ts
@@ -13,17 +13,18 @@
 'use strict';
 
 import type Chart from '../Core/Chart/Chart';
+import type { Options } from '../Core/Options';
 import type SeriesOptions from '../Core/Series/SeriesOptions';
 import ChartUtilities from './Utils/ChartUtilities.js';
 import H from '../Core/Globals.js';
 const {
     doc
 } = H;
 import KeyboardNavigationHandler from './KeyboardNavigationHandler.js';
-import O from '../Core/DefaultOptions.js';
+import D from '../Core/DefaultOptions.js';
 const {
     defaultOptions
-} = O;
+} = D;
 import Point from '../Core/Series/Point.js';
 import Series from '../Core/Series/Series.js';
 import U from '../Core/Utilities.js';
@@ -73,7 +74,7 @@ declare global {
             zoom: ZoomComponent;
         }
         interface AccessibilityChart extends Chart {
-            options: Required<O>;
+            options: Required<Options>;
             series: Array<AccessibilitySeries>;
         }
         interface AccessibilityPoint extends Point {
@@ -363,7 +364,7 @@ addEvent(H.Chart, 'render', function (e: Event): void {
 // Update with chart/series/point updates
 addEvent(H.Chart as any, 'update', function (
     this: Highcharts.AccessibilityChart,
-    e: { options: O }
+    e: { options: Options }
 ): void {
     // Merge new options
     const newOptions = e.options.accessibility;

diff --git a/ts/Accessibility/HighContrastTheme.ts b/ts/Accessibility/HighContrastTheme.ts
@@ -13,15 +13,15 @@
 'use strict';
 
 import type ColorType from '../Core/Color/ColorType';
-import type O from '../Core/DefaultOptions';
+import type Options from '../Core/Options';
 
 declare module '../Core/Series/DataLabelOptions' {
     interface DataLabelOptions {
         connectorColor?: ColorType;
     }
 }
 
-const theme: O = {
+const theme: Options = {
     chart: {
         backgroundColor: 'window'
     },

diff --git a/ts/Accessibility/Options/DeprecatedOptions.ts b/ts/Accessibility/Options/DeprecatedOptions.ts
@@ -61,7 +61,7 @@
 
 'use strict';
 
-import type O from '../../Core/DefaultOptions';
+import type Options from '../../Core/Options';
 import type Series from '../../Core/Series/Series';
 import Axis from '../../Core/Axis/Axis.js';
 import Chart from '../../Core/Chart/Chart.js';
@@ -76,8 +76,8 @@ const {
  * Declarations
  *
  * */
-declare module '../../Core/OptionsLike'{
-    interface OptionsLike {
+declare module '../../Core/Options'{
+    interface Options {
         /** @deprecated */
         exposeElementToA11y?: (
             Highcharts.SeriesAccessibilityOptions['exposeAsGroupOnly']
@@ -138,7 +138,7 @@ function deprecateFromOptionsMap(
      * @private
      */
     function getChildProp(
-        root: O,
+        root: Options,
         propAsArray: Array<string>
     ): Record<string, unknown> {
         return propAsArray.reduce(function (

diff --git a/ts/Accessibility/Options/Options.ts b/ts/Accessibility/Options/Options.ts
@@ -14,7 +14,7 @@
 
 import type Chart from '../../Core/Chart/Chart';
 import type { HTMLDOMElement } from '../../Core/Renderer/DOMElementType';
-import type O from '../../Core/DefaultOptions';
+import type Options from '../../Core/Options';
 import type Point from '../../Core/Series/Point';
 import type Series from '../../Core/Series/Series';
 
@@ -39,8 +39,8 @@ declare module '../../Core/LegendOptions' {
     }
 }
 
-declare module '../../Core/OptionsLike'{
-    interface OptionsLike {
+declare module '../../Core/Options'{
+    interface Options {
         accessibility?: Highcharts.AccessibilityOptions;
     }
 }
@@ -251,7 +251,7 @@ declare global {
  *         Formatted string for the screen reader module.
  */
 
-const options: DeepPartial<O> = {
+const options: DeepPartial<Options> = {
 
     /**
      * Options for configuring accessibility for the chart. Requires the

diff --git a/ts/Core/Axis/Axis.ts b/ts/Core/Axis/Axis.ts
@@ -26,6 +26,7 @@ import type CSSObject from '../Renderer/CSSObject';
 import type DashStyleValue from '../Renderer/DashStyleValue';
 import type { EventCallback } from '../Callback';
 import type FontMetricsObject from '../Renderer/FontMetricsObject';
+import type { OptionsOverflowValue } from '../Options';
 import type GradientColor from '../Color/GradientColor';
 import type PlotLineOrBand from './PlotLineOrBand';
 import type Point from '../Series/Point';
@@ -47,8 +48,8 @@ const {
 } = F;
 import H from '../Globals.js';
 import palette from '../Color/Palette.js';
-import O from '../DefaultOptions.js';
-const { defaultOptions } = O;
+import D from '../DefaultOptions.js';
+const { defaultOptions } = D;
 import Tick from './Tick.js';
 import U from '../Utilities.js';
 const {
@@ -81,8 +82,8 @@ const {
  *  Declarations
  *
  * */
-declare module '../../Core/OptionsLike'{
-    interface OptionsLike {
+declare module '../../Core/Options'{
+    interface Options {
         xAxis?: (DeepPartial<Highcharts.XAxisOptions>|Array<DeepPartial<Highcharts.XAxisOptions>>);
         yAxis?: (DeepPartial<Highcharts.YAxisOptions>|Array<DeepPartial<Highcharts.YAxisOptions>>);
     }
@@ -233,7 +234,7 @@ declare global {
             format?: string;
             formatter?: AxisLabelsFormatterCallbackFunction;
             indentation: number;
-            overflow: O.OptionsOverflowValue;
+            overflow: OptionsOverflowValue;
             padding: number;
             reserveSpace?: boolean;
             rotation?: number|'auto';

diff --git a/ts/Core/Axis/Axis3D.ts b/ts/Core/Axis/Axis3D.ts
@@ -13,7 +13,7 @@
 'use strict';
 
 import type Axis from './Axis';
-import type O from '../DefaultOptions';
+import type { OptionsPosition3dValue } from '../Options';
 import type Point from '../Series/Point';
 import type Position3DObject from '../Renderer/Position3DObject';
 import type SVGPath from '../Renderer/SVG/SVGPath';
@@ -56,7 +56,7 @@ declare module '../Series/PointLike' {
 declare global {
     namespace Highcharts {
         interface XAxisLabelsOptions {
-            position3d?: O.OptionsPosition3dValue;
+            position3d?: OptionsPosition3dValue;
             skew3d?: boolean;
         }
         interface XAxisTitleOptions {

diff --git a/ts/Core/Axis/ColorAxis.ts b/ts/Core/Axis/ColorAxis.ts
@@ -58,8 +58,8 @@ declare module '../Chart/ChartLike' {
     }
 }
 
-declare module '../../Core/OptionsLike'{
-    interface OptionsLike {
+declare module '../../Core/Options'{
+    interface Options {
         colorAxis?: (
             DeepPartial<ColorAxis.Options>|
             Array<DeepPartial<ColorAxis.Options>>

diff --git a/ts/Core/Axis/ZAxis.ts b/ts/Core/Axis/ZAxis.ts
@@ -26,8 +26,8 @@ declare module '../Chart/ChartLike'{
     }
 }
 
-declare module '../OptionsLike' {
-    interface OptionsLike {
+declare module '../Options' {
+    interface Options {
         zAxis?: (
             DeepPartial<Highcharts.AxisOptions>|
             Array<DeepPartial<Highcharts.AxisOptions>>