@highcharts/grid-pro 2.2.0 → 2.3.0

package/es-modules/Accessibility/Accessibility.js

@@ -15,8 +15,6 @@ import D from '../Core/Defaults.js';
 const { defaultOptions } = D;
 import H from '../Core/Globals.js';
 const { doc } = H;
-import U from '../Core/Utilities.js';
-const { addEvent, extend, fireEvent, merge } = U;
 import HU from './Utils/HTMLUtilities.js';
 const { removeElement } = HU;
 import A11yI18n from './A11yI18n.js';
@@ -37,6 +35,7 @@ import highContrastTheme from './HighContrastTheme.js';
 import defaultOptionsA11Y from './Options/A11yDefaults.js';
 import defaultLangOptions from './Options/LangDefaults.js';
 import copyDeprecatedOptions from './Options/DeprecatedOptions.js';
+import { addEvent, extend, fireEvent, merge } from '../Shared/Utilities.js';
 /* *
  *
  *  Class

package/es-modules/Accessibility/AccessibilityComponent.d.ts

@@ -5,9 +5,9 @@ import type HTMLElement from '../Core/Renderer/HTML/HTMLElement';
 import type KeyboardNavigationHandler from './KeyboardNavigationHandler';
 import type SVGElement from '../Core/Renderer/SVG/SVGElement';
 import type ProxyProvider from './ProxyProvider';
+import type { EventOptions } from '../Shared/Utilities.js';
 import DOMElementProvider from './Utils/DOMElementProvider.js';
 import EventProvider from './Utils/EventProvider.js';
-import U from '../Core/Utilities.js';
 /**
  * The AccessibilityComponent base class, representing a part of the chart that
  * has accessibility logic connected to it. This class can be inherited from to
@@ -75,7 +75,7 @@ declare class AccessibilityComponent {
      * See EventProvider for details.
      * @private
      */
-    addEvent<T>(el: (T | Class<T>), type: string, fn: (Function | EventCallback<T>), options?: U.EventOptions): Function;
+    addEvent<T>(el: (T | Class<T>), type: string, fn: (Function | EventCallback<T>), options?: EventOptions): Function;
     /**
      * Create an element and keep track of it for later removal.
      * See DOMElementProvider for details.

package/es-modules/Accessibility/Components/InfoRegionsComponent.js

@@ -25,8 +25,7 @@ import H from '../../Core/Globals.js';
 const { doc } = H;
 import HU from '../Utils/HTMLUtilities.js';
 const { addClass, getElement, getHeadingTagNameForElement, stripHTMLTagsFromString, visuallyHideElement } = HU;
-import U from '../../Core/Utilities.js';
-const { attr, pick, replaceNested } = U;
+import { attr, pick, replaceNested } from '../../Shared/Utilities.js';
 /* *
  *
  *  Functions
@@ -179,8 +178,8 @@ class InfoRegionsComponent extends AccessibilityComponent {
                 buildContent: function (chart) {
                     const formatter = accessibilityOptions.screenReaderSection
                         .beforeChartFormatter;
-                    return formatter ? formatter(chart) :
-                        component.defaultBeforeChartFormatter(chart);
+                    return formatter ? formatter(chart, component) :
+                        component.defaultBeforeChartFormatter();
                 },
                 insertIntoDOM: function (el, chart) {
                     chart.renderTo.insertBefore(el, chart.renderTo.firstChild);
@@ -199,7 +198,7 @@ class InfoRegionsComponent extends AccessibilityComponent {
                 buildContent: function (chart) {
                     const formatter = accessibilityOptions.screenReaderSection
                         .afterChartFormatter;
-                    return formatter ? formatter(chart) :
+                    return formatter ? formatter(chart, component) :
                         component.defaultAfterChartFormatter();
                 },
                 insertIntoDOM: function (el, chart) {
@@ -477,7 +476,7 @@ class InfoRegionsComponent extends AccessibilityComponent {
                 const onPlayAsSoundClick = (chart.options.accessibility &&
                     chart.options.accessibility.screenReaderSection
                         .onPlayAsSoundClick);
-                (onPlayAsSoundClick || defaultHandler).call(this, e, chart);
+                (onPlayAsSoundClick || defaultHandler).call(this, e, chart, this);
             };
         }
     }

package/es-modules/Accessibility/Components/LegendComponent.js

@@ -16,13 +16,12 @@ const { animObject } = A;
 import H from '../../Core/Globals.js';
 const { doc } = H;
 import Legend from '../../Core/Legend/Legend.js';
-import U from '../../Core/Utilities.js';
-const { addEvent, fireEvent, isNumber, pick, syncTimeout } = U;
 import AccessibilityComponent from '../AccessibilityComponent.js';
 import KeyboardNavigationHandler from '../KeyboardNavigationHandler.js';
 import CU from '../Utils/ChartUtilities.js';
 const { getChartTitle } = CU;
 import HU from '../Utils/HTMLUtilities.js';
+import { addEvent, fireEvent, isNumber, pick, syncTimeout } from '../../Shared/Utilities.js';
 const { stripHTMLTagsFromString: stripHTMLTags, addClass, removeClass } = HU;
 /* *
  *

package/es-modules/Accessibility/Components/MenuComponent.js

@@ -11,13 +11,12 @@
  *
  * */
 'use strict';
