From f5c44946211b8d28bc9642f3eed718af073f972e Mon Sep 17 00:00:00 2001 From: Ben McCann <322311+benmccann@users.noreply.github.com> Date: Mon, 3 Feb 2020 04:34:54 -0800 Subject: [PATCH] Cleanup imports on controllers (#7052) --- src/controllers/controller.bar.js | 22 +++++++++++----------- src/controllers/controller.bubble.js | 7 +++---- src/controllers/controller.doughnut.js | 8 +++----- src/controllers/controller.line.js | 9 ++++----- src/controllers/controller.pie.js | 4 ++-- src/controllers/controller.polarArea.js | 7 +++---- src/controllers/controller.radar.js | 4 +--- 7 files changed, 27 insertions(+), 34 deletions(-) diff --git a/src/controllers/controller.bar.js b/src/controllers/controller.bar.js index be85a2d1f..1d0f0af39 100644 --- a/src/controllers/controller.bar.js +++ b/src/controllers/controller.bar.js @@ -3,9 +3,9 @@ import DatasetController from '../core/core.datasetController'; import defaults from '../core/core.defaults'; import Rectangle from '../elements/element.rectangle'; -import helpers from '../helpers'; - -const valueOrDefault = helpers.valueOrDefault; +import {clipArea, unclipArea} from '../helpers/helpers.canvas'; +import {isArray, isNullOrUndef, valueOrDefault} from '../helpers/helpers.core'; +import {_limitValue, sign} from '../helpers/helpers.math'; defaults._set('bar', { hover: { @@ -69,12 +69,12 @@ function computeFitCategoryTraits(index, ruler, options) { var thickness = options.barThickness; var count = ruler.stackCount; var curr = ruler.pixels[index]; - var min = helpers.isNullOrUndef(thickness) + var min = isNullOrUndef(thickness) ? computeMinSampleSize(ruler.scale, ruler.pixels) : -1; var size, ratio; - if (helpers.isNullOrUndef(thickness)) { + if (isNullOrUndef(thickness)) { size = min * options.categoryPercentage; ratio = options.barPercentage; } else { @@ -167,7 +167,7 @@ function parseArrayOrPrimitive(meta, data, start, count) { item = {}; item[iScale.axis] = singleScale || iScale._parse(labels[i], i); - if (helpers.isArray(entry)) { + if (isArray(entry)) { parseFloatBar(entry, item, vScale, i); } else { item[vScale.axis] = vScale._parse(entry, i); @@ -234,7 +234,7 @@ export default DatasetController.extend({ item = {}; item[iScale.axis] = iScale._parseObject(obj, iScale.axis, i); value = obj[vProp]; - if (helpers.isArray(value)) { + if (isArray(value)) { parseFloatBar(value, item, vScale, i); } else { item[vScale.axis] = vScale._parseObject(obj, vProp, i); @@ -440,7 +440,7 @@ export default DatasetController.extend({ value = custom.barStart; length = custom.barEnd - custom.barStart; // bars crossing origin are not stacked - if (value !== 0 && helpers.math.sign(value) !== helpers.math.sign(custom.barEnd)) { + if (value !== 0 && sign(value) !== sign(custom.barEnd)) { start = 0; } start += value; @@ -450,7 +450,7 @@ export default DatasetController.extend({ // So we don't try to draw so huge rectangles. // https://github.com/chartjs/Chart.js/issues/5247 // TODO: use borderWidth instead (need to move the parsing from rectangle) - base = helpers.math._limitValue(vScale.getPixelForValue(start), + base = _limitValue(vScale.getPixelForValue(start), vScale._startPixel - 10, vScale._endPixel + 10); @@ -502,7 +502,7 @@ export default DatasetController.extend({ const ilen = rects.length; let i = 0; - helpers.canvas.clipArea(chart.ctx, chart.chartArea); + clipArea(chart.ctx, chart.chartArea); for (; i < ilen; ++i) { if (!isNaN(me._getParsed(i)[vScale.axis])) { @@ -510,7 +510,7 @@ export default DatasetController.extend({ } } - helpers.canvas.unclipArea(chart.ctx); + unclipArea(chart.ctx); } }); diff --git a/src/controllers/controller.bubble.js b/src/controllers/controller.bubble.js index 7c47c0970..400e803b5 100644 --- a/src/controllers/controller.bubble.js +++ b/src/controllers/controller.bubble.js @@ -3,9 +3,8 @@ import DatasetController from '../core/core.datasetController'; import defaults from '../core/core.defaults'; import Point from '../elements/element.point'; -import helpers from '../helpers'; - -const resolve = helpers.options.resolve; +import {extend} from '../helpers/helpers.core'; +import {resolve} from '../helpers/helpers.options'; defaults._set('bubble', { animation: { @@ -172,7 +171,7 @@ export default DatasetController.extend({ // In case values were cached (and thus frozen), we need to clone the values if (values.$shared) { - values = helpers.extend({}, values, {$shared: false}); + values = extend({}, values, {$shared: false}); } diff --git a/src/controllers/controller.doughnut.js b/src/controllers/controller.doughnut.js index 73b859102..053fc5a54 100644 --- a/src/controllers/controller.doughnut.js +++ b/src/controllers/controller.doughnut.js @@ -3,9 +3,7 @@ import DatasetController from '../core/core.datasetController'; import defaults from '../core/core.defaults'; import Arc from '../elements/element.arc'; -import helpers from '../helpers'; - -const valueOrDefault = helpers.valueOrDefault; +import {isArray, noop, valueOrDefault} from '../helpers/helpers.core'; const PI = Math.PI; const DOUBLE_PI = PI * 2; @@ -83,7 +81,7 @@ defaults._set('doughnut', { var dataLabel = data.labels[tooltipItem.index]; var value = ': ' + data.datasets[tooltipItem.datasetIndex].data[tooltipItem.index]; - if (helpers.isArray(dataLabel)) { + if (isArray(dataLabel)) { // show value on first line of multiline label // need to clone because we are changing the value dataLabel = dataLabel.slice(); @@ -102,7 +100,7 @@ export default DatasetController.extend({ dataElementType: Arc, - linkScales: helpers.noop, + linkScales: noop, /** * @private diff --git a/src/controllers/controller.line.js b/src/controllers/controller.line.js index 445294156..ec9188ab4 100644 --- a/src/controllers/controller.line.js +++ b/src/controllers/controller.line.js @@ -4,10 +4,9 @@ import DatasetController from '../core/core.datasetController'; import defaults from '../core/core.defaults'; import Line from '../elements/element.line'; import Point from '../elements/element.point'; -import helpers from '../helpers'; - -const valueOrDefault = helpers.valueOrDefault; -const resolve = helpers.options.resolve; +import {valueOrDefault} from '../helpers/helpers.core'; +import {isNumber} from '../helpers/helpers.math'; +import {resolve} from '../helpers/helpers.options'; defaults._set('line', { showLines: true, @@ -100,7 +99,7 @@ export default DatasetController.extend({ const sharedOptions = me._getSharedOptions(mode, points[start], firstOpts); const includeOptions = me._includeOptions(mode, sharedOptions); const spanGaps = valueOrDefault(me._config.spanGaps, me.chart.options.spanGaps); - const maxGapLength = helpers.math.isNumber(spanGaps) ? spanGaps : Number.POSITIVE_INFINITY; + const maxGapLength = isNumber(spanGaps) ? spanGaps : Number.POSITIVE_INFINITY; let prevParsed; for (let i = 0; i < points.length; ++i) { diff --git a/src/controllers/controller.pie.js b/src/controllers/controller.pie.js index 2589c09d6..d88cb8483 100644 --- a/src/controllers/controller.pie.js +++ b/src/controllers/controller.pie.js @@ -2,9 +2,9 @@ import DoughnutController from './controller.doughnut'; import defaults from '../core/core.defaults'; -import helpers from '../helpers'; +import {clone} from '../helpers/helpers.core'; -defaults._set('pie', helpers.clone(defaults.doughnut)); +defaults._set('pie', clone(defaults.doughnut)); defaults._set('pie', { cutoutPercentage: 0 }); diff --git a/src/controllers/controller.polarArea.js b/src/controllers/controller.polarArea.js index d337af133..6b2d2a5d5 100644 --- a/src/controllers/controller.polarArea.js +++ b/src/controllers/controller.polarArea.js @@ -3,9 +3,8 @@ import DatasetController from '../core/core.datasetController'; import defaults from '../core/core.defaults'; import Arc from '../elements/element.arc'; -import helpers from '../helpers'; - -const resolve = helpers.options.resolve; +import {toRadians} from '../helpers/helpers.math'; +import {resolve} from '../helpers/helpers.options'; defaults._set('polarArea', { animation: { @@ -88,7 +87,7 @@ defaults._set('polarArea', { function getStartAngleRadians(deg) { // radialLinear scale draws angleLines using startAngle. 0 is expected to be at top. // Here we adjust to standard unit circle used in drawing, where 0 is at right. - return helpers.math.toRadians(deg) - 0.5 * Math.PI; + return toRadians(deg) - 0.5 * Math.PI; } export default DatasetController.extend({ diff --git a/src/controllers/controller.radar.js b/src/controllers/controller.radar.js index 6020821fa..6dc68d054 100644 --- a/src/controllers/controller.radar.js +++ b/src/controllers/controller.radar.js @@ -4,9 +4,7 @@ import DatasetController from '../core/core.datasetController'; import defaults from '../core/core.defaults'; import Line from '../elements/element.line'; import Point from '../elements/element.point'; -import helpers from '../helpers'; - -const valueOrDefault = helpers.valueOrDefault; +import {valueOrDefault} from '../helpers/helpers.core'; defaults._set('radar', { spanGaps: false, -- 2.47.2