highcharts 10.2.1 → 10.3.1

package/modules/organization.src.js

@@ -1,5 +1,5 @@
 /**
- * @license Highcharts JS v10.2.1 (2022-08-29)
+ * @license Highcharts JS v10.3.1 (2022-10-31)
  * Organization chart series type
  *
  * (c) 2019-2021 Torstein Honsi
@@ -111,14 +111,12 @@
                 _this.series = void 0;
                 _this.toNode = void 0;
                 return _this;
-                /* eslint-enable valid-jsdoc */
             }
             /* *
              *
              *  Functions
              *
              * */
-            /* eslint-disable valid-jsdoc */
             /**
              * All nodes in an org chart are equal width.
              * @private
@@ -178,9 +176,521 @@
          *
          * */
 
-        return OrganizationPoint;
+        return OrganizationPoint;
+    });
+    _registerModule(_modules, 'Series/Organization/OrganizationSeriesDefaults.js', [], function () {
+        /* *
+         *
+         *  Organization chart module
+         *
+         *  (c) 2018-2021 Torstein Honsi
+         *
+         *  License: www.highcharts.com/license
+         *
+         *  !!!!!!! SOURCE GETS TRANSPILED BY TYPESCRIPT. EDIT TS FILE ONLY. !!!!!!!
+         *
+         * */
+        /* *
+         *
+         *  API Options
+         *
+         * */
+        /**
+         * An organization chart is a diagram that shows the structure of an
+         * organization and the relationships and relative ranks of its parts and
+         * positions.
+         *
+         * @sample       highcharts/demo/organization-chart/
+         *               Organization chart
+         * @sample       highcharts/series-organization/horizontal/
+         *               Horizontal organization chart
+         * @sample       highcharts/series-organization/borderless
+         *               Borderless design
+         * @sample       highcharts/series-organization/center-layout
+         *               Centered layout
+         *
+         * @extends      plotOptions.sankey
+         * @excluding    allowPointSelect, curveFactor, dataSorting
+         * @since        7.1.0
+         * @product      highcharts
+         * @requires     modules/organization
+         * @optionparent plotOptions.organization
+         */
+        var OrganizationSeriesDefaults = {
+                /**
+                 * The border color of the node cards.
+                 *
+                 * @type {Highcharts.ColorString}
+                 */
+                borderColor: "#666666" /* Palette.neutralColor60 */,
+                /**
+                 * The border radius of the node cards.
+                 *
+                 * @private
+                 */
+                borderRadius: 3,
+                /**
+                 * Radius for the rounded corners of the links between nodes. This
+                 * option is now deprecated,
+            and moved to
+                 * [link.radius](#plotOptions.organization.link.radius).
+                 *
+                 * @sample   highcharts/series-organization/link-options
+                 *           Square links
+                 *
+                 * @deprecated
+                 * @apioption series.organization.linkRadius
+                 */
+                /**
+                 * Link Styling options
+                 * @since 10.3.0
+                 * @product highcharts
+                 */
+                link: {
+                    /**
+                     * Modifier of the shape of the curved link. Works best for values
+                     * between 0 and 1,
+            where 0 is a straight line,
+            and 1 is a shape
+                     * close to the default one.
+                     *
+                     * @default 0.5
+                     * @type {number}
+                     * @since 10.3.0
+                     * @product highcharts
+                     * @apioption series.organization.link.offset
+                     */
+                    /**
+                     * The color of the links between nodes.
+                     *
+                     * @type {Highcharts.ColorString}
+                     */
+                    color: "#666666" /* Palette.neutralColor60 */,
+                    /**
+                     * The line width of the links connecting nodes,
+            in pixels.
+                     *
+                     * @sample   highcharts/series-organization/link-options
+                     *           Square links
+                     */
+                    lineWidth: 1,
+                    /**
+                     * Radius for the rounded corners of the links between nodes.
+                     * Works for `default` link type.
+                     *
+                     * @sample   highcharts/series-organization/link-options
+                     *           Square links
+                     */
+                    radius: 10,
+                    /**
+                     * Type of the link shape.
+                     *
+                     * @sample   highcharts/series-organization/different-link-types
+                     *           Different link types
+                     *
+                     * @declare Highcharts.OrganizationLinkTypeValue
+                     * @type {'default' | 'curved' | 'straight'}
+                     * @default 'default'
+                     * @product highcharts
+                     */
+                    type: 'default'
+                },
+                borderWidth: 1,
+                /**
+                 * @declare Highcharts.SeriesOrganizationDataLabelsOptionsObject
+                 *
+                 * @private
+                 */
+                dataLabels: {
+                    /* eslint-disable valid-jsdoc */
+                    /**
+                     * A callback for defining the format for _nodes_ in the
+                     * organization chart. The `nodeFormat` option takes precedence
+                     * over `nodeFormatter`.
+                     *
+                     * In an organization chart,
+            the `nodeFormatter` is a quite complex
+                     * function of the available options,
+            striving for a good default
+                     * layout of cards with or without images. In organization chart,
+                     * the data labels come with `useHTML` set to true,
+            meaning they
+                     * will be rendered as true HTML above the SVG.
+                     *
+                     * @sample highcharts/series-organization/datalabels-nodeformatter
+                     *         Modify the default label format output
+                     *
+                     * @type  {Highcharts.SeriesSankeyDataLabelsFormatterCallbackFunction}
+                     * @since 6.0.2
+                     */
+                    nodeFormatter: function () {
+                        var outerStyle = {
+                            width: '100%',
+                            height: '100%',
+                            display: 'flex',
+                            'flex-direction': 'row',
+                            'align-items': 'center',
+                            'justify-content': 'center'
+                        },
+            imageStyle = {
+                            'max-height': '100%',
+                            'border-radius': '50%'
+                        },
+            innerStyle = {
+                            width: '100%',
+                            padding: 0,
+                            'text-align': 'center',
+                            'white-space': 'normal'
+                        },
+            nameStyle = {
+                            margin: 0
+                        },
+            titleStyle = {
+                            margin: 0
+                        },
+            descriptionStyle = {
+                            opacity: 0.75,
+                            margin: '5px'
+                        };
+                    // eslint-disable-next-line valid-jsdoc
+                    /**
+                     * @private
+                     */
+                    function styleAttr(style) {
+                        return Object.keys(style).reduce(function (str, key) {
+                            return str + key + ':' + style[key] + ';';
+                        }, 'style="') + '"';
+                    }
+                    var _a = this.point,
+                        description = _a.description,
+                        image = _a.image,
+                        title = _a.title;
+                    if (image) {
+                        imageStyle['max-width'] = '30%';
+                        innerStyle.width = '70%';
+                    }
+                    // PhantomJS doesn't support flex, roll back to absolute
+                    // positioning
+                    if (this
+                        .series.chart.renderer.forExport) {
+                        outerStyle.display = 'block';
+                        innerStyle.position = 'absolute';
+                        innerStyle.left = image ? '30%' : 0;
+                        innerStyle.top = 0;
+                    }
+                    var html = '<div ' + styleAttr(outerStyle) + '>';
+                    if (image) {
+                        html += '<img src="' + image + '" ' +
+                            styleAttr(imageStyle) + '>';
+                    }
+                    html += '<div ' + styleAttr(innerStyle) + '>';
+                    if (this.point.name) {
+                        html += '<h4 ' + styleAttr(nameStyle) + '>' +
+                            this.point.name + '</h4>';
+                    }
+                    if (title) {
+                        html += '<p ' + styleAttr(titleStyle) + '>' +
+                            (title || '') + '</p>';
+                    }
+                    if (description) {
+                        html += '<p ' + styleAttr(descriptionStyle) + '>' +
+                            description + '</p>';
+                    }
+                    html += '</div>' +
+                        '</div>';
+                    return html;
+                },
+                /* eslint-enable valid-jsdoc */
+                style: {
+                    /** @internal */
+                    fontWeight: 'normal',
+                    /** @internal */
+                    fontSize: '13px'
+                },
+                useHTML: true
+            },
+            /**
+             * The indentation in pixels of hanging nodes, nodes which parent has
+             * [layout](#series.organization.nodes.layout) set to `hanging`.
+             *
+             * @private
+             */
+            hangingIndent: 20,
+            /**
+             * Defines the indentation of a `hanging` layout parent's children.
+             * Possible options:
+             *
+             * - `inherit` (default): Only the first child adds the indentation,
+             * children of a child with indentation inherit the indentation.
+             * - `cumulative`: All children of a child with indentation add its
+             * own indent. The option may cause overlapping of nodes.
+             * Then use `shrink` option:
+             * - `shrink`: Nodes shrink by the
+             * [hangingIndent](#plotOptions.organization.hangingIndent)
+             * value until they reach the
+             * [minNodeLength](#plotOptions.organization.minNodeLength).
+             *
+             * @sample highcharts/series-organization/hanging-cumulative
+             *         Every indent increases the indentation
+             *
+             * @sample highcharts/series-organization/hanging-shrink
+             *         Every indent decreases the nodes' width
+             *
+             * @type {Highcharts.OrganizationHangingIndentTranslationValue}
+             * @since 10.0.0
+             * @default inherit
+             *
+             * @private
+             */
+            hangingIndentTranslation: 'inherit',
+            /**
+             *
+             * The color of the links between nodes. This option is moved to
+             * [link.color](#plotOptions.organization.link.color).
+             *
+             * @type {Highcharts.ColorString}
+             * @deprecated
+             * @apioption series.organization.linkColor
+             * @private
+             */
+            /**
+             * The line width of the links connecting nodes, in pixels. This option
+             * is now deprecated and moved to the
+             * [link.radius](#plotOptions.organization.link.lineWidth).
+             *
+             * @sample   highcharts/series-organization/link-options
+             *           Square links
+             *
+             * @deprecated
+             * @apioption series.organization.linkLineWidth
+             * @private
+             */
+            /**
+             * In a horizontal chart, the minimum width of the **hanging** nodes
+             * only, in pixels. In a vertical chart, the minimum height of the
+             * **haning** nodes only, in pixels too.
+             *
+             * Note: Used only when
+             * [hangingIndentTranslation](#plotOptions.organization.hangingIndentTranslation)
+             * is set to `shrink`.
+             *
+             * @see [nodeWidth](#plotOptions.organization.nodeWidth)
+             *
+             * @private
+             */
+            minNodeLength: 10,
+            /**
+             * In a horizontal chart, the width of the nodes in pixels. Note that
+             * most organization charts are vertical, so the name of this option
+             * is counterintuitive.
+             *
+             * @see [minNodeLength](#plotOptions.organization.minNodeLength)
+             *
+             * @private
+             */
+            nodeWidth: 50,
+            tooltip: {
+                nodeFormat: '{point.name}<br>{point.title}<br>{point.description}'
+            }
+        };
+        /**
+         * An `organization` series. If the [type](#series.organization.type) option is
+         * not specified, it is inherited from [chart.type](#chart.type).
+         *
+         * @extends   series,plotOptions.organization
+         * @exclude   dataSorting, boostThreshold, boostBlending
+         * @product   highcharts
+         * @requires  modules/sankey
+         * @requires  modules/organization
+         * @apioption series.organization
+         */
+        /**
+         * @type      {Highcharts.SeriesOrganizationDataLabelsOptionsObject|Array<Highcharts.SeriesOrganizationDataLabelsOptionsObject>}
+         * @product   highcharts
+         * @apioption series.organization.data.dataLabels
+         */
+        /**
+         * A collection of options for the individual nodes. The nodes in an org chart
+         * are auto-generated instances of `Highcharts.Point`, but options can be
+         * applied here and linked by the `id`.
+         *
+         * @extends   series.sankey.nodes
+         * @type      {Array<*>}
+         * @product   highcharts
+         * @apioption series.organization.nodes
+         */
+        /**
+         * Individual data label for each node. The options are the same as
+         * the ones for [series.organization.dataLabels](#series.organization.dataLabels).
+         *
+         * @type    {Highcharts.SeriesOrganizationDataLabelsOptionsObject|Array<Highcharts.SeriesOrganizationDataLabelsOptionsObject>}
+         *
+         * @apioption series.organization.nodes.dataLabels
+         */
+        /**
+         * The job description for the node card, will be inserted by the default
+         * `dataLabel.nodeFormatter`.
+         *
+         * @sample highcharts/demo/organization-chart
+         *         Org chart with job descriptions
+         *
+         * @type      {string}
+         * @product   highcharts
+         * @apioption series.organization.nodes.description
+         */
+        /**
+         * An image for the node card, will be inserted by the default
+         * `dataLabel.nodeFormatter`.
+         *
+         * @sample highcharts/demo/organization-chart
+         *         Org chart with images
+         *
+         * @type      {string}
+         * @product   highcharts
+         * @apioption series.organization.nodes.image
+         */
+        /**
+         * Layout for the node's children. If `hanging`, this node's children will hang
+         * below their parent, allowing a tighter packing of nodes in the diagram.
+         *
+         * Note: Since @next version, the `hanging` layout is set by default for
+         * children of a parent using `hanging` layout.
+         *
+         * @sample highcharts/demo/organization-chart
+         *         Hanging layout
+         *
+         * @type      {Highcharts.SeriesOrganizationNodesLayoutValue}
+         * @default   normal
+         * @product   highcharts
+         * @apioption series.organization.nodes.layout
+         */
+        /**
+         * The job title for the node card, will be inserted by the default
+         * `dataLabel.nodeFormatter`.
+         *
+         * @sample highcharts/demo/organization-chart
+         *         Org chart with job titles
+         *
+         * @type      {string}
+         * @product   highcharts
+         * @apioption series.organization.nodes.title
+         */
+        /**
+         * An array of data points for the series. For the `organization` series
+         * type, points can be given in the following way:
+         *
+         * An array of objects with named values. The following snippet shows only a
+         * few settings, see the complete options set below. If the total number of data
+         * points exceeds the series' [turboThreshold](#series.area.turboThreshold),
+         * this option is not available.
+         *
+         *  ```js
+         *     data: [{
+         *         from: 'Category1',
+         *         to: 'Category2',
+         *         weight: 2
+         *     }, {
+         *         from: 'Category1',
+         *         to: 'Category3',
+         *         weight: 5
+         *     }]
+         *  ```
+         *
+         * @type      {Array<*>}
+         * @extends   series.sankey.data
+         * @product   highcharts
+         * @apioption series.organization.data
+         */
+        ''; // keeps doclets above in JS file
+        /* *
+         *
+         *  Default Export
+         *
+         * */
+
+        return OrganizationSeriesDefaults;
+    });
+    _registerModule(_modules, 'Series/PathUtilities.js', [], function () {
+        /* *
+         *
+         *  (c) 2010-2022 Pawel Lysy
+         *
+         *  License: www.highcharts.com/license
+         *
+         *  !!!!!!! SOURCE GETS TRANSPILED BY TYPESCRIPT. EDIT TS FILE ONLY. !!!!!!!
+         *
+         * */
+        /* *
+         *
+         *  Functions
+         *
+         * */
+        /**
+         * General function to apply corner radius to a path
+         * @private
+         */
+        function curvedPath(path, r) {
+            var d = [];
+            for (var i = 0; i < path.length; i++) {
+                var x = path[i][1];
+                var y = path[i][2];
+                if (typeof x === 'number' && typeof y === 'number') {
+                    // moveTo
+                    if (i === 0) {
+                        d.push(['M', x, y]);
+                    }
+                    else if (i === path.length - 1) {
+                        d.push(['L', x, y]);
+                        // curveTo
+                    }
+                    else if (r) {
+                        var prevSeg = path[i - 1];
+                        var nextSeg = path[i + 1];
+                        if (prevSeg && nextSeg) {
+                            var x1 = prevSeg[1],
+                                y1 = prevSeg[2],
+                                x2 = nextSeg[1],
+                                y2 = nextSeg[2];
+                            // Only apply to breaks
+                            if (typeof x1 === 'number' &&
+                                typeof x2 === 'number' &&
+                                typeof y1 === 'number' &&
+                                typeof y2 === 'number' &&
+                                x1 !== x2 &&
+                                y1 !== y2) {
+                                var directionX = x1 < x2 ? 1 : -1,
+                                    directionY = y1 < y2 ? 1 : -1;
+                                d.push([
+                                    'L',
+                                    x - directionX * Math.min(Math.abs(x - x1), r),
+                                    y - directionY * Math.min(Math.abs(y - y1), r)
+                                ], [
+                                    'C',
+                                    x,
+                                    y,
+                                    x,
+                                    y,
+                                    x + directionX * Math.min(Math.abs(x - x2), r),
+                                    y + directionY * Math.min(Math.abs(y - y2), r)
+                                ]);
+                            }
+                        }
+                        // lineTo
+                    }
+                    else {
+                        d.push(['L', x, y]);
+                    }
+                }
+            }
+            return d;
+        }
+        var PathUtilities = {
+                curvedPath: curvedPath
+            };
+
+        return PathUtilities;
     });
