ihmeuw · davschne · Mar 14, 2019 · Jul 10, 2017 · Jul 10, 2017 · Jul 11, 2017
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -9,7 +9,7 @@ module.exports = {
     "comma-dangle": 0,
     "no-underscore-dangle": [2, { "allowAfterThis": true }],
     "arrow-body-style": [1, "as-needed"],
-    "max-len": [2, 100, 2, { "ignoreUrls": true, "ignoreComments": true }]
+    "max-len": [2, 100, 2, { "ignoreUrls": true, "ignoreComments": true }],
   },
   "env": {
     "browser": true,

diff --git a/README.md b/README.md
@@ -20,8 +20,8 @@ npm install -S ihme-ui
 In it's most simple form, this library can be included in a `<script />` tag and accessed off of `window` as `ihmeUI`.
 If you've installed the library from the [npm registry](https://www.npmjs.com/package/ihme-ui), you can pull the library out of your `node_modules` folder.
 If not, grab it off of the unoffical NPM CDN, [unpkg](https://unpkg.com/#/).
-```html
 
+```html
 <!DOCTYPE html>
 <html lang="en">
 <head>
@@ -54,36 +54,43 @@ In most cases, however, you'll be importing ihme-ui into your project, and bundl
 In support of this, `ihme-ui` exposes both a CommonJS (i.e., `var ihmeUI = require('ihme-ui')`) and an ES module (i.e., `import ihmeUI from 'ihme-ui'`) target.
 ```javascript
 // index.js
-import { AxisChart, linspace } from 'ihme-ui';
-...
 
+import { AxisChart, linspace } from 'ihme-ui';
+//...
 ```
 
 ---
 
 ## API Reference
 * Components
-  * [\<Axis /\>](https://github.com/ihmeuw/ihme-ui/blob/master/src/ui/axis/README.md)
-  * [\<AxisChart /\>](https://github.com/ihmeuw/ihme-ui/blob/master/src/ui/axis-chart/README.md)
-  * [\<Button /\>](https://github.com/ihmeuw/ihme-ui/blob/master/src/ui/button/README.md)
-  * [\<Choropleth /\>](https://github.com/ihmeuw/ihme-ui/blob/master/src/ui/choropleth/README.md)
-  * [Compositions](https://github.com/ihmeuw/ihme-ui/blob/master/src/ui/compositions/README.md)
-    * [\<Map \/>](https://github.com/ihmeuw/ihme-ui/blob/master/src/ui/compositions/map/README.md)
-    * [\<ChoroplethLegend /\>](https://github.com/ihmeuw/ihme-ui/blob/master/src/ui/compositions/choropleth-legend/README.md)
-  * [\<ExpansionContainer /\>](https://github.com/ihmeuw/ihme-ui/blob/master/src/ui/expansion-container/README.md)
-  * [\<Group /\> and \<Option /\>](https://github.com/ihmeuw/ihme-ui/blob/master/src/ui/group/README.md)
-  * [\<HtmlLabel /\>](https://github.com/ihmeuw/ihme-ui/blob/master/src/ui/html-label/README.md)
-  * [\<Legend /\>](https://github.com/ihmeuw/ihme-ui/blob/master/src/ui/legend/README.md)
-  * [\<LoadingIndicator /\>](https://github.com/ihmeuw/ihme-ui/blob/master/src/ui/loading-indicator/README.md)
+  * [\<Axis /\>](src/ui/axis/README.md)
+  * [\<AxisChart /\>](src/ui/axis-chart/README.md)
+  * [Bar](src/ui/bar/README.md)
+    * \<Bar /\>
+    * \<Bars /\>
+    * \<GroupedBars /\>
+    * \<StackedBars /\>
+  * [\<Button /\>](src/ui/button/README.md)
+  * [\<Choropleth /\>](src/ui/choropleth/README.md)
+  * [Compositions](src/ui/compositions/README.md)
+    * [\<BarChart /\>](src/ui/compositions/bar-chart/README.md)
+    * [\<ChoroplethLegend /\>](src/ui/compositions/choropleth-legend/README.md)
+    * [\<Map /\>](src/ui/compositions/map/README.md)
+  * [\<ExpansionContainer /\>](src/ui/expansion-container/README.md)
+  * [\<Group /\> and \<Option /\>](src/ui/group/README.md)
+  * [\<HtmlLabel /\>](src/ui/html-label/README.md)
+  * [\<Legend /\>](src/ui/legend/README.md)
+  * [\<LoadingIndicator /\>](src/ui/loading-indicator/README.md)
+  * [\<ResponsiveContainer /\>](src/ui/responsive-container/README.md)
   * \<Select /\> - docs coming soon!
-  * [\<ResponsiveContainer /\>](https://github.com/ihmeuw/ihme-ui/blob/master/src/ui/responsive-container/README.md)
-  * [Shape](https://github.com/ihmeuw/ihme-ui/blob/master/src/ui/shape/README.md)
+  * [Shape](src/ui/shape/README.md)
     * \<Area /\>
     * \<Line /\>
     * \<MultiLine /\>
+    * \<MultiScatter /\>
     * \<Scatter /\>
     * \<Shape /\>
-  * [\<Slider /\>](https://github.com/ihmeuw/ihme-ui/blob/master/src/ui/slider/README.md)
-  * [\<SvgText /\>](https://github.com/ihmeuw/ihme-ui/blob/master/src/ui/svg-text/README.md)
-  * [\<Tooltip /\>](https://github.com/ihmeuw/ihme-ui/blob/master/src/ui/tooltip/README.md)
-* [Utilities](https://github.com/ihmeuw/ihme-ui/tree/master/src/utils) - docs coming soon!
+  * [\<Slider /\>](src/ui/slider/README.md)
+  * [\<SvgText /\>](src/ui/svg-text/README.md)
+  * [\<Tooltip /\>](src/ui/tooltip/README.md)
+* Utilities - docs coming soon!
diff --git a/package.json b/package.json
@@ -14,20 +14,21 @@
   ],
   "author": "Institue for Health Metrics and Evaluation",
   "contributors": [
-    "Gabe Medrash <[email protected]>",
-    "Brett Vitaz <[email protected]>",
-    "Aaron Keel <[email protected]>",
+    "Gabe Medrash <[email protected]> (https://github.com/GabeMedrash)",
+    "Brett Vitaz <[email protected]> (https://github.com/brettvitaz)",
+    "Aaron Keel <[email protected]> (https://github.com/aaronKeel)",
     "David Schneider <[email protected]> (https://github.com/davschne)",
-    "Katherine Beame <[email protected]>",
-    "Jim Vermillion <[email protected]>"
+    "Katherine Beame <[email protected]> (https://github.com/kbeame)",
+    "Jim Vermillion <[email protected]> (https://github.com/jimvermillion)",
+    "Bao Dinh <[email protected]> (https://github.com/bdinh)"
   ],
   "repository": "https://github.com/ihmeuw/ihme-ui.git",
   "bugs": "https://github.com/ihmeuw/ihme-ui/issues",
   "scripts": {
-    "build:all": "npm run clean && npm run build:commonjs && npm run build:es && npm run build:umd",
-    "build:commonjs": "NODE_ENV=production BABEL_ENV=commonjs $(npm bin)/babel --ignore test/,demo src --out-dir lib && scripts/concat-stylesheets.sh lib",
-    "build:es": "NODE_ENV=production BABEL_ENV=es $(npm bin)/babel --ignore test/,demo src --out-dir es && scripts/concat-stylesheets.sh es",
-    "build:umd": "BABEL_ENV=webpack webpack -p --config webpack.build.config.js src/index.js dist/ihme-ui.js",
+    "build:all": "npm run build:commonjs && npm run build:es && npm run build:umd",
+    "build:commonjs": "rm -rf lib && NODE_ENV=production BABEL_ENV=commonjs $(npm bin)/babel --ignore test/,demo src --out-dir lib && scripts/concat-stylesheets.sh lib",
+    "build:es": "rm -rf es && NODE_ENV=production BABEL_ENV=es $(npm bin)/babel --ignore test/,demo src --out-dir es && scripts/concat-stylesheets.sh es",
+    "build:umd": "rm -rf dist && BABEL_ENV=webpack webpack -p --config webpack.build.config.js src/index.js dist/ihme-ui.js",
     "clean": "rm -rf dist es lib",
     "css:minify": "$(npm bin)/cssnano dist/ihme-ui.css dist/ihme-ui.min.css",
     "coverage": "BABEL_ENV=test $(npm bin)/babel-node $(npm bin)/babel-istanbul cover $(npm bin)/_mocha --require ./scripts/setup-jsdom.js -- `scripts/get-test-directories.sh`",
@@ -37,8 +38,8 @@
     "docs:ui": "find -X ./src \\( -depth 3 -or -depth 4 \\) -type d -name 'src' | xargs $(npm bin)/react-docgen | node ./scripts/build-doc.js",
     "lint": "$(npm bin)/eslint src --ext .js,.jsx",
     "lint:fix": "$(npm bin)/eslint src --fix --ext .js,.jsx --quiet",
-    "preversion": "npm run lint && npm run test && npm run build:all",
-    "postversion": "git push && git push --tags && npm publish",
+    "preversion": "npm install && npm run lint && npm run test && npm run build:all",
+    "postversion": "git push --tags https://github.com/ihmeuw/ihme-ui.git master && npm publish",
     "test": "BABEL_ENV=test $(npm bin)/babel-node $(npm bin)/_mocha --require ./scripts/setup-jsdom.js `./scripts/get-test-directories.sh`",
     "test:travis": "npm run lint && npm run coverage:travis && npm run coverage:token",
     "update:dep": "./scripts/update-package.sh"

diff --git a/scripts/bundle-demos.sh b/scripts/bundle-demos.sh
@@ -12,7 +12,7 @@ function run_webpack
   fi
 
   echo "Packing: ${demo_dir}"
-  $(npm bin)/webpack -p --env ${demo_dir} --config "./webpack.demo.config.js" --display-error-details
+  $(npm bin)/webpack --env ${demo_dir} --config "./webpack.demo.config.js" --display-error-details
 }
 
 for dir in $(find . -d -regex ".*/${1+$1/}demo"*); do

diff --git a/src/ui/axis-chart/README.md b/src/ui/axis-chart/README.md
@@ -4,9 +4,8 @@
 
 Wraps and provides its child charting components with height, width, scales, and padding
 
-
 Property | Required | Type(s) | Defaults | Description
-:---    |:---      |:---     |:---      |:---       
+:---    |:---      |:---     |:---      |:---
 `className` |  | [CommonPropTypes.className](https://github.com/ihmeuw/ihme-ui/blob/master/src/utils/props.js#L11) |  | className applied to outermost svg element
 `clipPath` |  | bool |  | apply clipping path to charting area
 `height` | true | number |  | pixel height of line chart
@@ -18,4 +17,3 @@ Property | Required | Type(s) | Defaults | Description
 `xScaleType` |  | one of: SCALE_TYPES |  | type of x scale<br />[name of d3 scale scale function](https://github.com/d3/d3-scale)
 `yDomain` |  | array |  | [min, max] yScale (i.e., the range of the data)
 `yScaleType` |  | one of: SCALE_TYPES |  | type of y scale<br />[name of d3 scale scale function](https://github.com/d3/d3-scale)
-
diff --git a/src/ui/axis/README.md b/src/ui/axis/README.md
@@ -2,9 +2,8 @@
 =====================
 `import { Axis } from 'ihme-ui'`
 
-
 Property | Required | Type(s) | Defaults | Description
-:---    |:---      |:---     |:---      |:---       
+:---    |:---      |:---     |:---      |:---
 `className` |  | [CommonPropTypes.className](https://github.com/ihmeuw/ihme-ui/blob/master/src/utils/props.js#L11) |  | className applied to outermost group element
 `height` |  | number | 30 | height of charting area, minus padding<br />required if translate is not provided
 `label` |  | string |  | the axis label
@@ -25,7 +24,7 @@ Property | Required | Type(s) | Defaults | Description
 `translate` |  | object |  | push axis in x or y direction<br />keys: 'x' (required), 'y' (required)<br />required if width and height are not provided
 `width` |  | number | 900 | width of charting area, minus padding<br />required if translate is not specified
 
---- 
+---
 
 #### \<XAxis />
 
@@ -62,4 +61,3 @@ Property | Required | Type(s) | Defaults | Description
 `scales` | | func | | required if and only if `props.scale` is not provided
 `tickFontFamily` | | string | 'Helvetica' | font-family of axis ticks; used when taking measurement of widest tick if autoFilterTickValues === true
 `tickFontSize` | | number | 12 | font size of axis ticks, in pixels; used when taking measurement of widest tick or to determine tick height if autoFilterTickValues === true
-
diff --git a/src/ui/axis/src/axis.jsx b/src/ui/axis/src/axis.jsx
@@ -174,7 +174,6 @@ export const WIDTH_PROP_TYPES = {
   width: PropTypes.number.isRequired,
 };
 
-
 Axis.propTypes = {
 
   /**
-Original file line number
+Diff line change
@@ Expand Up / @@ -174,7 +174,6 @@ export const WIDTH_PROP_TYPES = { @@
       width: PropTypes.number.isRequired,
     };
     Axis.propTypes = {
       /**
@@ Expand Down @@