Skip to content

Commit

Permalink
Merge branch 'master' of github.com:devinit/charts
Browse files Browse the repository at this point in the history
  • Loading branch information
epicallan committed Apr 11, 2018
2 parents 6545244 + f136f45 commit 4a71de1
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 20 deletions.
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
},
"devDependencies": {
"@storybook/addon-actions": "3.4.0",
"@storybook/addon-info": "^3.4.0",
"@storybook/addon-info": "3.4.0",
"@storybook/addon-links": "3.4.0",
"@storybook/addon-storyshots": "3.4.0",
"@storybook/addons": "3.4.0",
Expand All @@ -17,8 +17,8 @@
"@types/jest": "22.2.2",
"@types/lodash": "4.14.106",
"@types/object-hash": "1.2.0",
"@types/react": "^16.3.5",
"awesome-typescript-loader": "4.0.0",
"@types/react": "16.3.5",
"awesome-typescript-loader": "4.0.1",
"css-loader": "0.28.11",
"git-pre-hooks": "1.2.0",
"jest": "22.4.3",
Expand All @@ -30,7 +30,7 @@
"less": "3.0.1",
"less-loader": "4.1.0",
"node-dev": "3.1.3",
"react-docgen-typescript-webpack-plugin": "^1.1.0",
"react-docgen-typescript-webpack-plugin": "1.1.0",
"ts-jest": "22.4.2",
"release-it": "7.3.0",
"react": "16.3.1",
Expand Down
4 changes: 2 additions & 2 deletions packages/bar/src/tooltip/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@ export default (container: HTMLElement, labeling: Labeling, orientation: string)
.attr('r', 3)
.attr('fill', 'transparent');

const placement = _orientation => {
const placement = pOrientation => {
return {
'vertical': 'top',
'horizontal': 'right',
'inverted-vertical': 'bottom',
'inverted-horizontal': 'left',
}[_orientation];
}[pOrientation];
};

const tip = Tooltip(tooltipAnchor.node(), {
Expand Down
4 changes: 2 additions & 2 deletions packages/core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
"d3": "5.0.0",
"lodash": "4.17.5",
"plottable": "3.8.2",
"react": "16.3.0",
"react-dom": "16.3.0"
"react": "16.3.1",
"react-dom": "16.3.1"
},
"directories": {
"lib": "./lib",
Expand Down
12 changes: 6 additions & 6 deletions packages/core/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -737,18 +737,18 @@ [email protected]:
version "0.25.0"
resolved "https://registry.yarnpkg.com/ramda/-/ramda-0.25.0.tgz#8fdf68231cffa90bc2f9460390a0cb74a29b29a9"

[email protected].0:
version "16.3.0"
resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.3.0.tgz#b318e52184188ecb5c3e81117420cca40618643e"
[email protected].1:
version "16.3.1"
resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.3.1.tgz#6a3c90a4fb62f915bdbcf6204422d93a7d4ca573"
dependencies:
fbjs "^0.8.16"
loose-envify "^1.1.0"
object-assign "^4.1.1"
prop-types "^15.6.0"

[email protected].0:
version "16.3.0"
resolved "https://registry.yarnpkg.com/react/-/react-16.3.0.tgz#fc5a01c68f91e9b38e92cf83f7b795ebdca8ddff"
[email protected].1:
version "16.3.1"
resolved "https://registry.yarnpkg.com/react/-/react-16.3.1.tgz#4a2da433d471251c69b6033ada30e2ed1202cfd8"
dependencies:
fbjs "^0.8.16"
loose-envify "^1.1.0"
Expand Down
12 changes: 6 additions & 6 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
react-inspector "^2.2.2"
uuid "^3.2.1"

"@storybook/addon-info@^3.4.0":
"@storybook/[email protected]":
version "3.4.0"
resolved "https://registry.yarnpkg.com/@storybook/addon-info/-/addon-info-3.4.0.tgz#26cb866c596208721642c7635fc87909f89c809c"
dependencies:
Expand Down Expand Up @@ -486,7 +486,7 @@
version "1.2.0"
resolved "https://registry.yarnpkg.com/@types/object-hash/-/object-hash-1.2.0.tgz#d65904331bd0b05c7d5ece75f9ddfdbe82affd30"

"@types/react@^16.3.5":
"@types/[email protected]":
version "16.3.5"
resolved "https://registry.yarnpkg.com/@types/react/-/react-16.3.5.tgz#bd3b21285602ea7cadb4b9e0d9711d96fd5692cc"
dependencies:
Expand Down Expand Up @@ -916,9 +916,9 @@ autoprefixer@^7.2.6:
postcss "^6.0.17"
postcss-value-parser "^3.2.3"

[email protected].0:
version "4.0.0"
resolved "https://registry.yarnpkg.com/awesome-typescript-loader/-/awesome-typescript-loader-4.0.0.tgz#486479ec2efb6069d158420e9851a5b515a24a15"
[email protected].1:
version "4.0.1"
resolved "https://registry.yarnpkg.com/awesome-typescript-loader/-/awesome-typescript-loader-4.0.1.tgz#bddae8183f06eb65184390d596e4342ca2089281"
dependencies:
chalk "^2.3.1"
enhanced-resolve "3.3.0"
Expand Down Expand Up @@ -8487,7 +8487,7 @@ react-dev-utils@^5.0.0:
strip-ansi "3.0.1"
text-table "0.2.0"

react-docgen-typescript-webpack-plugin@^1.1.0:
[email protected]:
version "1.1.0"
resolved "https://registry.yarnpkg.com/react-docgen-typescript-webpack-plugin/-/react-docgen-typescript-webpack-plugin-1.1.0.tgz#4bfb8c3312fce487083924842cf03f66177ab9df"
dependencies:
Expand Down

0 comments on commit 4a71de1

Please sign in to comment.