Legend item lineWidth is the average of borderWidth when set as object (Bar) (#7964)

* fixed default of tension property of line element

* Fix #7942

* Fixes some lint errors

* fixes "Expected property shorthand" error
This commit is contained in:
stockiNail 2020-10-28 12:12:52 +01:00 committed by GitHub
parent 68bae7906d
commit ea047f5cf2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View 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,