]> git.ipfire.org Git - thirdparty/Chart.js.git/commitdiff
Legend item lineWidth is the average of borderWidth when set as object (Bar) (#7964)
authorstockiNail <stocki.nail@gmail.com>
Wed, 28 Oct 2020 11:12:52 +0000 (12:12 +0100)
committerGitHub <noreply@github.com>
Wed, 28 Oct 2020 11:12:52 +0000 (13:12 +0200)
* fixed default of tension property of line element

* Fix #7942

* Fixes some lint errors

* fixes "Expected property shorthand" error

src/plugins/plugin.legend.js

index 0329570d3a839820966d63c03c9caed9c913466b..87f078f9c27460fda302cd4e32a9110f2de7c9be 100644 (file)
@@ -3,7 +3,7 @@ import Element from '../core/core.element';
 import layouts from '../core/core.layouts';
 import {drawPoint} from '../helpers/helpers.canvas';
 import {
-       callback as call, merge, valueOrDefault, isNullOrUndef, toFont,
+       callback as call, merge, valueOrDefault, isNullOrUndef, toFont, isObject,
        toPadding, getRtlAdapter, overrideTextDirection, restoreTextDirection,
        INFINITY
 } from '../helpers/index';
@@ -746,6 +746,7 @@ export default {
 
                                return chart._getSortedDatasetMetas().map((meta) => {
                                        const style = meta.controller.getStyle(usePointStyle ? 0 : undefined);
+                                       const borderWidth = isObject(style.borderWidth) ? (valueOrDefault(style.borderWidth.top, 0) + valueOrDefault(style.borderWidth.left, 0) + valueOrDefault(style.borderWidth.bottom, 0) + valueOrDefault(style.borderWidth.right, 0)) / 4 : style.borderWidth;
 
                                        return {
                                                text: datasets[meta.index].label,
@@ -755,7 +756,7 @@ export default {
                                                lineDash: style.borderDash,
                                                lineDashOffset: style.borderDashOffset,
                                                lineJoin: style.borderJoinStyle,
-                                               lineWidth: style.borderWidth,
+                                               lineWidth: borderWidth,
                                                strokeStyle: style.borderColor,
                                                pointStyle: overrideStyle || style.pointStyle,
                                                rotation: style.rotation,