highcharts 9.3.1 → 10.0.0

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

@@ -82,7 +82,8 @@ var ForcedMarkersComposition;
             var hadForcedMarker = point.hasForcedA11yMarker;
             delete point.hasForcedA11yMarker;
             if (pointOptions.marker) {
-                var isStillForcedMarker = hadForcedMarker && getPointMarkerOpacity(pointOptions) === 0;
+                var isStillForcedMarker = hadForcedMarker &&
+                    getPointMarkerOpacity(pointOptions) === 0;
                 if (pointOptions.marker.enabled && !isStillForcedMarker) {
                     unforcePointMarkerOptions(pointOptions);
                     point.hasForcedA11yMarker = false;
@@ -98,7 +99,9 @@ var ForcedMarkersComposition;
      * @private
      */
     function hasIndividualPointMarkerOptions(series) {
-        return !!(series._hasPointMarkers && series.points && series.points.length);
+        return !!(series._hasPointMarkers &&
+            series.points &&
+            series.points.length);
     }
     /**
      * @private
@@ -107,7 +110,8 @@ var ForcedMarkersComposition;
         var a11yOptions = series.chart.options.accessibility;
         return series.points.length <
             a11yOptions.series.pointDescriptionEnabledThreshold ||
-            a11yOptions.series.pointDescriptionEnabledThreshold === false;
+            a11yOptions.series
+                .pointDescriptionEnabledThreshold === false;
     }
     /**
      * Process marker graphics after render
@@ -125,8 +129,11 @@ var ForcedMarkersComposition;
             if (hasIndividualPointMarkerOptions(series)) {
                 series.points.forEach(function (point) {
                     if (point.graphic) {
-                        point.graphic[point.hasForcedA11yMarker ? 'addClass' : 'removeClass']('highcharts-a11y-marker-hidden');
-                        point.graphic[point.hasForcedA11yMarker === false ? 'addClass' : 'removeClass']('highcharts-a11y-marker-visible');
+                        point.graphic[point.hasForcedA11yMarker ?
+                            'addClass' : 'removeClass']('highcharts-a11y-marker-hidden');
+                        point.graphic[point.hasForcedA11yMarker === false ?
+                            'addClass' :
+                            'removeClass']('highcharts-a11y-marker-visible');
                     }
                 });
             }
@@ -157,6 +164,7 @@ var ForcedMarkersComposition;
         else if (series.a11yMarkersForced) {
             delete series.a11yMarkersForced;
             unforceSeriesMarkerOptions(series);
+            delete series.resetA11yMarkerOptions;
         }
     }
     /**
@@ -165,7 +173,9 @@ var ForcedMarkersComposition;
     function shouldForceMarkers(series) {
         var chart = series.chart, chartA11yEnabled = chart.options.accessibility.enabled, seriesA11yEnabled = (series.options.accessibility &&
             series.options.accessibility.enabled) !== false;
-        return chartA11yEnabled && seriesA11yEnabled && isWithinDescriptionThreshold(series);
+        return (chartA11yEnabled &&
+            seriesA11yEnabled &&
+            isWithinDescriptionThreshold(series));
     }
     /**
      * @private
@@ -180,20 +190,20 @@ var ForcedMarkersComposition;
         });
     }
     /**
+     * Reset markers to normal
      * @private
      */
     function unforceSeriesMarkerOptions(series) {
         var resetMarkerOptions = series.resetA11yMarkerOptions;
         if (resetMarkerOptions) {
-            merge(true, series.options, {
+            var originalOpactiy = resetMarkerOptions.states &&
+                resetMarkerOptions.states.normal &&
+                resetMarkerOptions.states.normal.opacity;
+            series.update({
                 marker: {
                     enabled: resetMarkerOptions.enabled,
                     states: {
-                        normal: {
-                            opacity: resetMarkerOptions.states &&
-                                resetMarkerOptions.states.normal &&
-                                resetMarkerOptions.states.normal.opacity
-                        }
+                        normal: { opacity: originalOpactiy }
                     }
                 }
             });

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

@@ -92,8 +92,9 @@ var NewDataAnnouncer = /** @class */ (function () {
      */
     NewDataAnnouncer.prototype.init = function () {
         var chart = this.chart;
-        var announceOptions = chart.options.accessibility.announceNewData;
-        var announceType = announceOptions.interruptUser ? 'assertive' : 'polite';
+        var announceOptions = (chart.options.accessibility.announceNewData);
+        var announceType = announceOptions.interruptUser ?
+            'assertive' : 'polite';
         this.lastAnnouncementTime = 0;
         this.dirty = {
             allSeries: {}
@@ -116,7 +117,7 @@ var NewDataAnnouncer = /** @class */ (function () {
      */
     NewDataAnnouncer.prototype.addEventListeners = function () {
         var announcer = this, chart = this.chart, e = this.eventProvider;
-        e.addEvent(chart, 'afterDrilldown', function () {
+        e.addEvent(chart, 'afterApplyDrilldown', function () {
             announcer.lastAnnouncementTime = 0;
         });
         e.addEvent(chart, 'afterAddSeries', function (e) {
@@ -157,7 +158,9 @@ var NewDataAnnouncer = /** @class */ (function () {
             }
             this.queueAnnouncement(Object
                 .keys(this.dirty.allSeries)
-                .map(function (ix) { return announcer.dirty.allSeries[ix]; }), this.dirty.newSeries, newPoint);
+                .map(function (ix) {
+                return announcer.dirty.allSeries[ix];
+            }), this.dirty.newSeries, newPoint);
             // Reset
             this.dirty = {
                 allSeries: {}
@@ -232,7 +235,8 @@ var NewDataAnnouncer = /** @class */ (function () {
             }
         }
         // Default formatter - use lang options
-        var multiple = H.charts && H.charts.length > 1 ? 'Multiple' : 'Single', langKey = newSeries ? 'newSeriesAnnounce' + multiple :
+        var multiple = H.charts && H.charts.length > 1 ?
+            'Multiple' : 'Single', langKey = newSeries ? 'newSeriesAnnounce' + multiple :
             newPoint ? 'newPointAnnounce' + multiple : 'newDataAnnounce', chartTitle = getChartTitle(chart);
         return chart.langFormat('accessibility.announceNewData.' + langKey, {
             chartTitle: chartTitle,

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

@@ -59,7 +59,7 @@ var SeriesComponent = /** @class */ (function (_super) {
      * @private
      */
     SeriesComponent.compose = function (ChartClass, PointClass, SeriesClass) {
-        // Handle forcing markers
+        NewDataAnnouncer.compose(SeriesClass);
         ForcedMarkers.compose(SeriesClass);
         SeriesKeyboardNavigation.compose(ChartClass, PointClass, SeriesClass);
     };
@@ -124,13 +124,14 @@ var SeriesComponent = /** @class */ (function (_super) {
     };
     /**
      * Get keyboard navigation handler for this component.
-     * @return {Highcharts.KeyboardNavigationHandler}
+     * @private
      */
     SeriesComponent.prototype.getKeyboardNavigation = function () {
         return this.keyboardNavigation.getKeyboardNavigationHandler();
     };
     /**
      * Remove traces
+     * @private
      */
     SeriesComponent.prototype.destroy = function () {
         this.newDataAnnouncer.destroy();

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

@@ -67,8 +67,6 @@ function makeDummyElement(point, pos) {
 }
 /**
  * @private
- * @param {Highcharts.Point} point
- * @return {Highcharts.HTMLDOMElement|Highcharts.SVGDOMElement|undefined}
  */
 function addDummyPointElement(point) {
     var series = point.series, firstPointWithGraphic = findFirstPointWithGraphic(point), firstGraphic = firstPointWithGraphic && firstPointWithGraphic.graphic, parentGroup = firstGraphic ?
@@ -91,8 +89,6 @@ function addDummyPointElement(point) {
 }
 /**
  * @private
- * @param {Highcharts.Series} series
- * @return {boolean}
  */
 function hasMorePointsThanDescriptionThreshold(series) {
     var chartA11yOptions = series.chart.options.accessibility, threshold = (chartA11yOptions.series.pointDescriptionEnabledThreshold);
@@ -102,8 +98,6 @@ function hasMorePointsThanDescriptionThreshold(series) {
 }
 /**
  * @private
- * @param {Highcharts.Series} series
- * @return {boolean}
  */
 function shouldSetScreenReaderPropsOnPoints(series) {
     var seriesA11yOptions = series.options.accessibility || {};
@@ -112,8 +106,6 @@ function shouldSetScreenReaderPropsOnPoints(series) {
 }
 /**
  * @private
- * @param {Highcharts.Series} series
- * @return {boolean}
  */
 function shouldSetKeyboardNavPropsOnPoints(series) {
     var chartA11yOptions = series.chart.options.accessibility, seriesNavOptions = chartA11yOptions.keyboardNavigation.seriesNavigation;
@@ -123,8 +115,6 @@ function shouldSetKeyboardNavPropsOnPoints(series) {
 }
 /**
  * @private
- * @param {Highcharts.Series} series
- * @return {boolean}
  */
 function shouldDescribeSeriesElement(series) {
     var chart = series.chart, chartOptions = chart.options.chart, chartHas3d = chartOptions.options3d && chartOptions.options3d.enabled, hasMultipleSeries = chart.series.length > 1, describeSingleSeriesOption = chart.options.accessibility.series.describeSingleSeries, exposeAsGroupOnlyOption = (series.options.accessibility || {}).exposeAsGroupOnly, noDescribe3D = chartHas3d && hasMultipleSeries;
@@ -133,12 +123,10 @@ function shouldDescribeSeriesElement(series) {
 }
 /**
  * @private
- * @param {Highcharts.Point} point
- * @param {number} value
- * @return {string}
  */
 function pointNumberToString(point, value) {
-    var series = point.series, chart = series.chart, a11yPointOptions = chart.options.accessibility.point || {}, seriesA11yPointOptions = series.options.accessibility && series.options.accessibility.point || {}, tooltipOptions = series.tooltipOptions || {}, lang = chart.options.lang;
+    var series = point.series, chart = series.chart, a11yPointOptions = chart.options.accessibility.point || {}, seriesA11yPointOptions = series.options.accessibility &&
+        series.options.accessibility.point || {}, tooltipOptions = series.tooltipOptions || {}, lang = chart.options.lang;
     if (isNumber(value)) {
         return numberFormat(value, seriesA11yPointOptions.valueDecimals ||
             a11yPointOptions.valueDecimals ||
@@ -149,8 +137,6 @@ function pointNumberToString(point, value) {
 }
 /**
  * @private
- * @param {Highcharts.Series} series
- * @return {string}
  */
 function getSeriesDescriptionText(series) {
     var seriesA11yOptions = series.options.accessibility || {}, descOpt = seriesA11yOptions.description;
@@ -161,9 +147,6 @@ function getSeriesDescriptionText(series) {
 }
 /**
  * @private
- * @param {Highcharts.series} series
- * @param {string} axisCollection
- * @return {string}
  */
 function getSeriesAxisDescriptionText(series, axisCollection) {
     var axis = series[axisCollection];
@@ -176,15 +159,13 @@ function getSeriesAxisDescriptionText(series, axisCollection) {
  * Get accessible time description for a point on a datetime axis.
  *
  * @private
- * @function Highcharts.Point#getTimeDescription
- * @param {Highcharts.Point} point
- * @return {string|undefined}
- * The description as string.
  */
 function getPointA11yTimeDescription(point) {
-    var series = point.series, chart = series.chart, seriesA11yOptions = series.options.accessibility && series.options.accessibility.point || {}, a11yOptions = chart.options.accessibility.point || {}, dateXAxis = series.xAxis && series.xAxis.dateTime;
+    var series = point.series, chart = series.chart, seriesA11yOptions = series.options.accessibility &&
+        series.options.accessibility.point || {}, a11yOptions = chart.options.accessibility.point || {}, dateXAxis = series.xAxis && series.xAxis.dateTime;
     if (dateXAxis) {
-        var tooltipDateFormat = dateXAxis.getXDateFormat(point.x || 0, chart.options.tooltip.dateTimeLabelFormats), dateFormat = seriesA11yOptions.dateFormatter && seriesA11yOptions.dateFormatter(point) ||
+        var tooltipDateFormat = dateXAxis.getXDateFormat(point.x || 0, chart.options.tooltip.dateTimeLabelFormats), dateFormat = seriesA11yOptions.dateFormatter &&
+            seriesA11yOptions.dateFormatter(point) ||
             a11yOptions.dateFormatter && a11yOptions.dateFormatter(point) ||
             seriesA11yOptions.dateFormat ||
             a11yOptions.dateFormat ||
@@ -194,8 +175,6 @@ function getPointA11yTimeDescription(point) {
 }
 /**
  * @private
- * @param {Highcharts.Point} point
- * @return {string}
  */
 function getPointXDescription(point) {
     var timeDesc = getPointA11yTimeDescription(point), xAxis = point.series.xAxis || {}, pointCategory = xAxis.categories && defined(point.category) &&
@@ -205,10 +184,6 @@ function getPointXDescription(point) {
 }
 /**
  * @private
- * @param {Highcharts.Point} point
- * @param {string} prefix
- * @param {string} suffix
- * @return {string}
  */
 function getPointArrayMapValueDescription(point, prefix, suffix) {
     var pre = prefix || '', suf = suffix || '', keyToValStr = function (key) {
@@ -221,11 +196,10 @@ function getPointArrayMapValueDescription(point, prefix, suffix) {
 }
 /**
  * @private
- * @param {Highcharts.Point} point
- * @return {string}
  */
 function getPointValue(point) {
-    var series = point.series, a11yPointOpts = series.chart.options.accessibility.point || {}, seriesA11yPointOpts = series.chart.options.accessibility && series.chart.options.accessibility.point || {}, tooltipOptions = series.tooltipOptions || {}, valuePrefix = seriesA11yPointOpts.valuePrefix ||
+    var series = point.series, a11yPointOpts = series.chart.options.accessibility.point || {}, seriesA11yPointOpts = series.chart.options.accessibility &&
+        series.chart.options.accessibility.point || {}, tooltipOptions = series.tooltipOptions || {}, valuePrefix = seriesA11yPointOpts.valuePrefix ||
         a11yPointOpts.valuePrefix ||
         tooltipOptions.valuePrefix ||
         '', valueSuffix = seriesA11yPointOpts.valueSuffix ||
@@ -249,8 +223,10 @@ function getPointValue(point) {
  * empty string if none.
  *
  * @private
- * @param {Highcharts.Point} point The data point to get the annotation info from.
- * @return {string} Annotation description
+ * @param {Highcharts.Point} point
+ * The data point to get the annotation info from.
+ * @return {string}
+ * Annotation description
  */
 function getPointAnnotationDescription(point) {
     var chart = point.series.chart;
@@ -262,7 +238,6 @@ function getPointAnnotationDescription(point) {
 /**
  * Return string with information about point.
  * @private
- * @return {string}
  */
 function getPointValueDescription(point) {
     var series = point.series, chart = series.chart, seriesA11yOptions = series.options.accessibility, seriesValueDescFormat = seriesA11yOptions && seriesA11yOptions.point &&
@@ -281,12 +256,11 @@ function getPointValueDescription(point) {
 /**
  * Return string with information about point.
  * @private
- * @return {string}
  */
 function defaultPointDescriptionFormatter(point) {
-    var series = point.series, chart = series.chart, valText = getPointValueDescription(point), description = point.options && point.options.accessibility &&
-        point.options.accessibility.description, userDescText = description ? ' ' + description : '', seriesNameText = chart.series.length > 1 && series.name ?
-        ' ' + series.name + '.' : '', annotationsDesc = getPointAnnotationDescription(point), pointAnnotationsText = annotationsDesc ? ' ' + annotationsDesc : '';
+    var series = point.series, shouldExposeSeriesName = series.chart.series.length > 1 ||
+        series.options.name, valText = getPointValueDescription(point), description = point.options && point.options.accessibility &&
+        point.options.accessibility.description, userDescText = description ? ' ' + description : '', seriesNameText = shouldExposeSeriesName ? ' ' + series.name + '.' : '', annotationsDesc = getPointAnnotationDescription(point), pointAnnotationsText = annotationsDesc ? ' ' + annotationsDesc : '';
     point.accessibility = point.accessibility || {};
     point.accessibility.valueDescription = valText;
     return valText + userDescText + seriesNameText + pointAnnotationsText;
@@ -298,7 +272,8 @@ function defaultPointDescriptionFormatter(point) {
  * @param {Highcharts.HTMLDOMElement|Highcharts.SVGDOMElement} pointElement
  */
 function setPointScreenReaderAttribs(point, pointElement) {
-    var series = point.series, a11yPointOptions = series.chart.options.accessibility.point || {}, seriesPointA11yOptions = series.options.accessibility && series.options.accessibility.point || {}, label = stripHTMLTags(seriesPointA11yOptions.descriptionFormatter &&
+    var series = point.series, a11yPointOptions = series.chart.options.accessibility.point || {}, seriesPointA11yOptions = series.options.accessibility &&
+        series.options.accessibility.point || {}, label = stripHTMLTags(seriesPointA11yOptions.descriptionFormatter &&
         seriesPointA11yOptions.descriptionFormatter(point) ||
         a11yPointOptions.descriptionFormatter &&
             a11yPointOptions.descriptionFormatter(point) ||
@@ -341,7 +316,6 @@ function describePointsInSeries(series) {
 /**
  * Return string with information about series.
  * @private
- * @return {string}
  */
 function defaultSeriesDescriptionFormatter(series) {
     var chart = series.chart, chartTypes = chart.types || [], description = getSeriesDescriptionText(series), shouldDescribeAxis = function (coll) {
@@ -372,7 +346,8 @@ function describeSeriesElement(series, seriesElement) {
     } /* else do not add role */
     seriesElement.setAttribute('tabindex', '-1');
     if (!series.chart.styledMode) {
-        seriesElement.style.outline = 'none'; // Don't show browser outline on click, despite tabindex
+        // Don't show browser outline on click, despite tabindex
+        seriesElement.style.outline = 'none';
     }
     seriesElement.setAttribute('aria-label', stripHTMLTags(a11yOptions.series.descriptionFormatter &&
         a11yOptions.series.descriptionFormatter(series) ||