-    _registerModule(_modules, 'Series/Organization/OrganizationSeries.js', [_modules['Series/Organization/OrganizationPoint.js'], _modules['Core/Series/SeriesRegistry.js'], _modules['Core/Utilities.js']], function (OrganizationPoint, SeriesRegistry, U) {
+    _registerModule(_modules, 'Series/Organization/OrganizationSeries.js', [_modules['Series/Organization/OrganizationPoint.js'], _modules['Series/Organization/OrganizationSeriesDefaults.js'], _modules['Core/Series/SeriesRegistry.js'], _modules['Series/PathUtilities.js'], _modules['Core/Utilities.js']], function (OrganizationPoint, OrganizationSeriesDefaults, SeriesRegistry, PathUtilities, U) {
         /* *
          *
          *  Organization chart module
@@ -212,8 +722,7 @@
         var css = U.css,
             extend = U.extend,
             merge = U.merge,
-            pick = U.pick,
-            wrap = U.wrap;
+            pick = U.pick;
         /* *
          *
          *  Class
@@ -236,7 +745,11 @@
                  * */
                 var _this = _super !== null && _super.apply(this,
                     arguments) || this;
-                /* eslint-enable valid-jsdoc */
+                /* *
+                 *
+                 *  Static Functions
+                 *
+                 * */
                 /* *
                  *
                  *  Properties
@@ -248,72 +761,6 @@
                 return _this;
                 /* eslint-enable valid-jsdoc */
             }
-            /* *
-             *
-             *  Static Functions
-             *
-             * */
-            /* eslint-disable valid-jsdoc */
-            /**
-             * General function to apply corner radius to a path - can be lifted to
-             * renderer or utilities if we need it elsewhere.
-             * @private
-             */
-            OrganizationSeries.curvedPath = function (path, r) {
-                var d = [];
-                for (var i = 0; i < path.length; i++) {
-                    var x = path[i][1];
-                    var y = path[i][2];
-                    if (typeof x === 'number' && typeof y === 'number') {
-                        // moveTo
-                        if (i === 0) {
-                            d.push(['M', x, y]);
-                        }
-                        else if (i === path.length - 1) {
-                            d.push(['L', x, y]);
-                            // curveTo
-                        }
-                        else if (r) {
-                            var prevSeg = path[i - 1];
-                            var nextSeg = path[i + 1];
-                            if (prevSeg && nextSeg) {
-                                var x1 = prevSeg[1],
-                                    y1 = prevSeg[2],
-                                    x2 = nextSeg[1],
-                                    y2 = nextSeg[2];
-                                // Only apply to breaks
-                                if (typeof x1 === 'number' &&
-                                    typeof x2 === 'number' &&
-                                    typeof y1 === 'number' &&
-                                    typeof y2 === 'number' &&
-                                    x1 !== x2 &&
-                                    y1 !== y2) {
-                                    var directionX = x1 < x2 ? 1 : -1,
-                                        directionY = y1 < y2 ? 1 : -1;
-                                    d.push([
-                                        'L',
-                                        x - directionX * Math.min(Math.abs(x - x1), r),
-                                        y - directionY * Math.min(Math.abs(y - y1), r)
-                                    ], [
-                                        'C',
-                                        x,
-                                        y,
-                                        x,
-                                        y,
-                                        x + directionX * Math.min(Math.abs(x - x2), r),
-                                        y + directionY * Math.min(Math.abs(y - y2), r)
-                                    ]);
-                                }
-                            }
-                            // lineTo
-                        }
-                        else {
-                            d.push(['L', x, y]);
-                        }
-                    }
-                }
-                return d;
-            };
             /* *
              *
              *  Functions
@@ -322,14 +769,15 @@
             /* eslint-disable valid-jsdoc */
             OrganizationSeries.prototype.alignDataLabel = function (point, dataLabel, options) {
                 // Align the data label to the point graphic
-                if (options.useHTML) {
-                    var width_1 = point.shapeArgs.width,
-                        height_1 = point.shapeArgs.height,
+                var shapeArgs = point.shapeArgs;
+                if (options.useHTML && shapeArgs) {
+                    var width_1 = shapeArgs.width || 0,
+                        height_1 = shapeArgs.height || 0,
                         padjust = (this.options.borderWidth +
                             2 * this.options.dataLabels.padding);
                     if (this.chart.inverted) {
                         width_1 = height_1;
-                        height_1 = point.shapeArgs.width;
+                        height_1 = shapeArgs.width || 0;
                     }
                     height_1 -= padjust;
                     width_1 -= padjust;
@@ -351,12 +799,7 @@
                     }
                     // The getBBox function is used in `alignDataLabel` to align
                     // inside the box
-                    dataLabel.getBBox = function () {
-                        return {
-                            width: width_1,
-                            height: height_1
-                        };
-                    };
+                    dataLabel.getBBox = function () { return ({ width: width_1, height: height_1, x: 0, y: 0 }); };
                     // Overwrite dataLabel dimensions (#13100).
                     dataLabel.width = width_1;
                     dataLabel.height = height_1;
@@ -367,27 +810,57 @@
                 var node = _super.prototype.createNode.call(this,
                     id);
                 // All nodes in an org chart are equal width
-                node.getSum = function () {
-                    return 1;
-                };
+                node.getSum = function () { return 1; };
                 return node;
             };
             OrganizationSeries.prototype.pointAttribs = function (point, state) {
-                var series = this, attribs = SankeySeries.prototype.pointAttribs.call(series, point, state), level = point.isNode ? point.level : point.fromNode.level, levelOptions = series.mapOptionsToLevel[level || 0] || {}, options = point.options, stateOptions = (levelOptions.states &&
-                        levelOptions.states[state]) || {}, values = ['borderRadius', 'linkColor', 'linkLineWidth', 'linkOpacity']
-                        .reduce(function (obj, key) {
-                        obj[key] = pick(stateOptions[key], options[key], levelOptions[key], series.options[key]);
-                    return obj;
-                }, {});
+                var series = this,
+                    attribs = SankeySeries.prototype.pointAttribs.call(series,
+                    point,
+                    state),
+                    level = point.isNode ? point.level : point.fromNode.level,
+                    levelOptions = series.mapOptionsToLevel[level || 0] || {},
+                    options = point.options,
+                    stateOptions = (levelOptions.states &&
+                        levelOptions.states[state]) ||
+                        {},
+                    borderRadius = pick(stateOptions.borderRadius,
+                    options.borderRadius,
+                    levelOptions.borderRadius,
+                    series.options.borderRadius),
+                    linkColor = pick(stateOptions.linkColor,
+                    options.linkColor,
+                    levelOptions.linkColor,
+                    series.options.linkColor,
+                    stateOptions.link && stateOptions.link.color,
+                    options.link && options.link.color,
+                    levelOptions.link && levelOptions.link.color,
+                    series.options.link && series.options.link.color),
+                    linkLineWidth = pick(stateOptions.linkLineWidth,
+                    options.linkLineWidth,
+                    levelOptions.linkLineWidth,
+                    series.options.linkLineWidth,
+                    stateOptions.link && stateOptions.link.lineWidth,
+                    options.link && options.link.lineWidth,
+                    levelOptions.link && levelOptions.link.lineWidth,
+                    series.options.link && series.options.link.lineWidth),
+                    linkOpacity = pick(stateOptions.linkOpacity,
+                    options.linkOpacity,
+                    levelOptions.linkOpacity,
+                    series.options.linkOpacity,
+                    stateOptions.link && stateOptions.link.linkOpacity,
+                    options.link && options.link.linkOpacity,
+                    levelOptions.link && levelOptions.link.linkOpacity,
+                    series.options.link && series.options.link.linkOpacity);
                 if (!point.isNode) {
-                    attribs.stroke = values.linkColor;
-                    attribs['stroke-width'] = values.linkLineWidth;
-                    attribs.opacity = values.linkOpacity;
+                    attribs.stroke = linkColor;
+                    attribs['stroke-width'] = linkLineWidth;
+                    attribs.opacity = linkOpacity;
                     delete attribs.fill;
                 }
                 else {
-                    if (values.borderRadius) {
-                        attribs.r = values.borderRadius;
+                    if (borderRadius) {
+                        attribs.r = borderRadius;
                     }
                 }
                 return attribs;
@@ -395,62 +868,98 @@
             OrganizationSeries.prototype.translateLink = function (point) {
                 var fromNode = point.fromNode,
                     toNode = point.toNode,
-                    crisp = Math.round(this.options.linkLineWidth) % 2 / 2,
-                    x1 = Math.floor(fromNode.shapeArgs.x +
-                        fromNode.shapeArgs.width) + crisp,
-                    y1 = Math.floor(fromNode.shapeArgs.y +
-                        fromNode.shapeArgs.height / 2) + crisp,
-                    x2 = Math.floor(toNode.shapeArgs.x) + crisp,
-                    y2 = Math.floor(toNode.shapeArgs.y +
-                        toNode.shapeArgs.height / 2) + crisp,
-                    xMiddle,
-                    hangingIndent = this.options.hangingIndent,
-                    toOffset = toNode.options.offset,
-                    percentOffset = /%$/.test(toOffset) && parseInt(toOffset, 10),
-                    inverted = this.chart.inverted;
-                if (inverted) {
-                    x1 -= fromNode.shapeArgs.width;
-                    x2 += toNode.shapeArgs.width;
-                }
-                xMiddle = Math.floor(x2 +
-                    (inverted ? 1 : -1) *
-                        (this.colDistance - this.nodeWidth) / 2) + crisp;
-                // Put the link on the side of the node when an offset is given. HR
-                // node in the main demo.
-                if (percentOffset &&
-                    (percentOffset >= 50 || percentOffset <= -50)) {
-                    xMiddle = x2 = Math.floor(x2 + (inverted ? -0.5 : 0.5) *
-                        toNode.shapeArgs.width) + crisp;
-                    y2 = toNode.shapeArgs.y;
-                    if (percentOffset > 0) {
-                        y2 += toNode.shapeArgs.height;
+                    linkWidth = pick(this.options.linkLineWidth,
+                    this.options.link.lineWidth),
+                    crisp = (Math.round(linkWidth) % 2) / 2,
+                    factor = pick(this.options.link.offset, 0.5),
+                    type = pick(point.options.link && point.options.link.type,
+                    this.options.link.type);
+                if (fromNode.shapeArgs && toNode.shapeArgs) {
+                    var x1 = Math.floor((fromNode.shapeArgs.x || 0) +
+                            (fromNode.shapeArgs.width || 0)) + crisp,
+                        y1 = Math.floor((fromNode.shapeArgs.y || 0) +
+                            (fromNode.shapeArgs.height || 0) / 2) + crisp,
+                        x2 = Math.floor(toNode.shapeArgs.x || 0) + crisp,
+                        y2 = Math.floor((toNode.shapeArgs.y || 0) +
+                            (toNode.shapeArgs.height || 0) / 2) + crisp,
+                        xMiddle = void 0,
+                        hangingIndent = this.options.hangingIndent,
+                        toOffset = toNode.options.offset,
+                        percentOffset = /%$/.test(toOffset) && parseInt(toOffset, 10),
+                        inverted = this.chart.inverted;
+                    if (inverted) {
+                        x1 -= (fromNode.shapeArgs.width || 0);
+                        x2 += (toNode.shapeArgs.width || 0);
                     }
-                }
-                if (toNode.hangsFrom === fromNode) {
-                    if (this.chart.inverted) {
-                        y1 = Math.floor(fromNode.shapeArgs.y +
-                            fromNode.shapeArgs.height -
-                            hangingIndent / 2) + crisp;
-                        y2 = (toNode.shapeArgs.y +
-                            toNode.shapeArgs.height);
+                    xMiddle = this.colDistance ?
+                        Math.floor(x2 +
+                            ((inverted ? 1 : -1) *
+                                (this.colDistance - this.nodeWidth)) /
+                                2) + crisp :
+                        Math.floor((x2 + x1) / 2) + crisp;
+                    // Put the link on the side of the node when an offset is given. HR
+                    // node in the main demo.
+                    if (percentOffset &&
+                        (percentOffset >= 50 || percentOffset <= -50)) {
+                        xMiddle = x2 = Math.floor(x2 + (inverted ? -0.5 : 0.5) *
+                            (toNode.shapeArgs.width || 0)) + crisp;
+                        y2 = toNode.shapeArgs.y || 0;
+                        if (percentOffset > 0) {
+                            y2 += toNode.shapeArgs.height || 0;
+                        }
+                    }
+                    if (toNode.hangsFrom === fromNode) {
+                        if (this.chart.inverted) {
+                            y1 = Math.floor((fromNode.shapeArgs.y || 0) +
+                                (fromNode.shapeArgs.height || 0) -
+                                hangingIndent / 2) + crisp;
+                            y2 = ((toNode.shapeArgs.y || 0) +
+                                (toNode.shapeArgs.height || 0));
+                        }
+                        else {
+                            y1 = Math.floor((fromNode.shapeArgs.y || 0) +
+                                hangingIndent / 2) + crisp;
+                        }
+                        xMiddle = x2 = Math.floor((toNode.shapeArgs.x || 0) +
+                            (toNode.shapeArgs.width || 0) / 2) + crisp;
+                    }
+                    point.plotX = xMiddle;
+                    point.plotY = (y1 + y2) / 2;
+                    point.shapeType = 'path';
+                    if (type === 'straight') {
+                        point.shapeArgs = {
+                            d: [
+                                ['M', x1, y1],
+                                ['L', x2, y2]
+                            ]
+                        };
+                    }
+                    else if (type === 'curved') {
+                        var offset = Math.abs(x2 - x1) * factor * (inverted ? -1 : 1);
+                        point.shapeArgs = {
+                            d: [
+                                ['M', x1, y1],
+                                ['C', x1 + offset, y1, x2 - offset, y2, x2, y2]
+                            ]
+                        };
                     }
                     else {
-                        y1 = Math.floor(fromNode.shapeArgs.y +
-                            hangingIndent / 2) + crisp;
+                        point.shapeArgs = {
+                            d: PathUtilities.curvedPath([
+                                ['M', x1, y1],
+                                ['L', xMiddle, y1],
+                                ['L', xMiddle, y2],
+                                ['L', x2, y2]
+                            ], pick(this.options.linkRadius, this.options.link.radius))
+                        };
                     }
-                    xMiddle = x2 = Math.floor(toNode.shapeArgs.x +
-                        toNode.shapeArgs.width / 2) + crisp;
+                    point.dlBox = {
+                        x: (x1 + x2) / 2,
+                        y: (y1 + y2) / 2,
+                        height: linkWidth,
+                        width: 0
+                    };
                 }
-                point.plotY = 1;
-                point.shapeType = 'path';
-                point.shapeArgs = {
-                    d: OrganizationSeries.curvedPath([
-                        ['M', x1, y1],
-                        ['L', xMiddle, y1],
-                        ['L', xMiddle, y2],
-                        ['L', x2, y2]
-                    ], this.options.linkRadius)
-                };
             };
             OrganizationSeries.prototype.translateNode = function (node, column) {
                 SankeySeries.prototype.translateNode.call(this, node, column);
@@ -491,238 +1000,7 @@
                     shapeArgs.width :
                     shapeArgs.height;
             };
-            /**
-             * An organization chart is a diagram that shows the structure of an
-             * organization and the relationships and relative ranks of its parts and
-             * positions.
-             *
-             * @sample       highcharts/demo/organization-chart/
-             *               Organization chart
-             * @sample       highcharts/series-organization/horizontal/
-             *               Horizontal organization chart
-             * @sample       highcharts/series-organization/borderless
-             *               Borderless design
-             * @sample       highcharts/series-organization/center-layout
-             *               Centered layout
-             *
-             * @extends      plotOptions.sankey
-             * @excluding    allowPointSelect, curveFactor, dataSorting
-             * @since        7.1.0
-             * @product      highcharts
-             * @requires     modules/organization
-             * @optionparent plotOptions.organization
-             *
-             * @private
-             */
-            OrganizationSeries.defaultOptions = merge(SankeySeries.defaultOptions, {
-                /**
-                 * The border color of the node cards.
-                 *
-                 * @type {Highcharts.ColorString}
-                 *
-                 * @private
-                 */
-                borderColor: "#666666" /* Palette.neutralColor60 */,
-                /**
-                 * The border radius of the node cards.
-                 *
-                 * @private
-                 */
-                borderRadius: 3,
-                /**
-                 * Radius for the rounded corners of the links between nodes.
-                 *
-                 * @sample   highcharts/series-organization/link-options
-                 *           Square links
-                 *
-                 * @private
-                 */
-                linkRadius: 10,
-                borderWidth: 1,
-                /**
-                 * @declare Highcharts.SeriesOrganizationDataLabelsOptionsObject
-                 *
-                 * @private
-                 */
-                dataLabels: {
-                    /* eslint-disable valid-jsdoc */
-                    /**
-                     * A callback for defining the format for _nodes_ in the
-                     * organization chart. The `nodeFormat` option takes precedence
-                     * over `nodeFormatter`.
-                     *
-                     * In an organization chart, the `nodeFormatter` is a quite complex
-                     * function of the available options, striving for a good default
-                     * layout of cards with or without images. In organization chart,
-                     * the data labels come with `useHTML` set to true, meaning they
-                     * will be rendered as true HTML above the SVG.
-                     *
-                     * @sample highcharts/series-organization/datalabels-nodeformatter
-                     *         Modify the default label format output
-                     *
-                     * @type  {Highcharts.SeriesSankeyDataLabelsFormatterCallbackFunction}
-                     * @since 6.0.2
-                     */
-                    nodeFormatter: function () {
-                        var outerStyle = {
-                                width: '100%',
-                                height: '100%',
-                                display: 'flex',
-                                'flex-direction': 'row',
-                                'align-items': 'center',
-                                'justify-content': 'center'
-                            },
-                            imageStyle = {
-                                'max-height': '100%',
-                                'border-radius': '50%'
-                            },
-                            innerStyle = {
-                                width: '100%',
-                                padding: 0,
-                                'text-align': 'center',
-                                'white-space': 'normal'
-                            },
-                            nameStyle = {
-                                margin: 0
-                            },
-                            titleStyle = {
-                                margin: 0
-                            },
-                            descriptionStyle = {
-                                opacity: 0.75,
-                                margin: '5px'
-                            };
-                        // eslint-disable-next-line valid-jsdoc
-                        /**
-                         * @private
-                         */
-                        function styleAttr(style) {
-                            return Object.keys(style).reduce(function (str, key) {
-                                return str + key + ':' + style[key] + ';';
-                            }, 'style="') + '"';
-                        }
-                        if (this.point.image) {
-                            imageStyle['max-width'] = '30%';
-                            innerStyle.width = '70%';
-                        }
-                        // PhantomJS doesn't support flex, roll back to absolute
-                        // positioning
-                        if (this.series.chart.renderer.forExport) {
-                            outerStyle.display = 'block';
-                            innerStyle.position = 'absolute';
-                            innerStyle.left = this.point.image ? '30%' : 0;
-                            innerStyle.top = 0;
-                        }
-                        var html = '<div ' + styleAttr(outerStyle) + '>';
-                        if (this.point.image) {
-                            html += '<img src="' + this.point.image + '" ' +
-                                styleAttr(imageStyle) + '>';
-                        }
-                        html += '<div ' + styleAttr(innerStyle) + '>';
-                        if (this.point.name) {
-                            html += '<h4 ' + styleAttr(nameStyle) + '>' +
-                                this.point.name + '</h4>';
-                        }
-                        if (this.point.title) {
-                            html += '<p ' + styleAttr(titleStyle) + '>' +
-                                (this.point.title || '') + '</p>';
-                        }
-                        if (this.point.description) {
-                            html += '<p ' + styleAttr(descriptionStyle) + '>' +
-                                this.point.description + '</p>';
-                        }
-                        html += '</div>' +
-                            '</div>';
-                        return html;
-                    },
-                    /* eslint-enable valid-jsdoc */
-                    style: {
-                        /** @internal */
-                        fontWeight: 'normal',
-                        /** @internal */
-                        fontSize: '13px'
-                    },
-                    useHTML: true
-                },
-                /**
-                 * The indentation in pixels of hanging nodes, nodes which parent has
-                 * [layout](#series.organization.nodes.layout) set to `hanging`.
-                 *
-                 * @private
-                 */
-                hangingIndent: 20,
-                /**
-                 * Defines the indentation of a `hanging` layout parent's children.
-                 * Possible options:
-                 *
-                 * - `inherit` (default): Only the first child adds the indentation,
-                 * children of a child with indentation inherit the indentation.
-                 * - `cumulative`: All children of a child with indentation add its
-                 * own indent. The option may cause overlapping of nodes.
-                 * Then use `shrink` option:
-                 * - `shrink`: Nodes shrink by the
-                 * [hangingIndent](#plotOptions.organization.hangingIndent)
-                 * value until they reach the
-                 * [minNodeLength](#plotOptions.organization.minNodeLength).
-                 *
-                 * @sample highcharts/series-organization/hanging-cumulative
-                 *         Every indent increases the indentation
-                 *
-                 * @sample highcharts/series-organization/hanging-shrink
-                 *         Every indent decreases the nodes' width
-                 *
-                 * @type {Highcharts.OrganizationHangingIndentTranslationValue}
-                 * @since 10.0.0
-                 * @default inherit
-                 *
-                 * @private
-                 */
-                hangingIndentTranslation: 'inherit',
-                /**
-                 * The color of the links between nodes.
-                 *
-                 * @type {Highcharts.ColorString}
-                 *
-                 * @private
-                 */
-                linkColor: "#666666" /* Palette.neutralColor60 */,
-                /**
-                 * The line width of the links connecting nodes, in pixels.
-                 *
-                 * @sample   highcharts/series-organization/link-options
-                 *           Square links
-                 *
-                 * @private
-                 */
-                linkLineWidth: 1,
-                /**
-                 * In a horizontal chart, the minimum width of the **hanging** nodes
-                 * only, in pixels. In a vertical chart, the minimum height of the
-                 * **haning** nodes only, in pixels too.
-                 *
-                 * Note: Used only when
-                 * [hangingIndentTranslation](#plotOptions.organization.hangingIndentTranslation)
-                 * is set to `shrink`.
-                 *
-                 * @see [nodeWidth](#plotOptions.organization.nodeWidth)
-                 *
-                 * @private
-                 */
-                minNodeLength: 10,
-                /**
-                 * In a horizontal chart, the width of the nodes in pixels. Note that
-                 * most organization charts are vertical, so the name of this option
-                 * is counterintuitive.
-                 *
-                 * @see [minNodeLength](#plotOptions.organization.minNodeLength)
-                 *
-                 * @private
-                 */
-                nodeWidth: 50,
-                tooltip: {
-                    nodeFormat: '{point.name}<br>{point.title}<br>{point.description}'
-                }
-            });
+            OrganizationSeries.defaultOptions = merge(SankeySeries.defaultOptions, OrganizationSeriesDefaults);
             return OrganizationSeries;
         }(SankeySeries));
         extend(OrganizationSeries.prototype, {
@@ -754,120 +1032,6 @@
          * @typedef {"inherit"|"cumulative"|"shrink"} Highcharts.OrganizationHangingIndentTranslationValue
          */
         ''; // detach doclets above
-        /* *
-         *
-         *  API Options
-         *
-         * */
-        /**
-         * An `organization` series. If the [type](#series.organization.type) option is
-         * not specified, it is inherited from [chart.type](#chart.type).
-         *
-         * @extends   series,plotOptions.organization
-         * @exclude   dataSorting, boostThreshold, boostBlending
-         * @product   highcharts
-         * @requires  modules/sankey
-         * @requires  modules/organization
-         * @apioption series.organization
-         */
-        /**
-         * @type      {Highcharts.SeriesOrganizationDataLabelsOptionsObject|Array<Highcharts.SeriesOrganizationDataLabelsOptionsObject>}
-         * @product   highcharts
-         * @apioption series.organization.data.dataLabels
-         */
-        /**
-         * A collection of options for the individual nodes. The nodes in an org chart
-         * are auto-generated instances of `Highcharts.Point`, but options can be
-         * applied here and linked by the `id`.
-         *
-         * @extends   series.sankey.nodes
-         * @type      {Array<*>}
-         * @product   highcharts
-         * @apioption series.organization.nodes
-         */
-        /**
-         * Individual data label for each node. The options are the same as
-         * the ones for [series.organization.dataLabels](#series.organization.dataLabels).
-         *
-         * @type    {Highcharts.SeriesOrganizationDataLabelsOptionsObject|Array<Highcharts.SeriesOrganizationDataLabelsOptionsObject>}
-         *
-         * @apioption series.organization.nodes.dataLabels
-         */
-        /**
-         * The job description for the node card, will be inserted by the default
-         * `dataLabel.nodeFormatter`.
-         *
-         * @sample highcharts/demo/organization-chart
-         *         Org chart with job descriptions
-         *
-         * @type      {string}
-         * @product   highcharts
-         * @apioption series.organization.nodes.description
-         */
-        /**
-         * An image for the node card, will be inserted by the default
-         * `dataLabel.nodeFormatter`.
-         *
-         * @sample highcharts/demo/organization-chart
-         *         Org chart with images
-         *
-         * @type      {string}
-         * @product   highcharts
-         * @apioption series.organization.nodes.image
-         */
-        /**
-         * Layout for the node's children. If `hanging`, this node's children will hang
-         * below their parent, allowing a tighter packing of nodes in the diagram.
-         *
-         * Note: Since @next version, the `hanging` layout is set by default for
-         * children of a parent using `hanging` layout.
-         *
-         * @sample highcharts/demo/organization-chart
-         *         Hanging layout
-         *
-         * @type      {Highcharts.SeriesOrganizationNodesLayoutValue}
-         * @default   normal
-         * @product   highcharts
-         * @apioption series.organization.nodes.layout
-         */
-        /**
-         * The job title for the node card, will be inserted by the default
-         * `dataLabel.nodeFormatter`.
-         *
-         * @sample highcharts/demo/organization-chart
-         *         Org chart with job titles
-         *
-         * @type      {string}
-         * @product   highcharts
-         * @apioption series.organization.nodes.title
-         */
-        /**
-         * An array of data points for the series. For the `organization` series
-         * type, points can be given in the following way:
-         *
-         * An array of objects with named values. The following snippet shows only a
-         * few settings, see the complete options set below. If the total number of data
-         * points exceeds the series' [turboThreshold](#series.area.turboThreshold),
-         * this option is not available.
-         *
-         *  ```js
-         *     data: [{
-         *         from: 'Category1',
-         *         to: 'Category2',
-         *         weight: 2
-         *     }, {
-         *         from: 'Category1',
-         *         to: 'Category3',
-         *         weight: 5
-         *     }]
-         *  ```
-         *
-         * @type      {Array<*>}
-         * @extends   series.sankey.data
-         * @product   highcharts
-         * @apioption series.organization.data
-         */
-        ''; // adds doclets above to transpiled file
 
         return OrganizationSeries;
     });