Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Transition delay #1113

Closed
wants to merge 2 commits into from
Closed

Transition delay #1113

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
03fadb0
adding ability to specify transitionDelay
mbustosorg Mar 4, 2016
4e20eb7
adding transitionDelay to the chart type API
mbustosorg Mar 5, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
119 changes: 75 additions & 44 deletions dc.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dc.js.map
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions dc.min.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dc.min.js.map
View file
Open in desktop

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@
},
"dependencies": {
"crossfilter": "1.x",
"d3": "3.x"
"d3": "3.x",
"glob": "^6.0.4"
},
"devDependencies": {
"emu": "~0.0.2",
Expand Down
8 changes: 4 additions & 4 deletions src/bar-chart.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ dc.barChart = function (parent, chartGroup) {
labels.attr('cursor', 'pointer');
}

dc.transition(labels, _chart.transitionDuration())
dc.transition(labels, _chart.transitionDuration(), _chart.transitionDelay())
.attr('x', function (d) {
var x = _chart.x()(d.x);
if (!_centerBar) {
Expand All @@ -120,7 +120,7 @@ dc.barChart = function (parent, chartGroup) {
return _chart.label()(d);
});

dc.transition(labels.exit(), _chart.transitionDuration())
dc.transition(labels.exit(), _chart.transitionDuration(), _chart.transitionDelay())
.attr('height', 0)
.remove();
}
Expand All @@ -144,7 +144,7 @@ dc.barChart = function (parent, chartGroup) {
bars.on('click', _chart.onClick);
}

dc.transition(bars, _chart.transitionDuration())
dc.transition(bars, _chart.transitionDuration(), _chart.transitionDelay())
.attr('x', function (d) {
var x = _chart.x()(d.x);
if (_centerBar) {
Expand All @@ -171,7 +171,7 @@ dc.barChart = function (parent, chartGroup) {
.attr('fill', dc.pluck('data', _chart.getColor))
.select('title').text(dc.pluck('data', _chart.title(d.name)));

dc.transition(bars.exit(), _chart.transitionDuration())
dc.transition(bars.exit(), _chart.transitionDuration(), _chart.transitionDelay())
.attr('height', 0)
.remove();
}
Expand Down
21 changes: 20 additions & 1 deletion src/base-mixin.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,8 @@ dc.baseMixin = function (_chart) {

var _transitionDuration = 750;

var _transitionDelay = 0;

var _filterPrinter = dc.printers.filters;

var _mandatoryAttributes = ['dimension', 'group'];
Expand Down Expand Up @@ -609,6 +611,23 @@ dc.baseMixin = function (_chart) {
return _chart;
};

/**
* Set or get the animation transition delay (in milliseconds) for this chart instance.
* @method transitionDelay
* @memberof dc.baseMixin
* @instance
* @param {Number} [delay=0]
* @return {Number}
* @return {dc.baseMixin}
*/
_chart.transitionDelay = function (delay) {
if (!arguments.length) {
return _transitionDelay;
}
_transitionDelay = delay;
return _chart;
};

_chart._mandatoryAttributes = function (_) {
if (!arguments.length) {
return _mandatoryAttributes;
Expand Down Expand Up @@ -656,7 +675,7 @@ dc.baseMixin = function (_chart) {
_chart._activateRenderlets = function (event) {
_listeners.pretransition(_chart);
if (_chart.transitionDuration() > 0 && _svg) {
_svg.transition().duration(_chart.transitionDuration())
_svg.transition().duration(_chart.transitionDuration()).delay(_chart.transitionDelay())
.each('end', function () {
_listeners.renderlet(_chart);
if (event) {
Expand Down
4 changes: 2 additions & 2 deletions src/box-plot.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ dc.boxPlot = function (parent, chartGroup) {
.height(_chart.effectiveHeight())
.value(_chart.valueAccessor())
.domain(_chart.y().domain())
.duration(_chart.transitionDuration())
.duration(_chart.transitionDuration(), _chart.transitionDelay())
.tickFormat(_tickFormat);

var boxesG = _chart.chartBodyG().selectAll('g.box').data(_chart.data(), function (d) { return d.key; });
Expand All @@ -169,7 +169,7 @@ dc.boxPlot = function (parent, chartGroup) {
}

function updateBoxes (boxesG) {
dc.transition(boxesG, _chart.transitionDuration())
dc.transition(boxesG, _chart.transitionDuration(), _chart.transitionDelay())
.attr('transform', boxTransform)
.call(_box)
.each(function () {
Expand Down
6 changes: 4 additions & 2 deletions src/bubble-chart.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@ dc.bubbleChart = function (parent, chartGroup) {

_chart.transitionDuration(750);

_chart.transitionDelay(0);

var bubbleLocator = function (d) {
return 'translate(' + (bubbleX(d)) + ',' + (bubbleY(d)) + ')';
};
Expand Down Expand Up @@ -114,7 +116,7 @@ dc.bubbleChart = function (parent, chartGroup) {
.on('click', _chart.onClick)
.attr('fill', _chart.getColor)
.attr('r', 0);
dc.transition(bubbleG, _chart.transitionDuration())
dc.transition(bubbleG, _chart.transitionDuration(), _chart.transitionDelay())
.selectAll('circle.' + _chart.BUBBLE_CLASS)
.attr('r', function (d) {
return _chart.bubbleR(d);
Expand All @@ -129,7 +131,7 @@ dc.bubbleChart = function (parent, chartGroup) {
}

function updateNodes (bubbleG) {
dc.transition(bubbleG, _chart.transitionDuration())
dc.transition(bubbleG, _chart.transitionDuration(), _chart.transitionDelay())
.attr('transform', bubbleLocator)
.selectAll('circle.' + _chart.BUBBLE_CLASS)
.attr('fill', _chart.getColor)
Expand Down
4 changes: 2 additions & 2 deletions src/bubble-mixin.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ dc.bubbleMixin = function (_chart) {
.attr('opacity', 0)
.attr('pointer-events', labelPointerEvent)
.text(labelFunction);
dc.transition(label, _chart.transitionDuration())
dc.transition(label, _chart.transitionDuration(), _chart.transitionDelay())
.attr('opacity', labelOpacity);
}
};
Expand All @@ -133,7 +133,7 @@ dc.bubbleMixin = function (_chart) {
var labels = bubbleGEnter.selectAll('text')
.attr('pointer-events', labelPointerEvent)
.text(labelFunction);
dc.transition(labels, _chart.transitionDuration())
dc.transition(labels, _chart.transitionDuration(), _chart.transitionDelay())
.attr('opacity', labelOpacity);
}
};
Expand Down
6 changes: 4 additions & 2 deletions src/bubble-overlay.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,8 @@ dc.bubbleOverlay = function (parent, chartGroup) {

_chart.transitionDuration(750);

_chart.transitionDelay(0);

_chart.radiusValueAccessor(function (d) {
return d.value;
});
Expand Down Expand Up @@ -108,7 +110,7 @@ dc.bubbleOverlay = function (parent, chartGroup) {
.on('click', _chart.onClick);
}

dc.transition(circle, _chart.transitionDuration())
dc.transition(circle, _chart.transitionDuration(), _chart.transitionDelay())
.attr('r', function (d) {
return _chart.bubbleR(d);
});
Expand Down Expand Up @@ -159,7 +161,7 @@ dc.bubbleOverlay = function (parent, chartGroup) {

var circle = nodeG.select('circle.' + BUBBLE_CLASS);

dc.transition(circle, _chart.transitionDuration())
dc.transition(circle, _chart.transitionDuration(), _chart.transitionDelay())
.attr('r', function (d) {
return _chart.bubbleR(d);
})
Expand Down
2 changes: 2 additions & 0 deletions src/composite-chart.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ dc.compositeChart = function (parent, chartGroup) {

_chart._mandatoryAttributes([]);
_chart.transitionDuration(500);
_chart.transitionDelay(0);

dc.override(_chart, '_generateG', function () {
var g = this.__generateG();
Expand All @@ -59,6 +60,7 @@ dc.compositeChart = function (parent, chartGroup) {
child.svg(_chart.svg());
child.xUnits(_chart.xUnits());
child.transitionDuration(_chart.transitionDuration());
child.transitionDelay(_chart.transitionDelay());
child.brushOn(_chart.brushOn());
child.renderTitle(_chart.renderTitle());
child.elasticX(_chart.elasticX());
Expand Down
19 changes: 10 additions & 9 deletions src/coordinate-grid-mixin.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -512,10 +512,10 @@ dc.coordinateGridMixin = function (_chart) {
axisXLab.text(_chart.xAxisLabel());
}

dc.transition(axisXG, _chart.transitionDuration())
dc.transition(axisXG, _chart.transitionDuration(), _chart.transitionDelay())
.attr('transform', 'translate(' + _chart.margins().left + ',' + _chart._xAxisY() + ')')
.call(_xAxis);
dc.transition(axisXLab, _chart.transitionDuration())
dc.transition(axisXLab, _chart.transitionDuration(), _chart.transitionDelay())
.attr('transform', 'translate(' + (_chart.margins().left + _chart.xAxisLength() / 2) + ',' +
(_chart.height() - _xAxisLabelPadding) + ')');
};
Expand Down Expand Up @@ -548,11 +548,11 @@ dc.coordinateGridMixin = function (_chart) {
})
.attr('y2', 0)
.attr('opacity', 0);
dc.transition(linesGEnter, _chart.transitionDuration())
dc.transition(linesGEnter, _chart.transitionDuration(), _chart.transitionDelay())
.attr('opacity', 1);

// update
dc.transition(lines, _chart.transitionDuration())
dc.transition(lines, _chart.transitionDuration(), _chart.transitionDelay())
.attr('x1', function (d) {
return _x(d);
})
Expand Down Expand Up @@ -633,7 +633,7 @@ dc.coordinateGridMixin = function (_chart) {
if (text && axisYLab.text() !== text) {
axisYLab.text(text);
}
dc.transition(axisYLab, _chart.transitionDuration())
dc.transition(axisYLab, _chart.transitionDuration(), _chart.transitionDelay())
.attr('transform', 'translate(' + labelXPosition + ',' + labelYPosition + '),rotate(' + rotation + ')');
};

Expand All @@ -645,7 +645,7 @@ dc.coordinateGridMixin = function (_chart) {
.attr('transform', 'translate(' + position + ',' + _chart.margins().top + ')');
}

dc.transition(axisYG, _chart.transitionDuration())
dc.transition(axisYG, _chart.transitionDuration(), _chart.transitionDelay())
.attr('transform', 'translate(' + position + ',' + _chart.margins().top + ')')
.call(axis);
};
Expand Down Expand Up @@ -685,11 +685,11 @@ dc.coordinateGridMixin = function (_chart) {
return scale(d);
})
.attr('opacity', 0);
dc.transition(linesGEnter, _chart.transitionDuration())
dc.transition(linesGEnter, _chart.transitionDuration(), _chart.transitionDelay())
.attr('opacity', 1);

// update
dc.transition(lines, _chart.transitionDuration())
dc.transition(lines, _chart.transitionDuration(), _chart.transitionDelay())
.attr('x1', 1)
.attr('y1', function (d) {
return scale(d);
Expand Down Expand Up @@ -1182,7 +1182,8 @@ dc.coordinateGridMixin = function (_chart) {
_zoom.x(_chart.x())
.scaleExtent(_zoomScale)
.size([_chart.width(), _chart.height()])
.duration(_chart.transitionDuration());
.duration(_chart.transitionDuration())
.delay(_chart.transitionDelay());
_chart.root().call(_zoom);
};

Expand Down
7 changes: 4 additions & 3 deletions src/core.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,14 +265,15 @@ dc.redrawAll = function (group) {
*/
dc.disableTransitions = false;

dc.transition = function (selections, duration, callback, name) {
dc.transition = function (selections, duration, delay, callback, name) {
if (duration <= 0 || duration === undefined || dc.disableTransitions) {
return selections;
}

var s = selections
.transition(name)
.duration(duration);
.transition(name)
.duration(duration)
.delay(delay);

if (typeof(callback) === 'function') {
callback(s);
Expand Down
2 changes: 1 addition & 1 deletion src/geo-choropleth-chart.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ dc.geoChoroplethChart = function (parent, chartGroup) {
return _chart.onClick(d, layerIndex);
});

dc.transition(paths, _chart.transitionDuration()).attr('fill', function (d, i) {
dc.transition(paths, _chart.transitionDuration(), _chart.transitionDelay()).attr('fill', function (d, i) {
return _chart.getColor(data[geoJson(layerIndex).keyAccessor(d)], i);
});
}
Expand Down
6 changes: 3 additions & 3 deletions src/heatmap.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,7 @@ dc.heatMap = function (parent, chartGroup) {
boxes.selectAll('title').text(_chart.title());
}

dc.transition(boxes.selectAll('rect'), _chart.transitionDuration())
dc.transition(boxes.selectAll('rect'), _chart.transitionDuration(), _chart.transitionDelay())
.attr('x', function (d, i) { return cols(_chart.keyAccessor()(d, i)); })
.attr('y', function (d, i) { return rows(_chart.valueAccessor()(d, i)); })
.attr('rx', _xBorderRadius)
Expand All @@ -257,7 +257,7 @@ dc.heatMap = function (parent, chartGroup) {
.attr('dy', 12)
.on('click', _chart.xAxisOnClick())
.text(_chart.colsLabel());
dc.transition(gColsText, _chart.transitionDuration())
dc.transition(gColsText, _chart.transitionDuration(), _chart.transitionDelay())
.text(_chart.colsLabel())
.attr('x', function (d) { return cols(d) + boxWidth / 2; })
.attr('y', _chart.effectiveHeight());
Expand All @@ -274,7 +274,7 @@ dc.heatMap = function (parent, chartGroup) {
.attr('dx', -2)
.on('click', _chart.yAxisOnClick())
.text(_chart.rowsLabel());
dc.transition(gRowsText, _chart.transitionDuration())
dc.transition(gRowsText, _chart.transitionDuration(), _chart.transitionDelay())
.text(_chart.rowsLabel())
.attr('y', function (d) { return rows(d) + boxHeight / 2; });
gRowsText.exit().remove();
Expand Down
5 changes: 3 additions & 2 deletions src/line-chart.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ dc.lineChart = function (parent, chartGroup) {
var _xyTipsOn = true;

_chart.transitionDuration(500);
_chart.transitionDelay(0);
_chart._rangeBandPadding(1);

_chart.plotData = function () {
Expand Down Expand Up @@ -206,7 +207,7 @@ dc.lineChart = function (parent, chartGroup) {
path.attr('stroke-dasharray', _dashStyle);
}

dc.transition(layers.select('path.line'), _chart.transitionDuration())
dc.transition(layers.select('path.line'), _chart.transitionDuration(), _chart.transitionDelay())
//.ease('linear')
.attr('stroke', colors)
.attr('d', function (d) {
Expand Down Expand Up @@ -239,7 +240,7 @@ dc.lineChart = function (parent, chartGroup) {
return safeD(area(d.values));
});

dc.transition(layers.select('path.area'), _chart.transitionDuration())
dc.transition(layers.select('path.area'), _chart.transitionDuration(), _chart.transitionDelay())
//.ease('linear')
.attr('fill', colors)
.attr('d', function (d) {
Expand Down
4 changes: 3 additions & 1 deletion src/number-display.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ dc.numberDisplay = function (parent, chartGroup) {
});

_chart.transitionDuration(250); // good default
_chart.transitionDelay(0);

_chart._doRender = function () {
var newValue = _chart.value(),
Expand All @@ -96,7 +97,8 @@ dc.numberDisplay = function (parent, chartGroup) {
}

span.transition()
.duration(_chart.transitionDuration())
.duration(_chart.transitionDuration())
.delay(_chart.transitionDelay())
.ease('quad-out-in')
.tween('text', function () {
var interp = d3.interpolateNumber(this.lastValue || 0, newValue);
Expand Down
Loading