-import U from '../../Core/Utilities.js';
-const { attr } = U;
 import AccessibilityComponent from '../AccessibilityComponent.js';
 import KeyboardNavigationHandler from '../KeyboardNavigationHandler.js';
 import ChartUtilities from '../Utils/ChartUtilities.js';
 const { getChartTitle, unhideChartElementFromAT } = ChartUtilities;
 import HTMLUtilities from '../Utils/HTMLUtilities.js';
+import { attr } from '../../Shared/Utilities.js';
 const { getFakeMouseEvent } = HTMLUtilities;
 /* *
  *

package/es-modules/Accessibility/Components/NavigatorComponent.js

@@ -24,12 +24,11 @@ import A from '../../Core/Animation/AnimationUtilities.js';
 const { animObject } = A;
 import T from '../../Core/Templating.js';
 const { format } = T;
-import U from '../../Core/Utilities.js';
-const { clamp, pick, syncTimeout } = U;
 import HU from '../Utils/HTMLUtilities.js';
 const { getFakeMouseEvent } = HU;
 import CU from '../Utils/ChartUtilities.js';
 const { getAxisRangeDescription, fireEventOnWrappedOrUnwrappedElement } = CU;
+import { clamp, internalClearTimeout, pick, syncTimeout } from '../../Shared/Utilities.js';
 /**
  * The NavigatorComponent class
  *
@@ -145,7 +144,7 @@ class NavigatorComponent extends AccessibilityComponent {
      */
     destroy() {
         if (this.updateNavigatorThrottleTimer) {
-            clearTimeout(this.updateNavigatorThrottleTimer);
+            internalClearTimeout(this.updateNavigatorThrottleTimer);
         }
         this.proxyProvider.removeGroup('navigator');
         if (this.announcer) {
@@ -222,7 +221,7 @@ class NavigatorComponent extends AccessibilityComponent {
         // Throttle updates so as not to reduce performance with
         // continuous keypress.
         if (this.updateNavigatorThrottleTimer) {
-            clearTimeout(this.updateNavigatorThrottleTimer);
+            internalClearTimeout(this.updateNavigatorThrottleTimer);
         }
         this.updateNavigatorThrottleTimer = setTimeout(performUpdate.bind(this, beforeAnnounce), 20);
     }

package/es-modules/Accessibility/Components/RangeSelectorComponent.js

@@ -16,8 +16,7 @@ import Announcer from '../Utils/Announcer.js';
 import ChartUtilities from '../Utils/ChartUtilities.js';
 const { unhideChartElementFromAT, getAxisRangeDescription } = ChartUtilities;
 import KeyboardNavigationHandler from '../KeyboardNavigationHandler.js';
-import U from '../../Core/Utilities.js';
-const { addEvent, attr } = U;
+import { addEvent, attr } from '../../Shared/Utilities.js';
 /* *
  *
  *  Functions

package/es-modules/Accessibility/Components/SeriesComponent/ForcedMarkers.js

@@ -13,8 +13,7 @@
 'use strict';
 import H from '../../../Core/Globals.js';
 const { composed } = H;
-import U from '../../../Core/Utilities.js';
-const { addEvent, merge, pushUnique } = U;
+import { addEvent, merge, pushUnique } from '../../../Shared/Utilities.js';
 /* *
  *
  *  Composition

package/es-modules/Accessibility/Components/SeriesComponent/NewDataAnnouncer.js

@@ -13,13 +13,12 @@
 'use strict';
 import H from '../../../Core/Globals.js';
 const { composed } = H;
-import U from '../../../Core/Utilities.js';
-const { addEvent, defined, pushUnique } = U;
 import Announcer from '../../Utils/Announcer.js';
 import ChartUtilities from '../../Utils/ChartUtilities.js';
 const { getChartTitle } = ChartUtilities;
 import EventProvider from '../../Utils/EventProvider.js';
 import SeriesDescriber from './SeriesDescriber.js';
+import { addEvent, defined, internalClearTimeout, pushUnique } from '../../../Shared/Utilities.js';
 const { defaultPointDescriptionFormatter, defaultSeriesDescriptionFormatter } = SeriesDescriber;
 /* *
  *
@@ -184,7 +183,7 @@ class NewDataAnnouncer {
             if (message) {
                 // Is there already one queued?
                 if (this.queuedAnnouncement) {
-                    clearTimeout(this.queuedAnnouncementTimer);
+                    internalClearTimeout(this.queuedAnnouncementTimer);
                 }
                 // Build the announcement
                 this.queuedAnnouncement = {
@@ -221,7 +220,7 @@ class NewDataAnnouncer {
         const chart = this.chart, annOptions = chart.options.accessibility.announceNewData;
         // User supplied formatter?
         if (annOptions.announcementFormatter) {
-            const formatterRes = annOptions.announcementFormatter(dirtySeries, newSeries, newPoint);
+            const formatterRes = annOptions.announcementFormatter(dirtySeries, newSeries, newPoint, this);
             if (formatterRes !== false) {
                 return formatterRes.length ? formatterRes : null;
             }

package/es-modules/Accessibility/Components/SeriesComponent/SeriesDescriber.js

@@ -3,7 +3,7 @@
  *  (c) 2009-2026 Highsoft AS
  *  Author: Øystein Moseng
  *
- *  Place desriptions on a series and its points.
+ *  Place descriptions on a series and its points.
  *
  *  A commercial license may be required depending on use.
  *  See www.highcharts.com/license
@@ -19,8 +19,7 @@ import F from '../../../Core/Templating.js';
 const { format, numberFormat } = F;
 import HTMLUtilities from '../../Utils/HTMLUtilities.js';
 const { reverseChildNodes, stripHTMLTagsFromString: stripHTMLTags } = HTMLUtilities;
-import U from '../../../Core/Utilities.js';
-const { find, isNumber, isString, pick, defined } = U;
+import { defined, find, isString, isNumber, pick } from '../../../Shared/Utilities.js';
 /* *
  *
  *  Functions
@@ -172,7 +171,7 @@ function getPointA11yTimeDescription(point) {
     if (dateXAxis) {
         const tooltipDateFormat = dateXAxis.getXDateFormat(point.x || 0, chart.options.tooltip.dateTimeLabelFormats), dateFormat = seriesA11yOptions.dateFormatter &&
             seriesA11yOptions.dateFormatter(point) ||
-            a11yOptions.dateFormatter && a11yOptions.dateFormatter(point) ||
+            a11yOptions.dateFormatter?.(point) ||
             seriesA11yOptions.dateFormat ||
             a11yOptions.dateFormat ||
             tooltipDateFormat;

package/es-modules/Accessibility/Components/SeriesComponent/SeriesKeyboardNavigation.js

@@ -17,11 +17,10 @@ import SeriesRegistry from '../../../Core/Series/SeriesRegistry.js';
 const { seriesTypes } = SeriesRegistry;
 import H from '../../../Core/Globals.js';
 const { doc } = H;
-import U from '../../../Core/Utilities.js';
-const { defined, fireEvent } = U;
 import KeyboardNavigationHandler from '../../KeyboardNavigationHandler.js';
 import EventProvider from '../../Utils/EventProvider.js';
 import ChartUtilities from '../../Utils/ChartUtilities.js';
+import { defined, fireEvent } from '../../../Shared/Utilities.js';
 const { getPointFromXY, getSeriesFromName, scrollAxisToPoint } = ChartUtilities;
 /* *
  *

package/es-modules/Accessibility/Components/ZoomComponent.js

@@ -17,8 +17,7 @@ const { unhideChartElementFromAT } = CU;
 import HU from '../Utils/HTMLUtilities.js';
 const { getFakeMouseEvent } = HU;
 import KeyboardNavigationHandler from '../KeyboardNavigationHandler.js';
-import U from '../../Core/Utilities.js';
-const { attr, pick } = U;
+import { attr, pick } from '../../Shared/Utilities.js';
 /* *
  *
  *  Functions

package/es-modules/Accessibility/FocusBorder.js

@@ -11,8 +11,7 @@
  *
  * */
 'use strict';
-import U from '../Core/Utilities.js';
-const { addEvent, pick } = U;
+import { addEvent, pick } from '../Shared/Utilities.js';
 /* *
  *
  *  Composition

package/es-modules/Accessibility/KeyboardNavigation.js

@@ -14,10 +14,9 @@
 import H from '../Core/Globals.js';
 const { doc, win } = H;
 import MenuComponent from './Components/MenuComponent.js';
-import U from '../Core/Utilities.js';
-const { addEvent, defined, fireEvent } = U;
 import EventProvider from './Utils/EventProvider.js';
 import HTMLUtilities from './Utils/HTMLUtilities.js';
+import { addEvent, defined, fireEvent } from '../Shared/Utilities.js';
 const { getElement, simulatedEventTarget } = HTMLUtilities;
 /* *
  *

package/es-modules/Accessibility/KeyboardNavigationHandler.js

@@ -11,8 +11,7 @@
  *
  * */
 'use strict';
-import U from '../Core/Utilities.js';
-const { find } = U;
+import { find } from '../Shared/Utilities.js';
 /* *
  *
  *  Class

package/es-modules/Accessibility/Options/A11yDefaults.d.ts

@@ -51,6 +51,13 @@ import type { DeepPartial } from '../../Shared/Types';
  * @param {global.MouseEvent} evt
  *        Mouse click event
  *
+ * @param {Highcharts.Chart} [chart]
+ *        Chart context.
+ *
+ * @param {global.GlobalEventHandlers} [ctx]
+ *        Since v12.5.0, the global event handlers context passed as an extra
+ *        argument for arrow functions.
+ *
  * @return {void}
  */
 /**
@@ -61,6 +68,10 @@ import type { DeepPartial } from '../../Shared/Types';
  * @param {T} context
  *        Context to format
  *
+ * @param {*} [outerContext]
+ *        Since v12.5.0, the outer context passed as an extra argument for
+ *        arrow functions.
+ *
  * @return {string}
  *         Formatted string for the screen reader module.
  */

package/es-modules/Accessibility/Options/A11yDefaults.js

@@ -69,6 +69,13 @@
  * @param {global.MouseEvent} evt
  *        Mouse click event
  *
+ * @param {Highcharts.Chart} [chart]
+ *        Chart context.
+ *
+ * @param {global.GlobalEventHandlers} [ctx]
+ *        Since v12.5.0, the global event handlers context passed as an extra
+ *        argument for arrow functions.
+ *
  * @return {void}
  */
 /**
@@ -79,6 +86,10 @@
  * @param {T} context
  *        Context to format
  *
+ * @param {*} [outerContext]
+ *        Since v12.5.0, the outer context passed as an extra argument for
+ *        arrow functions.
+ *
  * @return {string}
  *         Formatted string for the screen reader module.
  */

package/es-modules/Accessibility/Options/DeprecatedOptions.d.ts

@@ -12,6 +12,64 @@ declare module '../../Core/Options' {
         exposeElementToA11y?: SeriesAccessibilityOptions['exposeAsGroupOnly'];
     }
 }
+declare module '../../Core/Series/SeriesOptions' {
+    interface SeriesOptions {
+        /**
+         * Deprecated. Use
+         * [plotOptions.series.accessibility.description](#plotOptions.series.accessibility.description)
+         * instead.
+         *
+         * A description of the series to add to the screen reader information
+         * about the series.
+         *
+         * @since      5.0.0
+         * @requires   modules/accessibility
+         * @deprecated 8.0.0
+         */
+        description?: SeriesAccessibilityOptions['description'];
+        /**
+         * Deprecated. Use
+         * [plotOptions.series.accessibility.point.descriptionFormatter](#plotOptions.series.accessibility.point.descriptionFormatter)
+         * instead.
+         *
+         * Same as
+         * [accessibility.series.descriptionFormatter](#accessibility.series.descriptionFormatter),
+         * but for an individual series. Overrides the chart wide configuration.
+         *
+         * @requires   modules/accessibility
+         * @since      5.0.12
+         * @deprecated 8.0.0
+         */
+        pointDescriptionFormatter?: SeriesAccessibilityOptions['point']['descriptionFormatter'];
+        /**
+         * Deprecated. Use
+         * [plotOptions.series.accessibility.point.descriptionFormat](#plotOptions.series.accessibility.point.descriptionFormat)
+         * instead.
+         *
+         * Same as
+         * [accessibility.point.descriptionFormat](#accessibility.point.descriptionFormat),
+         * but for an individual series. Overrides the chart wide configuration.
+         *
+         * @requires   modules/accessibility
+         * @since      11.1.0
+         * @deprecated next
+         */
+        pointDescriptionFormat?: SeriesAccessibilityOptions['point']['descriptionFormat'];
+        /**
+         * Deprecated. Use
+         * [series.accessibility.keyboardNavigation](#plotOptions.series.accessibility.keyboardNavigation)
+         * instead.
+         *
+         * If set to `true`, the accessibility module will skip past the points
+         * in this series for keyboard navigation.
+         *
+         * @requires   modules/accessibility
+         * @since      5.0.12
+         * @deprecated 8.0.0
+         */
+        skipKeyboardNavigation?: boolean;
+    }
+}
 /**
  * Copy options that are deprecated over to new options. Logs warnings to
  * console if deprecated options are used.

package/es-modules/Accessibility/Options/DeprecatedOptions.js

@@ -18,6 +18,8 @@
  *  chart.typeDescription -> accessibility.typeDescription
  *  series.description -> series.accessibility.description
  *  series.exposeElementToA11y -> series.accessibility.exposeAsGroupOnly
+ *  series.pointDescriptionFormat ->
+ *      series.accessibility.point.descriptionFormat
  *  series.pointDescriptionFormatter ->
  *      series.accessibility.pointDescriptionFormatter
  *  series.accessibility.pointDescriptionFormatter ->
@@ -61,8 +63,8 @@
  */
 /* eslint-enable max-len */
 'use strict';
-import U from '../../Core/Utilities.js';
-const { error, pick } = U;
+import { pick } from '../../Shared/Utilities.js';
+import { error } from '../../Core/Utilities.js';
 /* *
  *
  *  Functions
@@ -147,6 +149,9 @@ function copyDeprecatedSeriesOptions(chart) {
     const oldToNewSeriesOptions = {
         description: ['accessibility', 'description'],
         exposeElementToA11y: ['accessibility', 'exposeAsGroupOnly'],
+        pointDescriptionFormat: [
+            'accessibility', 'point', 'descriptionFormat'
+        ],
         pointDescriptionFormatter: [
             'accessibility', 'point', 'descriptionFormatter'
         ],

package/es-modules/Accessibility/Options/LangDefaults.js

@@ -208,6 +208,15 @@ const langOptions = {
              */
             changeAnnouncement: '{axisRangeDescription}'
         },
