Browse Source

Adds .eslintrc, runs --fix on src/ folder.

v1-dev
Ændrew Rininsland 8 years ago
parent
commit
9c606280d0
No known key found for this signature in database
GPG Key ID: ADBCD4C867F9B2DA
  1. 7
      .eslintrc
  2. 548
      c3.js
  3. 342
      es6_modules/axis.js
  4. 220
      es6_modules/chart.js
  5. 2201
      es6_modules/chartinternal.js
  6. 171
      src/axis/axis.js
  7. 166
      src/axis/c3.axis.js
  8. 3
      src/axis/index.js
  9. 18
      src/chart/api.axis.js
  10. 4
      src/chart/api.category.js
  11. 14
      src/chart/api.chart.js
  12. 2
      src/chart/api.color.js
  13. 8
      src/chart/api.data.js
  14. 28
      src/chart/api.flow.js
  15. 10
      src/chart/api.focus.js
  16. 16
      src/chart/api.grid.js
  17. 2
      src/chart/api.group.js
  18. 8
      src/chart/api.legend.js
  19. 20
      src/chart/api.load.js
  20. 20
      src/chart/api.region.js
  21. 16
      src/chart/api.selection.js
  22. 16
      src/chart/api.show.js
  23. 2
      src/chart/api.tooltip.js
  24. 4
      src/chart/api.transform.js
  25. 8
      src/chart/api.x.js
  26. 18
      src/chart/api.zoom.js
  27. 6
      src/chart/index.js
  28. 211
      src/chartinternal/arc.js
  29. 6
      src/chartinternal/cache.js
  30. 2
      src/chartinternal/category.js
  31. 20
      src/chartinternal/class.js
  32. 26
      src/chartinternal/clip.js
  33. 8
      src/chartinternal/color.js
  34. 66
      src/chartinternal/config.js
  35. 84
      src/chartinternal/data.convert.js
  36. 166
      src/chartinternal/data.js
  37. 26
      src/chartinternal/data.load.js
  38. 46
      src/chartinternal/domain.js
  39. 24
      src/chartinternal/drag.js
  40. 64
      src/chartinternal/flow.js
  41. 14
      src/chartinternal/format.js
  42. 136
      src/chartinternal/grid.js
  43. 426
      src/chartinternal/index.js
  44. 123
      src/chartinternal/interaction.js
  45. 90
      src/chartinternal/legend.js
  46. 34
      src/chartinternal/region.js
  47. 14
      src/chartinternal/scale.js
  48. 32
      src/chartinternal/selection.js
  49. 57
      src/chartinternal/shape.bar.js
  50. 30
      src/chartinternal/shape.js
  51. 145
      src/chartinternal/shape.line.js
  52. 32
      src/chartinternal/size.js
  53. 101
      src/chartinternal/subchart.js
  54. 46
      src/chartinternal/text.js
  55. 20
      src/chartinternal/title.js
  56. 72
      src/chartinternal/tooltip.js
  57. 6
      src/chartinternal/transform.js
  58. 30
      src/chartinternal/type.js
  59. 4
      src/chartinternal/ua.js
  60. 14
      src/chartinternal/util.js
  61. 26
      src/chartinternal/zoom.js
  62. 1518
      src/polyfill.js

7
.eslintrc

@ -0,0 +1,7 @@
{
"extends": "airbnb-base",
"rules": {
"indent": ["error", 4],
"no-var": "error"
}
}

548
c3.js

File diff suppressed because one or more lines are too long

342
es6_modules/axis.js

@ -4,11 +4,10 @@ function API(owner) {
}
function inherit(base, derived) {
if (Object.create) {
derived.prototype = Object.create(base.prototype);
} else {
var f = function f() {};
const f = function f() {};
f.prototype = base.prototype;
derived.prototype = new f();
}
@ -22,31 +21,31 @@ function inherit(base, derived) {
// 1. category axis
// 2. ceil values of translate/x/y to int for half pixel antialiasing
// 3. multiline tick text
var tickTextCharSize;
let tickTextCharSize;
function c3_axis(d3, params) {
var scale = d3.scale.linear(), orient = "bottom", innerTickSize = 6, outerTickSize, tickPadding = 3, tickValues = null, tickFormat, tickArguments;
let scale = d3.scale.linear(), orient = 'bottom', innerTickSize = 6, outerTickSize, tickPadding = 3, tickValues = null, tickFormat, tickArguments;
var tickOffset = 0, tickCulling = true, tickCentered;
let tickOffset = 0, tickCulling = true, tickCentered;
params = params || {};
outerTickSize = params.withOuterTick ? 6 : 0;
function axisX(selection, x) {
selection.attr("transform", function (d) {
return "translate(" + Math.ceil(x(d) + tickOffset) + ", 0)";
selection.attr('transform', (d) => {
return 'translate(' + Math.ceil(x(d) + tickOffset) + ', 0)';
});
}
function axisY(selection, y) {
selection.attr("transform", function (d) {
return "translate(0," + Math.ceil(y(d)) + ")";
selection.attr('transform', (d) => {
return 'translate(0,' + Math.ceil(y(d)) + ')';
});
}
function scaleExtent(domain) {
var start = domain[0], stop = domain[domain.length - 1];
return start < stop ? [ start, stop ] : [ stop, start ];
let start = domain[0], stop = domain[domain.length - 1];
return start < stop ? [start, stop] : [stop, start];
}
function generateTicks(scale) {
var i, domain, ticks = [];
let i, domain, ticks = [];
if (scale.ticks) {
return scale.ticks.apply(scale, tickArguments);
}
@ -60,7 +59,7 @@ function c3_axis(d3, params) {
return ticks;
}
function copyScale() {
var newScale = scale.copy(), domain;
let newScale = scale.copy(), domain;
if (params.isCategory) {
domain = scale.domain();
newScale.domain([domain[0], domain[1] - 1]);
@ -68,19 +67,19 @@ function c3_axis(d3, params) {
return newScale;
}
function textFormatted(v) {
var formatted = tickFormat ? tickFormat(v) : v;
const formatted = tickFormat ? tickFormat(v) : v;
return typeof formatted !== 'undefined' ? formatted : '';
}
function getSizeFor1Char(tick) {
if (tickTextCharSize) {
return tickTextCharSize;
}
var size = {
const size = {
h: 11.5,
w: 5.5
w: 5.5,
};
tick.select('text').text(textFormatted).each(function (d) {
var box = this.getBoundingClientRect(),
let box = this.getBoundingClientRect(),
text = textFormatted(d),
h = box.height,
w = text ? (box.width / text.length) : undefined;
@ -97,28 +96,28 @@ function c3_axis(d3, params) {
}
function axis(g) {
g.each(function () {
var g = axis.g = d3.select(this);
const g = axis.g = d3.select(this);
var scale0 = this.__chart__ || scale, scale1 = this.__chart__ = copyScale();
let scale0 = this.__chart__ || scale, scale1 = this.__chart__ = copyScale();
var ticks = tickValues ? tickValues : generateTicks(scale1),
tick = g.selectAll(".tick").data(ticks, scale1),
tickEnter = tick.enter().insert("g", ".domain").attr("class", "tick").style("opacity", 1e-6),
let ticks = tickValues ? tickValues : generateTicks(scale1),
tick = g.selectAll('.tick').data(ticks, scale1),
tickEnter = tick.enter().insert('g', '.domain').attr('class', 'tick').style('opacity', 1e-6),
// MEMO: No exit transition. The reason is this transition affects max tick width calculation because old tick will be included in the ticks.
tickExit = tick.exit().remove(),
tickUpdate = transitionise(tick).style("opacity", 1),
tickUpdate = transitionise(tick).style('opacity', 1),
tickTransform, tickX, tickY;
var range = scale.rangeExtent ? scale.rangeExtent() : scaleExtent(scale.range()),
path = g.selectAll(".domain").data([ 0 ]),
pathUpdate = (path.enter().append("path").attr("class", "domain"), transitionise(path));
tickEnter.append("line");
tickEnter.append("text");
let range = scale.rangeExtent ? scale.rangeExtent() : scaleExtent(scale.range()),
path = g.selectAll('.domain').data([0]),
pathUpdate = (path.enter().append('path').attr('class', 'domain'), transitionise(path));
tickEnter.append('line');
tickEnter.append('text');
var lineEnter = tickEnter.select("line"),
lineUpdate = tickUpdate.select("line"),
textEnter = tickEnter.select("text"),
textUpdate = tickUpdate.select("text");
let lineEnter = tickEnter.select('line'),
lineUpdate = tickUpdate.select('line'),
textEnter = tickEnter.select('text'),
textUpdate = tickUpdate.select('text');
if (params.isCategory) {
tickOffset = Math.ceil((scale1(1) - scale1(0)) / 2);
@ -128,16 +127,16 @@ function c3_axis(d3, params) {
tickOffset = tickX = 0;
}
var text, tspan, sizeFor1Char = getSizeFor1Char(g.select('.tick')), counts = [];
var tickLength = Math.max(innerTickSize, 0) + tickPadding,
let text, tspan, sizeFor1Char = getSizeFor1Char(g.select('.tick')), counts = [];
let tickLength = Math.max(innerTickSize, 0) + tickPadding,
isVertical = orient === 'left' || orient === 'right';
// this should be called only when category axis
function splitTickText(d, maxWidth) {
var tickText = textFormatted(d),
let tickText = textFormatted(d),
subtext, spaceIndex, textWidth, splitted = [];
if (Object.prototype.toString.call(tickText) === "[object Array]") {
if (Object.prototype.toString.call(tickText) === '[object Array]') {
return tickText;
}
@ -147,7 +146,7 @@ function c3_axis(d3, params) {
function split(splitted, text) {
spaceIndex = undefined;
for (var i = 1; i < text.length; i++) {
for (let i = 1; i < text.length; i++) {
if (text.charAt(i) === ' ') {
spaceIndex = i;
}
@ -164,52 +163,52 @@ function c3_axis(d3, params) {
return splitted.concat(text);
}
return split(splitted, tickText + "");
return split(splitted, tickText + '');
}
function tspanDy(d, i) {
var dy = sizeFor1Char.h;
let dy = sizeFor1Char.h;
if (i === 0) {
if (orient === 'left' || orient === 'right') {
dy = -((counts[d.index] - 1) * (sizeFor1Char.h / 2) - 3);
} else {
dy = ".71em";
dy = '.71em';
}
}
return dy;
}
function tickSize(d) {
var tickPosition = scale(d) + (tickCentered ? 0 : tickOffset);
const tickPosition = scale(d) + (tickCentered ? 0 : tickOffset);
return range[0] < tickPosition && tickPosition < range[1] ? innerTickSize : 0;
}
text = tick.select("text");
text = tick.select('text');
tspan = text.selectAll('tspan')
.data(function (d, i) {
var splitted = params.tickMultiline ? splitTickText(d, params.tickWidth) : [].concat(textFormatted(d));
.data((d, i) => {
const splitted = params.tickMultiline ? splitTickText(d, params.tickWidth) : [].concat(textFormatted(d));
counts[i] = splitted.length;
return splitted.map(function (s) {
return splitted.map((s) => {
return { index: i, splitted: s };
});
});
tspan.enter().append('tspan');
tspan.exit().remove();
tspan.text(function (d) { return d.splitted; });
tspan.text((d) => { return d.splitted; });
var rotate = params.tickTextRotate;
const rotate = params.tickTextRotate;
function textAnchorForText(rotate) {
if (!rotate) {
return 'middle';
}
return rotate > 0 ? "start" : "end";
return rotate > 0 ? 'start' : 'end';
}
function textTransform(rotate) {
if (!rotate) {
return '';
}
return "rotate(" + rotate + ")";
return 'rotate(' + rotate + ')';
}
function dxForText(rotate) {
if (!rotate) {
@ -225,59 +224,59 @@ function c3_axis(d3, params) {
}
switch (orient) {
case "bottom":
case 'bottom':
{
tickTransform = axisX;
lineEnter.attr("y2", innerTickSize);
textEnter.attr("y", tickLength);
lineUpdate.attr("x1", tickX).attr("x2", tickX).attr("y2", tickSize);
textUpdate.attr("x", 0).attr("y", yForText(rotate))
.style("text-anchor", textAnchorForText(rotate))
.attr("transform", textTransform(rotate));
tspan.attr('x', 0).attr("dy", tspanDy).attr('dx', dxForText(rotate));
pathUpdate.attr("d", "M" + range[0] + "," + outerTickSize + "V0H" + range[1] + "V" + outerTickSize);
lineEnter.attr('y2', innerTickSize);
textEnter.attr('y', tickLength);
lineUpdate.attr('x1', tickX).attr('x2', tickX).attr('y2', tickSize);
textUpdate.attr('x', 0).attr('y', yForText(rotate))
.style('text-anchor', textAnchorForText(rotate))
.attr('transform', textTransform(rotate));
tspan.attr('x', 0).attr('dy', tspanDy).attr('dx', dxForText(rotate));
pathUpdate.attr('d', 'M' + range[0] + ',' + outerTickSize + 'V0H' + range[1] + 'V' + outerTickSize);
break;
}
case "top":
case 'top':
{
// TODO: rotated tick text
tickTransform = axisX;
lineEnter.attr("y2", -innerTickSize);
textEnter.attr("y", -tickLength);
lineUpdate.attr("x2", 0).attr("y2", -innerTickSize);
textUpdate.attr("x", 0).attr("y", -tickLength);
text.style("text-anchor", "middle");
tspan.attr('x', 0).attr("dy", "0em");
pathUpdate.attr("d", "M" + range[0] + "," + -outerTickSize + "V0H" + range[1] + "V" + -outerTickSize);
lineEnter.attr('y2', -innerTickSize);
textEnter.attr('y', -tickLength);
lineUpdate.attr('x2', 0).attr('y2', -innerTickSize);
textUpdate.attr('x', 0).attr('y', -tickLength);
text.style('text-anchor', 'middle');
tspan.attr('x', 0).attr('dy', '0em');
pathUpdate.attr('d', 'M' + range[0] + ',' + -outerTickSize + 'V0H' + range[1] + 'V' + -outerTickSize);
break;
}
case "left":
case 'left':
{
tickTransform = axisY;
lineEnter.attr("x2", -innerTickSize);
textEnter.attr("x", -tickLength);
lineUpdate.attr("x2", -innerTickSize).attr("y1", tickY).attr("y2", tickY);
textUpdate.attr("x", -tickLength).attr("y", tickOffset);
text.style("text-anchor", "end");
tspan.attr('x', -tickLength).attr("dy", tspanDy);
pathUpdate.attr("d", "M" + -outerTickSize + "," + range[0] + "H0V" + range[1] + "H" + -outerTickSize);
lineEnter.attr('x2', -innerTickSize);
textEnter.attr('x', -tickLength);
lineUpdate.attr('x2', -innerTickSize).attr('y1', tickY).attr('y2', tickY);
textUpdate.attr('x', -tickLength).attr('y', tickOffset);
text.style('text-anchor', 'end');
tspan.attr('x', -tickLength).attr('dy', tspanDy);
pathUpdate.attr('d', 'M' + -outerTickSize + ',' + range[0] + 'H0V' + range[1] + 'H' + -outerTickSize);
break;
}
case "right":
case 'right':
{
tickTransform = axisY;
lineEnter.attr("x2", innerTickSize);
textEnter.attr("x", tickLength);
lineUpdate.attr("x2", innerTickSize).attr("y2", 0);
textUpdate.attr("x", tickLength).attr("y", 0);
text.style("text-anchor", "start");
tspan.attr('x', tickLength).attr("dy", tspanDy);
pathUpdate.attr("d", "M" + outerTickSize + "," + range[0] + "H0V" + range[1] + "H" + outerTickSize);
lineEnter.attr('x2', innerTickSize);
textEnter.attr('x', tickLength);
lineUpdate.attr('x2', innerTickSize).attr('y2', 0);
textUpdate.attr('x', tickLength).attr('y', 0);
text.style('text-anchor', 'start');
tspan.attr('x', tickLength).attr('dy', tspanDy);
pathUpdate.attr('d', 'M' + outerTickSize + ',' + range[0] + 'H0V' + range[1] + 'H' + outerTickSize);
break;
}
}
if (scale1.rangeBand) {
var x = scale1, dx = x.rangeBand() / 2;
let x = scale1, dx = x.rangeBand() / 2;
scale0 = scale1 = function (d) {
return x(d) + dx;
};
@ -297,7 +296,7 @@ function c3_axis(d3, params) {
};
axis.orient = function (x) {
if (!arguments.length) { return orient; }
orient = x in {top: 1, right: 1, bottom: 1, left: 1} ? x + "" : "bottom";
orient = x in { top: 1, right: 1, bottom: 1, left: 1 } ? x + '' : 'bottom';
return axis;
};
axis.tickFormat = function (format) {
@ -314,7 +313,7 @@ function c3_axis(d3, params) {
return tickOffset;
};
axis.tickInterval = function () {
var interval, length;
let interval, length;
if (params.isCategory) {
interval = tickOffset * 2;
}
@ -356,51 +355,50 @@ function Axis(owner) {
inherit(API, Axis);
Axis.prototype.init = function init() {
var $$ = this.owner, config = $$.config, main = $$.main;
$$.axes.x = main.append("g")
.attr("class", CLASS.axis + ' ' + CLASS.axisX)
.attr("clip-path", $$.clipPathForXAxis)
.attr("transform", $$.getTranslate('x'))
.style("visibility", config.axis_x_show ? 'visible' : 'hidden');
$$.axes.x.append("text")
.attr("class", CLASS.axisXLabel)
.attr("transform", config.axis_rotated ? "rotate(-90)" : "")
.style("text-anchor", this.textAnchorForXAxisLabel.bind(this));
$$.axes.y = main.append("g")
.attr("class", CLASS.axis + ' ' + CLASS.axisY)
.attr("clip-path", config.axis_y_inner ? "" : $$.clipPathForYAxis)
.attr("transform", $$.getTranslate('y'))
.style("visibility", config.axis_y_show ? 'visible' : 'hidden');
$$.axes.y.append("text")
.attr("class", CLASS.axisYLabel)
.attr("transform", config.axis_rotated ? "" : "rotate(-90)")
.style("text-anchor", this.textAnchorForYAxisLabel.bind(this));
$$.axes.y2 = main.append("g")
.attr("class", CLASS.axis + ' ' + CLASS.axisY2)
let $$ = this.owner, config = $$.config, main = $$.main;
$$.axes.x = main.append('g')
.attr('class', CLASS.axis + ' ' + CLASS.axisX)
.attr('clip-path', $$.clipPathForXAxis)
.attr('transform', $$.getTranslate('x'))
.style('visibility', config.axis_x_show ? 'visible' : 'hidden');
$$.axes.x.append('text')
.attr('class', CLASS.axisXLabel)
.attr('transform', config.axis_rotated ? 'rotate(-90)' : '')
.style('text-anchor', this.textAnchorForXAxisLabel.bind(this));
$$.axes.y = main.append('g')
.attr('class', CLASS.axis + ' ' + CLASS.axisY)
.attr('clip-path', config.axis_y_inner ? '' : $$.clipPathForYAxis)
.attr('transform', $$.getTranslate('y'))
.style('visibility', config.axis_y_show ? 'visible' : 'hidden');
$$.axes.y.append('text')
.attr('class', CLASS.axisYLabel)
.attr('transform', config.axis_rotated ? '' : 'rotate(-90)')
.style('text-anchor', this.textAnchorForYAxisLabel.bind(this));
$$.axes.y2 = main.append('g')
.attr('class', CLASS.axis + ' ' + CLASS.axisY2)
// clip-path?
.attr("transform", $$.getTranslate('y2'))
.style("visibility", config.axis_y2_show ? 'visible' : 'hidden');
$$.axes.y2.append("text")
.attr("class", CLASS.axisY2Label)
.attr("transform", config.axis_rotated ? "" : "rotate(-90)")
.style("text-anchor", this.textAnchorForY2AxisLabel.bind(this));
.attr('transform', $$.getTranslate('y2'))
.style('visibility', config.axis_y2_show ? 'visible' : 'hidden');
$$.axes.y2.append('text')
.attr('class', CLASS.axisY2Label)
.attr('transform', config.axis_rotated ? '' : 'rotate(-90)')
.style('text-anchor', this.textAnchorForY2AxisLabel.bind(this));
};
Axis.prototype.getXAxis = function getXAxis(scale, orient, tickFormat, tickValues, withOuterTick, withoutTransition, withoutRotateTickText) {
var $$ = this.owner, config = $$.config,
let $$ = this.owner, config = $$.config,
axisParams = {
isCategory: $$.isCategorized(),
withOuterTick: withOuterTick,
withOuterTick,
tickMultiline: config.axis_x_tick_multiline,
tickWidth: config.axis_x_tick_width,
tickTextRotate: withoutRotateTickText ? 0 : config.axis_x_tick_rotate,
withoutTransition: withoutTransition,
withoutTransition,
},
axis = c3_axis($$.d3, axisParams).scale(scale).orient(orient);
if ($$.isTimeSeries() && tickValues && typeof tickValues !== "function") {
tickValues = tickValues.map(function (v) { return $$.parseDate(v); });
if ($$.isTimeSeries() && tickValues && typeof tickValues !== 'function') {
tickValues = tickValues.map((v) => { return $$.parseDate(v); });
}
// Set tick
@ -415,7 +413,7 @@ Axis.prototype.getXAxis = function getXAxis(scale, orient, tickFormat, tickValue
return axis;
};
Axis.prototype.updateXAxisTickValues = function updateXAxisTickValues(targets, axis) {
var $$ = this.owner, config = $$.config, tickValues;
let $$ = this.owner, config = $$.config, tickValues;
if (config.axis_x_tick_fit || config.axis_x_tick_count) {
tickValues = this.generateTickValues($$.mapTargetsToUniqueXs(targets), config.axis_x_tick_count, $$.isTimeSeries());
}
@ -428,11 +426,11 @@ Axis.prototype.updateXAxisTickValues = function updateXAxisTickValues(targets, a
return tickValues;
};
Axis.prototype.getYAxis = function getYAxis(scale, orient, tickFormat, tickValues, withOuterTick, withoutTransition, withoutRotateTickText) {
var $$ = this.owner, config = $$.config,
let $$ = this.owner, config = $$.config,
axisParams = {
withOuterTick: withOuterTick,
withoutTransition: withoutTransition,
tickTextRotate: withoutRotateTickText ? 0 : config.axis_y_tick_rotate
withOuterTick,
withoutTransition,
tickTextRotate: withoutRotateTickText ? 0 : config.axis_y_tick_rotate,
},
axis = c3_axis($$.d3, axisParams).scale(scale).orient(orient).tickFormat(tickFormat);
if ($$.isTimeSeriesY()) {
@ -443,18 +441,18 @@ Axis.prototype.getYAxis = function getYAxis(scale, orient, tickFormat, tickValue
return axis;
};
Axis.prototype.getId = function getId(id) {
var config = this.owner.config;
const config = this.owner.config;
return id in config.data_axes ? config.data_axes[id] : 'y';
};
Axis.prototype.getXAxisTickFormat = function getXAxisTickFormat() {
var $$ = this.owner, config = $$.config,
let $$ = this.owner, config = $$.config,
format = $$.isTimeSeries() ? $$.defaultAxisTimeFormat : $$.isCategorized() ? $$.categoryName : function (v) { return v < 0 ? v.toFixed(0) : v; };
if (config.axis_x_tick_format) {
if (isFunction(config.axis_x_tick_format)) {
format = config.axis_x_tick_format;
} else if ($$.isTimeSeries()) {
format = function (date) {
return date ? $$.axisTimeFormat(config.axis_x_tick_format)(date) : "";
return date ? $$.axisTimeFormat(config.axis_x_tick_format)(date) : '';
};
}
}
@ -473,7 +471,7 @@ Axis.prototype.getY2AxisTickValues = function getY2AxisTickValues() {
return this.getTickValues(this.owner.config.axis_y2_tick_values, this.owner.y2Axis);
};
Axis.prototype.getLabelOptionByAxisId = function getLabelOptionByAxisId(axisId) {
var $$ = this.owner, config = $$.config, option;
let $$ = this.owner, config = $$.config, option;
if (axisId === 'y') {
option = config.axis_y_label;
} else if (axisId === 'y2') {
@ -484,11 +482,11 @@ Axis.prototype.getLabelOptionByAxisId = function getLabelOptionByAxisId(axisId)
return option;
};
Axis.prototype.getLabelText = function getLabelText(axisId) {
var option = this.getLabelOptionByAxisId(axisId);
const option = this.getLabelOptionByAxisId(axisId);
return isString(option) ? option : option ? option.text : null;
};
Axis.prototype.setLabelText = function setLabelText(axisId, text) {
var $$ = this.owner, config = $$.config,
let $$ = this.owner, config = $$.config,
option = this.getLabelOptionByAxisId(axisId);
if (isString(option)) {
if (axisId === 'y') {
@ -503,7 +501,7 @@ Axis.prototype.setLabelText = function setLabelText(axisId, text) {
}
};
Axis.prototype.getLabelPosition = function getLabelPosition(axisId, defaultPosition) {
var option = this.getLabelOptionByAxisId(axisId),
let option = this.getLabelOptionByAxisId(axisId),
position = (option && typeof option === 'object' && option.position) ? option.position : defaultPosition;
return {
isInner: position.indexOf('inner') >= 0,
@ -513,7 +511,7 @@ Axis.prototype.getLabelPosition = function getLabelPosition(axisId, defaultPosit
isRight: position.indexOf('right') >= 0,
isTop: position.indexOf('top') >= 0,
isMiddle: position.indexOf('middle') >= 0,
isBottom: position.indexOf('bottom') >= 0
isBottom: position.indexOf('bottom') >= 0,
};
};
Axis.prototype.getXAxisLabelPosition = function getXAxisLabelPosition() {
@ -538,7 +536,7 @@ Axis.prototype.textForY2AxisLabel = function textForY2AxisLabel() {
return this.getLabelText('y2');
};
Axis.prototype.xForAxisLabel = function xForAxisLabel(forHorizontal, position) {
var $$ = this.owner;
const $$ = this.owner;
if (forHorizontal) {
return position.isLeft ? 0 : position.isCenter ? $$.width / 2 : $$.width;
} else {
@ -547,9 +545,9 @@ Axis.prototype.xForAxisLabel = function xForAxisLabel(forHorizontal, position) {
};
Axis.prototype.dxForAxisLabel = function dxForAxisLabel(forHorizontal, position) {
if (forHorizontal) {
return position.isLeft ? "0.5em" : position.isRight ? "-0.5em" : "0";
return position.isLeft ? '0.5em' : position.isRight ? '-0.5em' : '0';
} else {
return position.isTop ? "-0.5em" : position.isBottom ? "0.5em" : "0";
return position.isTop ? '-0.5em' : position.isBottom ? '0.5em' : '0';
}
};
Axis.prototype.textAnchorForAxisLabel = function textAnchorForAxisLabel(forHorizontal, position) {
@ -578,46 +576,46 @@ Axis.prototype.dxForY2AxisLabel = function dxForY2AxisLabel() {
return this.dxForAxisLabel(this.owner.config.axis_rotated, this.getY2AxisLabelPosition());
};
Axis.prototype.dyForXAxisLabel = function dyForXAxisLabel() {
var $$ = this.owner, config = $$.config,
let $$ = this.owner, config = $$.config,
position = this.getXAxisLabelPosition();
if (config.axis_rotated) {
return position.isInner ? "1.2em" : -25 - this.getMaxTickWidth('x');
return position.isInner ? '1.2em' : -25 - this.getMaxTickWidth('x');
} else {
return position.isInner ? "-0.5em" : config.axis_x_height ? config.axis_x_height - 10 : "3em";
return position.isInner ? '-0.5em' : config.axis_x_height ? config.axis_x_height - 10 : '3em';
}
};
Axis.prototype.dyForYAxisLabel = function dyForYAxisLabel() {
var $$ = this.owner,
let $$ = this.owner,
position = this.getYAxisLabelPosition();
if ($$.config.axis_rotated) {
return position.isInner ? "-0.5em" : "3em";
return position.isInner ? '-0.5em' : '3em';
} else {
return position.isInner ? "1.2em" : -10 - ($$.config.axis_y_inner ? 0 : (this.getMaxTickWidth('y') + 10));
return position.isInner ? '1.2em' : -10 - ($$.config.axis_y_inner ? 0 : (this.getMaxTickWidth('y') + 10));
}
};
Axis.prototype.dyForY2AxisLabel = function dyForY2AxisLabel() {
var $$ = this.owner,
let $$ = this.owner,
position = this.getY2AxisLabelPosition();
if ($$.config.axis_rotated) {
return position.isInner ? "1.2em" : "-2.2em";
return position.isInner ? '1.2em' : '-2.2em';
} else {
return position.isInner ? "-0.5em" : 15 + ($$.config.axis_y2_inner ? 0 : (this.getMaxTickWidth('y2') + 15));
return position.isInner ? '-0.5em' : 15 + ($$.config.axis_y2_inner ? 0 : (this.getMaxTickWidth('y2') + 15));
}
};
Axis.prototype.textAnchorForXAxisLabel = function textAnchorForXAxisLabel() {
var $$ = this.owner;
const $$ = this.owner;
return this.textAnchorForAxisLabel(!$$.config.axis_rotated, this.getXAxisLabelPosition());
};
Axis.prototype.textAnchorForYAxisLabel = function textAnchorForYAxisLabel() {
var $$ = this.owner;
const $$ = this.owner;
return this.textAnchorForAxisLabel($$.config.axis_rotated, this.getYAxisLabelPosition());
};
Axis.prototype.textAnchorForY2AxisLabel = function textAnchorForY2AxisLabel() {
var $$ = this.owner;
const $$ = this.owner;
return this.textAnchorForAxisLabel($$.config.axis_rotated, this.getY2AxisLabelPosition());
};
Axis.prototype.getMaxTickWidth = function getMaxTickWidth(id, withoutRecompute) {
var $$ = this.owner, config = $$.config,
let $$ = this.owner, config = $$.config,
maxWidth = 0, targetsToShow, scale, axis, dummy, svg;
if (withoutRecompute && $$.currentMaxTickWidths[id]) {
return $$.currentMaxTickWidths[id];
@ -636,10 +634,10 @@ Axis.prototype.getMaxTickWidth = function getMaxTickWidth(id, withoutRecompute)
this.updateXAxisTickValues(targetsToShow, axis);
}
dummy = $$.d3.select('body').append('div').classed('c3', true);
svg = dummy.append("svg").style('visibility', 'hidden').style('position', 'fixed').style('top', 0).style('left', 0),
svg = dummy.append('svg').style('visibility', 'hidden').style('position', 'fixed').style('top', 0).style('left', 0),
svg.append('g').call(axis).each(function () {
$$.d3.select(this).selectAll('text').each(function () {
var box = this.getBoundingClientRect();
const box = this.getBoundingClientRect();
if (maxWidth < box.width) { maxWidth = box.width; }
});
dummy.remove();
@ -650,28 +648,28 @@ Axis.prototype.getMaxTickWidth = function getMaxTickWidth(id, withoutRecompute)
};
Axis.prototype.updateLabels = function updateLabels(withTransition) {
var $$ = this.owner;
var axisXLabel = $$.main.select('.' + CLASS.axisX + ' .' + CLASS.axisXLabel),
const $$ = this.owner;
let axisXLabel = $$.main.select('.' + CLASS.axisX + ' .' + CLASS.axisXLabel),
axisYLabel = $$.main.select('.' + CLASS.axisY + ' .' + CLASS.axisYLabel),
axisY2Label = $$.main.select('.' + CLASS.axisY2 + ' .' + CLASS.axisY2Label);
(withTransition ? axisXLabel.transition() : axisXLabel)
.attr("x", this.xForXAxisLabel.bind(this))
.attr("dx", this.dxForXAxisLabel.bind(this))
.attr("dy", this.dyForXAxisLabel.bind(this))
.attr('x', this.xForXAxisLabel.bind(this))
.attr('dx', this.dxForXAxisLabel.bind(this))
.attr('dy', this.dyForXAxisLabel.bind(this))
.text(this.textForXAxisLabel.bind(this));
(withTransition ? axisYLabel.transition() : axisYLabel)
.attr("x", this.xForYAxisLabel.bind(this))
.attr("dx", this.dxForYAxisLabel.bind(this))
.attr("dy", this.dyForYAxisLabel.bind(this))
.attr('x', this.xForYAxisLabel.bind(this))
.attr('dx', this.dxForYAxisLabel.bind(this))
.attr('dy', this.dyForYAxisLabel.bind(this))
.text(this.textForYAxisLabel.bind(this));
(withTransition ? axisY2Label.transition() : axisY2Label)
.attr("x", this.xForY2AxisLabel.bind(this))
.attr("dx", this.dxForY2AxisLabel.bind(this))
.attr("dy", this.dyForY2AxisLabel.bind(this))
.attr('x', this.xForY2AxisLabel.bind(this))
.attr('dx', this.dxForY2AxisLabel.bind(this))
.attr('dy', this.dyForY2AxisLabel.bind(this))
.text(this.textForY2AxisLabel.bind(this));
};
Axis.prototype.getPadding = function getPadding(padding, key, defaultValue, domainLength) {
var p = typeof padding === 'number' ? padding : padding[key];
const p = typeof padding === 'number' ? padding : padding[key];
if (!isValue(p)) {
return defaultValue;
}
@ -682,12 +680,12 @@ Axis.prototype.getPadding = function getPadding(padding, key, defaultValue, doma
return this.convertPixelsToAxisPadding(p, domainLength);
};
Axis.prototype.convertPixelsToAxisPadding = function convertPixelsToAxisPadding(pixels, domainLength) {
var $$ = this.owner,
let $$ = this.owner,
length = $$.config.axis_rotated ? $$.width : $$.height;
return domainLength * (pixels / length);
};
Axis.prototype.generateTickValues = function generateTickValues(values, tickCount, forTimeSeries) {
var tickValues = values, targetCount, start, end, count, interval, i, tickValue;
let tickValues = values, targetCount, start, end, count, interval, i, tickValue;
if (tickCount) {
targetCount = isFunction(tickCount) ? tickCount() : tickCount;
// compute ticks according to tickCount
@ -709,24 +707,24 @@ Axis.prototype.generateTickValues = function generateTickValues(values, tickCoun
tickValues.push(end);
}
}
if (!forTimeSeries) { tickValues = tickValues.sort(function (a, b) { return a - b; }); }
if (!forTimeSeries) { tickValues = tickValues.sort((a, b) => { return a - b; }); }
return tickValues;
};
Axis.prototype.generateTransitions = function generateTransitions(duration) {
var $$ = this.owner, axes = $$.axes;
let $$ = this.owner, axes = $$.axes;
return {
axisX: duration ? axes.x.transition().duration(duration) : axes.x,
axisY: duration ? axes.y.transition().duration(duration) : axes.y,
axisY2: duration ? axes.y2.transition().duration(duration) : axes.y2,
axisSubX: duration ? axes.subx.transition().duration(duration) : axes.subx
axisSubX: duration ? axes.subx.transition().duration(duration) : axes.subx,
};
};
Axis.prototype.redraw = function redraw(transitions, isHidden) {
var $$ = this.owner;
$$.axes.x.style("opacity", isHidden ? 0 : 1);
$$.axes.y.style("opacity", isHidden ? 0 : 1);
$$.axes.y2.style("opacity", isHidden ? 0 : 1);
$$.axes.subx.style("opacity", isHidden ? 0 : 1);
const $$ = this.owner;
$$.axes.x.style('opacity', isHidden ? 0 : 1);
$$.axes.y.style('opacity', isHidden ? 0 : 1);
$$.axes.y2.style('opacity', isHidden ? 0 : 1);
$$.axes.subx.style('opacity', isHidden ? 0 : 1);
transitions.axisX.call($$.xAxis);
transitions.axisY.call($$.yAxis);
transitions.axisY2.call($$.y2Axis);

220
es6_modules/chart.js

@ -1,9 +1,9 @@
import {CLASS,isValue,isFunction,isString,isUndefined,isDefined,ceil10,asHalfPixel,diffDomain,isEmpty,notEmpty,getOption,hasValue,sanitise,getPathBox, ChartInternal} from './chartinternal.js';
var c3_chart_fn;
let c3_chart_fn;
function Chart(config) {
var $$ = this.internal = new ChartInternal(this);
const $$ = this.internal = new ChartInternal(this);
$$.loadConfig(config);
$$.beforeInit(config);
@ -12,7 +12,7 @@ function Chart(config) {
// bind "this" to nested API
(function bindThis(fn, target, argThis) {
Object.keys(fn).forEach(function(key) {
Object.keys(fn).forEach((key) => {
target[key] = fn[key].bind(argThis);
if (Object.keys(fn[key]).length > 0) {
bindThis(fn[key], target[key], argThis);
@ -24,7 +24,7 @@ function Chart(config) {
c3_chart_fn = Chart.prototype;
c3_chart_fn.focus = function (targetIds) {
var $$ = this.internal, candidates;
let $$ = this.internal, candidates;
targetIds = $$.mapToTargetIds(targetIds);
candidates = $$.svg.selectAll($$.selectorTargets(targetIds.filter($$.isTargetToShow, $$))),
@ -38,13 +38,13 @@ c3_chart_fn.focus = function (targetIds) {
$$.toggleFocusLegend(targetIds, true);
$$.focusedTargetIds = targetIds;
$$.defocusedTargetIds = $$.defocusedTargetIds.filter(function (id) {
$$.defocusedTargetIds = $$.defocusedTargetIds.filter((id) => {
return targetIds.indexOf(id) < 0;
});
};
c3_chart_fn.defocus = function (targetIds) {
var $$ = this.internal, candidates;
let $$ = this.internal, candidates;
targetIds = $$.mapToTargetIds(targetIds);
candidates = $$.svg.selectAll($$.selectorTargets(targetIds.filter($$.isTargetToShow, $$))),
@ -55,14 +55,14 @@ c3_chart_fn.defocus = function (targetIds) {
}
$$.toggleFocusLegend(targetIds, false);
$$.focusedTargetIds = $$.focusedTargetIds.filter(function (id) {
$$.focusedTargetIds = $$.focusedTargetIds.filter((id) => {
return targetIds.indexOf(id) < 0;
});
$$.defocusedTargetIds = targetIds;
};
c3_chart_fn.revert = function (targetIds) {
var $$ = this.internal, candidates;
let $$ = this.internal, candidates;
targetIds = $$.mapToTargetIds(targetIds);
candidates = $$.svg.selectAll($$.selectorTargets(targetIds)); // should be for all targets
@ -85,7 +85,7 @@ c3_chart_fn.revert = function (targetIds) {
};
c3_chart_fn.show = function (targetIds, options) {
var $$ = this.internal, targets;
let $$ = this.internal, targets;
targetIds = $$.mapToTargetIds(targetIds);
options = options || {};
@ -95,7 +95,7 @@ c3_chart_fn.show = function (targetIds, options) {
targets.transition()
.style('opacity', 1, 'important')
.call($$.endall, function () {
.call($$.endall, () => {
targets.style('opacity', null).style('opacity', 1);
});
@ -103,11 +103,11 @@ c3_chart_fn.show = function (targetIds, options) {
$$.showLegend(targetIds);
}
$$.redraw({withUpdateOrgXDomain: true, withUpdateXDomain: true, withLegend: true});
$$.redraw({ withUpdateOrgXDomain: true, withUpdateXDomain: true, withLegend: true });
};
c3_chart_fn.hide = function (targetIds, options) {
var $$ = this.internal, targets;
let $$ = this.internal, targets;
targetIds = $$.mapToTargetIds(targetIds);
options = options || {};
@ -117,7 +117,7 @@ c3_chart_fn.hide = function (targetIds, options) {
targets.transition()
.style('opacity', 0, 'important')
.call($$.endall, function () {
.call($$.endall, () => {
targets.style('opacity', null).style('opacity', 0);
});
@ -125,41 +125,41 @@ c3_chart_fn.hide = function (targetIds, options) {
$$.hideLegend(targetIds);
}
$$.redraw({withUpdateOrgXDomain: true, withUpdateXDomain: true, withLegend: true});
$$.redraw({ withUpdateOrgXDomain: true, withUpdateXDomain: true, withLegend: true });
};
c3_chart_fn.toggle = function (targetIds, options) {
var that = this, $$ = this.internal;
$$.mapToTargetIds(targetIds).forEach(function (targetId) {
let that = this, $$ = this.internal;
$$.mapToTargetIds(targetIds).forEach((targetId) => {
$$.isTargetToShow(targetId) ? that.hide(targetId, options) : that.show(targetId, options);
});
};
c3_chart_fn.zoom = function (domain) {
var $$ = this.internal;
const $$ = this.internal;
if (domain) {
if ($$.isTimeSeries()) {
domain = domain.map(function (x) { return $$.parseDate(x); });
domain = domain.map((x) => { return $$.parseDate(x); });
}
$$.brush.extent(domain);
$$.redraw({withUpdateXDomain: true, withY: $$.config.zoom_rescale});
$$.redraw({ withUpdateXDomain: true, withY: $$.config.zoom_rescale });
$$.config.zoom_onzoom.call(this, $$.x.orgDomain());
}
return $$.brush.extent();
};
c3_chart_fn.zoom.enable = function (enabled) {
var $$ = this.internal;
const $$ = this.internal;
$$.config.zoom_enabled = enabled;
$$.updateAndRedraw();
};
c3_chart_fn.unzoom = function () {
var $$ = this.internal;
const $$ = this.internal;
$$.brush.clear().update();
$$.redraw({withUpdateXDomain: true});
$$.redraw({ withUpdateXDomain: true });
};
c3_chart_fn.zoom.max = function (max) {
var $$ = this.internal, config = $$.config, d3 = $$.d3;
let $$ = this.internal, config = $$.config, d3 = $$.d3;
if (max === 0 || max) {
config.zoom_x_max = d3.max([$$.orgXDomain[1], max]);
}
@ -169,7 +169,7 @@ c3_chart_fn.zoom.max = function (max) {
};
c3_chart_fn.zoom.min = function (min) {
var $$ = this.internal, config = $$.config, d3 = $$.d3;
let $$ = this.internal, config = $$.config, d3 = $$.d3;
if (min === 0 || min) {
config.zoom_x_min = d3.min([$$.orgXDomain[0], min]);
}
@ -185,13 +185,13 @@ c3_chart_fn.zoom.range = function (range) {
} else {
return {
max: this.domain.max(),
min: this.domain.min()
min: this.domain.min(),
};
}
};
c3_chart_fn.load = function (args) {
var $$ = this.internal, config = $$.config;
let $$ = this.internal, config = $$.config;
// update xs if specified
if (args.xs) {
$$.addXs(args.xs);
@ -202,7 +202,7 @@ c3_chart_fn.load = function (args) {
}
// update classes if exists
if ('classes' in args) {
Object.keys(args.classes).forEach(function (id) {
Object.keys(args.classes).forEach((id) => {
config.data_classes[id] = args.classes[id];
});
}
@ -212,13 +212,13 @@ c3_chart_fn.load = function (args) {
}
// update axes if exists
if ('axes' in args) {
Object.keys(args.axes).forEach(function (id) {
Object.keys(args.axes).forEach((id) => {
config.data_axes[id] = args.axes[id];
});
}
// update colors if exists
if ('colors' in args) {
Object.keys(args.colors).forEach(function (id) {
Object.keys(args.colors).forEach((id) => {
config.data_colors[id] = args.colors[id];
});
}
@ -230,7 +230,7 @@ c3_chart_fn.load = function (args) {
// unload if needed
if ('unload' in args) {
// TODO: do not unload if target will load (included in url/rows/columns)
$$.unload($$.mapToTargetIds((typeof args.unload === 'boolean' && args.unload) ? null : args.unload), function () {
$$.unload($$.mapToTargetIds((typeof args.unload === 'boolean' && args.unload) ? null : args.unload), () => {
$$.loadFromArgs(args);
});
} else {
@ -239,21 +239,21 @@ c3_chart_fn.load = function (args) {
};
c3_chart_fn.unload = function (args) {
var $$ = this.internal;
const $$ = this.internal;
args = args || {};
if (args instanceof Array) {
args = {ids: args};
args = { ids: args };
} else if (typeof args === 'string') {
args = {ids: [args]};
args = { ids: [args] };
}
$$.unload($$.mapToTargetIds(args.ids), function () {
$$.redraw({withUpdateOrgXDomain: true, withUpdateXDomain: true, withLegend: true});
$$.unload($$.mapToTargetIds(args.ids), () => {
$$.redraw({ withUpdateOrgXDomain: true, withUpdateXDomain: true, withLegend: true });
if (args.done) { args.done(); }
});
};
c3_chart_fn.flow = function(args) {
var $$ = this.internal,
c3_chart_fn.flow = function (args) {
let $$ = this.internal,
targets, data, notfoundIds = [],
orgDataCount = $$.getMaxDataCount(),
dataCount, domain, baseTarget, baseValue, length = 0,
@ -272,8 +272,8 @@ c3_chart_fn.flow = function(args) {
targets = $$.convertDataToTargets(data, true);
// Update/Add data
$$.data.targets.forEach(function(t) {
var found = false,
$$.data.targets.forEach((t) => {
let found = false,
i, j;
for (i = 0; i < targets.length; i++) {
if (t.id === targets[i].id) {
@ -300,8 +300,8 @@ c3_chart_fn.flow = function(args) {
});
// Append null for not found targets
$$.data.targets.forEach(function(t) {
var i, j;
$$.data.targets.forEach((t) => {
let i, j;
for (i = 0; i < notfoundIds.length; i++) {
if (t.id === notfoundIds[i]) {
tail = t.values[t.values.length - 1].index + 1;
@ -310,7 +310,7 @@ c3_chart_fn.flow = function(args) {
id: t.id,
index: tail + j,
x: $$.isTimeSeries() ? $$.getOtherTargetX(tail + j) : tail + j,
value: null
value: null,
});
}
}
@ -319,17 +319,17 @@ c3_chart_fn.flow = function(args) {
// Generate null values for new target
if ($$.data.targets.length) {
targets.forEach(function(t) {
var i, missing = [];
targets.forEach((t) => {
let i, missing = [];
for (i = $$.data.targets[0].values[0].index; i < tail; i++) {
missing.push({
id: t.id,
index: i,
x: $$.isTimeSeries() ? $$.getOtherTargetX(i) : i,
value: null
value: null,
});
}
t.values.forEach(function(v) {
t.values.forEach((v) => {
v.index += tail;
if (!$$.isTimeSeries()) {
v.x += tail;
@ -349,7 +349,7 @@ c3_chart_fn.flow = function(args) {
if (isDefined(args.to)) {
length = 0;
to = $$.isTimeSeries() ? $$.parseDate(args.to) : args.to;
baseTarget.values.forEach(function(v) {
baseTarget.values.forEach((v) => {
if (v.x < to) { length++; }
});
} else if (isDefined(args.length)) {
@ -384,10 +384,10 @@ c3_chart_fn.flow = function(args) {
$$.redraw({
flow: {
index: baseValue.index,
length: length,
length,
duration: isValue(args.duration) ? args.duration : $$.config.transition_duration,
done: args.done,
orgDataCount: orgDataCount,
orgDataCount,
},
withLegend: true,
withTransition: orgDataCount > 1,
@ -397,18 +397,18 @@ c3_chart_fn.flow = function(args) {
};
c3_chart_fn.selected = function (targetId) {
var $$ = this.internal, d3 = $$.d3;
let $$ = this.internal, d3 = $$.d3;
return d3.merge(
$$.main.selectAll('.' + CLASS.shapes + $$.getTargetSelectorSuffix(targetId)).selectAll('.' + CLASS.shape)
.filter(function () { return d3.select(this).classed(CLASS.SELECTED); })
.map(function (d) { return d.map(function (d) { var data = d.__data__; return data.data ? data.data : data; }); })
.map((d) => { return d.map((d) => { const data = d.__data__; return data.data ? data.data : data; }); })
);
};
c3_chart_fn.select = function (ids, indices, resetOther) {
var $$ = this.internal, d3 = $$.d3, config = $$.config;
if (! config.data_selection_enabled) { return; }
let $$ = this.internal, d3 = $$.d3, config = $$.config;
if (!config.data_selection_enabled) { return; }
$$.main.selectAll('.' + CLASS.shapes).selectAll('.' + CLASS.shape).each(function (d, i) {
var shape = d3.select(this), id = d.data ? d.data.id : d.id,
let shape = d3.select(this), id = d.data ? d.data.id : d.id,
toggle = $$.getToggle(this, d).bind($$),
isTargetId = config.data_selection_grouped || !ids || ids.indexOf(id) >= 0,
isTargetIndex = !indices || indices.indexOf(i) >= 0,
@ -429,10 +429,10 @@ c3_chart_fn.select = function (ids, indices, resetOther) {
});
};
c3_chart_fn.unselect = function (ids, indices) {
var $$ = this.internal, d3 = $$.d3, config = $$.config;
if (! config.data_selection_enabled) { return; }
let $$ = this.internal, d3 = $$.d3, config = $$.config;
if (!config.data_selection_enabled) { return; }
$$.main.selectAll('.' + CLASS.shapes).selectAll('.' + CLASS.shape).each(function (d, i) {
var shape = d3.select(this), id = d.data ? d.data.id : d.id,
let shape = d3.select(this), id = d.data ? d.data.id : d.id,
toggle = $$.getToggle(this, d).bind($$),
isTargetId = config.data_selection_grouped || !ids || ids.indexOf(id) >= 0,
isTargetIndex = !indices || indices.indexOf(i) >= 0,
@ -451,14 +451,14 @@ c3_chart_fn.unselect = function (ids, indices) {
});
};
c3_chart_fn.transform = function(type, targetIds) {
var $$ = this.internal,
c3_chart_fn.transform = function (type, targetIds) {
let $$ = this.internal,
options = ['pie', 'donut'].indexOf(type) >= 0 ? { withTransform: true } : null;
$$.transformTo(targetIds, type, options);
};
c3_chart_fn.groups = function (groups) {
var $$ = this.internal, config = $$.config;
let $$ = this.internal, config = $$.config;
if (isUndefined(groups)) { return config.data_groups; }
config.data_groups = groups;
$$.redraw();
@ -466,70 +466,70 @@ c3_chart_fn.groups = function (groups) {
};
c3_chart_fn.xgrids = function (grids) {
var $$ = this.internal, config = $$.config;
if (! grids) { return config.grid_x_lines; }
let $$ = this.internal, config = $$.config;
if (!grids) { return config.grid_x_lines; }
config.grid_x_lines = grids;
$$.redrawWithoutRescale();
return config.grid_x_lines;
};
c3_chart_fn.xgrids.add = function (grids) {
var $$ = this.internal;
const $$ = this.internal;
return this.xgrids($$.config.grid_x_lines.concat(grids ? grids : []));
};
c3_chart_fn.xgrids.remove = function (params) { // TODO: multiple
var $$ = this.internal;
const $$ = this.internal;
$$.removeGridLines(params, true);
};
c3_chart_fn.ygrids = function (grids) {
var $$ = this.internal, config = $$.config;
if (! grids) { return config.grid_y_lines; }
let $$ = this.internal, config = $$.config;
if (!grids) { return config.grid_y_lines; }
config.grid_y_lines = grids;
$$.redrawWithoutRescale();
return config.grid_y_lines;
};
c3_chart_fn.ygrids.add = function (grids) {
var $$ = this.internal;
const $$ = this.internal;
return this.ygrids($$.config.grid_y_lines.concat(grids ? grids : []));
};
c3_chart_fn.ygrids.remove = function (params) { // TODO: multiple
var $$ = this.internal;
const $$ = this.internal;
$$.removeGridLines(params, false);
};
c3_chart_fn.regions = function (regions) {
var $$ = this.internal, config = $$.config;
let $$ = this.internal, config = $$.config;
if (!regions) { return config.regions; }
config.regions = regions;
$$.redrawWithoutRescale();
return config.regions;
};
c3_chart_fn.regions.add = function (regions) {
var $$ = this.internal, config = $$.config;
let $$ = this.internal, config = $$.config;
if (!regions) { return config.regions; }
config.regions = config.regions.concat(regions);
$$.redrawWithoutRescale();
return config.regions;
};
c3_chart_fn.regions.remove = function (options) {
var $$ = this.internal, config = $$.config,
let $$ = this.internal, config = $$.config,
duration, classes, regions;
options = options || {};
duration = $$.getOption(options, "duration", config.transition_duration);
classes = $$.getOption(options, "classes", [CLASS.region]);
duration = $$.getOption(options, 'duration', config.transition_duration);
classes = $$.getOption(options, 'classes', [CLASS.region]);
regions = $$.main.select('.' + CLASS.regions).selectAll(classes.map(function (c) { return '.' + c; }));
regions = $$.main.select('.' + CLASS.regions).selectAll(classes.map((c) => { return '.' + c; }));
(duration ? regions.transition().duration(duration) : regions)
.style('opacity', 0)
.remove();
config.regions = config.regions.filter(function (region) {
var found = false;
if (!region['class']) {
config.regions = config.regions.filter((region) => {
let found = false;
if (!region.class) {
return true;
}
region['class'].split(' ').forEach(function (c) {
region.class.split(' ').forEach((c) => {
if (classes.indexOf(c) >= 0) { found = true; }
});
return !found;
@ -539,8 +539,8 @@ c3_chart_fn.regions.remove = function (options) {
};
c3_chart_fn.data = function (targetIds) {
var targets = this.internal.data.targets;
return typeof targetIds === 'undefined' ? targets : targets.filter(function (t) {
const targets = this.internal.data.targets;
return typeof targetIds === 'undefined' ? targets : targets.filter((t) => {
return [].concat(targetIds).indexOf(t.id) >= 0;
});
};
@ -548,10 +548,10 @@ c3_chart_fn.data.shown = function (targetIds) {
return this.internal.filterTargetsToShow(this.data(targetIds));
};
c3_chart_fn.data.values = function (targetId) {
var targets, values = null;
let targets, values = null;
if (targetId) {
targets = this.data(targetId);
values = targets[0] ? targets[0].values.map(function (d) { return d.value; }) : null;
values = targets[0] ? targets[0].values.map((d) => { return d.value; }) : null;
}
return values;
};
@ -567,7 +567,7 @@ c3_chart_fn.data.axes = function (axes) {
};
c3_chart_fn.category = function (i, category) {
var $$ = this.internal, config = $$.config;
let $$ = this.internal, config = $$.config;
if (arguments.length > 1) {
config.axis_x_categories[i] = category;
$$.redraw();
@ -575,7 +575,7 @@ c3_chart_fn.category = function (i, category) {
return config.axis_x_categories[i];
};
c3_chart_fn.categories = function (categories) {
var $$ = this.internal, config = $$.config;
let $$ = this.internal, config = $$.config;
if (!arguments.length) { return config.axis_x_categories; }
config.axis_x_categories = categories;
$$.redraw();
@ -584,32 +584,32 @@ c3_chart_fn.categories = function (categories) {
// TODO: fix
c3_chart_fn.color = function (id) {
var $$ = this.internal;
const $$ = this.internal;
return $$.color(id); // more patterns
};
c3_chart_fn.x = function (x) {
var $$ = this.internal;
const $$ = this.internal;
if (arguments.length) {
$$.updateTargetX($$.data.targets, x);
$$.redraw({withUpdateOrgXDomain: true, withUpdateXDomain: true});
$$.redraw({ withUpdateOrgXDomain: true, withUpdateXDomain: true });
}
return $$.data.xs;
};
c3_chart_fn.xs = function (xs) {
var $$ = this.internal;
const $$ = this.internal;
if (arguments.length) {
$$.updateTargetXs($$.data.targets, xs);
$$.redraw({withUpdateOrgXDomain: true, withUpdateXDomain: true});
$$.redraw({ withUpdateOrgXDomain: true, withUpdateXDomain: true });
}
return $$.data.xs;
};
c3_chart_fn.axis = function () {};
c3_chart_fn.axis.labels = function (labels) {
var $$ = this.internal;
const $$ = this.internal;
if (arguments.length) {
Object.keys(labels).forEach(function (axisId) {
Object.keys(labels).forEach((axisId) => {
$$.axis.setLabelText(axisId, labels[axisId]);
});
$$.axis.updateLabels();
@ -617,7 +617,7 @@ c3_chart_fn.axis.labels = function (labels) {
// TODO: return some values?
};
c3_chart_fn.axis.max = function (max) {
var $$ = this.internal, config = $$.config;
let $$ = this.internal, config = $$.config;
if (arguments.length) {
if (typeof max === 'object') {
if (isValue(max.x)) { config.axis_x_max = max.x; }
@ -626,17 +626,17 @@ c3_chart_fn.axis.max = function (max) {
} else {
config.axis_y_max = config.axis_y2_max = max;
}
$$.redraw({withUpdateOrgXDomain: true, withUpdateXDomain: true});
$$.redraw({ withUpdateOrgXDomain: true, withUpdateXDomain: true });
} else {
return {
x: config.axis_x_max,
y: config.axis_y_max,
y2: config.axis_y2_max
y2: config.axis_y2_max,
};
}
};
c3_chart_fn.axis.min = function (min) {
var $$ = this.internal, config = $$.config;
let $$ = this.internal, config = $$.config;
if (arguments.length) {
if (typeof min === 'object') {
if (isValue(min.x)) { config.axis_x_min = min.x; }
@ -645,12 +645,12 @@ c3_chart_fn.axis.min = function (min) {
} else {
config.axis_y_min = config.axis_y2_min = min;
}
$$.redraw({withUpdateOrgXDomain: true, withUpdateXDomain: true});
$$.redraw({ withUpdateOrgXDomain: true, withUpdateXDomain: true });
} else {
return {
x: config.axis_x_min,
y: config.axis_y_min,
y2: config.axis_y2_min
y2: config.axis_y2_min,
};
}
};
@ -661,37 +661,37 @@ c3_chart_fn.axis.range = function (range) {
} else {
return {
max: this.axis.max(),
min: this.axis.min()
min: this.axis.min(),
};
}
};
c3_chart_fn.legend = function () {};
c3_chart_fn.legend.show = function (targetIds) {
var $$ = this.internal;
const $$ = this.internal;
$$.showLegend($$.mapToTargetIds(targetIds));
$$.updateAndRedraw({withLegend: true});
$$.updateAndRedraw({ withLegend: true });
};
c3_chart_fn.legend.hide = function (targetIds) {
var $$ = this.internal;
const $$ = this.internal;
$$.hideLegend($$.mapToTargetIds(targetIds));
$$.updateAndRedraw({withLegend: true});
$$.updateAndRedraw({ withLegend: true });
};
c3_chart_fn.resize = function (size) {
var $$ = this.internal, config = $$.config;
let $$ = this.internal, config = $$.config;
config.size_width = size ? size.width : null;
config.size_height = size ? size.height : null;
this.flush();
};
c3_chart_fn.flush = function () {
var $$ = this.internal;
$$.updateAndRedraw({withLegend: true, withTransition: false, withTransitionForTransform: false});
const $$ = this.internal;
$$.updateAndRedraw({ withLegend: true, withTransition: false, withTransitionForTransform: false });
};
c3_chart_fn.destroy = function () {
var $$ = this.internal;
const $$ = this.internal;
window.clearInterval($$.intervalForObserveInserted);
@ -704,17 +704,17 @@ c3_chart_fn.destroy = function () {
} else if (window.removeEventListener) {
window.removeEventListener('resize', $$.resizeFunction);
} else {
var wrapper = window.onresize;
const wrapper = window.onresize;
// check if no one else removed our wrapper and remove our resizeFunction from it
if (wrapper && wrapper.add && wrapper.remove) {
wrapper.remove($$.resizeFunction);
}
}
$$.selectChart.classed('c3', false).html("");
$$.selectChart.classed('c3', false).html('');
// MEMO: this is needed because the reference of some elements will not be released, then memory leak will happen.
Object.keys($$).forEach(function (key) {
Object.keys($$).forEach((key) => {
$$[key] = null;
});
@ -723,7 +723,7 @@ c3_chart_fn.destroy = function () {
c3_chart_fn.tooltip = function () {};
c3_chart_fn.tooltip.show = function (args) {
var $$ = this.internal, index, mouse;
let $$ = this.internal, index, mouse;
// determine mouse position on the chart
if (args.mouse) {

2201
es6_modules/chartinternal.js

File diff suppressed because it is too large Load Diff

171
src/axis/axis.js

@ -5,51 +5,50 @@ function Axis(owner) {
inherit(API, Axis);
Axis.prototype.init = function init() {
let $$ = this.owner, config = $$.config, main = $$.main;
$$.axes.x = main.append('g')
.attr('class', CLASS.axis + ' ' + CLASS.axisX)
.attr('clip-path', $$.clipPathForXAxis)
.attr('transform', $$.getTranslate('x'))
.style('visibility', config.axis_x_show ? 'visible' : 'hidden');
$$.axes.x.append('text')
.attr('class', CLASS.axisXLabel)
.attr('transform', config.axis_rotated ? 'rotate(-90)' : '')
.style('text-anchor', this.textAnchorForXAxisLabel.bind(this));
$$.axes.y = main.append('g')
.attr('class', CLASS.axis + ' ' + CLASS.axisY)
.attr('clip-path', config.axis_y_inner ? '' : $$.clipPathForYAxis)
.attr('transform', $$.getTranslate('y'))
.style('visibility', config.axis_y_show ? 'visible' : 'hidden');
$$.axes.y.append('text')
.attr('class', CLASS.axisYLabel)
.attr('transform', config.axis_rotated ? '' : 'rotate(-90)')
.style('text-anchor', this.textAnchorForYAxisLabel.bind(this));
var $$ = this.owner, config = $$.config, main = $$.main;
$$.axes.x = main.append("g")
.attr("class", CLASS.axis + ' ' + CLASS.axisX)
.attr("clip-path", $$.clipPathForXAxis)
.attr("transform", $$.getTranslate('x'))
.style("visibility", config.axis_x_show ? 'visible' : 'hidden');
$$.axes.x.append("text")
.attr("class", CLASS.axisXLabel)
.attr("transform", config.axis_rotated ? "rotate(-90)" : "")
.style("text-anchor", this.textAnchorForXAxisLabel.bind(this));
$$.axes.y = main.append("g")
.attr("class", CLASS.axis + ' ' + CLASS.axisY)
.attr("clip-path", config.axis_y_inner ? "" : $$.clipPathForYAxis)
.attr("transform", $$.getTranslate('y'))
.style("visibility", config.axis_y_show ? 'visible' : 'hidden');
$$.axes.y.append("text")
.attr("class", CLASS.axisYLabel)
.attr("transform", config.axis_rotated ? "" : "rotate(-90)")
.style("text-anchor", this.textAnchorForYAxisLabel.bind(this));
$$.axes.y2 = main.append("g")
.attr("class", CLASS.axis + ' ' + CLASS.axisY2)
$$.axes.y2 = main.append('g')
.attr('class', CLASS.axis + ' ' + CLASS.axisY2)
// clip-path?
.attr("transform", $$.getTranslate('y2'))
.style("visibility", config.axis_y2_show ? 'visible' : 'hidden');
$$.axes.y2.append("text")
.attr("class", CLASS.axisY2Label)
.attr("transform", config.axis_rotated ? "" : "rotate(-90)")
.style("text-anchor", this.textAnchorForY2AxisLabel.bind(this));
.attr('transform', $$.getTranslate('y2'))
.style('visibility', config.axis_y2_show ? 'visible' : 'hidden');
$$.axes.y2.append('text')
.attr('class', CLASS.axisY2Label)
.attr('transform', config.axis_rotated ? '' : 'rotate(-90)')
.style('text-anchor', this.textAnchorForY2AxisLabel.bind(this));
};
Axis.prototype.getXAxis = function getXAxis(scale, orient, tickFormat, tickValues, withOuterTick, withoutTransition, withoutRotateTickText) {
var $$ = this.owner, config = $$.config,
let $$ = this.owner, config = $$.config,
axisParams = {
isCategory: $$.isCategorized(),
withOuterTick: withOuterTick,
withOuterTick,
tickMultiline: config.axis_x_tick_multiline,
tickWidth: config.axis_x_tick_width,
tickTextRotate: withoutRotateTickText ? 0 : config.axis_x_tick_rotate,
withoutTransition: withoutTransition,
withoutTransition,
},
axis = c3_axis($$.d3, axisParams).scale(scale).orient(orient);
if ($$.isTimeSeries() && tickValues && typeof tickValues !== "function") {
tickValues = tickValues.map(function (v) { return $$.parseDate(v); });
if ($$.isTimeSeries() && tickValues && typeof tickValues !== 'function') {
tickValues = tickValues.map((v) => { return $$.parseDate(v); });
}
// Set tick
@ -64,7 +63,7 @@ Axis.prototype.getXAxis = function getXAxis(scale, orient, tickFormat, tickValue
return axis;
};
Axis.prototype.updateXAxisTickValues = function updateXAxisTickValues(targets, axis) {
var $$ = this.owner, config = $$.config, tickValues;
let $$ = this.owner, config = $$.config, tickValues;
if (config.axis_x_tick_fit || config.axis_x_tick_count) {
tickValues = this.generateTickValues($$.mapTargetsToUniqueXs(targets), config.axis_x_tick_count, $$.isTimeSeries());
}
@ -77,11 +76,11 @@ Axis.prototype.updateXAxisTickValues = function updateXAxisTickValues(targets, a
return tickValues;
};
Axis.prototype.getYAxis = function getYAxis(scale, orient, tickFormat, tickValues, withOuterTick, withoutTransition, withoutRotateTickText) {
var $$ = this.owner, config = $$.config,
let $$ = this.owner, config = $$.config,
axisParams = {
withOuterTick: withOuterTick,
withoutTransition: withoutTransition,
tickTextRotate: withoutRotateTickText ? 0 : config.axis_y_tick_rotate
withOuterTick,
withoutTransition,
tickTextRotate: withoutRotateTickText ? 0 : config.axis_y_tick_rotate,
},
axis = c3_axis($$.d3, axisParams).scale(scale).orient(orient).tickFormat(tickFormat);
if ($$.isTimeSeriesY()) {
@ -92,18 +91,18 @@ Axis.prototype.getYAxis = function getYAxis(scale, orient, tickFormat, tickValue
return axis;
};
Axis.prototype.getId = function getId(id) {
var config = this.owner.config;
const config = this.owner.config;
return id in config.data_axes ? config.data_axes[id] : 'y';
};
Axis.prototype.getXAxisTickFormat = function getXAxisTickFormat() {
var $$ = this.owner, config = $$.config,
let $$ = this.owner, config = $$.config,
format = $$.isTimeSeries() ? $$.defaultAxisTimeFormat : $$.isCategorized() ? $$.categoryName : function (v) { return v < 0 ? v.toFixed(0) : v; };
if (config.axis_x_tick_format) {
if (isFunction(config.axis_x_tick_format)) {
format = config.axis_x_tick_format;
} else if ($$.isTimeSeries()) {
format = function (date) {
return date ? $$.axisTimeFormat(config.axis_x_tick_format)(date) : "";
return date ? $$.axisTimeFormat(config.axis_x_tick_format)(date) : '';
};
}
}
@ -122,7 +121,7 @@ Axis.prototype.getY2AxisTickValues = function getY2AxisTickValues() {
return this.getTickValues(this.owner.config.axis_y2_tick_values, this.owner.y2Axis);
};
Axis.prototype.getLabelOptionByAxisId = function getLabelOptionByAxisId(axisId) {
var $$ = this.owner, config = $$.config, option;
let $$ = this.owner, config = $$.config, option;
if (axisId === 'y') {
option = config.axis_y_label;
} else if (axisId === 'y2') {
@ -133,11 +132,11 @@ Axis.prototype.getLabelOptionByAxisId = function getLabelOptionByAxisId(axisId)
return option;
};
Axis.prototype.getLabelText = function getLabelText(axisId) {
var option = this.getLabelOptionByAxisId(axisId);
const option = this.getLabelOptionByAxisId(axisId);
return isString(option) ? option : option ? option.text : null;
};
Axis.prototype.setLabelText = function setLabelText(axisId, text) {
var $$ = this.owner, config = $$.config,
let $$ = this.owner, config = $$.config,
option = this.getLabelOptionByAxisId(axisId);
if (isString(option)) {
if (axisId === 'y') {
@ -152,7 +151,7 @@ Axis.prototype.setLabelText = function setLabelText(axisId, text) {
}
};
Axis.prototype.getLabelPosition = function getLabelPosition(axisId, defaultPosition) {
var option = this.getLabelOptionByAxisId(axisId),
let option = this.getLabelOptionByAxisId(axisId),
position = (option && typeof option === 'object' && option.position) ? option.position : defaultPosition;
return {
isInner: position.indexOf('inner') >= 0,
@ -162,7 +161,7 @@ Axis.prototype.getLabelPosition = function getLabelPosition(axisId, defaultPosit
isRight: position.indexOf('right') >= 0,
isTop: position.indexOf('top') >= 0,
isMiddle: position.indexOf('middle') >= 0,
isBottom: position.indexOf('bottom') >= 0
isBottom: position.indexOf('bottom') >= 0,
};
};
Axis.prototype.getXAxisLabelPosition = function getXAxisLabelPosition() {
@ -187,7 +186,7 @@ Axis.prototype.textForY2AxisLabel = function textForY2AxisLabel() {
return this.getLabelText('y2');
};
Axis.prototype.xForAxisLabel = function xForAxisLabel(forHorizontal, position) {
var $$ = this.owner;
const $$ = this.owner;
if (forHorizontal) {
return position.isLeft ? 0 : position.isCenter ? $$.width / 2 : $$.width;
} else {
@ -196,9 +195,9 @@ Axis.prototype.xForAxisLabel = function xForAxisLabel(forHorizontal, position) {
};
Axis.prototype.dxForAxisLabel = function dxForAxisLabel(forHorizontal, position) {
if (forHorizontal) {
return position.isLeft ? "0.5em" : position.isRight ? "-0.5em" : "0";
return position.isLeft ? '0.5em' : position.isRight ? '-0.5em' : '0';
} else {
return position.isTop ? "-0.5em" : position.isBottom ? "0.5em" : "0";
return position.isTop ? '-0.5em' : position.isBottom ? '0.5em' : '0';
}
};
Axis.prototype.textAnchorForAxisLabel = function textAnchorForAxisLabel(forHorizontal, position) {
@ -227,46 +226,46 @@ Axis.prototype.dxForY2AxisLabel = function dxForY2AxisLabel() {
return this.dxForAxisLabel(this.owner.config.axis_rotated, this.getY2AxisLabelPosition());
};
Axis.prototype.dyForXAxisLabel = function dyForXAxisLabel() {
var $$ = this.owner, config = $$.config,
let $$ = this.owner, config = $$.config,
position = this.getXAxisLabelPosition();
if (config.axis_rotated) {
return position.isInner ? "1.2em" : -25 - this.getMaxTickWidth('x');
return position.isInner ? '1.2em' : -25 - this.getMaxTickWidth('x');
} else {
return position.isInner ? "-0.5em" : config.axis_x_height ? config.axis_x_height - 10 : "3em";
return position.isInner ? '-0.5em' : config.axis_x_height ? config.axis_x_height - 10 : '3em';
}
};
Axis.prototype.dyForYAxisLabel = function dyForYAxisLabel() {
var $$ = this.owner,
let $$ = this.owner,
position = this.getYAxisLabelPosition();
if ($$.config.axis_rotated) {
return position.isInner ? "-0.5em" : "3em";
return position.isInner ? '-0.5em' : '3em';
} else {
return position.isInner ? "1.2em" : -10 - ($$.config.axis_y_inner ? 0 : (this.getMaxTickWidth('y') + 10));
return position.isInner ? '1.2em' : -10 - ($$.config.axis_y_inner ? 0 : (this.getMaxTickWidth('y') + 10));
}
};
Axis.prototype.dyForY2AxisLabel = function dyForY2AxisLabel() {
var $$ = this.owner,
let $$ = this.owner,
position = this.getY2AxisLabelPosition();
if ($$.config.axis_rotated) {
return position.isInner ? "1.2em" : "-2.2em";
return position.isInner ? '1.2em' : '-2.2em';
} else {
return position.isInner ? "-0.5em" : 15 + ($$.config.axis_y2_inner ? 0 : (this.getMaxTickWidth('y2') + 15));
return position.isInner ? '-0.5em' : 15 + ($$.config.axis_y2_inner ? 0 : (this.getMaxTickWidth('y2') + 15));
}
};
Axis.prototype.textAnchorForXAxisLabel = function textAnchorForXAxisLabel() {
var $$ = this.owner;
const $$ = this.owner;
return this.textAnchorForAxisLabel(!$$.config.axis_rotated, this.getXAxisLabelPosition());
};
Axis.prototype.textAnchorForYAxisLabel = function textAnchorForYAxisLabel() {
var $$ = this.owner;
const $$ = this.owner;
return this.textAnchorForAxisLabel($$.config.axis_rotated, this.getYAxisLabelPosition());
};
Axis.prototype.textAnchorForY2AxisLabel = function textAnchorForY2AxisLabel() {
var $$ = this.owner;
const $$ = this.owner;
return this.textAnchorForAxisLabel($$.config.axis_rotated, this.getY2AxisLabelPosition());
};
Axis.prototype.getMaxTickWidth = function getMaxTickWidth(id, withoutRecompute) {
var $$ = this.owner, config = $$.config,
let $$ = this.owner, config = $$.config,
maxWidth = 0, targetsToShow, scale, axis, dummy, svg;
if (withoutRecompute && $$.currentMaxTickWidths[id]) {
return $$.currentMaxTickWidths[id];
@ -285,10 +284,10 @@ Axis.prototype.getMaxTickWidth = function getMaxTickWidth(id, withoutRecompute)
this.updateXAxisTickValues(targetsToShow, axis);
}
dummy = $$.d3.select('body').append('div').classed('c3', true);
svg = dummy.append("svg").style('visibility', 'hidden').style('position', 'fixed').style('top', 0).style('left', 0),
svg = dummy.append('svg').style('visibility', 'hidden').style('position', 'fixed').style('top', 0).style('left', 0),
svg.append('g').call(axis).each(function () {
$$.d3.select(this).selectAll('text').each(function () {
var box = this.getBoundingClientRect();
const box = this.getBoundingClientRect();
if (maxWidth < box.width) { maxWidth = box.width; }
});
dummy.remove();
@ -299,28 +298,28 @@ Axis.prototype.getMaxTickWidth = function getMaxTickWidth(id, withoutRecompute)
};
Axis.prototype.updateLabels = function updateLabels(withTransition) {
var $$ = this.owner;
var axisXLabel = $$.main.select('.' + CLASS.axisX + ' .' + CLASS.axisXLabel),
const $$ = this.owner;
let axisXLabel = $$.main.select('.' + CLASS.axisX + ' .' + CLASS.axisXLabel),
axisYLabel = $$.main.select('.' + CLASS.axisY + ' .' + CLASS.axisYLabel),
axisY2Label = $$.main.select('.' + CLASS.axisY2 + ' .' + CLASS.axisY2Label);
(withTransition ? axisXLabel.transition() : axisXLabel)
.attr("x", this.xForXAxisLabel.bind(this))
.attr("dx", this.dxForXAxisLabel.bind(this))
.attr("dy", this.dyForXAxisLabel.bind(this))
.attr('x', this.xForXAxisLabel.bind(this))
.attr('dx', this.dxForXAxisLabel.bind(this))
.attr('dy', this.dyForXAxisLabel.bind(this))
.text(this.textForXAxisLabel.bind(this));
(withTransition ? axisYLabel.transition() : axisYLabel)
.attr("x", this.xForYAxisLabel.bind(this))
.attr("dx", this.dxForYAxisLabel.bind(this))
.attr("dy", this.dyForYAxisLabel.bind(this))
.attr('x', this.xForYAxisLabel.bind(this))
.attr('dx', this.dxForYAxisLabel.bind(this))
.attr('dy', this.dyForYAxisLabel.bind(this))
.text(this.textForYAxisLabel.bind(this));
(withTransition ? axisY2Label.transition() : axisY2Label)
.attr("x", this.xForY2AxisLabel.bind(this))
.attr("dx", this.dxForY2AxisLabel.bind(this))
.attr("dy", this.dyForY2AxisLabel.bind(this))
.attr('x', this.xForY2AxisLabel.bind(this))
.attr('dx', this.dxForY2AxisLabel.bind(this))
.attr('dy', this.dyForY2AxisLabel.bind(this))
.text(this.textForY2AxisLabel.bind(this));
};
Axis.prototype.getPadding = function getPadding(padding, key, defaultValue, domainLength) {
var p = typeof padding === 'number' ? padding : padding[key];
const p = typeof padding === 'number' ? padding : padding[key];
if (!isValue(p)) {
return defaultValue;
}
@ -331,12 +330,12 @@ Axis.prototype.getPadding = function getPadding(padding, key, defaultValue, doma
return this.convertPixelsToAxisPadding(p, domainLength);
};
Axis.prototype.convertPixelsToAxisPadding = function convertPixelsToAxisPadding(pixels, domainLength) {
var $$ = this.owner,
let $$ = this.owner,
length = $$.config.axis_rotated ? $$.width : $$.height;
return domainLength * (pixels / length);
};
Axis.prototype.generateTickValues = function generateTickValues(values, tickCount, forTimeSeries) {
var tickValues = values, targetCount, start, end, count, interval, i, tickValue;
let tickValues = values, targetCount, start, end, count, interval, i, tickValue;
if (tickCount) {
targetCount = isFunction(tickCount) ? tickCount() : tickCount;
// compute ticks according to tickCount
@ -358,24 +357,24 @@ Axis.prototype.generateTickValues = function generateTickValues(values, tickCoun
tickValues.push(end);
}
}
if (!forTimeSeries) { tickValues = tickValues.sort(function (a, b) { return a - b; }); }
if (!forTimeSeries) { tickValues = tickValues.sort((a, b) => { return a - b; }); }
return tickValues;
};
Axis.prototype.generateTransitions = function generateTransitions(duration) {
var $$ = this.owner, axes = $$.axes;
let $$ = this.owner, axes = $$.axes;
return {
axisX: duration ? axes.x.transition().duration(duration) : axes.x,
axisY: duration ? axes.y.transition().duration(duration) : axes.y,
axisY2: duration ? axes.y2.transition().duration(duration) : axes.y2,
axisSubX: duration ? axes.subx.transition().duration(duration) : axes.subx
axisSubX: duration ? axes.subx.transition().duration(duration) : axes.subx,
};
};
Axis.prototype.redraw = function redraw(transitions, isHidden) {
var $$ = this.owner;
$$.axes.x.style("opacity", isHidden ? 0 : 1);
$$.axes.y.style("opacity", isHidden ? 0 : 1);
$$.axes.y2.style("opacity", isHidden ? 0 : 1);
$$.axes.subx.style("opacity", isHidden ? 0 : 1);
const $$ = this.owner;
$$.axes.x.style('opacity', isHidden ? 0 : 1);
$$.axes.y.style('opacity', isHidden ? 0 : 1);
$$.axes.y2.style('opacity', isHidden ? 0 : 1);
$$.axes.subx.style('opacity', isHidden ? 0 : 1);
transitions.axisX.call($$.xAxis);
transitions.axisY.call($$.yAxis);
transitions.axisY2.call($$.y2Axis);

166
src/axis/c3.axis.js

@ -2,31 +2,31 @@
// 1. category axis
// 2. ceil values of translate/x/y to int for half pixel antialiasing
// 3. multiline tick text
var tickTextCharSize;
let tickTextCharSize;
function c3_axis(d3, params) {
var scale = d3.scale.linear(), orient = "bottom", innerTickSize = 6, outerTickSize, tickPadding = 3, tickValues = null, tickFormat, tickArguments;
let scale = d3.scale.linear(), orient = 'bottom', innerTickSize = 6, outerTickSize, tickPadding = 3, tickValues = null, tickFormat, tickArguments;
var tickOffset = 0, tickCulling = true, tickCentered;
let tickOffset = 0, tickCulling = true, tickCentered;
params = params || {};
outerTickSize = params.withOuterTick ? 6 : 0;
function axisX(selection, x) {
selection.attr("transform", function (d) {
return "translate(" + Math.ceil(x(d) + tickOffset) + ", 0)";
selection.attr('transform', (d) => {
return 'translate(' + Math.ceil(x(d) + tickOffset) + ', 0)';
});
}
function axisY(selection, y) {
selection.attr("transform", function (d) {
return "translate(0," + Math.ceil(y(d)) + ")";
selection.attr('transform', (d) => {
return 'translate(0,' + Math.ceil(y(d)) + ')';
});
}
function scaleExtent(domain) {
var start = domain[0], stop = domain[domain.length - 1];
return start < stop ? [ start, stop ] : [ stop, start ];
let start = domain[0], stop = domain[domain.length - 1];
return start < stop ? [start, stop] : [stop, start];
}
function generateTicks(scale) {
var i, domain, ticks = [];
let i, domain, ticks = [];
if (scale.ticks) {
return scale.ticks.apply(scale, tickArguments);
}
@ -40,7 +40,7 @@ function c3_axis(d3, params) {
return ticks;
}
function copyScale() {
var newScale = scale.copy(), domain;
let newScale = scale.copy(), domain;
if (params.isCategory) {
domain = scale.domain();
newScale.domain([domain[0], domain[1] - 1]);
@ -48,19 +48,19 @@ function c3_axis(d3, params) {
return newScale;
}
function textFormatted(v) {
var formatted = tickFormat ? tickFormat(v) : v;
const formatted = tickFormat ? tickFormat(v) : v;
return typeof formatted !== 'undefined' ? formatted : '';
}
function getSizeFor1Char(tick) {
if (tickTextCharSize) {
return tickTextCharSize;
}
var size = {
const size = {
h: 11.5,
w: 5.5
w: 5.5,
};
tick.select('text').text(textFormatted).each(function (d) {
var box = this.getBoundingClientRect(),
let box = this.getBoundingClientRect(),
text = textFormatted(d),
h = box.height,
w = text ? (box.width / text.length) : undefined;
@ -77,28 +77,28 @@ function c3_axis(d3, params) {
}
function axis(g) {
g.each(function () {
var g = axis.g = d3.select(this);
const g = axis.g = d3.select(this);
var scale0 = this.__chart__ || scale, scale1 = this.__chart__ = copyScale();
let scale0 = this.__chart__ || scale, scale1 = this.__chart__ = copyScale();
var ticks = tickValues ? tickValues : generateTicks(scale1),
tick = g.selectAll(".tick").data(ticks, scale1),
tickEnter = tick.enter().insert("g", ".domain").attr("class", "tick").style("opacity", 1e-6),
let ticks = tickValues ? tickValues : generateTicks(scale1),
tick = g.selectAll('.tick').data(ticks, scale1),
tickEnter = tick.enter().insert('g', '.domain').attr('class', 'tick').style('opacity', 1e-6),
// MEMO: No exit transition. The reason is this transition affects max tick width calculation because old tick will be included in the ticks.
tickExit = tick.exit().remove(),
tickUpdate = transitionise(tick).style("opacity", 1),
tickUpdate = transitionise(tick).style('opacity', 1),
tickTransform, tickX, tickY;
var range = scale.rangeExtent ? scale.rangeExtent() : scaleExtent(scale.range()),
path = g.selectAll(".domain").data([ 0 ]),
pathUpdate = (path.enter().append("path").attr("class", "domain"), transitionise(path));
tickEnter.append("line");
tickEnter.append("text");
let range = scale.rangeExtent ? scale.rangeExtent() : scaleExtent(scale.range()),
path = g.selectAll('.domain').data([0]),
pathUpdate = (path.enter().append('path').attr('class', 'domain'), transitionise(path));
tickEnter.append('line');
tickEnter.append('text');
var lineEnter = tickEnter.select("line"),
lineUpdate = tickUpdate.select("line"),
textEnter = tickEnter.select("text"),
textUpdate = tickUpdate.select("text");
let lineEnter = tickEnter.select('line'),
lineUpdate = tickUpdate.select('line'),
textEnter = tickEnter.select('text'),
textUpdate = tickUpdate.select('text');
if (params.isCategory) {
tickOffset = Math.ceil((scale1(1) - scale1(0)) / 2);
@ -108,16 +108,16 @@ function c3_axis(d3, params) {
tickOffset = tickX = 0;
}
var text, tspan, sizeFor1Char = getSizeFor1Char(g.select('.tick')), counts = [];
var tickLength = Math.max(innerTickSize, 0) + tickPadding,
let text, tspan, sizeFor1Char = getSizeFor1Char(g.select('.tick')), counts = [];
let tickLength = Math.max(innerTickSize, 0) + tickPadding,
isVertical = orient === 'left' || orient === 'right';
// this should be called only when category axis
function splitTickText(d, maxWidth) {
var tickText = textFormatted(d),
let tickText = textFormatted(d),
subtext, spaceIndex, textWidth, splitted = [];
if (Object.prototype.toString.call(tickText) === "[object Array]") {
if (Object.prototype.toString.call(tickText) === '[object Array]') {
return tickText;
}
@ -127,7 +127,7 @@ function c3_axis(d3, params) {
function split(splitted, text) {
spaceIndex = undefined;
for (var i = 1; i < text.length; i++) {
for (let i = 1; i < text.length; i++) {
if (text.charAt(i) === ' ') {
spaceIndex = i;
}
@ -144,52 +144,52 @@ function c3_axis(d3, params) {
return splitted.concat(text);
}
return split(splitted, tickText + "");
return split(splitted, tickText + '');
}
function tspanDy(d, i) {
var dy = sizeFor1Char.h;
let dy = sizeFor1Char.h;
if (i === 0) {
if (orient === 'left' || orient === 'right') {
dy = -((counts[d.index] - 1) * (sizeFor1Char.h / 2) - 3);
} else {
dy = ".71em";
dy = '.71em';
}
}
return dy;
}
function tickSize(d) {
var tickPosition = scale(d) + (tickCentered ? 0 : tickOffset);
const tickPosition = scale(d) + (tickCentered ? 0 : tickOffset);
return range[0] < tickPosition && tickPosition < range[1] ? innerTickSize : 0;
}
text = tick.select("text");
text = tick.select('text');
tspan = text.selectAll('tspan')
.data(function (d, i) {
var splitted = params.tickMultiline ? splitTickText(d, params.tickWidth) : [].concat(textFormatted(d));
.data((d, i) => {
const splitted = params.tickMultiline ? splitTickText(d, params.tickWidth) : [].concat(textFormatted(d));
counts[i] = splitted.length;
return splitted.map(function (s) {
return splitted.map((s) => {
return { index: i, splitted: s };
});
});
tspan.enter().append('tspan');
tspan.exit().remove();
tspan.text(function (d) { return d.splitted; });
tspan.text((d) => { return d.splitted; });
var rotate = params.tickTextRotate;
const rotate = params.tickTextRotate;
function textAnchorForText(rotate) {
if (!rotate) {
return 'middle';
}
return rotate > 0 ? "start" : "end";
return rotate > 0 ? 'start' : 'end';
}
function textTransform(rotate) {
if (!rotate) {
return '';
}
return "rotate(" + rotate + ")";
return 'rotate(' + rotate + ')';
}
function dxForText(rotate) {
if (!rotate) {
@ -205,59 +205,59 @@ function c3_axis(d3, params) {
}
switch (orient) {
case "bottom":
case 'bottom':
{
tickTransform = axisX;
lineEnter.attr("y2", innerTickSize);
textEnter.attr("y", tickLength);
lineUpdate.attr("x1", tickX).attr("x2", tickX).attr("y2", tickSize);
textUpdate.attr("x", 0).attr("y", yForText(rotate))
.style("text-anchor", textAnchorForText(rotate))
.attr("transform", textTransform(rotate));
tspan.attr('x', 0).attr("dy", tspanDy).attr('dx', dxForText(rotate));
pathUpdate.attr("d", "M" + range[0] + "," + outerTickSize + "V0H" + range[1] + "V" + outerTickSize);
lineEnter.attr('y2', innerTickSize);
textEnter.attr('y', tickLength);
lineUpdate.attr('x1', tickX).attr('x2', tickX).attr('y2', tickSize);
textUpdate.attr('x', 0).attr('y', yForText(rotate))
.style('text-anchor', textAnchorForText(rotate))
.attr('transform', textTransform(rotate));
tspan.attr('x', 0).attr('dy', tspanDy).attr('dx', dxForText(rotate));
pathUpdate.attr('d', 'M' + range[0] + ',' + outerTickSize + 'V0H' + range[1] + 'V' + outerTickSize);
break;
}
case "top":
case 'top':
{
// TODO: rotated tick text
tickTransform = axisX;
lineEnter.attr("y2", -innerTickSize);
textEnter.attr("y", -tickLength);
lineUpdate.attr("x2", 0).attr("y2", -innerTickSize);
textUpdate.attr("x", 0).attr("y", -tickLength);
text.style("text-anchor", "middle");
tspan.attr('x', 0).attr("dy", "0em");
pathUpdate.attr("d", "M" + range[0] + "," + -outerTickSize + "V0H" + range[1] + "V" + -outerTickSize);
lineEnter.attr('y2', -innerTickSize);
textEnter.attr('y', -tickLength);
lineUpdate.attr('x2', 0).attr('y2', -innerTickSize);
textUpdate.attr('x', 0).attr('y', -tickLength);
text.style('text-anchor', 'middle');
tspan.attr('x', 0).attr('dy', '0em');
pathUpdate.attr('d', 'M' + range[0] + ',' + -outerTickSize + 'V0H' + range[1] + 'V' + -outerTickSize);
break;
}
case "left":
case 'left':
{
tickTransform = axisY;
lineEnter.attr("x2", -innerTickSize);
textEnter.attr("x", -tickLength);
lineUpdate.attr("x2", -innerTickSize).attr("y1", tickY).attr("y2", tickY);
textUpdate.attr("x", -tickLength).attr("y", tickOffset);
text.style("text-anchor", "end");
tspan.attr('x', -tickLength).attr("dy", tspanDy);
pathUpdate.attr("d", "M" + -outerTickSize + "," + range[0] + "H0V" + range[1] + "H" + -outerTickSize);
lineEnter.attr('x2', -innerTickSize);
textEnter.attr('x', -tickLength);
lineUpdate.attr('x2', -innerTickSize).attr('y1', tickY).attr('y2', tickY);
textUpdate.attr('x', -tickLength).attr('y', tickOffset);
text.style('text-anchor', 'end');
tspan.attr('x', -tickLength).attr('dy', tspanDy);
pathUpdate.attr('d', 'M' + -outerTickSize + ',' + range[0] + 'H0V' + range[1] + 'H' + -outerTickSize);
break;
}
case "right":
case 'right':
{
tickTransform = axisY;
lineEnter.attr("x2", innerTickSize);
textEnter.attr("x", tickLength);
lineUpdate.attr("x2", innerTickSize).attr("y2", 0);
textUpdate.attr("x", tickLength).attr("y", 0);
text.style("text-anchor", "start");
tspan.attr('x', tickLength).attr("dy", tspanDy);
pathUpdate.attr("d", "M" + outerTickSize + "," + range[0] + "H0V" + range[1] + "H" + outerTickSize);
lineEnter.attr('x2', innerTickSize);
textEnter.attr('x', tickLength);
lineUpdate.attr('x2', innerTickSize).attr('y2', 0);
textUpdate.attr('x', tickLength).attr('y', 0);
text.style('text-anchor', 'start');
tspan.attr('x', tickLength).attr('dy', tspanDy);
pathUpdate.attr('d', 'M' + outerTickSize + ',' + range[0] + 'H0V' + range[1] + 'H' + outerTickSize);
break;
}
}
if (scale1.rangeBand) {
var x = scale1, dx = x.rangeBand() / 2;
let x = scale1, dx = x.rangeBand() / 2;
scale0 = scale1 = function (d) {
return x(d) + dx;
};
@ -277,7 +277,7 @@ function c3_axis(d3, params) {
};
axis.orient = function (x) {
if (!arguments.length) { return orient; }
orient = x in {top: 1, right: 1, bottom: 1, left: 1} ? x + "" : "bottom";
orient = x in { top: 1, right: 1, bottom: 1, left: 1 } ? x + '' : 'bottom';
return axis;
};
axis.tickFormat = function (format) {
@ -294,7 +294,7 @@ function c3_axis(d3, params) {
return tickOffset;
};
axis.tickInterval = function () {
var interval, length;
let interval, length;
if (params.isCategory) {
interval = tickOffset * 2;
}

3
src/axis/index.js

@ -3,11 +3,10 @@ function API(owner) {
}
function inherit(base, derived) {
if (Object.create) {
derived.prototype = Object.create(base.prototype);
} else {
var f = function f() {};
const f = function f() {};
f.prototype = base.prototype;
derived.prototype = new f();
}

18
src/chart/api.axis.js

@ -1,8 +1,8 @@
c3_chart_fn.axis = function () {};
c3_chart_fn.axis.labels = function (labels) {
var $$ = this.internal;
const $$ = this.internal;
if (arguments.length) {
Object.keys(labels).forEach(function (axisId) {
Object.keys(labels).forEach((axisId) => {
$$.axis.setLabelText(axisId, labels[axisId]);
});
$$.axis.updateLabels();
@ -10,7 +10,7 @@ c3_chart_fn.axis.labels = function (labels) {
// TODO: return some values?
};
c3_chart_fn.axis.max = function (max) {
var $$ = this.internal, config = $$.config;
let $$ = this.internal, config = $$.config;
if (arguments.length) {
if (typeof max === 'object') {
if (isValue(max.x)) { config.axis_x_max = max.x; }
@ -19,17 +19,17 @@ c3_chart_fn.axis.max = function (max) {
} else {
config.axis_y_max = config.axis_y2_max = max;
}
$$.redraw({withUpdateOrgXDomain: true, withUpdateXDomain: true});
$$.redraw({ withUpdateOrgXDomain: true, withUpdateXDomain: true });
} else {
return {
x: config.axis_x_max,
y: config.axis_y_max,
y2: config.axis_y2_max
y2: config.axis_y2_max,
};
}
};
c3_chart_fn.axis.min = function (min) {
var $$ = this.internal, config = $$.config;
let $$ = this.internal, config = $$.config;
if (arguments.length) {
if (typeof min === 'object') {
if (isValue(min.x)) { config.axis_x_min = min.x; }
@ -38,12 +38,12 @@ c3_chart_fn.axis.min = function (min) {
} else {
config.axis_y_min = config.axis_y2_min = min;
}
$$.redraw({withUpdateOrgXDomain: true, withUpdateXDomain: true});
$$.redraw({ withUpdateOrgXDomain: true, withUpdateXDomain: true });
} else {
return {
x: config.axis_x_min,
y: config.axis_y_min,
y2: config.axis_y2_min
y2: config.axis_y2_min,
};
}
};
@ -54,7 +54,7 @@ c3_chart_fn.axis.range = function (range) {
} else {
return {
max: this.axis.max(),
min: this.axis.min()
min: this.axis.min(),
};
}
};

4
src/chart/api.category.js

@ -1,5 +1,5 @@
c3_chart_fn.category = function (i, category) {
var $$ = this.internal, config = $$.config;
let $$ = this.internal, config = $$.config;
if (arguments.length > 1) {
config.axis_x_categories[i] = category;
$$.redraw();
@ -7,7 +7,7 @@ c3_chart_fn.category = function (i, category) {
return config.axis_x_categories[i];
};
c3_chart_fn.categories = function (categories) {
var $$ = this.internal, config = $$.config;
let $$ = this.internal, config = $$.config;
if (!arguments.length) { return config.axis_x_categories; }
config.axis_x_categories = categories;
$$.redraw();

14
src/chart/api.chart.js

@ -1,17 +1,17 @@
c3_chart_fn.resize = function (size) {
var $$ = this.internal, config = $$.config;
let $$ = this.internal, config = $$.config;
config.size_width = size ? size.width : null;
config.size_height = size ? size.height : null;
this.flush();
};
c3_chart_fn.flush = function () {
var $$ = this.internal;
$$.updateAndRedraw({withLegend: true, withTransition: false, withTransitionForTransform: false});
const $$ = this.internal;
$$.updateAndRedraw({ withLegend: true, withTransition: false, withTransitionForTransform: false });
};
c3_chart_fn.destroy = function () {
var $$ = this.internal;
const $$ = this.internal;
window.clearInterval($$.intervalForObserveInserted);
@ -24,17 +24,17 @@ c3_chart_fn.destroy = function () {
} else if (window.removeEventListener) {
window.removeEventListener('resize', $$.resizeFunction);
} else {
var wrapper = window.onresize;
const wrapper = window.onresize;
// check if no one else removed our wrapper and remove our resizeFunction from it
if (wrapper && wrapper.add && wrapper.remove) {
wrapper.remove($$.resizeFunction);
}
}
$$.selectChart.classed('c3', false).html("");
$$.selectChart.classed('c3', false).html('');
// MEMO: this is needed because the reference of some elements will not be released, then memory leak will happen.
Object.keys($$).forEach(function (key) {
Object.keys($$).forEach((key) => {
$$[key] = null;
});

2
src/chart/api.color.js

@ -1,5 +1,5 @@
// TODO: fix
c3_chart_fn.color = function (id) {
var $$ = this.internal;
const $$ = this.internal;
return $$.color(id); // more patterns
};

8
src/chart/api.data.js

@ -1,6 +1,6 @@
c3_chart_fn.data = function (targetIds) {
var targets = this.internal.data.targets;
return typeof targetIds === 'undefined' ? targets : targets.filter(function (t) {
const targets = this.internal.data.targets;
return typeof targetIds === 'undefined' ? targets : targets.filter((t) => {
return [].concat(targetIds).indexOf(t.id) >= 0;
});
};
@ -8,10 +8,10 @@ c3_chart_fn.data.shown = function (targetIds) {
return this.internal.filterTargetsToShow(this.data(targetIds));
};
c3_chart_fn.data.values = function (targetId) {
var targets, values = null;
let targets, values = null;
if (targetId) {
targets = this.data(targetId);
values = targets[0] ? targets[0].values.map(function (d) { return d.value; }) : null;
values = targets[0] ? targets[0].values.map((d) => { return d.value; }) : null;
}
return values;
};

28
src/chart/api.flow.js

@ -1,5 +1,5 @@
c3_chart_fn.flow = function(args) {
var $$ = this.internal,
c3_chart_fn.flow = function (args) {
let $$ = this.internal,
targets, data, notfoundIds = [],
orgDataCount = $$.getMaxDataCount(),
dataCount, domain, baseTarget, baseValue, length = 0,
@ -18,8 +18,8 @@ c3_chart_fn.flow = function(args) {
targets = $$.convertDataToTargets(data, true);
// Update/Add data
$$.data.targets.forEach(function(t) {
var found = false,
$$.data.targets.forEach((t) => {
let found = false,
i, j;
for (i = 0; i < targets.length; i++) {
if (t.id === targets[i].id) {
@ -46,8 +46,8 @@ c3_chart_fn.flow = function(args) {
});
// Append null for not found targets
$$.data.targets.forEach(function(t) {
var i, j;
$$.data.targets.forEach((t) => {
let i, j;
for (i = 0; i < notfoundIds.length; i++) {
if (t.id === notfoundIds[i]) {
tail = t.values[t.values.length - 1].index + 1;
@ -56,7 +56,7 @@ c3_chart_fn.flow = function(args) {
id: t.id,
index: tail + j,
x: $$.isTimeSeries() ? $$.getOtherTargetX(tail + j) : tail + j,
value: null
value: null,
});
}
}
@ -65,17 +65,17 @@ c3_chart_fn.flow = function(args) {
// Generate null values for new target
if ($$.data.targets.length) {
targets.forEach(function(t) {
var i, missing = [];
targets.forEach((t) => {
let i, missing = [];
for (i = $$.data.targets[0].values[0].index; i < tail; i++) {
missing.push({
id: t.id,
index: i,
x: $$.isTimeSeries() ? $$.getOtherTargetX(i) : i,
value: null
value: null,
});
}
t.values.forEach(function(v) {
t.values.forEach((v) => {
v.index += tail;
if (!$$.isTimeSeries()) {
v.x += tail;
@ -95,7 +95,7 @@ c3_chart_fn.flow = function(args) {
if (isDefined(args.to)) {
length = 0;
to = $$.isTimeSeries() ? $$.parseDate(args.to) : args.to;
baseTarget.values.forEach(function(v) {
baseTarget.values.forEach((v) => {
if (v.x < to) { length++; }
});
} else if (isDefined(args.length)) {
@ -130,10 +130,10 @@ c3_chart_fn.flow = function(args) {
$$.redraw({
flow: {
index: baseValue.index,
length: length,
length,
duration: isValue(args.duration) ? args.duration : $$.config.transition_duration,
done: args.done,
orgDataCount: orgDataCount,
orgDataCount,
},
withLegend: true,
withTransition: orgDataCount > 1,

10
src/chart/api.focus.js

@ -1,5 +1,5 @@
c3_chart_fn.focus = function (targetIds) {
var $$ = this.internal, candidates;
let $$ = this.internal, candidates;
targetIds = $$.mapToTargetIds(targetIds);
candidates = $$.svg.selectAll($$.selectorTargets(targetIds.filter($$.isTargetToShow, $$))),
@ -13,13 +13,13 @@ c3_chart_fn.focus = function (targetIds) {
$$.toggleFocusLegend(targetIds, true);
$$.focusedTargetIds = targetIds;
$$.defocusedTargetIds = $$.defocusedTargetIds.filter(function (id) {
$$.defocusedTargetIds = $$.defocusedTargetIds.filter((id) => {
return targetIds.indexOf(id) < 0;
});
};
c3_chart_fn.defocus = function (targetIds) {
var $$ = this.internal, candidates;
let $$ = this.internal, candidates;
targetIds = $$.mapToTargetIds(targetIds);
candidates = $$.svg.selectAll($$.selectorTargets(targetIds.filter($$.isTargetToShow, $$))),
@ -30,14 +30,14 @@ c3_chart_fn.defocus = function (targetIds) {
}
$$.toggleFocusLegend(targetIds, false);
$$.focusedTargetIds = $$.focusedTargetIds.filter(function (id) {
$$.focusedTargetIds = $$.focusedTargetIds.filter((id) => {
return targetIds.indexOf(id) < 0;
});
$$.defocusedTargetIds = targetIds;
};
c3_chart_fn.revert = function (targetIds) {
var $$ = this.internal, candidates;
let $$ = this.internal, candidates;
targetIds = $$.mapToTargetIds(targetIds);
candidates = $$.svg.selectAll($$.selectorTargets(targetIds)); // should be for all targets

16
src/chart/api.grid.js

@ -1,31 +1,31 @@
c3_chart_fn.xgrids = function (grids) {
var $$ = this.internal, config = $$.config;
if (! grids) { return config.grid_x_lines; }
let $$ = this.internal, config = $$.config;
if (!grids) { return config.grid_x_lines; }
config.grid_x_lines = grids;
$$.redrawWithoutRescale();
return config.grid_x_lines;
};
c3_chart_fn.xgrids.add = function (grids) {
var $$ = this.internal;
const $$ = this.internal;
return this.xgrids($$.config.grid_x_lines.concat(grids ? grids : []));
};
c3_chart_fn.xgrids.remove = function (params) { // TODO: multiple
var $$ = this.internal;
const $$ = this.internal;
$$.removeGridLines(params, true);
};
c3_chart_fn.ygrids = function (grids) {
var $$ = this.internal, config = $$.config;
if (! grids) { return config.grid_y_lines; }
let $$ = this.internal, config = $$.config;
if (!grids) { return config.grid_y_lines; }
config.grid_y_lines = grids;
$$.redrawWithoutRescale();
return config.grid_y_lines;
};
c3_chart_fn.ygrids.add = function (grids) {
var $$ = this.internal;
const $$ = this.internal;
return this.ygrids($$.config.grid_y_lines.concat(grids ? grids : []));
};
c3_chart_fn.ygrids.remove = function (params) { // TODO: multiple
var $$ = this.internal;
const $$ = this.internal;
$$.removeGridLines(params, false);
};

2
src/chart/api.group.js

@ -1,5 +1,5 @@
c3_chart_fn.groups = function (groups) {
var $$ = this.internal, config = $$.config;
let $$ = this.internal, config = $$.config;
if (isUndefined(groups)) { return config.data_groups; }
config.data_groups = groups;
$$.redraw();

8
src/chart/api.legend.js

@ -1,11 +1,11 @@
c3_chart_fn.legend = function () {};
c3_chart_fn.legend.show = function (targetIds) {
var $$ = this.internal;
const $$ = this.internal;
$$.showLegend($$.mapToTargetIds(targetIds));
$$.updateAndRedraw({withLegend: true});
$$.updateAndRedraw({ withLegend: true });
};
c3_chart_fn.legend.hide = function (targetIds) {
var $$ = this.internal;
const $$ = this.internal;
$$.hideLegend($$.mapToTargetIds(targetIds));
$$.updateAndRedraw({withLegend: true});
$$.updateAndRedraw({ withLegend: true });
};

20
src/chart/api.load.js

@ -1,5 +1,5 @@
c3_chart_fn.load = function (args) {
var $$ = this.internal, config = $$.config;
let $$ = this.internal, config = $$.config;
// update xs if specified
if (args.xs) {
$$.addXs(args.xs);
@ -10,7 +10,7 @@ c3_chart_fn.load = function (args) {
}
// update classes if exists
if ('classes' in args) {
Object.keys(args.classes).forEach(function (id) {
Object.keys(args.classes).forEach((id) => {
config.data_classes[id] = args.classes[id];
});
}
@ -20,13 +20,13 @@ c3_chart_fn.load = function (args) {
}
// update axes if exists
if ('axes' in args) {
Object.keys(args.axes).forEach(function (id) {
Object.keys(args.axes).forEach((id) => {
config.data_axes[id] = args.axes[id];
});
}
// update colors if exists
if ('colors' in args) {
Object.keys(args.colors).forEach(function (id) {
Object.keys(args.colors).forEach((id) => {
config.data_colors[id] = args.colors[id];
});
}
@ -38,7 +38,7 @@ c3_chart_fn.load = function (args) {
// unload if needed
if ('unload' in args) {
// TODO: do not unload if target will load (included in url/rows/columns)
$$.unload($$.mapToTargetIds((typeof args.unload === 'boolean' && args.unload) ? null : args.unload), function () {
$$.unload($$.mapToTargetIds((typeof args.unload === 'boolean' && args.unload) ? null : args.unload), () => {
$$.loadFromArgs(args);
});
} else {
@ -47,15 +47,15 @@ c3_chart_fn.load = function (args) {
};
c3_chart_fn.unload = function (args) {
var $$ = this.internal;
const $$ = this.internal;
args = args || {};
if (args instanceof Array) {
args = {ids: args};
args = { ids: args };
} else if (typeof args === 'string') {
args = {ids: [args]};
args = { ids: [args] };
}
$$.unload($$.mapToTargetIds(args.ids), function () {
$$.redraw({withUpdateOrgXDomain: true, withUpdateXDomain: true, withLegend: true});
$$.unload($$.mapToTargetIds(args.ids), () => {
$$.redraw({ withUpdateOrgXDomain: true, withUpdateXDomain: true, withLegend: true });
if (args.done) { args.done(); }
});
};

20
src/chart/api.region.js

@ -1,36 +1,36 @@
c3_chart_fn.regions = function (regions) {
var $$ = this.internal, config = $$.config;
let $$ = this.internal, config = $$.config;
if (!regions) { return config.regions; }
config.regions = regions;
$$.redrawWithoutRescale();
return config.regions;
};
c3_chart_fn.regions.add = function (regions) {
var $$ = this.internal, config = $$.config;
let $$ = this.internal, config = $$.config;
if (!regions) { return config.regions; }
config.regions = config.regions.concat(regions);
$$.redrawWithoutRescale();
return config.regions;
};
c3_chart_fn.regions.remove = function (options) {
var $$ = this.internal, config = $$.config,
let $$ = this.internal, config = $$.config,
duration, classes, regions;
options = options || {};
duration = $$.getOption(options, "duration", config.transition_duration);
classes = $$.getOption(options, "classes", [CLASS.region]);
duration = $$.getOption(options, 'duration', config.transition_duration);
classes = $$.getOption(options, 'classes', [CLASS.region]);
regions = $$.main.select('.' + CLASS.regions).selectAll(classes.map(function (c) { return '.' + c; }));
regions = $$.main.select('.' + CLASS.regions).selectAll(classes.map((c) => { return '.' + c; }));
(duration ? regions.transition().duration(duration) : regions)
.style('opacity', 0)
.remove();
config.regions = config.regions.filter(function (region) {
var found = false;
if (!region['class']) {
config.regions = config.regions.filter((region) => {
let found = false;
if (!region.class) {
return true;
}
region['class'].split(' ').forEach(function (c) {
region.class.split(' ').forEach((c) => {
if (classes.indexOf(c) >= 0) { found = true; }
});
return !found;

16
src/chart/api.selection.js

@ -1,16 +1,16 @@
c3_chart_fn.selected = function (targetId) {
var $$ = this.internal, d3 = $$.d3;
let $$ = this.internal, d3 = $$.d3;
return d3.merge(
$$.main.selectAll('.' + CLASS.shapes + $$.getTargetSelectorSuffix(targetId)).selectAll('.' + CLASS.shape)
.filter(function () { return d3.select(this).classed(CLASS.SELECTED); })
.map(function (d) { return d.map(function (d) { var data = d.__data__; return data.data ? data.data : data; }); })
.map((d) => { return d.map((d) => { const data = d.__data__; return data.data ? data.data : data; }); })
);
};
c3_chart_fn.select = function (ids, indices, resetOther) {
var $$ = this.internal, d3 = $$.d3, config = $$.config;
if (! config.data_selection_enabled) { return; }
let $$ = this.internal, d3 = $$.d3, config = $$.config;
if (!config.data_selection_enabled) { return; }
$$.main.selectAll('.' + CLASS.shapes).selectAll('.' + CLASS.shape).each(function (d, i) {
var shape = d3.select(this), id = d.data ? d.data.id : d.id,
let shape = d3.select(this), id = d.data ? d.data.id : d.id,
toggle = $$.getToggle(this, d).bind($$),
isTargetId = config.data_selection_grouped || !ids || ids.indexOf(id) >= 0,
isTargetIndex = !indices || indices.indexOf(i) >= 0,
@ -31,10 +31,10 @@ c3_chart_fn.select = function (ids, indices, resetOther) {
});
};
c3_chart_fn.unselect = function (ids, indices) {
var $$ = this.internal, d3 = $$.d3, config = $$.config;
if (! config.data_selection_enabled) { return; }
let $$ = this.internal, d3 = $$.d3, config = $$.config;
if (!config.data_selection_enabled) { return; }
$$.main.selectAll('.' + CLASS.shapes).selectAll('.' + CLASS.shape).each(function (d, i) {
var shape = d3.select(this), id = d.data ? d.data.id : d.id,
let shape = d3.select(this), id = d.data ? d.data.id : d.id,
toggle = $$.getToggle(this, d).bind($$),
isTargetId = config.data_selection_grouped || !ids || ids.indexOf(id) >= 0,
isTargetIndex = !indices || indices.indexOf(i) >= 0,

16
src/chart/api.show.js

@ -1,5 +1,5 @@
c3_chart_fn.show = function (targetIds, options) {
var $$ = this.internal, targets;
let $$ = this.internal, targets;
targetIds = $$.mapToTargetIds(targetIds);
options = options || {};
@ -9,7 +9,7 @@ c3_chart_fn.show = function (targetIds, options) {
targets.transition()
.style('opacity', 1, 'important')
.call($$.endall, function () {
.call($$.endall, () => {
targets.style('opacity', null).style('opacity', 1);
});
@ -17,11 +17,11 @@ c3_chart_fn.show = function (targetIds, options) {
$$.showLegend(targetIds);
}
$$.redraw({withUpdateOrgXDomain: true, withUpdateXDomain: true, withLegend: true});
$$.redraw({ withUpdateOrgXDomain: true, withUpdateXDomain: true, withLegend: true });
};
c3_chart_fn.hide = function (targetIds, options) {
var $$ = this.internal, targets;
let $$ = this.internal, targets;
targetIds = $$.mapToTargetIds(targetIds);
options = options || {};
@ -31,7 +31,7 @@ c3_chart_fn.hide = function (targetIds, options) {
targets.transition()
.style('opacity', 0, 'important')
.call($$.endall, function () {
.call($$.endall, () => {
targets.style('opacity', null).style('opacity', 0);
});
@ -39,12 +39,12 @@ c3_chart_fn.hide = function (targetIds, options) {
$$.hideLegend(targetIds);
}
$$.redraw({withUpdateOrgXDomain: true, withUpdateXDomain: true, withLegend: true});
$$.redraw({ withUpdateOrgXDomain: true, withUpdateXDomain: true, withLegend: true });
};
c3_chart_fn.toggle = function (targetIds, options) {
var that = this, $$ = this.internal;
$$.mapToTargetIds(targetIds).forEach(function (targetId) {
let that = this, $$ = this.internal;
$$.mapToTargetIds(targetIds).forEach((targetId) => {
$$.isTargetToShow(targetId) ? that.hide(targetId, options) : that.show(targetId, options);
});
};

2
src/chart/api.tooltip.js

@ -1,6 +1,6 @@
c3_chart_fn.tooltip = function () {};
c3_chart_fn.tooltip.show = function (args) {
var $$ = this.internal, index, mouse;
let $$ = this.internal, index, mouse;
// determine mouse position on the chart
if (args.mouse) {

4
src/chart/api.transform.js

@ -1,5 +1,5 @@
c3_chart_fn.transform = function(type, targetIds) {
var $$ = this.internal,
c3_chart_fn.transform = function (type, targetIds) {
let $$ = this.internal,
options = ['pie', 'donut'].indexOf(type) >= 0 ? { withTransform: true } : null;
$$.transformTo(targetIds, type, options);
};

8
src/chart/api.x.js

@ -1,16 +1,16 @@
c3_chart_fn.x = function (x) {
var $$ = this.internal;
const $$ = this.internal;
if (arguments.length) {
$$.updateTargetX($$.data.targets, x);
$$.redraw({withUpdateOrgXDomain: true, withUpdateXDomain: true});
$$.redraw({ withUpdateOrgXDomain: true, withUpdateXDomain: true });
}
return $$.data.xs;
};
c3_chart_fn.xs = function (xs) {
var $$ = this.internal;
const $$ = this.internal;
if (arguments.length) {
$$.updateTargetXs($$.data.targets, xs);
$$.redraw({withUpdateOrgXDomain: true, withUpdateXDomain: true});
$$.redraw({ withUpdateOrgXDomain: true, withUpdateXDomain: true });
}
return $$.data.xs;
};

18
src/chart/api.zoom.js

@ -1,28 +1,28 @@
c3_chart_fn.zoom = function (domain) {
var $$ = this.internal;
const $$ = this.internal;
if (domain) {
if ($$.isTimeSeries()) {
domain = domain.map(function (x) { return $$.parseDate(x); });
domain = domain.map((x) => { return $$.parseDate(x); });
}
$$.brush.extent(domain);
$$.redraw({withUpdateXDomain: true, withY: $$.config.zoom_rescale});
$$.redraw({ withUpdateXDomain: true, withY: $$.config.zoom_rescale });
$$.config.zoom_onzoom.call(this, $$.x.orgDomain());
}
return $$.brush.extent();
};
c3_chart_fn.zoom.enable = function (enabled) {
var $$ = this.internal;
const $$ = this.internal;
$$.config.zoom_enabled = enabled;
$$.updateAndRedraw();
};
c3_chart_fn.unzoom = function () {
var $$ = this.internal;
const $$ = this.internal;
$$.brush.clear().update();
$$.redraw({withUpdateXDomain: true});
$$.redraw({ withUpdateXDomain: true });
};
c3_chart_fn.zoom.max = function (max) {
var $$ = this.internal, config = $$.config, d3 = $$.d3;
let $$ = this.internal, config = $$.config, d3 = $$.d3;
if (max === 0 || max) {
config.zoom_x_max = d3.max([$$.orgXDomain[1], max]);
}
@ -32,7 +32,7 @@ c3_chart_fn.zoom.max = function (max) {
};
c3_chart_fn.zoom.min = function (min) {
var $$ = this.internal, config = $$.config, d3 = $$.d3;
let $$ = this.internal, config = $$.config, d3 = $$.d3;
if (min === 0 || min) {
config.zoom_x_min = d3.min([$$.orgXDomain[0], min]);
}
@ -48,7 +48,7 @@ c3_chart_fn.zoom.range = function (range) {
} else {
return {
max: this.domain.max(),
min: this.domain.min()
min: this.domain.min(),
};
}
};

6
src/chart/index.js

@ -1,8 +1,8 @@
var c3_chart_fn;
let c3_chart_fn;
function Chart(config) {
var $$ = this.internal = new ChartInternal(this);
const $$ = this.internal = new ChartInternal(this);
$$.loadConfig(config);
$$.beforeInit(config);
@ -11,7 +11,7 @@ function Chart(config) {
// bind "this" to nested API
(function bindThis(fn, target, argThis) {
Object.keys(fn).forEach(function(key) {
Object.keys(fn).forEach((key) => {
target[key] = fn[key].bind(argThis);
if (Object.keys(fn[key]).length > 0) {
bindThis(fn[key], target[key], argThis);

211
src/chartinternal/arc.js

@ -1,7 +1,7 @@
c3_chart_internal_fn.initPie = function () {
var $$ = this, d3 = $$.d3, config = $$.config;
$$.pie = d3.layout.pie().value(function (d) {
return d.values.reduce(function (a, b) { return a + b.value; }, 0);
let $$ = this, d3 = $$.d3, config = $$.config;
$$.pie = d3.layout.pie().value((d) => {
return d.values.reduce((a, b) => { return a + b.value; }, 0);
});
if (!config.data_order) {
$$.pie.sort(null);
@ -9,7 +9,7 @@ c3_chart_internal_fn.initPie = function () {
};
c3_chart_internal_fn.updateRadius = function () {
var $$ = this, config = $$.config,
let $$ = this, config = $$.config,
w = config.gauge_width || config.donut_width;
$$.radiusExpanded = Math.min($$.arcWidth, $$.arcHeight) / 2;
$$.radius = $$.radiusExpanded * 0.95;
@ -18,14 +18,14 @@ c3_chart_internal_fn.updateRadius = function () {
};
c3_chart_internal_fn.updateArc = function () {
var $$ = this;
const $$ = this;
$$.svgArc = $$.getSvgArc();
$$.svgArcExpanded = $$.getSvgArcExpanded();
$$.svgArcExpandedSub = $$.getSvgArcExpanded(0.98);
};
c3_chart_internal_fn.updateAngle = function (d) {
var $$ = this, config = $$.config,
let $$ = this, config = $$.config,
found = false, index = 0,
gMin, gMax, gTic, gValue;
@ -33,8 +33,8 @@ c3_chart_internal_fn.updateAngle = function (d) {
return null;
}
$$.pie($$.filterTargetsToShow($$.data.targets)).forEach(function (t) {
if (! found && t.data.id === d.data.id) {
$$.pie($$.filterTargetsToShow($$.data.targets)).forEach((t) => {
if (!found && t.data.id === d.data.id) {
found = true;
d = t;
d.index = index;
@ -59,13 +59,13 @@ c3_chart_internal_fn.updateAngle = function (d) {
};
c3_chart_internal_fn.getSvgArc = function () {
var $$ = this,
let $$ = this,
arc = $$.d3.svg.arc().outerRadius($$.radius).innerRadius($$.innerRadius),
newArc = function (d, withoutUpdate) {
var updated;
let updated;
if (withoutUpdate) { return arc(d); } // for interpolate
updated = $$.updateAngle(d);
return updated ? arc(updated) : "M 0 0";
return updated ? arc(updated) : 'M 0 0';
};
// TODO: extends all function
newArc.centroid = arc.centroid;
@ -73,22 +73,22 @@ c3_chart_internal_fn.getSvgArc = function () {
};
c3_chart_internal_fn.getSvgArcExpanded = function (rate) {
var $$ = this,
let $$ = this,
arc = $$.d3.svg.arc().outerRadius($$.radiusExpanded * (rate ? rate : 1)).innerRadius($$.innerRadius);
return function (d) {
var updated = $$.updateAngle(d);
return updated ? arc(updated) : "M 0 0";
const updated = $$.updateAngle(d);
return updated ? arc(updated) : 'M 0 0';
};
};
c3_chart_internal_fn.getArc = function (d, withoutUpdate, force) {
return force || this.isArcType(d.data) ? this.svgArc(d, withoutUpdate) : "M 0 0";
return force || this.isArcType(d.data) ? this.svgArc(d, withoutUpdate) : 'M 0 0';
};
c3_chart_internal_fn.transformForArcLabel = function (d) {
var $$ = this, config = $$.config,
updated = $$.updateAngle(d), c, x, y, h, ratio, translate = "";
let $$ = this, config = $$.config,
updated = $$.updateAngle(d), c, x, y, h, ratio, translate = '';
if (updated && !$$.hasType('gauge')) {
c = this.svgArc.centroid(updated);
x = isNaN(c[0]) ? 0 : c[0];
@ -101,13 +101,13 @@ c3_chart_internal_fn.transformForArcLabel = function (d) {
} else {
ratio = $$.radius && h ? (36 / $$.radius > 0.375 ? 1.175 - 36 / $$.radius : 0.8) * $$.radius / h : 0;
}
translate = "translate(" + (x * ratio) + ',' + (y * ratio) + ")";
translate = 'translate(' + (x * ratio) + ',' + (y * ratio) + ')';
}
return translate;
};
c3_chart_internal_fn.getArcRatio = function (d) {
var $$ = this,
let $$ = this,
config = $$.config,
whole = Math.PI * ($$.hasType('gauge') && !config.gauge_fullCircle ? 1 : 2);
return d ? (d.endAngle - d.startAngle) / whole : null;
@ -118,29 +118,29 @@ c3_chart_internal_fn.convertToArcData = function (d) {
id: d.data.id,
value: d.value,
ratio: this.getArcRatio(d),
index: d.index
index: d.index,
});
};
c3_chart_internal_fn.textForArcLabel = function (d) {
var $$ = this,
let $$ = this,
updated, value, ratio, id, format;
if (! $$.shouldShowArcLabel()) { return ""; }
if (!$$.shouldShowArcLabel()) { return ''; }
updated = $$.updateAngle(d);
value = updated ? updated.value : null;
ratio = $$.getArcRatio(updated);
id = d.data.id;
if (! $$.hasType('gauge') && ! $$.meetsArcLabelThreshold(ratio)) { return ""; }
if (!$$.hasType('gauge') && !$$.meetsArcLabelThreshold(ratio)) { return ''; }
format = $$.getArcLabelFormat();
return format ? format(value, ratio, id) : $$.defaultArcValueFormat(value, ratio);
};
c3_chart_internal_fn.expandArc = function (targetIds) {
var $$ = this, interval;
let $$ = this, interval;
// MEMO: avoid to cancel transition
if ($$.transiting) {
interval = window.setInterval(function () {
interval = window.setInterval(() => {
if (!$$.transiting) {
window.clearInterval(interval);
if ($$.legend.selectAll('.c3-legend-item-focused').size() > 0) {
@ -154,13 +154,13 @@ c3_chart_internal_fn.expandArc = function (targetIds) {
targetIds = $$.mapToTargetIds(targetIds);
$$.svg.selectAll($$.selectorTargets(targetIds, '.' + CLASS.chartArc)).each(function (d) {
if (! $$.shouldExpand(d.data.id)) { return; }
if (!$$.shouldExpand(d.data.id)) { return; }
$$.d3.select(this).selectAll('path')
.transition().duration($$.expandDuration(d.data.id))
.attr("d", $$.svgArcExpanded)
.attr('d', $$.svgArcExpanded)
.transition().duration($$.expandDuration(d.data.id) * 2)
.attr("d", $$.svgArcExpandedSub)
.each(function (d) {
.attr('d', $$.svgArcExpandedSub)
.each((d) => {
if ($$.isDonutType(d.data)) {
// callback here
}
@ -169,23 +169,23 @@ c3_chart_internal_fn.expandArc = function (targetIds) {
};
c3_chart_internal_fn.unexpandArc = function (targetIds) {
var $$ = this;
const $$ = this;
if ($$.transiting) { return; }
targetIds = $$.mapToTargetIds(targetIds);
$$.svg.selectAll($$.selectorTargets(targetIds, '.' + CLASS.chartArc)).selectAll('path')
.transition().duration(function(d) {
.transition().duration((d) => {
return $$.expandDuration(d.data.id);
})
.attr("d", $$.svgArc);
.attr('d', $$.svgArc);
$$.svg.selectAll('.' + CLASS.arc)
.style("opacity", 1);
.style('opacity', 1);
};
c3_chart_internal_fn.expandDuration = function (id) {
var $$ = this, config = $$.config;
let $$ = this, config = $$.config;
if ($$.isDonutType(id)) {
return config.donut_expand_duration;
@ -196,18 +196,17 @@ c3_chart_internal_fn.expandDuration = function (id) {
} else {
return 50;
}
};
c3_chart_internal_fn.shouldExpand = function (id) {
var $$ = this, config = $$.config;
let $$ = this, config = $$.config;
return ($$.isDonutType(id) && config.donut_expand) ||
($$.isGaugeType(id) && config.gauge_expand) ||
($$.isPieType(id) && config.pie_expand);
};
c3_chart_internal_fn.shouldShowArcLabel = function () {
var $$ = this, config = $$.config, shouldShow = true;
let $$ = this, config = $$.config, shouldShow = true;
if ($$.hasType('donut')) {
shouldShow = config.donut_label_show;
} else if ($$.hasType('pie')) {
@ -218,13 +217,13 @@ c3_chart_internal_fn.shouldShowArcLabel = function () {
};
c3_chart_internal_fn.meetsArcLabelThreshold = function (ratio) {
var $$ = this, config = $$.config,
let $$ = this, config = $$.config,
threshold = $$.hasType('donut') ? config.donut_label_threshold : config.pie_label_threshold;
return ratio >= threshold;
};
c3_chart_internal_fn.getArcLabelFormat = function () {
var $$ = this, config = $$.config,
let $$ = this, config = $$.config,
format = config.pie_label_format;
if ($$.hasType('gauge')) {
format = config.gauge_label_format;
@ -235,53 +234,53 @@ c3_chart_internal_fn.getArcLabelFormat = function () {
};
c3_chart_internal_fn.getArcTitle = function () {
var $$ = this;
return $$.hasType('donut') ? $$.config.donut_title : "";
const $$ = this;
return $$.hasType('donut') ? $$.config.donut_title : '';
};
c3_chart_internal_fn.updateTargetsForArc = function (targets) {
var $$ = this, main = $$.main,
let $$ = this, main = $$.main,
mainPieUpdate, mainPieEnter,
classChartArc = $$.classChartArc.bind($$),
classArcs = $$.classArcs.bind($$),
classFocus = $$.classFocus.bind($$);
mainPieUpdate = main.select('.' + CLASS.chartArcs).selectAll('.' + CLASS.chartArc)
.data($$.pie(targets))
.attr("class", function (d) { return classChartArc(d) + classFocus(d.data); });
mainPieEnter = mainPieUpdate.enter().append("g")
.attr("class", classChartArc);
.attr('class', (d) => { return classChartArc(d) + classFocus(d.data); });
mainPieEnter = mainPieUpdate.enter().append('g')
.attr('class', classChartArc);
mainPieEnter.append('g')
.attr('class', classArcs);
mainPieEnter.append("text")
.attr("dy", $$.hasType('gauge') ? "-.1em" : ".35em")
.style("opacity", 0)
.style("text-anchor", "middle")
.style("pointer-events", "none");
mainPieEnter.append('text')
.attr('dy', $$.hasType('gauge') ? '-.1em' : '.35em')
.style('opacity', 0)
.style('text-anchor', 'middle')
.style('pointer-events', 'none');
// MEMO: can not keep same color..., but not bad to update color in redraw
//mainPieUpdate.exit().remove();
// mainPieUpdate.exit().remove();
};
c3_chart_internal_fn.initArc = function () {
var $$ = this;
$$.arcs = $$.main.select('.' + CLASS.chart).append("g")
.attr("class", CLASS.chartArcs)
.attr("transform", $$.getTranslate('arc'));
const $$ = this;
$$.arcs = $$.main.select('.' + CLASS.chart).append('g')
.attr('class', CLASS.chartArcs)
.attr('transform', $$.getTranslate('arc'));
$$.arcs.append('text')
.attr('class', CLASS.chartArcsTitle)
.style("text-anchor", "middle")
.style('text-anchor', 'middle')
.text($$.getArcTitle());
};
c3_chart_internal_fn.redrawArc = function (duration, durationForExit, withTransform) {
var $$ = this, d3 = $$.d3, config = $$.config, main = $$.main,
let $$ = this, d3 = $$.d3, config = $$.config, main = $$.main,
mainArc;
mainArc = main.selectAll('.' + CLASS.arcs).selectAll('.' + CLASS.arc)
.data($$.arcData.bind($$));
mainArc.enter().append('path')
.attr("class", $$.classArc.bind($$))
.style("fill", function (d) { return $$.color(d.data); })
.style("cursor", function (d) { return config.interaction_enabled && config.data_selection_isselectable(d) ? "pointer" : null; })
.style("opacity", 0)
.attr('class', $$.classArc.bind($$))
.style('fill', (d) => { return $$.color(d.data); })
.style('cursor', (d) => { return config.interaction_enabled && config.data_selection_isselectable(d) ? 'pointer' : null; })
.style('opacity', 0)
.each(function (d) {
if ($$.isGaugeType(d.data)) {
d.startAngle = d.endAngle = config.gauge_startingAngle;
@ -289,10 +288,10 @@ c3_chart_internal_fn.redrawArc = function (duration, durationForExit, withTransf
this._current = d;
});
mainArc
.attr("transform", function (d) { return !$$.isGaugeType(d.data) && withTransform ? "scale(0)" : ""; })
.style("opacity", function (d) { return d === this._current ? 0 : 1; })
.attr('transform', (d) => { return !$$.isGaugeType(d.data) && withTransform ? 'scale(0)' : ''; })
.style('opacity', function (d) { return d === this._current ? 0 : 1; })
.on('mouseover', config.interaction_enabled ? function (d) {
var updated, arcData;
let updated, arcData;
if ($$.transiting) { // skip while transiting
return;
}
@ -307,7 +306,7 @@ c3_chart_internal_fn.redrawArc = function (duration, durationForExit, withTransf
}
} : null)
.on('mousemove', config.interaction_enabled ? function (d) {
var updated = $$.updateAngle(d), arcData, selectedData;
let updated = $$.updateAngle(d), arcData, selectedData;
if (updated) {
arcData = $$.convertToArcData(updated),
selectedData = [arcData];
@ -315,7 +314,7 @@ c3_chart_internal_fn.redrawArc = function (duration, durationForExit, withTransf
}
} : null)
.on('mouseout', config.interaction_enabled ? function (d) {
var updated, arcData;
let updated, arcData;
if ($$.transiting) { // skip while transiting
return;
}
@ -331,7 +330,7 @@ c3_chart_internal_fn.redrawArc = function (duration, durationForExit, withTransf
}
} : null)
.on('click', config.interaction_enabled ? function (d, i) {
var updated = $$.updateAngle(d), arcData;
let updated = $$.updateAngle(d), arcData;
if (updated) {
arcData = $$.convertToArcData(updated);
if ($$.toggleShape) {
@ -340,12 +339,12 @@ c3_chart_internal_fn.redrawArc = function (duration, durationForExit, withTransf
$$.config.data_onclick.call($$.api, arcData, this);
}
} : null)
.each(function () { $$.transiting = true; })
.each(() => { $$.transiting = true; })
.transition().duration(duration)
.attrTween("d", function (d) {
var updated = $$.updateAngle(d), interpolate;
if (! updated) {
return function () { return "M 0 0"; };
.attrTween('d', function (d) {
let updated = $$.updateAngle(d), interpolate;
if (!updated) {
return function () { return 'M 0 0'; };
}
// if (this._current === d) {
// this._current = {
@ -362,73 +361,73 @@ c3_chart_internal_fn.redrawArc = function (duration, durationForExit, withTransf
interpolate = d3.interpolate(this._current, updated);
this._current = interpolate(0);
return function (t) {
var interpolated = interpolate(t);
const interpolated = interpolate(t);
interpolated.data = d.data; // data.id will be updated by interporator
return $$.getArc(interpolated, true);
};
})
.attr("transform", withTransform ? "scale(1)" : "")
.style("fill", function (d) {
.attr('transform', withTransform ? 'scale(1)' : '')
.style('fill', (d) => {
return $$.levelColor ? $$.levelColor(d.data.values[0].value) : $$.color(d.data.id);
}) // Where gauge reading color would receive customization.
.style("opacity", 1)
.call($$.endall, function () {
.style('opacity', 1)
.call($$.endall, () => {
$$.transiting = false;
});
mainArc.exit().transition().duration(durationForExit)
.style('opacity', 0)
.remove();
main.selectAll('.' + CLASS.chartArc).select('text')
.style("opacity", 0)
.attr('class', function (d) { return $$.isGaugeType(d.data) ? CLASS.gaugeValue : ''; })
.style('opacity', 0)
.attr('class', (d) => { return $$.isGaugeType(d.data) ? CLASS.gaugeValue : ''; })
.text($$.textForArcLabel.bind($$))
.attr("transform", $$.transformForArcLabel.bind($$))
.style('font-size', function (d) { return $$.isGaugeType(d.data) ? Math.round($$.radius / 5) + 'px' : ''; })
.attr('transform', $$.transformForArcLabel.bind($$))
.style('font-size', (d) => { return $$.isGaugeType(d.data) ? Math.round($$.radius / 5) + 'px' : ''; })
.transition().duration(duration)
.style("opacity", function (d) { return $$.isTargetToShow(d.data.id) && $$.isArcType(d.data) ? 1 : 0; });
.style('opacity', (d) => { return $$.isTargetToShow(d.data.id) && $$.isArcType(d.data) ? 1 : 0; });
main.select('.' + CLASS.chartArcsTitle)
.style("opacity", $$.hasType('donut') || $$.hasType('gauge') ? 1 : 0);
.style('opacity', $$.hasType('donut') || $$.hasType('gauge') ? 1 : 0);
if ($$.hasType('gauge')) {
$$.arcs.select('.' + CLASS.chartArcsBackground)
.attr("d", function () {
var d = {
data: [{value: config.gauge_max}],
.attr('d', () => {
const d = {
data: [{ value: config.gauge_max }],
startAngle: config.gauge_startingAngle,
endAngle: -1 * config.gauge_startingAngle
endAngle: -1 * config.gauge_startingAngle,
};
return $$.getArc(d, true, true);
});
$$.arcs.select('.' + CLASS.chartArcsGaugeUnit)
.attr("dy", ".75em")
.attr('dy', '.75em')
.text(config.gauge_label_show ? config.gauge_units : '');
$$.arcs.select('.' + CLASS.chartArcsGaugeMin)
.attr("dx", -1 * ($$.innerRadius + (($$.radius - $$.innerRadius) / (config.gauge_fullCircle ? 1 : 2))) + "px")
.attr("dy", "1.2em")
.attr('dx', -1 * ($$.innerRadius + (($$.radius - $$.innerRadius) / (config.gauge_fullCircle ? 1 : 2))) + 'px')
.attr('dy', '1.2em')
.text(config.gauge_label_show ? config.gauge_min : '');
$$.arcs.select('.' + CLASS.chartArcsGaugeMax)
.attr("dx", $$.innerRadius + (($$.radius - $$.innerRadius) / (config.gauge_fullCircle ? 1 : 2)) + "px")
.attr("dy", "1.2em")
.attr('dx', $$.innerRadius + (($$.radius - $$.innerRadius) / (config.gauge_fullCircle ? 1 : 2)) + 'px')
.attr('dy', '1.2em')
.text(config.gauge_label_show ? config.gauge_max : '');
}
};
c3_chart_internal_fn.initGauge = function () {
var arcs = this.arcs;
const arcs = this.arcs;
if (this.hasType('gauge')) {
arcs.append('path')
.attr("class", CLASS.chartArcsBackground);
arcs.append("text")
.attr("class", CLASS.chartArcsGaugeUnit)
.style("text-anchor", "middle")
.style("pointer-events", "none");
arcs.append("text")
.attr("class", CLASS.chartArcsGaugeMin)
.style("text-anchor", "middle")
.style("pointer-events", "none");
arcs.append("text")
.attr("class", CLASS.chartArcsGaugeMax)
.style("text-anchor", "middle")
.style("pointer-events", "none");
.attr('class', CLASS.chartArcsBackground);
arcs.append('text')
.attr('class', CLASS.chartArcsGaugeUnit)
.style('text-anchor', 'middle')
.style('pointer-events', 'none');
arcs.append('text')
.attr('class', CLASS.chartArcsGaugeMin)
.style('text-anchor', 'middle')
.style('pointer-events', 'none');
arcs.append('text')
.attr('class', CLASS.chartArcsGaugeMax)
.style('text-anchor', 'middle')
.style('pointer-events', 'none');
}
};
c3_chart_internal_fn.getGaugeLabelHeight = function () {

6
src/chartinternal/cache.js

@ -1,6 +1,6 @@
c3_chart_internal_fn.hasCaches = function (ids) {
for (var i = 0; i < ids.length; i++) {
if (! (ids[i] in this.cache)) { return false; }
for (let i = 0; i < ids.length; i++) {
if (!(ids[i] in this.cache)) { return false; }
}
return true;
};
@ -8,7 +8,7 @@ c3_chart_internal_fn.addCache = function (id, target) {
this.cache[id] = this.cloneTarget(target);
};
c3_chart_internal_fn.getCaches = function (ids) {
var targets = [], i;
let targets = [], i;
for (i = 0; i < ids.length; i++) {
if (ids[i] in this.cache) { targets.push(this.cloneTarget(this.cache[ids[i]])); }
}

2
src/chartinternal/category.js

@ -1,4 +1,4 @@
c3_chart_internal_fn.categoryName = function (i) {
var config = this.config;
const config = this.config;
return i < config.axis_x_categories.length ? config.axis_x_categories[i] : i;
};

20
src/chartinternal/class.js

@ -1,4 +1,4 @@
var CLASS = c3_chart_internal_fn.CLASS = {
const CLASS = c3_chart_internal_fn.CLASS = {
target: 'c3-target',
chart: 'c3-chart',
chartLine: 'c3-chart-line',
@ -73,10 +73,10 @@ var CLASS = c3_chart_internal_fn.CLASS = {
dragarea: 'c3-dragarea',
EXPANDED: '_expanded_',
SELECTED: '_selected_',
INCLUDED: '_included_'
INCLUDED: '_included_',
};
c3_chart_internal_fn.generateClass = function (prefix, targetId) {
return " " + prefix + " " + prefix + this.getTargetSelectorSuffix(targetId);
return ' ' + prefix + ' ' + prefix + this.getTargetSelectorSuffix(targetId);
};
c3_chart_internal_fn.classText = function (d) {
return this.generateClass(CLASS.text, d.index);
@ -121,14 +121,14 @@ c3_chart_internal_fn.classAreas = function (d) {
return this.classShapes(d) + this.generateClass(CLASS.areas, d.id);
};
c3_chart_internal_fn.classRegion = function (d, i) {
return this.generateClass(CLASS.region, i) + ' ' + ('class' in d ? d['class'] : '');
return this.generateClass(CLASS.region, i) + ' ' + ('class' in d ? d.class : '');
};
c3_chart_internal_fn.classEvent = function (d) {
return this.generateClass(CLASS.eventRect, d.index);
};
c3_chart_internal_fn.classTarget = function (id) {
var $$ = this;
var additionalClassSuffix = $$.config.data_classes[id], additionalClass = '';
const $$ = this;
let additionalClassSuffix = $$.config.data_classes[id], additionalClass = '';
if (additionalClassSuffix) {
additionalClass = ' ' + CLASS.target + '-' + additionalClassSuffix;
}
@ -162,14 +162,14 @@ c3_chart_internal_fn.selectorTarget = function (id, prefix) {
return (prefix || '') + '.' + CLASS.target + this.getTargetSelectorSuffix(id);
};
c3_chart_internal_fn.selectorTargets = function (ids, prefix) {
var $$ = this;
const $$ = this;
ids = ids || [];
return ids.length ? ids.map(function (id) { return $$.selectorTarget(id, prefix); }) : null;
return ids.length ? ids.map((id) => { return $$.selectorTarget(id, prefix); }) : null;
};
c3_chart_internal_fn.selectorLegend = function (id) {
return '.' + CLASS.legendItem + this.getTargetSelectorSuffix(id);
};
c3_chart_internal_fn.selectorLegends = function (ids) {
var $$ = this;
return ids && ids.length ? ids.map(function (id) { return $$.selectorLegend(id); }) : null;
const $$ = this;
return ids && ids.length ? ids.map((id) => { return $$.selectorLegend(id); }) : null;
};

26
src/chartinternal/clip.js

@ -1,36 +1,36 @@
c3_chart_internal_fn.getClipPath = function (id) {
var isIE9 = window.navigator.appVersion.toLowerCase().indexOf("msie 9.") >= 0;
return "url(" + (isIE9 ? "" : document.URL.split('#')[0]) + "#" + id + ")";
const isIE9 = window.navigator.appVersion.toLowerCase().indexOf('msie 9.') >= 0;
return 'url(' + (isIE9 ? '' : document.URL.split('#')[0]) + '#' + id + ')';
};
c3_chart_internal_fn.appendClip = function (parent, id) {
return parent.append("clipPath").attr("id", id).append("rect");
return parent.append('clipPath').attr('id', id).append('rect');
};
c3_chart_internal_fn.getAxisClipX = function (forHorizontal) {
// axis line width + padding for left
var left = Math.max(30, this.margin.left);
const left = Math.max(30, this.margin.left);
return forHorizontal ? -(1 + left) : -(left - 1);
};
c3_chart_internal_fn.getAxisClipY = function (forHorizontal) {
return forHorizontal ? -20 : -this.margin.top;
};
c3_chart_internal_fn.getXAxisClipX = function () {
var $$ = this;
const $$ = this;
return $$.getAxisClipX(!$$.config.axis_rotated);
};
c3_chart_internal_fn.getXAxisClipY = function () {
var $$ = this;
const $$ = this;
return $$.getAxisClipY(!$$.config.axis_rotated);
};
c3_chart_internal_fn.getYAxisClipX = function () {
var $$ = this;
const $$ = this;
return $$.config.axis_y_inner ? -1 : $$.getAxisClipX($$.config.axis_rotated);
};
c3_chart_internal_fn.getYAxisClipY = function () {
var $$ = this;
const $$ = this;
return $$.getAxisClipY($$.config.axis_rotated);
};
c3_chart_internal_fn.getAxisClipWidth = function (forHorizontal) {
var $$ = this,
let $$ = this,
left = Math.max(30, $$.margin.left),
right = Math.max(30, $$.margin.right);
// width + axis line width + padding for left/right
@ -41,18 +41,18 @@ c3_chart_internal_fn.getAxisClipHeight = function (forHorizontal) {
return (forHorizontal ? this.margin.bottom : (this.margin.top + this.height)) + 20;
};
c3_chart_internal_fn.getXAxisClipWidth = function () {
var $$ = this;
const $$ = this;
return $$.getAxisClipWidth(!$$.config.axis_rotated);
};
c3_chart_internal_fn.getXAxisClipHeight = function () {
var $$ = this;
const $$ = this;
return $$.getAxisClipHeight(!$$.config.axis_rotated);
};
c3_chart_internal_fn.getYAxisClipWidth = function () {
var $$ = this;
const $$ = this;
return $$.getAxisClipWidth($$.config.axis_rotated) + ($$.config.axis_y_inner ? 20 : 0);
};
c3_chart_internal_fn.getYAxisClipHeight = function () {
var $$ = this;
const $$ = this;
return $$.getAxisClipHeight($$.config.axis_rotated);
};

8
src/chartinternal/color.js

@ -1,12 +1,12 @@
c3_chart_internal_fn.generateColor = function () {
var $$ = this, config = $$.config, d3 = $$.d3,
let $$ = this, config = $$.config, d3 = $$.d3,
colors = config.data_colors,
pattern = notEmpty(config.color_pattern) ? config.color_pattern : d3.scale.category10().range(),
callback = config.data_color,
ids = [];
return function (d) {
var id = d.id || (d.data && d.data.id) || d, color;
let id = d.id || (d.data && d.data.id) || d, color;
// if callback function is provided
if (colors[id] instanceof Function) {
@ -26,14 +26,14 @@ c3_chart_internal_fn.generateColor = function () {
};
};
c3_chart_internal_fn.generateLevelColor = function () {
var $$ = this, config = $$.config,
let $$ = this, config = $$.config,
colors = config.color_pattern,
threshold = config.color_threshold,
asValue = threshold.unit === 'value',
values = threshold.values && threshold.values.length ? threshold.values : [],
max = threshold.max || 100;
return notEmpty(config.color_threshold) ? function (value) {
var i, v, color = colors[colors.length - 1];
let i, v, color = colors[colors.length - 1];
for (i = 0; i < values.length; i++) {
v = asValue ? value : (value * 100 / max);
if (v < values[i]) {

66
src/chartinternal/config.js

@ -1,5 +1,5 @@
c3_chart_internal_fn.getDefaultConfig = function () {
var config = {
const config = {
bindto: '#chart',
svg_classname: undefined,
size_width: undefined,
@ -13,26 +13,26 @@ c3_chart_internal_fn.getDefaultConfig = function () {
zoom_extent: undefined,
zoom_privileged: false,
zoom_rescale: false,
zoom_onzoom: function () {},
zoom_onzoomstart: function () {},
zoom_onzoomend: function () {},
zoom_onzoom() {},
zoom_onzoomstart() {},
zoom_onzoomend() {},
zoom_x_min: undefined,
zoom_x_max: undefined,
interaction_brighten: true,
interaction_enabled: true,
onmouseover: function () {},
onmouseout: function () {},
onresize: function () {},
onresized: function () {},
oninit: function () {},
onrendered: function () {},
onmouseover() {},
onmouseout() {},
onresize() {},
onresized() {},
oninit() {},
onrendered() {},
transition_duration: 350,
data_x: undefined,
data_xs: {},
data_xFormat: '%Y-%m-%d',
data_xLocaltime: true,
data_xSort: true,
data_idConverter: function (id) { return id; },
data_idConverter(id) { return id; },
data_names: {},
data_classes: {},
data_groups: [],
@ -48,14 +48,14 @@ c3_chart_internal_fn.getDefaultConfig = function () {
data_filter: undefined,
data_selection_enabled: false,
data_selection_grouped: false,
data_selection_isselectable: function () { return true; },
data_selection_isselectable() { return true; },
data_selection_multiple: true,
data_selection_draggable: false,
data_onclick: function () {},
data_onmouseover: function () {},
data_onmouseout: function () {},
data_onselected: function () {},
data_onunselected: function () {},
data_onclick() {},
data_onmouseover() {},
data_onmouseout() {},
data_onselected() {},
data_onunselected() {},
data_url: undefined,
data_headers: undefined,
data_json: undefined,
@ -64,12 +64,12 @@ c3_chart_internal_fn.getDefaultConfig = function () {
data_mimeType: undefined,
data_keys: undefined,
// configuration for no plot-able data supplied.
data_empty_label_text: "",
data_empty_label_text: '',
// subchart
subchart_show: false,
subchart_size_height: 60,
subchart_axis_x_show: true,
subchart_onbrush: function () {},
subchart_onbrush() {},
// color
color_pattern: [],
color_threshold: {},
@ -121,7 +121,7 @@ c3_chart_internal_fn.getDefaultConfig = function () {
axis_y_label: {},
axis_y_tick_format: undefined,
axis_y_tick_outer: true,
axis_y_tick_values: null,
axis_y_tick_values: null,
axis_y_tick_rotate: 0,
axis_y_tick_count: undefined,
axis_y_tick_time_value: undefined,
@ -183,7 +183,7 @@ c3_chart_internal_fn.getDefaultConfig = function () {
gauge_label_format: undefined,
gauge_min: 0,
gauge_max: 100,
gauge_startingAngle: -1 * Math.PI/2,
gauge_startingAngle: -1 * Math.PI / 2,
gauge_units: undefined,
gauge_width: undefined,
gauge_expand: {},
@ -194,7 +194,7 @@ c3_chart_internal_fn.getDefaultConfig = function () {
donut_label_threshold: 0.05,
donut_label_ratio: undefined,
donut_width: undefined,
donut_title: "",
donut_title: '',
donut_expand: {},
donut_expand_duration: 50,
// spline
@ -208,26 +208,26 @@ c3_chart_internal_fn.getDefaultConfig = function () {
tooltip_format_name: undefined,
tooltip_format_value: undefined,
tooltip_position: undefined,
tooltip_contents: function (d, defaultTitleFormat, defaultValueFormat, color) {
tooltip_contents(d, defaultTitleFormat, defaultValueFormat, color) {
return this.getTooltipContent ? this.getTooltipContent(d, defaultTitleFormat, defaultValueFormat, color) : '';
},
tooltip_init_show: false,
tooltip_init_x: 0,
tooltip_init_position: {top: '0px', left: '50px'},
tooltip_onshow: function () {},
tooltip_onhide: function () {},
tooltip_init_position: { top: '0px', left: '50px' },
tooltip_onshow() {},
tooltip_onhide() {},
// title
title_text: undefined,
title_padding: {
top: 0,
right: 0,
bottom: 0,
left: 0
left: 0,
},
title_position: 'top-center',
//TouchEvent configuration
touch_tap_radius : 20, //touch movement must be less than this to be a 'tap'
touch_tap_delay : 500, //clicks are suppressed for this many ms after a tap
// TouchEvent configuration
touch_tap_radius: 20, // touch movement must be less than this to be a 'tap'
touch_tap_delay: 500, //clicks are suppressed for this many ms after a tap
};
Object.keys(this.additionalConfig).forEach(function (key) {
@ -239,9 +239,9 @@ c3_chart_internal_fn.getDefaultConfig = function () {
c3_chart_internal_fn.additionalConfig = {};
c3_chart_internal_fn.loadConfig = function (config) {
var this_config = this.config, target, keys, read;
let this_config = this.config, target, keys, read;
function find() {
var key = keys.shift();
const key = keys.shift();
// console.log("key =>", key, ", target =>", target);
if (key && target && typeof target === 'object' && key in target) {
target = target[key];
@ -254,7 +254,7 @@ c3_chart_internal_fn.loadConfig = function (config) {
return undefined;
}
}
Object.keys(this_config).forEach(function (key) {
Object.keys(this_config).forEach((key) => {
target = config;
keys = key.split('_');
read = find();

84
src/chartinternal/data.convert.js

@ -1,13 +1,13 @@
c3_chart_internal_fn.convertUrlToData = function (url, mimeType, headers, keys, done) {
var $$ = this, type = mimeType ? mimeType : 'csv';
var req = $$.d3.xhr(url);
let $$ = this, type = mimeType ? mimeType : 'csv';
const req = $$.d3.xhr(url);
if (headers) {
Object.keys(headers).forEach(function (header) {
Object.keys(headers).forEach((header) => {
req.header(header, headers[header]);
});
}
req.get(function (error, data) {
var d;
req.get((error, data) => {
let d;
if (!data) {
throw new Error(error.responseURL + ' ' + error.status + ' (' + error.statusText + ')');
}
@ -22,10 +22,10 @@ c3_chart_internal_fn.convertUrlToData = function (url, mimeType, headers, keys,
});
};
c3_chart_internal_fn.convertXsvToData = function (xsv, parser) {
var rows = parser.parseRows(xsv), d;
let rows = parser.parseRows(xsv), d;
if (rows.length === 1) {
d = [{}];
rows[0].forEach(function (id) {
rows[0].forEach((id) => {
d[0][id] = null;
});
} else {
@ -40,7 +40,7 @@ c3_chart_internal_fn.convertTsvToData = function (tsv) {
return this.convertXsvToData(tsv, this.d3.tsv);
};
c3_chart_internal_fn.convertJsonToData = function (json, keys) {
var $$ = this,
let $$ = this,
new_rows = [], targetKeys, data;
if (keys) { // when keys specified, json would be an array that includes objects
if (keys.x) {
@ -50,11 +50,11 @@ c3_chart_internal_fn.convertJsonToData = function (json, keys) {
targetKeys = keys.value;
}
new_rows.push(targetKeys);
json.forEach(function (o) {
var new_row = [];
targetKeys.forEach(function (key) {
json.forEach((o) => {
const new_row = [];
targetKeys.forEach((key) => {
// convert undefined to null because undefined data will be removed in convertDataToTargets()
var v = $$.findValueInJson(o, key);
let v = $$.findValueInJson(o, key);
if (isUndefined(v)) {
v = null;
}
@ -64,7 +64,7 @@ c3_chart_internal_fn.convertJsonToData = function (json, keys) {
});
data = $$.convertRowsToData(new_rows);
} else {
Object.keys(json).forEach(function (key) {
Object.keys(json).forEach((key) => {
new_rows.push([key].concat(json[key]));
});
data = $$.convertColumnsToData(new_rows);
@ -74,9 +74,9 @@ c3_chart_internal_fn.convertJsonToData = function (json, keys) {
c3_chart_internal_fn.findValueInJson = function (object, path) {
path = path.replace(/\[(\w+)\]/g, '.$1'); // convert indexes to properties (replace [] with .)
path = path.replace(/^\./, ''); // strip a leading dot
var pathArray = path.split('.');
for (var i = 0; i < pathArray.length; ++i) {
var k = pathArray[i];
const pathArray = path.split('.');
for (let i = 0; i < pathArray.length; ++i) {
const k = pathArray[i];
if (k in object) {
object = object[k];
} else {
@ -86,12 +86,12 @@ c3_chart_internal_fn.findValueInJson = function (object, path) {
return object;
};
c3_chart_internal_fn.convertRowsToData = function (rows) {
var keys = rows[0], new_row = {}, new_rows = [], i, j;
let keys = rows[0], new_row = {}, new_rows = [], i, j;
for (i = 1; i < rows.length; i++) {
new_row = {};
for (j = 0; j < rows[i].length; j++) {
if (isUndefined(rows[i][j])) {
throw new Error("Source data is missing a component at (" + i + "," + j + ")!");
throw new Error('Source data is missing a component at (' + i + ',' + j + ')!');
}
new_row[keys[j]] = rows[i][j];
}
@ -100,7 +100,7 @@ c3_chart_internal_fn.convertRowsToData = function (rows) {
return new_rows;
};
c3_chart_internal_fn.convertColumnsToData = function (columns) {
var new_rows = [], i, j, key;
let new_rows = [], i, j, key;
for (i = 0; i < columns.length; i++) {
key = columns[i][0];
for (j = 1; j < columns[i].length; j++) {
@ -108,7 +108,7 @@ c3_chart_internal_fn.convertColumnsToData = function (columns) {
new_rows[j - 1] = {};
}
if (isUndefined(columns[i][j])) {
throw new Error("Source data is missing a component at (" + i + "," + j + ")!");
throw new Error('Source data is missing a component at (' + i + ',' + j + ')!');
}
new_rows[j - 1][key] = columns[i][j];
}
@ -116,22 +116,22 @@ c3_chart_internal_fn.convertColumnsToData = function (columns) {
return new_rows;
};
c3_chart_internal_fn.convertDataToTargets = function (data, appendXs) {
var $$ = this, config = $$.config,
let $$ = this, config = $$.config,
ids = $$.d3.keys(data[0]).filter($$.isNotX, $$),
xs = $$.d3.keys(data[0]).filter($$.isX, $$),
targets;
// save x for update data by load when custom x and c3.x API
ids.forEach(function (id) {
var xKey = $$.getXKey(id);
ids.forEach((id) => {
const xKey = $$.getXKey(id);
if ($$.isCustomX() || $$.isTimeSeries()) {
// if included in input data
if (xs.indexOf(xKey) >= 0) {
$$.data.xs[id] = (appendXs && $$.data.xs[id] ? $$.data.xs[id] : []).concat(
data.map(function (d) { return d[xKey]; })
data.map((d) => { return d[xKey]; })
.filter(isValue)
.map(function (rawX, i) { return $$.generateTargetX(rawX, id, i); })
.map((rawX, i) => { return $$.generateTargetX(rawX, id, i); })
);
}
// if not included in input data, find from preloaded data of other id's x
@ -144,26 +144,26 @@ c3_chart_internal_fn.convertDataToTargets = function (data, appendXs) {
}
// MEMO: if no x included, use same x of current will be used
} else {
$$.data.xs[id] = data.map(function (d, i) { return i; });
$$.data.xs[id] = data.map((d, i) => { return i; });
}
});
// check x is defined
ids.forEach(function (id) {
ids.forEach((id) => {
if (!$$.data.xs[id]) {
throw new Error('x is not defined for id = "' + id + '".');
}
});
// convert to target
targets = ids.map(function (id, index) {
var convertedId = config.data_idConverter(id);
targets = ids.map((id, index) => {
const convertedId = config.data_idConverter(id);
return {
id: convertedId,
id_org: id,
values: data.map(function (d, i) {
var xKey = $$.getXKey(id), rawX = d[xKey],
values: data.map((d, i) => {
let xKey = $$.getXKey(id), rawX = d[xKey],
value = d[id] !== null && !isNaN(d[id]) ? +d[id] : null, x;
// use x as categories if custom x and categorized
if ($$.isCustomX() && $$.isCategorized() && index === 0 && !isUndefined(rawX)) {
@ -176,35 +176,35 @@ c3_chart_internal_fn.convertDataToTargets = function (data, appendXs) {
config.axis_x_categories.push(rawX);
}
} else {
x = $$.generateTargetX(rawX, id, i);
x = $$.generateTargetX(rawX, id, i);
}
// mark as x = undefined if value is undefined and filter to remove after mapped
if (isUndefined(d[id]) || $$.data.xs[id].length <= i) {
x = undefined;
}
return {x: x, value: value, id: convertedId};
}).filter(function (v) { return isDefined(v.x); })
return { x, value, id: convertedId };
}).filter((v) => { return isDefined(v.x); }),
};
});
// finish targets
targets.forEach(function (t) {
var i;
targets.forEach((t) => {
let i;
// sort values by its x
if (config.data_xSort) {
t.values = t.values.sort(function (v1, v2) {
var x1 = v1.x || v1.x === 0 ? v1.x : Infinity,
t.values = t.values.sort((v1, v2) => {
let x1 = v1.x || v1.x === 0 ? v1.x : Infinity,
x2 = v2.x || v2.x === 0 ? v2.x : Infinity;
return x1 - x2;
});
}
// indexing each value
i = 0;
t.values.forEach(function (v) {
t.values.forEach((v) => {
v.index = i++;
});
// this needs to be sorted because its index and value.index is identical
$$.data.xs[t.id].sort(function (v1, v2) {
$$.data.xs[t.id].sort((v1, v2) => {
return v1 - v2;
});
});
@ -215,11 +215,11 @@ c3_chart_internal_fn.convertDataToTargets = function (data, appendXs) {
// set target types
if (config.data_type) {
$$.setTargetType($$.mapToIds(targets).filter(function (id) { return ! (id in config.data_types); }), config.data_type);
$$.setTargetType($$.mapToIds(targets).filter((id) => { return !(id in config.data_types); }), config.data_type);
}
// cache as original id keyed
targets.forEach(function (d) {
targets.forEach((d) => {
$$.addCache(d.id_org, d);
});

166
src/chartinternal/data.js

@ -1,18 +1,18 @@
c3_chart_internal_fn.isX = function (key) {
var $$ = this, config = $$.config;
let $$ = this, config = $$.config;
return (config.data_x && key === config.data_x) || (notEmpty(config.data_xs) && hasValue(config.data_xs, key));
};
c3_chart_internal_fn.isNotX = function (key) {
return !this.isX(key);
};
c3_chart_internal_fn.getXKey = function (id) {
var $$ = this, config = $$.config;
let $$ = this, config = $$.config;
return config.data_x ? config.data_x : notEmpty(config.data_xs) ? config.data_xs[id] : null;
};
c3_chart_internal_fn.getXValuesOfXKey = function (key, targets) {
var $$ = this,
let $$ = this,
xValues, ids = targets && notEmpty(targets) ? $$.mapToIds(targets) : [];
ids.forEach(function (id) {
ids.forEach((id) => {
if ($$.getXKey(id) === key) {
xValues = $$.data.xs[id];
}
@ -20,37 +20,37 @@ c3_chart_internal_fn.getXValuesOfXKey = function (key, targets) {
return xValues;
};
c3_chart_internal_fn.getIndexByX = function (x) {
var $$ = this,
let $$ = this,
data = $$.filterByX($$.data.targets, x);
return data.length ? data[0].index : null;
};
c3_chart_internal_fn.getXValue = function (id, i) {
var $$ = this;
const $$ = this;
return id in $$.data.xs && $$.data.xs[id] && isValue($$.data.xs[id][i]) ? $$.data.xs[id][i] : i;
};
c3_chart_internal_fn.getOtherTargetXs = function () {
var $$ = this,
let $$ = this,
idsForX = Object.keys($$.data.xs);
return idsForX.length ? $$.data.xs[idsForX[0]] : null;
};
c3_chart_internal_fn.getOtherTargetX = function (index) {
var xs = this.getOtherTargetXs();
const xs = this.getOtherTargetXs();
return xs && index < xs.length ? xs[index] : null;
};
c3_chart_internal_fn.addXs = function (xs) {
var $$ = this;
Object.keys(xs).forEach(function (id) {
const $$ = this;
Object.keys(xs).forEach((id) => {
$$.config.data_xs[id] = xs[id];
});
};
c3_chart_internal_fn.hasMultipleX = function (xs) {
return this.d3.set(Object.keys(xs).map(function (id) { return xs[id]; })).size() > 1;
return this.d3.set(Object.keys(xs).map((id) => { return xs[id]; })).size() > 1;
};
c3_chart_internal_fn.isMultipleX = function () {
return notEmpty(this.config.data_xs) || !this.config.data_xSort || this.hasType('scatter');
};
c3_chart_internal_fn.addName = function (data) {
var $$ = this, name;
let $$ = this, name;
if (data) {
name = $$.config.data_names[data.id];
data.name = name !== undefined ? name : data.id;
@ -58,28 +58,28 @@ c3_chart_internal_fn.addName = function (data) {
return data;
};
c3_chart_internal_fn.getValueOnIndex = function (values, index) {
var valueOnIndex = values.filter(function (v) { return v.index === index; });
const valueOnIndex = values.filter((v) => { return v.index === index; });
return valueOnIndex.length ? valueOnIndex[0] : null;
};
c3_chart_internal_fn.updateTargetX = function (targets, x) {
var $$ = this;
targets.forEach(function (t) {
t.values.forEach(function (v, i) {
const $$ = this;
targets.forEach((t) => {
t.values.forEach((v, i) => {
v.x = $$.generateTargetX(x[i], t.id, i);
});
$$.data.xs[t.id] = x;
});
};
c3_chart_internal_fn.updateTargetXs = function (targets, xs) {
var $$ = this;
targets.forEach(function (t) {
const $$ = this;
targets.forEach((t) => {
if (xs[t.id]) {
$$.updateTargetX([t], xs[t.id]);
}
});
};
c3_chart_internal_fn.generateTargetX = function (rawX, id, index) {
var $$ = this, x;
let $$ = this, x;
if ($$.isTimeSeries()) {
x = rawX ? $$.parseDate(rawX) : $$.parseDate($$.getXValue(id, index));
}
@ -93,38 +93,38 @@ c3_chart_internal_fn.generateTargetX = function (rawX, id, index) {
};
c3_chart_internal_fn.cloneTarget = function (target) {
return {
id : target.id,
id_org : target.id_org,
values : target.values.map(function (d) {
return {x: d.x, value: d.value, id: d.id};
})
id: target.id,
id_org: target.id_org,
values: target.values.map((d) => {
return { x: d.x, value: d.value, id: d.id };
}),
};
};
c3_chart_internal_fn.updateXs = function () {
var $$ = this;
const $$ = this;
if ($$.data.targets.length) {
$$.xs = [];
$$.data.targets[0].values.forEach(function (v) {
$$.data.targets[0].values.forEach((v) => {
$$.xs[v.index] = v.x;
});
}
};
c3_chart_internal_fn.getPrevX = function (i) {
var x = this.xs[i - 1];
const x = this.xs[i - 1];
return typeof x !== 'undefined' ? x : null;
};
c3_chart_internal_fn.getNextX = function (i) {
var x = this.xs[i + 1];
const x = this.xs[i + 1];
return typeof x !== 'undefined' ? x : null;
};
c3_chart_internal_fn.getMaxDataCount = function () {
var $$ = this;
return $$.d3.max($$.data.targets, function (t) { return t.values.length; });
const $$ = this;
return $$.d3.max($$.data.targets, (t) => { return t.values.length; });
};
c3_chart_internal_fn.getMaxDataCountTarget = function (targets) {
var length = targets.length, max = 0, maxTarget;
let length = targets.length, max = 0, maxTarget;
if (length > 1) {
targets.forEach(function (t) {
targets.forEach((t) => {
if (t.values.length > max) {
maxTarget = t;
max = t.values.length;
@ -136,21 +136,21 @@ c3_chart_internal_fn.getMaxDataCountTarget = function (targets) {
return maxTarget;
};
c3_chart_internal_fn.getEdgeX = function (targets) {
var $$ = this;
const $$ = this;
return !targets.length ? [0, 0] : [
$$.d3.min(targets, function (t) { return t.values[0].x; }),
$$.d3.max(targets, function (t) { return t.values[t.values.length - 1].x; })
$$.d3.min(targets, (t) => { return t.values[0].x; }),
$$.d3.max(targets, (t) => { return t.values[t.values.length - 1].x; }),
];
};
c3_chart_internal_fn.mapToIds = function (targets) {
return targets.map(function (d) { return d.id; });
return targets.map((d) => { return d.id; });
};
c3_chart_internal_fn.mapToTargetIds = function (ids) {
var $$ = this;
const $$ = this;
return ids ? [].concat(ids) : $$.mapToIds($$.data.targets);
};
c3_chart_internal_fn.hasTarget = function (targets, id) {
var ids = this.mapToIds(targets), i;
let ids = this.mapToIds(targets), i;
for (i = 0; i < ids.length; i++) {
if (ids[i] === id) {
return true;
@ -165,39 +165,39 @@ c3_chart_internal_fn.isLegendToShow = function (targetId) {
return this.hiddenLegendIds.indexOf(targetId) < 0;
};
c3_chart_internal_fn.filterTargetsToShow = function (targets) {
var $$ = this;
return targets.filter(function (t) { return $$.isTargetToShow(t.id); });
const $$ = this;
return targets.filter((t) => { return $$.isTargetToShow(t.id); });
};
c3_chart_internal_fn.mapTargetsToUniqueXs = function (targets) {
var $$ = this;
var xs = $$.d3.set($$.d3.merge(targets.map(function (t) { return t.values.map(function (v) { return +v.x; }); }))).values();
xs = $$.isTimeSeries() ? xs.map(function (x) { return new Date(+x); }) : xs.map(function (x) { return +x; });
return xs.sort(function (a, b) { return a < b ? -1 : a > b ? 1 : a >= b ? 0 : NaN; });
const $$ = this;
let xs = $$.d3.set($$.d3.merge(targets.map((t) => { return t.values.map((v) => { return +v.x; }); }))).values();
xs = $$.isTimeSeries() ? xs.map((x) => { return new Date(+x); }) : xs.map((x) => { return +x; });
return xs.sort((a, b) => { return a < b ? -1 : a > b ? 1 : a >= b ? 0 : NaN; });
};
c3_chart_internal_fn.addHiddenTargetIds = function (targetIds) {
this.hiddenTargetIds = this.hiddenTargetIds.concat(targetIds);
};
c3_chart_internal_fn.removeHiddenTargetIds = function (targetIds) {
this.hiddenTargetIds = this.hiddenTargetIds.filter(function (id) { return targetIds.indexOf(id) < 0; });
this.hiddenTargetIds = this.hiddenTargetIds.filter((id) => { return targetIds.indexOf(id) < 0; });
};
c3_chart_internal_fn.addHiddenLegendIds = function (targetIds) {
this.hiddenLegendIds = this.hiddenLegendIds.concat(targetIds);
};
c3_chart_internal_fn.removeHiddenLegendIds = function (targetIds) {
this.hiddenLegendIds = this.hiddenLegendIds.filter(function (id) { return targetIds.indexOf(id) < 0; });
this.hiddenLegendIds = this.hiddenLegendIds.filter((id) => { return targetIds.indexOf(id) < 0; });
};
c3_chart_internal_fn.getValuesAsIdKeyed = function (targets) {
var ys = {};
targets.forEach(function (t) {
const ys = {};
targets.forEach((t) => {
ys[t.id] = [];
t.values.forEach(function (v) {
t.values.forEach((v) => {
ys[t.id].push(v.value);
});
});
return ys;
};
c3_chart_internal_fn.checkValueInTargets = function (targets, checker) {
var ids = Object.keys(targets), i, j, values;
let ids = Object.keys(targets), i, j, values;
for (i = 0; i < ids.length; i++) {
values = targets[ids[i]].values;
for (j = 0; j < values.length; j++) {
@ -209,25 +209,25 @@ c3_chart_internal_fn.checkValueInTargets = function (targets, checker) {
return false;
};
c3_chart_internal_fn.hasNegativeValueInTargets = function (targets) {
return this.checkValueInTargets(targets, function (v) { return v < 0; });
return this.checkValueInTargets(targets, (v) => { return v < 0; });
};
c3_chart_internal_fn.hasPositiveValueInTargets = function (targets) {
return this.checkValueInTargets(targets, function (v) { return v > 0; });
return this.checkValueInTargets(targets, (v) => { return v > 0; });
};
c3_chart_internal_fn.isOrderDesc = function () {
var config = this.config;
return typeof(config.data_order) === 'string' && config.data_order.toLowerCase() === 'desc';
const config = this.config;
return typeof (config.data_order) === 'string' && config.data_order.toLowerCase() === 'desc';
};
c3_chart_internal_fn.isOrderAsc = function () {
var config = this.config;
return typeof(config.data_order) === 'string' && config.data_order.toLowerCase() === 'asc';
const config = this.config;
return typeof (config.data_order) === 'string' && config.data_order.toLowerCase() === 'asc';
};
c3_chart_internal_fn.orderTargets = function (targets) {
var $$ = this, config = $$.config, orderAsc = $$.isOrderAsc(), orderDesc = $$.isOrderDesc();
let $$ = this, config = $$.config, orderAsc = $$.isOrderAsc(), orderDesc = $$.isOrderDesc();
if (orderAsc || orderDesc) {
targets.sort(function (t1, t2) {
var reducer = function (p, c) { return p + Math.abs(c.value); };
var t1Sum = t1.values.reduce(reducer, 0),
targets.sort((t1, t2) => {
const reducer = function (p, c) { return p + Math.abs(c.value); };
let t1Sum = t1.values.reduce(reducer, 0),
t2Sum = t2.values.reduce(reducer, 0);
return orderAsc ? t2Sum - t1Sum : t1Sum - t2Sum;
});
@ -237,24 +237,24 @@ c3_chart_internal_fn.orderTargets = function (targets) {
return targets;
};
c3_chart_internal_fn.filterByX = function (targets, x) {
return this.d3.merge(targets.map(function (t) { return t.values; })).filter(function (v) { return v.x - x === 0; });
return this.d3.merge(targets.map((t) => { return t.values; })).filter((v) => { return v.x - x === 0; });
};
c3_chart_internal_fn.filterRemoveNull = function (data) {
return data.filter(function (d) { return isValue(d.value); });
return data.filter((d) => { return isValue(d.value); });
};
c3_chart_internal_fn.filterByXDomain = function (targets, xDomain) {
return targets.map(function (t) {
return targets.map((t) => {
return {
id: t.id,
id_org: t.id_org,
values: t.values.filter(function (v) {
values: t.values.filter((v) => {
return xDomain[0] <= v.x && v.x <= xDomain[1];
})
}),
};
});
};
c3_chart_internal_fn.hasDataLabel = function () {
var config = this.config;
const config = this.config;
if (typeof config.data_labels === 'boolean' && config.data_labels) {
return true;
} else if (typeof config.data_labels === 'object' && notEmpty(config.data_labels)) {
@ -263,12 +263,12 @@ c3_chart_internal_fn.hasDataLabel = function () {
return false;
};
c3_chart_internal_fn.getDataLabelLength = function (min, max, key) {
var $$ = this,
let $$ = this,
lengths = [0, 0], paddingCoef = 1.3;
$$.selectChart.select('svg').selectAll('.dummy')
.data([min, max])
.enter().append('text')
.text(function (d) { return $$.dataLabelFormat(d.id)(d); })
.text((d) => { return $$.dataLabelFormat(d.id)(d); })
.each(function (d, i) {
lengths[i] = this.getBoundingClientRect()[key] * paddingCoef;
})
@ -282,7 +282,7 @@ c3_chart_internal_fn.isArc = function (d) {
return 'data' in d && this.hasTarget(this.data.targets, d.data.id);
};
c3_chart_internal_fn.findSameXOfValues = function (values, index) {
var i, targetX = values[index].x, sames = [];
let i, targetX = values[index].x, sames = [];
for (i = index - 1; i >= 0; i--) {
if (targetX !== values[i].x) { break; }
sames.push(values[i]);
@ -295,10 +295,10 @@ c3_chart_internal_fn.findSameXOfValues = function (values, index) {
};
c3_chart_internal_fn.findClosestFromTargets = function (targets, pos) {
var $$ = this, candidates;
let $$ = this, candidates;
// map to array of closest points of each target
candidates = targets.map(function (target) {
candidates = targets.map((target) => {
return $$.findClosest(target.values, pos);
});
@ -306,19 +306,19 @@ c3_chart_internal_fn.findClosestFromTargets = function (targets, pos) {
return $$.findClosest(candidates, pos);
};
c3_chart_internal_fn.findClosest = function (values, pos) {
var $$ = this, minDist = $$.config.point_sensitivity, closest;
let $$ = this, minDist = $$.config.point_sensitivity, closest;
// find mouseovering bar
values.filter(function (v) { return v && $$.isBarType(v.id); }).forEach(function (v) {
var shape = $$.main.select('.' + CLASS.bars + $$.getTargetSelectorSuffix(v.id) + ' .' + CLASS.bar + '-' + v.index).node();
values.filter((v) => { return v && $$.isBarType(v.id); }).forEach((v) => {
const shape = $$.main.select('.' + CLASS.bars + $$.getTargetSelectorSuffix(v.id) + ' .' + CLASS.bar + '-' + v.index).node();
if (!closest && $$.isWithinBar(shape)) {
closest = v;
}
});
// find closest point from non-bar
values.filter(function (v) { return v && !$$.isBarType(v.id); }).forEach(function (v) {
var d = $$.dist(v, pos);
values.filter((v) => { return v && !$$.isBarType(v.id); }).forEach((v) => {
const d = $$.dist(v, pos);
if (d < minDist) {
minDist = d;
closest = v;
@ -328,7 +328,7 @@ c3_chart_internal_fn.findClosest = function (values, pos) {
return closest;
};
c3_chart_internal_fn.dist = function (data, pos) {
var $$ = this, config = $$.config,
let $$ = this, config = $$.config,
xIndex = config.axis_rotated ? 1 : 0,
yIndex = config.axis_rotated ? 0 : 1,
y = $$.circleY(data, data.index),
@ -336,7 +336,7 @@ c3_chart_internal_fn.dist = function (data, pos) {
return Math.sqrt(Math.pow(x - pos[xIndex], 2) + Math.pow(y - pos[yIndex], 2));
};
c3_chart_internal_fn.convertValuesToStep = function (values) {
var converted = [].concat(values), i;
let converted = [].concat(values), i;
if (!this.isCategorized()) {
return values;
@ -349,22 +349,22 @@ c3_chart_internal_fn.convertValuesToStep = function (values) {
converted[0] = {
x: converted[0].x - 1,
value: converted[0].value,
id: converted[0].id
id: converted[0].id,
};
converted[values.length + 1] = {
x: converted[values.length].x + 1,
value: converted[values.length].value,
id: converted[values.length].id
id: converted[values.length].id,
};
return converted;
};
c3_chart_internal_fn.updateDataAttributes = function (name, attrs) {
var $$ = this, config = $$.config, current = config['data_' + name];
let $$ = this, config = $$.config, current = config['data_' + name];
if (typeof attrs === 'undefined') { return current; }
Object.keys(attrs).forEach(function (id) {
Object.keys(attrs).forEach((id) => {
current[id] = attrs[id];
});
$$.redraw({withLegend: true});
$$.redraw({ withLegend: true });
return current;
};

26
src/chartinternal/data.load.js

@ -1,5 +1,5 @@
c3_chart_internal_fn.load = function (targets, args) {
var $$ = this;
const $$ = this;
if (targets) {
// filter loading targets if needed
if (args.filter) {
@ -7,14 +7,14 @@ c3_chart_internal_fn.load = function (targets, args) {
}
// set type if args.types || args.type specified
if (args.type || args.types) {
targets.forEach(function (t) {
var type = args.types && args.types[t.id] ? args.types[t.id] : args.type;
targets.forEach((t) => {
const type = args.types && args.types[t.id] ? args.types[t.id] : args.type;
$$.setTargetType(t.id, type);
});
}
// Update/Add data
$$.data.targets.forEach(function (d) {
for (var i = 0; i < targets.length; i++) {
$$.data.targets.forEach((d) => {
for (let i = 0; i < targets.length; i++) {
if (d.id === targets[i].id) {
d.values = targets[i].values;
targets.splice(i, 1);
@ -29,17 +29,17 @@ c3_chart_internal_fn.load = function (targets, args) {
$$.updateTargets($$.data.targets);
// Redraw with new targets
$$.redraw({withUpdateOrgXDomain: true, withUpdateXDomain: true, withLegend: true});
$$.redraw({ withUpdateOrgXDomain: true, withUpdateXDomain: true, withLegend: true });
if (args.done) { args.done(); }
};
c3_chart_internal_fn.loadFromArgs = function (args) {
var $$ = this;
const $$ = this;
if (args.data) {
$$.load($$.convertDataToTargets(args.data), args);
}
else if (args.url) {
$$.convertUrlToData(args.url, args.mimeType, args.headers, args.keys, function (data) {
$$.convertUrlToData(args.url, args.mimeType, args.headers, args.keys, (data) => {
$$.load($$.convertDataToTargets(data), args);
});
}
@ -57,23 +57,23 @@ c3_chart_internal_fn.loadFromArgs = function (args) {
}
};
c3_chart_internal_fn.unload = function (targetIds, done) {
var $$ = this;
const $$ = this;
if (!done) {
done = function () {};
}
// filter existing target
targetIds = targetIds.filter(function (id) { return $$.hasTarget($$.data.targets, id); });
targetIds = targetIds.filter((id) => { return $$.hasTarget($$.data.targets, id); });
// If no target, call done and return
if (!targetIds || targetIds.length === 0) {
done();
return;
}
$$.svg.selectAll(targetIds.map(function (id) { return $$.selectorTarget(id); }))
$$.svg.selectAll(targetIds.map((id) => { return $$.selectorTarget(id); }))
.transition()
.style('opacity', 0)
.remove()
.call($$.endall, done);
targetIds.forEach(function (id) {
targetIds.forEach((id) => {
// Reset fadein for future load
$$.withoutFadeIn[id] = false;
// Remove target's elements
@ -81,7 +81,7 @@ c3_chart_internal_fn.unload = function (targetIds, done) {
$$.legend.selectAll('.' + CLASS.legendItem + $$.getTargetSelectorSuffix(id)).remove();
}
// Remove target
$$.data.targets = $$.data.targets.filter(function (t) {
$$.data.targets = $$.data.targets.filter((t) => {
return t.id !== id;
});
});

46
src/chartinternal/domain.js

@ -1,25 +1,25 @@
c3_chart_internal_fn.getYDomainMin = function (targets) {
var $$ = this, config = $$.config,
let $$ = this, config = $$.config,
ids = $$.mapToIds(targets), ys = $$.getValuesAsIdKeyed(targets),
j, k, baseId, idsInGroup, id, hasNegativeValue;
if (config.data_groups.length > 0) {
hasNegativeValue = $$.hasNegativeValueInTargets(targets);
for (j = 0; j < config.data_groups.length; j++) {
// Determine baseId
idsInGroup = config.data_groups[j].filter(function (id) { return ids.indexOf(id) >= 0; });
idsInGroup = config.data_groups[j].filter((id) => { return ids.indexOf(id) >= 0; });
if (idsInGroup.length === 0) { continue; }
baseId = idsInGroup[0];
// Consider negative values
if (hasNegativeValue && ys[baseId]) {
ys[baseId].forEach(function (v, i) {
ys[baseId].forEach((v, i) => {
ys[baseId][i] = v < 0 ? v : 0;
});
}
// Compute min
for (k = 1; k < idsInGroup.length; k++) {
id = idsInGroup[k];
if (! ys[id]) { continue; }
ys[id].forEach(function (v, i) {
if (!ys[id]) { continue; }
ys[id].forEach((v, i) => {
if ($$.axis.getId(id) === $$.axis.getId(baseId) && ys[baseId] && !(hasNegativeValue && +v > 0)) {
ys[baseId][i] += +v;
}
@ -27,30 +27,30 @@ c3_chart_internal_fn.getYDomainMin = function (targets) {
}
}
}
return $$.d3.min(Object.keys(ys).map(function (key) { return $$.d3.min(ys[key]); }));
return $$.d3.min(Object.keys(ys).map((key) => { return $$.d3.min(ys[key]); }));
};
c3_chart_internal_fn.getYDomainMax = function (targets) {
var $$ = this, config = $$.config,
let $$ = this, config = $$.config,
ids = $$.mapToIds(targets), ys = $$.getValuesAsIdKeyed(targets),
j, k, baseId, idsInGroup, id, hasPositiveValue;
if (config.data_groups.length > 0) {
hasPositiveValue = $$.hasPositiveValueInTargets(targets);
for (j = 0; j < config.data_groups.length; j++) {
// Determine baseId
idsInGroup = config.data_groups[j].filter(function (id) { return ids.indexOf(id) >= 0; });
idsInGroup = config.data_groups[j].filter((id) => { return ids.indexOf(id) >= 0; });
if (idsInGroup.length === 0) { continue; }
baseId = idsInGroup[0];
// Consider positive values
if (hasPositiveValue && ys[baseId]) {
ys[baseId].forEach(function (v, i) {
ys[baseId].forEach((v, i) => {
ys[baseId][i] = v > 0 ? v : 0;
});
}
// Compute max
for (k = 1; k < idsInGroup.length; k++) {
id = idsInGroup[k];
if (! ys[id]) { continue; }
ys[id].forEach(function (v, i) {
if (!ys[id]) { continue; }
ys[id].forEach((v, i) => {
if ($$.axis.getId(id) === $$.axis.getId(baseId) && ys[baseId] && !(hasPositiveValue && +v < 0)) {
ys[baseId][i] += +v;
}
@ -58,11 +58,11 @@ c3_chart_internal_fn.getYDomainMax = function (targets) {
}
}
}
return $$.d3.max(Object.keys(ys).map(function (key) { return $$.d3.max(ys[key]); }));
return $$.d3.max(Object.keys(ys).map((key) => { return $$.d3.max(ys[key]); }));
};
c3_chart_internal_fn.getYDomain = function (targets, axisId, xDomain) {
var $$ = this, config = $$.config,
targetsByAxisId = targets.filter(function (t) { return $$.axis.getId(t.id) === axisId; }),
let $$ = this, config = $$.config,
targetsByAxisId = targets.filter((t) => { return $$.axis.getId(t.id) === axisId; }),
yTargets = xDomain ? $$.filterByXDomain(targetsByAxisId, xDomain) : targetsByAxisId,
yMin = axisId === 'y2' ? config.axis_y2_min : config.axis_y_min,
yMax = axisId === 'y2' ? config.axis_y2_max : config.axis_y_max,
@ -143,19 +143,19 @@ c3_chart_internal_fn.getYDomain = function (targets, axisId, xDomain) {
return isInverted ? domain.reverse() : domain;
};
c3_chart_internal_fn.getXDomainMin = function (targets) {
var $$ = this, config = $$.config;
let $$ = this, config = $$.config;
return isDefined(config.axis_x_min) ?
($$.isTimeSeries() ? this.parseDate(config.axis_x_min) : config.axis_x_min) :
$$.d3.min(targets, function (t) { return $$.d3.min(t.values, function (v) { return v.x; }); });
$$.d3.min(targets, (t) => { return $$.d3.min(t.values, (v) => { return v.x; }); });
};
c3_chart_internal_fn.getXDomainMax = function (targets) {
var $$ = this, config = $$.config;
let $$ = this, config = $$.config;
return isDefined(config.axis_x_max) ?
($$.isTimeSeries() ? this.parseDate(config.axis_x_max) : config.axis_x_max) :
$$.d3.max(targets, function (t) { return $$.d3.max(t.values, function (v) { return v.x; }); });
$$.d3.max(targets, (t) => { return $$.d3.max(t.values, (v) => { return v.x; }); });
};
c3_chart_internal_fn.getXDomainPadding = function (domain) {
var $$ = this, config = $$.config,
let $$ = this, config = $$.config,
diff = domain[1] - domain[0],
maxDataCount, padding, paddingLeft, paddingRight;
if ($$.isCategorized()) {
@ -174,10 +174,10 @@ c3_chart_internal_fn.getXDomainPadding = function (domain) {
} else {
paddingLeft = paddingRight = padding;
}
return {left: paddingLeft, right: paddingRight};
return { left: paddingLeft, right: paddingRight };
};
c3_chart_internal_fn.getXDomain = function (targets) {
var $$ = this,
let $$ = this,
xDomain = [$$.getXDomainMin(targets), $$.getXDomainMax(targets)],
firstX = xDomain[0], lastX = xDomain[1],
padding = $$.getXDomainPadding(xDomain),
@ -201,7 +201,7 @@ c3_chart_internal_fn.getXDomain = function (targets) {
return [min, max];
};
c3_chart_internal_fn.updateXDomain = function (targets, withUpdateXDomain, withUpdateOrgXDomain, withTrim, domain) {
var $$ = this, config = $$.config;
let $$ = this, config = $$.config;
if (withUpdateOrgXDomain) {
$$.x.domain(domain ? domain : $$.d3.extent($$.getXDomain(targets)));
@ -221,7 +221,7 @@ c3_chart_internal_fn.updateXDomain = function (targets, withUpdateXDomain, withU
return $$.x.domain();
};
c3_chart_internal_fn.trimXDomain = function (domain) {
var zoomDomain = this.getZoomDomain(),
let zoomDomain = this.getZoomDomain(),
min = zoomDomain[0], max = zoomDomain[1];
if (domain[0] <= min) {
domain[1] = +domain[1] + (min - domain[0]);

24
src/chartinternal/drag.js

@ -1,10 +1,10 @@
c3_chart_internal_fn.drag = function (mouse) {
var $$ = this, config = $$.config, main = $$.main, d3 = $$.d3;
var sx, sy, mx, my, minX, maxX, minY, maxY;
let $$ = this, config = $$.config, main = $$.main, d3 = $$.d3;
let sx, sy, mx, my, minX, maxX, minY, maxY;
if ($$.hasArcType()) { return; }
if (! config.data_selection_enabled) { return; } // do nothing if not selectable
if (config.zoom_enabled && ! $$.zoom.altDomain) { return; } // skip if zoomable because of conflict drag dehavior
if (!config.data_selection_enabled) { return; } // do nothing if not selectable
if (config.zoom_enabled && !$$.zoom.altDomain) { return; } // skip if zoomable because of conflict drag dehavior
if (!config.data_selection_multiple) { return; } // skip when single selection because drag is used for multiple selection
sx = $$.dragStart[0];
@ -23,15 +23,15 @@ c3_chart_internal_fn.drag = function (mouse) {
.attr('height', maxY - minY);
// TODO: binary search when multiple xs
main.selectAll('.' + CLASS.shapes).selectAll('.' + CLASS.shape)
.filter(function (d) { return config.data_selection_isselectable(d); })
.filter((d) => { return config.data_selection_isselectable(d); })
.each(function (d, i) {
var shape = d3.select(this),
let shape = d3.select(this),
isSelected = shape.classed(CLASS.SELECTED),
isIncluded = shape.classed(CLASS.INCLUDED),
_x, _y, _w, _h, toggle, isWithin = false, box;
if (shape.classed(CLASS.circle)) {
_x = shape.attr("cx") * 1;
_y = shape.attr("cy") * 1;
_x = shape.attr('cx') * 1;
_y = shape.attr('cy') * 1;
toggle = $$.togglePoint;
isWithin = minX < _x && _x < maxX && minY < _y && _y < maxY;
}
@ -57,9 +57,9 @@ c3_chart_internal_fn.drag = function (mouse) {
};
c3_chart_internal_fn.dragstart = function (mouse) {
var $$ = this, config = $$.config;
let $$ = this, config = $$.config;
if ($$.hasArcType()) { return; }
if (! config.data_selection_enabled) { return; } // do nothing if not selectable
if (!config.data_selection_enabled) { return; } // do nothing if not selectable
$$.dragStart = mouse;
$$.main.select('.' + CLASS.chart).append('rect')
.attr('class', CLASS.dragarea)
@ -68,9 +68,9 @@ c3_chart_internal_fn.dragstart = function (mouse) {
};
c3_chart_internal_fn.dragend = function () {
var $$ = this, config = $$.config;
let $$ = this, config = $$.config;
if ($$.hasArcType()) { return; }
if (! config.data_selection_enabled) { return; } // do nothing if not selectable
if (!config.data_selection_enabled) { return; } // do nothing if not selectable
$$.main.select('.' + CLASS.dragarea)
.transition().duration(100)
.style('opacity', 0)

64
src/chartinternal/flow.js

@ -1,10 +1,10 @@
c3_chart_internal_fn.generateFlow = function(args) {
var $$ = this,
c3_chart_internal_fn.generateFlow = function (args) {
let $$ = this,
config = $$.config,
d3 = $$.d3;
return function() {
var targets = args.targets,
return function () {
let targets = args.targets,
flow = args.flow,
drawBar = args.drawBar,
drawLine = args.drawLine,
@ -16,7 +16,7 @@ c3_chart_internal_fn.generateFlow = function(args) {
yForText = args.yForText,
duration = args.duration;
var translateX, scaleX = 1,
let translateX, scaleX = 1,
transform,
flowIndex = flow.index,
flowLength = flow.length,
@ -25,10 +25,10 @@ c3_chart_internal_fn.generateFlow = function(args) {
orgDomain = $$.x.domain(),
domain,
durationForFlow = flow.duration || duration,
done = flow.done || function() {},
done = flow.done || function () {},
wait = $$.generateWait();
var xgrid = $$.xgrid || d3.selectAll([]),
let xgrid = $$.xgrid || d3.selectAll([]),
xgridLines = $$.xgridLines || d3.selectAll([]),
mainRegion = $$.mainRegion || d3.selectAll([]),
mainText = $$.mainText || d3.selectAll([]),
@ -41,7 +41,7 @@ c3_chart_internal_fn.generateFlow = function(args) {
$$.flowing = true;
// remove head data after rendered
$$.data.targets.forEach(function(d) {
$$.data.targets.forEach((d) => {
d.values.splice(0, flowLength);
});
@ -77,19 +77,19 @@ c3_chart_internal_fn.generateFlow = function(args) {
$$.hideXGridFocus();
d3.transition().ease('linear').duration(durationForFlow).each(function() {
wait.add($$.axes.x.transition().call($$.xAxis));
wait.add(mainBar.transition().attr('transform', transform));
wait.add(mainLine.transition().attr('transform', transform));
wait.add(mainArea.transition().attr('transform', transform));
wait.add(mainCircle.transition().attr('transform', transform));
wait.add(mainText.transition().attr('transform', transform));
wait.add(mainRegion.filter($$.isRegionOnX).transition().attr('transform', transform));
wait.add(xgrid.transition().attr('transform', transform));
wait.add(xgridLines.transition().attr('transform', transform));
})
.call(wait, function() {
var i, shapes = [],
d3.transition().ease('linear').duration(durationForFlow).each(() => {
wait.add($$.axes.x.transition().call($$.xAxis));
wait.add(mainBar.transition().attr('transform', transform));
wait.add(mainLine.transition().attr('transform', transform));
wait.add(mainArea.transition().attr('transform', transform));
wait.add(mainCircle.transition().attr('transform', transform));
wait.add(mainText.transition().attr('transform', transform));
wait.add(mainRegion.filter($$.isRegionOnX).transition().attr('transform', transform));
wait.add(xgrid.transition().attr('transform', transform));
wait.add(xgridLines.transition().attr('transform', transform));
})
.call(wait, () => {
let i, shapes = [],
texts = [],
eventRects = [];
@ -113,24 +113,24 @@ c3_chart_internal_fn.generateFlow = function(args) {
xgridLines
.attr('transform', null);
xgridLines.select('line')
.attr("x1", config.axis_rotated ? 0 : xv)
.attr("x2", config.axis_rotated ? $$.width : xv);
.attr('x1', config.axis_rotated ? 0 : xv)
.attr('x2', config.axis_rotated ? $$.width : xv);
xgridLines.select('text')
.attr("x", config.axis_rotated ? $$.width : 0)
.attr("y", xv);
.attr('x', config.axis_rotated ? $$.width : 0)
.attr('y', xv);
mainBar
.attr('transform', null)
.attr("d", drawBar);
.attr('d', drawBar);
mainLine
.attr('transform', null)
.attr("d", drawLine);
.attr('d', drawLine);
mainArea
.attr('transform', null)
.attr("d", drawArea);
.attr('d', drawArea);
mainCircle
.attr('transform', null)
.attr("cx", cx)
.attr("cy", cy);
.attr('cx', cx)
.attr('cy', cy);
mainText
.attr('transform', null)
.attr('x', xForText)
@ -139,8 +139,8 @@ c3_chart_internal_fn.generateFlow = function(args) {
mainRegion
.attr('transform', null);
mainRegion.select('rect').filter($$.isRegionOnX)
.attr("x", $$.regionX.bind($$))
.attr("width", $$.regionWidth.bind($$));
.attr('x', $$.regionX.bind($$))
.attr('width', $$.regionWidth.bind($$));
if (config.interaction_enabled) {
$$.redrawEventRect();

14
src/chartinternal/format.js

@ -1,31 +1,31 @@
c3_chart_internal_fn.getYFormat = function (forArc) {
var $$ = this,
let $$ = this,
formatForY = forArc && !$$.hasType('gauge') ? $$.defaultArcValueFormat : $$.yFormat,
formatForY2 = forArc && !$$.hasType('gauge') ? $$.defaultArcValueFormat : $$.y2Format;
return function (v, ratio, id) {
var format = $$.axis.getId(id) === 'y2' ? formatForY2 : formatForY;
const format = $$.axis.getId(id) === 'y2' ? formatForY2 : formatForY;
return format.call($$, v, ratio);
};
};
c3_chart_internal_fn.yFormat = function (v) {
var $$ = this, config = $$.config,
let $$ = this, config = $$.config,
format = config.axis_y_tick_format ? config.axis_y_tick_format : $$.defaultValueFormat;
return format(v);
};
c3_chart_internal_fn.y2Format = function (v) {
var $$ = this, config = $$.config,
let $$ = this, config = $$.config,
format = config.axis_y2_tick_format ? config.axis_y2_tick_format : $$.defaultValueFormat;
return format(v);
};
c3_chart_internal_fn.defaultValueFormat = function (v) {
return isValue(v) ? +v : "";
return isValue(v) ? +v : '';
};
c3_chart_internal_fn.defaultArcValueFormat = function (v, ratio) {
return (ratio * 100).toFixed(1) + '%';
};
c3_chart_internal_fn.dataLabelFormat = function (targetId) {
var $$ = this, data_labels = $$.config.data_labels,
format, defaultFormat = function (v) { return isValue(v) ? +v : ""; };
let $$ = this, data_labels = $$.config.data_labels,
format, defaultFormat = function (v) { return isValue(v) ? +v : ''; };
// find format according to axis id
if (typeof data_labels.format === 'function') {
format = data_labels.format;

136
src/chartinternal/grid.js

@ -1,17 +1,17 @@
c3_chart_internal_fn.initGrid = function () {
var $$ = this, config = $$.config, d3 = $$.d3;
let $$ = this, config = $$.config, d3 = $$.d3;
$$.grid = $$.main.append('g')
.attr("clip-path", $$.clipPathForGrid)
.attr('clip-path', $$.clipPathForGrid)
.attr('class', CLASS.grid);
if (config.grid_x_show) {
$$.grid.append("g").attr("class", CLASS.xgrids);
$$.grid.append('g').attr('class', CLASS.xgrids);
}
if (config.grid_y_show) {
$$.grid.append('g').attr('class', CLASS.ygrids);
}
if (config.grid_focus_show) {
$$.grid.append('g')
.attr("class", CLASS.xgridFocus)
.attr('class', CLASS.xgridFocus)
.append('line')
.attr('class', CLASS.xgridFocus);
}
@ -19,16 +19,16 @@ c3_chart_internal_fn.initGrid = function () {
if (!config.grid_lines_front) { $$.initGridLines(); }
};
c3_chart_internal_fn.initGridLines = function () {
var $$ = this, d3 = $$.d3;
let $$ = this, d3 = $$.d3;
$$.gridLines = $$.main.append('g')
.attr("clip-path", $$.clipPathForGrid)
.attr('clip-path', $$.clipPathForGrid)
.attr('class', CLASS.grid + ' ' + CLASS.gridLines);
$$.gridLines.append('g').attr("class", CLASS.xgridLines);
$$.gridLines.append('g').attr('class', CLASS.xgridLines);
$$.gridLines.append('g').attr('class', CLASS.ygridLines);
$$.xgridLines = d3.selectAll([]);
};
c3_chart_internal_fn.updateXGrid = function (withoutUpdate) {
var $$ = this, config = $$.config, d3 = $$.d3,
let $$ = this, config = $$.config, d3 = $$.d3,
xgridData = $$.generateGridData(config.grid_x_type, $$.x),
tickOffset = $$.isCategorized() ? $$.xAxis.tickOffset() : 0;
@ -36,41 +36,41 @@ c3_chart_internal_fn.updateXGrid = function (withoutUpdate) {
'x1': 0,
'x2': $$.width,
'y1': function (d) { return $$.x(d) - tickOffset; },
'y2': function (d) { return $$.x(d) - tickOffset; }
'y2': function (d) { return $$.x(d) - tickOffset; },
} : {
'x1': function (d) { return $$.x(d) + tickOffset; },
'x2': function (d) { return $$.x(d) + tickOffset; },
'y1': 0,
'y2': $$.height
'y2': $$.height,
};
$$.xgrid = $$.main.select('.' + CLASS.xgrids).selectAll('.' + CLASS.xgrid)
.data(xgridData);
$$.xgrid.enter().append('line').attr("class", CLASS.xgrid);
$$.xgrid.enter().append('line').attr('class', CLASS.xgrid);
if (!withoutUpdate) {
$$.xgrid.attr($$.xgridAttr)
.style("opacity", function () { return +d3.select(this).attr(config.axis_rotated ? 'y1' : 'x1') === (config.axis_rotated ? $$.height : 0) ? 0 : 1; });
.style('opacity', function () { return +d3.select(this).attr(config.axis_rotated ? 'y1' : 'x1') === (config.axis_rotated ? $$.height : 0) ? 0 : 1; });
}
$$.xgrid.exit().remove();
};
c3_chart_internal_fn.updateYGrid = function () {
var $$ = this, config = $$.config,
let $$ = this, config = $$.config,
gridValues = $$.yAxis.tickValues() || $$.y.ticks(config.grid_y_ticks);
$$.ygrid = $$.main.select('.' + CLASS.ygrids).selectAll('.' + CLASS.ygrid)
.data(gridValues);
$$.ygrid.enter().append('line')
.attr('class', CLASS.ygrid);
$$.ygrid.attr("x1", config.axis_rotated ? $$.y : 0)
.attr("x2", config.axis_rotated ? $$.y : $$.width)
.attr("y1", config.axis_rotated ? 0 : $$.y)
.attr("y2", config.axis_rotated ? $$.height : $$.y);
$$.ygrid.attr('x1', config.axis_rotated ? $$.y : 0)
.attr('x2', config.axis_rotated ? $$.y : $$.width)
.attr('y1', config.axis_rotated ? 0 : $$.y)
.attr('y2', config.axis_rotated ? $$.height : $$.y);
$$.ygrid.exit().remove();
$$.smoothLines($$.ygrid, 'grid');
};
c3_chart_internal_fn.gridTextAnchor = function (d) {
return d.position ? d.position : "end";
return d.position ? d.position : 'end';
};
c3_chart_internal_fn.gridTextDx = function (d) {
return d.position === 'start' ? 4 : d.position === 'middle' ? 0 : -4;
@ -82,13 +82,13 @@ c3_chart_internal_fn.yGridTextX = function (d) {
return d.position === 'start' ? 0 : d.position === 'middle' ? this.width / 2 : this.width;
};
c3_chart_internal_fn.updateGrid = function (duration) {
var $$ = this, main = $$.main, config = $$.config,
let $$ = this, main = $$.main, config = $$.config,
xgridLine, ygridLine, yv;
// hide if arc type
$$.grid.style('visibility', $$.hasArcType() ? 'hidden' : 'visible');
main.select('line.' + CLASS.xgridFocus).style("visibility", "hidden");
main.select('line.' + CLASS.xgridFocus).style('visibility', 'hidden');
if (config.grid_x_show) {
$$.updateXGrid();
}
@ -96,20 +96,20 @@ c3_chart_internal_fn.updateGrid = function (duration) {
.data(config.grid_x_lines);
// enter
xgridLine = $$.xgridLines.enter().append('g')
.attr("class", function (d) { return CLASS.xgridLine + (d['class'] ? ' ' + d['class'] : ''); });
.attr('class', (d) => { return CLASS.xgridLine + (d.class ? ' ' + d.class : ''); });
xgridLine.append('line')
.style("opacity", 0);
.style('opacity', 0);
xgridLine.append('text')
.attr("text-anchor", $$.gridTextAnchor)
.attr("transform", config.axis_rotated ? "" : "rotate(-90)")
.attr('text-anchor', $$.gridTextAnchor)
.attr('transform', config.axis_rotated ? '' : 'rotate(-90)')
.attr('dx', $$.gridTextDx)
.attr('dy', -5)
.style("opacity", 0);
.style('opacity', 0);
// udpate
// done in d3.transition() of the end of this function
// exit
$$.xgridLines.exit().transition().duration(duration)
.style("opacity", 0)
.style('opacity', 0)
.remove();
// Y-Grid
@ -120,83 +120,83 @@ c3_chart_internal_fn.updateGrid = function (duration) {
.data(config.grid_y_lines);
// enter
ygridLine = $$.ygridLines.enter().append('g')
.attr("class", function (d) { return CLASS.ygridLine + (d['class'] ? ' ' + d['class'] : ''); });
.attr('class', (d) => { return CLASS.ygridLine + (d.class ? ' ' + d.class : ''); });
ygridLine.append('line')
.style("opacity", 0);
.style('opacity', 0);
ygridLine.append('text')
.attr("text-anchor", $$.gridTextAnchor)
.attr("transform", config.axis_rotated ? "rotate(-90)" : "")
.attr('text-anchor', $$.gridTextAnchor)
.attr('transform', config.axis_rotated ? 'rotate(-90)' : '')
.attr('dx', $$.gridTextDx)
.attr('dy', -5)
.style("opacity", 0);
.style('opacity', 0);
// update
yv = $$.yv.bind($$);
$$.ygridLines.select('line')
.transition().duration(duration)
.attr("x1", config.axis_rotated ? yv : 0)
.attr("x2", config.axis_rotated ? yv : $$.width)
.attr("y1", config.axis_rotated ? 0 : yv)
.attr("y2", config.axis_rotated ? $$.height : yv)
.style("opacity", 1);
.attr('x1', config.axis_rotated ? yv : 0)
.attr('x2', config.axis_rotated ? yv : $$.width)
.attr('y1', config.axis_rotated ? 0 : yv)
.attr('y2', config.axis_rotated ? $$.height : yv)
.style('opacity', 1);
$$.ygridLines.select('text')
.transition().duration(duration)
.attr("x", config.axis_rotated ? $$.xGridTextX.bind($$) : $$.yGridTextX.bind($$))
.attr("y", yv)
.text(function (d) { return d.text; })
.style("opacity", 1);
.attr('x', config.axis_rotated ? $$.xGridTextX.bind($$) : $$.yGridTextX.bind($$))
.attr('y', yv)
.text((d) => { return d.text; })
.style('opacity', 1);
// exit
$$.ygridLines.exit().transition().duration(duration)
.style("opacity", 0)
.style('opacity', 0)
.remove();
};
c3_chart_internal_fn.redrawGrid = function (withTransition) {
var $$ = this, config = $$.config, xv = $$.xv.bind($$),
let $$ = this, config = $$.config, xv = $$.xv.bind($$),
lines = $$.xgridLines.select('line'),
texts = $$.xgridLines.select('text');
return [
(withTransition ? lines.transition() : lines)
.attr("x1", config.axis_rotated ? 0 : xv)
.attr("x2", config.axis_rotated ? $$.width : xv)
.attr("y1", config.axis_rotated ? xv : 0)
.attr("y2", config.axis_rotated ? xv : $$.height)
.style("opacity", 1),
.attr('x1', config.axis_rotated ? 0 : xv)
.attr('x2', config.axis_rotated ? $$.width : xv)
.attr('y1', config.axis_rotated ? xv : 0)
.attr('y2', config.axis_rotated ? xv : $$.height)
.style('opacity', 1),
(withTransition ? texts.transition() : texts)
.attr("x", config.axis_rotated ? $$.yGridTextX.bind($$) : $$.xGridTextX.bind($$))
.attr("y", xv)
.text(function (d) { return d.text; })
.style("opacity", 1)
.attr('x', config.axis_rotated ? $$.yGridTextX.bind($$) : $$.xGridTextX.bind($$))
.attr('y', xv)
.text((d) => { return d.text; })
.style('opacity', 1),
];
};
c3_chart_internal_fn.showXGridFocus = function (selectedData) {
var $$ = this, config = $$.config,
dataToShow = selectedData.filter(function (d) { return d && isValue(d.value); }),
let $$ = this, config = $$.config,
dataToShow = selectedData.filter((d) => { return d && isValue(d.value); }),
focusEl = $$.main.selectAll('line.' + CLASS.xgridFocus),
xx = $$.xx.bind($$);
if (! config.tooltip_show) { return; }
if (!config.tooltip_show) { return; }
// Hide when scatter plot exists
if ($$.hasType('scatter') || $$.hasArcType()) { return; }
focusEl
.style("visibility", "visible")
.style('visibility', 'visible')
.data([dataToShow[0]])
.attr(config.axis_rotated ? 'y1' : 'x1', xx)
.attr(config.axis_rotated ? 'y2' : 'x2', xx);
$$.smoothLines(focusEl, 'grid');
};
c3_chart_internal_fn.hideXGridFocus = function () {
this.main.select('line.' + CLASS.xgridFocus).style("visibility", "hidden");
this.main.select('line.' + CLASS.xgridFocus).style('visibility', 'hidden');
};
c3_chart_internal_fn.updateXgridFocus = function () {
var $$ = this, config = $$.config;
let $$ = this, config = $$.config;
$$.main.select('line.' + CLASS.xgridFocus)
.attr("x1", config.axis_rotated ? 0 : -10)
.attr("x2", config.axis_rotated ? $$.width : -10)
.attr("y1", config.axis_rotated ? -10 : 0)
.attr("y2", config.axis_rotated ? -10 : $$.height);
.attr('x1', config.axis_rotated ? 0 : -10)
.attr('x2', config.axis_rotated ? $$.width : -10)
.attr('y1', config.axis_rotated ? -10 : 0)
.attr('y2', config.axis_rotated ? -10 : $$.height);
};
c3_chart_internal_fn.generateGridData = function (type, scale) {
var $$ = this,
let $$ = this,
gridData = [], xDomain, firstYear, lastYear, i,
tickNum = $$.main.select("." + CLASS.axisX).selectAll('.tick').size();
tickNum = $$.main.select('.' + CLASS.axisX).selectAll('.tick').size();
if (type === 'year') {
xDomain = $$.getXDomain();
firstYear = xDomain[0].getFullYear();
@ -207,16 +207,16 @@ c3_chart_internal_fn.generateGridData = function (type, scale) {
} else {
gridData = scale.ticks(10);
if (gridData.length > tickNum) { // use only int
gridData = gridData.filter(function (d) { return ("" + d).indexOf('.') < 0; });
gridData = gridData.filter((d) => { return ('' + d).indexOf('.') < 0; });
}
}
return gridData;
};
c3_chart_internal_fn.getGridFilterToRemove = function (params) {
return params ? function (line) {
var found = false;
[].concat(params).forEach(function (param) {
if ((('value' in param && line.value === param.value) || ('class' in param && line['class'] === param['class']))) {
let found = false;
[].concat(params).forEach((param) => {
if ((('value' in param && line.value === param.value) || ('class' in param && line.class === param.class))) {
found = true;
}
});
@ -224,7 +224,7 @@ c3_chart_internal_fn.getGridFilterToRemove = function (params) {
} : function () { return true; };
};
c3_chart_internal_fn.removeGridLines = function (params, forX) {
var $$ = this, config = $$.config,
let $$ = this, config = $$.config,
toRemove = $$.getGridFilterToRemove(params),
toShow = function (line) { return !toRemove(line); },
classLines = forX ? CLASS.xgridLines : CLASS.ygridLines,

426
src/chartinternal/index.js

@ -1,6 +1,6 @@
function ChartInternal(api) {
var $$ = this;
$$.d3 = window.d3 ? window.d3 : typeof require !== 'undefined' ? require("d3") : undefined;
const $$ = this;
$$.d3 = window.d3 ? window.d3 : typeof require !== 'undefined' ? require('d3') : undefined;
$$.api = api;
$$.config = $$.getDefaultConfig();
$$.data = {};
@ -8,16 +8,16 @@ function ChartInternal(api) {
$$.axes = {};
}
var c3_chart_internal_fn = ChartInternal.prototype;
const c3_chart_internal_fn = ChartInternal.prototype;
c3_chart_internal_fn.beforeInit = function() {
c3_chart_internal_fn.beforeInit = function () {
// can do something
};
c3_chart_internal_fn.afterInit = function() {
c3_chart_internal_fn.afterInit = function () {
// can do something
};
c3_chart_internal_fn.init = function() {
var $$ = this,
c3_chart_internal_fn.init = function () {
let $$ = this,
config = $$.config;
$$.initParams();
@ -35,13 +35,13 @@ c3_chart_internal_fn.init = function() {
}
};
c3_chart_internal_fn.initParams = function() {
var $$ = this,
c3_chart_internal_fn.initParams = function () {
let $$ = this,
d3 = $$.d3,
config = $$.config;
// MEMO: clipId needs to be unique because it conflicts when multiple charts exist
$$.clipId = "c3-" + (+new Date()) + '-clip',
$$.clipId = 'c3-' + (+new Date()) + '-clip',
$$.clipIdForXAxis = $$.clipId + '-xaxis',
$$.clipIdForYAxis = $$.clipId + '-yaxis',
$$.clipIdForGrid = $$.clipId + '-grid',
@ -65,30 +65,30 @@ c3_chart_internal_fn.initParams = function() {
$$.dataTimeFormat = config.data_xLocaltime ? d3.time.format : d3.time.format.utc;
$$.axisTimeFormat = config.axis_x_localtime ? d3.time.format : d3.time.format.utc;
$$.defaultAxisTimeFormat = $$.axisTimeFormat.multi([
[".%L", function(d) {
['.%L', function (d) {
return d.getMilliseconds();
}],
[":%S", function(d) {
[':%S', function (d) {
return d.getSeconds();
}],
["%I:%M", function(d) {
['%I:%M', function (d) {
return d.getMinutes();
}],
["%I %p", function(d) {
['%I %p', function (d) {
return d.getHours();
}],
["%-m/%-d", function(d) {
['%-m/%-d', function (d) {
return d.getDay() && d.getDate() !== 1;
}],
["%-m/%-d", function(d) {
['%-m/%-d', function (d) {
return d.getDate() !== 1;
}],
["%-m/%-d", function(d) {
['%-m/%-d', function (d) {
return d.getMonth();
}],
["%Y/%-m/%-d", function() {
['%Y/%-m/%-d', function () {
return true;
}]
}],
]);
$$.hiddenTargetIds = [];
@ -96,10 +96,10 @@ c3_chart_internal_fn.initParams = function() {
$$.focusedTargetIds = [];
$$.defocusedTargetIds = [];
$$.xOrient = config.axis_rotated ? "left" : "bottom";
$$.yOrient = config.axis_rotated ? (config.axis_y_inner ? "top" : "bottom") : (config.axis_y_inner ? "right" : "left");
$$.y2Orient = config.axis_rotated ? (config.axis_y2_inner ? "bottom" : "top") : (config.axis_y2_inner ? "left" : "right");
$$.subXOrient = config.axis_rotated ? "left" : "bottom";
$$.xOrient = config.axis_rotated ? 'left' : 'bottom';
$$.yOrient = config.axis_rotated ? (config.axis_y_inner ? 'top' : 'bottom') : (config.axis_y_inner ? 'right' : 'left');
$$.y2Orient = config.axis_rotated ? (config.axis_y2_inner ? 'bottom' : 'top') : (config.axis_y2_inner ? 'left' : 'right');
$$.subXOrient = config.axis_rotated ? 'left' : 'bottom';
$$.isLegendRight = config.legend_position === 'right';
$$.isLegendInset = config.legend_position === 'inset';
@ -112,7 +112,7 @@ c3_chart_internal_fn.initParams = function() {
$$.currentMaxTickWidths = {
x: 0,
y: 0,
y2: 0
y2: 0,
};
$$.rotated_padding_left = 30;
@ -126,7 +126,7 @@ c3_chart_internal_fn.initParams = function() {
$$.axes.subx = d3.selectAll([]); // needs when excluding subchart.js
};
c3_chart_internal_fn.initChartElements = function() {
c3_chart_internal_fn.initChartElements = function () {
if (this.initBar) { this.initBar(); }
if (this.initLine) { this.initLine(); }
if (this.initArc) { this.initArc(); }
@ -134,11 +134,11 @@ c3_chart_internal_fn.initChartElements = function() {
if (this.initText) { this.initText(); }
};
c3_chart_internal_fn.initWithData = function(data) {
var $$ = this,
c3_chart_internal_fn.initWithData = function (data) {
let $$ = this,
d3 = $$.d3,
config = $$.config;
var defs, main, binding = true;
let defs, main, binding = true;
$$.axis = new Axis($$);
@ -158,7 +158,7 @@ c3_chart_internal_fn.initWithData = function(data) {
$$.observeInserted($$.selectChart);
binding = false;
}
$$.selectChart.html("").classed("c3", true);
$$.selectChart.html('').classed('c3', true);
// Init data as targets
$$.data.xs = {};
@ -200,15 +200,15 @@ c3_chart_internal_fn.initWithData = function(data) {
if ($$.brush) { $$.brush.scale($$.subX); }
if (config.zoom_enabled) { $$.zoom.scale($$.x); }
/*-- Basic Elements --*/
/* -- Basic Elements --*/
// Define svgs
$$.svg = $$.selectChart.append("svg")
.style("overflow", "hidden")
.on('mouseenter', function() {
$$.svg = $$.selectChart.append('svg')
.style('overflow', 'hidden')
.on('mouseenter', () => {
return config.onmouseover.call($$);
})
.on('mouseleave', function() {
.on('mouseleave', () => {
return config.onmouseout.call($$);
});
@ -217,7 +217,7 @@ c3_chart_internal_fn.initWithData = function(data) {
}
// Define defs
defs = $$.svg.append("defs");
defs = $$.svg.append('defs');
$$.clipChart = $$.appendClip(defs, $$.clipId);
$$.clipXAxis = $$.appendClip(defs, $$.clipIdForXAxis);
$$.clipYAxis = $$.appendClip(defs, $$.clipIdForYAxis);
@ -226,20 +226,20 @@ c3_chart_internal_fn.initWithData = function(data) {
$$.updateSvgSize();
// Define regions
main = $$.main = $$.svg.append("g").attr("transform", $$.getTranslate('main'));
main = $$.main = $$.svg.append('g').attr('transform', $$.getTranslate('main'));
if ($$.initSubchart) { $$.initSubchart(); }
if ($$.initTooltip) { $$.initTooltip(); }
if ($$.initLegend) { $$.initLegend(); }
if ($$.initTitle) { $$.initTitle(); }
/*-- Main Region --*/
/* -- Main Region --*/
// text when empty
main.append("text")
.attr("class", CLASS.text + ' ' + CLASS.empty)
.attr("text-anchor", "middle") // horizontal centering of text at x position in all browsers.
.attr("dominant-baseline", "middle"); // vertical centering of text at y position in all browsers, except IE.
main.append('text')
.attr('class', CLASS.text + ' ' + CLASS.empty)
.attr('text-anchor', 'middle') // horizontal centering of text at x position in all browsers.
.attr('dominant-baseline', 'middle'); // vertical centering of text at y position in all browsers, except IE.
// Regions
$$.initRegion();
@ -249,7 +249,7 @@ c3_chart_internal_fn.initWithData = function(data) {
// Define g for chart area
main.append('g')
.attr("clip-path", $$.clipPath)
.attr('clip-path', $$.clipPath)
.attr('class', CLASS.chart);
// Grid lines
@ -268,7 +268,7 @@ c3_chart_internal_fn.initWithData = function(data) {
.attr('width', $$.width)
.attr('height', $$.height)
.style('opacity', 0)
.on("dblclick.zoom", null);
.on('dblclick.zoom', null);
// Set default extent if defined
if (config.axis_x_extent) { $$.brush.extent($$.getDefaultExtent()); }
@ -288,7 +288,7 @@ c3_chart_internal_fn.initWithData = function(data) {
withTransform: true,
withUpdateXDomain: true,
withUpdateOrgXDomain: true,
withTransitionForAxis: false
withTransitionForAxis: false,
});
}
@ -299,11 +299,11 @@ c3_chart_internal_fn.initWithData = function(data) {
$$.api.element = $$.selectChart.node();
};
c3_chart_internal_fn.smoothLines = function(el, type) {
var $$ = this;
c3_chart_internal_fn.smoothLines = function (el, type) {
const $$ = this;
if (type === 'grid') {
el.each(function() {
var g = $$.d3.select(this),
el.each(function () {
let g = $$.d3.select(this),
x1 = g.attr('x1'),
x2 = g.attr('x2'),
y1 = g.attr('y1'),
@ -312,17 +312,17 @@ c3_chart_internal_fn.smoothLines = function(el, type) {
'x1': Math.ceil(x1),
'x2': Math.ceil(x2),
'y1': Math.ceil(y1),
'y2': Math.ceil(y2)
'y2': Math.ceil(y2),
});
});
}
};
c3_chart_internal_fn.updateSizes = function() {
var $$ = this,
c3_chart_internal_fn.updateSizes = function () {
let $$ = this,
config = $$.config;
var legendHeight = $$.legend ? $$.getLegendHeight() : 0,
let legendHeight = $$.legend ? $$.getLegendHeight() : 0,
legendWidth = $$.legend ? $$.getLegendWidth() : 0,
legendHeightForBottom = $$.isLegendRight || $$.isLegendInset ? 0 : legendHeight,
hasArc = $$.hasArcType(),
@ -337,12 +337,12 @@ c3_chart_internal_fn.updateSizes = function() {
top: $$.getHorizontalAxisHeight('y2') + $$.getCurrentPaddingTop(),
right: hasArc ? 0 : $$.getCurrentPaddingRight(),
bottom: $$.getHorizontalAxisHeight('y') + legendHeightForBottom + $$.getCurrentPaddingBottom(),
left: subchartHeight + (hasArc ? 0 : $$.getCurrentPaddingLeft())
left: subchartHeight + (hasArc ? 0 : $$.getCurrentPaddingLeft()),
} : {
top: 4 + $$.getCurrentPaddingTop(), // for top tick text
right: hasArc ? 0 : $$.getCurrentPaddingRight(),
bottom: xAxisHeight + subchartHeight + legendHeightForBottom + $$.getCurrentPaddingBottom(),
left: hasArc ? 0 : $$.getCurrentPaddingLeft()
left: hasArc ? 0 : $$.getCurrentPaddingLeft(),
};
// for subchart
@ -350,12 +350,12 @@ c3_chart_internal_fn.updateSizes = function() {
top: $$.margin.top,
right: NaN,
bottom: 20 + legendHeightForBottom,
left: $$.rotated_padding_left
left: $$.rotated_padding_left,
} : {
top: $$.currentHeight - subchartHeight - legendHeightForBottom,
right: NaN,
bottom: xAxisHeight + legendHeightForBottom,
left: $$.margin.left
left: $$.margin.left,
};
// for legend
@ -363,7 +363,7 @@ c3_chart_internal_fn.updateSizes = function() {
top: 0,
right: NaN,
bottom: 0,
left: 0
left: 0,
};
if ($$.updateSizeForLegend) { $$.updateSizeForLegend(legendHeight, legendWidth); }
@ -390,73 +390,73 @@ c3_chart_internal_fn.updateSizes = function() {
}
};
c3_chart_internal_fn.updateTargets = function(targets) {
var $$ = this;
c3_chart_internal_fn.updateTargets = function (targets) {
const $$ = this;
/*-- Main --*/
/* -- Main --*/
//-- Text --//
// -- Text --//
$$.updateTargetsForText(targets);
//-- Bar --//
// -- Bar --//
$$.updateTargetsForBar(targets);
//-- Line --//
// -- Line --//
$$.updateTargetsForLine(targets);
//-- Arc --//
// -- Arc --//
if ($$.hasArcType() && $$.updateTargetsForArc) { $$.updateTargetsForArc(targets); }
/*-- Sub --*/
/* -- Sub --*/
if ($$.updateTargetsForSubchart) { $$.updateTargetsForSubchart(targets); }
// Fade-in each chart
$$.showTargets();
};
c3_chart_internal_fn.showTargets = function() {
var $$ = this;
$$.svg.selectAll('.' + CLASS.target).filter(function(d) {
return $$.isTargetToShow(d.id);
})
c3_chart_internal_fn.showTargets = function () {
const $$ = this;
$$.svg.selectAll('.' + CLASS.target).filter((d) => {
return $$.isTargetToShow(d.id);
})
.transition().duration($$.config.transition_duration)
.style("opacity", 1);
.style('opacity', 1);
};
c3_chart_internal_fn.redraw = function(options, transitions) {
var $$ = this,
c3_chart_internal_fn.redraw = function (options, transitions) {
let $$ = this,
main = $$.main,
d3 = $$.d3,
config = $$.config;
var areaIndices = $$.getShapeIndices($$.isAreaType),
let areaIndices = $$.getShapeIndices($$.isAreaType),
barIndices = $$.getShapeIndices($$.isBarType),
lineIndices = $$.getShapeIndices($$.isLineType);
var withY, withSubchart, withTransition, withTransitionForExit, withTransitionForAxis,
let withY, withSubchart, withTransition, withTransitionForExit, withTransitionForAxis,
withTransform, withUpdateXDomain, withUpdateOrgXDomain, withTrimXDomain, withLegend,
withEventRect, withDimension, withUpdateXAxis;
var hideAxis = $$.hasArcType();
var drawArea, drawBar, drawLine, xForText, yForText;
var duration, durationForExit, durationForAxis;
var waitForDraw, flow;
var targetsToShow = $$.filterTargetsToShow($$.data.targets),
const hideAxis = $$.hasArcType();
let drawArea, drawBar, drawLine, xForText, yForText;
let duration, durationForExit, durationForAxis;
let waitForDraw, flow;
let targetsToShow = $$.filterTargetsToShow($$.data.targets),
tickValues, i, intervalForCulling, xDomainForZoom;
var xv = $$.xv.bind($$),
let xv = $$.xv.bind($$),
cx, cy;
options = options || {};
withY = getOption(options, "withY", true);
withSubchart = getOption(options, "withSubchart", true);
withTransition = getOption(options, "withTransition", true);
withTransform = getOption(options, "withTransform", false);
withUpdateXDomain = getOption(options, "withUpdateXDomain", false);
withUpdateOrgXDomain = getOption(options, "withUpdateOrgXDomain", false);
withTrimXDomain = getOption(options, "withTrimXDomain", true);
withUpdateXAxis = getOption(options, "withUpdateXAxis", withUpdateXDomain);
withLegend = getOption(options, "withLegend", false);
withEventRect = getOption(options, "withEventRect", true);
withDimension = getOption(options, "withDimension", true);
withTransitionForExit = getOption(options, "withTransitionForExit", withTransition);
withTransitionForAxis = getOption(options, "withTransitionForAxis", withTransition);
withY = getOption(options, 'withY', true);
withSubchart = getOption(options, 'withSubchart', true);
withTransition = getOption(options, 'withTransition', true);
withTransform = getOption(options, 'withTransform', false);
withUpdateXDomain = getOption(options, 'withUpdateXDomain', false);
withUpdateOrgXDomain = getOption(options, 'withUpdateOrgXDomain', false);
withTrimXDomain = getOption(options, 'withTrimXDomain', true);
withUpdateXAxis = getOption(options, 'withUpdateXAxis', withUpdateXDomain);
withLegend = getOption(options, 'withLegend', false);
withEventRect = getOption(options, 'withEventRect', true);
withDimension = getOption(options, 'withDimension', true);
withTransitionForExit = getOption(options, 'withTransitionForExit', withTransition);
withTransitionForAxis = getOption(options, 'withTransitionForAxis', withTransition);
duration = withTransition ? config.transition_duration : 0;
durationForExit = withTransitionForExit ? duration : 0;
@ -517,8 +517,8 @@ c3_chart_internal_fn.redraw = function(options, transitions) {
break;
}
}
$$.svg.selectAll('.' + CLASS.axisX + ' .tick text').each(function(e) {
var index = tickValues.indexOf(e);
$$.svg.selectAll('.' + CLASS.axisX + ' .tick text').each(function (e) {
const index = tickValues.indexOf(e);
if (index >= 0) {
d3.select(this).style('display', index % intervalForCulling ? 'none' : 'block');
}
@ -545,9 +545,9 @@ c3_chart_internal_fn.redraw = function(options, transitions) {
$$.updateXgridFocus();
// Data empty label positioning and text.
main.select("text." + CLASS.text + '.' + CLASS.empty)
.attr("x", $$.width / 2)
.attr("y", $$.height / 2)
main.select('text.' + CLASS.text + '.' + CLASS.empty)
.attr('x', $$.width / 2)
.attr('y', $$.height / 2)
.text(config.data_empty_label_text)
.transition()
.style('opacity', targetsToShow.length ? 0 : 1);
@ -606,44 +606,44 @@ c3_chart_internal_fn.redraw = function(options, transitions) {
targets: targetsToShow,
flow: options.flow,
duration: options.flow.duration,
drawBar: drawBar,
drawLine: drawLine,
drawArea: drawArea,
cx: cx,
cy: cy,
xv: xv,
xForText: xForText,
yForText: yForText
drawBar,
drawLine,
drawArea,
cx,
cy,
xv,
xForText,
yForText,
});
}
if ((duration || flow) && $$.isTabVisible()) { // Only use transition if tab visible. See #938.
// transition should be derived from one transition
d3.transition().duration(duration).each(function() {
var transitionsToWait = [];
d3.transition().duration(duration).each(() => {
const transitionsToWait = [];
// redraw and gather transitions
[
$$.redrawBar(drawBar, true),
$$.redrawLine(drawLine, true),
$$.redrawArea(drawArea, true),
$$.redrawCircle(cx, cy, true),
$$.redrawText(xForText, yForText, options.flow, true),
$$.redrawRegion(true),
$$.redrawGrid(true),
].forEach(function(transitions) {
transitions.forEach(function(transition) {
transitionsToWait.push(transition);
});
[
$$.redrawBar(drawBar, true),
$$.redrawLine(drawLine, true),
$$.redrawArea(drawArea, true),
$$.redrawCircle(cx, cy, true),
$$.redrawText(xForText, yForText, options.flow, true),
$$.redrawRegion(true),
$$.redrawGrid(true),
].forEach((transitions) => {
transitions.forEach((transition) => {
transitionsToWait.push(transition);
});
});
// Wait for end of transitions to call flow and onrendered callback
waitForDraw = $$.generateWait();
transitionsToWait.forEach(function(t) {
waitForDraw.add(t);
});
})
.call(waitForDraw, function() {
waitForDraw = $$.generateWait();
transitionsToWait.forEach((t) => {
waitForDraw.add(t);
});
})
.call(waitForDraw, () => {
if (flow) {
flow();
}
@ -665,25 +665,25 @@ c3_chart_internal_fn.redraw = function(options, transitions) {
}
// update fadein condition
$$.mapToIds($$.data.targets).forEach(function(id) {
$$.mapToIds($$.data.targets).forEach((id) => {
$$.withoutFadeIn[id] = true;
});
};
c3_chart_internal_fn.updateAndRedraw = function(options) {
var $$ = this,
c3_chart_internal_fn.updateAndRedraw = function (options) {
let $$ = this,
config = $$.config,
transitions;
options = options || {};
// same with redraw
options.withTransition = getOption(options, "withTransition", true);
options.withTransform = getOption(options, "withTransform", false);
options.withLegend = getOption(options, "withLegend", false);
options.withTransition = getOption(options, 'withTransition', true);
options.withTransform = getOption(options, 'withTransform', false);
options.withLegend = getOption(options, 'withLegend', false);
// NOT same with redraw
options.withUpdateXDomain = true;
options.withUpdateOrgXDomain = true;
options.withTransitionForExit = false;
options.withTransitionForTransform = getOption(options, "withTransitionForTransform", options.withTransition);
options.withTransitionForTransform = getOption(options, 'withTransitionForTransform', options.withTransition);
// MEMO: this needs to be called before updateLegend and it means this ALWAYS needs to be called)
$$.updateSizes();
// MEMO: called in updateLegend in redraw if withLegend
@ -698,33 +698,33 @@ c3_chart_internal_fn.updateAndRedraw = function(options) {
// Draw with new sizes & scales
$$.redraw(options, transitions);
};
c3_chart_internal_fn.redrawWithoutRescale = function() {
c3_chart_internal_fn.redrawWithoutRescale = function () {
this.redraw({
withY: false,
withSubchart: false,
withEventRect: false,
withTransitionForAxis: false
withTransitionForAxis: false,
});
};
c3_chart_internal_fn.isTimeSeries = function() {
c3_chart_internal_fn.isTimeSeries = function () {
return this.config.axis_x_type === 'timeseries';
};
c3_chart_internal_fn.isCategorized = function() {
c3_chart_internal_fn.isCategorized = function () {
return this.config.axis_x_type.indexOf('categor') >= 0;
};
c3_chart_internal_fn.isCustomX = function() {
var $$ = this,
c3_chart_internal_fn.isCustomX = function () {
let $$ = this,
config = $$.config;
return !$$.isTimeSeries() && (config.data_x || notEmpty(config.data_xs));
};
c3_chart_internal_fn.isTimeSeriesY = function() {
c3_chart_internal_fn.isTimeSeriesY = function () {
return this.config.axis_y_type === 'timeseries';
};
c3_chart_internal_fn.getTranslate = function(target) {
var $$ = this,
c3_chart_internal_fn.getTranslate = function (target) {
let $$ = this,
config = $$.config,
x, y;
if (target === 'main') {
@ -752,26 +752,26 @@ c3_chart_internal_fn.getTranslate = function(target) {
x = $$.arcWidth / 2;
y = $$.arcHeight / 2;
}
return "translate(" + x + "," + y + ")";
return 'translate(' + x + ',' + y + ')';
};
c3_chart_internal_fn.initialOpacity = function(d) {
c3_chart_internal_fn.initialOpacity = function (d) {
return d.value !== null && this.withoutFadeIn[d.id] ? 1 : 0;
};
c3_chart_internal_fn.initialOpacityForCircle = function(d) {
c3_chart_internal_fn.initialOpacityForCircle = function (d) {
return d.value !== null && this.withoutFadeIn[d.id] ? this.opacityForCircle(d) : 0;
};
c3_chart_internal_fn.opacityForCircle = function(d) {
var opacity = this.config.point_show ? 1 : 0;
c3_chart_internal_fn.opacityForCircle = function (d) {
const opacity = this.config.point_show ? 1 : 0;
return isValue(d.value) ? (this.isScatterType(d) ? 0.5 : opacity) : 0;
};
c3_chart_internal_fn.opacityForText = function() {
c3_chart_internal_fn.opacityForText = function () {
return this.hasDataLabel() ? 1 : 0;
};
c3_chart_internal_fn.xx = function(d) {
c3_chart_internal_fn.xx = function (d) {
return d ? this.x(d.x) : null;
};
c3_chart_internal_fn.xv = function(d) {
var $$ = this,
c3_chart_internal_fn.xv = function (d) {
let $$ = this,
value = d.value;
if ($$.isTimeSeries()) {
value = $$.parseDate(d.value);
@ -780,17 +780,17 @@ c3_chart_internal_fn.xv = function(d) {
}
return Math.ceil($$.x(value));
};
c3_chart_internal_fn.yv = function(d) {
var $$ = this,
c3_chart_internal_fn.yv = function (d) {
let $$ = this,
yScale = d.axis && d.axis === 'y2' ? $$.y2 : $$.y;
return Math.ceil(yScale(d.value));
};
c3_chart_internal_fn.subxx = function(d) {
c3_chart_internal_fn.subxx = function (d) {
return d ? this.subX(d.x) : null;
};
c3_chart_internal_fn.transformMain = function(withTransition, transitions) {
var $$ = this,
c3_chart_internal_fn.transformMain = function (withTransition, transitions) {
let $$ = this,
xAxis, yAxis, y2Axis;
if (transitions && transitions.axisX) {
xAxis = transitions.axisX;
@ -810,22 +810,22 @@ c3_chart_internal_fn.transformMain = function(withTransition, transitions) {
y2Axis = $$.main.select('.' + CLASS.axisY2);
if (withTransition) { y2Axis = y2Axis.transition(); }
}
(withTransition ? $$.main.transition() : $$.main).attr("transform", $$.getTranslate('main'));
xAxis.attr("transform", $$.getTranslate('x'));
yAxis.attr("transform", $$.getTranslate('y'));
y2Axis.attr("transform", $$.getTranslate('y2'));
$$.main.select('.' + CLASS.chartArcs).attr("transform", $$.getTranslate('arc'));
(withTransition ? $$.main.transition() : $$.main).attr('transform', $$.getTranslate('main'));
xAxis.attr('transform', $$.getTranslate('x'));
yAxis.attr('transform', $$.getTranslate('y'));
y2Axis.attr('transform', $$.getTranslate('y2'));
$$.main.select('.' + CLASS.chartArcs).attr('transform', $$.getTranslate('arc'));
};
c3_chart_internal_fn.transformAll = function(withTransition, transitions) {
var $$ = this;
c3_chart_internal_fn.transformAll = function (withTransition, transitions) {
const $$ = this;
$$.transformMain(withTransition, transitions);
if ($$.config.subchart_show) { $$.transformContext(withTransition, transitions); }
if ($$.legend) { $$.transformLegend(withTransition); }
};
c3_chart_internal_fn.updateSvgSize = function() {
var $$ = this,
brush = $$.svg.select(".c3-brush .background");
c3_chart_internal_fn.updateSvgSize = function () {
let $$ = this,
brush = $$.svg.select('.c3-brush .background');
$$.svg.attr('width', $$.currentWidth).attr('height', $$.currentHeight);
$$.svg.selectAll(['#' + $$.clipId, '#' + $$.clipIdForGrid]).select('rect')
.attr('width', $$.width)
@ -847,12 +847,12 @@ c3_chart_internal_fn.updateSvgSize = function() {
.attr('width', $$.width)
.attr('height', $$.height);
// MEMO: parent div's height will be bigger than svg when <!DOCTYPE html>
$$.selectChart.style('max-height', $$.currentHeight + "px");
$$.selectChart.style('max-height', $$.currentHeight + 'px');
};
c3_chart_internal_fn.updateDimension = function(withoutAxis) {
var $$ = this;
c3_chart_internal_fn.updateDimension = function (withoutAxis) {
const $$ = this;
if (!withoutAxis) {
if ($$.config.axis_rotated) {
$$.axes.x.call($$.xAxis);
@ -868,19 +868,19 @@ c3_chart_internal_fn.updateDimension = function(withoutAxis) {
$$.transformAll(false);
};
c3_chart_internal_fn.observeInserted = function(selection) {
var $$ = this,
c3_chart_internal_fn.observeInserted = function (selection) {
let $$ = this,
observer;
if (typeof MutationObserver === 'undefined') {
window.console.error("MutationObserver not defined.");
window.console.error('MutationObserver not defined.');
return;
}
observer = new MutationObserver(function(mutations) {
mutations.forEach(function(mutation) {
observer = new MutationObserver((mutations) => {
mutations.forEach((mutation) => {
if (mutation.type === 'childList' && mutation.previousSibling) {
observer.disconnect();
// need to wait for completion of load because size calculation requires the actual sizes determined after that completion
$$.intervalForObserveInserted = window.setInterval(function() {
$$.intervalForObserveInserted = window.setInterval(() => {
// parentNode will NOT be null when completed
if (selection.node().parentNode) {
window.clearInterval($$.intervalForObserveInserted);
@ -893,7 +893,7 @@ c3_chart_internal_fn.observeInserted = function(selection) {
withUpdateOrgXDomain: true,
withTransition: false,
withTransitionForTransform: false,
withLegend: true
withLegend: true,
});
selection.transition().style('opacity', 1);
}
@ -904,27 +904,27 @@ c3_chart_internal_fn.observeInserted = function(selection) {
observer.observe(selection.node(), { attributes: true, childList: true, characterData: true });
};
c3_chart_internal_fn.bindResize = function() {
var $$ = this,
c3_chart_internal_fn.bindResize = function () {
let $$ = this,
config = $$.config;
$$.resizeFunction = $$.generateResize();
$$.resizeFunction.add(function() {
$$.resizeFunction.add(() => {
config.onresize.call($$);
});
if (config.resize_auto) {
$$.resizeFunction.add(function() {
$$.resizeFunction.add(() => {
if ($$.resizeTimeout !== undefined) {
window.clearTimeout($$.resizeTimeout);
}
$$.resizeTimeout = window.setTimeout(function() {
$$.resizeTimeout = window.setTimeout(() => {
delete $$.resizeTimeout;
$$.api.flush();
}, 100);
});
}
$$.resizeFunction.add(function() {
$$.resizeFunction.add(() => {
config.onresized.call($$);
});
@ -934,7 +934,7 @@ c3_chart_internal_fn.bindResize = function() {
window.addEventListener('resize', $$.resizeFunction, false);
} else {
// fallback to this, if this is a very old browser
var wrapper = window.onresize;
let wrapper = window.onresize;
if (!wrapper) {
// create a wrapper that will call all charts
wrapper = $$.generateResize();
@ -949,19 +949,19 @@ c3_chart_internal_fn.bindResize = function() {
}
};
c3_chart_internal_fn.generateResize = function() {
var resizeFunctions = [];
c3_chart_internal_fn.generateResize = function () {
const resizeFunctions = [];
function callResizeFunctions() {
resizeFunctions.forEach(function(f) {
resizeFunctions.forEach((f) => {
f();
});
}
callResizeFunctions.add = function(f) {
callResizeFunctions.add = function (f) {
resizeFunctions.push(f);
};
callResizeFunctions.remove = function(f) {
for (var i = 0; i < resizeFunctions.length; i++) {
callResizeFunctions.remove = function (f) {
for (let i = 0; i < resizeFunctions.length; i++) {
if (resizeFunctions[i] === f) {
resizeFunctions.splice(i, 1);
break;
@ -971,20 +971,20 @@ c3_chart_internal_fn.generateResize = function() {
return callResizeFunctions;
};
c3_chart_internal_fn.endall = function(transition, callback) {
var n = 0;
c3_chart_internal_fn.endall = function (transition, callback) {
let n = 0;
transition
.each(function() {++n; })
.each("end", function() {
.each(() => { ++n; })
.each('end', function () {
if (!--n) { callback.apply(this, arguments); }
});
};
c3_chart_internal_fn.generateWait = function() {
var transitionsToWait = [],
f = function(transition, callback) {
var timer = setInterval(function() {
var done = 0;
transitionsToWait.forEach(function(t) {
c3_chart_internal_fn.generateWait = function () {
let transitionsToWait = [],
f = function (transition, callback) {
const timer = setInterval(() => {
let done = 0;
transitionsToWait.forEach((t) => {
if (t.empty()) {
done += 1;
return;
@ -1001,14 +1001,14 @@ c3_chart_internal_fn.generateWait = function() {
}
}, 10);
};
f.add = function(transition) {
f.add = function (transition) {
transitionsToWait.push(transition);
};
return f;
};
c3_chart_internal_fn.parseDate = function(date) {
var $$ = this,
c3_chart_internal_fn.parseDate = function (date) {
let $$ = this,
parsedDate;
if (date instanceof Date) {
parsedDate = date;
@ -1023,16 +1023,16 @@ c3_chart_internal_fn.parseDate = function(date) {
return parsedDate;
};
c3_chart_internal_fn.isTabVisible = function() {
var hidden;
if (typeof document.hidden !== "undefined") { // Opera 12.10 and Firefox 18 and later support
hidden = "hidden";
} else if (typeof document.mozHidden !== "undefined") {
hidden = "mozHidden";
} else if (typeof document.msHidden !== "undefined") {
hidden = "msHidden";
} else if (typeof document.webkitHidden !== "undefined") {
hidden = "webkitHidden";
c3_chart_internal_fn.isTabVisible = function () {
let hidden;
if (typeof document.hidden !== 'undefined') { // Opera 12.10 and Firefox 18 and later support
hidden = 'hidden';
} else if (typeof document.mozHidden !== 'undefined') {
hidden = 'mozHidden';
} else if (typeof document.msHidden !== 'undefined') {
hidden = 'msHidden';
} else if (typeof document.webkitHidden !== 'undefined') {
hidden = 'webkitHidden';
}
return document[hidden] ? false : true;

123
src/chartinternal/interaction.js

@ -1,16 +1,16 @@
c3_chart_internal_fn.initEventRect = function () {
var $$ = this;
$$.main.select('.' + CLASS.chart).append("g")
.attr("class", CLASS.eventRects)
const $$ = this;
$$.main.select('.' + CLASS.chart).append('g')
.attr('class', CLASS.eventRects)
.style('fill-opacity', 0);
};
c3_chart_internal_fn.redrawEventRect = function () {
var $$ = this, config = $$.config,
let $$ = this, config = $$.config,
eventRectUpdate, maxDataCountTarget,
isMultipleX = $$.isMultipleX();
// rects for mouseover
var eventRects = $$.main.select('.' + CLASS.eventRects)
const eventRects = $$.main.select('.' + CLASS.eventRects)
.style('cursor', config.zoom_enabled ? config.axis_rotated ? 'ns-resize' : 'ew-resize' : null)
.classed(CLASS.eventRectsMultiple, isMultipleX)
.classed(CLASS.eventRectsSingle, !isMultipleX);
@ -34,7 +34,7 @@ c3_chart_internal_fn.redrawEventRect = function () {
maxDataCountTarget = $$.getMaxDataCountTarget($$.data.targets);
eventRects.datum(maxDataCountTarget ? maxDataCountTarget.values : []);
$$.eventRect = eventRects.selectAll('.' + CLASS.eventRect);
eventRectUpdate = $$.eventRect.data(function (d) { return d; });
eventRectUpdate = $$.eventRect.data((d) => { return d; });
// enter
$$.generateEventRectsForSingleX(eventRectUpdate.enter());
// update
@ -44,11 +44,11 @@ c3_chart_internal_fn.redrawEventRect = function () {
}
};
c3_chart_internal_fn.updateEventRect = function (eventRectUpdate) {
var $$ = this, config = $$.config,
let $$ = this, config = $$.config,
x, y, w, h, rectW, rectX;
// set update selection if null
eventRectUpdate = eventRectUpdate || $$.eventRect.data(function (d) { return d; });
eventRectUpdate = eventRectUpdate || $$.eventRect.data((d) => { return d; });
if ($$.isMultipleX()) {
// TODO: rotated not supported yet
@ -59,12 +59,11 @@ c3_chart_internal_fn.updateEventRect = function (eventRectUpdate) {
}
else {
if (($$.isCustomX() || $$.isTimeSeries()) && !$$.isCategorized()) {
// update index for x that is used by prevX and nextX
$$.updateXs();
rectW = function (d) {
var prevX = $$.getPrevX(d.index), nextX = $$.getNextX(d.index);
let prevX = $$.getPrevX(d.index), nextX = $$.getNextX(d.index);
// if there this is a single data point make the eventRect full width (or height)
if (prevX === null && nextX === null) {
@ -77,7 +76,7 @@ c3_chart_internal_fn.updateEventRect = function (eventRectUpdate) {
return Math.max(0, ($$.x(nextX) - $$.x(prevX)) / 2);
};
rectX = function (d) {
var prevX = $$.getPrevX(d.index), nextX = $$.getNextX(d.index),
let prevX = $$.getPrevX(d.index), nextX = $$.getNextX(d.index),
thisX = $$.data.xs[d.id][d.index];
// if there this is a single data point position the eventRect at 0
@ -103,17 +102,17 @@ c3_chart_internal_fn.updateEventRect = function (eventRectUpdate) {
eventRectUpdate
.attr('class', $$.classEvent.bind($$))
.attr("x", x)
.attr("y", y)
.attr("width", w)
.attr("height", h);
.attr('x', x)
.attr('y', y)
.attr('width', w)
.attr('height', h);
};
c3_chart_internal_fn.generateEventRectsForSingleX = function (eventRectEnter) {
var $$ = this, d3 = $$.d3, config = $$.config,
let $$ = this, d3 = $$.d3, config = $$.config,
tap = false, tapX;
function click(shape, d) {
var index = d.index;
let index = d.index;
if ($$.hasArcType() || !$$.toggleShape) { return; }
if ($$.cancelClick) {
$$.cancelClick = false;
@ -130,11 +129,11 @@ c3_chart_internal_fn.generateEventRectsForSingleX = function (eventRectEnter) {
});
}
eventRectEnter.append("rect")
.attr("class", $$.classEvent.bind($$))
.style("cursor", config.data_selection_enabled && config.data_selection_grouped ? "pointer" : null)
.on('mouseover', function (d) {
var index = d.index;
eventRectEnter.append('rect')
.attr('class', $$.classEvent.bind($$))
.style('cursor', config.data_selection_enabled && config.data_selection_grouped ? 'pointer' : null)
.on('mouseover', (d) => {
const index = d.index;
if ($$.dragging || $$.flowing) { return; } // do nothing while dragging/flowing
if ($$.hasArcType()) { return; }
@ -144,12 +143,12 @@ c3_chart_internal_fn.generateEventRectsForSingleX = function (eventRectEnter) {
$$.expandBars(index, null, true);
// Call event handler
$$.main.selectAll('.' + CLASS.shape + '-' + index).each(function (d) {
$$.main.selectAll('.' + CLASS.shape + '-' + index).each((d) => {
config.data_onmouseover.call($$.api, d);
});
})
.on('mouseout', function (d) {
var index = d.index;
.on('mouseout', (d) => {
const index = d.index;
if (!$$.config) { return; } // chart is destroyed
if ($$.hasArcType()) { return; }
$$.hideXGridFocus();
@ -158,12 +157,12 @@ c3_chart_internal_fn.generateEventRectsForSingleX = function (eventRectEnter) {
$$.unexpandCircles();
$$.unexpandBars();
// Call event handler
$$.main.selectAll('.' + CLASS.shape + '-' + index).each(function (d) {
$$.main.selectAll('.' + CLASS.shape + '-' + index).each((d) => {
config.data_onmouseout.call($$.api, d);
});
})
.on('mousemove', function (d) {
var selectedData, index = d.index,
let selectedData, index = d.index,
eventRect = $$.svg.select('.' + CLASS.eventRect + '-' + index);
if ($$.dragging || $$.flowing) { return; } // do nothing while dragging/flowing
@ -174,7 +173,7 @@ c3_chart_internal_fn.generateEventRectsForSingleX = function (eventRectEnter) {
}
// Show tooltip
selectedData = $$.filterTargetsToShow($$.data.targets).map(function (t) {
selectedData = $$.filterTargetsToShow($$.data.targets).map((t) => {
return $$.addName($$.getValueOnIndex(t.values, index));
});
@ -218,32 +217,31 @@ c3_chart_internal_fn.generateEventRectsForSingleX = function (eventRectEnter) {
});
})
.on('click', function (d) {
//click event was simulated via a 'tap' touch event, cancel regular click
// click event was simulated via a 'tap' touch event, cancel regular click
if (tap) {
return;
}
click(this, d);
})
.on('touchstart', function(d) {
//store current X selection for comparison during touch end event
.on('touchstart', (d) => {
// store current X selection for comparison during touch end event
tapX = d.x;
})
.on('touchend', function(d) {
var finalX = d.x;
.on('touchend', function (d) {
const finalX = d.x;
//If end is not the same as the start, event doesn't count as a tap
// If end is not the same as the start, event doesn't count as a tap
if (tapX !== finalX) {
return;
}
click(this, d);
//indictate tap event fired to prevent click;
// indictate tap event fired to prevent click;
tap = true;
setTimeout(function() { tap = false; }, config.touch_tap_delay);
setTimeout(() => { tap = false; }, config.touch_tap_delay);
})
.call(
@ -251,13 +249,13 @@ c3_chart_internal_fn.generateEventRectsForSingleX = function (eventRectEnter) {
d3.behavior.drag().origin(Object)
.on('drag', function () { $$.drag(d3.mouse(this)); })
.on('dragstart', function () { $$.dragstart(d3.mouse(this)); })
.on('dragend', function () { $$.dragend(); })
) : function () {}
.on('dragend', () => { $$.dragend(); })
) : () => {}
);
};
c3_chart_internal_fn.generateEventRectsForMultipleXs = function (eventRectEnter) {
var $$ = this, d3 = $$.d3, config = $$.config,
let $$ = this, d3 = $$.d3, config = $$.config,
tap = false, tapX, tapY;
function mouseout() {
@ -269,13 +267,13 @@ c3_chart_internal_fn.generateEventRectsForMultipleXs = function (eventRectEnter)
}
function click(shape) {
var targetsToShow = $$.filterTargetsToShow($$.data.targets);
var mouse, closest;
const targetsToShow = $$.filterTargetsToShow($$.data.targets);
let mouse, closest;
if ($$.hasArcType(targetsToShow)) { return; }
mouse = d3.mouse(shape);
closest = $$.findClosestFromTargets(targetsToShow, mouse);
if (! closest) { return; }
if (!closest) { return; }
// select if selection enabled
if ($$.isBarType(closest.id) || $$.dist(closest, mouse) < config.point_sensitivity) {
$$.main.selectAll('.' + CLASS.shapes + $$.getTargetSelectorSuffix(closest.id)).selectAll('.' + CLASS.shape + '-' + closest.index).each(function () {
@ -293,14 +291,14 @@ c3_chart_internal_fn.generateEventRectsForMultipleXs = function (eventRectEnter)
.attr('width', $$.width)
.attr('height', $$.height)
.attr('class', CLASS.eventRect)
.on('mouseout', function () {
.on('mouseout', () => {
if (!$$.config) { return; } // chart is destroyed
if ($$.hasArcType()) { return; }
mouseout();
})
.on('mousemove', function () {
var targetsToShow = $$.filterTargetsToShow($$.data.targets);
var mouse, closest, sameXData, selectedData;
const targetsToShow = $$.filterTargetsToShow($$.data.targets);
let mouse, closest, sameXData, selectedData;
if ($$.dragging) { return; } // do nothing when dragging
if ($$.hasArcType(targetsToShow)) { return; }
@ -313,7 +311,7 @@ c3_chart_internal_fn.generateEventRectsForMultipleXs = function (eventRectEnter)
$$.mouseover = undefined;
}
if (! closest) {
if (!closest) {
mouseout();
return;
}
@ -325,7 +323,7 @@ c3_chart_internal_fn.generateEventRectsForMultipleXs = function (eventRectEnter)
}
// show tooltip when cursor is close to some point
selectedData = sameXData.map(function (d) {
selectedData = sameXData.map((d) => {
return $$.addName(d);
});
$$.showTooltip(selectedData, this);
@ -349,53 +347,52 @@ c3_chart_internal_fn.generateEventRectsForMultipleXs = function (eventRectEnter)
}
})
.on('click', function () {
//click event was simulated via a 'tap' touch event, cancel regular click
// click event was simulated via a 'tap' touch event, cancel regular click
if (tap) {
return;
}
click(this);
})
.on('touchstart', function(){
var mouse = d3.mouse(this);
//store starting coordinates for distance comparision during touch end event
.on('touchstart', function () {
const mouse = d3.mouse(this);
// store starting coordinates for distance comparision during touch end event
tapX = mouse[0];
tapY = mouse[1];
})
.on('touchend', function(){
var mouse = d3.mouse(this),
.on('touchend', function () {
let mouse = d3.mouse(this),
x = mouse[0],
y = mouse[1];
//If end is too far from start, event doesn't count as a tap
// If end is too far from start, event doesn't count as a tap
if (Math.abs(x - tapX) > config.touch_tap_radius || Math.abs(y - tapY) > config.touch_tap_radius) {
return;
}
click(this);
//indictate tap event fired to prevent click;
// indictate tap event fired to prevent click;
tap = true;
setTimeout(function() { tap = false; }, config.touch_tap_delay);
setTimeout(() => { tap = false; }, config.touch_tap_delay);
})
.call(
config.data_selection_draggable && $$.drag ? (
d3.behavior.drag().origin(Object)
.on('drag', function () { $$.drag(d3.mouse(this)); })
.on('dragstart', function () { $$.dragstart(d3.mouse(this)); })
.on('dragend', function () { $$.dragend(); })
) : function () {}
.on('dragend', () => { $$.dragend(); })
) : () => {}
);
};
c3_chart_internal_fn.dispatchEvent = function (type, index, mouse) {
var $$ = this,
let $$ = this,
selector = '.' + CLASS.eventRect + (!$$.isMultipleX() ? '-' + index : ''),
eventRect = $$.main.select(selector).node(),
box = eventRect.getBoundingClientRect(),
x = box.left + (mouse ? mouse[0] : 0),
y = box.top + (mouse ? mouse[1] : 0),
event = document.createEvent("MouseEvents");
event = document.createEvent('MouseEvents');
event.initMouseEvent(type, true, true, window, 0, x, y, x, y,
false, false, false, false, 0, null);

90
src/chartinternal/legend.js

@ -1,8 +1,8 @@
c3_chart_internal_fn.initLegend = function () {
var $$ = this;
const $$ = this;
$$.legendItemTextBox = {};
$$.legendHasRendered = false;
$$.legend = $$.svg.append("g").attr("transform", $$.getTranslate('legend'));
$$.legend = $$.svg.append('g').attr('transform', $$.getTranslate('legend'));
if (!$$.config.legend_show) {
$$.legend.style('visibility', 'hidden');
$$.hiddenLegendIds = $$.mapToIds($$.data.targets);
@ -13,25 +13,25 @@ c3_chart_internal_fn.initLegend = function () {
$$.updateLegendWithDefaults();
};
c3_chart_internal_fn.updateLegendWithDefaults = function () {
var $$ = this;
$$.updateLegend($$.mapToIds($$.data.targets), {withTransform: false, withTransitionForTransform: false, withTransition: false});
const $$ = this;
$$.updateLegend($$.mapToIds($$.data.targets), { withTransform: false, withTransitionForTransform: false, withTransition: false });
};
c3_chart_internal_fn.updateSizeForLegend = function (legendHeight, legendWidth) {
var $$ = this, config = $$.config, insetLegendPosition = {
top: $$.isLegendTop ? $$.getCurrentPaddingTop() + config.legend_inset_y + 5.5 : $$.currentHeight - legendHeight - $$.getCurrentPaddingBottom() - config.legend_inset_y,
left: $$.isLegendLeft ? $$.getCurrentPaddingLeft() + config.legend_inset_x + 0.5 : $$.currentWidth - legendWidth - $$.getCurrentPaddingRight() - config.legend_inset_x + 0.5
};
let $$ = this, config = $$.config, insetLegendPosition = {
top: $$.isLegendTop ? $$.getCurrentPaddingTop() + config.legend_inset_y + 5.5 : $$.currentHeight - legendHeight - $$.getCurrentPaddingBottom() - config.legend_inset_y,
left: $$.isLegendLeft ? $$.getCurrentPaddingLeft() + config.legend_inset_x + 0.5 : $$.currentWidth - legendWidth - $$.getCurrentPaddingRight() - config.legend_inset_x + 0.5,
};
$$.margin3 = {
top: $$.isLegendRight ? 0 : $$.isLegendInset ? insetLegendPosition.top : $$.currentHeight - legendHeight,
right: NaN,
bottom: 0,
left: $$.isLegendRight ? $$.currentWidth - legendWidth : $$.isLegendInset ? insetLegendPosition.left : 0
left: $$.isLegendRight ? $$.currentWidth - legendWidth : $$.isLegendInset ? insetLegendPosition.left : 0,
};
};
c3_chart_internal_fn.transformLegend = function (withTransition) {
var $$ = this;
(withTransition ? $$.legend.transition() : $$.legend).attr("transform", $$.getTranslate('legend'));
const $$ = this;
(withTransition ? $$.legend.transition() : $$.legend).attr('transform', $$.getTranslate('legend'));
};
c3_chart_internal_fn.updateLegendStep = function (step) {
this.legendStep = step;
@ -43,11 +43,11 @@ c3_chart_internal_fn.updateLegendItemHeight = function (h) {
this.legendItemHeight = h;
};
c3_chart_internal_fn.getLegendWidth = function () {
var $$ = this;
const $$ = this;
return $$.config.legend_show ? $$.isLegendRight || $$.isLegendInset ? $$.legendItemWidth * ($$.legendStep + 1) : $$.currentWidth : 0;
};
c3_chart_internal_fn.getLegendHeight = function () {
var $$ = this, h = 0;
let $$ = this, h = 0;
if ($$.config.legend_show) {
if ($$.isLegendRight) {
h = $$.currentHeight;
@ -64,26 +64,26 @@ c3_chart_internal_fn.opacityForUnfocusedLegend = function (legendItem) {
return legendItem.classed(CLASS.legendItemHidden) ? null : 0.3;
};
c3_chart_internal_fn.toggleFocusLegend = function (targetIds, focus) {
var $$ = this;
const $$ = this;
targetIds = $$.mapToTargetIds(targetIds);
$$.legend.selectAll('.' + CLASS.legendItem)
.filter(function (id) { return targetIds.indexOf(id) >= 0; })
.filter((id) => { return targetIds.indexOf(id) >= 0; })
.classed(CLASS.legendItemFocused, focus)
.transition().duration(100)
.style('opacity', function () {
var opacity = focus ? $$.opacityForLegend : $$.opacityForUnfocusedLegend;
const opacity = focus ? $$.opacityForLegend : $$.opacityForUnfocusedLegend;
return opacity.call($$, $$.d3.select(this));
});
};
c3_chart_internal_fn.revertLegend = function () {
var $$ = this, d3 = $$.d3;
let $$ = this, d3 = $$.d3;
$$.legend.selectAll('.' + CLASS.legendItem)
.classed(CLASS.legendItemFocused, false)
.transition().duration(100)
.style('opacity', function () { return $$.opacityForLegend(d3.select(this)); });
};
c3_chart_internal_fn.showLegend = function (targetIds) {
var $$ = this, config = $$.config;
let $$ = this, config = $$.config;
if (!config.legend_show) {
config.legend_show = true;
$$.legend.style('visibility', 'visible');
@ -98,7 +98,7 @@ c3_chart_internal_fn.showLegend = function (targetIds) {
.style('opacity', function () { return $$.opacityForLegend($$.d3.select(this)); });
};
c3_chart_internal_fn.hideLegend = function (targetIds) {
var $$ = this, config = $$.config;
let $$ = this, config = $$.config;
if (config.legend_show && isEmpty(targetIds)) {
config.legend_show = false;
$$.legend.style('visibility', 'hidden');
@ -112,21 +112,21 @@ c3_chart_internal_fn.clearLegendItemTextBoxCache = function () {
this.legendItemTextBox = {};
};
c3_chart_internal_fn.updateLegend = function (targetIds, options, transitions) {
var $$ = this, config = $$.config;
var xForLegend, xForLegendText, xForLegendRect, yForLegend, yForLegendText, yForLegendRect, x1ForLegendTile, x2ForLegendTile, yForLegendTile;
var paddingTop = 4, paddingRight = 10, maxWidth = 0, maxHeight = 0, posMin = 10, tileWidth = config.legend_item_tile_width + 5;
var l, totalLength = 0, offsets = {}, widths = {}, heights = {}, margins = [0], steps = {}, step = 0;
var withTransition, withTransitionForTransform;
var texts, rects, tiles, background;
let $$ = this, config = $$.config;
let xForLegend, xForLegendText, xForLegendRect, yForLegend, yForLegendText, yForLegendRect, x1ForLegendTile, x2ForLegendTile, yForLegendTile;
let paddingTop = 4, paddingRight = 10, maxWidth = 0, maxHeight = 0, posMin = 10, tileWidth = config.legend_item_tile_width + 5;
let l, totalLength = 0, offsets = {}, widths = {}, heights = {}, margins = [0], steps = {}, step = 0;
let withTransition, withTransitionForTransform;
let texts, rects, tiles, background;
// Skip elements when their name is set to null
targetIds = targetIds.filter(function(id) {
targetIds = targetIds.filter((id) => {
return !isDefined(config.data_names[id]) || config.data_names[id] !== null;
});
options = options || {};
withTransition = getOption(options, "withTransition", true);
withTransitionForTransform = getOption(options, "withTransitionForTransform", true);
withTransition = getOption(options, 'withTransition', true);
withTransitionForTransform = getOption(options, 'withTransitionForTransform', true);
function getTextBox(textElement, id) {
if (!$$.legendItemTextBox[id]) {
@ -136,7 +136,7 @@ c3_chart_internal_fn.updateLegend = function (targetIds, options, transitions) {
}
function updatePositions(textElement, id, index) {
var reset = index === 0, isLast = index === targetIds.length - 1,
let reset = index === 0, isLast = index === targetIds.length - 1,
box = getTextBox(textElement, id),
itemWidth = box.width + tileWidth + (isLast && !($$.isLegendRight || $$.isLegendInset) ? 0 : paddingRight) + config.legend_padding,
itemHeight = box.height + paddingTop,
@ -180,13 +180,13 @@ c3_chart_internal_fn.updateLegend = function (targetIds, options, transitions) {
maxLength = $$.isLegendRight || $$.isLegendInset ? maxHeight : maxWidth;
if (config.legend_equally) {
Object.keys(widths).forEach(function (id) { widths[id] = maxWidth; });
Object.keys(heights).forEach(function (id) { heights[id] = maxHeight; });
Object.keys(widths).forEach((id) => { widths[id] = maxWidth; });
Object.keys(heights).forEach((id) => { heights[id] = maxHeight; });
margin = (areaLength - maxLength * targetIds.length) / 2;
if (margin < posMin) {
totalLength = 0;
step = 0;
targetIds.forEach(function (id) { updateValues(id); });
targetIds.forEach((id) => { updateValues(id); });
}
else {
updateValues(id, true);
@ -223,10 +223,10 @@ c3_chart_internal_fn.updateLegend = function (targetIds, options, transitions) {
l = $$.legend.selectAll('.' + CLASS.legendItem)
.data(targetIds)
.enter().append('g')
.attr('class', function (id) { return $$.generateClass(CLASS.legendItem, id); })
.style('visibility', function (id) { return $$.isLegendToShow(id) ? 'visible' : 'hidden'; })
.attr('class', (id) => { return $$.generateClass(CLASS.legendItem, id); })
.style('visibility', (id) => { return $$.isLegendToShow(id) ? 'visible' : 'hidden'; })
.style('cursor', 'pointer')
.on('click', function (id) {
.on('click', (id) => {
if (config.legend_item_onclick) {
config.legend_item_onclick.call($$, id);
} else {
@ -260,20 +260,20 @@ c3_chart_internal_fn.updateLegend = function (targetIds, options, transitions) {
}
});
l.append('text')
.text(function (id) { return isDefined(config.data_names[id]) ? config.data_names[id] : id; })
.text((id) => { return isDefined(config.data_names[id]) ? config.data_names[id] : id; })
.each(function (id, i) { updatePositions(this, id, i); })
.style("pointer-events", "none")
.style('pointer-events', 'none')
.attr('x', $$.isLegendRight || $$.isLegendInset ? xForLegendText : -200)
.attr('y', $$.isLegendRight || $$.isLegendInset ? -200 : yForLegendText);
l.append('rect')
.attr("class", CLASS.legendItemEvent)
.attr('class', CLASS.legendItemEvent)
.style('fill-opacity', 0)
.attr('x', $$.isLegendRight || $$.isLegendInset ? xForLegendRect : -200)
.attr('y', $$.isLegendRight || $$.isLegendInset ? -200 : yForLegendRect);
l.append('line')
.attr('class', CLASS.legendItemTile)
.style('stroke', $$.color)
.style("pointer-events", "none")
.style('pointer-events', 'none')
.attr('x1', $$.isLegendRight || $$.isLegendInset ? x1ForLegendTile : -200)
.attr('y1', $$.isLegendRight || $$.isLegendInset ? -200 : yForLegendTile)
.attr('x2', $$.isLegendRight || $$.isLegendInset ? x2ForLegendTile : -200)
@ -284,13 +284,13 @@ c3_chart_internal_fn.updateLegend = function (targetIds, options, transitions) {
background = $$.legend.select('.' + CLASS.legendBackground + ' rect');
if ($$.isLegendInset && maxWidth > 0 && background.size() === 0) {
background = $$.legend.insert('g', '.' + CLASS.legendItem)
.attr("class", CLASS.legendBackground)
.attr('class', CLASS.legendBackground)
.append('rect');
}
texts = $$.legend.selectAll('text')
.data(targetIds)
.text(function (id) { return isDefined(config.data_names[id]) ? config.data_names[id] : id; }) // MEMO: needed for update
.text((id) => { return isDefined(config.data_names[id]) ? config.data_names[id] : id; }) // MEMO: needed for update
.each(function (id, i) { updatePositions(this, id, i); });
(withTransition ? texts.transition() : texts)
.attr('x', xForLegendText)
@ -299,14 +299,14 @@ c3_chart_internal_fn.updateLegend = function (targetIds, options, transitions) {
rects = $$.legend.selectAll('rect.' + CLASS.legendItemEvent)
.data(targetIds);
(withTransition ? rects.transition() : rects)
.attr('width', function (id) { return widths[id]; })
.attr('height', function (id) { return heights[id]; })
.attr('width', (id) => { return widths[id]; })
.attr('height', (id) => { return heights[id]; })
.attr('x', xForLegendRect)
.attr('y', yForLegendRect);
tiles = $$.legend.selectAll('line.' + CLASS.legendItemTile)
.data(targetIds);
(withTransition ? tiles.transition() : tiles)
(withTransition ? tiles.transition() : tiles)
.style('stroke', $$.color)
.attr('x1', x1ForLegendTile)
.attr('y1', yForLegendTile)
@ -321,7 +321,7 @@ c3_chart_internal_fn.updateLegend = function (targetIds, options, transitions) {
// toggle legend state
$$.legend.selectAll('.' + CLASS.legendItem)
.classed(CLASS.legendItemHidden, function (id) { return !$$.isTargetToShow(id); });
.classed(CLASS.legendItemHidden, (id) => { return !$$.isTargetToShow(id); });
// Update all to reflect change of legend
$$.updateLegendItemWidth(maxWidth);

34
src/chartinternal/region.js

@ -1,11 +1,11 @@
c3_chart_internal_fn.initRegion = function () {
var $$ = this;
const $$ = this;
$$.region = $$.main.append('g')
.attr("clip-path", $$.clipPath)
.attr("class", CLASS.regions);
.attr('clip-path', $$.clipPath)
.attr('class', CLASS.regions);
};
c3_chart_internal_fn.updateRegion = function (duration) {
var $$ = this, config = $$.config;
let $$ = this, config = $$.config;
// hide if arc type
$$.region.style('visibility', $$.hasArcType() ? 'hidden' : 'visible');
@ -14,20 +14,20 @@ c3_chart_internal_fn.updateRegion = function (duration) {
.data(config.regions);
$$.mainRegion.enter().append('g')
.append('rect')
.style("fill-opacity", 0);
.style('fill-opacity', 0);
$$.mainRegion
.attr('class', $$.classRegion.bind($$));
$$.mainRegion.exit().transition().duration(duration)
.style("opacity", 0)
.style('opacity', 0)
.remove();
};
c3_chart_internal_fn.redrawRegion = function (withTransition) {
var $$ = this,
let $$ = this,
regions = $$.mainRegion.selectAll('rect').each(function () {
// data is binded to g and it's not transferred to rect (child node) automatically,
// then data of each rect has to be updated manually.
// TODO: there should be more efficient way to solve this?
var parentData = $$.d3.select(this.parentNode).datum();
const parentData = $$.d3.select(this.parentNode).datum();
$$.d3.select(this).datum(parentData);
}),
x = $$.regionX.bind($$),
@ -36,15 +36,15 @@ c3_chart_internal_fn.redrawRegion = function (withTransition) {
h = $$.regionHeight.bind($$);
return [
(withTransition ? regions.transition() : regions)
.attr("x", x)
.attr("y", y)
.attr("width", w)
.attr("height", h)
.style("fill-opacity", function (d) { return isValue(d.opacity) ? d.opacity : 0.1; })
.attr('x', x)
.attr('y', y)
.attr('width', w)
.attr('height', h)
.style('fill-opacity', (d) => { return isValue(d.opacity) ? d.opacity : 0.1; }),
];
};
c3_chart_internal_fn.regionX = function (d) {
var $$ = this, config = $$.config,
let $$ = this, config = $$.config,
xPos, yScale = d.axis === 'y' ? $$.y : $$.y2;
if (d.axis === 'y' || d.axis === 'y2') {
xPos = config.axis_rotated ? ('start' in d ? yScale(d.start) : 0) : 0;
@ -54,7 +54,7 @@ c3_chart_internal_fn.regionX = function (d) {
return xPos;
};
c3_chart_internal_fn.regionY = function (d) {
var $$ = this, config = $$.config,
let $$ = this, config = $$.config,
yPos, yScale = d.axis === 'y' ? $$.y : $$.y2;
if (d.axis === 'y' || d.axis === 'y2') {
yPos = config.axis_rotated ? 0 : ('end' in d ? yScale(d.end) : 0);
@ -64,7 +64,7 @@ c3_chart_internal_fn.regionY = function (d) {
return yPos;
};
c3_chart_internal_fn.regionWidth = function (d) {
var $$ = this, config = $$.config,
let $$ = this, config = $$.config,
start = $$.regionX(d), end, yScale = d.axis === 'y' ? $$.y : $$.y2;
if (d.axis === 'y' || d.axis === 'y2') {
end = config.axis_rotated ? ('end' in d ? yScale(d.end) : $$.width) : $$.width;
@ -74,7 +74,7 @@ c3_chart_internal_fn.regionWidth = function (d) {
return end < start ? 0 : end - start;
};
c3_chart_internal_fn.regionHeight = function (d) {
var $$ = this, config = $$.config,
let $$ = this, config = $$.config,
start = this.regionY(d), end, yScale = d.axis === 'y' ? $$.y : $$.y2;
if (d.axis === 'y' || d.axis === 'y2') {
end = config.axis_rotated ? $$.height : ('start' in d ? yScale(d.start) : $$.height);

14
src/chartinternal/scale.js

@ -2,19 +2,19 @@ c3_chart_internal_fn.getScale = function (min, max, forTimeseries) {
return (forTimeseries ? this.d3.time.scale() : this.d3.scale.linear()).range([min, max]);
};
c3_chart_internal_fn.getX = function (min, max, domain, offset) {
var $$ = this,
let $$ = this,
scale = $$.getScale(min, max, $$.isTimeSeries()),
_scale = domain ? scale.domain(domain) : scale, key;
// Define customized scale if categorized axis
if ($$.isCategorized()) {
offset = offset || function () { return 0; };
scale = function (d, raw) {
var v = _scale(d) + offset(d);
const v = _scale(d) + offset(d);
return raw ? v : Math.ceil(v);
};
} else {
scale = function (d, raw) {
var v = _scale(d);
const v = _scale(d);
return raw ? v : Math.ceil(v);
};
}
@ -39,7 +39,7 @@ c3_chart_internal_fn.getX = function (min, max, domain, offset) {
return scale;
};
c3_chart_internal_fn.getY = function (min, max, domain) {
var scale = this.getScale(min, max, this.isTimeSeriesY());
const scale = this.getScale(min, max, this.isTimeSeriesY());
if (domain) { scale.domain(domain); }
return scale;
};
@ -50,7 +50,7 @@ c3_chart_internal_fn.getSubYScale = function (id) {
return this.axis.getId(id) === 'y2' ? this.subY2 : this.subY;
};
c3_chart_internal_fn.updateScales = function () {
var $$ = this, config = $$.config,
let $$ = this, config = $$.config,
forInit = !$$.x;
// update edges
$$.xMin = config.axis_rotated ? 1 : 0;
@ -62,10 +62,10 @@ c3_chart_internal_fn.updateScales = function () {
$$.subYMin = config.axis_rotated ? 0 : $$.height2;
$$.subYMax = config.axis_rotated ? $$.width2 : 1;
// update scales
$$.x = $$.getX($$.xMin, $$.xMax, forInit ? undefined : $$.x.orgDomain(), function () { return $$.xAxis.tickOffset(); });
$$.x = $$.getX($$.xMin, $$.xMax, forInit ? undefined : $$.x.orgDomain(), () => { return $$.xAxis.tickOffset(); });
$$.y = $$.getY($$.yMin, $$.yMax, forInit ? config.axis_y_default : $$.y.domain());
$$.y2 = $$.getY($$.yMin, $$.yMax, forInit ? config.axis_y2_default : $$.y2.domain());
$$.subX = $$.getX($$.xMin, $$.xMax, $$.orgXDomain, function (d) { return d % 1 ? 0 : $$.subXAxis.tickOffset(); });
$$.subX = $$.getX($$.xMin, $$.xMax, $$.orgXDomain, (d) => { return d % 1 ? 0 : $$.subXAxis.tickOffset(); });
$$.subY = $$.getY($$.subYMin, $$.subYMax, forInit ? config.axis_y_default : $$.subY.domain());
$$.subY2 = $$.getY($$.subYMin, $$.subYMax, forInit ? config.axis_y2_default : $$.subY2.domain());
// update axes

32
src/chartinternal/selection.js

@ -1,5 +1,5 @@
c3_chart_internal_fn.selectPoint = function (target, d, i) {
var $$ = this, config = $$.config,
let $$ = this, config = $$.config,
cx = (config.axis_rotated ? $$.circleY : $$.circleX).bind($$),
cy = (config.axis_rotated ? $$.circleX : $$.circleY).bind($$),
r = $$.pointSelectR.bind($$);
@ -8,16 +8,16 @@ c3_chart_internal_fn.selectPoint = function (target, d, i) {
$$.main.select('.' + CLASS.selectedCircles + $$.getTargetSelectorSuffix(d.id)).selectAll('.' + CLASS.selectedCircle + '-' + i)
.data([d])
.enter().append('circle')
.attr("class", function () { return $$.generateClass(CLASS.selectedCircle, i); })
.attr("cx", cx)
.attr("cy", cy)
.attr("stroke", function () { return $$.color(d); })
.attr("r", function (d) { return $$.pointSelectR(d) * 1.4; })
.attr('class', () => { return $$.generateClass(CLASS.selectedCircle, i); })
.attr('cx', cx)
.attr('cy', cy)
.attr('stroke', () => { return $$.color(d); })
.attr('r', (d) => { return $$.pointSelectR(d) * 1.4; })
.transition().duration(100)
.attr("r", r);
.attr('r', r);
};
c3_chart_internal_fn.unselectPoint = function (target, d, i) {
var $$ = this;
const $$ = this;
$$.config.data_onunselected.call($$.api, d, target.node());
// remove selected-circle from low layer g
$$.main.select('.' + CLASS.selectedCircles + $$.getTargetSelectorSuffix(d.id)).selectAll('.' + CLASS.selectedCircle + '-' + i)
@ -28,26 +28,26 @@ c3_chart_internal_fn.togglePoint = function (selected, target, d, i) {
selected ? this.selectPoint(target, d, i) : this.unselectPoint(target, d, i);
};
c3_chart_internal_fn.selectPath = function (target, d) {
var $$ = this;
const $$ = this;
$$.config.data_onselected.call($$, d, target.node());
if ($$.config.interaction_brighten) {
target.transition().duration(100)
.style("fill", function () { return $$.d3.rgb($$.color(d)).brighter(0.75); });
.style('fill', () => { return $$.d3.rgb($$.color(d)).brighter(0.75); });
}
};
c3_chart_internal_fn.unselectPath = function (target, d) {
var $$ = this;
const $$ = this;
$$.config.data_onunselected.call($$, d, target.node());
if ($$.config.interaction_brighten) {
target.transition().duration(100)
.style("fill", function () { return $$.color(d); });
.style('fill', () => { return $$.color(d); });
}
};
c3_chart_internal_fn.togglePath = function (selected, target, d, i) {
selected ? this.selectPath(target, d, i) : this.unselectPath(target, d, i);
};
c3_chart_internal_fn.getToggle = function (that, d) {
var $$ = this, toggle;
let $$ = this, toggle;
if (that.nodeName === 'circle') {
if ($$.isStepType(d)) {
// circle is hidden in step chart, so treat as within the click area
@ -62,14 +62,14 @@ c3_chart_internal_fn.getToggle = function (that, d) {
return toggle;
};
c3_chart_internal_fn.toggleShape = function (that, d, i) {
var $$ = this, d3 = $$.d3, config = $$.config,
let $$ = this, d3 = $$.d3, config = $$.config,
shape = d3.select(that), isSelected = shape.classed(CLASS.SELECTED),
toggle = $$.getToggle(that, d).bind($$);
if (config.data_selection_enabled && config.data_selection_isselectable(d)) {
if (!config.data_selection_multiple) {
$$.main.selectAll('.' + CLASS.shapes + (config.data_selection_grouped ? $$.getTargetSelectorSuffix(d.id) : "")).selectAll('.' + CLASS.shape).each(function (d, i) {
var shape = d3.select(this);
$$.main.selectAll('.' + CLASS.shapes + (config.data_selection_grouped ? $$.getTargetSelectorSuffix(d.id) : '')).selectAll('.' + CLASS.shape).each(function (d, i) {
const shape = d3.select(this);
if (shape.classed(CLASS.SELECTED)) { toggle(false, shape.classed(CLASS.SELECTED, false), d, i); }
});
}

57
src/chartinternal/shape.bar.js

@ -1,29 +1,28 @@
c3_chart_internal_fn.initBar = function () {
var $$ = this;
$$.main.select('.' + CLASS.chart).append("g")
.attr("class", CLASS.chartBars);
const $$ = this;
$$.main.select('.' + CLASS.chart).append('g')
.attr('class', CLASS.chartBars);
};
c3_chart_internal_fn.updateTargetsForBar = function (targets) {
var $$ = this, config = $$.config,
let $$ = this, config = $$.config,
mainBarUpdate, mainBarEnter,
classChartBar = $$.classChartBar.bind($$),
classBars = $$.classBars.bind($$),
classFocus = $$.classFocus.bind($$);
mainBarUpdate = $$.main.select('.' + CLASS.chartBars).selectAll('.' + CLASS.chartBar)
.data(targets)
.attr('class', function (d) { return classChartBar(d) + classFocus(d); });
.attr('class', (d) => { return classChartBar(d) + classFocus(d); });
mainBarEnter = mainBarUpdate.enter().append('g')
.attr('class', classChartBar)
.style('opacity', 0)
.style("pointer-events", "none");
.style('pointer-events', 'none');
// Bars for each data
mainBarEnter.append('g')
.attr("class", classBars)
.style("cursor", function (d) { return config.data_selection_isselectable(d) ? "pointer" : null; });
.attr('class', classBars)
.style('cursor', (d) => { return config.data_selection_isselectable(d) ? 'pointer' : null; });
};
c3_chart_internal_fn.updateBar = function (durationForExit) {
var $$ = this,
let $$ = this,
barData = $$.barData.bind($$),
classBar = $$.classBar.bind($$),
initialOpacity = $$.initialOpacity.bind($$),
@ -31,11 +30,11 @@ c3_chart_internal_fn.updateBar = function (durationForExit) {
$$.mainBar = $$.main.selectAll('.' + CLASS.bars).selectAll('.' + CLASS.bar)
.data(barData);
$$.mainBar.enter().append('path')
.attr("class", classBar)
.style("stroke", color)
.style("fill", color);
.attr('class', classBar)
.style('stroke', color)
.style('fill', color);
$$.mainBar
.style("opacity", initialOpacity);
.style('opacity', initialOpacity);
$$.mainBar.exit().transition().duration(durationForExit)
.style('opacity', 0)
.remove();
@ -44,40 +43,40 @@ c3_chart_internal_fn.redrawBar = function (drawBar, withTransition) {
return [
(withTransition ? this.mainBar.transition(Math.random().toString()) : this.mainBar)
.attr('d', drawBar)
.style("fill", this.color)
.style("opacity", 1)
.style('fill', this.color)
.style('opacity', 1),
];
};
c3_chart_internal_fn.getBarW = function (axis, barTargetsNum) {
var $$ = this, config = $$.config,
let $$ = this, config = $$.config,
w = typeof config.bar_width === 'number' ? config.bar_width : barTargetsNum ? (axis.tickInterval() * config.bar_width_ratio) / barTargetsNum : 0;
return config.bar_width_max && w > config.bar_width_max ? config.bar_width_max : w;
};
c3_chart_internal_fn.getBars = function (i, id) {
var $$ = this;
const $$ = this;
return (id ? $$.main.selectAll('.' + CLASS.bars + $$.getTargetSelectorSuffix(id)) : $$.main).selectAll('.' + CLASS.bar + (isValue(i) ? '-' + i : ''));
};
c3_chart_internal_fn.expandBars = function (i, id, reset) {
var $$ = this;
const $$ = this;
if (reset) { $$.unexpandBars(); }
$$.getBars(i, id).classed(CLASS.EXPANDED, true);
};
c3_chart_internal_fn.unexpandBars = function (i) {
var $$ = this;
const $$ = this;
$$.getBars(i).classed(CLASS.EXPANDED, false);
};
c3_chart_internal_fn.generateDrawBar = function (barIndices, isSub) {
var $$ = this, config = $$.config,
let $$ = this, config = $$.config,
getPoints = $$.generateGetBarPoints(barIndices, isSub);
return function (d, i) {
// 4 points that make a bar
var points = getPoints(d, i);
const points = getPoints(d, i);
// switch points if axis is rotated, not applicable for sub chart
var indexX = config.axis_rotated ? 1 : 0;
var indexY = config.axis_rotated ? 0 : 1;
const indexX = config.axis_rotated ? 1 : 0;
const indexY = config.axis_rotated ? 0 : 1;
var path = 'M ' + points[0][indexX] + ',' + points[0][indexY] + ' ' +
const path = 'M ' + points[0][indexX] + ',' + points[0][indexY] + ' ' +
'L' + points[1][indexX] + ',' + points[1][indexY] + ' ' +
'L' + points[2][indexX] + ',' + points[2][indexY] + ' ' +
'L' + points[3][indexX] + ',' + points[3][indexY] + ' ' +
@ -87,7 +86,7 @@ c3_chart_internal_fn.generateDrawBar = function (barIndices, isSub) {
};
};
c3_chart_internal_fn.generateGetBarPoints = function (barIndices, isSub) {
var $$ = this,
let $$ = this,
axis = isSub ? $$.subXAxis : $$.xAxis,
barTargetsNum = barIndices.__max__ + 1,
barW = $$.getBarW(axis, barTargetsNum),
@ -96,7 +95,7 @@ c3_chart_internal_fn.generateGetBarPoints = function (barIndices, isSub) {
barOffset = $$.getShapeOffset($$.isBarType, barIndices, !!isSub),
yScale = isSub ? $$.getSubYScale : $$.getYScale;
return function (d, i) {
var y0 = yScale.call($$, d.id)(0),
let y0 = yScale.call($$, d.id)(0),
offset = barOffset(d, i) || y0, // offset is for stacked bar chart
posX = barX(d), posY = barY(d);
// fix posY not to overflow opposite quadrant
@ -108,12 +107,12 @@ c3_chart_internal_fn.generateGetBarPoints = function (barIndices, isSub) {
[posX, offset],
[posX, posY - (y0 - offset)],
[posX + barW, posY - (y0 - offset)],
[posX + barW, offset]
[posX + barW, offset],
];
};
};
c3_chart_internal_fn.isWithinBar = function (that) {
var mouse = this.d3.mouse(that), box = that.getBoundingClientRect(),
let mouse = this.d3.mouse(that), box = that.getBoundingClientRect(),
seg0 = that.pathSegList.getItem(0), seg1 = that.pathSegList.getItem(1),
x = Math.min(seg0.x, seg1.x), y = Math.min(seg0.y, seg1.y),
w = box.width, h = box.height, offset = 2,

30
src/chartinternal/shape.js

@ -1,7 +1,7 @@
c3_chart_internal_fn.getShapeIndices = function (typeFilter) {
var $$ = this, config = $$.config,
let $$ = this, config = $$.config,
indices = {}, i = 0, j, k;
$$.filterTargetsToShow($$.data.targets.filter(typeFilter, $$)).forEach(function (d) {
$$.filterTargetsToShow($$.data.targets.filter(typeFilter, $$)).forEach((d) => {
for (j = 0; j < config.data_groups.length; j++) {
if (config.data_groups[j].indexOf(d.id) < 0) { continue; }
for (k = 0; k < config.data_groups[j].length; k++) {
@ -17,35 +17,35 @@ c3_chart_internal_fn.getShapeIndices = function (typeFilter) {
return indices;
};
c3_chart_internal_fn.getShapeX = function (offset, targetsNum, indices, isSub) {
var $$ = this, scale = isSub ? $$.subX : $$.x;
let $$ = this, scale = isSub ? $$.subX : $$.x;
return function (d) {
var index = d.id in indices ? indices[d.id] : 0;
const index = d.id in indices ? indices[d.id] : 0;
return d.x || d.x === 0 ? scale(d.x) - offset * (targetsNum / 2 - index) : 0;
};
};
c3_chart_internal_fn.getShapeY = function (isSub) {
var $$ = this;
const $$ = this;
return function (d) {
var scale = isSub ? $$.getSubYScale(d.id) : $$.getYScale(d.id);
const scale = isSub ? $$.getSubYScale(d.id) : $$.getYScale(d.id);
return scale(d.value);
};
};
c3_chart_internal_fn.getShapeOffset = function (typeFilter, indices, isSub) {
var $$ = this,
let $$ = this,
targets = $$.orderTargets($$.filterTargetsToShow($$.data.targets.filter(typeFilter, $$))),
targetIds = targets.map(function (t) { return t.id; });
targetIds = targets.map((t) => { return t.id; });
return function (d, i) {
var scale = isSub ? $$.getSubYScale(d.id) : $$.getYScale(d.id),
let scale = isSub ? $$.getSubYScale(d.id) : $$.getYScale(d.id),
y0 = scale(0), offset = y0;
targets.forEach(function (t) {
var values = $$.isStepType(d) ? $$.convertValuesToStep(t.values) : t.values;
targets.forEach((t) => {
const values = $$.isStepType(d) ? $$.convertValuesToStep(t.values) : t.values;
if (t.id === d.id || indices[t.id] !== indices[d.id]) { return; }
if (targetIds.indexOf(t.id) < targetIds.indexOf(d.id)) {
// check if the x values line up
if (typeof values[i] === 'undefined' || +values[i].x !== +d.x) { // "+" for timeseries
// if not, try to find the value that does line up
i = -1;
values.forEach(function (v, j) {
values.forEach((v, j) => {
if (v.x === d.x) {
i = j;
}
@ -60,7 +60,7 @@ c3_chart_internal_fn.getShapeOffset = function (typeFilter, indices, isSub) {
};
};
c3_chart_internal_fn.isWithinShape = function (that, d) {
var $$ = this,
let $$ = this,
shape = $$.d3.select(that), isWithin;
if (!$$.isTargetToShow(d.id)) {
isWithin = false;
@ -76,7 +76,7 @@ c3_chart_internal_fn.isWithinShape = function (that, d) {
c3_chart_internal_fn.getInterpolate = function (d) {
var $$ = this,
let $$ = this,
interpolation = $$.isInterpolationType($$.config.spline_interpolation_type) ? $$.config.spline_interpolation_type : 'cardinal';
return $$.isSplineType(d) ? interpolation : $$.isStepType(d) ? $$.config.line_step_type : "linear";
return $$.isSplineType(d) ? interpolation : $$.isStepType(d) ? $$.config.line_step_type : 'linear';
};

145
src/chartinternal/shape.line.js

@ -1,10 +1,10 @@
c3_chart_internal_fn.initLine = function () {
var $$ = this;
$$.main.select('.' + CLASS.chart).append("g")
.attr("class", CLASS.chartLines);
const $$ = this;
$$.main.select('.' + CLASS.chart).append('g')
.attr('class', CLASS.chartLines);
};
c3_chart_internal_fn.updateTargetsForLine = function (targets) {
var $$ = this, config = $$.config,
let $$ = this, config = $$.config,
mainLineUpdate, mainLineEnter,
classChartLine = $$.classChartLine.bind($$),
classLines = $$.classLines.bind($$),
@ -13,42 +13,42 @@ c3_chart_internal_fn.updateTargetsForLine = function (targets) {
classFocus = $$.classFocus.bind($$);
mainLineUpdate = $$.main.select('.' + CLASS.chartLines).selectAll('.' + CLASS.chartLine)
.data(targets)
.attr('class', function (d) { return classChartLine(d) + classFocus(d); });
.attr('class', (d) => { return classChartLine(d) + classFocus(d); });
mainLineEnter = mainLineUpdate.enter().append('g')
.attr('class', classChartLine)
.style('opacity', 0)
.style("pointer-events", "none");
.style('pointer-events', 'none');
// Lines for each data
mainLineEnter.append('g')
.attr("class", classLines);
.attr('class', classLines);
// Areas
mainLineEnter.append('g')
.attr('class', classAreas);
// Circles for each data point on lines
mainLineEnter.append('g')
.attr("class", function (d) { return $$.generateClass(CLASS.selectedCircles, d.id); });
.attr('class', (d) => { return $$.generateClass(CLASS.selectedCircles, d.id); });
mainLineEnter.append('g')
.attr("class", classCircles)
.style("cursor", function (d) { return config.data_selection_isselectable(d) ? "pointer" : null; });
.attr('class', classCircles)
.style('cursor', (d) => { return config.data_selection_isselectable(d) ? 'pointer' : null; });
// Update date for selected circles
targets.forEach(function (t) {
$$.main.selectAll('.' + CLASS.selectedCircles + $$.getTargetSelectorSuffix(t.id)).selectAll('.' + CLASS.selectedCircle).each(function (d) {
targets.forEach((t) => {
$$.main.selectAll('.' + CLASS.selectedCircles + $$.getTargetSelectorSuffix(t.id)).selectAll('.' + CLASS.selectedCircle).each((d) => {
d.value = t.values[d.index].value;
});
});
// MEMO: can not keep same color...
//mainLineUpdate.exit().remove();
// mainLineUpdate.exit().remove();
};
c3_chart_internal_fn.updateLine = function (durationForExit) {
var $$ = this;
const $$ = this;
$$.mainLine = $$.main.selectAll('.' + CLASS.lines).selectAll('.' + CLASS.line)
.data($$.lineData.bind($$));
$$.mainLine.enter().append('path')
.attr('class', $$.classLine.bind($$))
.style("stroke", $$.color);
.style('stroke', $$.color);
$$.mainLine
.style("opacity", $$.initialOpacity.bind($$))
.style('shape-rendering', function (d) { return $$.isStepType(d) ? 'crispEdges' : ''; })
.style('opacity', $$.initialOpacity.bind($$))
.style('shape-rendering', (d) => { return $$.isStepType(d) ? 'crispEdges' : ''; })
.attr('transform', null);
$$.mainLine.exit().transition().duration(durationForExit)
.style('opacity', 0)
@ -57,13 +57,13 @@ c3_chart_internal_fn.updateLine = function (durationForExit) {
c3_chart_internal_fn.redrawLine = function (drawLine, withTransition) {
return [
(withTransition ? this.mainLine.transition(Math.random().toString()) : this.mainLine)
.attr("d", drawLine)
.style("stroke", this.color)
.style("opacity", 1)
.attr('d', drawLine)
.style('stroke', this.color)
.style('opacity', 1),
];
};
c3_chart_internal_fn.generateDrawLine = function (lineIndices, isSub) {
var $$ = this, config = $$.config,
let $$ = this, config = $$.config,
line = $$.d3.svg.line(),
getPoints = $$.generateGetLinePoints(lineIndices, isSub),
yScaleGetter = isSub ? $$.getSubYScale : $$.getYScale,
@ -73,9 +73,9 @@ c3_chart_internal_fn.generateDrawLine = function (lineIndices, isSub) {
};
line = config.axis_rotated ? line.x(yValue).y(xValue) : line.x(xValue).y(yValue);
if (!config.line_connectNull) { line = line.defined(function (d) { return d.value != null; }); }
if (!config.line_connectNull) { line = line.defined((d) => { return d.value != null; }); }
return function (d) {
var values = config.line_connectNull ? $$.filterRemoveNull(d.values) : d.values,
let values = config.line_connectNull ? $$.filterRemoveNull(d.values) : d.values,
x = isSub ? $$.x : $$.subX, y = yScaleGetter.call($$, d.id), x0 = 0, y0 = 0, path;
if ($$.isLineType(d)) {
if (config.data_regions[d.id]) {
@ -89,20 +89,20 @@ c3_chart_internal_fn.generateDrawLine = function (lineIndices, isSub) {
x0 = x(values[0].x);
y0 = y(values[0].value);
}
path = config.axis_rotated ? "M " + y0 + " " + x0 : "M " + x0 + " " + y0;
path = config.axis_rotated ? 'M ' + y0 + ' ' + x0 : 'M ' + x0 + ' ' + y0;
}
return path ? path : "M 0 0";
return path ? path : 'M 0 0';
};
};
c3_chart_internal_fn.generateGetLinePoints = function (lineIndices, isSub) { // partial duplication of generateGetBarPoints
var $$ = this, config = $$.config,
let $$ = this, config = $$.config,
lineTargetsNum = lineIndices.__max__ + 1,
x = $$.getShapeX(0, lineTargetsNum, lineIndices, !!isSub),
y = $$.getShapeY(!!isSub),
lineOffset = $$.getShapeOffset($$.isLineType, lineIndices, !!isSub),
yScale = isSub ? $$.getSubYScale : $$.getYScale;
return function (d, i) {
var y0 = yScale.call($$, d.id)(0),
let y0 = yScale.call($$, d.id)(0),
offset = lineOffset(d, i) || y0, // offset is for stacked area chart
posX = x(d), posY = y(d);
// fix posY not to overflow opposite quadrant
@ -114,23 +114,23 @@ c3_chart_internal_fn.generateGetLinePoints = function (lineIndices, isSub) { //
[posX, posY - (y0 - offset)],
[posX, posY - (y0 - offset)], // needed for compatibility
[posX, posY - (y0 - offset)], // needed for compatibility
[posX, posY - (y0 - offset)] // needed for compatibility
[posX, posY - (y0 - offset)], // needed for compatibility
];
};
};
c3_chart_internal_fn.lineWithRegions = function (d, x, y, _regions) {
var $$ = this, config = $$.config,
let $$ = this, config = $$.config,
prev = -1, i, j,
s = "M", sWithRegion,
s = 'M', sWithRegion,
xp, yp, dx, dy, dd, diff, diffx2,
xOffset = $$.isCategorized() ? 0.5 : 0,
xValue, yValue,
regions = [];
function isWithinRegions(x, regions) {
var i;
let i;
for (i = 0; i < regions.length; i++) {
if (regions[i].start < x && x <= regions[i].end) { return true; }
}
@ -164,7 +164,7 @@ c3_chart_internal_fn.lineWithRegions = function (d, x, y, _regions) {
}
if ($$.isTimeSeries()) {
sWithRegion = function (d0, d1, j, diff) {
var x0 = d0.x.getTime(), x_diff = d1.x - d0.x,
let x0 = d0.x.getTime(), x_diff = d1.x - d0.x,
xv0 = new Date(x0 + x_diff * j),
xv1 = new Date(x0 + x_diff * (j + diff)),
points;
@ -177,7 +177,7 @@ c3_chart_internal_fn.lineWithRegions = function (d, x, y, _regions) {
};
} else {
sWithRegion = function (d0, d1, j, diff) {
var points;
let points;
if (config.axis_rotated) {
points = [[y(yp(j), true), x(xp(j))], [y(yp(j + diff), true), x(xp(j + diff))]];
} else {
@ -189,10 +189,9 @@ c3_chart_internal_fn.lineWithRegions = function (d, x, y, _regions) {
// Generate
for (i = 0; i < d.length; i++) {
// Draw as normal
if (isUndefined(regions) || ! isWithinRegions(d[i].x, regions)) {
s += " " + xValue(d[i]) + " " + yValue(d[i]);
if (isUndefined(regions) || !isWithinRegions(d[i].x, regions)) {
s += ' ' + xValue(d[i]) + ' ' + yValue(d[i]);
}
// Draw with region // TODO: Fix for horizotal charts
else {
@ -217,15 +216,15 @@ c3_chart_internal_fn.lineWithRegions = function (d, x, y, _regions) {
c3_chart_internal_fn.updateArea = function (durationForExit) {
var $$ = this, d3 = $$.d3;
let $$ = this, d3 = $$.d3;
$$.mainArea = $$.main.selectAll('.' + CLASS.areas).selectAll('.' + CLASS.area)
.data($$.lineData.bind($$));
$$.mainArea.enter().append('path')
.attr("class", $$.classArea.bind($$))
.style("fill", $$.color)
.style("opacity", function () { $$.orgAreaOpacity = +d3.select(this).style('opacity'); return 0; });
.attr('class', $$.classArea.bind($$))
.style('fill', $$.color)
.style('opacity', function () { $$.orgAreaOpacity = +d3.select(this).style('opacity'); return 0; });
$$.mainArea
.style("opacity", $$.orgAreaOpacity);
.style('opacity', $$.orgAreaOpacity);
$$.mainArea.exit().transition().duration(durationForExit)
.style('opacity', 0)
.remove();
@ -233,13 +232,13 @@ c3_chart_internal_fn.updateArea = function (durationForExit) {
c3_chart_internal_fn.redrawArea = function (drawArea, withTransition) {
return [
(withTransition ? this.mainArea.transition(Math.random().toString()) : this.mainArea)
.attr("d", drawArea)
.style("fill", this.color)
.style("opacity", this.orgAreaOpacity)
.attr('d', drawArea)
.style('fill', this.color)
.style('opacity', this.orgAreaOpacity),
];
};
c3_chart_internal_fn.generateDrawArea = function (areaIndices, isSub) {
var $$ = this, config = $$.config, area = $$.d3.svg.area(),
let $$ = this, config = $$.config, area = $$.d3.svg.area(),
getPoints = $$.generateGetAreaPoints(areaIndices, isSub),
yScaleGetter = isSub ? $$.getSubYScale : $$.getYScale,
xValue = function (d) { return (isSub ? $$.subxx : $$.xx).call($$, d); },
@ -252,11 +251,11 @@ c3_chart_internal_fn.generateDrawArea = function (areaIndices, isSub) {
area = config.axis_rotated ? area.x0(value0).x1(value1).y(xValue) : area.x(xValue).y0(config.area_above ? 0 : value0).y1(value1);
if (!config.line_connectNull) {
area = area.defined(function (d) { return d.value !== null; });
area = area.defined((d) => { return d.value !== null; });
}
return function (d) {
var values = config.line_connectNull ? $$.filterRemoveNull(d.values) : d.values,
let values = config.line_connectNull ? $$.filterRemoveNull(d.values) : d.values,
x0 = 0, y0 = 0, path;
if ($$.isAreaType(d)) {
if ($$.isStepType(d)) { values = $$.convertValuesToStep(values); }
@ -266,23 +265,23 @@ c3_chart_internal_fn.generateDrawArea = function (areaIndices, isSub) {
x0 = $$.x(values[0].x);
y0 = $$.getYScale(d.id)(values[0].value);
}
path = config.axis_rotated ? "M " + y0 + " " + x0 : "M " + x0 + " " + y0;
path = config.axis_rotated ? 'M ' + y0 + ' ' + x0 : 'M ' + x0 + ' ' + y0;
}
return path ? path : "M 0 0";
return path ? path : 'M 0 0';
};
};
c3_chart_internal_fn.getAreaBaseValue = function () {
return 0;
};
c3_chart_internal_fn.generateGetAreaPoints = function (areaIndices, isSub) { // partial duplication of generateGetBarPoints
var $$ = this, config = $$.config,
let $$ = this, config = $$.config,
areaTargetsNum = areaIndices.__max__ + 1,
x = $$.getShapeX(0, areaTargetsNum, areaIndices, !!isSub),
y = $$.getShapeY(!!isSub),
areaOffset = $$.getShapeOffset($$.isAreaType, areaIndices, !!isSub),
yScale = isSub ? $$.getSubYScale : $$.getYScale;
return function (d, i) {
var y0 = yScale.call($$, d.id)(0),
let y0 = yScale.call($$, d.id)(0),
offset = areaOffset(d, i) || y0, // offset is for stacked area chart
posX = x(d), posY = y(d);
// fix posY not to overflow opposite quadrant
@ -294,42 +293,42 @@ c3_chart_internal_fn.generateGetAreaPoints = function (areaIndices, isSub) { //
[posX, offset],
[posX, posY - (y0 - offset)],
[posX, posY - (y0 - offset)], // needed for compatibility
[posX, offset] // needed for compatibility
[posX, offset], // needed for compatibility
];
};
};
c3_chart_internal_fn.updateCircle = function () {
var $$ = this;
const $$ = this;
$$.mainCircle = $$.main.selectAll('.' + CLASS.circles).selectAll('.' + CLASS.circle)
.data($$.lineOrScatterData.bind($$));
$$.mainCircle.enter().append("circle")
.attr("class", $$.classCircle.bind($$))
.attr("r", $$.pointR.bind($$))
.style("fill", $$.color);
$$.mainCircle.enter().append('circle')
.attr('class', $$.classCircle.bind($$))
.attr('r', $$.pointR.bind($$))
.style('fill', $$.color);
$$.mainCircle
.style("opacity", $$.initialOpacityForCircle.bind($$));
.style('opacity', $$.initialOpacityForCircle.bind($$));
$$.mainCircle.exit().remove();
};
c3_chart_internal_fn.redrawCircle = function (cx, cy, withTransition) {
var selectedCircles = this.main.selectAll('.' + CLASS.selectedCircle);
const selectedCircles = this.main.selectAll('.' + CLASS.selectedCircle);
return [
(withTransition ? this.mainCircle.transition(Math.random().toString()) : this.mainCircle)
.style('opacity', this.opacityForCircle.bind(this))
.style("fill", this.color)
.attr("cx", cx)
.attr("cy", cy),
.style('fill', this.color)
.attr('cx', cx)
.attr('cy', cy),
(withTransition ? selectedCircles.transition(Math.random().toString()) : selectedCircles)
.attr("cx", cx)
.attr("cy", cy)
.attr('cx', cx)
.attr('cy', cy),
];
};
c3_chart_internal_fn.circleX = function (d) {
return d.x || d.x === 0 ? this.x(d.x) : null;
};
c3_chart_internal_fn.updateCircleY = function () {
var $$ = this, lineIndices, getPoints;
let $$ = this, lineIndices, getPoints;
if ($$.config.data_groups.length > 0) {
lineIndices = $$.getShapeIndices($$.isLineType),
getPoints = $$.generateGetLinePoints(lineIndices);
@ -343,11 +342,11 @@ c3_chart_internal_fn.updateCircleY = function () {
}
};
c3_chart_internal_fn.getCircles = function (i, id) {
var $$ = this;
const $$ = this;
return (id ? $$.main.selectAll('.' + CLASS.circles + $$.getTargetSelectorSuffix(id)) : $$.main).selectAll('.' + CLASS.circle + (isValue(i) ? '-' + i : ''));
};
c3_chart_internal_fn.expandCircles = function (i, id, reset) {
var $$ = this,
let $$ = this,
r = $$.pointExpandedR.bind($$);
if (reset) { $$.unexpandCircles(); }
$$.getCircles(i, id)
@ -355,7 +354,7 @@ c3_chart_internal_fn.expandCircles = function (i, id, reset) {
.attr('r', r);
};
c3_chart_internal_fn.unexpandCircles = function (i) {
var $$ = this,
let $$ = this,
r = $$.pointR.bind($$);
$$.getCircles(i)
.filter(function () { return $$.d3.select(this).classed(CLASS.EXPANDED); })
@ -363,21 +362,21 @@ c3_chart_internal_fn.unexpandCircles = function (i) {
.attr('r', r);
};
c3_chart_internal_fn.pointR = function (d) {
var $$ = this, config = $$.config;
let $$ = this, config = $$.config;
return $$.isStepType(d) ? 0 : (isFunction(config.point_r) ? config.point_r(d) : config.point_r);
};
c3_chart_internal_fn.pointExpandedR = function (d) {
var $$ = this, config = $$.config;
let $$ = this, config = $$.config;
return config.point_focus_expand_enabled ? (config.point_focus_expand_r ? config.point_focus_expand_r : $$.pointR(d) * 1.75) : $$.pointR(d);
};
c3_chart_internal_fn.pointSelectR = function (d) {
var $$ = this, config = $$.config;
let $$ = this, config = $$.config;
return isFunction(config.point_select_r) ? config.point_select_r(d) : ((config.point_select_r) ? config.point_select_r : $$.pointR(d) * 4);
};
c3_chart_internal_fn.isWithinCircle = function (that, r) {
var d3 = this.d3,
let d3 = this.d3,
mouse = d3.mouse(that), d3_this = d3.select(that),
cx = +d3_this.attr("cx"), cy = +d3_this.attr("cy");
cx = +d3_this.attr('cx'), cy = +d3_this.attr('cy');
return Math.sqrt(Math.pow(cx - mouse[0], 2) + Math.pow(cy - mouse[1], 2)) < r;
};
c3_chart_internal_fn.isWithinStep = function (that, y) {

32
src/chartinternal/size.js

@ -1,14 +1,14 @@
c3_chart_internal_fn.getCurrentWidth = function () {
var $$ = this, config = $$.config;
let $$ = this, config = $$.config;
return config.size_width ? config.size_width : $$.getParentWidth();
};
c3_chart_internal_fn.getCurrentHeight = function () {
var $$ = this, config = $$.config,
let $$ = this, config = $$.config,
h = config.size_height ? config.size_height : $$.getParentHeight();
return h > 0 ? h : 320 / ($$.hasType('gauge') && !config.gauge_fullCircle ? 2 : 1);
return h > 0 ? h : 320 / ($$.hasType('gauge') && !config.gauge_fullCircle ? 2 : 1);
};
c3_chart_internal_fn.getCurrentPaddingTop = function () {
var $$ = this,
let $$ = this,
config = $$.config,
padding = isValue(config.padding_top) ? config.padding_top : 0;
if ($$.title && $$.title.node()) {
@ -17,11 +17,11 @@ c3_chart_internal_fn.getCurrentPaddingTop = function () {
return padding;
};
c3_chart_internal_fn.getCurrentPaddingBottom = function () {
var config = this.config;
const config = this.config;
return isValue(config.padding_bottom) ? config.padding_bottom : 0;
};
c3_chart_internal_fn.getCurrentPaddingLeft = function (withoutRecompute) {
var $$ = this, config = $$.config;
let $$ = this, config = $$.config;
if (isValue(config.padding_left)) {
return config.padding_left;
} else if (config.axis_rotated) {
@ -33,7 +33,7 @@ c3_chart_internal_fn.getCurrentPaddingLeft = function (withoutRecompute) {
}
};
c3_chart_internal_fn.getCurrentPaddingRight = function () {
var $$ = this, config = $$.config,
let $$ = this, config = $$.config,
defaultPadding = 10, legendWidthOnRight = $$.isLegendRight ? $$.getLegendWidth() + 20 : 0;
if (isValue(config.padding_right)) {
return config.padding_right + 1; // 1 is needed not to hide tick line
@ -47,11 +47,11 @@ c3_chart_internal_fn.getCurrentPaddingRight = function () {
};
c3_chart_internal_fn.getParentRectValue = function (key) {
var parent = this.selectChart.node(), v;
let parent = this.selectChart.node(), v;
while (parent && parent.tagName !== 'BODY') {
try {
v = parent.getBoundingClientRect()[key];
} catch(e) {
} catch (e) {
if (key === 'width') {
// In IE in certain cases getBoundingClientRect
// will cause an "unspecified error"
@ -69,17 +69,17 @@ c3_chart_internal_fn.getParentWidth = function () {
return this.getParentRectValue('width');
};
c3_chart_internal_fn.getParentHeight = function () {
var h = this.selectChart.style('height');
const h = this.selectChart.style('height');
return h.indexOf('px') > 0 ? +h.replace('px', '') : 0;
};
c3_chart_internal_fn.getSvgLeft = function (withoutRecompute) {
var $$ = this, config = $$.config,
let $$ = this, config = $$.config,
hasLeftAxisRect = config.axis_rotated || (!config.axis_rotated && !config.axis_y_inner),
leftAxisClass = config.axis_rotated ? CLASS.axisX : CLASS.axisY,
leftAxis = $$.main.select('.' + leftAxisClass).node(),
svgRect = leftAxis && hasLeftAxisRect ? leftAxis.getBoundingClientRect() : {right: 0},
svgRect = leftAxis && hasLeftAxisRect ? leftAxis.getBoundingClientRect() : { right: 0 },
chartRect = $$.selectChart.node().getBoundingClientRect(),
hasArc = $$.hasArcType(),
svgLeft = svgRect.right - chartRect.left - (hasArc ? 0 : $$.getCurrentPaddingLeft(withoutRecompute));
@ -88,15 +88,15 @@ c3_chart_internal_fn.getSvgLeft = function (withoutRecompute) {
c3_chart_internal_fn.getAxisWidthByAxisId = function (id, withoutRecompute) {
var $$ = this, position = $$.axis.getLabelPositionById(id);
let $$ = this, position = $$.axis.getLabelPositionById(id);
return $$.axis.getMaxTickWidth(id, withoutRecompute) + (position.isInner ? 20 : 40);
};
c3_chart_internal_fn.getHorizontalAxisHeight = function (axisId) {
var $$ = this, config = $$.config, h = 30;
let $$ = this, config = $$.config, h = 30;
if (axisId === 'x' && !config.axis_x_show) { return 8; }
if (axisId === 'x' && config.axis_x_height) { return config.axis_x_height; }
if (axisId === 'y' && !config.axis_y_show) {
return config.legend_show && !$$.isLegendRight && !$$.isLegendInset ? 10 : 1;
if (axisId === 'y' && !config.axis_y_show) {
return config.legend_show && !$$.isLegendRight && !$$.isLegendInset ? 10 : 1;
}
if (axisId === 'y2' && !config.axis_y2_show) { return $$.rotated_padding_top; }
// Calculate x axis height when tick rotated

101
src/chartinternal/subchart.js

@ -1,6 +1,6 @@
c3_chart_internal_fn.initBrush = function () {
var $$ = this, d3 = $$.d3;
$$.brush = d3.svg.brush().on("brush", function () { $$.redrawForBrush(); });
let $$ = this, d3 = $$.d3;
$$.brush = d3.svg.brush().on('brush', () => { $$.redrawForBrush(); });
$$.brush.update = function () {
if ($$.context) { $$.context.select('.' + CLASS.brush).call(this); }
return this;
@ -10,41 +10,41 @@ c3_chart_internal_fn.initBrush = function () {
};
};
c3_chart_internal_fn.initSubchart = function () {
var $$ = this, config = $$.config,
context = $$.context = $$.svg.append("g").attr("transform", $$.getTranslate('context')),
let $$ = this, config = $$.config,
context = $$.context = $$.svg.append('g').attr('transform', $$.getTranslate('context')),
visibility = config.subchart_show ? 'visible' : 'hidden';
context.style('visibility', visibility);
// Define g for chart area
context.append('g')
.attr("clip-path", $$.clipPathForSubchart)
.attr('clip-path', $$.clipPathForSubchart)
.attr('class', CLASS.chart);
// Define g for bar chart area
context.select('.' + CLASS.chart).append("g")
.attr("class", CLASS.chartBars);
context.select('.' + CLASS.chart).append('g')
.attr('class', CLASS.chartBars);
// Define g for line chart area
context.select('.' + CLASS.chart).append("g")
.attr("class", CLASS.chartLines);
context.select('.' + CLASS.chart).append('g')
.attr('class', CLASS.chartLines);
// Add extent rect for Brush
context.append("g")
.attr("clip-path", $$.clipPath)
.attr("class", CLASS.brush)
context.append('g')
.attr('clip-path', $$.clipPath)
.attr('class', CLASS.brush)
.call($$.brush);
// ATTENTION: This must be called AFTER chart added
// Add Axis
$$.axes.subx = context.append("g")
.attr("class", CLASS.axisX)
.attr("transform", $$.getTranslate('subx'))
.attr("clip-path", config.axis_rotated ? "" : $$.clipPathForXAxis)
.style("visibility", config.subchart_axis_x_show ? visibility : 'hidden');
$$.axes.subx = context.append('g')
.attr('class', CLASS.axisX)
.attr('transform', $$.getTranslate('subx'))
.attr('clip-path', config.axis_rotated ? '' : $$.clipPathForXAxis)
.style('visibility', config.subchart_axis_x_show ? visibility : 'hidden');
};
c3_chart_internal_fn.updateTargetsForSubchart = function (targets) {
var $$ = this, context = $$.context, config = $$.config,
let $$ = this, context = $$.context, config = $$.config,
contextLineEnter, contextLineUpdate, contextBarEnter, contextBarUpdate,
classChartBar = $$.classChartBar.bind($$),
classBars = $$.classBars.bind($$),
@ -53,7 +53,7 @@ c3_chart_internal_fn.updateTargetsForSubchart = function (targets) {
classAreas = $$.classAreas.bind($$);
if (config.subchart_show) {
//-- Bar --//
// -- Bar --//
contextBarUpdate = context.select('.' + CLASS.chartBars).selectAll('.' + CLASS.chartBar)
.data(targets)
.attr('class', classChartBar);
@ -62,9 +62,9 @@ c3_chart_internal_fn.updateTargetsForSubchart = function (targets) {
.attr('class', classChartBar);
// Bars for each data
contextBarEnter.append('g')
.attr("class", classBars);
.attr('class', classBars);
//-- Line --//
// -- Line --//
contextLineUpdate = context.select('.' + CLASS.chartLines).selectAll('.' + CLASS.chartLine)
.data(targets)
.attr('class', classChartLine);
@ -72,27 +72,27 @@ c3_chart_internal_fn.updateTargetsForSubchart = function (targets) {
.style('opacity', 0)
.attr('class', classChartLine);
// Lines for each data
contextLineEnter.append("g")
.attr("class", classLines);
contextLineEnter.append('g')
.attr('class', classLines);
// Area
contextLineEnter.append("g")
.attr("class", classAreas);
contextLineEnter.append('g')
.attr('class', classAreas);
//-- Brush --//
// -- Brush --//
context.selectAll('.' + CLASS.brush + ' rect')
.attr(config.axis_rotated ? "width" : "height", config.axis_rotated ? $$.width2 : $$.height2);
.attr(config.axis_rotated ? 'width' : 'height', config.axis_rotated ? $$.width2 : $$.height2);
}
};
c3_chart_internal_fn.updateBarForSubchart = function (durationForExit) {
var $$ = this;
const $$ = this;
$$.contextBar = $$.context.selectAll('.' + CLASS.bars).selectAll('.' + CLASS.bar)
.data($$.barData.bind($$));
$$.contextBar.enter().append('path')
.attr("class", $$.classBar.bind($$))
.style("stroke", 'none')
.style("fill", $$.color);
.attr('class', $$.classBar.bind($$))
.style('stroke', 'none')
.style('fill', $$.color);
$$.contextBar
.style("opacity", $$.initialOpacity.bind($$));
.style('opacity', $$.initialOpacity.bind($$));
$$.contextBar.exit().transition().duration(durationForExit)
.style('opacity', 0)
.remove();
@ -103,45 +103,45 @@ c3_chart_internal_fn.redrawBarForSubchart = function (drawBarOnSub, withTransiti
.style('opacity', 1);
};
c3_chart_internal_fn.updateLineForSubchart = function (durationForExit) {
var $$ = this;
const $$ = this;
$$.contextLine = $$.context.selectAll('.' + CLASS.lines).selectAll('.' + CLASS.line)
.data($$.lineData.bind($$));
$$.contextLine.enter().append('path')
.attr('class', $$.classLine.bind($$))
.style('stroke', $$.color);
$$.contextLine
.style("opacity", $$.initialOpacity.bind($$));
.style('opacity', $$.initialOpacity.bind($$));
$$.contextLine.exit().transition().duration(durationForExit)
.style('opacity', 0)
.remove();
};
c3_chart_internal_fn.redrawLineForSubchart = function (drawLineOnSub, withTransition, duration) {
(withTransition ? this.contextLine.transition(Math.random().toString()).duration(duration) : this.contextLine)
.attr("d", drawLineOnSub)
.attr('d', drawLineOnSub)
.style('opacity', 1);
};
c3_chart_internal_fn.updateAreaForSubchart = function (durationForExit) {
var $$ = this, d3 = $$.d3;
let $$ = this, d3 = $$.d3;
$$.contextArea = $$.context.selectAll('.' + CLASS.areas).selectAll('.' + CLASS.area)
.data($$.lineData.bind($$));
$$.contextArea.enter().append('path')
.attr("class", $$.classArea.bind($$))
.style("fill", $$.color)
.style("opacity", function () { $$.orgAreaOpacity = +d3.select(this).style('opacity'); return 0; });
.attr('class', $$.classArea.bind($$))
.style('fill', $$.color)
.style('opacity', function () { $$.orgAreaOpacity = +d3.select(this).style('opacity'); return 0; });
$$.contextArea
.style("opacity", 0);
.style('opacity', 0);
$$.contextArea.exit().transition().duration(durationForExit)
.style('opacity', 0)
.remove();
};
c3_chart_internal_fn.redrawAreaForSubchart = function (drawAreaOnSub, withTransition, duration) {
(withTransition ? this.contextArea.transition(Math.random().toString()).duration(duration) : this.contextArea)
.attr("d", drawAreaOnSub)
.style("fill", this.color)
.style("opacity", this.orgAreaOpacity);
.attr('d', drawAreaOnSub)
.style('fill', this.color)
.style('opacity', this.orgAreaOpacity);
};
c3_chart_internal_fn.redrawSubchart = function (withSubchart, transitions, duration, durationForExit, areaIndices, barIndices, lineIndices) {
var $$ = this, d3 = $$.d3, config = $$.config,
let $$ = this, d3 = $$.d3, config = $$.config,
drawAreaOnSub, drawBarOnSub, drawLineOnSub;
$$.context.style('visibility', config.subchart_show ? 'visible' : 'hidden');
@ -154,7 +154,6 @@ c3_chart_internal_fn.redrawSubchart = function (withSubchart, transitions, durat
}
// update subchart elements if needed
if (withSubchart) {
// extent rect
if (!$$.brush.empty()) {
$$.brush.extent($$.x.orgDomain()).update();
@ -175,29 +174,29 @@ c3_chart_internal_fn.redrawSubchart = function (withSubchart, transitions, durat
}
};
c3_chart_internal_fn.redrawForBrush = function () {
var $$ = this, x = $$.x;
let $$ = this, x = $$.x;
$$.redraw({
withTransition: false,
withY: $$.config.zoom_rescale,
withSubchart: false,
withUpdateXDomain: true,
withDimension: false
withDimension: false,
});
$$.config.subchart_onbrush.call($$.api, x.orgDomain());
};
c3_chart_internal_fn.transformContext = function (withTransition, transitions) {
var $$ = this, subXAxis;
let $$ = this, subXAxis;
if (transitions && transitions.axisSubX) {
subXAxis = transitions.axisSubX;
} else {
subXAxis = $$.context.select('.' + CLASS.axisX);
if (withTransition) { subXAxis = subXAxis.transition(); }
}
$$.context.attr("transform", $$.getTranslate('context'));
subXAxis.attr("transform", $$.getTranslate('subx'));
$$.context.attr('transform', $$.getTranslate('context'));
subXAxis.attr('transform', $$.getTranslate('subx'));
};
c3_chart_internal_fn.getDefaultExtent = function () {
var $$ = this, config = $$.config,
let $$ = this, config = $$.config,
extent = isFunction(config.axis_x_extent) ? config.axis_x_extent($$.getXDomain($$.data.targets)) : config.axis_x_extent;
if ($$.isTimeSeries()) {
extent = [$$.parseDate(extent[0]), $$.parseDate(extent[1])];

46
src/chartinternal/text.js

@ -1,38 +1,38 @@
c3_chart_internal_fn.initText = function () {
var $$ = this;
$$.main.select('.' + CLASS.chart).append("g")
.attr("class", CLASS.chartTexts);
const $$ = this;
$$.main.select('.' + CLASS.chart).append('g')
.attr('class', CLASS.chartTexts);
$$.mainText = $$.d3.selectAll([]);
};
c3_chart_internal_fn.updateTargetsForText = function (targets) {
var $$ = this, mainTextUpdate, mainTextEnter,
let $$ = this, mainTextUpdate, mainTextEnter,
classChartText = $$.classChartText.bind($$),
classTexts = $$.classTexts.bind($$),
classFocus = $$.classFocus.bind($$);
mainTextUpdate = $$.main.select('.' + CLASS.chartTexts).selectAll('.' + CLASS.chartText)
.data(targets)
.attr('class', function (d) { return classChartText(d) + classFocus(d); });
.attr('class', (d) => { return classChartText(d) + classFocus(d); });
mainTextEnter = mainTextUpdate.enter().append('g')
.attr('class', classChartText)
.style('opacity', 0)
.style("pointer-events", "none");
.style('pointer-events', 'none');
mainTextEnter.append('g')
.attr('class', classTexts);
};
c3_chart_internal_fn.updateText = function (durationForExit) {
var $$ = this, config = $$.config,
let $$ = this, config = $$.config,
barOrLineData = $$.barOrLineData.bind($$),
classText = $$.classText.bind($$);
$$.mainText = $$.main.selectAll('.' + CLASS.texts).selectAll('.' + CLASS.text)
.data(barOrLineData);
$$.mainText.enter().append('text')
.attr("class", classText)
.attr('text-anchor', function (d) { return config.axis_rotated ? (d.value < 0 ? 'end' : 'start') : 'middle'; })
.style("stroke", 'none')
.style("fill", function (d) { return $$.color(d); })
.style("fill-opacity", 0);
.attr('class', classText)
.attr('text-anchor', (d) => { return config.axis_rotated ? (d.value < 0 ? 'end' : 'start') : 'middle'; })
.style('stroke', 'none')
.style('fill', (d) => { return $$.color(d); })
.style('fill-opacity', 0);
$$.mainText
.text(function (d, i, j) { return $$.dataLabelFormat(d.id)(d.value, d.id, i, j); });
.text((d, i, j) => { return $$.dataLabelFormat(d.id)(d.value, d.id, i, j); });
$$.mainText.exit()
.transition().duration(durationForExit)
.style('fill-opacity', 0)
@ -43,19 +43,19 @@ c3_chart_internal_fn.redrawText = function (xForText, yForText, forFlow, withTra
(withTransition ? this.mainText.transition() : this.mainText)
.attr('x', xForText)
.attr('y', yForText)
.style("fill", this.color)
.style("fill-opacity", forFlow ? 0 : this.opacityForText.bind(this))
.style('fill', this.color)
.style('fill-opacity', forFlow ? 0 : this.opacityForText.bind(this)),
];
};
c3_chart_internal_fn.getTextRect = function (text, cls, element) {
var dummy = this.d3.select('body').append('div').classed('c3', true),
svg = dummy.append("svg").style('visibility', 'hidden').style('position', 'fixed').style('top', 0).style('left', 0),
let dummy = this.d3.select('body').append('div').classed('c3', true),
svg = dummy.append('svg').style('visibility', 'hidden').style('position', 'fixed').style('top', 0).style('left', 0),
font = this.d3.select(element).style('font'),
rect;
svg.selectAll('.dummy')
.data([text])
.enter().append('text')
.classed(cls ? cls : "", true)
.classed(cls ? cls : '', true)
.style('font', font)
.text(text)
.each(function () { rect = this.getBoundingClientRect(); });
@ -63,18 +63,18 @@ c3_chart_internal_fn.getTextRect = function (text, cls, element) {
return rect;
};
c3_chart_internal_fn.generateXYForText = function (areaIndices, barIndices, lineIndices, forX) {
var $$ = this,
let $$ = this,
getAreaPoints = $$.generateGetAreaPoints(areaIndices, false),
getBarPoints = $$.generateGetBarPoints(barIndices, false),
getLinePoints = $$.generateGetLinePoints(lineIndices, false),
getter = forX ? $$.getXForText : $$.getYForText;
return function (d, i) {
var getPoints = $$.isAreaType(d) ? getAreaPoints : $$.isBarType(d) ? getBarPoints : getLinePoints;
const getPoints = $$.isAreaType(d) ? getAreaPoints : $$.isBarType(d) ? getBarPoints : getLinePoints;
return getter.call($$, getPoints(d, i), d, this);
};
};
c3_chart_internal_fn.getXForText = function (points, d, textElement) {
var $$ = this,
let $$ = this,
box = textElement.getBoundingClientRect(), xPos, padding;
if ($$.config.axis_rotated) {
padding = $$.isBarType(d) ? 4 : 6;
@ -93,14 +93,14 @@ c3_chart_internal_fn.getXForText = function (points, d, textElement) {
return xPos;
};
c3_chart_internal_fn.getYForText = function (points, d, textElement) {
var $$ = this,
let $$ = this,
box = textElement.getBoundingClientRect(),
yPos;
if ($$.config.axis_rotated) {
yPos = (points[0][0] + points[2][0] + box.height * 0.6) / 2;
} else {
yPos = points[2][1];
if (d.value < 0 || (d.value === 0 && !$$.hasPositiveValue)) {
if (d.value < 0 || (d.value === 0 && !$$.hasPositiveValue)) {
yPos += box.height;
if ($$.isBarType(d) && $$.isSafari()) {
yPos -= 3;

20
src/chartinternal/title.js

@ -1,17 +1,17 @@
c3_chart_internal_fn.initTitle = function () {
var $$ = this;
$$.title = $$.svg.append("text")
const $$ = this;
$$.title = $$.svg.append('text')
.text($$.config.title_text)
.attr("class", $$.CLASS.title);
.attr('class', $$.CLASS.title);
};
c3_chart_internal_fn.redrawTitle = function () {
var $$ = this;
const $$ = this;
$$.title
.attr("x", $$.xForTitle.bind($$))
.attr("y", $$.yForTitle.bind($$));
.attr('x', $$.xForTitle.bind($$))
.attr('y', $$.yForTitle.bind($$));
};
c3_chart_internal_fn.xForTitle = function () {
var $$ = this, config = $$.config, position = config.title_position || 'left', x;
let $$ = this, config = $$.config, position = config.title_position || 'left', x;
if (position.indexOf('right') >= 0) {
x = $$.currentWidth - $$.getTextRect($$.title.node().textContent, $$.CLASS.title, $$.title.node()).width - config.title_padding.right;
} else if (position.indexOf('center') >= 0) {
@ -22,10 +22,10 @@ c3_chart_internal_fn.xForTitle = function () {
return x;
};
c3_chart_internal_fn.yForTitle = function () {
var $$ = this;
const $$ = this;
return $$.config.title_padding.top + $$.getTextRect($$.title.node().textContent, $$.CLASS.title, $$.title.node()).height;
};
c3_chart_internal_fn.getTitlePadding = function() {
var $$ = this;
c3_chart_internal_fn.getTitlePadding = function () {
const $$ = this;
return $$.yForTitle() + $$.config.title_padding.bottom;
};

72
src/chartinternal/tooltip.js

@ -1,12 +1,12 @@
c3_chart_internal_fn.initTooltip = function () {
var $$ = this, config = $$.config, i;
let $$ = this, config = $$.config, i;
$$.tooltip = $$.selectChart
.style("position", "relative")
.append("div")
.style('position', 'relative')
.append('div')
.attr('class', CLASS.tooltipContainer)
.style("position", "absolute")
.style("pointer-events", "none")
.style("display", "none");
.style('position', 'absolute')
.style('pointer-events', 'none')
.style('display', 'none');
// Show tooltip if needed
if (config.tooltip_init_show) {
if ($$.isTimeSeries() && isString(config.tooltip_init_x)) {
@ -16,16 +16,16 @@ c3_chart_internal_fn.initTooltip = function () {
}
config.tooltip_init_x = i;
}
$$.tooltip.html(config.tooltip_contents.call($$, $$.data.targets.map(function (d) {
$$.tooltip.html(config.tooltip_contents.call($$, $$.data.targets.map((d) => {
return $$.addName(d.values[config.tooltip_init_x]);
}), $$.axis.getXAxisTickFormat(), $$.getYFormat($$.hasArcType()), $$.color));
$$.tooltip.style("top", config.tooltip_init_position.top)
.style("left", config.tooltip_init_position.left)
.style("display", "block");
$$.tooltip.style('top', config.tooltip_init_position.top)
.style('left', config.tooltip_init_position.left)
.style('display', 'block');
}
};
c3_chart_internal_fn.getTooltipContent = function (d, defaultTitleFormat, defaultValueFormat, color) {
var $$ = this, config = $$.config,
let $$ = this, config = $$.config,
titleFormat = config.tooltip_format_title || defaultTitleFormat,
nameFormat = config.tooltip_format_name || function (name) { return name; },
valueFormat = config.tooltip_format_value || defaultValueFormat,
@ -33,16 +33,16 @@ c3_chart_internal_fn.getTooltipContent = function (d, defaultTitleFormat, defaul
orderAsc = $$.isOrderAsc();
if (config.data_groups.length === 0) {
d.sort(function(a, b){
var v1 = a ? a.value : null, v2 = b ? b.value : null;
d.sort((a, b) => {
let v1 = a ? a.value : null, v2 = b ? b.value : null;
return orderAsc ? v1 - v2 : v2 - v1;
});
} else {
var ids = $$.orderTargets($$.data.targets).map(function (i) {
const ids = $$.orderTargets($$.data.targets).map((i) => {
return i.id;
});
d.sort(function(a, b) {
var v1 = a ? a.value : null, v2 = b ? b.value : null;
d.sort((a, b) => {
let v1 = a ? a.value : null, v2 = b ? b.value : null;
if (v1 > 0 && v2 > 0) {
v1 = a ? ids.indexOf(a.id) : null;
v2 = b ? ids.indexOf(b.id) : null;
@ -52,11 +52,11 @@ c3_chart_internal_fn.getTooltipContent = function (d, defaultTitleFormat, defaul
}
for (i = 0; i < d.length; i++) {
if (! (d[i] && (d[i].value || d[i].value === 0))) { continue; }
if (!(d[i] && (d[i].value || d[i].value === 0))) { continue; }
if (! text) {
if (!text) {
title = sanitise(titleFormat ? titleFormat(d[i].x) : d[i].x);
text = "<table class='" + $$.CLASS.tooltip + "'>" + (title || title === 0 ? "<tr><th colspan='2'>" + title + "</th></tr>" : "");
text = "<table class='" + $$.CLASS.tooltip + "'>" + (title || title === 0 ? "<tr><th colspan='2'>" + title + '</th></tr>' : '');
}
value = sanitise(valueFormat(d[i].value, d[i].ratio, d[i].id, d[i].index, d));
@ -66,18 +66,18 @@ c3_chart_internal_fn.getTooltipContent = function (d, defaultTitleFormat, defaul
name = sanitise(nameFormat(d[i].name, d[i].ratio, d[i].id, d[i].index));
bgcolor = $$.levelColor ? $$.levelColor(d[i].value) : color(d[i].id);
text += "<tr class='" + $$.CLASS.tooltipName + "-" + $$.getTargetSelectorSuffix(d[i].id) + "'>";
text += "<td class='name'><span style='background-color:" + bgcolor + "'></span>" + name + "</td>";
text += "<td class='value'>" + value + "</td>";
text += "</tr>";
text += "<tr class='" + $$.CLASS.tooltipName + '-' + $$.getTargetSelectorSuffix(d[i].id) + "'>";
text += "<td class='name'><span style='background-color:" + bgcolor + "'></span>" + name + '</td>';
text += "<td class='value'>" + value + '</td>';
text += '</tr>';
}
}
return text + "</table>";
return text + '</table>';
};
c3_chart_internal_fn.tooltipPosition = function (dataToShow, tWidth, tHeight, element) {
var $$ = this, config = $$.config, d3 = $$.d3;
var svgLeft, tooltipLeft, tooltipRight, tooltipTop, chartRight;
var forArc = $$.hasArcType(),
let $$ = this, config = $$.config, d3 = $$.d3;
let svgLeft, tooltipLeft, tooltipRight, tooltipTop, chartRight;
let forArc = $$.hasArcType(),
mouse = d3.mouse(element);
// Determin tooltip position
if (forArc) {
@ -108,18 +108,18 @@ c3_chart_internal_fn.tooltipPosition = function (dataToShow, tWidth, tHeight, el
if (tooltipTop < 0) {
tooltipTop = 0;
}
return {top: tooltipTop, left: tooltipLeft};
return { top: tooltipTop, left: tooltipLeft };
};
c3_chart_internal_fn.showTooltip = function (selectedData, element) {
var $$ = this, config = $$.config;
var tWidth, tHeight, position;
var forArc = $$.hasArcType(),
dataToShow = selectedData.filter(function (d) { return d && isValue(d.value); }),
let $$ = this, config = $$.config;
let tWidth, tHeight, position;
let forArc = $$.hasArcType(),
dataToShow = selectedData.filter((d) => { return d && isValue(d.value); }),
positionFunction = config.tooltip_position || c3_chart_internal_fn.tooltipPosition;
if (dataToShow.length === 0 || !config.tooltip_show) {
return;
}
$$.tooltip.html(config.tooltip_contents.call($$, selectedData, $$.axis.getXAxisTickFormat(), $$.getYFormat(forArc), $$.color)).style("display", "block");
$$.tooltip.html(config.tooltip_contents.call($$, selectedData, $$.axis.getXAxisTickFormat(), $$.getYFormat(forArc), $$.color)).style('display', 'block');
// Get tooltip dimensions
tWidth = $$.tooltip.property('offsetWidth');
@ -128,9 +128,9 @@ c3_chart_internal_fn.showTooltip = function (selectedData, element) {
position = positionFunction.call(this, dataToShow, tWidth, tHeight, element);
// Set tooltip
$$.tooltip
.style("top", position.top + "px")
.style("left", position.left + 'px');
.style('top', position.top + 'px')
.style('left', position.left + 'px');
};
c3_chart_internal_fn.hideTooltip = function () {
this.tooltip.style("display", "none");
this.tooltip.style('display', 'none');
};

6
src/chartinternal/transform.js

@ -1,7 +1,7 @@
c3_chart_internal_fn.transformTo = function(targetIds, type, optionsForRedraw) {
var $$ = this,
c3_chart_internal_fn.transformTo = function (targetIds, type, optionsForRedraw) {
let $$ = this,
withTransitionForAxis = !$$.hasArcType(),
options = optionsForRedraw || { withTransitionForAxis: withTransitionForAxis };
options = optionsForRedraw || { withTransitionForAxis };
options.withTransitionForTransform = false;
$$.transiting = false;
$$.setTargetType(targetIds, type);

30
src/chartinternal/type.js

@ -1,6 +1,6 @@
c3_chart_internal_fn.setTargetType = function (targetIds, type) {
var $$ = this, config = $$.config;
$$.mapToTargetIds(targetIds).forEach(function (id) {
let $$ = this, config = $$.config;
$$.mapToTargetIds(targetIds).forEach((id) => {
$$.withoutFadeIn[id] = (type === config.data_types[id]);
config.data_types[id] = type;
});
@ -9,17 +9,17 @@ c3_chart_internal_fn.setTargetType = function (targetIds, type) {
}
};
c3_chart_internal_fn.hasType = function (type, targets) {
var $$ = this, types = $$.config.data_types, has = false;
let $$ = this, types = $$.config.data_types, has = false;
targets = targets || $$.data.targets;
if (targets && targets.length) {
targets.forEach(function (target) {
var t = types[target.id];
targets.forEach((target) => {
const t = types[target.id];
if ((t && t.indexOf(type) >= 0) || (!t && type === 'line')) {
has = true;
}
});
} else if (Object.keys(types).length) {
Object.keys(types).forEach(function (id) {
Object.keys(types).forEach((id) => {
if (types[id] === type) { has = true; }
});
} else {
@ -31,39 +31,39 @@ c3_chart_internal_fn.hasArcType = function (targets) {
return this.hasType('pie', targets) || this.hasType('donut', targets) || this.hasType('gauge', targets);
};
c3_chart_internal_fn.isLineType = function (d) {
var config = this.config, id = isString(d) ? d : d.id;
let config = this.config, id = isString(d) ? d : d.id;
return !config.data_types[id] || ['line', 'spline', 'area', 'area-spline', 'step', 'area-step'].indexOf(config.data_types[id]) >= 0;
};
c3_chart_internal_fn.isStepType = function (d) {
var id = isString(d) ? d : d.id;
const id = isString(d) ? d : d.id;
return ['step', 'area-step'].indexOf(this.config.data_types[id]) >= 0;
};
c3_chart_internal_fn.isSplineType = function (d) {
var id = isString(d) ? d : d.id;
const id = isString(d) ? d : d.id;
return ['spline', 'area-spline'].indexOf(this.config.data_types[id]) >= 0;
};
c3_chart_internal_fn.isAreaType = function (d) {
var id = isString(d) ? d : d.id;
const id = isString(d) ? d : d.id;
return ['area', 'area-spline', 'area-step'].indexOf(this.config.data_types[id]) >= 0;
};
c3_chart_internal_fn.isBarType = function (d) {
var id = isString(d) ? d : d.id;
const id = isString(d) ? d : d.id;
return this.config.data_types[id] === 'bar';
};
c3_chart_internal_fn.isScatterType = function (d) {
var id = isString(d) ? d : d.id;
const id = isString(d) ? d : d.id;
return this.config.data_types[id] === 'scatter';
};
c3_chart_internal_fn.isPieType = function (d) {
var id = isString(d) ? d : d.id;
const id = isString(d) ? d : d.id;
return this.config.data_types[id] === 'pie';
};
c3_chart_internal_fn.isGaugeType = function (d) {
var id = isString(d) ? d : d.id;
const id = isString(d) ? d : d.id;
return this.config.data_types[id] === 'gauge';
};
c3_chart_internal_fn.isDonutType = function (d) {
var id = isString(d) ? d : d.id;
const id = isString(d) ? d : d.id;
return this.config.data_types[id] === 'donut';
};
c3_chart_internal_fn.isArcType = function (d) {

4
src/chartinternal/ua.js

@ -1,8 +1,8 @@
c3_chart_internal_fn.isSafari = function () {
var ua = window.navigator.userAgent;
const ua = window.navigator.userAgent;
return ua.indexOf('Safari') >= 0 && ua.indexOf('Chrome') < 0;
};
c3_chart_internal_fn.isChrome = function () {
var ua = window.navigator.userAgent;
const ua = window.navigator.userAgent;
return ua.indexOf('Chrome') >= 0;
};

14
src/chartinternal/util.js

@ -1,6 +1,6 @@
var isValue = c3_chart_internal_fn.isValue = function (v) {
return v || v === 0;
},
let isValue = c3_chart_internal_fn.isValue = function (v) {
return v || v === 0;
},
isFunction = c3_chart_internal_fn.isFunction = function (o) {
return typeof o === 'function';
},
@ -32,8 +32,8 @@ var isValue = c3_chart_internal_fn.isValue = function (v) {
return isDefined(options[key]) ? options[key] : defaultValue;
},
hasValue = c3_chart_internal_fn.hasValue = function (dict, value) {
var found = false;
Object.keys(dict).forEach(function (key) {
let found = false;
Object.keys(dict).forEach((key) => {
if (dict[key] === value) { found = true; }
});
return found;
@ -42,8 +42,8 @@ var isValue = c3_chart_internal_fn.isValue = function (v) {
return typeof str === 'string' ? str.replace(/</g, '&lt;').replace(/>/g, '&gt;') : str;
},
getPathBox = c3_chart_internal_fn.getPathBox = function (path) {
var box = path.getBoundingClientRect(),
let box = path.getBoundingClientRect(),
items = [path.pathSegList.getItem(0), path.pathSegList.getItem(1)],
minX = items[0].x, minY = Math.min(items[0].y, items[1].y);
return {x: minX, y: minY, width: box.width, height: box.height};
return { x: minX, y: minY, width: box.width, height: box.height };
};

26
src/chartinternal/zoom.js

@ -1,17 +1,17 @@
c3_chart_internal_fn.initZoom = function () {
var $$ = this, d3 = $$.d3, config = $$.config, startEvent;
let $$ = this, d3 = $$.d3, config = $$.config, startEvent;
$$.zoom = d3.behavior.zoom()
.on("zoomstart", function () {
.on('zoomstart', () => {
startEvent = d3.event.sourceEvent;
$$.zoom.altDomain = d3.event.sourceEvent.altKey ? $$.x.orgDomain() : null;
config.zoom_onzoomstart.call($$.api, d3.event.sourceEvent);
})
.on("zoom", function () {
.on('zoom', () => {
$$.redrawForZoom.call($$);
})
.on('zoomend', function () {
var event = d3.event.sourceEvent;
.on('zoomend', () => {
const event = d3.event.sourceEvent;
// if click, do nothing. otherwise, click interaction will be canceled.
if (event && startEvent.clientX === event.clientX && startEvent.clientY === event.clientY) {
return;
@ -24,29 +24,29 @@ c3_chart_internal_fn.initZoom = function () {
return config.axis_rotated ? this.y(scale) : this.x(scale);
};
$$.zoom.orgScaleExtent = function () {
var extent = config.zoom_extent ? config.zoom_extent : [1, 10];
const extent = config.zoom_extent ? config.zoom_extent : [1, 10];
return [extent[0], Math.max($$.getMaxDataCount() / extent[1], extent[1])];
};
$$.zoom.updateScaleExtent = function () {
var ratio = diffDomain($$.x.orgDomain()) / diffDomain($$.getZoomDomain()),
let ratio = diffDomain($$.x.orgDomain()) / diffDomain($$.getZoomDomain()),
extent = this.orgScaleExtent();
this.scaleExtent([extent[0] * ratio, extent[1] * ratio]);
return this;
};
};
c3_chart_internal_fn.getZoomDomain = function () {
var $$ = this, config = $$.config, d3 = $$.d3,
let $$ = this, config = $$.config, d3 = $$.d3,
min = d3.min([$$.orgXDomain[0], config.zoom_x_min]),
max = d3.max([$$.orgXDomain[1], config.zoom_x_max]);
return [min, max];
};
c3_chart_internal_fn.updateZoom = function () {
var $$ = this, z = $$.config.zoom_enabled ? $$.zoom : function () {};
$$.main.select('.' + CLASS.zoomRect).call(z).on("dblclick.zoom", null);
$$.main.selectAll('.' + CLASS.eventRect).call(z).on("dblclick.zoom", null);
let $$ = this, z = $$.config.zoom_enabled ? $$.zoom : function () {};
$$.main.select('.' + CLASS.zoomRect).call(z).on('dblclick.zoom', null);
$$.main.selectAll('.' + CLASS.eventRect).call(z).on('dblclick.zoom', null);
};
c3_chart_internal_fn.redrawForZoom = function () {
var $$ = this, d3 = $$.d3, config = $$.config, zoom = $$.zoom, x = $$.x;
let $$ = this, d3 = $$.d3, config = $$.config, zoom = $$.zoom, x = $$.x;
if (!config.zoom_enabled) {
return;
}
@ -66,7 +66,7 @@ c3_chart_internal_fn.redrawForZoom = function () {
withY: config.zoom_rescale,
withSubchart: false,
withEventRect: false,
withDimension: false
withDimension: false,
});
if (d3.event.sourceEvent.type === 'mousemove') {
$$.cancelClick = true;

1518
src/polyfill.js

File diff suppressed because it is too large Load Diff
Loading…
Cancel
Save