highcharts 13.0.0 → 13.0.2

package/es-modules/Core/Tooltip.js

@@ -10,8 +10,7 @@
  *
  * */
 'use strict';
-import A from './Animation/AnimationUtilities.js';
-const { animObject } = A;
+import { animObject } from './Animation/AnimationUtilities.js';
 import F from './Templating.js';
 const { format } = F;
 import H from './Globals.js';
@@ -19,7 +18,7 @@ const { composed, dateFormats, doc, isSafari } = H;
 import R from './Renderer/RendererUtilities.js';
 const { distribute } = R;
 import SVGRenderer from './Renderer/SVG/SVGRenderer.js';
-import { addEvent, clamp, css, discardElement, extend, fireEvent, getAlignFactor, internalClearTimeout, isArray, isNumber, isObject, isString, merge, pick, pushUnique, splat, syncTimeout } from '../Shared/Utilities.js';
+import { addEvent, clamp, css, discardElement, extend, fireEvent, getAlignFactor, internalClearTimeout, isArray, isNumber, isObject, isString, merge, pushUnique, splat, syncTimeout } from '../Shared/Utilities.js';
 /**
  * Clear all timeouts for showing and hiding the tooltip.
  *
@@ -275,7 +274,8 @@ class Tooltip {
             'highcharts-label',
             isHeader && 'highcharts-tooltip-header',
             isSplit ? 'highcharts-tooltip-box' : 'highcharts-tooltip',
-            !isHeader && 'highcharts-color-' + pick(point.colorIndex, series.colorIndex),
+            !isHeader &&
+                'highcharts-color-' + (point.colorIndex ?? series.colorIndex),
             seriesOptions?.className
         ].filter(isString).join(' ');
     }
@@ -460,7 +460,8 @@ class Tooltip {
         }
         // The far side is right or bottom
         const preferFarSide = !this.followPointer &&
-            pick(point.ttBelow, polar ? false : !inverted === flipped), // #4984
+            (point.ttBelow ??
+                (polar ? false : !inverted === flipped)), // #4984
         /*
          * Handle the preferred dimension. When the preferred dimension is
          * tooltip on top or bottom of the point, it will look for space
@@ -587,7 +588,7 @@ class Tooltip {
         const tooltip = this;
         // Disallow duplicate timers (#1728, #1766)
         clearTimeouts(this);
-        delay = pick(delay, this.options.hideDelay);
+        delay = (delay ?? this.options.hideDelay);
         if (!this.isHidden) {
             this.hideTimer = syncTimeout(function () {
                 const label = tooltip.getLabel();
@@ -690,7 +691,9 @@ class Tooltip {
          * Split tooltip does not support outside in the first iteration. Should
          * not be too complicated to implement.
          */
