Skip to content

Commit

Permalink
Merge branch 'next' of github.com:storybookjs/storybook into next
Browse files Browse the repository at this point in the history
  • Loading branch information
@shilman
shilman committed Aug 30, 2019
2 parents fc3b994 + 7806f82 commit 199e4d3
Show file tree
Hide file tree
Showing 4 changed files with 57 additions and 30 deletions.
8 changes: 8 additions & 0 deletions addons/viewport/src/Tool.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,14 @@ export const ViewportTool: FunctionComponent<{}> = React.memo(
});
const list = toList(viewports);

useEffect(() => {
setState({
selected:
defaultViewport || (viewports[state.selected] ? state.selected : responsiveViewport.id),
isRotated: state.isRotated,
});
}, [defaultViewport]);

const { selected, isRotated } = state;
const item =
list.find(i => i.id === selected) ||
Expand Down
2 changes: 1 addition & 1 deletion docs/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"serve": "gatsby serve"
},
"dependencies": {
"@storybook/components": "5.2.0-beta.7",
"@storybook/components": "5.2.0-beta.48",
"@storybook/theming": "5.2.0-beta.7",
"babel-loader": "^6.4.1",
"babel-plugin-styled-components": "^1.10.6",
Expand Down
45 changes: 31 additions & 14 deletions docs/yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -279,20 +279,27 @@
dependencies:
"@ndhoule/map" "^2.0.1"

"@storybook/[email protected]":
version "5.2.0-beta.48"
resolved "https://registry.yarnpkg.com/@storybook/client-logger/-/client-logger-5.2.0-beta.48.tgz#6a1d3b16accce30476730d4c45833722b136dacc"
integrity sha512-dHodCe9gzLZynGhu9mRgWpZSSJkyneuVOGfVvrQWD/uwFNxpxuAPcfVtlw7pYoEEdBiXrPa1rB1j127wDQllAw==
dependencies:
core-js "^3.0.1"

"@storybook/[email protected]":
version "5.2.0-beta.7"
resolved "https://registry.yarnpkg.com/@storybook/client-logger/-/client-logger-5.2.0-beta.7.tgz#6d503b9c01fd0b430b1d72ed67ee1eeb63115cac"
integrity sha512-+OqWHjew0QFA37fQL884icQfG3NG1aO8CKxJN5JyVeXm0Tma10amlBfAd9kDrCRHk1Kr/UJF4/DRX73CJBW4rQ==
dependencies:
core-js "^3.0.1"

"@storybook/[email protected].7":
version "5.2.0-beta.7"
resolved "https://registry.yarnpkg.com/@storybook/components/-/components-5.2.0-beta.7.tgz#a61eba234c4556dff9fafe6b0c6211eb0da07b14"
integrity sha512-wo9RWkUFs3ExDfQIxS9koDxKnLHl4aKTWteC1UalFtvu6bKvN7IXhhE7FwaSLqQL6BL2koTcBN3vg28tRz1Y8Q==
"@storybook/[email protected].48":
version "5.2.0-beta.48"
resolved "https://registry.yarnpkg.com/@storybook/components/-/components-5.2.0-beta.48.tgz#ab353fb2e96bb48fe947a25bdeede027ddd8244a"
integrity sha512-LGMj7+8/lii79T+Jf9qXyF9n73hGqqPaSQnbzYs0uL+HHy7bqsxm4MD80YAKUfL0rgTb2ne6fw9mShFSCHmbkA==
dependencies:
"@storybook/client-logger" "5.2.0-beta.7"
"@storybook/theming" "5.2.0-beta.7"
"@storybook/client-logger" "5.2.0-beta.48"
"@storybook/theming" "5.2.0-beta.48"
"@types/react-syntax-highlighter" "10.1.0"
core-js "^3.0.1"
global "^4.3.2"
Expand All @@ -310,6 +317,24 @@
react-textarea-autosize "^7.1.0"
simplebar-react "^1.0.0-alpha.6"

"@storybook/[email protected]":
version "5.2.0-beta.48"
resolved "https://registry.yarnpkg.com/@storybook/theming/-/theming-5.2.0-beta.48.tgz#8a2664781a2868d1ae2c427e5aa14ded94724dc7"
integrity sha512-unsVWu9RIiTanmA0ET/U46SmGLs8FndBejtdNZkfGtLX+ZKEkLGwgUr+1hPlHGwe60byMxwlVMoy5qZLajT6fA==
dependencies:
"@emotion/core" "^10.0.14"
"@emotion/styled" "^10.0.14"
"@storybook/client-logger" "5.2.0-beta.48"
common-tags "^1.8.0"
core-js "^3.0.1"
deep-object-diff "^1.1.0"
emotion-theming "^10.0.14"
global "^4.3.2"
memoizerific "^1.11.3"
polished "^3.3.1"
prop-types "^15.7.2"
resolve-from "^5.0.0"

"@storybook/[email protected]":
version "5.2.0-beta.7"
resolved "https://registry.yarnpkg.com/@storybook/theming/-/theming-5.2.0-beta.7.tgz#7b76d0cee992235a0fb09583a5953ce101ceb47f"
Expand Down Expand Up @@ -10858,14 +10883,6 @@ sc-formatter@^3.0.1:
resolved "https://registry.yarnpkg.com/sc-formatter/-/sc-formatter-3.0.2.tgz#9abdb14e71873ce7157714d3002477bbdb33c4e6"
integrity sha512-9PbqYBpCq+OoEeRQ3QfFIGE6qwjjBcd2j7UjgDlhnZbtSnuGgHdcRklPKYGuYFH82V/dwd+AIpu8XvA1zqTd+A==

scheduler@^0.13.6:
version "0.13.6"
resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.13.6.tgz#466a4ec332467b31a91b9bf74e5347072e4cd889"
integrity sha512-IWnObHt413ucAYKsD9J1QShUKkbKLQQHdxRyw73sw4FN26iWr3DY/H34xGPe4nmL1DwXyWmSWmMrA9TfQbE/XQ==
dependencies:
loose-envify "^1.1.0"
object-assign "^4.1.1"

scheduler@^0.15.0:
version "0.15.0"
resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.15.0.tgz#6bfcf80ff850b280fed4aeecc6513bc0b4f17f8e"
Expand Down
32 changes: 17 additions & 15 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3787,9 +3787,9 @@
"@types/lodash" "*"

"@types/lodash@*", "@types/lodash@^4.14.129":
version "4.14.135"
resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.135.tgz#d2607c35dd68f70c2b35ba020c667493dedd8447"
integrity sha512-Ed+tSZ9qM1oYpi5kzdsBuOzcAIn1wDW+e8TFJ50IMJMlSopGdJgKAbhHzN6h1E1OfjlGOr2JepzEWtg9NIfoNg==
version "4.14.136"
resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.136.tgz#413e85089046b865d960c9ff1d400e04c31ab60f"
integrity sha512-0GJhzBdvsW2RUccNHOBkabI8HZVdOXmXbXhuKlDEd5Vv12P7oAVGfomGp3Ne21o5D/qu1WmthlNKFaoZJJeErA==

"@types/mini-css-extract-plugin@^0.2.1":
version "0.2.1"
Expand Down Expand Up @@ -11717,14 +11717,16 @@ eslint-scope@^4.0.0, eslint-scope@^4.0.3:
estraverse "^4.1.1"

eslint-utils@^1.3.1:
version "1.3.1"
resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-1.3.1.tgz#9a851ba89ee7c460346f97cf8939c7298827e512"
integrity sha512-Z7YjnIldX+2XMcjr7ZkgEsOj/bREONV60qYeB/bjMAqqqZ4zxKyWX+BOUkdmRmA9riiIPVvo5x86m5elviOk0Q==
version "1.4.2"
resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-1.4.2.tgz#166a5180ef6ab7eb462f162fd0e6f2463d7309ab"
integrity sha512-eAZS2sEUMlIeCjBeubdj45dmBHQwPHWyBcT1VSYB7o9x9WRRqKxyUoiXlRjyAwzN7YEzHJlYg0NmzDRWx6GP4Q==
dependencies:
eslint-visitor-keys "^1.0.0"

eslint-visitor-keys@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz#3f3180fb2e291017716acb4c9d6d5b5c34a6a81d"
integrity sha512-qzm/XxIbxm/FHyH341ZrbnMUpe+5Bocte9xkmFMzPMjRaZMcXww+MpBptFvtU+79L362nqiLhekCxCxDPaUMBQ==
version "1.1.0"
resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.1.0.tgz#e2a82cea84ff246ad6fb57f9bde5b46621459ec2"
integrity sha512-8y9YjtM1JBJU/A9Kc+SbaOV4y29sSWckBwMHa+FGtVj5gN/sbnKDf6xJUl+8g7FAij9LVaP8C24DUiH/f/2Z9A==

eslint@^5.10.0, eslint@^5.14.1, eslint@^5.16.0:
version "5.16.0"
Expand Down Expand Up @@ -27370,9 +27372,9 @@ store2@^2.7.1:
integrity sha512-zzzP5ZY6QWumnAFV6kBRbS44pUMcpZBNER5DWUe1HETlaKXqLcCQxbNu6IHaKr1pUsjuhUGBdOy8sWKmMkL6pQ==

storybook-addon-vue-info@^1.2.1:
version "1.2.1"
resolved "https://registry.yarnpkg.com/storybook-addon-vue-info/-/storybook-addon-vue-info-1.2.1.tgz#41dc5b16392640866878441abb8c060414803c78"
integrity sha512-B4l93SBHjVilrbzZ7sFMyfBlwm5nCuecU+ZOhpeci5zOK0ixTgCAwg/zIWBpCT9yI0iUAZv70xaIO9ICxm3vOQ==
version "1.2.2"
resolved "https://registry.yarnpkg.com/storybook-addon-vue-info/-/storybook-addon-vue-info-1.2.2.tgz#3479ed65fe2cfc87bafff4f711716851986b8101"
integrity sha512-DkT2SjwAJxuv/G5f1NZ8DH8Q+1u2FIfutbdgJTbah+ZAQz5PeLS5pkY9/zL4oETs6DA7hB8NXBeFWiZoPGbEfw==
dependencies:
clone "^2.1.2"
dedent-tabs "^0.8.0"
Expand Down Expand Up @@ -27865,9 +27867,9 @@ svelte-loader@^2.13.4:
svelte-dev-helper "^1.1.9"

svelte@^3.4.1:
version "3.6.4"
resolved "https://registry.yarnpkg.com/svelte/-/svelte-3.6.4.tgz#6b04e9b261af17e2ee9b3bf92104e8a0dbcd35ff"
integrity sha512-oI2FAZK4iLUKwwf/ltn9Y9185+03LX3uMzKlVnLrkW5P1xazJnCOHBX5mI5FeyhSIPIyueTQtqJ9cQaEUMMXgA==
version "3.9.1"
resolved "https://registry.yarnpkg.com/svelte/-/svelte-3.9.1.tgz#f0dc0993d80e69da46f7b21d858895c37c2fd419"
integrity sha512-oy6FjffuCzPueBnzs8SxkV5VaOS+VX/eUywgE9LCA+skKdXt7wFlpKH3DNi1Uy+K23sb9bzlWxn0AaDQOnEUEw==

sver-compat@^1.5.0:
version "1.5.0"
Expand Down

0 comments on commit 199e4d3

Please sign in to comment.