+        /**
+         * Stock tools language options for accessibility.
+         *
+         * @since next
+         */
+        stockTools: {
+            groupLabel: 'Stock chart tools',
+            arrowLabel: 'Toggle submenu'
+        },
         /**
          * Accessibility language options for the data table.
          *

package/es-modules/Accessibility/ProxyElement.js

@@ -17,12 +17,11 @@
 'use strict';
 import H from '../Core/Globals.js';
 const { doc, win } = H;
-import U from '../Core/Utilities.js';
-const { attr, css, merge } = U;
 import EventProvider from './Utils/EventProvider.js';
 import ChartUtilities from './Utils/ChartUtilities.js';
 const { fireEventOnWrappedOrUnwrappedElement } = ChartUtilities;
 import HTMLUtilities from './Utils/HTMLUtilities.js';
+import { attr, css, merge } from '../Shared/Utilities.js';
 const { cloneMouseEvent, cloneTouchEvent, getFakeMouseEvent, removeElement } = HTMLUtilities;
 /* *
  *
@@ -125,9 +124,7 @@ class ProxyElement {
      */
     updateCSSClassName() {
         const stringHasNoTooltip = (s) => (s.indexOf('highcharts-no-tooltip') > -1);
-        const legend = this.chart.legend;
-        const groupDiv = legend.group && legend.group.div;
-        const noTooltipOnGroup = stringHasNoTooltip(groupDiv && groupDiv.className || '');
+        const noTooltipOnGroup = stringHasNoTooltip(this.chart.legend?.group?.div?.className || '');
         const targetClassName = this.getTargetAttr(this.target.click, 'class') || '';
         const noTooltipOnTarget = stringHasNoTooltip(targetClassName);
         this.innerElement.className = noTooltipOnGroup || noTooltipOnTarget ?

package/es-modules/Accessibility/ProxyProvider.js

@@ -17,14 +17,13 @@
 'use strict';
 import H from '../Core/Globals.js';
 const { doc } = H;
-import U from '../Core/Utilities.js';
-const { attr, css } = U;
 import CU from './Utils/ChartUtilities.js';
 const { unhideChartElementFromAT } = CU;
 import DOMElementProvider from './Utils/DOMElementProvider.js';
 import HU from './Utils/HTMLUtilities.js';
 const { removeChildNodes } = HU;
 import ProxyElement from './ProxyElement.js';
+import { attr, css } from '../Shared/Utilities.js';
 /* *
  *
  *  Class

package/es-modules/Accessibility/Utils/Announcer.js

@@ -17,8 +17,7 @@ import H from '../../Core/Globals.js';
 const { doc } = H;
 import HU from './HTMLUtilities.js';
 const { addClass, visuallyHideElement } = HU;
-import U from '../../Core/Utilities.js';
-const { attr } = U;
+import { attr, internalClearTimeout } from '../../Shared/Utilities.js';
 /* *
  *
  *  Class
@@ -48,7 +47,7 @@ class Announcer {
         // Delete contents after a little while to avoid user finding the live
         // region in the DOM.
         if (this.clearAnnouncementRegionTimer) {
-            clearTimeout(this.clearAnnouncementRegionTimer);
+            internalClearTimeout(this.clearAnnouncementRegionTimer);
         }
         this.clearAnnouncementRegionTimer = setTimeout(() => {
             this.announceRegion.innerHTML = AST.emptyHTML;

package/es-modules/Accessibility/Utils/ChartUtilities.js

@@ -15,8 +15,7 @@ import H from '../../Core/Globals.js';
 const { doc } = H;
 import HU from './HTMLUtilities.js';
 const { stripHTMLTagsFromString: stripHTMLTags } = HU;
-import U from '../../Core/Utilities.js';
-const { defined, find, fireEvent } = U;
+import { defined, find, fireEvent } from '../../Shared/Utilities.js';
 /* *
  *
  *  Functions

package/es-modules/Accessibility/Utils/EventProvider.d.ts

@@ -1,6 +1,6 @@
+import { type EventOptions } from '../../Shared/Utilities.js';
 import type { EventCallback } from '../../Core/Callback';
 import DOMElementType from '../../Core/Renderer/DOMElementType';
-import U from '../../Core/Utilities.js';
 interface ElementsFocusEventRemovers {
     element: DOMElementType;
     remover: Function;
@@ -11,7 +11,7 @@ interface ElementsFocusEventRemovers {
 declare class EventProvider {
     constructor();
     eventRemovers: Array<ElementsFocusEventRemovers>;
-    addEvent<T>(el: (Class<T> | T), type: string, fn: (EventCallback<T> | Function), options?: U.EventOptions): Function;
+    addEvent<T>(el: (Class<T> | T), type: string, fn: (EventCallback<T> | Function), options?: EventOptions): Function;
     /**
      * Remove added event.
      * @private

package/es-modules/Accessibility/Utils/EventProvider.js

@@ -11,9 +11,13 @@
  *
  * */
 'use strict';
+/* *
+ *
+ *  Imports
+ *
+ * */
+import { addEvent } from '../../Shared/Utilities.js';
 import H from '../../Core/Globals.js';
-import U from '../../Core/Utilities.js';
-const { addEvent } = U;
 /**
  * @private
  */

package/es-modules/Accessibility/Utils/HTMLUtilities.js

@@ -12,9 +12,8 @@
  * */
 'use strict';
 import H from '../../Core/Globals.js';
+import { css } from '../../Shared/Utilities.js';
 const { doc, win } = H;
-import U from '../../Core/Utilities.js';
-const { css } = U;
 /* *
  *
  *  Constants

package/es-modules/Core/Animation/AnimationUtilities.js

@@ -10,8 +10,7 @@
  * */
 'use strict';
 import Fx from './Fx.js';
-import U from '../Utilities.js';
-const { defined, getStyle, isArray, isNumber, isObject, merge, objectEach, pick } = U;
+import { defined, getStyle, isArray, isNumber, isObject, merge, objectEach, pick } from '../../Shared/Utilities.js';
 /* *
  *
  *  Functions

package/es-modules/Core/Animation/Fx.js

@@ -13,8 +13,7 @@ import Color from '../Color/Color.js';
 const { parse: color } = Color;
 import H from '../Globals.js';
 const { win } = H;
-import U from '../Utilities.js';
-const { isNumber, objectEach } = U;
+import { isNumber, objectEach } from '../../Shared/Utilities.js';
 /* eslint-disable no-invalid-this, valid-jsdoc */
 /* *
  *

package/es-modules/Core/Callback.d.ts

@@ -1,3 +1,4 @@
+import type { AnyRecord } from '../Shared/Types.js';
 /**
  * Generic callback function.
  *
@@ -23,11 +24,14 @@ export interface Callback<TScope, TReturn> {
  * @param {TEvent} e
  * Event argument.
  *
+ * @param {TScope} [ctx]
+ * The context for the callback.
+ *
  * @return {boolean|void}
  * Return value.
  */
 export interface EventCallback<TScope, TEvent = AnyRecord | Event> {
-    (this: TScope, e: TEvent): (boolean | void);
+    (this: TScope, e: TEvent, ctx?: TScope): (boolean | void);
 }
 /**
  * Generic formatter callback function.
@@ -40,10 +44,13 @@ export interface EventCallback<TScope, TEvent = AnyRecord | Event> {
  * @param {TEvent} e
  * Event argument.
  *
+ * @param {TScope} [ctx]
+ * The context for the callback.
+ *
  * @return {string}
  * Return value.
  */
 export interface FormatterCallback<TScope, TEvent = unknown> {
-    (this: TScope, e: TEvent): string;
+    (this: TScope, e: TEvent, ctx?: TScope): string;
 }
 export default Callback;