highcharts 9.2.0 → 9.3.1

package/es-modules/Series/Sankey/SankeySeries.js

@@ -25,12 +25,12 @@ var __extends = (this && this.__extends) || (function () {
 })();
 import Color from '../../Core/Color/Color.js';
 import H from '../../Core/Globals.js';
-import NodesMixin from '../../Mixins/Nodes.js';
+import NodesComposition from '../NodesComposition.js';
 import SankeyPoint from './SankeyPoint.js';
 import SeriesRegistry from '../../Core/Series/SeriesRegistry.js';
 var Series = SeriesRegistry.series, ColumnSeries = SeriesRegistry.seriesTypes.column;
-import TreeSeriesMixin from '../../Mixins/TreeSeries.js';
-var getLevelOptions = TreeSeriesMixin.getLevelOptions;
+import TU from '../TreeUtilities.js';
+var getLevelOptions = TU.getLevelOptions;
 import U from '../../Core/Utilities.js';
 var defined = U.defined, extend = U.extend, find = U.find, isObject = U.isObject, merge = U.merge, pick = U.pick, relativeLength = U.relativeLength, stableSort = U.stableSort;
 /* *
@@ -112,8 +112,9 @@ var SankeySeries = /** @class */ (function (_super) {
         column.offset = function (node, factor) {
             var offset = 0, totalNodeOffset, nodePadding = series.nodePadding;
             for (var i = 0; i < column.length; i++) {
-                var sum = column[i].getSum();
-                var height = Math.max(sum * factor, series.options.minLinkWidth);
+                var sum = column[i].getSum(), height = Math.max(sum * factor, series.options.minLinkWidth), directionOffset = node.options[chart.inverted ?
+                    'offsetHorizontal' :
+                    'offsetVertical'], optionOffset = node.options.offset || 0;
                 if (sum) {
                     totalNodeOffset = height + nodePadding;
                 }
@@ -123,7 +124,9 @@ var SankeySeries = /** @class */ (function (_super) {
                 }
                 if (column[i] === node) {
                     return {
-                        relativeTop: offset + relativeLength(node.options.offset || 0, totalNodeOffset)
+                        relativeTop: offset + (defined(directionOffset) ?
+                            // directionOffset is a percent of the node height
+                            relativeLength(directionOffset, height) : relativeLength(optionOffset, totalNodeOffset))
                     };
                 }
                 offset += totalNodeOffset;
@@ -206,7 +209,7 @@ var SankeySeries = /** @class */ (function (_super) {
      * @private
      */
     SankeySeries.prototype.generatePoints = function () {
-        NodesMixin.generatePoints.apply(this, arguments);
+        NodesComposition.generatePoints.apply(this, arguments);
         /**
          * Order the nodes, starting with the root node(s). (#9818)
          * @private
@@ -412,11 +415,10 @@ var SankeySeries = /** @class */ (function (_super) {
             return y;
         };
         var fromNode = point.fromNode, toNode = point.toNode, chart = this.chart, translationFactor = this.translationFactor, linkHeight = Math.max(point.weight * translationFactor, this.options.minLinkWidth), options = this.options, curvy = ((chart.inverted ? -this.colDistance : this.colDistance) *
-            options.curveFactor), fromY = getY(fromNode, 'linksFrom'), toY = getY(toNode, 'linksTo'), nodeLeft = fromNode.nodeX, nodeW = this.nodeWidth, right = toNode.column * this.colDistance, outgoing = point.outgoing, straight = right > nodeLeft + nodeW;
+            options.curveFactor), fromY = getY(fromNode, 'linksFrom'), toY = getY(toNode, 'linksTo'), nodeLeft = fromNode.nodeX, nodeW = this.nodeWidth, right = toNode.nodeX, outgoing = point.outgoing, straight = right > nodeLeft + nodeW;
         if (chart.inverted) {
             fromY = chart.plotSizeY - fromY;
             toY = (chart.plotSizeY || 0) - toY;
-            right = chart.plotSizeX - right;
             nodeW = -nodeW;
             linkHeight = -linkHeight;
             straight = nodeLeft > right;
@@ -513,11 +515,12 @@ var SankeySeries = /** @class */ (function (_super) {
      * @private
      */
     SankeySeries.prototype.translateNode = function (node, column) {
-        var translationFactor = this.translationFactor, chart = this.chart, options = this.options, sum = node.getSum(), nodeHeight = Math.max(Math.round(sum * translationFactor), this.options.minLinkWidth), crisp = Math.round(options.borderWidth) % 2 / 2, nodeOffset = column.offset(node, translationFactor), fromNodeTop = Math.floor(pick(nodeOffset.absoluteTop, (column.top(translationFactor) +
+        var translationFactor = this.translationFactor, chart = this.chart, options = this.options, sum = node.getSum(), nodeHeight = Math.max(Math.round(sum * translationFactor), this.options.minLinkWidth), nodeWidth = Math.round(this.nodeWidth), crisp = Math.round(options.borderWidth) % 2 / 2, nodeOffset = column.offset(node, translationFactor), fromNodeTop = Math.floor(pick(nodeOffset.absoluteTop, (column.top(translationFactor) +
             nodeOffset.relativeTop))) + crisp, left = Math.floor(this.colDistance * node.column +
-            options.borderWidth / 2) + crisp, nodeLeft = chart.inverted ?
+            options.borderWidth / 2) + relativeLength(node.options.offsetHorizontal || 0, nodeWidth) +
+            crisp, nodeLeft = chart.inverted ?
             chart.plotSizeX - left :
-            left, nodeWidth = Math.round(this.nodeWidth);
+            left;
         node.sum = sum;
         // If node sum is 0, don't render the rect #12453
         if (sum) {
@@ -820,20 +823,20 @@ var SankeySeries = /** @class */ (function (_super) {
     });
     return SankeySeries;
 }(ColumnSeries));
+NodesComposition.compose(SankeyPoint, SankeySeries);
 extend(SankeySeries.prototype, {
     animate: Series.prototype.animate,
     // Create a single node that holds information on incoming and outgoing
     // links.
-    createNode: NodesMixin.createNode,
-    destroy: NodesMixin.destroy,
+    createNode: NodesComposition.createNode,
     forceDL: true,
     invertible: true,
     isCartesian: false,
     orderNodes: true,
+    noSharedTooltip: true,
     pointArrayMap: ['from', 'to'],
     pointClass: SankeyPoint,
-    searchPoint: H.noop,
-    setData: NodesMixin.setData
+    searchPoint: H.noop
 });
 SeriesRegistry.registerSeriesType('sankey', SankeySeries);
 /* *
@@ -892,16 +895,50 @@ export default SankeySeries;
 * @type {string}
 * @product highcharts
 */ /**
+* This option is deprecated, use
+* {@link Highcharts.SankeyNodeObject#offsetHorizontal} and
+* {@link Highcharts.SankeyNodeObject#offsetVertical} instead.
+*
 * The vertical offset of a node in terms of weight. Positive values shift the
 * node downwards, negative shift it upwards.
 *
+* If a percantage string is given, the node is offset by the percentage of the
+* node size plus `nodePadding`.
+*
 * @see {@link https://jsfiddle.net/gh/get/library/pure/highcharts/highcharts/tree/master/samples/highcharts/plotoptions/sankey-node-column/|Highcharts-Demo:}
 *         Specified node offset
 *
+* @deprecated
 * @name Highcharts.SankeyNodeObject#offset
-* @type {number}
+* @type {number|string}
 * @default 0
 * @since 6.0.5
+*/ /**
+* The horizontal offset of a node. Positive values shift the node right,
+* negative shift it left.
+*
+* If a percantage string is given, the node is offset by the percentage of the
+* node size.
+*
+* @see {@link https://jsfiddle.net/gh/get/library/pure/highcharts/highcharts/tree/master/samples/highcharts/plotoptions/sankey-node-column/|Highcharts-Demo:}
+*         Specified node offset
+*
+* @name Highcharts.SankeyNodeObject#offsetHorizontal
+* @type {number|string}
+* @since 9.3.0
+*/ /**
+* The vertical offset of a node. Positive values shift the node down,
+* negative shift it up.
+*
+* If a percantage string is given, the node is offset by the percentage of the
+* node size.
+*
+* @see {@link https://jsfiddle.net/gh/get/library/pure/highcharts/highcharts/tree/master/samples/highcharts/plotoptions/sankey-node-column/|Highcharts-Demo:}
+*         Specified node offset
+*
+* @name Highcharts.SankeyNodeObject#offsetVertical
+* @type {number|string}
+* @since 9.3.0
 */
 /**
  * Formatter callback function.
@@ -1028,6 +1065,10 @@ export default SankeySeries;
  * @apioption series.sankey.nodes.name
  */
 /**
+ * This option is deprecated, use
+ * [offsetHorizontal](#series.sankey.nodes.offsetHorizontal) and
+ * [offsetVertical](#series.sankey.nodes.offsetVertical) instead.
+ *
  * In a horizontal layout, the vertical offset of a node in terms of weight.
  * Positive values shift the node downwards, negative shift it upwards. In a
  * vertical layout, like organization chart, the offset is horizontal.
@@ -1035,15 +1076,43 @@ export default SankeySeries;
  * If a percantage string is given, the node is offset by the percentage of the
  * node size plus `nodePadding`.
  *
- * @sample highcharts/plotoptions/sankey-node-column/
- *         Specified node offset
- *
+ * @deprecated
  * @type      {number|string}
  * @default   0
  * @since     6.0.5
  * @product   highcharts
  * @apioption series.sankey.nodes.offset
  */
+/**
+ * The horizontal offset of a node. Positive values shift the node right,
+ * negative shift it left.
+ *
+ * If a percantage string is given, the node is offset by the percentage of the
+ * node size.
+ *
+ * @sample highcharts/plotoptions/sankey-node-column/
+ *         Specified node offset
+ *
+ * @type      {number|string}
+ * @since 9.3.0
+ * @product   highcharts
+ * @apioption series.sankey.nodes.offsetHorizontal
+ */
+/**
+ * The vertical offset of a node. Positive values shift the node down,
+ * negative shift it up.
+ *
+ * If a percantage string is given, the node is offset by the percentage of the
+ * node size.
+ *
+ * @sample highcharts/plotoptions/sankey-node-column/
+ *         Specified node offset
+ *
+ * @type      {number|string}
+ * @since 9.3.0
+ * @product   highcharts
+ * @apioption series.sankey.nodes.offsetVertical
+ */
 /**
  * An array of data points for the series. For the `sankey` series type,
  * points can be given in the following way:

package/es-modules/Series/Sunburst/SunburstPoint.js

@@ -25,6 +25,7 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
+import DrawPointComposition from '../DrawPointComposition.js';
 import SeriesRegistry from '../../Core/Series/SeriesRegistry.js';
 var Point = SeriesRegistry.series.prototype.pointClass, TreemapPoint = SeriesRegistry.seriesTypes.treemap.prototype.pointClass;
 import U from '../../Core/Utilities.js';
@@ -98,9 +99,6 @@ var SunburstPoint = /** @class */ (function (_super) {
     SunburstPoint.prototype.isValid = function () {
         return true;
     };
-    SunburstPoint.prototype.shouldDraw = function () {
-        return !this.isNull;
-    };
     return SunburstPoint;
 }(TreemapPoint));
 extend(SunburstPoint.prototype, {
@@ -108,6 +106,7 @@ extend(SunburstPoint.prototype, {
     haloPath: Point.prototype.haloPath,
     setState: Point.prototype.setState
 });
+DrawPointComposition.compose(SunburstPoint);
 /* *
  *
  *  Defaul Export

package/es-modules/Series/Sunburst/SunburstSeries.js

@@ -25,16 +25,16 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
-import CenteredSeriesMixin from '../../Mixins/CenteredSeries.js';
-var getCenter = CenteredSeriesMixin.getCenter, getStartAndEndRadians = CenteredSeriesMixin.getStartAndEndRadians;
+import CU from '../CenteredUtilities.js';
+var getCenter = CU.getCenter, getStartAndEndRadians = CU.getStartAndEndRadians;
 import H from '../../Core/Globals.js';
 var noop = H.noop;
 import SeriesRegistry from '../../Core/Series/SeriesRegistry.js';
 var Series = SeriesRegistry.series, _a = SeriesRegistry.seriesTypes, ColumnSeries = _a.column, TreemapSeries = _a.treemap;
 import SunburstPoint from './SunburstPoint.js';
 import SunburstUtilities from './SunburstUtilities.js';
-import TreeSeriesMixin from '../../Mixins/TreeSeries.js';
-var getColor = TreeSeriesMixin.getColor, getLevelOptions = TreeSeriesMixin.getLevelOptions, setTreeValues = TreeSeriesMixin.setTreeValues, updateRootId = TreeSeriesMixin.updateRootId;
+import TU from '../TreeUtilities.js';
+var getColor = TU.getColor, getLevelOptions = TU.getLevelOptions, setTreeValues = TU.setTreeValues, updateRootId = TU.updateRootId;
 import U from '../../Core/Utilities.js';
 var error = U.error, extend = U.extend, isNumber = U.isNumber, isObject = U.isObject, isString = U.isString, merge = U.merge, splat = U.splat;
 /* *

package/es-modules/Series/Tilemap/TilemapPoint.js

@@ -24,8 +24,7 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
-import ColorSeriesModule from '../../Mixins/ColorSeries.js';
-var colorPointMixin = ColorSeriesModule.colorPointMixin;
+import ColorAxisComposition from '../../Core/Axis/Color/ColorAxisComposition.js';
 import SeriesRegistry from '../../Core/Series/SeriesRegistry.js';
 var Point = SeriesRegistry.series.prototype.pointClass, HeatmapPoint = SeriesRegistry.seriesTypes.heatmap.prototype.pointClass;
 import U from '../../Core/Utilities.js';
@@ -70,7 +69,7 @@ var TilemapPoint = /** @class */ (function (_super) {
 }(HeatmapPoint));
 extend(TilemapPoint.prototype, {
     setState: Point.prototype.setState,
-    setVisible: colorPointMixin.setVisible
+    setVisible: ColorAxisComposition.pointSetVisible
 });
 /* *
  *

package/es-modules/Series/Timeline/TimelineSeries.js

@@ -26,7 +26,6 @@ var __extends = (this && this.__extends) || (function () {
     };
 })();
 import LegendSymbol from '../../Core/Legend/LegendSymbol.js';
-import palette from '../../Core/Color/Palette.js';
 import SeriesRegistry from '../../Core/Series/SeriesRegistry.js';
 var _a = SeriesRegistry.seriesTypes, ColumnSeries = _a.column, LineSeries = _a.line;
 import SVGElement from '../../Core/Renderer/SVG/SVGElement.js';
@@ -334,11 +333,11 @@ var TimelineSeries = /** @class */ (function (_super) {
              *         Alternate disabled
              */
             alternate: true,
-            backgroundColor: palette.backgroundColor,
+            backgroundColor: "#ffffff" /* backgroundColor */,
             borderWidth: 1,
-            borderColor: palette.neutralColor40,
+            borderColor: "#999999" /* neutralColor40 */,
             borderRadius: 3,
-            color: palette.neutralColor80,
+            color: "#333333" /* neutralColor80 */,
             /**
              * The color of the line connecting the data label to the point.
              * The default color is the same as the point's color.

package/es-modules/{Mixins/TreeSeries.js → Series/TreeUtilities.js}

@@ -1,4 +1,10 @@
 /* *
+ *
+ *  (c) 2014-2021 Highsoft AS
+ *
+ *  Authors: Jon Arild Nygard / Oystein Moseng
+ *
+ *  License: www.highcharts.com/license
  *
  *  !!!!!!! SOURCE GETS TRANSPILED BY TYPESCRIPT. EDIT TS FILE ONLY. !!!!!!!
  *
@@ -7,68 +13,31 @@
 import Color from '../Core/Color/Color.js';
 import U from '../Core/Utilities.js';
 var extend = U.extend, isArray = U.isArray, isNumber = U.isNumber, isObject = U.isObject, merge = U.merge, pick = U.pick;
-var isBoolean = function (x) {
-    return typeof x === 'boolean';
-}, isFn = function (x) {
-    return typeof x === 'function';
-};
+/* *
+ *
+ *  Functions
+ *
+ * */
 /* eslint-disable valid-jsdoc */
 /**
- * @todo Combine buildTree and buildNode with setTreeValues
- * @todo Remove logic from Treemap and make it utilize this mixin.
  * @private
  */
-var setTreeValues = function setTreeValues(tree, options) {
-    var before = options.before, idRoot = options.idRoot, mapIdToNode = options.mapIdToNode, nodeRoot = mapIdToNode[idRoot], levelIsConstant = (isBoolean(options.levelIsConstant) ?
-        options.levelIsConstant :
-        true), points = options.points, point = points[tree.i], optionsPoint = point && point.options || {}, childrenTotal = 0, children = [], value;
-    tree.levelDynamic = tree.level - (levelIsConstant ? 0 : nodeRoot.level);
-    tree.name = pick(point && point.name, '');
-    tree.visible = (idRoot === tree.id ||
-        (isBoolean(options.visible) ? options.visible : false));
-    if (isFn(before)) {
-        tree = before(tree, options);
-    }
-    // First give the children some values
-    tree.children.forEach(function (child, i) {
-        var newOptions = extend({}, options);
-        extend(newOptions, {
-            index: i,
-            siblings: tree.children.length,
-            visible: tree.visible
-        });
-        child = setTreeValues(child, newOptions);
-        children.push(child);
-        if (child.visible) {
-            childrenTotal += child.val;
-        }
-    });
-    // Set the values
-    value = pick(optionsPoint.value, childrenTotal);
-    tree.visible = value >= 0 && (childrenTotal > 0 || tree.visible);
-    tree.children = children;
-    tree.childrenTotal = childrenTotal;
-    tree.isLeaf = tree.visible && !childrenTotal;
-    tree.val = value;
-    return tree;
-};
-/**
- * @private
- */
-var getColor = function getColor(node, options) {
-    var index = options.index, mapOptionsToLevel = options.mapOptionsToLevel, parentColor = options.parentColor, parentColorIndex = options.parentColorIndex, series = options.series, colors = options.colors, siblings = options.siblings, points = series.points, getColorByPoint, chartOptionsChart = series.chart.options.chart, point, level, colorByPoint, colorIndexByPoint, color, colorIndex;
+function getColor(node, options) {
+    var index = options.index, mapOptionsToLevel = options.mapOptionsToLevel, parentColor = options.parentColor, parentColorIndex = options.parentColorIndex, series = options.series, colors = options.colors, siblings = options.siblings, points = series.points, chartOptionsChart = series.chart.options.chart;
+    var getColorByPoint, point, level, colorByPoint, colorIndexByPoint, color, colorIndex;
     /**
      * @private
      */
-    function variation(color) {
+    var variateColor = function (color) {
         var colorVariation = level && level.colorVariation;
-        if (colorVariation) {
-            if (colorVariation.key === 'brightness') {
-                return Color.parse(color).brighten(colorVariation.to * (index / siblings)).get();
-            }
+        if (colorVariation &&
+            colorVariation.key === 'brightness' &&
+            index &&
+            siblings) {
+            return Color.parse(color).brighten(colorVariation.to * (index / siblings)).get();
         }
         return color;
-    }
+    };
     if (node) {
         point = points[node.i];
         level = mapOptionsToLevel[node.level] || {};
@@ -81,7 +50,7 @@ var getColor = function getColor(node, options) {
         }
         // Select either point color, level color or inherited color.
         if (!series.chart.styledMode) {
-            color = pick(point && point.options.color, level && level.color, colorByPoint, parentColor && variation(parentColor), series.color);
+            color = pick(point && point.options.color, level && level.color, colorByPoint, parentColor && variateColor(parentColor), series.color);
         }
         colorIndex = pick(point && point.options.colorIndex, level && level.colorIndex, colorIndexByPoint, parentColorIndex, options.colorIndex);
     }
@@ -89,24 +58,25 @@ var getColor = function getColor(node, options) {
         color: color,
         colorIndex: colorIndex
     };
-};
+}
 /**
  * Creates a map from level number to its given options.
  *
  * @private
- * @function getLevelOptions
+ *
  * @param {object} params
- *        Object containing parameters.
- *        - `defaults` Object containing default options. The default options
- *           are merged with the userOptions to get the final options for a
- *           specific level.
- *        - `from` The lowest level number.
- *        - `levels` User options from series.levels.
- *        - `to` The highest level number.
+ * Object containing parameters.
+ * - `defaults` Object containing default options. The default options are
+ *   merged with the userOptions to get the final options for a specific
+ *   level.
+ * - `from` The lowest level number.
+ * - `levels` User options from series.levels.
+ * - `to` The highest level number.
+ *
  * @return {Highcharts.Dictionary<object>|null}
- *         Returns a map from level number to its given options.
+ * Returns a map from level number to its given options.
  */
-var getLevelOptions = function getLevelOptions(params) {
+function getLevelOptions(params) {
     var result = null, defaults, converted, i, from, to, levels;
     if (isObject(params)) {
         result = {};
@@ -119,16 +89,14 @@ var getLevelOptions = function getLevelOptions(params) {
                 var level, levelIsConstant, options;
                 if (isObject(item) && isNumber(item.level)) {
                     options = merge({}, item);
-                    levelIsConstant = (isBoolean(options.levelIsConstant) ?
-                        options.levelIsConstant :
-                        defaults.levelIsConstant);
+                    levelIsConstant = pick(options.levelIsConstant, defaults.levelIsConstant);
                     // Delete redundant properties.
                     delete options.levelIsConstant;
                     delete options.level;
                     // Calculate which level these options apply to.
                     level = item.level + (levelIsConstant ? 0 : from - 1);
                     if (isObject(obj[level])) {
-                        extend(obj[level], options);
+                        merge(true, obj[level], options); // #16329
                     }
                     else {
                         obj[level] = options;
@@ -143,21 +111,58 @@ var getLevelOptions = function getLevelOptions(params) {
         }
     }
     return result;
-};
+}
+/**
+ * @private
+ * @todo Combine buildTree and buildNode with setTreeValues
+ * @todo Remove logic from Treemap and make it utilize this mixin.
+ */
+function setTreeValues(tree, options) {
+    var before = options.before, idRoot = options.idRoot, mapIdToNode = options.mapIdToNode, nodeRoot = mapIdToNode[idRoot], levelIsConstant = (options.levelIsConstant !== false), points = options.points, point = points[tree.i], optionsPoint = point && point.options || {}, children = [];
+    var childrenTotal = 0;
+    tree.levelDynamic = tree.level - (levelIsConstant ? 0 : nodeRoot.level);
+    tree.name = pick(point && point.name, '');
+    tree.visible = (idRoot === tree.id ||
+        options.visible === true);
+    if (typeof before === 'function') {
+        tree = before(tree, options);
+    }
+    // First give the children some values
+    tree.children.forEach(function (child, i) {
+        var newOptions = extend({}, options);
+        extend(newOptions, {
+            index: i,
+            siblings: tree.children.length,
+            visible: tree.visible
+        });
+        child = setTreeValues(child, newOptions);
+        children.push(child);
+        if (child.visible) {
+            childrenTotal += child.val;
+        }
+    });
+    // Set the values
+    var value = pick(optionsPoint.value, childrenTotal);
+    tree.visible = value >= 0 && (childrenTotal > 0 || tree.visible);
+    tree.children = children;
+    tree.childrenTotal = childrenTotal;
+    tree.isLeaf = tree.visible && !childrenTotal;
+    tree.val = value;
+    return tree;
+}
 /**
  * Update the rootId property on the series. Also makes sure that it is
  * accessible to exporting.
  *
  * @private
- * @function updateRootId
  *
  * @param {object} series
- *        The series to operate on.
+ * The series to operate on.
  *
  * @return {string}
- *         Returns the resulting rootId after update.
+ * Returns the resulting rootId after update.
  */
-var updateRootId = function (series) {
+function updateRootId(series) {
     var rootId, options;
     if (isObject(series)) {
         // Get the series options.
@@ -172,11 +177,16 @@ var updateRootId = function (series) {
         series.rootNode = rootId;
     }
     return rootId;
-};
-var result = {
+}
+/* *
+ *
+ *  Default Export
+ *
+ * */
+var TreeUtilities = {
     getColor: getColor,
     getLevelOptions: getLevelOptions,
     setTreeValues: setTreeValues,
     updateRootId: updateRootId
 };
-export default result;
+export default TreeUtilities;

package/es-modules/Series/Treemap/TreemapPoint.js

@@ -23,7 +23,7 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
-import DrawPointMixin from '../../Mixins/DrawPoint.js';
+import DrawPointComposition from '../DrawPointComposition.js';
 import SeriesRegistry from '../../Core/Series/SeriesRegistry.js';
 var Point = SeriesRegistry.series.prototype.pointClass, _a = SeriesRegistry.seriesTypes, PiePoint = _a.pie.prototype.pointClass, ScatterPoint = _a.scatter.prototype.pointClass;
 import U from '../../Core/Utilities.js';
@@ -96,9 +96,9 @@ var TreemapPoint = /** @class */ (function (_super) {
     return TreemapPoint;
 }(ScatterPoint));
 extend(TreemapPoint.prototype, {
-    draw: DrawPointMixin.drawPoint,
     setVisible: PiePoint.prototype.setVisible
 });
+DrawPointComposition.compose(TreemapPoint);
 /* *
  *
  *  Default Export

package/es-modules/Series/Treemap/TreemapSeries.js

@@ -25,19 +25,18 @@ var __extends = (this && this.__extends) || (function () {
 })();
 import Color from '../../Core/Color/Color.js';
 var color = Color.parse;
-import ColorMapMixin from '../../Mixins/ColorMapSeries.js';
-var colorMapSeriesMixin = ColorMapMixin.colorMapSeriesMixin;
+import ColorMapComposition from '../ColorMapComposition.js';
+var colorMapSeriesMixin = ColorMapComposition.colorMapSeriesMixin;
 import H from '../../Core/Globals.js';
 var noop = H.noop;
 import LegendSymbol from '../../Core/Legend/LegendSymbol.js';
-import palette from '../../Core/Color/Palette.js';
 import SeriesRegistry from '../../Core/Series/SeriesRegistry.js';
 var Series = SeriesRegistry.series, _a = SeriesRegistry.seriesTypes, ColumnSeries = _a.column, HeatmapSeries = _a.heatmap, ScatterSeries = _a.scatter;
 import TreemapAlgorithmGroup from './TreemapAlgorithmGroup.js';
 import TreemapPoint from './TreemapPoint.js';
 import TreemapUtilities from './TreemapUtilities.js';
-import TreeSeriesMixin from '../../Mixins/TreeSeries.js';
-var getColor = TreeSeriesMixin.getColor, getLevelOptions = TreeSeriesMixin.getLevelOptions, updateRootId = TreeSeriesMixin.updateRootId;
+import TU from '../TreeUtilities.js';
+var getColor = TU.getColor, getLevelOptions = TU.getLevelOptions, updateRootId = TU.updateRootId;
 import U from '../../Core/Utilities.js';
 var addEvent = U.addEvent, correctFloat = U.correctFloat, defined = U.defined, error = U.error, extend = U.extend, fireEvent = U.fireEvent, isArray = U.isArray, isObject = U.isObject, isString = U.isString, merge = U.merge, pick = U.pick, stableSort = U.stableSort;
 import './TreemapComposition.js';
@@ -511,7 +510,7 @@ var TreemapSeries = /** @class */ (function (_super) {
         var series = this, setOptionsEvent;
         // If color series logic is loaded, add some properties
         if (colorMapSeriesMixin) {
-            this.colorAttribs = colorMapSeriesMixin.colorAttribs;
+            this.colorAttribs = ColorMapComposition.seriesColorAttribs;
         }
         setOptionsEvent = addEvent(series, 'setOptions', function (event) {
             var options = event.userOptions;
@@ -1305,7 +1304,7 @@ var TreemapSeries = /** @class */ (function (_super) {
          *
          * @type {Highcharts.ColorString}
          */
-        borderColor: palette.neutralColor10,
+        borderColor: "#e6e6e6" /* neutralColor10 */,
         /**
          * The width of the border surrounding each tree map item.
          */
@@ -1334,7 +1333,7 @@ var TreemapSeries = /** @class */ (function (_super) {
                 /**
                  * The border color for the hovered state.
                  */
-                borderColor: palette.neutralColor40,
+                borderColor: "#999999" /* neutralColor40 */,
                 /**
                  * Brightness for the hovered point. Defaults to 0 if the
                  * heatmap series is loaded first, otherwise 0.1.
@@ -1379,6 +1378,7 @@ extend(TreemapSeries.prototype, {
         recursive: TreemapUtilities.recursive
     }
 });
+ColorMapComposition.compose(TreemapSeries);
 SeriesRegistry.registerSeriesType('treemap', TreemapSeries);
 /* *
  *