highcharts 7.1.1 → 7.1.2

package/es-modules/parts/Html.js

@@ -1,32 +1,20 @@
 /* *
- * (c) 2010-2019 Torstein Honsi
  *
- * License: www.highcharts.com/license
- */
-
+ *  (c) 2010-2019 Torstein Honsi
+ *
+ *  License: www.highcharts.com/license
+ *
+ *  !!!!!!! SOURCE GETS TRANSPILED BY TYPESCRIPT. EDIT TS FILE ONLY. !!!!!!!
+ *
+ * */
 'use strict';
-
 import H from './Globals.js';
 import './Utilities.js';
 import './SvgRenderer.js';
-
-var attr = H.attr,
-    createElement = H.createElement,
-    css = H.css,
-    defined = H.defined,
-    extend = H.extend,
-    isFirefox = H.isFirefox,
-    isMS = H.isMS,
-    isWebKit = H.isWebKit,
-    pick = H.pick,
-    pInt = H.pInt,
-    SVGElement = H.SVGElement,
-    SVGRenderer = H.SVGRenderer,
-    win = H.win;
-
+var attr = H.attr, createElement = H.createElement, css = H.css, defined = H.defined, extend = H.extend, isFirefox = H.isFirefox, isMS = H.isMS, isWebKit = H.isWebKit, pick = H.pick, pInt = H.pInt, SVGElement = H.SVGElement, SVGRenderer = H.SVGRenderer, win = H.win;
+/* eslint-disable valid-jsdoc */
 // Extend SvgElement for useHTML option.
 extend(SVGElement.prototype, /** @lends SVGElement.prototype */ {
-
     /**
      * Apply CSS to HTML elements. This is used in text within SVG rendering and
      * by the VML renderer
@@ -39,42 +27,29 @@ extend(SVGElement.prototype, /** @lends SVGElement.prototype */ {
      * @return {Highcharts.SVGElement}
      */
     htmlCss: function (styles) {
-        var wrapper = this,
-            element = wrapper.element,
-            // When setting or unsetting the width style, we need to update
-            // transform (#8809)
-            isSettingWidth = (
-                element.tagName === 'SPAN' &&
-                styles &&
-                'width' in styles
-            ),
-            textWidth = pick(
-                isSettingWidth && styles.width,
-                undefined
-            ),
-            doTransform;
-
+        var wrapper = this, element = wrapper.element, 
+        // When setting or unsetting the width style, we need to update
+        // transform (#8809)
+        isSettingWidth = (element.tagName === 'SPAN' &&
+            styles &&
+            'width' in styles), textWidth = pick(isSettingWidth && styles.width, undefined), doTransform;
         if (isSettingWidth) {
             delete styles.width;
             wrapper.textWidth = textWidth;
             doTransform = true;
         }
-
         if (styles && styles.textOverflow === 'ellipsis') {
             styles.whiteSpace = 'nowrap';
             styles.overflow = 'hidden';
         }
         wrapper.styles = extend(wrapper.styles, styles);
         css(wrapper.element, styles);
-
         // Now that all styles are applied, to the transform
         if (doTransform) {
             wrapper.htmlUpdateTransform();
         }
-
         return wrapper;
     },
-
     /**
      * VML and useHTML method for calculating the bounding box based on offsets.
      *
@@ -89,9 +64,7 @@ extend(SVGElement.prototype, /** @lends SVGElement.prototype */ {
      *         A hash containing values for x, y, width and height.
      */
     htmlGetBBox: function () {
-        var wrapper = this,
-            element = wrapper.element;
-
+        var wrapper = this, element = wrapper.element;
         return {
             x: element.offsetLeft,
             y: element.offsetTop,
@@ -99,13 +72,13 @@ extend(SVGElement.prototype, /** @lends SVGElement.prototype */ {
             height: element.offsetHeight
         };
     },
-
     /**
      * VML override private method to update elements based on internal
      * properties based on SVG transform.
      *
      * @private
      * @function Highcharts.SVGElement#htmlUpdateTransform
+     * @return {void}
      */
     htmlUpdateTransform: function () {
         // aligning non added elements is expensive
@@ -113,19 +86,13 @@ extend(SVGElement.prototype, /** @lends SVGElement.prototype */ {
             this.alignOnAdd = true;
             return;
         }
-
-        var wrapper = this,
-            renderer = wrapper.renderer,
-            elem = wrapper.element,
-            translateX = wrapper.translateX || 0,
-            translateY = wrapper.translateY || 0,
-            x = wrapper.x || 0,
-            y = wrapper.y || 0,
-            align = wrapper.textAlign || 'left',
-            alignCorrection = { left: 0, center: 0.5, right: 1 }[align],
-            styles = wrapper.styles,
-            whiteSpace = styles && styles.whiteSpace;
-
+        var wrapper = this, renderer = wrapper.renderer, elem = wrapper.element, translateX = wrapper.translateX || 0, translateY = wrapper.translateY || 0, x = wrapper.x || 0, y = wrapper.y || 0, align = wrapper.textAlign || 'left', alignCorrection = {
+            left: 0, center: 0.5, right: 1
+        }[align], styles = wrapper.styles, whiteSpace = styles && styles.whiteSpace;
+        /**
+         * @private
+         * @return {number}
+         */
         function getTextPxLength() {
             // Reset multiline/ellipsis in order to read width (#4928,
             // #5417)
@@ -135,13 +102,11 @@ extend(SVGElement.prototype, /** @lends SVGElement.prototype */ {
             });
             return elem.offsetWidth;
         }
-
         // apply translate
         css(elem, {
             marginLeft: translateX,
             marginTop: translateY
         });
-
         if (!renderer.styledMode && wrapper.shadows) { // used in labels/tooltip
             wrapper.shadows.forEach(function (shadow) {
                 css(shadow, {
@@ -150,43 +115,31 @@ extend(SVGElement.prototype, /** @lends SVGElement.prototype */ {
                 });
             });
         }
-
         // apply inversion
         if (wrapper.inverted) { // wrapper is a group
             [].forEach.call(elem.childNodes, function (child) {
                 renderer.invertChild(child, elem);
             });
         }
-
         if (elem.tagName === 'SPAN') {
-
-            var rotation = wrapper.rotation,
-                baseline,
-                textWidth = wrapper.textWidth && pInt(wrapper.textWidth),
-                currentTextTransform = [
-                    rotation,
-                    align,
-                    elem.innerHTML,
-                    wrapper.textWidth,
-                    wrapper.textAlign
-                ].join(',');
-
+            var rotation = wrapper.rotation, baseline, textWidth = wrapper.textWidth && pInt(wrapper.textWidth), currentTextTransform = [
+                rotation,
+                align,
+                elem.innerHTML,
+                wrapper.textWidth,
+                wrapper.textAlign
+            ].join(',');
             // Update textWidth. Use the memoized textPxLength if possible, to
             // avoid the getTextPxLength function using elem.offsetWidth.
             // Calling offsetWidth affects rendering time as it forces layout
             // (#7656).
-            if (
-                textWidth !== wrapper.oldTextWidth &&
-                (
-                    (textWidth > wrapper.oldTextWidth) ||
-                    (wrapper.textPxLength || getTextPxLength()) > textWidth
-                ) && (
-                    // Only set the width if the text is able to word-wrap, or
-                    // text-overflow is ellipsis (#9537)
-                    /[ \-]/.test(elem.textContent || elem.innerText) ||
-                    elem.style.textOverflow === 'ellipsis'
-                )
-            ) { // #983, #1254
+            if (textWidth !== wrapper.oldTextWidth &&
+                ((textWidth > wrapper.oldTextWidth) ||
+                    (wrapper.textPxLength || getTextPxLength()) > textWidth) && (
+            // Only set the width if the text is able to word-wrap, or
+            // text-overflow is ellipsis (#9537)
+            /[ \-]/.test(elem.textContent || elem.innerText) ||
+                elem.style.textOverflow === 'ellipsis')) { // #983, #1254
                 css(elem, {
                     width: textWidth + 'px',
                     display: 'block',
@@ -194,102 +147,73 @@ extend(SVGElement.prototype, /** @lends SVGElement.prototype */ {
                 });
                 wrapper.oldTextWidth = textWidth;
                 wrapper.hasBoxWidthChanged = true; // #8159
-            } else {
+            }
+            else {
                 wrapper.hasBoxWidthChanged = false; // #8159
             }
-
             // Do the calculations and DOM access only if properties changed
             if (currentTextTransform !== wrapper.cTT) {
                 baseline = renderer.fontMetrics(elem.style.fontSize, elem).b;
-
                 // Renderer specific handling of span rotation, but only if we
                 // have something to update.
-                if (
-                    defined(rotation) &&
-                    (
-                        (rotation !== (wrapper.oldRotation || 0)) ||
-                        (align !== wrapper.oldAlign)
-                    )
-                ) {
-                    wrapper.setSpanRotation(
-                        rotation,
-                        alignCorrection,
-                        baseline
-                    );
+                if (defined(rotation) &&
+                    ((rotation !== (wrapper.oldRotation || 0)) ||
+                        (align !== wrapper.oldAlign))) {
+                    wrapper.setSpanRotation(rotation, alignCorrection, baseline);
                 }
-
                 wrapper.getSpanCorrection(
-                    // Avoid elem.offsetWidth if we can, it affects rendering
-                    // time heavily (#7656)
-                    (
-                        (!defined(rotation) && wrapper.textPxLength) || // #7920
-                        elem.offsetWidth
-                    ),
-                    baseline,
-                    alignCorrection,
-                    rotation,
-                    align
-                );
+                // Avoid elem.offsetWidth if we can, it affects rendering
+                // time heavily (#7656)
+                ((!defined(rotation) && wrapper.textPxLength) || // #7920
+                    elem.offsetWidth), baseline, alignCorrection, rotation, align);
             }
-
             // apply position with correction
             css(elem, {
                 left: (x + (wrapper.xCorr || 0)) + 'px',
                 top: (y + (wrapper.yCorr || 0)) + 'px'
             });
-
             // record current text transform
             wrapper.cTT = currentTextTransform;
             wrapper.oldRotation = rotation;
             wrapper.oldAlign = align;
         }
     },
-
     /**
      * Set the rotation of an individual HTML span.
      *
      * @private
      * @function Highcharts.SVGElement#setSpanRotation
-     *
      * @param {number} rotation
-     *
      * @param {number} alignCorrection
-     *
      * @param {number} baseline
+     * @return {void}
      */
     setSpanRotation: function (rotation, alignCorrection, baseline) {
-        var rotationStyle = {},
-            cssTransformKey = this.renderer.getTransformKey();
-
+        var rotationStyle = {}, cssTransformKey = this.renderer.getTransformKey();
         rotationStyle[cssTransformKey] = rotationStyle.transform =
             'rotate(' + rotation + 'deg)';
         rotationStyle[cssTransformKey + (isFirefox ? 'Origin' : '-origin')] =
-        rotationStyle.transformOrigin =
-            (alignCorrection * 100) + '% ' + baseline + 'px';
+            rotationStyle.transformOrigin =
+                (alignCorrection * 100) + '% ' + baseline + 'px';
         css(this.element, rotationStyle);
     },
-
     /**
      * Get the correction in X and Y positioning as the element is rotated.
      *
      * @private
      * @function Highcharts.SVGElement#getSpanCorrection
-     *
      * @param {number} width
-     *
      * @param {number} baseline
-     *
      * @param {number} alignCorrection
+     * @return {void}
      */
     getSpanCorrection: function (width, baseline, alignCorrection) {
         this.xCorr = -width * alignCorrection;
         this.yCorr = -baseline;
     }
 });
-
 // Extend SvgRenderer for useHTML option.
 extend(SVGRenderer.prototype, /** @lends SVGRenderer.prototype */ {
-
     /**
      * @private
      * @function Highcharts.SVGRenderer#getTransformKey
@@ -307,7 +231,6 @@ extend(SVGRenderer.prototype, /** @lends SVGRenderer.prototype */ {
                         '-o-transform' :
                         '';
     },
-
     /**
      * Create HTML text node. This is used by the VML renderer as well as the
      * SVG renderer through the useHTML option.
@@ -327,34 +250,23 @@ extend(SVGRenderer.prototype, /** @lends SVGRenderer.prototype */ {
      * @return {Highcharts.HTMLDOMElement}
      */
     html: function (str, x, y) {
-        var wrapper = this.createElement('span'),
-            element = wrapper.element,
-            renderer = wrapper.renderer,
-            isSVG = renderer.isSVG,
-            addSetters = function (gWrapper, style) {
-                // These properties are set as attributes on the SVG group, and
-                // as identical CSS properties on the div. (#3542)
-                ['opacity', 'visibility'].forEach(function (prop) {
-                    gWrapper[prop + 'Setter'] = function (
-                        value,
-                        key,
-                        elem
-                    ) {
-                        var styleObject = gWrapper.div ?
-                            gWrapper.div.style :
-                            style;
-                        SVGElement.prototype[prop + 'Setter']
-                            .call(this, value, key, elem);
-                        if (styleObject) {
-                            styleObject[key] = value;
-                        }
-                    };
-                });
-                gWrapper.addedSetters = true;
-            },
-            chart = H.charts[renderer.chartIndex],
-            styledMode = chart && chart.styledMode;
-
+        var wrapper = this.createElement('span'), element = wrapper.element, renderer = wrapper.renderer, isSVG = renderer.isSVG, addSetters = function (gWrapper, style) {
+            // These properties are set as attributes on the SVG group, and
+            // as identical CSS properties on the div. (#3542)
+            ['opacity', 'visibility'].forEach(function (prop) {
+                gWrapper[prop + 'Setter'] = function (value, key, elem) {
+                    var styleObject = gWrapper.div ?
+                        gWrapper.div.style :
+                        style;
+                    SVGElement.prototype[prop + 'Setter']
+                        .call(this, value, key, elem);
+                    if (styleObject) {
+                        styleObject[key] = value;
+                    }
+                };
+            });
+            gWrapper.addedSetters = true;
+        }, chart = H.charts[renderer.chartIndex], styledMode = chart && chart.styledMode;
         // Text setter
         wrapper.textSetter = function (value) {
             if (value !== element.innerHTML) {
@@ -365,26 +277,23 @@ extend(SVGRenderer.prototype, /** @lends SVGRenderer.prototype */ {
             element.innerHTML = pick(value, '');
             wrapper.doTransform = true;
         };
-
         // Add setters for the element itself (#4938)
         if (isSVG) { // #4938, only for HTML within SVG
             addSetters(wrapper, wrapper.element.style);
         }
-
         // Various setters which rely on update transform
         wrapper.xSetter =
-        wrapper.ySetter =
-        wrapper.alignSetter =
-        wrapper.rotationSetter =
-        function (value, key) {
-            if (key === 'align') {
-                // Do not overwrite the SVGElement.align method. Same as VML.
-                key = 'textAlign';
-            }
-            wrapper[key] = value;
-            wrapper.doTransform = true;
-        };
-
+            wrapper.ySetter =
+                wrapper.alignSetter =
+                    wrapper.rotationSetter =
+                        function (value, key) {
+                            if (key === 'align') {
+                                // Do not overwrite the SVGElement.align method. Same as VML.
+                                key = 'textAlign';
+                            }
+                            wrapper[key] = value;
+                            wrapper.doTransform = true;
+                        };
         // Runs at the end of .attr()
         wrapper.afterSetters = function () {
             // Update transform. Do this outside the loop to prevent redundant
@@ -394,105 +303,86 @@ extend(SVGRenderer.prototype, /** @lends SVGRenderer.prototype */ {
                 this.doTransform = false;
             }
         };
-
         // Set the default attributes
         wrapper
             .attr({
-                text: str,
-                x: Math.round(x),
-                y: Math.round(y)
-            })
+            text: str,
+            x: Math.round(x),
+            y: Math.round(y)
+        })
             .css({
-                position: 'absolute'
-            });
-
+            position: 'absolute'
+        });
         if (!styledMode) {
             wrapper.css({
                 fontFamily: this.style.fontFamily,
                 fontSize: this.style.fontSize
             });
         }
-
         // Keep the whiteSpace style outside the wrapper.styles collection
         element.style.whiteSpace = 'nowrap';
-
         // Use the HTML specific .css method
         wrapper.css = wrapper.htmlCss;
-
         // This is specific for HTML within SVG
         if (isSVG) {
             wrapper.add = function (svgGroupWrapper) {
-
-                var htmlGroup,
-                    container = renderer.box.parentNode,
-                    parentGroup,
-                    parents = [];
-
+                var htmlGroup, container = renderer.box.parentNode, parentGroup, parents = [];
                 this.parentGroup = svgGroupWrapper;
-
                 // Create a mock group to hold the HTML elements
                 if (svgGroupWrapper) {
                     htmlGroup = svgGroupWrapper.div;
                     if (!htmlGroup) {
-
                         // Read the parent chain into an array and read from top
                         // down
                         parentGroup = svgGroupWrapper;
                         while (parentGroup) {
-
                             parents.push(parentGroup);
-
                             // Move up to the next parent group
                             parentGroup = parentGroup.parentGroup;
                         }
-
                         // Ensure dynamically updating position when any parent
                         // is translated
                         parents.reverse().forEach(function (parentGroup) {
-                            var htmlGroupStyle,
-                                cls = attr(parentGroup.element, 'class');
-
-                            // Common translate setter for X and Y on the HTML
-                            // group. Reverted the fix for #6957 du to
-                            // positioning problems and offline export (#7254,
-                            // #7280, #7529)
+                            var htmlGroupStyle, cls = attr(parentGroup.element, 'class');
+                            /**
+                             * Common translate setter for X and Y on the HTML
+                             * group. Reverted the fix for #6957 du to
+                             * positioning problems and offline export (#7254,
+                             * #7280, #7529)
+                             * @private
+                             * @param {*} value
+                             * @param {string} key
+                             * @return {void}
+                             */
                             function translateSetter(value, key) {
                                 parentGroup[key] = value;
-
                                 if (key === 'translateX') {
                                     htmlGroupStyle.left = value + 'px';
-                                } else {
+                                }
+                                else {
                                     htmlGroupStyle.top = value + 'px';
                                 }
-
                                 parentGroup.doTransform = true;
                             }
-
                             if (cls) {
                                 cls = { className: cls };
                             } // else null
-
                             // Create a HTML div and append it to the parent div
                             // to emulate the SVG group structure
                             htmlGroup =
-                            parentGroup.div =
-                            parentGroup.div || createElement('div', cls, {
-                                position: 'absolute',
-                                left: (parentGroup.translateX || 0) + 'px',
-                                top: (parentGroup.translateY || 0) + 'px',
-                                display: parentGroup.display,
-                                opacity: parentGroup.opacity, // #5075
-                                pointerEvents: (
-                                    parentGroup.styles &&
-                                    parentGroup.styles.pointerEvents
-                                ) // #5595
-
-                            // the top group is appended to container
-                            }, htmlGroup || container);
-
+                                parentGroup.div =
+                                    parentGroup.div || createElement('div', cls, {
+                                        position: 'absolute',
+                                        left: (parentGroup.translateX || 0) + 'px',
+                                        top: (parentGroup.translateY || 0) + 'px',
+                                        display: parentGroup.display,
+                                        opacity: parentGroup.opacity,
+                                        pointerEvents: (parentGroup.styles &&
+                                            parentGroup.styles.pointerEvents) // #5595
+                                        // the top group is appended to container
+                                    }, htmlGroup || container);
                             // Shortcut
                             htmlGroupStyle = htmlGroup.style;
-
                             // Set listeners to update the HTML div's position
                             // whenever the SVG group position is changed.
                             extend(parentGroup, {
@@ -500,19 +390,13 @@ extend(SVGRenderer.prototype, /** @lends SVGRenderer.prototype */ {
                                 // the related group
                                 classSetter: (function (htmlGroup) {
                                     return function (value) {
-                                        this.element.setAttribute(
-                                            'class',
-                                            value
-                                        );
+                                        this.element.setAttribute('class', value);
                                         htmlGroup.className = value;
                                     };
                                 }(htmlGroup)),
                                 on: function () {
                                     if (parents[0].div) { // #6418
-                                        wrapper.on.apply(
-                                            { element: parents[0].div },
-                                            arguments
-                                        );
+                                        wrapper.on.apply({ element: parents[0].div }, arguments);
                                     }
                                     return parentGroup;
                                 },
@@ -523,20 +407,17 @@ extend(SVGRenderer.prototype, /** @lends SVGRenderer.prototype */ {
                                 addSetters(parentGroup);
                             }
                         });
-
                     }
-                } else {
+                }
+                else {
                     htmlGroup = container;
                 }
-
                 htmlGroup.appendChild(element);
-
                 // Shared with VML:
                 wrapper.added = true;
                 if (wrapper.alignOnAdd) {
                     wrapper.htmlUpdateTransform();
                 }
-
                 return wrapper;
             };
         }

package/es-modules/parts/Interaction.js

@@ -24,6 +24,7 @@ var addEvent = H.addEvent,
     fireEvent = H.fireEvent,
     hasTouch = H.hasTouch,
     isObject = H.isObject,
+    isArray = H.isArray,
     Legend = H.Legend,
     merge = H.merge,
     pick = H.pick,
@@ -61,20 +62,27 @@ TrackerMixin = H.TrackerMixin = {
                     pointer.isDirectTouch = true;
                     point.onMouseOver(e);
                 }
-            };
+            },
+            dataLabels;
 
         // Add reference to the point
         series.points.forEach(function (point) {
+            dataLabels = (
+                isArray(point.dataLabels) ?
+                    point.dataLabels :
+                    (point.dataLabel ? [point.dataLabel] : [])
+            );
+
             if (point.graphic) {
                 point.graphic.element.point = point;
             }
-            if (point.dataLabel) {
-                if (point.dataLabel.div) {
-                    point.dataLabel.div.point = point;
+            dataLabels.forEach(function (dataLabel) {
+                if (dataLabel.div) {
+                    dataLabel.div.point = point;
                 } else {
-                    point.dataLabel.element.point = point;
+                    dataLabel.element.point = point;
                 }
-            }
+            });
         });
 
         // Add the event listeners, we need to do this only once
@@ -791,7 +799,9 @@ extend(Point.prototype, /** @lends Highcharts.Point.prototype */ {
             point.events = events;
 
             H.objectEach(events, function (event, eventType) {
-                addEvent(point, eventType, event);
+                if (H.isFunction(event)) {
+                    addEvent(point, eventType, event);
+                }
             });
             this.hasImportedEvents = true;