From 9afc292cced0024680e494a61d09f39abc20dc40 Mon Sep 17 00:00:00 2001
From: Jake Zatecky <jake.zatecky@gmail.com>
Date: Thu, 21 Jul 2016 00:15:13 -0400
Subject: [PATCH] Bump version

---
 CHANGELOG.md          |   2 +-
 dist/d3-funnel.js     | 382 +++++++++++++++++++++++++++++-------------
 dist/d3-funnel.min.js |   4 +-
 package.json          |   2 +-
 4 files changed, 271 insertions(+), 119 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 49f815b..ba4caad 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,4 @@
-## v0.8.0 (TBA)
+## v0.8.0 (July 21, 2016)
 
 ### New Features
 
diff --git a/dist/d3-funnel.js b/dist/d3-funnel.js
index 4b9c6c9..12cd32c 100644
--- a/dist/d3-funnel.js
+++ b/dist/d3-funnel.js
@@ -117,10 +117,15 @@ return /******/ (function(modules) { // webpackBootstrap
 			this.selector = selector;
 
 			this.colorizer = new _Colorizer2.default();
-
 			this.labelFormatter = new _LabelFormatter2.default();
-
 			this.navigator = new _Navigator2.default();
+
+			this.id = null;
+			this.autoId = 0;
+
+			// Bind event handlers
+			this.onMouseOver = this.onMouseOver.bind(this);
+			this.onMouseOut = this.onMouseOut.bind(this);
 		}
 
 		/**
@@ -165,9 +170,9 @@ return /******/ (function(modules) { // webpackBootstrap
 
 				this.destroy();
 
-				this._initialize(data, options);
+				this.initialize(data, options);
 
-				this._draw();
+				this.drawOntoDom();
 			}
 
 			/**
@@ -180,11 +185,14 @@ return /******/ (function(modules) { // webpackBootstrap
 	   */
 
 		}, {
-			key: '_initialize',
-			value: function _initialize(data, options) {
-				this._validateData(data);
+			key: 'initialize',
+			value: function initialize(data, options) {
+				this.validateData(data);
 
-				var settings = this._getSettings(options);
+				var settings = this.getSettings(options);
+
+				this.id = this.generateUniqueId();
+				this.colorizer.setInstanceId(this.id);
 
 				// Set labels
 				this.label = settings.label;
@@ -214,16 +222,16 @@ return /******/ (function(modules) { // webpackBootstrap
 				// Support for events
 				this.onBlockClick = settings.events.click.block;
 
-				this._setBlocks(data);
+				this.setBlocks(data);
 
 				// Calculate the bottom left x position
 				this.bottomLeftX = (this.width - this.bottomWidth) / 2;
 
 				// Change in x direction
-				this.dx = this._getDx();
+				this.dx = this.getDx();
 
 				// Change in y direction
-				this.dy = this._getDy();
+				this.dy = this.getDy();
 			}
 
 			/**
@@ -233,8 +241,8 @@ return /******/ (function(modules) { // webpackBootstrap
 	   */
 
 		}, {
-			key: '_validateData',
-			value: function _validateData(data) {
+			key: 'validateData',
+			value: function validateData(data) {
 				if (Array.isArray(data) === false) {
 					throw new Error('Data must be an array.');
 				}
@@ -255,33 +263,95 @@ return /******/ (function(modules) { // webpackBootstrap
 			/**
 	   * @param {Object} options
 	   *
-	   * @returns {Object}
+	   * @return {Object}
 	   */
 
 		}, {
-			key: '_getSettings',
-			value: function _getSettings(options) {
+			key: 'getSettings',
+			value: function getSettings(options) {
+				var containerDimensions = this.getContainerDimensions();
+				var defaults = this.getDefaultSettings(containerDimensions);
+
 				// Prepare the configuration settings based on the defaults
-				// Set the default width and height based on the container
-				var settings = _Utils2.default.extend({}, D3Funnel.defaults);
-				settings.chart.width = parseInt(_d2.default.select(this.selector).style('width'), 10);
-				settings.chart.height = parseInt(_d2.default.select(this.selector).style('height'), 10);
+				var settings = _Utils2.default.extend({}, defaults);
 
-				// Overwrite default settings with user options
+				// Override default settings with user options
 				settings = _Utils2.default.extend(settings, options);
 
-				// In the case that the width or height is not valid, set
-				// the width/height as its default hard-coded value
-				if (settings.chart.width <= 0) {
-					settings.chart.width = D3Funnel.defaults.chart.width;
-				}
-				if (settings.chart.height <= 0) {
-					settings.chart.height = D3Funnel.defaults.chart.height;
-				}
+				// Account for any percentage-based dimensions
+				settings.chart = _extends({}, settings.chart, this.castDimensions(settings, containerDimensions));
+
+				return settings;
+			}
+
+			/**
+	   * Return default settings.
+	   *
+	   * @param {Object} containerDimensions
+	   *
+	   * @return {Object}
+	   */
+
+		}, {
+			key: 'getDefaultSettings',
+			value: function getDefaultSettings(containerDimensions) {
+				var settings = D3Funnel.defaults;
+
+				// Set the default width and height based on the container
+				settings.chart = _extends({}, settings.chart, containerDimensions);
 
 				return settings;
 			}
 
+			/**
+	   * Get the width/height dimensions of the container.
+	   *
+	   * @return {{width: Number, height: Number}}
+	   */
+
+		}, {
+			key: 'getContainerDimensions',
+			value: function getContainerDimensions() {
+				return {
+					width: parseFloat(_d2.default.select(this.selector).style('width')),
+					height: parseFloat(_d2.default.select(this.selector).style('height'))
+				};
+			}
+
+			/**
+	   * Cast dimensions into tangible or meaningful numbers.
+	   *
+	   * @param {Object} chart
+	   * @param {Object} containerDimensions
+	   *
+	   * @return {{width: Number, height: Number}}
+	   */
+
+		}, {
+			key: 'castDimensions',
+			value: function castDimensions(_ref, containerDimensions) {
+				var chart = _ref.chart;
+
+				var dimensions = {};
+
+				['width', 'height'].forEach(function (direction) {
+					var chartDimension = chart[direction];
+					var containerDimension = containerDimensions[direction];
+
+					if (/%$/.test(String(chartDimension))) {
+						// Convert string into a percentage of the container
+						dimensions[direction] = parseFloat(chartDimension) / 100 * containerDimension;
+					} else if (chartDimension <= 0) {
+						// If case of non-positive number, set to a usable number
+						dimensions[direction] = D3Funnel.defaults.chart[direction];
+					} else {
+						dimensions[direction] = chartDimension;
+					}
+				});
+
+				return dimensions;
+			}
+
 			/**
 	   * Register the raw data into a standard block format and pre-calculate
 	   * some values.
@@ -292,11 +362,11 @@ return /******/ (function(modules) { // webpackBootstrap
 	   */
 
 		}, {
-			key: '_setBlocks',
-			value: function _setBlocks(data) {
-				var totalCount = this._getTotalCount(data);
+			key: 'setBlocks',
+			value: function setBlocks(data) {
+				var totalCount = this.getTotalCount(data);
 
-				this.blocks = this._standardizeData(data, totalCount);
+				this.blocks = this.standardizeData(data, totalCount);
 			}
 
 			/**
@@ -308,8 +378,8 @@ return /******/ (function(modules) { // webpackBootstrap
 	   */
 
 		}, {
-			key: '_getTotalCount',
-			value: function _getTotalCount(data) {
+			key: 'getTotalCount',
+			value: function getTotalCount(data) {
 				var _this = this;
 
 				if (this.totalCount !== null) {
@@ -319,7 +389,7 @@ return /******/ (function(modules) { // webpackBootstrap
 				var total = 0;
 
 				data.forEach(function (block) {
-					total += _this._getRawBlockCount(block);
+					total += _this.getRawBlockCount(block);
 				});
 
 				return total;
@@ -335,14 +405,14 @@ return /******/ (function(modules) { // webpackBootstrap
 	   */
 
 		}, {
-			key: '_standardizeData',
-			value: function _standardizeData(data, totalCount) {
+			key: 'standardizeData',
+			value: function standardizeData(data, totalCount) {
 				var _this2 = this;
 
 				var standardized = [];
 
 				data.forEach(function (block, index) {
-					var count = _this2._getRawBlockCount(block);
+					var count = _this2.getRawBlockCount(block);
 					var ratio = count / totalCount || 0;
 					var label = block[0];
 
@@ -372,8 +442,8 @@ return /******/ (function(modules) { // webpackBootstrap
 	   */
 
 		}, {
-			key: '_getRawBlockCount',
-			value: function _getRawBlockCount(block) {
+			key: 'getRawBlockCount',
+			value: function getRawBlockCount(block) {
 				return Array.isArray(block[1]) ? block[1][0] : block[1];
 			}
 
@@ -382,8 +452,8 @@ return /******/ (function(modules) { // webpackBootstrap
 	   */
 
 		}, {
-			key: '_getDx',
-			value: function _getDx() {
+			key: 'getDx',
+			value: function getDx() {
 				// Will be sharper if there is a pinch
 				if (this.bottomPinch > 0) {
 					return this.bottomLeftX / (this.blocks.length - this.bottomPinch);
@@ -397,8 +467,8 @@ return /******/ (function(modules) { // webpackBootstrap
 	   */
 
 		}, {
-			key: '_getDy',
-			value: function _getDy() {
+			key: 'getDy',
+			value: function getDy() {
 				// Curved chart needs reserved pixels to account for curvature
 				if (this.isCurved) {
 					return (this.height - this.curveHeight) / this.blocks.length;
@@ -414,27 +484,52 @@ return /******/ (function(modules) { // webpackBootstrap
 	   */
 
 		}, {
-			key: '_draw',
-			value: function _draw() {
-				// Add the SVG
-				this.svg = _d2.default.select(this.selector).append('svg').attr('width', this.width).attr('height', this.height);
+			key: 'drawOntoDom',
+			value: function drawOntoDom() {
+				this.svg = _d2.default.select(this.selector) // Add the SVG
+				.append('svg').attr('id', this.id).attr('width', this.width).attr('height', this.height);
 
-				var newPaths = this._makePaths();
+				var newPaths = this.makePaths();
 				this.blockPaths = newPaths[0];
 				this.overlayPaths = newPaths[1];
 
 				// Define color gradients
 				if (this.fillType === 'gradient') {
-					this._defineColorGradients(this.svg);
+					this.defineColorGradients(this.svg);
 				}
 
 				// Add top oval if curved
 				if (this.isCurved) {
-					this._drawTopOval(this.svg, this.blockPaths);
+					this.drawTopOval(this.svg, this.blockPaths);
 				}
 
 				// Add each block
-				this._drawBlock(0);
+				this.drawBlock(0);
+			}
+
+			/**
+	   * Return a unique ID for the funnel on the document.
+	   *
+	   * @return {string}
+	   */
+
+		}, {
+			key: 'generateUniqueId',
+			value: function generateUniqueId() {
+				var findingId = true;
+				var id = '';
+
+				while (findingId) {
+					id = 'd3-funnel-chart-' + this.autoId;
+
+					if (document.getElementById(id) === null) {
+						findingId = false;
+					}
+
+					this.autoId++;
+				}
+
+				return id;
 			}
 
 			/**
@@ -445,8 +540,8 @@ return /******/ (function(modules) { // webpackBootstrap
 	   */
 
 		}, {
-			key: '_makePaths',
-			value: function _makePaths() {
+			key: 'makePaths',
+			value: function makePaths() {
 				var _this3 = this;
 
 				var paths = [];
@@ -647,8 +742,8 @@ return /******/ (function(modules) { // webpackBootstrap
 	   */
 
 		}, {
-			key: '_defineColorGradients',
-			value: function _defineColorGradients(svg) {
+			key: 'defineColorGradients',
+			value: function defineColorGradients(svg) {
 				var _this4 = this;
 
 				var defs = svg.append('defs');
@@ -659,9 +754,7 @@ return /******/ (function(modules) { // webpackBootstrap
 					var shade = _this4.colorizer.shade(color, -0.2);
 
 					// Create linear gradient
-					var gradient = defs.append('linearGradient').attr({
-						id: 'gradient-' + index
-					});
+					var gradient = defs.append('linearGradient').attr({ id: _this4.colorizer.getGradientId(index) });
 
 					// Define the gradient stops
 					var stops = [[0, shade], [40, color], [60, color], [100, shade]];
@@ -686,8 +779,8 @@ return /******/ (function(modules) { // webpackBootstrap
 	   */
 
 		}, {
-			key: '_drawTopOval',
-			value: function _drawTopOval(svg, blockPaths) {
+			key: 'drawTopOval',
+			value: function drawTopOval(svg, blockPaths) {
 				var leftX = 0;
 				var rightX = this.width;
 				var centerX = this.width / 2;
@@ -716,8 +809,8 @@ return /******/ (function(modules) { // webpackBootstrap
 	   */
 
 		}, {
-			key: '_drawBlock',
-			value: function _drawBlock(index) {
+			key: 'drawBlock',
+			value: function drawBlock(index) {
 				var _this5 = this;
 
 				if (index === this.blocks.length) {
@@ -728,17 +821,17 @@ return /******/ (function(modules) { // webpackBootstrap
 				var group = this.svg.append('g');
 
 				// Fetch path element
-				var path = this._getBlockPath(group, index);
+				var path = this.getBlockPath(group, index);
 
 				// Attach data to the element
-				this._attachData(path, this.blocks[index]);
+				this.attachData(path, this.blocks[index]);
 
 				var overlayPath = null;
 				var pathColor = this.blocks[index].fill.actual;
 
 				if (this.addValueOverlay) {
-					overlayPath = this._getOverlayPath(group, index);
-					this._attachData(overlayPath, this.blocks[index]);
+					overlayPath = this.getOverlayPath(group, index);
+					this.attachData(overlayPath, this.blocks[index]);
 
 					// Add data attribute to distinguish between paths
 					path.node().setAttribute('pathType', 'background');
@@ -750,12 +843,12 @@ return /******/ (function(modules) { // webpackBootstrap
 
 				// Add animation components
 				if (this.animation !== 0) {
-					path.transition().duration(this.animation).ease('linear').attr('fill', pathColor).attr('d', this._getPathDefinition(index)).each('end', function () {
-						_this5._drawBlock(index + 1);
+					path.transition().duration(this.animation).ease('linear').attr('fill', pathColor).attr('d', this.getPathDefinition(index)).each('end', function () {
+						_this5.drawBlock(index + 1);
 					});
 				} else {
-					path.attr('fill', pathColor).attr('d', this._getPathDefinition(index));
-					this._drawBlock(index + 1);
+					path.attr('fill', pathColor).attr('d', this.getPathDefinition(index));
+					this.drawBlock(index + 1);
 				}
 
 				// Add path overlay
@@ -763,9 +856,9 @@ return /******/ (function(modules) { // webpackBootstrap
 					path.attr('stroke', this.blocks[index].fill.raw);
 
 					if (this.animation !== 0) {
-						overlayPath.transition().duration(this.animation).ease('linear').attr('fill', this.blocks[index].fill.actual).attr('d', this._getOverlayPathDefinition(index));
+						overlayPath.transition().duration(this.animation).ease('linear').attr('fill', this.blocks[index].fill.actual).attr('d', this.getOverlayPathDefinition(index));
 					} else {
-						overlayPath.attr('fill', this.blocks[index].fill.actual).attr('d', this._getOverlayPathDefinition(index));
+						overlayPath.attr('fill', this.blocks[index].fill.actual).attr('d', this.getOverlayPathDefinition(index));
 					}
 				}
 
@@ -776,7 +869,7 @@ return /******/ (function(modules) { // webpackBootstrap
 							return;
 						}
 
-						target.on('mouseover', _this5._onMouseOver.bind(_this5)).on('mouseout', _this5._onMouseOut.bind(_this5));
+						target.on('mouseover', _this5.onMouseOver).on('mouseout', _this5.onMouseOut);
 					});
 				}
 
@@ -791,7 +884,7 @@ return /******/ (function(modules) { // webpackBootstrap
 					});
 				}
 
-				this._addBlockLabel(group, index);
+				this.addBlockLabel(group, index);
 			}
 
 			/**
@@ -802,12 +895,12 @@ return /******/ (function(modules) { // webpackBootstrap
 	   */
 
 		}, {
-			key: '_getBlockPath',
-			value: function _getBlockPath(group, index) {
+			key: 'getBlockPath',
+			value: function getBlockPath(group, index) {
 				var path = group.append('path');
 
 				if (this.animation !== 0) {
-					this._addBeforeTransition(path, index);
+					this.addBeforeTransition(path, index, false);
 				}
 
 				return path;
@@ -821,12 +914,12 @@ return /******/ (function(modules) { // webpackBootstrap
 	   */
 
 		}, {
-			key: '_getOverlayPath',
-			value: function _getOverlayPath(group, index) {
+			key: 'getOverlayPath',
+			value: function getOverlayPath(group, index) {
 				var path = group.append('path');
 
 				if (this.animation !== 0) {
-					this._addBeforeTransition(path, index, true);
+					this.addBeforeTransition(path, index, true);
 				}
 
 				return path;
@@ -843,8 +936,8 @@ return /******/ (function(modules) { // webpackBootstrap
 	   */
 
 		}, {
-			key: '_addBeforeTransition',
-			value: function _addBeforeTransition(path, index, isOverlay) {
+			key: 'addBeforeTransition',
+			value: function addBeforeTransition(path, index, isOverlay) {
 				var paths = isOverlay ? this.overlayPaths[index] : this.blockPaths[index];
 
 				var beforePath = '';
@@ -880,8 +973,8 @@ return /******/ (function(modules) { // webpackBootstrap
 	   */
 
 		}, {
-			key: '_attachData',
-			value: function _attachData(element, data) {
+			key: 'attachData',
+			value: function attachData(element, data) {
 				var nodeData = _extends({}, data, {
 					node: element.node()
 				});
@@ -896,8 +989,8 @@ return /******/ (function(modules) { // webpackBootstrap
 	   */
 
 		}, {
-			key: '_getPathDefinition',
-			value: function _getPathDefinition(index) {
+			key: 'getPathDefinition',
+			value: function getPathDefinition(index) {
 				var commands = [];
 
 				this.blockPaths[index].forEach(function (command) {
@@ -914,8 +1007,8 @@ return /******/ (function(modules) { // webpackBootstrap
 	   */
 
 		}, {
-			key: '_getOverlayPathDefinition',
-			value: function _getOverlayPathDefinition(index) {
+			key: 'getOverlayPathDefinition',
+			value: function getOverlayPathDefinition(index) {
 				var commands = [];
 
 				this.overlayPaths[index].forEach(function (command) {
@@ -932,8 +1025,8 @@ return /******/ (function(modules) { // webpackBootstrap
 	   */
 
 		}, {
-			key: '_onMouseOver',
-			value: function _onMouseOver(data) {
+			key: 'onMouseOver',
+			value: function onMouseOver(data) {
 				var children = _d2.default.event.target.parentElement.childNodes;
 
 				for (var i = 0; i < children.length; i++) {
@@ -959,8 +1052,8 @@ return /******/ (function(modules) { // webpackBootstrap
 	   */
 
 		}, {
-			key: '_onMouseOut',
-			value: function _onMouseOut(data) {
+			key: 'onMouseOut',
+			value: function onMouseOut(data) {
 				var children = _d2.default.event.target.parentElement.childNodes;
 
 				for (var i = 0; i < children.length; i++) {
@@ -988,28 +1081,60 @@ return /******/ (function(modules) { // webpackBootstrap
 	   */
 
 		}, {
-			key: '_addBlockLabel',
-			value: function _addBlockLabel(group, index) {
+			key: 'addBlockLabel',
+			value: function addBlockLabel(group, index) {
 				var paths = this.blockPaths[index];
 
-				var text = this.blocks[index].label.formatted;
+				var formattedLabel = this.blocks[index].label.formatted;
 				var fill = this.blocks[index].label.color;
 
 				var x = this.width / 2; // Center the text
-				var y = this._getTextY(paths);
+				var y = this.getTextY(paths);
 
-				var label = group.append('text').text(text).attr({
+				var text = group.append('text').attr({
 					x: x,
 					y: y,
 					fill: fill,
+					'font-size': this.label.fontSize,
 					'text-anchor': 'middle',
 					'dominant-baseline': 'middle',
 					'pointer-events': 'none'
-				}).attr('font-size', this.label.fontSize);
+				});
 
+				// Add font-family, if exists
 				if (this.label.fontFamily !== null) {
-					label.attr('font-family', this.label.fontFamily);
+					text.attr('font-family', this.label.fontFamily);
 				}
+
+				this.addLabelLines(text, formattedLabel, x);
+			}
+
+			/**
+	   * Add <tspan> elements for each line of the formatted label.
+	   *
+	   * @param {Object} text
+	   * @param {String} formattedLabel
+	   * @param {Number} x
+	   *
+	   * @return {void}
+	   */
+
+		}, {
+			key: 'addLabelLines',
+			value: function addLabelLines(text, formattedLabel, x) {
+				var lines = formattedLabel.split('\n');
+				var lineHeight = 20;
+
+				// dy will signify the change from the initial height y
+				// We need to initially start the first line at the very top, factoring
+				// in the other number of lines
+				var initialDy = -1 * lineHeight * (lines.length - 1) / 2;
+
+				lines.forEach(function (line, i) {
+					var dy = i === 0 ? initialDy : lineHeight;
+
+					text.append('tspan').attr({ x: x, dy: dy }).text(line);
+				});
 			}
 
 			/**
@@ -1022,8 +1147,8 @@ return /******/ (function(modules) { // webpackBootstrap
 	   */
 
 		}, {
-			key: '_getTextY',
-			value: function _getTextY(paths) {
+			key: 'getTextY',
+			value: function getTextY(paths) {
 				if (this.isCurved) {
 					return (paths[2][1] + paths[3][1]) / 2 + this.curveHeight / this.blocks.length;
 				}
@@ -1096,24 +1221,39 @@ return /******/ (function(modules) { // webpackBootstrap
 	function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 
 	var Colorizer = function () {
+		/**
+	  * @return {void}
+	  */
+
 		function Colorizer() {
 			_classCallCheck(this, Colorizer);
 
 			this.hexExpression = /^#([0-9a-f]{3}|[0-9a-f]{6})$/i;
-
+			this.instanceId = null;
 			this.labelFill = null;
-
 			this.scale = null;
 		}
 
 		/**
-	  * @param {string} fill
+	  * @param {string} instanceId
 	  *
 	  * @return {void}
 	  */
 
 
 		_createClass(Colorizer, [{
+			key: 'setInstanceId',
+			value: function setInstanceId(instanceId) {
+				this.instanceId = instanceId;
+			}
+
+			/**
+	   * @param {string} fill
+	   *
+	   * @return {void}
+	   */
+
+		}, {
 			key: 'setLabelFill',
 			value: function setLabelFill(fill) {
 				this.labelFill = fill;
@@ -1137,18 +1277,19 @@ return /******/ (function(modules) { // webpackBootstrap
 	   * @param {Array}  block
 	   * @param {Number} index
 	   * @param {string} type
+	   * @param {string} instanceId
 	   *
 	   * @return {Object}
 	   */
 
 		}, {
 			key: 'getBlockFill',
-			value: function getBlockFill(block, index, type) {
+			value: function getBlockFill(block, index, type, instanceId) {
 				var raw = this.getBlockRawFill(block, index);
 
 				return {
 					raw: raw,
-					actual: this.getBlockActualFill(raw, index, type)
+					actual: this.getBlockActualFill(raw, index, type, instanceId)
 				};
 			}
 
@@ -1195,7 +1336,21 @@ return /******/ (function(modules) { // webpackBootstrap
 					return raw;
 				}
 
-				return 'url(#gradient-' + index + ')';
+				return 'url(#' + this.getGradientId(index) + ')';
+			}
+
+			/**
+	   * Return the gradient ID for the given index.
+	   *
+	   * @param {Number} index
+	   *
+	   * @return {string}
+	   */
+
+		}, {
+			key: 'getGradientId',
+			value: function getGradientId(index) {
+				return this.instanceId + '-gradient-' + index;
 			}
 
 			/**
@@ -1283,7 +1438,6 @@ return /******/ (function(modules) { // webpackBootstrap
 	function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 
 	var LabelFormatter = function () {
-
 		/**
 	  * Initial the formatter.
 	  *
@@ -1407,13 +1561,12 @@ return /******/ (function(modules) { // webpackBootstrap
 		_createClass(Navigator, [{
 			key: 'plot',
 
-
 			/**
 	   * Given a list of path commands, returns the compiled description.
 	   *
 	   * @param {Array} commands
 	   *
-	   * @returns {string}
+	   * @return {string}
 	   */
 			value: function plot(commands) {
 				var path = '';
@@ -1456,7 +1609,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	   * @param {Number} nextHeight
 	   * @param {Number} curveHeight
 	   *
-	   * @returns {Object}
+	   * @return {Object}
 	   */
 
 		}, {
@@ -1509,7 +1662,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	   * @param {Object} p12
 	   * @param {Number} ratio
 	   *
-	   * @returns {Array}
+	   * @return {Array}
 	   */
 
 		}, {
@@ -1698,7 +1851,6 @@ return /******/ (function(modules) { // webpackBootstrap
 		_createClass(Utils, null, [{
 			key: 'isExtendableObject',
 
-
 			/**
 	   * Determine whether the given parameter is an extendable object.
 	   *
diff --git a/dist/d3-funnel.min.js b/dist/d3-funnel.min.js
index 1c04e47..23fb1a0 100644
--- a/dist/d3-funnel.min.js
+++ b/dist/d3-funnel.min.js
@@ -1,2 +1,2 @@
-/*! d3-funnel - v0.7.7 | 2016 */
-!function(t,e){"object"==typeof exports&&"object"==typeof module?module.exports=e(require("d3")):"function"==typeof define&&define.amd?define(["d3"],e):"object"==typeof exports?exports.D3Funnel=e(require("d3")):t.D3Funnel=e(t.d3)}(this,function(t){return function(t){function e(a){if(i[a])return i[a].exports;var n=i[a]={exports:{},id:a,loaded:!1};return t[a].call(n.exports,n,n.exports,e),n.loaded=!0,n.exports}var i={};return e.m=t,e.c=i,e.p="",e(0)}([function(t,e,i){"use strict";t.exports=i(1)["default"]},function(t,e,i){"use strict";function a(t){return t&&t.__esModule?t:{"default":t}}function n(t){if(Array.isArray(t)){for(var e=0,i=Array(t.length);e<t.length;e++)i[e]=t[e];return i}return Array.from(t)}function r(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}Object.defineProperty(e,"__esModule",{value:!0});var o=Object.assign||function(t){for(var e=1;e<arguments.length;e++){var i=arguments[e];for(var a in i)Object.prototype.hasOwnProperty.call(i,a)&&(t[a]=i[a])}return t},l=function(){function t(t,e){for(var i=0;i<e.length;i++){var a=e[i];a.enumerable=a.enumerable||!1,a.configurable=!0,"value"in a&&(a.writable=!0),Object.defineProperty(t,a.key,a)}}return function(e,i,a){return i&&t(e.prototype,i),a&&t(e,a),e}}(),h=i(2),s=a(h),u=i(3),c=a(u),f=i(4),d=a(f),v=i(5),y=a(v),g=i(6),p=a(g),b=function(){function t(e){r(this,t),this.selector=e,this.colorizer=new c["default"],this.labelFormatter=new d["default"],this.navigator=new y["default"]}return l(t,[{key:"destroy",value:function(){var t=s["default"].select(this.selector);t.selectAll("svg").remove(),t.selectAll("*").remove(),t.text("")}},{key:"draw",value:function(t){var e=arguments.length<=1||void 0===arguments[1]?{}:arguments[1];this.destroy(),this._initialize(t,e),this._draw()}},{key:"_initialize",value:function(t,e){this._validateData(t);var i=this._getSettings(e);this.label=i.label,this.labelFormatter.setFormat(this.label.format),this.colorizer.setLabelFill(i.label.fill),this.colorizer.setScale(i.block.fill.scale),this.width=i.chart.width,this.height=i.chart.height,this.bottomWidth=i.chart.width*i.chart.bottomWidth,this.bottomPinch=i.chart.bottomPinch,this.isInverted=i.chart.inverted,this.isCurved=i.chart.curve.enabled,this.addValueOverlay=i.block.barOverlay,this.curveHeight=i.chart.curve.height,this.fillType=i.block.fill.type,this.hoverEffects=i.block.highlight,this.dynamicHeight=i.block.dynamicHeight,this.dynamicSlope=i.block.dynamicSlope,this.minHeight=i.block.minHeight,this.animation=i.chart.animate,this.totalCount=i.chart.totalCount,this.onBlockClick=i.events.click.block,this._setBlocks(t),this.bottomLeftX=(this.width-this.bottomWidth)/2,this.dx=this._getDx(),this.dy=this._getDy()}},{key:"_validateData",value:function(t){if(Array.isArray(t)===!1)throw new Error("Data must be an array.");if(0===t.length)throw new Error("Data array must contain at least one element.");if(Array.isArray(t[0])===!1)throw new Error("Data array elements must be arrays.");if(t[0].length<2)throw new Error("Data array elements must contain a label and value.")}},{key:"_getSettings",value:function(e){var i=p["default"].extend({},t.defaults);return i.chart.width=parseInt(s["default"].select(this.selector).style("width"),10),i.chart.height=parseInt(s["default"].select(this.selector).style("height"),10),i=p["default"].extend(i,e),i.chart.width<=0&&(i.chart.width=t.defaults.chart.width),i.chart.height<=0&&(i.chart.height=t.defaults.chart.height),i}},{key:"_setBlocks",value:function(t){var e=this._getTotalCount(t);this.blocks=this._standardizeData(t,e)}},{key:"_getTotalCount",value:function(t){var e=this;if(null!==this.totalCount)return this.totalCount||0;var i=0;return t.forEach(function(t){i+=e._getRawBlockCount(t)}),i}},{key:"_standardizeData",value:function(t,e){var i=this,a=[];return t.forEach(function(t,n){var r=i._getRawBlockCount(t),o=r/e||0,l=t[0];a.push({index:n,ratio:o,value:r,height:i.height*o,fill:i.colorizer.getBlockFill(t,n,i.fillType),label:{raw:l,formatted:i.labelFormatter.format(l,t[1]),color:i.colorizer.getLabelFill(t)}})}),a}},{key:"_getRawBlockCount",value:function(t){return Array.isArray(t[1])?t[1][0]:t[1]}},{key:"_getDx",value:function(){return this.bottomPinch>0?this.bottomLeftX/(this.blocks.length-this.bottomPinch):this.bottomLeftX/this.blocks.length}},{key:"_getDy",value:function(){return this.isCurved?(this.height-this.curveHeight)/this.blocks.length:this.height/this.blocks.length}},{key:"_draw",value:function(){this.svg=s["default"].select(this.selector).append("svg").attr("width",this.width).attr("height",this.height);var t=this._makePaths();this.blockPaths=t[0],this.overlayPaths=t[1],"gradient"===this.fillType&&this._defineColorGradients(this.svg),this.isCurved&&this._drawTopOval(this.svg,this.blockPaths),this._drawBlock(0)}},{key:"_makePaths",value:function(){var t=this,e=[],i=[],a=this.dx,r=this.dy,o=0,l=this.width,h=0;this.isInverted&&(o=this.bottomLeftX,l=this.width-this.bottomLeftX);var s=0,u=0,c=0,f=this.width/2;this.isCurved&&(h=10);var d=this.height;0!==this.minHeight&&(d=this.height-this.minHeight*this.blocks.length);var v=this.height;this.blocks.forEach(function(e,i){t.bottomPinch>0&&(t.isInverted?i<t.bottomPinch&&(v-=e.height):i>=t.blocks.length-t.bottomPinch&&(v-=e.height))});var y=2*v/(this.width-this.bottomWidth);return this.blocks.forEach(function(v,g){if(t.dynamicHeight&&(r=d*v.ratio,0!==t.minHeight&&(r+=t.minHeight),t.isCurved&&(r-=t.curveHeight/t.blocks.length),s=(h+r)/y,t.isInverted&&(s=(h+r-t.height)/(-1*y)),0===t.bottomWidth&&g===t.blocks.length-1&&(s=t.width/2,t.isInverted&&(s=0)),t.bottomWidth===t.width&&(s=o),a=s-o,t.isInverted&&(a=o-s)),t.dynamicSlope){var p=t.blocks[g+1]?t.blocks[g+1].value:v.value,b=1-p/v.value;a=b*(f-o)}t.bottomPinch>0&&(t.isInverted?(t.dynamicHeight||(a=t.dx),a=g<t.bottomPinch?0:a):g>=t.blocks.length-t.bottomPinch&&(a=0)),s=o+a,u=l-a,c=h+r,t.isInverted&&(s=o-a,u=l+a);var k={centerX:f,prevLeftX:o,prevRightX:l,prevHeight:h,nextLeftX:s,nextRightX:u,nextHeight:c,curveHeight:t.curveHeight,ratio:v.ratio};t.isCurved?(e=[].concat(n(e),[t.navigator.makeCurvedPaths(k)]),t.addValueOverlay&&(i=[].concat(n(i),[t.navigator.makeCurvedPaths(k,!0)]))):(e=[].concat(n(e),[t.navigator.makeStraightPaths(k)]),t.addValueOverlay&&(i=[].concat(n(i),[t.navigator.makeStraightPaths(k,!0)]))),o=s,l=u,h=c}),[e,i]}},{key:"_defineColorGradients",value:function(t){var e=this,i=t.append("defs");this.blocks.forEach(function(t,a){var n=t.fill.raw,r=e.colorizer.shade(n,-.2),o=i.append("linearGradient").attr({id:"gradient-"+a}),l=[[0,r],[40,n],[60,n],[100,r]];l.forEach(function(t){o.append("stop").attr({offset:t[0]+"%",style:"stop-color: "+t[1]})})})}},{key:"_drawTopOval",value:function(t,e){var i=0,a=this.width,n=this.width/2;this.isInverted&&(i=this.bottomLeftX,a=this.width-this.bottomLeftX);var r=e[0],o=r[1][1]+this.curveHeight-10,l=this.navigator.plot([["M",i,r[0][1]],["Q",n,o],[" ",a,r[2][1]],["M",a,10],["Q",n,0],[" ",i,10]]);t.append("path").attr("fill",this.colorizer.shade(this.blocks[0].fill.raw,-.4)).attr("d",l)}},{key:"_drawBlock",value:function(t){var e=this;if(t!==this.blocks.length){var i=this.svg.append("g"),a=this._getBlockPath(i,t);this._attachData(a,this.blocks[t]);var n=null,r=this.blocks[t].fill.actual;this.addValueOverlay&&(n=this._getOverlayPath(i,t),this._attachData(n,this.blocks[t]),a.node().setAttribute("pathType","background"),n.node().setAttribute("pathType","foreground"),r=this.colorizer.shade(this.blocks[t].fill.raw,.3)),0!==this.animation?a.transition().duration(this.animation).ease("linear").attr("fill",r).attr("d",this._getPathDefinition(t)).each("end",function(){e._drawBlock(t+1)}):(a.attr("fill",r).attr("d",this._getPathDefinition(t)),this._drawBlock(t+1)),this.addValueOverlay&&(a.attr("stroke",this.blocks[t].fill.raw),0!==this.animation?n.transition().duration(this.animation).ease("linear").attr("fill",this.blocks[t].fill.actual).attr("d",this._getOverlayPathDefinition(t)):n.attr("fill",this.blocks[t].fill.actual).attr("d",this._getOverlayPathDefinition(t))),this.hoverEffects&&[a,n].forEach(function(t){t&&t.on("mouseover",e._onMouseOver.bind(e)).on("mouseout",e._onMouseOut.bind(e))}),null!==this.onBlockClick&&[a,n].forEach(function(t){t&&t.on("click",e.onBlockClick)}),this._addBlockLabel(i,t)}}},{key:"_getBlockPath",value:function(t,e){var i=t.append("path");return 0!==this.animation&&this._addBeforeTransition(i,e),i}},{key:"_getOverlayPath",value:function(t,e){var i=t.append("path");return 0!==this.animation&&this._addBeforeTransition(i,e,!0),i}},{key:"_addBeforeTransition",value:function(t,e,i){var a=i?this.overlayPaths[e]:this.blockPaths[e],n="",r="";n=this.isCurved?this.navigator.plot([["M",a[0][0],a[0][1]],["Q",a[1][0],a[1][1]],[" ",a[2][0],a[2][1]],["L",a[2][0],a[2][1]],["M",a[2][0],a[2][1]],["Q",a[1][0],a[1][1]],[" ",a[0][0],a[0][1]]]):this.navigator.plot([["M",a[0][0],a[0][1]],["L",a[1][0],a[1][1]],["L",a[1][0],a[1][1]],["L",a[0][0],a[0][1]]]),r="solid"===this.fillType&&e>0?this.blocks[e-1].fill.actual:this.blocks[e].fill.actual,t.attr("d",n).attr("fill",r)}},{key:"_attachData",value:function(t,e){var i=o({},e,{node:t.node()});t.data([i])}},{key:"_getPathDefinition",value:function(t){var e=[];return this.blockPaths[t].forEach(function(t){e.push([t[2],t[0],t[1]])}),this.navigator.plot(e)}},{key:"_getOverlayPathDefinition",value:function(t){var e=[];return this.overlayPaths[t].forEach(function(t){e.push([t[2],t[0],t[1]])}),this.navigator.plot(e)}},{key:"_onMouseOver",value:function(t){for(var e=s["default"].event.target.parentElement.childNodes,i=0;i<e.length;i++){var a=e[i];if("path"===a.nodeName.toLowerCase()){var n=a.getAttribute("pathType")||"";"foreground"===n?s["default"].select(a).attr("fill",this.colorizer.shade(t.fill.raw,-.5)):s["default"].select(a).attr("fill",this.colorizer.shade(t.fill.raw,-.2))}}}},{key:"_onMouseOut",value:function(t){for(var e=s["default"].event.target.parentElement.childNodes,i=0;i<e.length;i++){var a=e[i];if("path"===a.nodeName.toLowerCase()){var n=a.getAttribute("pathType")||"";if("background"===n){var r=this.colorizer.shade(t.fill.raw,.3);s["default"].select(a).attr("fill",r)}else s["default"].select(a).attr("fill",t.fill.actual)}}}},{key:"_addBlockLabel",value:function(t,e){var i=this.blockPaths[e],a=this.blocks[e].label.formatted,n=this.blocks[e].label.color,r=this.width/2,o=this._getTextY(i),l=t.append("text").text(a).attr({x:r,y:o,fill:n,"text-anchor":"middle","dominant-baseline":"middle","pointer-events":"none"}).attr("font-size",this.label.fontSize);null!==this.label.fontFamily&&l.attr("font-family",this.label.fontFamily)}},{key:"_getTextY",value:function(t){return this.isCurved?(t[2][1]+t[3][1])/2+this.curveHeight/this.blocks.length:(t[1][1]+t[2][1])/2}}]),t}();b.defaults={chart:{width:350,height:400,bottomWidth:1/3,bottomPinch:0,inverted:!1,horizontal:!1,animate:0,curve:{enabled:!1,height:20},totalCount:null},block:{dynamicHeight:!1,dynamicSlope:!1,barOverlay:!1,fill:{scale:s["default"].scale.category10().domain(s["default"].range(0,10)),type:"solid"},minHeight:0,highlight:!1},label:{fontFamily:null,fontSize:"14px",fill:"#fff",format:"{l}: {f}"},events:{click:{block:null}}},e["default"]=b},function(e,i){e.exports=t},function(t,e){"use strict";function i(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}Object.defineProperty(e,"__esModule",{value:!0});var a=function(){function t(t,e){for(var i=0;i<e.length;i++){var a=e[i];a.enumerable=a.enumerable||!1,a.configurable=!0,"value"in a&&(a.writable=!0),Object.defineProperty(t,a.key,a)}}return function(e,i,a){return i&&t(e.prototype,i),a&&t(e,a),e}}(),n=function(){function t(){i(this,t),this.hexExpression=/^#([0-9a-f]{3}|[0-9a-f]{6})$/i,this.labelFill=null,this.scale=null}return a(t,[{key:"setLabelFill",value:function(t){this.labelFill=t}},{key:"setScale",value:function(t){this.scale=t}},{key:"getBlockFill",value:function(t,e,i){var a=this.getBlockRawFill(t,e);return{raw:a,actual:this.getBlockActualFill(a,e,i)}}},{key:"getBlockRawFill",value:function(t,e){return t.length>2&&this.hexExpression.test(t[2])?t[2]:Array.isArray(this.scale)?this.scale[e]:this.scale(e)}},{key:"getBlockActualFill",value:function(t,e,i){return"solid"===i?t:"url(#gradient-"+e+")"}},{key:"getLabelFill",value:function(t){return t.length>3&&this.hexExpression.test(t[3])?t[3]:this.labelFill}},{key:"shade",value:function(t,e){var i=t.slice(1);3===i.length&&(i=this.expandHex(i));var a=parseInt(i,16),n=0>e?0:255,r=0>e?-1*e:e,o=a>>16,l=a>>8&255,h=255&a,s=16777216+65536*(Math.round((n-o)*r)+o)+256*(Math.round((n-l)*r)+l)+(Math.round((n-h)*r)+h);return"#"+s.toString(16).slice(1)}},{key:"expandHex",value:function(t){return t[0]+t[0]+t[1]+t[1]+t[2]+t[2]}}]),t}();e["default"]=n},function(t,e){"use strict";function i(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}Object.defineProperty(e,"__esModule",{value:!0});var a=function(){function t(t,e){for(var i=0;i<e.length;i++){var a=e[i];a.enumerable=a.enumerable||!1,a.configurable=!0,"value"in a&&(a.writable=!0),Object.defineProperty(t,a.key,a)}}return function(e,i,a){return i&&t(e.prototype,i),a&&t(e,a),e}}(),n=function(){function t(){i(this,t),this.expression=null}return a(t,[{key:"setFormat",value:function(t){"function"==typeof t?this.formatter=t:(this.expression=t,this.formatter=this.stringFormatter)}},{key:"format",value:function(t,e){return Array.isArray(e)?this.formatter(t,e[0],e[1]):this.formatter(t,e,null)}},{key:"stringFormatter",value:function(t,e){var i=arguments.length<=2||void 0===arguments[2]?null:arguments[2],a=i;return null===i&&(a=this.getDefaultFormattedValue(e)),this.expression.split("{l}").join(t).split("{v}").join(e).split("{f}").join(a)}},{key:"getDefaultFormattedValue",value:function(t){return t.toLocaleString()}}]),t}();e["default"]=n},function(t,e){"use strict";function i(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}Object.defineProperty(e,"__esModule",{value:!0});var a=function(){function t(t,e){for(var i=0;i<e.length;i++){var a=e[i];a.enumerable=a.enumerable||!1,a.configurable=!0,"value"in a&&(a.writable=!0),Object.defineProperty(t,a.key,a)}}return function(e,i,a){return i&&t(e.prototype,i),a&&t(e,a),e}}(),n=function(){function t(){i(this,t)}return a(t,[{key:"plot",value:function(t){var e="";return t.forEach(function(t){e+=""+t[0]+t[1]+","+t[2]+" "}),e.replace(/ +/g," ").trim()}},{key:"makeCurvedPaths",value:function(t){var e=arguments.length<=1||void 0===arguments[1]?!1:arguments[1],i=this.makeBezierPoints(t);return e?this.makeBezierPath(i,t.ratio):this.makeBezierPath(i)}},{key:"makeBezierPoints",value:function(t){var e=t.centerX,i=t.prevLeftX,a=t.prevRightX,n=t.prevHeight,r=t.nextLeftX,o=t.nextRightX,l=t.nextHeight,h=t.curveHeight;return{p00:{x:i,y:n},p01:{x:e,y:n+h-10},p02:{x:a,y:n},p10:{x:r,y:l},p11:{x:e,y:l+h},p12:{x:o,y:l}}}},{key:"makeBezierPath",value:function(t){var e=t.p00,i=t.p01,a=t.p02,n=t.p10,r=t.p11,o=t.p12,l=arguments.length<=1||void 0===arguments[1]?1:arguments[1],h=this.getQuadraticBezierCurve(e,i,a,l),s=this.getQuadraticBezierCurve(n,r,o,l);return[[h.p0.x,h.p0.y,"M"],[h.p1.x,h.p1.y,"Q"],[h.p2.x,h.p2.y,""],[s.p2.x,s.p2.y,"L"],[s.p2.x,s.p2.y,"M"],[s.p1.x,s.p1.y,"Q"],[s.p0.x,s.p0.y,""],[h.p0.x,h.p0.y,"L"]]}},{key:"getQuadraticBezierCurve",value:function(t,e,i){var a=arguments.length<=3||void 0===arguments[3]?1:arguments[3];return{p0:t,p1:{x:this.getLinearInterpolation(t,e,a,"x"),y:this.getLinearInterpolation(t,e,a,"y")},p2:{x:this.getQuadraticInterpolation(t,e,i,a,"x"),y:this.getQuadraticInterpolation(t,e,i,a,"y")}}}},{key:"getLinearInterpolation",value:function(t,e,i,a){return t[a]+i*(e[a]-t[a])}},{key:"getQuadraticInterpolation",value:function(t,e,i,a,n){return Math.pow(1-a,2)*t[n]+2*(1-a)*a*e[n]+Math.pow(a,2)*i[n]}},{key:"makeStraightPaths",value:function(t){var e=t.prevLeftX,i=t.prevRightX,a=t.prevHeight,n=t.nextLeftX,r=t.nextRightX,o=t.nextHeight,l=t.ratio,h=arguments.length<=1||void 0===arguments[1]?!1:arguments[1];if(h){var s=i-e,u=r-n,c=s*(l||0)+e,f=u*(l||0)+n;return c=Math.min(c,s),f=Math.min(f,u),[[e,a,"M"],[c,a,"L"],[f,o,"L"],[n,o,"L"],[e,a,"L"]]}return[[e,a,"M"],[i,a,"L"],[r,o,"L"],[n,o,"L"],[e,a,"L"]]}}]),t}();e["default"]=n},function(t,e){"use strict";function i(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}Object.defineProperty(e,"__esModule",{value:!0});var a="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol?"symbol":typeof t},n=function(){function t(t,e){for(var i=0;i<e.length;i++){var a=e[i];a.enumerable=a.enumerable||!1,a.configurable=!0,"value"in a&&(a.writable=!0),Object.defineProperty(t,a.key,a)}}return function(e,i,a){return i&&t(e.prototype,i),a&&t(e,a),e}}(),r=function(){function t(){i(this,t)}return n(t,null,[{key:"isExtendableObject",value:function(t){return"object"===("undefined"==typeof t?"undefined":a(t))&&null!==t&&!Array.isArray(t)}},{key:"extend",value:function(e,i){var a={};return Object.keys(e).length>0&&(a=t.extend({},e)),Object.keys(i).forEach(function(n){t.isExtendableObject(i[n])?t.isExtendableObject(e[n])?a[n]=t.extend(e[n],i[n]):a[n]=t.extend({},i[n]):a[n]=i[n]}),a}}]),t}();e["default"]=r}])});
\ No newline at end of file
+/*! d3-funnel - v0.8.0 | 2016 */
+!function(t,e){"object"==typeof exports&&"object"==typeof module?module.exports=e(require("d3")):"function"==typeof define&&define.amd?define(["d3"],e):"object"==typeof exports?exports.D3Funnel=e(require("d3")):t.D3Funnel=e(t.d3)}(this,function(t){return function(t){function e(a){if(i[a])return i[a].exports;var n=i[a]={exports:{},id:a,loaded:!1};return t[a].call(n.exports,n,n.exports,e),n.loaded=!0,n.exports}var i={};return e.m=t,e.c=i,e.p="",e(0)}([function(t,e,i){"use strict";t.exports=i(1)["default"]},function(t,e,i){"use strict";function a(t){return t&&t.__esModule?t:{"default":t}}function n(t){if(Array.isArray(t)){for(var e=0,i=Array(t.length);e<t.length;e++)i[e]=t[e];return i}return Array.from(t)}function r(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}Object.defineProperty(e,"__esModule",{value:!0});var o=Object.assign||function(t){for(var e=1;e<arguments.length;e++){var i=arguments[e];for(var a in i)Object.prototype.hasOwnProperty.call(i,a)&&(t[a]=i[a])}return t},l=function(){function t(t,e){for(var i=0;i<e.length;i++){var a=e[i];a.enumerable=a.enumerable||!1,a.configurable=!0,"value"in a&&(a.writable=!0),Object.defineProperty(t,a.key,a)}}return function(e,i,a){return i&&t(e.prototype,i),a&&t(e,a),e}}(),s=i(2),h=a(s),u=i(3),c=a(u),f=i(4),d=a(f),v=i(5),y=a(v),g=i(6),p=a(g),b=function(){function t(e){r(this,t),this.selector=e,this.colorizer=new c["default"],this.labelFormatter=new d["default"],this.navigator=new y["default"],this.id=null,this.autoId=0,this.onMouseOver=this.onMouseOver.bind(this),this.onMouseOut=this.onMouseOut.bind(this)}return l(t,[{key:"destroy",value:function(){var t=h["default"].select(this.selector);t.selectAll("svg").remove(),t.selectAll("*").remove(),t.text("")}},{key:"draw",value:function(t){var e=arguments.length<=1||void 0===arguments[1]?{}:arguments[1];this.destroy(),this.initialize(t,e),this.drawOntoDom()}},{key:"initialize",value:function(t,e){this.validateData(t);var i=this.getSettings(e);this.id=this.generateUniqueId(),this.colorizer.setInstanceId(this.id),this.label=i.label,this.labelFormatter.setFormat(this.label.format),this.colorizer.setLabelFill(i.label.fill),this.colorizer.setScale(i.block.fill.scale),this.width=i.chart.width,this.height=i.chart.height,this.bottomWidth=i.chart.width*i.chart.bottomWidth,this.bottomPinch=i.chart.bottomPinch,this.isInverted=i.chart.inverted,this.isCurved=i.chart.curve.enabled,this.addValueOverlay=i.block.barOverlay,this.curveHeight=i.chart.curve.height,this.fillType=i.block.fill.type,this.hoverEffects=i.block.highlight,this.dynamicHeight=i.block.dynamicHeight,this.dynamicSlope=i.block.dynamicSlope,this.minHeight=i.block.minHeight,this.animation=i.chart.animate,this.totalCount=i.chart.totalCount,this.onBlockClick=i.events.click.block,this.setBlocks(t),this.bottomLeftX=(this.width-this.bottomWidth)/2,this.dx=this.getDx(),this.dy=this.getDy()}},{key:"validateData",value:function(t){if(Array.isArray(t)===!1)throw new Error("Data must be an array.");if(0===t.length)throw new Error("Data array must contain at least one element.");if(Array.isArray(t[0])===!1)throw new Error("Data array elements must be arrays.");if(t[0].length<2)throw new Error("Data array elements must contain a label and value.")}},{key:"getSettings",value:function(t){var e=this.getContainerDimensions(),i=this.getDefaultSettings(e),a=p["default"].extend({},i);return a=p["default"].extend(a,t),a.chart=o({},a.chart,this.castDimensions(a,e)),a}},{key:"getDefaultSettings",value:function(e){var i=t.defaults;return i.chart=o({},i.chart,e),i}},{key:"getContainerDimensions",value:function(){return{width:parseFloat(h["default"].select(this.selector).style("width")),height:parseFloat(h["default"].select(this.selector).style("height"))}}},{key:"castDimensions",value:function(e,i){var a=e.chart,n={};return["width","height"].forEach(function(e){var r=a[e],o=i[e];/%$/.test(String(r))?n[e]=parseFloat(r)/100*o:0>=r?n[e]=t.defaults.chart[e]:n[e]=r}),n}},{key:"setBlocks",value:function(t){var e=this.getTotalCount(t);this.blocks=this.standardizeData(t,e)}},{key:"getTotalCount",value:function(t){var e=this;if(null!==this.totalCount)return this.totalCount||0;var i=0;return t.forEach(function(t){i+=e.getRawBlockCount(t)}),i}},{key:"standardizeData",value:function(t,e){var i=this,a=[];return t.forEach(function(t,n){var r=i.getRawBlockCount(t),o=r/e||0,l=t[0];a.push({index:n,ratio:o,value:r,height:i.height*o,fill:i.colorizer.getBlockFill(t,n,i.fillType),label:{raw:l,formatted:i.labelFormatter.format(l,t[1]),color:i.colorizer.getLabelFill(t)}})}),a}},{key:"getRawBlockCount",value:function(t){return Array.isArray(t[1])?t[1][0]:t[1]}},{key:"getDx",value:function(){return this.bottomPinch>0?this.bottomLeftX/(this.blocks.length-this.bottomPinch):this.bottomLeftX/this.blocks.length}},{key:"getDy",value:function(){return this.isCurved?(this.height-this.curveHeight)/this.blocks.length:this.height/this.blocks.length}},{key:"drawOntoDom",value:function(){this.svg=h["default"].select(this.selector).append("svg").attr("id",this.id).attr("width",this.width).attr("height",this.height);var t=this.makePaths();this.blockPaths=t[0],this.overlayPaths=t[1],"gradient"===this.fillType&&this.defineColorGradients(this.svg),this.isCurved&&this.drawTopOval(this.svg,this.blockPaths),this.drawBlock(0)}},{key:"generateUniqueId",value:function(){for(var t=!0,e="";t;)e="d3-funnel-chart-"+this.autoId,null===document.getElementById(e)&&(t=!1),this.autoId++;return e}},{key:"makePaths",value:function(){var t=this,e=[],i=[],a=this.dx,r=this.dy,o=0,l=this.width,s=0;this.isInverted&&(o=this.bottomLeftX,l=this.width-this.bottomLeftX);var h=0,u=0,c=0,f=this.width/2;this.isCurved&&(s=10);var d=this.height;0!==this.minHeight&&(d=this.height-this.minHeight*this.blocks.length);var v=this.height;this.blocks.forEach(function(e,i){t.bottomPinch>0&&(t.isInverted?i<t.bottomPinch&&(v-=e.height):i>=t.blocks.length-t.bottomPinch&&(v-=e.height))});var y=2*v/(this.width-this.bottomWidth);return this.blocks.forEach(function(v,g){if(t.dynamicHeight&&(r=d*v.ratio,0!==t.minHeight&&(r+=t.minHeight),t.isCurved&&(r-=t.curveHeight/t.blocks.length),h=(s+r)/y,t.isInverted&&(h=(s+r-t.height)/(-1*y)),0===t.bottomWidth&&g===t.blocks.length-1&&(h=t.width/2,t.isInverted&&(h=0)),t.bottomWidth===t.width&&(h=o),a=h-o,t.isInverted&&(a=o-h)),t.dynamicSlope){var p=t.blocks[g+1]?t.blocks[g+1].value:v.value,b=1-p/v.value;a=b*(f-o)}t.bottomPinch>0&&(t.isInverted?(t.dynamicHeight||(a=t.dx),a=g<t.bottomPinch?0:a):g>=t.blocks.length-t.bottomPinch&&(a=0)),h=o+a,u=l-a,c=s+r,t.isInverted&&(h=o-a,u=l+a);var k={centerX:f,prevLeftX:o,prevRightX:l,prevHeight:s,nextLeftX:h,nextRightX:u,nextHeight:c,curveHeight:t.curveHeight,ratio:v.ratio};t.isCurved?(e=[].concat(n(e),[t.navigator.makeCurvedPaths(k)]),t.addValueOverlay&&(i=[].concat(n(i),[t.navigator.makeCurvedPaths(k,!0)]))):(e=[].concat(n(e),[t.navigator.makeStraightPaths(k)]),t.addValueOverlay&&(i=[].concat(n(i),[t.navigator.makeStraightPaths(k,!0)]))),o=h,l=u,s=c}),[e,i]}},{key:"defineColorGradients",value:function(t){var e=this,i=t.append("defs");this.blocks.forEach(function(t,a){var n=t.fill.raw,r=e.colorizer.shade(n,-.2),o=i.append("linearGradient").attr({id:e.colorizer.getGradientId(a)}),l=[[0,r],[40,n],[60,n],[100,r]];l.forEach(function(t){o.append("stop").attr({offset:t[0]+"%",style:"stop-color: "+t[1]})})})}},{key:"drawTopOval",value:function(t,e){var i=0,a=this.width,n=this.width/2;this.isInverted&&(i=this.bottomLeftX,a=this.width-this.bottomLeftX);var r=e[0],o=r[1][1]+this.curveHeight-10,l=this.navigator.plot([["M",i,r[0][1]],["Q",n,o],[" ",a,r[2][1]],["M",a,10],["Q",n,0],[" ",i,10]]);t.append("path").attr("fill",this.colorizer.shade(this.blocks[0].fill.raw,-.4)).attr("d",l)}},{key:"drawBlock",value:function(t){var e=this;if(t!==this.blocks.length){var i=this.svg.append("g"),a=this.getBlockPath(i,t);this.attachData(a,this.blocks[t]);var n=null,r=this.blocks[t].fill.actual;this.addValueOverlay&&(n=this.getOverlayPath(i,t),this.attachData(n,this.blocks[t]),a.node().setAttribute("pathType","background"),n.node().setAttribute("pathType","foreground"),r=this.colorizer.shade(this.blocks[t].fill.raw,.3)),0!==this.animation?a.transition().duration(this.animation).ease("linear").attr("fill",r).attr("d",this.getPathDefinition(t)).each("end",function(){e.drawBlock(t+1)}):(a.attr("fill",r).attr("d",this.getPathDefinition(t)),this.drawBlock(t+1)),this.addValueOverlay&&(a.attr("stroke",this.blocks[t].fill.raw),0!==this.animation?n.transition().duration(this.animation).ease("linear").attr("fill",this.blocks[t].fill.actual).attr("d",this.getOverlayPathDefinition(t)):n.attr("fill",this.blocks[t].fill.actual).attr("d",this.getOverlayPathDefinition(t))),this.hoverEffects&&[a,n].forEach(function(t){t&&t.on("mouseover",e.onMouseOver).on("mouseout",e.onMouseOut)}),null!==this.onBlockClick&&[a,n].forEach(function(t){t&&t.on("click",e.onBlockClick)}),this.addBlockLabel(i,t)}}},{key:"getBlockPath",value:function(t,e){var i=t.append("path");return 0!==this.animation&&this.addBeforeTransition(i,e,!1),i}},{key:"getOverlayPath",value:function(t,e){var i=t.append("path");return 0!==this.animation&&this.addBeforeTransition(i,e,!0),i}},{key:"addBeforeTransition",value:function(t,e,i){var a=i?this.overlayPaths[e]:this.blockPaths[e],n="",r="";n=this.isCurved?this.navigator.plot([["M",a[0][0],a[0][1]],["Q",a[1][0],a[1][1]],[" ",a[2][0],a[2][1]],["L",a[2][0],a[2][1]],["M",a[2][0],a[2][1]],["Q",a[1][0],a[1][1]],[" ",a[0][0],a[0][1]]]):this.navigator.plot([["M",a[0][0],a[0][1]],["L",a[1][0],a[1][1]],["L",a[1][0],a[1][1]],["L",a[0][0],a[0][1]]]),r="solid"===this.fillType&&e>0?this.blocks[e-1].fill.actual:this.blocks[e].fill.actual,t.attr("d",n).attr("fill",r)}},{key:"attachData",value:function(t,e){var i=o({},e,{node:t.node()});t.data([i])}},{key:"getPathDefinition",value:function(t){var e=[];return this.blockPaths[t].forEach(function(t){e.push([t[2],t[0],t[1]])}),this.navigator.plot(e)}},{key:"getOverlayPathDefinition",value:function(t){var e=[];return this.overlayPaths[t].forEach(function(t){e.push([t[2],t[0],t[1]])}),this.navigator.plot(e)}},{key:"onMouseOver",value:function(t){for(var e=h["default"].event.target.parentElement.childNodes,i=0;i<e.length;i++){var a=e[i];if("path"===a.nodeName.toLowerCase()){var n=a.getAttribute("pathType")||"";"foreground"===n?h["default"].select(a).attr("fill",this.colorizer.shade(t.fill.raw,-.5)):h["default"].select(a).attr("fill",this.colorizer.shade(t.fill.raw,-.2))}}}},{key:"onMouseOut",value:function(t){for(var e=h["default"].event.target.parentElement.childNodes,i=0;i<e.length;i++){var a=e[i];if("path"===a.nodeName.toLowerCase()){var n=a.getAttribute("pathType")||"";if("background"===n){var r=this.colorizer.shade(t.fill.raw,.3);h["default"].select(a).attr("fill",r)}else h["default"].select(a).attr("fill",t.fill.actual)}}}},{key:"addBlockLabel",value:function(t,e){var i=this.blockPaths[e],a=this.blocks[e].label.formatted,n=this.blocks[e].label.color,r=this.width/2,o=this.getTextY(i),l=t.append("text").attr({x:r,y:o,fill:n,"font-size":this.label.fontSize,"text-anchor":"middle","dominant-baseline":"middle","pointer-events":"none"});null!==this.label.fontFamily&&l.attr("font-family",this.label.fontFamily),this.addLabelLines(l,a,r)}},{key:"addLabelLines",value:function(t,e,i){var a=e.split("\n"),n=20,r=-1*n*(a.length-1)/2;a.forEach(function(e,a){var o=0===a?r:n;t.append("tspan").attr({x:i,dy:o}).text(e)})}},{key:"getTextY",value:function(t){return this.isCurved?(t[2][1]+t[3][1])/2+this.curveHeight/this.blocks.length:(t[1][1]+t[2][1])/2}}]),t}();b.defaults={chart:{width:350,height:400,bottomWidth:1/3,bottomPinch:0,inverted:!1,horizontal:!1,animate:0,curve:{enabled:!1,height:20},totalCount:null},block:{dynamicHeight:!1,dynamicSlope:!1,barOverlay:!1,fill:{scale:h["default"].scale.category10().domain(h["default"].range(0,10)),type:"solid"},minHeight:0,highlight:!1},label:{fontFamily:null,fontSize:"14px",fill:"#fff",format:"{l}: {f}"},events:{click:{block:null}}},e["default"]=b},function(e,i){e.exports=t},function(t,e){"use strict";function i(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}Object.defineProperty(e,"__esModule",{value:!0});var a=function(){function t(t,e){for(var i=0;i<e.length;i++){var a=e[i];a.enumerable=a.enumerable||!1,a.configurable=!0,"value"in a&&(a.writable=!0),Object.defineProperty(t,a.key,a)}}return function(e,i,a){return i&&t(e.prototype,i),a&&t(e,a),e}}(),n=function(){function t(){i(this,t),this.hexExpression=/^#([0-9a-f]{3}|[0-9a-f]{6})$/i,this.instanceId=null,this.labelFill=null,this.scale=null}return a(t,[{key:"setInstanceId",value:function(t){this.instanceId=t}},{key:"setLabelFill",value:function(t){this.labelFill=t}},{key:"setScale",value:function(t){this.scale=t}},{key:"getBlockFill",value:function(t,e,i,a){var n=this.getBlockRawFill(t,e);return{raw:n,actual:this.getBlockActualFill(n,e,i,a)}}},{key:"getBlockRawFill",value:function(t,e){return t.length>2&&this.hexExpression.test(t[2])?t[2]:Array.isArray(this.scale)?this.scale[e]:this.scale(e)}},{key:"getBlockActualFill",value:function(t,e,i){return"solid"===i?t:"url(#"+this.getGradientId(e)+")"}},{key:"getGradientId",value:function(t){return this.instanceId+"-gradient-"+t}},{key:"getLabelFill",value:function(t){return t.length>3&&this.hexExpression.test(t[3])?t[3]:this.labelFill}},{key:"shade",value:function(t,e){var i=t.slice(1);3===i.length&&(i=this.expandHex(i));var a=parseInt(i,16),n=0>e?0:255,r=0>e?-1*e:e,o=a>>16,l=a>>8&255,s=255&a,h=16777216+65536*(Math.round((n-o)*r)+o)+256*(Math.round((n-l)*r)+l)+(Math.round((n-s)*r)+s);return"#"+h.toString(16).slice(1)}},{key:"expandHex",value:function(t){return t[0]+t[0]+t[1]+t[1]+t[2]+t[2]}}]),t}();e["default"]=n},function(t,e){"use strict";function i(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}Object.defineProperty(e,"__esModule",{value:!0});var a=function(){function t(t,e){for(var i=0;i<e.length;i++){var a=e[i];a.enumerable=a.enumerable||!1,a.configurable=!0,"value"in a&&(a.writable=!0),Object.defineProperty(t,a.key,a)}}return function(e,i,a){return i&&t(e.prototype,i),a&&t(e,a),e}}(),n=function(){function t(){i(this,t),this.expression=null}return a(t,[{key:"setFormat",value:function(t){"function"==typeof t?this.formatter=t:(this.expression=t,this.formatter=this.stringFormatter)}},{key:"format",value:function(t,e){return Array.isArray(e)?this.formatter(t,e[0],e[1]):this.formatter(t,e,null)}},{key:"stringFormatter",value:function(t,e){var i=arguments.length<=2||void 0===arguments[2]?null:arguments[2],a=i;return null===i&&(a=this.getDefaultFormattedValue(e)),this.expression.split("{l}").join(t).split("{v}").join(e).split("{f}").join(a)}},{key:"getDefaultFormattedValue",value:function(t){return t.toLocaleString()}}]),t}();e["default"]=n},function(t,e){"use strict";function i(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}Object.defineProperty(e,"__esModule",{value:!0});var a=function(){function t(t,e){for(var i=0;i<e.length;i++){var a=e[i];a.enumerable=a.enumerable||!1,a.configurable=!0,"value"in a&&(a.writable=!0),Object.defineProperty(t,a.key,a)}}return function(e,i,a){return i&&t(e.prototype,i),a&&t(e,a),e}}(),n=function(){function t(){i(this,t)}return a(t,[{key:"plot",value:function(t){var e="";return t.forEach(function(t){e+=""+t[0]+t[1]+","+t[2]+" "}),e.replace(/ +/g," ").trim()}},{key:"makeCurvedPaths",value:function(t){var e=arguments.length<=1||void 0===arguments[1]?!1:arguments[1],i=this.makeBezierPoints(t);return e?this.makeBezierPath(i,t.ratio):this.makeBezierPath(i)}},{key:"makeBezierPoints",value:function(t){var e=t.centerX,i=t.prevLeftX,a=t.prevRightX,n=t.prevHeight,r=t.nextLeftX,o=t.nextRightX,l=t.nextHeight,s=t.curveHeight;return{p00:{x:i,y:n},p01:{x:e,y:n+s-10},p02:{x:a,y:n},p10:{x:r,y:l},p11:{x:e,y:l+s},p12:{x:o,y:l}}}},{key:"makeBezierPath",value:function(t){var e=t.p00,i=t.p01,a=t.p02,n=t.p10,r=t.p11,o=t.p12,l=arguments.length<=1||void 0===arguments[1]?1:arguments[1],s=this.getQuadraticBezierCurve(e,i,a,l),h=this.getQuadraticBezierCurve(n,r,o,l);return[[s.p0.x,s.p0.y,"M"],[s.p1.x,s.p1.y,"Q"],[s.p2.x,s.p2.y,""],[h.p2.x,h.p2.y,"L"],[h.p2.x,h.p2.y,"M"],[h.p1.x,h.p1.y,"Q"],[h.p0.x,h.p0.y,""],[s.p0.x,s.p0.y,"L"]]}},{key:"getQuadraticBezierCurve",value:function(t,e,i){var a=arguments.length<=3||void 0===arguments[3]?1:arguments[3];return{p0:t,p1:{x:this.getLinearInterpolation(t,e,a,"x"),y:this.getLinearInterpolation(t,e,a,"y")},p2:{x:this.getQuadraticInterpolation(t,e,i,a,"x"),y:this.getQuadraticInterpolation(t,e,i,a,"y")}}}},{key:"getLinearInterpolation",value:function(t,e,i,a){return t[a]+i*(e[a]-t[a])}},{key:"getQuadraticInterpolation",value:function(t,e,i,a,n){return Math.pow(1-a,2)*t[n]+2*(1-a)*a*e[n]+Math.pow(a,2)*i[n]}},{key:"makeStraightPaths",value:function(t){var e=t.prevLeftX,i=t.prevRightX,a=t.prevHeight,n=t.nextLeftX,r=t.nextRightX,o=t.nextHeight,l=t.ratio,s=arguments.length<=1||void 0===arguments[1]?!1:arguments[1];if(s){var h=i-e,u=r-n,c=h*(l||0)+e,f=u*(l||0)+n;return c=Math.min(c,h),f=Math.min(f,u),[[e,a,"M"],[c,a,"L"],[f,o,"L"],[n,o,"L"],[e,a,"L"]]}return[[e,a,"M"],[i,a,"L"],[r,o,"L"],[n,o,"L"],[e,a,"L"]]}}]),t}();e["default"]=n},function(t,e){"use strict";function i(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}Object.defineProperty(e,"__esModule",{value:!0});var a="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol?"symbol":typeof t},n=function(){function t(t,e){for(var i=0;i<e.length;i++){var a=e[i];a.enumerable=a.enumerable||!1,a.configurable=!0,"value"in a&&(a.writable=!0),Object.defineProperty(t,a.key,a)}}return function(e,i,a){return i&&t(e.prototype,i),a&&t(e,a),e}}(),r=function(){function t(){i(this,t)}return n(t,null,[{key:"isExtendableObject",value:function(t){return"object"===("undefined"==typeof t?"undefined":a(t))&&null!==t&&!Array.isArray(t)}},{key:"extend",value:function(e,i){var a={};return Object.keys(e).length>0&&(a=t.extend({},e)),Object.keys(i).forEach(function(n){t.isExtendableObject(i[n])?t.isExtendableObject(e[n])?a[n]=t.extend(e[n],i[n]):a[n]=t.extend({},i[n]):a[n]=i[n]}),a}}]),t}();e["default"]=r}])});
\ No newline at end of file
diff --git a/package.json b/package.json
index 41ea029..2333cc1 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "d3-funnel",
-  "version": "0.7.7",
+  "version": "0.8.0",
   "description": "A library for rendering SVG funnel charts using D3.js",
   "author": "Jake Zatecky",
   "license": "MIT",