-        this.outside = pick(options.outside, Boolean(chart.scrollablePixelsX || chart.scrollablePixelsY));
+        this.outside =
+            options.outside ??
+                Boolean(chart.scrollablePixelsX || chart.scrollablePixelsY);
     }
     shouldStickOnContact(pointerEvent) {
         return !!(!this.followPointer &&
@@ -770,7 +773,7 @@ class Tooltip {
         point.points = void 0;
         // Register the current series
         const currentSeries = point.series;
-        this.distance = pick(currentSeries.tooltipOptions.distance, 16);
+        this.distance = (currentSeries.tooltipOptions.distance ?? 16);
         // Update the inner HTML
         if (text === false) {
             this.hide();
@@ -1043,7 +1046,7 @@ class Tooltip {
                         anchorY,
                         boxWidth,
                         point,
-                        rank: pick(boxPosition.rank, isHeader ? 1 : 0),
+                        rank: boxPosition.rank ?? (isHeader ? 1 : 0),
                         size,
                         target: boxPosition.y,
                         tt,

package/es-modules/Core/Utilities.js

@@ -10,7 +10,7 @@
  *
  * */
 'use strict';
-import { attr, fireEvent, isNumber, isString, objectEach, pick } from '../Shared/Utilities.js';
+import { attr, fireEvent, isNumber, isString, objectEach } from '../Shared/Utilities.js';
 import H from './Globals.js';
 const { charts, win } = H;
 /* *
@@ -113,7 +113,8 @@ export function insertItem(item, collection) {
         !collection[i] ||
             // Handle index option, the element to insert has lower index
             (isNumber(indexOption) &&
-                indexOption < pick(collection[i].options.index, collection[i]._i)) ||
+                indexOption < (collection[i].options.index ??
+                    collection[i]._i)) ||
             // Insert the new item before other internal items
             // (navigator)
             collection[i].options.isInternal) {
@@ -199,7 +200,7 @@ export const uniqueKey = (function () {
  * State of the serial mode.
  */
 export function useSerialIds(mode) {
-    return (serialMode = pick(mode, serialMode));
+    return (serialMode = (mode ?? serialMode));
 }
 /* *
  *

package/es-modules/Data/Connectors/DataConnector.js

@@ -18,7 +18,7 @@
 'use strict';
 import DataModifier from '../Modifiers/DataModifier.js';
 import DataTable from '../DataTable.js';
-import { addEvent, fireEvent, merge, pick } from '../../Shared/Utilities.js';
+import { addEvent, fireEvent, merge } from '../../Shared/Utilities.js';
 /* *
  *
  *  Class
@@ -163,7 +163,7 @@ class DataConnector {
     getColumnOrder() {
         const connector = this, columns = connector.metadata.columns, names = Object.keys(columns || {});
         if (names.length) {
-            return names.sort((a, b) => (pick(columns[a].index, 0) - pick(columns[b].index, 0)));
+            return names.sort((a, b) => ((columns[a].index ?? 0) - (columns[b].index ?? 0)));
         }
     }
     /**

package/es-modules/Data/Connectors/GoogleSheetsConnector.js

@@ -19,7 +19,7 @@
 'use strict';
 import DataConnector from './DataConnector.js';
 import GoogleSheetsConverter from '../Converters/GoogleSheetsConverter.js';
-import { fireEvent, merge, pick } from '../../Shared/Utilities.js';
+import { fireEvent, merge } from '../../Shared/Utilities.js';
 /* *
  *
  *  Functions
@@ -193,7 +193,7 @@ export function buildQueryRange(options = {}) {
     return googleSpreadsheetRange || ((alphabet[startColumn || 0] || 'A') +
         (Math.max((startRow || 0), 0) + 1) +
         ':' +
-        (alphabet[pick(endColumn, 25)] || 'Z') +
+        (alphabet[(endColumn ?? 25)] || 'Z') +
         (endRow ?
             Math.max(endRow, 0) :
             'Z'));

package/es-modules/Data/DataTable.js

@@ -958,6 +958,23 @@ class DataTable extends DataTableCore {
         });
     }
 }
+/**
+ * Type guard narrowing an arbitrary value to a valid table cell value.
+ *
+ * @param {*} value
+ * Candidate value.
+ *
+ * @return {boolean}
+ * `true` when the value is a valid `CellType`.
+ */
+export function isCellValue(value) {
+    const valueType = typeof value;
+    return (value === null ||
+        valueType === 'undefined' ||
+        valueType === 'boolean' ||
+        valueType === 'number' ||
+        valueType === 'string');
+}
 /* *
  *
  *  Default Export

package/es-modules/Data/DataTableCore.js

@@ -127,7 +127,7 @@ class DataTableCore {
      * Fetches the given column by the canonical column ID. Simplified version
      * of the full `DataTable.getRow` method, always returning by reference.
      *
-     * @function Highcharts.DataTable#setColumn
+     * @function Highcharts.DataTable#getColumn
      *
      * @param {string} columnId
      * ID of the column to get.

package/es-modules/Extensions/Annotations/Annotation.js

@@ -10,8 +10,7 @@
  *
  * */
 'use strict';
-import A from '../../Core/Animation/AnimationUtilities.js';
-const { getDeferredAnimation } = A;
+import { getDeferredAnimation } from '../../Core/Animation/AnimationUtilities.js';
 import AnnotationChart from './AnnotationChart.js';
 import AnnotationDefaults from './AnnotationDefaults.js';
 import ControllableRect from './Controllables/ControllableRect.js';
@@ -27,7 +26,7 @@ const { defaultOptions } = D;
 import EventEmitter from './EventEmitter.js';
 import MockPoint from './MockPoint.js';
 import PopupComposition from './Popup/PopupComposition.js';
-import { destroyObjectProperties, erase, fireEvent, merge, pick, splat } from '../../Shared/Utilities.js';
+import { destroyObjectProperties, erase, fireEvent, merge, splat } from '../../Shared/Utilities.js';
 /* *
  *
  *  Functions
@@ -355,7 +354,7 @@ class Annotation extends EventEmitter {
             if (!item.graphic) {
                 this.renderItem(item);
             }
-            item.redraw(pick(animation, true) && item.graphic.placed);
+            item.redraw((animation ?? true) && item.graphic.placed);
             if (item.points.length) {
                 adjustVisibility(item);
             }
@@ -498,7 +497,7 @@ class Annotation extends EventEmitter {
      * annotation's visibility is toggled.
      */
     setVisibility(visible) {
-        const options = this.options, navigation = this.chart.navigationBindings, visibility = pick(visible, !options.visible);
+        const options = this.options, navigation = this.chart.navigationBindings, visibility = (visible ?? !options.visible);
         this.graphic.attr('visibility', visibility ? 'inherit' : 'hidden');
         if (!visibility) {
             const setItemControlPointsVisibility = function (item) {
@@ -534,7 +533,7 @@ class Annotation extends EventEmitter {
         // Update options in chart options, used in exporting (#9767, #21507):
         chart.options.annotations[userOptionsIndex] = this.options;
         this.isUpdating = true;
-        if (pick(redraw, true)) {
+        if (redraw ?? true) {
             chart.drawAnnotations();
         }
         fireEvent(this, 'afterUpdate');

package/es-modules/Extensions/Annotations/AnnotationChart.js

@@ -10,7 +10,7 @@
  *
  * */
 'use strict';
-import { addEvent, erase, find, fireEvent, isArray, isObject, pick, wrap } from '../../Shared/Utilities.js';
+import { addEvent, erase, find, fireEvent, isArray, isObject, wrap } from '../../Shared/Utilities.js';
 /* *
  *
  *  Functions
@@ -35,7 +35,7 @@ import { addEvent, erase, find, fireEvent, isArray, isObject, pick, wrap } from
 function chartAddAnnotation(options, redraw) {
     const annotation = this.initAnnotation(options);
     this.options.annotations.push(annotation.options);
-    if (pick(redraw, true)) {
+    if (redraw ?? true) {
         annotation.redraw();
         annotation.graphic.attr({
             opacity: 1

package/es-modules/Extensions/Annotations/AnnotationDefaults.js

@@ -720,19 +720,19 @@ const AnnotationDefaults = {
      * @apioption annotations.typeOptions.type
      */
     /**
-     * This number defines which `xAxis` the point is connected to.
+     * This option defines which `xAxis` the point is connected to.
      * It refers to either the axis id or the index of the axis
      * in the `xAxis` array.
      *
-     * @type {number}
+     * @type {number|string}
      * @apioption annotations.typeOptions.xAxis
      */
     /**
-     * This number defines which `yAxis` the point is connected to.
+     * This option defines which `yAxis` the point is connected to.
      * It refers to either the axis id or the index of the axis
      * in the `yAxis` array.
      *
-     * @type {number}
+     * @type {number|string}
      * @apioption annotations.typeOptions.yAxis
      */
     },

package/es-modules/Extensions/Annotations/ControlPoint.js

@@ -4,7 +4,7 @@
  * */
 'use strict';
 import EventEmitter from './EventEmitter.js';
-import { merge, pick } from '../../Shared/Utilities.js';
+import { merge } from '../../Shared/Utilities.js';
 /* *
  *
  *  Class
@@ -53,7 +53,7 @@ class ControlPoint extends EventEmitter {
         this.chart = chart;
         this.target = target;
         this.options = options;
-        this.index = pick(options.index, index);
+        this.index = (options.index ?? index);
     }
     /* *
      *

package/es-modules/Extensions/Annotations/Controllables/ControllableLabel.js

@@ -7,7 +7,7 @@ import Controllable from './Controllable.js';
 import F from '../../../Core/Templating.js';
 const { format } = F;
 import MockPoint from '../MockPoint.js';
-import { extend, getAlignFactor, isNumber, pick } from '../../../Shared/Utilities.js';
+import { extend, getAlignFactor, isNumber } from '../../../Shared/Utilities.js';
 /* *
  *
  *  Functions
@@ -296,7 +296,7 @@ class ControllableLabel extends Controllable {
             if (itemOptions.distance && tooltip) {
                 itemPosition = tooltip.getPosition.call({
                     chart,
-                    distance: pick(itemOptions.distance, 16),
+                    distance: (itemOptions.distance ?? 16),
                     getPlayingField: tooltip.getPlayingField,
                     pointer: tooltip.pointer
                 }, width, height, {

package/es-modules/Extensions/Annotations/EventEmitter.js

@@ -12,7 +12,7 @@
 'use strict';
 import H from '../../Core/Globals.js';
 const { doc, isTouchDevice } = H;
-import { addEvent, fireEvent, objectEach, pick, removeEvent } from '../../Shared/Utilities.js';
+import { addEvent, fireEvent, objectEach, removeEvent } from '../../Shared/Utilities.js';
 /* *
  *
  *  Class
@@ -201,7 +201,8 @@ class EventEmitter {
         emitter.removeMouseUp = addEvent(doc, isTouchDevice || firesTouchEvents ? 'touchend' : 'mouseup', function () {
             // Sometimes the target is the annotation and sometimes its the
             // controllable
-            const annotation = pick(emitter.target && emitter.target.annotation, emitter.target);
+            const annotation = ((emitter.target && emitter.target.annotation) ??
+                emitter.target);
             if (annotation) {
                 // Keep annotation selected after dragging control point
                 annotation.cancelClick = emitter.hasDragged;
@@ -210,8 +211,7 @@ class EventEmitter {
             emitter.chart.hasDraggedAnnotation = false;
             if (emitter.hasDragged) {
                 // ControlPoints vs Annotation:
-                fireEvent(pick(annotation, // #15952
-                emitter), 'afterUpdate');
+                fireEvent((annotation ?? emitter), 'afterUpdate');
             }
             emitter.hasDragged = false;
             emitter.onMouseUp();

package/es-modules/Extensions/Annotations/MockPoint.js

@@ -3,6 +3,8 @@
  *
  * */
 'use strict';
+import NBU from './NavigationBindingsUtilities.js';
+const { getAxisFromOptions } = NBU;
 import SeriesRegistry from '../../Core/Series/SeriesRegistry.js';
 const { series: { prototype: seriesProto } } = SeriesRegistry;
 import { defined, fireEvent } from '../../Shared/Utilities.js';
@@ -341,11 +343,7 @@ class MockPoint {
         this.series[axisName] =
             typeof axisOptions === 'object' ?
                 axisOptions :
-                defined(axisOptions) ?
-                    (chart[axisName][axisOptions] ||
-                        // @todo v--- (axisName)[axisOptions] ?
-                        chart.get(axisOptions)) :
-                    null;
+                getAxisFromOptions(chart, axisName, axisOptions) || null;
     }
     /**
      * Transform the mock point to an anchor (relative position on the chart).
@@ -419,18 +417,18 @@ export default MockPoint;
 * @type      {number}
 * @name      Highcharts.AnnotationMockPointOptionsObject.y
 */ /**
-* This number defines which xAxis the point is connected to.
+* This option defines which `xAxis` the point is connected to.
 * It refers to either the axis id or the index of the axis in
-* the xAxis array. If the option is not configured or the axis
+* the `xAxis` array. If the option is not configured or the axis
 * is not found the point's x coordinate refers to the chart
 * pixels.
 *
 * @type      {number|string|null}
 * @name      Highcharts.AnnotationMockPointOptionsObject.xAxis
 */ /**
-* This number defines which yAxis the point is connected to.
+* This option defines which `yAxis` the point is connected to.
 * It refers to either the axis id or the index of the axis in
-* the yAxis array. If the option is not configured or the axis
+* the `yAxis` array. If the option is not configured or the axis
 * is not found the point's y coordinate refers to the chart
 * pixels.
 *

package/es-modules/Extensions/Annotations/NavigationBindings.js

@@ -20,7 +20,7 @@ const { composed, doc, win } = H;
 import NavigationBindingDefaults from './NavigationBindingsDefaults.js';
 import NBU from './NavigationBindingsUtilities.js';
 const { getAssignedAxis, getFieldType } = NBU;
-import { addEvent, attr, defined, fireEvent, isArray, isFunction, isNumber, isObject, merge, objectEach, pick, pushUnique } from '../../Shared/Utilities.js';
+import { addEvent, attr, defined, fireEvent, isArray, isFunction, isNumber, isObject, merge, objectEach, pushUnique } from '../../Shared/Utilities.js';
 /* *
  *
  *  Functions
@@ -491,7 +491,7 @@ class NavigationBindings {
                 let parent = config;
                 path.forEach((name, index) => {
                     if (name !== '__proto__' && name !== 'constructor') {
-                        const nextName = pick(path[index + 1], '');
+                        const nextName = (path[index + 1] ?? '');
                         if (pathLength === index) {
                             // Last index, put value:
                             parent[name] = value;
@@ -537,7 +537,10 @@ class NavigationBindings {
      *         Annotation options to be displayed in popup box
      */
     annotationToFields(annotation) {
-        const options = annotation.options, editables = NavigationBindings.annotationsEditable, nestedEditables = editables.nestedOptions, type = pick(options.type, options.shapes?.[0]?.type, options.labels?.[0]?.type, 'label'), nonEditables = NavigationBindings.annotationsNonEditable[options.langKey] || [], visualOptions = {
+        const options = annotation.options, editables = NavigationBindings.annotationsEditable, nestedEditables = editables.nestedOptions, type = options.type ??
+            options.shapes?.[0]?.type ??
+            options.labels?.[0]?.type ??
+            'label', nonEditables = NavigationBindings.annotationsNonEditable[options.langKey] || [], visualOptions = {
             langKey: options.langKey,
             type: type
         };

package/es-modules/Extensions/Annotations/NavigationBindingsUtilities.js

@@ -10,7 +10,7 @@
  *
  * */
 'use strict';
-import { defined, isNumber, pick } from '../../Shared/Utilities.js';
+import { defined, find, isNumber } from '../../Shared/Utilities.js';
 /* *
  *
  *  Constants
@@ -56,7 +56,7 @@ function getAssignedAxis(coords) {
         const extremes = coord.axis.getExtremes(), axisMin = extremes.min, axisMax = extremes.max, 
         // Correct axis edges when axis has series
         // with pointRange (like column)
-        minPointOffset = pick(coord.axis.minPointOffset, 0);
+        minPointOffset = (coord.axis.minPointOffset ?? 0);
         return isNumber(axisMin) && isNumber(axisMax) &&
             coord.value >= (axisMin - minPointOffset) &&
             coord.value <= (axisMax + minPointOffset) &&
@@ -64,6 +64,32 @@ function getAssignedAxis(coords) {
             !coord.axis.options.isInternal;
     })[0]; // If the axes overlap, return the first axis that was found.
 }
+/**
+ * Resolve an axis from an annotation option that can reference it either by its
+ * index (number) or by its id (string).
+ *
+ * @internal
+ *
+ * @param {Highcharts.Chart} chart
+ *        The chart instance.
+ *
+ * @param {'xAxis'|'yAxis'} coll
+ *        The axis collection to look in.
+ *
+ * @param {number|string|undefined} idOrIndex
+ *        The axis index or id.
+ *
+ * @return {Highcharts.Axis|undefined}
+ *         The matching axis, or `undefined` if none was found.
+ */
+function getAxisFromOptions(chart, coll, idOrIndex) {
+    if (isNumber(idOrIndex)) {
+        return chart[coll][idOrIndex];
+    }
+    return defined(idOrIndex) ?
+        find(chart[coll], (axis) => axis.options.id === idOrIndex) :
+        void 0;
+}
 /**
  * Get field type according to value
  *
@@ -91,10 +117,11 @@ function getFieldType(key, value) {
  *
  * */
 /** @internal */
-const NavigationBindingUtilities = {
+const NavigationBindingsUtilities = {
     annotationsFieldsTypes,
     getAssignedAxis,
+    getAxisFromOptions,
     getFieldType
 };
 /** @internal */
-export default NavigationBindingUtilities;
+export default NavigationBindingsUtilities;

package/es-modules/Extensions/Annotations/Popup/Popup.js

@@ -21,7 +21,7 @@ const { getOptions } = D;
 import PopupAnnotations from './PopupAnnotations.js';
 import PopupIndicators from './PopupIndicators.js';
 import PopupTabs from './PopupTabs.js';
-import { addEvent, clamp, createElement, extend, fireEvent, pick } from '../../../Shared/Utilities.js';
+import { addEvent, clamp, createElement, extend, fireEvent } from '../../../Shared/Utilities.js';
 /* *
  *
  *  Functions
@@ -178,7 +178,8 @@ class Popup extends BaseForm {
      *         Return created input element.
      */
     addInput(option, indicatorType, parentDiv, inputAttributes) {
-        const optionParamList = option.split('.'), optionName = optionParamList[optionParamList.length - 1], lang = this.lang, inputName = 'highcharts-' + indicatorType + '-' + pick(inputAttributes.htmlFor, optionName);
+        const optionParamList = option.split('.'), optionName = optionParamList[optionParamList.length - 1], lang = this.lang, inputName = 'highcharts-' + indicatorType + '-' +
+            (inputAttributes.htmlFor ?? optionName);
         if (!optionName.match(/^\d+$/)) {
             // Add label
             createElement('label', {

package/es-modules/Extensions/Annotations/Popup/PopupAnnotations.js

@@ -14,9 +14,9 @@
 'use strict';
 import H from '../../../Core/Globals.js';
 const { doc, isFirefox } = H;
-import BaseFormIcons from '../../../Shared/BaseFormIcons';
-import getIcon from '../../../Shared/BaseFormUtils';
-import { createElement, isArray, isObject, objectEach, pick, stableSort } from '../../../Shared/Utilities.js';
+import BaseFormIcons from '../../../Shared/BaseFormIcons.js';
+import getIcon from '../../../Shared/BaseFormUtils.js';
+import { createElement, isArray, isObject, objectEach, stableSort } from '../../../Shared/Utilities.js';
 /* *
  *
  *  Functions
@@ -85,11 +85,9 @@ function addToolbar(chart, options, callback) {
         className: 'highcharts-annotation-label'
     }, void 0, popupDiv);
     label.setAttribute('aria-label', 'Annotation type');
-    label.appendChild(doc.createTextNode(pick(
-    // Advanced annotations:
-    lang[options.langKey] || options.langKey, 
-    // Basic shapes:
-    options.shapes && options.shapes[0].type, '')));
+    label.appendChild(doc.createTextNode(((lang[options.langKey] || options.langKey) ??
+        (options.shapes && options.shapes[0].type) ??
+        '')));
     // Add buttons
     let button = this.addButton(popupDiv, lang.editButton || 'Edit', 'edit', popupDiv, () => {
         showForm.call(this, 'annotation-edit', chart, options, callback);

package/es-modules/Extensions/Annotations/Types/CrookedLine.js

@@ -30,15 +30,15 @@ if (defaultOptions.annotations?.types) {
          */
         typeOptions: {
             /**
-             * This number defines which xAxis the point is connected to.
+             * This option defines which `xAxis` the point is connected to.
              * It refers to either the axis id or the index of the axis
-             * in the xAxis array.
+             * in the `xAxis` array.
              */
             xAxis: 0,
             /**
-             * This number defines which yAxis the point is connected to.
+             * This option defines which `yAxis` the point is connected to.
              * It refers to either the axis id or the index of the axis
-             * in the xAxis array.
+             * in the `yAxis` array.
              */
             yAxis: 0,
             /**

package/es-modules/Extensions/Annotations/Types/Measure.js

@@ -7,7 +7,9 @@ import Annotation from '../Annotation.js';
 import ControlPoint from '../ControlPoint.js';
 import D from '../../../Core/Defaults.js';
 const { defaultOptions } = D;
-import { defined, extend, isNumber, merge, pick } from '../../../Shared/Utilities.js';
+import NBU from '../NavigationBindingsUtilities.js';
+const { getAxisFromOptions } = NBU;
+import { defined, extend, isNumber, merge } from '../../../Shared/Utilities.js';
 if (defaultOptions.annotations?.types) {
     /**
      * Options for the measure annotation type.
@@ -194,7 +196,10 @@ if (defaultOptions.annotations?.types) {
         },
         controlPointOptions: {
             positioner: function (target) {
-                const cpIndex = this.index, chart = target.chart, options = target.options, typeOptions = options.typeOptions, selectType = typeOptions.selectType, controlPointOptions = options.controlPointOptions, inverted = chart.inverted, xAxis = chart.xAxis[typeOptions.xAxis], yAxis = chart.yAxis[typeOptions.yAxis], ext = getExtremes(target.xAxisMin, target.xAxisMax, target.yAxisMin, target.yAxisMax);
+                const cpIndex = this.index, chart = target.chart, options = target.options, typeOptions = options.typeOptions, selectType = typeOptions.selectType, controlPointOptions = options.controlPointOptions, inverted = chart.inverted, xAxis = getAxisFromOptions(chart, 'xAxis', typeOptions.xAxis), yAxis = getAxisFromOptions(chart, 'yAxis', typeOptions.yAxis), ext = getExtremes(target.xAxisMin, target.xAxisMax, target.yAxisMin, target.yAxisMax);
+                if (!xAxis || !yAxis) {
+                    return { x: 0, y: 0 };
+                }
                 let targetX = target.xAxisMax, targetY = target.yAxisMax, x, y;
                 if (selectType === 'x') {
                     targetY = (ext.yAxisMax + ext.yAxisMin) / 2;
@@ -331,7 +336,11 @@ function getPointPos(axis, value, offset) {
  * @internal
  */
 function init() {
-    const options = this.options.typeOptions, chart = this.chart, inverted = chart.inverted, xAxis = chart.xAxis[options.xAxis], yAxis = chart.yAxis[options.yAxis], bg = options.background, width = inverted ? bg.height : bg.width, height = inverted ? bg.width : bg.height, selectType = options.selectType, top = inverted ? xAxis.left : yAxis.top, // #13664
+    const options = this.options.typeOptions, chart = this.chart, inverted = chart.inverted, xAxis = getAxisFromOptions(chart, 'xAxis', options.xAxis), yAxis = getAxisFromOptions(chart, 'yAxis', options.yAxis), bg = options.background, width = inverted ? bg.height : bg.width, height = inverted ? bg.width : bg.height, selectType = options.selectType;
+    if (!xAxis || !yAxis) {
+        return;
+    }
+    const top = inverted ? xAxis.left : yAxis.top, // #13664
     left = inverted ? yAxis.top : xAxis.left; // #13664
     this.startXMin = options.point.x;
     this.startYMin = options.point.y;
@@ -413,7 +422,10 @@ function min() {
  *        Flag if shape is resized.
  */
 function recalculate(resize) {
-    const options = this.options.typeOptions, xAxis = this.chart.xAxis[options.xAxis], yAxis = this.chart.yAxis[options.yAxis], offsetX = this.offsetX, offsetY = this.offsetY;
+    const options = this.options.typeOptions, xAxis = getAxisFromOptions(this.chart, 'xAxis', options.xAxis), yAxis = getAxisFromOptions(this.chart, 'yAxis', options.yAxis), offsetX = this.offsetX, offsetY = this.offsetY;
+    if (!xAxis || !yAxis) {
+        return;
+    }
     this.xAxisMin = getPointPos(xAxis, this.startXMin, offsetX);
     this.xAxisMax = getPointPos(xAxis, this.startXMax, offsetX);
     this.yAxisMin = getPointPos(yAxis, this.startYMin, offsetY);
@@ -439,7 +451,10 @@ function recalculate(resize) {
  */
 function updateStartPoints(redraw, resize, cpIndex, dx, dy) {
     var _a;
-    const options = this.options.typeOptions, selectType = options.selectType, xAxis = this.chart.xAxis[options.xAxis], yAxis = this.chart.yAxis[options.yAxis], startXMin = this.startXMin, startXMax = this.startXMax, startYMin = this.startYMin, startYMax = this.startYMax, offsetX = this.offsetX, offsetY = this.offsetY;
+    const options = this.options.typeOptions, selectType = options.selectType, xAxis = getAxisFromOptions(this.chart, 'xAxis', options.xAxis), yAxis = getAxisFromOptions(this.chart, 'yAxis', options.yAxis), startXMin = this.startXMin, startXMax = this.startXMax, startYMin = this.startYMin, startYMax = this.startYMax, offsetX = this.offsetX, offsetY = this.offsetY;
+    if (!xAxis || !yAxis) {
+        return;
+    }
     if (resize) {
         if (selectType === 'x') {
             if (cpIndex === 0) {
@@ -510,8 +525,8 @@ class Measure extends Annotation {
      * Overrides default setter to get axes from typeOptions.
      */
     setClipAxes() {
-        this.clipXAxis = this.chart.xAxis[this.options.typeOptions.xAxis];
-        this.clipYAxis = this.chart.yAxis[this.options.typeOptions.yAxis];
+        this.clipXAxis = getAxisFromOptions(this.chart, 'xAxis', this.options.typeOptions.xAxis);
+        this.clipYAxis = getAxisFromOptions(this.chart, 'yAxis', this.options.typeOptions.yAxis);
     }
     /**
      * Get points configuration objects for shapes.
@@ -603,8 +618,8 @@ class Measure extends Annotation {
                     return {
                         x: annotation.xAxisMin,
                         y: annotation.yAxisMin,
-                        xAxis: pick(typeOptions.xAxis, options.xAxis),
-                        yAxis: pick(typeOptions.yAxis, options.yAxis)
+                        xAxis: (typeOptions.xAxis ?? options.xAxis),
+                        yAxis: (typeOptions.yAxis ?? options.yAxis)
                     };
                 },
                 text: (formatter?.call(this, this) ||
@@ -637,10 +652,13 @@ class Measure extends Annotation {
      * Add internal crosshair shapes (on top and bottom).
      */
     addCrosshairs() {
-        const chart = this.chart, options = this.options.typeOptions, point = this.options.typeOptions.point, xAxis = chart.xAxis[options.xAxis], yAxis = chart.yAxis[options.yAxis], inverted = chart.inverted, defaultOptions = {
+        const chart = this.chart, options = this.options.typeOptions, point = this.options.typeOptions.point, xAxis = getAxisFromOptions(chart, 'xAxis', options.xAxis), yAxis = getAxisFromOptions(chart, 'yAxis', options.yAxis), inverted = chart.inverted, defaultOptions = {
             point: point,
             type: 'path'
         };
+        if (!xAxis || !yAxis) {
+            return;
+        }
         let xAxisMin = xAxis.toPixels(this.xAxisMin), xAxisMax = xAxis.toPixels(this.xAxisMax), yAxisMin = yAxis.toPixels(this.yAxisMin), yAxisMax = yAxis.toPixels(this.yAxisMax), pathH = [], pathV = [], crosshairOptionsX, crosshairOptionsY, temp;
         if (inverted) {
             temp = xAxisMin;