Skip to content

Commit

Permalink
Use helpers.options.resolve instead of helpers.options._fallback
Browse files Browse the repository at this point in the history
  • Loading branch information
@nagix
nagix committed Jan 8, 2019
1 parent 5349ed5 commit 1c2622f
Show file tree
Hide file tree
Showing 11 changed files with 108 additions and 154 deletions.
8 changes: 4 additions & 4 deletions src/controllers/controller.bubble.js
View file
Expand Up @@ -5,8 +5,6 @@ var defaults = require('../core/core.defaults');
var elements = require('../elements/index');
var helpers = require('../helpers/index');

var valueOrDefault = helpers.valueOrDefault;

defaults._set('bubble', {
hover: {
mode: 'single'
Expand Down Expand Up @@ -103,6 +101,8 @@ module.exports = DatasetController.extend({
setHoverStyle: function(point) {
var model = point._model;
var options = point._options;
var valueOrDefault = helpers.valueOrDefault;
var getHoverColor = helpers.getHoverColor;

point.$previousStyle = {
backgroundColor: model.backgroundColor,
Expand All @@ -111,8 +111,8 @@ module.exports = DatasetController.extend({
radius: model.radius
};

model.backgroundColor = valueOrDefault(options.hoverBackgroundColor, helpers.getHoverColor(options.backgroundColor));
model.borderColor = valueOrDefault(options.hoverBorderColor, helpers.getHoverColor(options.borderColor));
model.backgroundColor = valueOrDefault(options.hoverBackgroundColor, getHoverColor(options.backgroundColor));
model.borderColor = valueOrDefault(options.hoverBorderColor, getHoverColor(options.borderColor));
model.borderWidth = valueOrDefault(options.hoverBorderWidth, options.borderWidth);
model.radius = options.radius + options.hoverRadius;
},
Expand Down
18 changes: 9 additions & 9 deletions src/controllers/controller.doughnut.js
View file
Expand Up @@ -5,7 +5,7 @@ var defaults = require('../core/core.defaults');
var elements = require('../elements/index');
var helpers = require('../helpers/index');

var valueAtIndexOrDefault = helpers.valueAtIndexOrDefault;
var resolve = helpers.options.resolve;

defaults._set('doughnut', {
animation: {
Expand Down Expand Up @@ -49,9 +49,9 @@ defaults._set('doughnut', {
var arc = meta.data[i];
var custom = arc && arc.custom || {};
var arcOpts = chart.options.elements.arc;
var fill = custom.backgroundColor ? custom.backgroundColor : valueAtIndexOrDefault(ds.backgroundColor, i, arcOpts.backgroundColor);
var stroke = custom.borderColor ? custom.borderColor : valueAtIndexOrDefault(ds.borderColor, i, arcOpts.borderColor);
var bw = !isNaN(custom.borderWidth) ? custom.borderWidth : valueAtIndexOrDefault(ds.borderWidth, i, arcOpts.borderWidth);
var fill = resolve([custom.backgroundColor, ds.backgroundColor, arcOpts.backgroundColor], undefined, i);
var stroke = resolve([custom.borderColor, ds.borderColor, arcOpts.borderColor], undefined, i);
var bw = resolve([custom.borderWidth, ds.borderWidth, arcOpts.borderWidth], undefined, i);

return {
text: label,
Expand Down Expand Up @@ -228,7 +228,7 @@ module.exports = DatasetController.extend({
circumference: circumference,
outerRadius: outerRadius,
innerRadius: innerRadius,
label: valueAtIndexOrDefault(dataset.label, index, chart.data.labels[index])
label: helpers.valueAtIndexOrDefault(dataset.label, index, chart.data.labels[index])
}
});

Expand Down Expand Up @@ -325,10 +325,10 @@ module.exports = DatasetController.extend({
var options = me.chart.options.elements.arc;

return {
backgroundColor: custom.backgroundColor ? custom.backgroundColor : valueAtIndexOrDefault(dataset.backgroundColor, index, options.backgroundColor),
borderColor: custom.borderColor ? custom.borderColor : valueAtIndexOrDefault(dataset.borderColor, index, options.borderColor),
borderWidth: !isNaN(custom.borderWidth) ? custom.borderWidth : valueAtIndexOrDefault(dataset.borderWidth, index, options.borderWidth),
borderAlign: custom.borderAlign ? custom.borderAlign : valueAtIndexOrDefault(dataset.borderAlign, index, options.borderAlign)
backgroundColor: resolve([custom.backgroundColor, dataset.backgroundColor, options.backgroundColor], undefined, index),
borderColor: resolve([custom.borderColor, dataset.borderColor, options.borderColor], undefined, index),
borderWidth: resolve([custom.borderWidth, dataset.borderWidth, options.borderWidth], undefined, index),
borderAlign: resolve([custom.borderAlign, dataset.borderAlign, options.borderAlign], undefined, index)
};
}
});
101 changes: 43 additions & 58 deletions src/controllers/controller.line.js
View file
Expand Up @@ -6,8 +6,7 @@ var elements = require('../elements/index');
var helpers = require('../helpers/index');

var valueOrDefault = helpers.valueOrDefault;
var valueAtIndexOrDefault = helpers.valueAtIndexOrDefault;
var fallback = helpers.options._fallback;
var resolve = helpers.options.resolve;
var isPointInArea = helpers.canvas._isPointInArea;

defaults._set('line', {
Expand Down Expand Up @@ -73,17 +72,17 @@ module.exports = DatasetController.extend({
// to https://github.com/chartjs/Chart.js/issues/2435#issuecomment-216718158
// This option gives lines the ability to span gaps
spanGaps: valueOrDefault(dataset.spanGaps, options.spanGaps),
tension: fallback(custom.tension, dataset.lineTension, lineElementOptions.tension),
backgroundColor: fallback(custom.backgroundColor, dataset.backgroundColor, lineElementOptions.backgroundColor),
borderWidth: fallback(custom.borderWidth, dataset.borderWidth, lineElementOptions.borderWidth),
borderColor: fallback(custom.borderColor, dataset.borderColor, lineElementOptions.borderColor),
borderCapStyle: fallback(custom.borderCapStyle, dataset.borderCapStyle, lineElementOptions.borderCapStyle),
borderDash: fallback(custom.borderDash, dataset.borderDash, lineElementOptions.borderDash),
borderDashOffset: fallback(custom.borderDashOffset, dataset.borderDashOffset, lineElementOptions.borderDashOffset),
borderJoinStyle: fallback(custom.borderJoinStyle, dataset.borderJoinStyle, lineElementOptions.borderJoinStyle),
fill: fallback(custom.fill, dataset.fill, lineElementOptions.fill),
steppedLine: fallback(custom.steppedLine, dataset.steppedLine, lineElementOptions.stepped),
cubicInterpolationMode: fallback(custom.cubicInterpolationMode, dataset.cubicInterpolationMode, lineElementOptions.cubicInterpolationMode),
tension: resolve([custom.tension, dataset.lineTension, lineElementOptions.tension]),
backgroundColor: resolve([custom.backgroundColor, dataset.backgroundColor, lineElementOptions.backgroundColor]),
borderWidth: resolve([custom.borderWidth, dataset.borderWidth, lineElementOptions.borderWidth]),
borderColor: resolve([custom.borderColor, dataset.borderColor, lineElementOptions.borderColor]),
borderCapStyle: resolve([custom.borderCapStyle, dataset.borderCapStyle, lineElementOptions.borderCapStyle]),
borderDash: resolve([custom.borderDash, dataset.borderDash, lineElementOptions.borderDash]),
borderDashOffset: resolve([custom.borderDashOffset, dataset.borderDashOffset, lineElementOptions.borderDashOffset]),
borderJoinStyle: resolve([custom.borderJoinStyle, dataset.borderJoinStyle, lineElementOptions.borderJoinStyle]),
fill: resolve([custom.fill, dataset.fill, lineElementOptions.fill]),
steppedLine: resolve([custom.steppedLine, dataset.steppedLine, lineElementOptions.stepped]),
cubicInterpolationMode: resolve([custom.cubicInterpolationMode, dataset.cubicInterpolationMode, lineElementOptions.cubicInterpolationMode]),
};

line.pivot();
Expand All @@ -105,64 +104,49 @@ module.exports = DatasetController.extend({
},

getPointBackgroundColor: function(point, index) {
var backgroundColor = this.chart.options.elements.point.backgroundColor;
var dataset = this.getDataset();
var custom = point.custom || {};

if (custom.backgroundColor) {
backgroundColor = custom.backgroundColor;
} else if (dataset.pointBackgroundColor) {
backgroundColor = valueAtIndexOrDefault(dataset.pointBackgroundColor, index, backgroundColor);
} else if (dataset.backgroundColor) {
backgroundColor = dataset.backgroundColor;
}

return backgroundColor;
return resolve([
custom.backgroundColor,
dataset.pointBackgroundColor,
dataset.backgroundColor,
this.chart.options.elements.point.backgroundColor
], undefined, index);
},

getPointBorderColor: function(point, index) {
var borderColor = this.chart.options.elements.point.borderColor;
var dataset = this.getDataset();
var custom = point.custom || {};

if (custom.borderColor) {
borderColor = custom.borderColor;
} else if (dataset.pointBorderColor) {
borderColor = valueAtIndexOrDefault(dataset.pointBorderColor, index, borderColor);
} else if (dataset.borderColor) {
borderColor = dataset.borderColor;
}

return borderColor;
return resolve([
custom.borderColor,
dataset.pointBorderColor,
dataset.borderColor,
this.chart.options.elements.point.borderColor
], undefined, index);
},

getPointBorderWidth: function(point, index) {
var borderWidth = this.chart.options.elements.point.borderWidth;
var dataset = this.getDataset();
var custom = point.custom || {};

if (!isNaN(custom.borderWidth)) {
borderWidth = custom.borderWidth;
} else if (!isNaN(dataset.pointBorderWidth) || helpers.isArray(dataset.pointBorderWidth)) {
borderWidth = valueAtIndexOrDefault(dataset.pointBorderWidth, index, borderWidth);
} else if (!isNaN(dataset.borderWidth)) {
borderWidth = dataset.borderWidth;
}

return borderWidth;
return resolve([
custom.borderWidth,
dataset.pointBorderWidth,
dataset.borderWidth,
this.chart.options.elements.point.borderWidth
], undefined, index);
},

getPointRotation: function(point, index) {
var pointRotation = this.chart.options.elements.point.rotation;
var dataset = this.getDataset();
var custom = point.custom || {};

if (!isNaN(custom.rotation)) {
pointRotation = custom.rotation;
} else if (!isNaN(dataset.pointRotation) || helpers.isArray(dataset.pointRotation)) {
pointRotation = valueAtIndexOrDefault(dataset.pointRotation, index, pointRotation);
}
return pointRotation;
return resolve([
custom.rotation,
this.getDataset().pointRotation,
this.chart.options.elements.point.rotation
], undefined, index);
},

updateElement: function(point, index, reset) {
Expand Down Expand Up @@ -200,16 +184,16 @@ module.exports = DatasetController.extend({
y: y,
skip: custom.skip || isNaN(x) || isNaN(y),
// Appearance
radius: !isNaN(custom.radius) ? custom.radius : valueAtIndexOrDefault(dataset.pointRadius, index, pointOptions.radius),
pointStyle: custom.pointStyle || valueAtIndexOrDefault(dataset.pointStyle, index, pointOptions.pointStyle),
radius: resolve([custom.radius, dataset.pointRadius, pointOptions.radius], undefined, index),
pointStyle: resolve([custom.pointStyle, dataset.pointStyle, pointOptions.pointStyle], undefined, index),
rotation: me.getPointRotation(point, index),
backgroundColor: me.getPointBackgroundColor(point, index),
borderColor: me.getPointBorderColor(point, index),
borderWidth: me.getPointBorderWidth(point, index),
tension: meta.dataset._model ? meta.dataset._model.tension : 0,
steppedLine: meta.dataset._model ? meta.dataset._model.steppedLine : false,
// Tooltip
hitRadius: !isNaN(custom.hitRadius) ? custom.hitRadius : valueAtIndexOrDefault(dataset.pointHitRadius, index, pointOptions.hitRadius)
hitRadius: resolve([custom.hitRadius, dataset.pointHitRadius, pointOptions.hitRadius], undefined, index)
};
},

Expand Down Expand Up @@ -339,6 +323,7 @@ module.exports = DatasetController.extend({
var index = element._index;
var custom = element.custom || {};
var model = element._model;
var getHoverColor = helpers.getHoverColor;

element.$previousStyle = {
backgroundColor: model.backgroundColor,
Expand All @@ -347,9 +332,9 @@ module.exports = DatasetController.extend({
radius: model.radius
};

model.backgroundColor = custom.hoverBackgroundColor || valueAtIndexOrDefault(dataset.pointHoverBackgroundColor, index, helpers.getHoverColor(model.backgroundColor));
model.borderColor = custom.hoverBorderColor || valueAtIndexOrDefault(dataset.pointHoverBorderColor, index, helpers.getHoverColor(model.borderColor));
model.borderWidth = !isNaN(custom.hoverBorderWidth) ? custom.hoverBorderWidth : valueAtIndexOrDefault(dataset.pointHoverBorderWidth, index, model.borderWidth);
model.radius = !isNaN(custom.hoverRadius) ? custom.hoverRadius : valueAtIndexOrDefault(dataset.pointHoverRadius, index, this.chart.options.elements.point.hoverRadius);
model.backgroundColor = resolve([custom.hoverBackgroundColor, dataset.pointHoverBackgroundColor, getHoverColor(model.backgroundColor)], undefined, index);
model.borderColor = resolve([custom.hoverBorderColor, dataset.pointHoverBorderColor, getHoverColor(model.borderColor)], undefined, index);
model.borderWidth = resolve([custom.hoverBorderWidth, dataset.pointHoverBorderWidth, model.borderWidth], undefined, index);
model.radius = resolve([custom.hoverRadius, dataset.pointHoverRadius, this.chart.options.elements.point.hoverRadius], undefined, index);
}
});
18 changes: 9 additions & 9 deletions src/controllers/controller.polarArea.js
View file
Expand Up @@ -5,7 +5,7 @@ var defaults = require('../core/core.defaults');
var elements = require('../elements/index');
var helpers = require('../helpers/index');

var valueAtIndexOrDefault = helpers.valueAtIndexOrDefault;
var resolve = helpers.options.resolve;

defaults._set('polarArea', {
scale: {
Expand Down Expand Up @@ -63,9 +63,9 @@ defaults._set('polarArea', {
var arc = meta.data[i];
var custom = arc.custom || {};
var arcOpts = chart.options.elements.arc;
var fill = custom.backgroundColor || valueAtIndexOrDefault(ds.backgroundColor, i, arcOpts.backgroundColor);
var stroke = custom.borderColor || valueAtIndexOrDefault(ds.borderColor, i, arcOpts.borderColor);
var bw = !isNaN(custom.borderWidth) ? custom.borderWidth : valueAtIndexOrDefault(ds.borderWidth, i, arcOpts.borderWidth);
var fill = resolve([custom.backgroundColor, ds.backgroundColor, arcOpts.backgroundColor], undefined, i);
var stroke = resolve([custom.borderColor, ds.borderColor, arcOpts.borderColor], undefined, i);
var bw = resolve([custom.borderWidth, ds.borderWidth, arcOpts.borderWidth], undefined, i);

return {
text: label,
Expand Down Expand Up @@ -193,7 +193,7 @@ module.exports = DatasetController.extend({
outerRadius: reset ? resetRadius : distance,
startAngle: reset && animationOpts.animateRotate ? datasetStartAngle : startAngle,
endAngle: reset && animationOpts.animateRotate ? datasetStartAngle : endAngle,
label: valueAtIndexOrDefault(labels, index, labels[index])
label: helpers.valueAtIndexOrDefault(labels, index, labels[index])
}
});

Expand All @@ -202,10 +202,10 @@ module.exports = DatasetController.extend({
var custom = arc.custom || {};
var model = arc._model;

model.backgroundColor = custom.backgroundColor || valueAtIndexOrDefault(dataset.backgroundColor, index, elementOpts.backgroundColor);
model.borderColor = custom.borderColor || valueAtIndexOrDefault(dataset.borderColor, index, elementOpts.borderColor);
model.borderWidth = !isNaN(custom.borderWidth) ? custom.borderWidth : valueAtIndexOrDefault(dataset.borderWidth, index, elementOpts.borderWidth);
model.borderAlign = custom.borderAlign || valueAtIndexOrDefault(dataset.borderAlign, index, elementOpts.borderAlign);
model.backgroundColor = resolve([custom.backgroundColor, dataset.backgroundColor, elementOpts.backgroundColor], undefined, index);
model.borderColor = resolve([custom.borderColor, dataset.borderColor, elementOpts.borderColor], undefined, index);
model.borderWidth = resolve([custom.borderWidth, dataset.borderWidth, elementOpts.borderWidth], undefined, index);
model.borderAlign = resolve([custom.borderAlign, dataset.borderAlign, elementOpts.borderAlign], undefined, index);

arc.pivot();
},
Expand Down

0 comments on commit 1c2622f

Please sign in to comment.