diff --git a/.storybook/addons.js b/.storybook/addons.js index ebcefbcdc2..019597f4e8 100644 --- a/.storybook/addons.js +++ b/.storybook/addons.js @@ -2,5 +2,4 @@ import '@storybook/addon-actions/register' import '@storybook/addon-links/register' -import '@storybook/addon-knobs/register' import 'storybook-addon-intl/register' diff --git a/.storybook/config.js b/.storybook/config.js index 44996fdf11..a1c9adf8ad 100644 --- a/.storybook/config.js +++ b/.storybook/config.js @@ -2,9 +2,6 @@ import { addDecorator, configure } from '@storybook/react' -// integrate storybook-addon-knobs -import { withKnobs } from '@storybook/addon-knobs' - // integrate storybook-addon-intl for react-intl import { setIntlConfig, withIntl } from 'storybook-addon-intl' import { addLocaleData } from 'react-intl' @@ -23,7 +20,6 @@ setIntlConfig({ }) // add global decorators -addDecorator(withKnobs) addDecorator(withIntl) // dynamically load stories from the components directory diff --git a/.storybook/test/addons.js b/.storybook/test/addons.js index 37f8f1a544..9a07f19472 100644 --- a/.storybook/test/addons.js +++ b/.storybook/test/addons.js @@ -2,4 +2,3 @@ import '@storybook/addon-actions/register' import '@storybook/addon-links/register' - diff --git a/package.json b/package.json index 5983b01f19..e1a95e8ba4 100644 --- a/package.json +++ b/package.json @@ -36,13 +36,12 @@ "recharts": "1.0.0-alpha.4", "redux": "3.7.2", "redux-form": "7.0.3", - "semantic-ui-react": "0.71.4", + "semantic-ui-react": "0.72.0", "validator": "8.1.0" }, "devDependencies": { "@storybook/addon-actions": "3.2.6", "@storybook/addon-info": "3.2.9", - "@storybook/addon-knobs": "3.2.8", "@storybook/addon-links": "3.2.6", "@storybook/addon-storyshots": "3.2.8", "@storybook/react": "3.2.8", diff --git a/src/components/__snapshots__/storyshots.test.js.snap b/src/components/__snapshots__/storyshots.test.js.snap index 84bcdbcaf2..d42a747e41 100644 --- a/src/components/__snapshots__/storyshots.test.js.snap +++ b/src/components/__snapshots__/storyshots.test.js.snap @@ -13,6 +13,7 @@ exports[`Storyshots ActionButton default 1`] = ` className="ui large circular icon primary button" disabled={undefined} onClick={[Function]} + role="button" tabIndex={undefined} > answer2 @@ -1378,6 +1387,7 @@ exports[`Storyshots SingleChoiceOptions default 1`] = ` className="ui basic fluid button" disabled={undefined} onClick={[Function]} + role="button" tabIndex={undefined} > antwort 2 @@ -1391,6 +1401,7 @@ exports[`Storyshots SingleChoiceOptions default 1`] = ` className="ui basic fluid button" disabled={undefined} onClick={[Function]} + role="button" tabIndex={undefined} > option 3 @@ -1404,6 +1415,7 @@ exports[`Storyshots SingleChoiceOptions default 1`] = ` className="ui basic fluid button" disabled={undefined} onClick={[Function]} + role="button" tabIndex={undefined} > tschege @@ -1425,6 +1437,7 @@ exports[`Storyshots SingleChoiceOptions withActiveOption 1`] = ` className="ui basic fluid button" disabled={undefined} onClick={[Function]} + role="button" tabIndex={undefined} > answer2 @@ -1438,6 +1451,7 @@ exports[`Storyshots SingleChoiceOptions withActiveOption 1`] = ` className="ui basic fluid button" disabled={undefined} onClick={[Function]} + role="button" tabIndex={undefined} > antwort 2 @@ -1451,6 +1465,7 @@ exports[`Storyshots SingleChoiceOptions withActiveOption 1`] = ` className="ui basic fluid button" disabled={undefined} onClick={[Function]} + role="button" tabIndex={undefined} > option 3 @@ -1464,6 +1479,7 @@ exports[`Storyshots SingleChoiceOptions withActiveOption 1`] = ` className="ui basic fluid button" disabled={undefined} onClick={[Function]} + role="button" tabIndex={undefined} > tschege diff --git a/src/components/questionTypes/SingleChoiceOptions.stories.js b/src/components/questionTypes/SingleChoiceOptions.stories.js index 20bf604c4d..16abba8898 100644 --- a/src/components/questionTypes/SingleChoiceOptions.stories.js +++ b/src/components/questionTypes/SingleChoiceOptions.stories.js @@ -8,7 +8,6 @@ import React, { Component } from 'react' import { storiesOf } from '@storybook/react' import { action } from '@storybook/addon-actions' -import { number } from '@storybook/addon-knobs' import SingleChoiceOptions from './SingleChoiceOptions' @@ -40,7 +39,7 @@ storiesOf('SingleChoiceOptions', module) .add('default', () => ) .add('withActiveOption', () => ( () => action(`option ${index} clicked`)} />), diff --git a/src/components/questions/QuestionBlock.stories.js b/src/components/questions/QuestionBlock.stories.js index af24b633bd..d091e884db 100644 --- a/src/components/questions/QuestionBlock.stories.js +++ b/src/components/questions/QuestionBlock.stories.js @@ -7,24 +7,19 @@ import React from 'react' import { storiesOf } from '@storybook/react' -import { boolean, number } from '@storybook/addon-knobs' import QuestionBlock from './QuestionBlock' import fixtures from '../../../.storybook/fixtures' storiesOf('QuestionBlock', module) .add('default', () => - (), + , ) .add('empty', () => (), ) diff --git a/src/pages/questions/__snapshots__/index.test.js.snap b/src/pages/questions/__snapshots__/index.test.js.snap index 90ffc09338..74e90884c5 100644 --- a/src/pages/questions/__snapshots__/index.test.js.snap +++ b/src/pages/questions/__snapshots__/index.test.js.snap @@ -217,6 +217,7 @@ exports[`Snapshot-Testing Works 1`] = ` className="ui huge circular icon primary button actionButton" disabled={undefined} onClick={[Function]} + role="button" tabIndex={undefined} > answer1 @@ -142,6 +144,7 @@ exports[`Snapshot-Testing Works 1`] = ` className="ui basic fluid button" disabled={undefined} onClick={[Function]} + role="button" tabIndex={undefined} > antwort 2 @@ -155,6 +158,7 @@ exports[`Snapshot-Testing Works 1`] = ` className="ui basic fluid button" disabled={undefined} onClick={[Function]} + role="button" tabIndex={undefined} > option 3 @@ -168,6 +172,7 @@ exports[`Snapshot-Testing Works 1`] = ` className="ui basic fluid button" disabled={undefined} onClick={[Function]} + role="button" tabIndex={undefined} > tschege @@ -183,6 +188,7 @@ exports[`Snapshot-Testing Works 1`] = ` className="ui primary button submitButton" disabled={undefined} onClick={[Function]} + role="button" tabIndex={undefined} > @@ -415,6 +421,7 @@ exports[`Snapshot-Testing Works 1`] = ` className="ui large circular icon primary button" disabled={undefined} onClick={[Function]} + role="button" tabIndex={undefined} > diff --git a/src/pages/user/__snapshots__/registration.test.js.snap b/src/pages/user/__snapshots__/registration.test.js.snap index 7a625dec9c..ed43b5ad37 100644 --- a/src/pages/user/__snapshots__/registration.test.js.snap +++ b/src/pages/user/__snapshots__/registration.test.js.snap @@ -193,6 +193,7 @@ exports[`Snapshot-Testing Works 1`] = ` className="ui primary disabled right floated button" disabled={true} onClick={[Function]} + role="button" tabIndex={-1} type="submit" > diff --git a/src/pages/user/__snapshots__/resetPassword.test.js.snap b/src/pages/user/__snapshots__/resetPassword.test.js.snap index 8e0873790a..43a22ce2ef 100644 --- a/src/pages/user/__snapshots__/resetPassword.test.js.snap +++ b/src/pages/user/__snapshots__/resetPassword.test.js.snap @@ -54,6 +54,7 @@ exports[`Snapshot-Testing Works 1`] = ` className="ui primary disabled button semanticButton" disabled={true} onClick={[Function]} + role="button" tabIndex={-1} type="submit" > diff --git a/yarn.lock b/yarn.lock index f6fb44b2cc..c8c02512f1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -30,23 +30,6 @@ react-addons-create-fragment "^15.5.3" util-deprecate "^1.0.2" -"@storybook/addon-knobs@3.2.8": - version "3.2.8" - resolved "https://registry.yarnpkg.com/@storybook/addon-knobs/-/addon-knobs-3.2.8.tgz#eb4821409e62f2f886d7ae9333bcc95e4b0714eb" - dependencies: - "@storybook/addons" "^3.2.6" - babel-runtime "^6.23.0" - deep-equal "^1.0.1" - global "^4.3.2" - insert-css "^1.0.0" - lodash.debounce "^4.0.8" - moment "^2.18.1" - prop-types "^15.5.10" - react-color "^2.11.4" - react-datetime "^2.8.10" - react-textarea-autosize "^4.3.0" - util-deprecate "^1.0.2" - "@storybook/addon-links@3.2.6", "@storybook/addon-links@^3.2.6": version "3.2.6" resolved "https://registry.yarnpkg.com/@storybook/addon-links/-/addon-links-3.2.6.tgz#93029ecee8a1a1939f01381c06ed19327acd746b" @@ -181,10 +164,6 @@ version "0.10.2" resolved "https://registry.yarnpkg.com/@types/graphql/-/graphql-0.10.2.tgz#d7c79acbaa17453b6681c80c34b38fcb10c4c08c" -"@types/react@>=15": - version "16.0.5" - resolved "https://registry.yarnpkg.com/@types/react/-/react-16.0.5.tgz#d713cf67cc211dea20463d2a0b66005c22070c4b" - abab@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/abab/-/abab-1.0.3.tgz#b81de5f7274ec4e756d797cd834f303642724e5d" @@ -496,14 +475,14 @@ autoprefixer@^6.3.1: postcss-value-parser "^3.2.3" autoprefixer@^7.1.1: - version "7.1.2" - resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-7.1.2.tgz#fbeaf07d48fd878e0682bf7cbeeade728adb2b18" + version "7.1.3" + resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-7.1.3.tgz#0e8d337976d6f13644db9f8813b4c42f3d1ccc34" dependencies: - browserslist "^2.1.5" - caniuse-lite "^1.0.30000697" + browserslist "^2.4.0" + caniuse-lite "^1.0.30000718" normalize-range "^0.1.2" num2fraction "^1.2.2" - postcss "^6.0.6" + postcss "^6.0.10" postcss-value-parser "^3.2.3" aws-sign2@~0.6.0: @@ -1572,7 +1551,7 @@ babel-runtime@6.23.0: core-js "^2.4.0" regenerator-runtime "^0.10.0" -babel-runtime@6.x.x, babel-runtime@^6.11.6, babel-runtime@^6.18.0, babel-runtime@^6.2.0, babel-runtime@^6.20.0, babel-runtime@^6.22.0, babel-runtime@^6.23.0, babel-runtime@^6.26.0, babel-runtime@^6.5.0, babel-runtime@^6.9.2: +babel-runtime@6.x.x, babel-runtime@^6.11.6, babel-runtime@^6.18.0, babel-runtime@^6.2.0, babel-runtime@^6.20.0, babel-runtime@^6.22.0, babel-runtime@^6.23.0, babel-runtime@^6.25.0, babel-runtime@^6.26.0, babel-runtime@^6.5.0, babel-runtime@^6.9.2: version "6.26.0" resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.26.0.tgz#965c7058668e82b55d7bfe04ff2337bc8b5647fe" dependencies: @@ -1802,7 +1781,7 @@ browserslist@^1.3.6, browserslist@^1.5.2, browserslist@^1.7.6: caniuse-db "^1.0.30000639" electron-to-chromium "^1.2.7" -browserslist@^2.1.2, browserslist@^2.1.5: +browserslist@^2.1.2, browserslist@^2.4.0: version "2.4.0" resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-2.4.0.tgz#693ee93d01e66468a6348da5498e011f578f87f8" dependencies: @@ -1888,7 +1867,7 @@ caniuse-db@^1.0.30000529, caniuse-db@^1.0.30000634, caniuse-db@^1.0.30000639: version "1.0.30000718" resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000718.tgz#86cdd97987302554934c61e106f4e470f16f993c" -caniuse-lite@^1.0.30000697, caniuse-lite@^1.0.30000718: +caniuse-lite@^1.0.30000718: version "1.0.30000718" resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000718.tgz#0dd24290beb11310b2d80f6b70a823c2a65a6fad" @@ -1986,7 +1965,7 @@ clap@^1.0.9: dependencies: chalk "^1.1.3" -classnames@2.2.5, classnames@^2.1.5, classnames@^2.2.3, classnames@^2.2.5: +classnames@2.2.5, classnames@^2.2.3, classnames@^2.2.5: version "2.2.5" resolved "https://registry.yarnpkg.com/classnames/-/classnames-2.2.5.tgz#fb3801d453467649ef3603c7d61a02bd129bde6d" @@ -2233,7 +2212,7 @@ create-hmac@^1.1.0, create-hmac@^1.1.2, create-hmac@^1.1.4: safe-buffer "^5.0.1" sha.js "^2.4.8" -create-react-class@^15.5.2, create-react-class@^15.5.x, create-react-class@^15.6.0: +create-react-class@^15.6.0: version "15.6.0" resolved "https://registry.yarnpkg.com/create-react-class/-/create-react-class-15.6.0.tgz#ab448497c26566e1e29413e883207d57cfe7bed4" dependencies: @@ -2475,6 +2454,12 @@ debug@2.6.8, debug@^2.1.1, debug@^2.2.0, debug@^2.6.3, debug@^2.6.8: dependencies: ms "2.0.0" +debug@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/debug/-/debug-3.0.1.tgz#0564c612b521dc92d9f2988f0549e34f9c98db64" + dependencies: + ms "2.0.0" + decamelize@^1.0.0, decamelize@^1.1.1, decamelize@^1.1.2: version "1.2.0" resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290" @@ -3439,8 +3424,8 @@ fstream@^1.0.0, fstream@^1.0.10, fstream@^1.0.2: rimraf "2" function-bind@^1.0.2, function-bind@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.0.tgz#16176714c801798e4e8f2cf7f7529467bb4a5771" + version "1.1.1" + resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d" function.prototype.name@^1.0.0, function.prototype.name@^1.0.3: version "1.0.3" @@ -3956,10 +3941,6 @@ inquirer@^3.0.6: strip-ansi "^4.0.0" through "^2.3.6" -insert-css@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/insert-css/-/insert-css-1.1.0.tgz#4a3f7a3e783877381bb8471a6452d1d27315db9e" - interpret@^1.0.0: version "1.0.3" resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.0.3.tgz#cbc35c62eeee73f19ab7b10a801511401afc0f90" @@ -4882,7 +4863,7 @@ lodash.uniq@^4.5.0: version "4.5.0" resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773" -lodash@4.17.4, lodash@4.x.x, lodash@^4.0.0, lodash@^4.0.1, lodash@^4.14.0, lodash@^4.15.0, lodash@^4.16.4, lodash@^4.17.2, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.2.0, lodash@^4.2.1, lodash@^4.3.0, lodash@^4.5.1, lodash@^4.6.1, lodash@~4.17.4: +lodash@4.17.4, lodash@4.x.x, lodash@^4.0.0, lodash@^4.14.0, lodash@^4.15.0, lodash@^4.16.4, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.2.0, lodash@^4.2.1, lodash@^4.3.0, lodash@^4.5.1, lodash@^4.6.1, lodash@~4.17.4: version "4.17.4" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae" @@ -4983,10 +4964,6 @@ marksy@^2.0.0: he "^1.1.1" marked "^0.3.6" -material-colors@^1.2.1: - version "1.2.5" - resolved "https://registry.yarnpkg.com/material-colors/-/material-colors-1.2.5.tgz#5292593e6754cb1bcc2b98030e4e0d6a3afc9ea1" - math-expression-evaluator@^1.2.14: version "1.2.17" resolved "https://registry.yarnpkg.com/math-expression-evaluator/-/math-expression-evaluator-1.2.17.tgz#de819fdbcd84dccd8fae59c6aeb79615b9d266ac" @@ -5150,7 +5127,7 @@ mobx@^2.3.4: version "2.7.0" resolved "https://registry.yarnpkg.com/mobx/-/mobx-2.7.0.tgz#cf3d82d18c0ca7f458d8f2a240817b3dc7e54a01" -moment@2.18.1, moment@^2.11.2, moment@^2.18.1: +moment@2.18.1, moment@^2.11.2: version "2.18.1" resolved "https://registry.yarnpkg.com/moment/-/moment-2.18.1.tgz#c36193dd3ce1c2eed2adb7c802dbbc77a81b1c0f" @@ -6037,7 +6014,7 @@ postcss@^5.0.10, postcss@^5.0.11, postcss@^5.0.12, postcss@^5.0.13, postcss@^5.0 source-map "^0.5.6" supports-color "^3.2.3" -postcss@^6.0.1, postcss@^6.0.2, postcss@^6.0.6: +postcss@^6.0.1, postcss@^6.0.10, postcss@^6.0.2: version "6.0.10" resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.10.tgz#c311b89734483d87a91a56dc9e53f15f4e6e84e4" dependencies: @@ -6158,7 +6135,7 @@ prop-types-exact@^1.1.1: has "^1.0.1" object.assign "^4.0.4" -prop-types@15.5.10, prop-types@^15.5.0, prop-types@^15.5.10, prop-types@^15.5.4, prop-types@^15.5.6, prop-types@^15.5.7, prop-types@^15.5.8, prop-types@^15.5.9, prop-types@~15.5.10: +prop-types@15.5.10, prop-types@^15.5.0, prop-types@^15.5.10, prop-types@^15.5.4, prop-types@^15.5.6, prop-types@^15.5.8, prop-types@^15.5.9, prop-types@~15.5.10: version "15.5.10" resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.5.10.tgz#2797dfc3126182e3a95e3dfbb2e893ddd7456154" dependencies: @@ -6316,25 +6293,6 @@ react-apollo@1.4.15: object-assign "^4.0.1" prop-types "^15.5.8" -react-color@^2.11.4: - version "2.13.5" - resolved "https://registry.yarnpkg.com/react-color/-/react-color-2.13.5.tgz#741cbfa2bfca1e86b08d13886051ea2017414043" - dependencies: - lodash "^4.0.1" - material-colors "^1.2.1" - reactcss "^1.2.0" - tinycolor2 "^1.1.2" - -react-datetime@^2.8.10: - version "2.10.1" - resolved "https://registry.yarnpkg.com/react-datetime/-/react-datetime-2.10.1.tgz#25ba863551ae6e5ae80d8a7f99d359ea063c4a38" - dependencies: - "@types/react" ">=15" - create-react-class "^15.5.2" - object-assign "^3.0.0" - prop-types "^15.5.7" - react-onclickoutside "^5.9.0" - react-deep-force-update@^2.0.1: version "2.1.1" resolved "https://registry.yarnpkg.com/react-deep-force-update/-/react-deep-force-update-2.1.1.tgz#8ea4263cd6455a050b37445b3f08fd839d86e909" @@ -6446,12 +6404,6 @@ react-modal@^2.2.4: prop-types "^15.5.10" react-dom-factories "^1.0.0" -react-onclickoutside@^5.9.0: - version "5.11.1" - resolved "https://registry.yarnpkg.com/react-onclickoutside/-/react-onclickoutside-5.11.1.tgz#00314e52567cf55faba94cabbacd119619070623" - dependencies: - create-react-class "^15.5.x" - react-proxy@^3.0.0-alpha.0: version "3.0.0-alpha.1" resolved "https://registry.yarnpkg.com/react-proxy/-/react-proxy-3.0.0-alpha.1.tgz#4400426bcfa80caa6724c7755695315209fa4b07" @@ -6532,12 +6484,6 @@ react-test-renderer@15.6.1: fbjs "^0.8.9" object-assign "^4.1.0" -react-textarea-autosize@^4.3.0: - version "4.3.2" - resolved "https://registry.yarnpkg.com/react-textarea-autosize/-/react-textarea-autosize-4.3.2.tgz#962a52c68caceae408c18acecec29049b81e42fa" - dependencies: - prop-types "^15.5.8" - react-transition-group@^1.1.1, react-transition-group@^1.1.2, react-transition-group@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-1.2.0.tgz#b51fc921b0c3835a7ef7c571c79fc82c73e9204f" @@ -6569,12 +6515,6 @@ react@15, react@15.6.1: object-assign "^4.1.0" prop-types "^15.5.10" -reactcss@^1.2.0: - version "1.2.2" - resolved "https://registry.yarnpkg.com/reactcss/-/reactcss-1.2.2.tgz#41b0ef43e01d54880357c34b11ac1531209350ef" - dependencies: - lodash "^4.0.1" - read-all-stream@^3.0.0: version "3.1.0" resolved "https://registry.yarnpkg.com/read-all-stream/-/read-all-stream-3.1.0.tgz#35c3e177f2078ef789ee4bfafa4373074eaef4fa" @@ -7007,15 +6947,15 @@ semantic-ui-css@2.2.12: dependencies: jquery x.* -semantic-ui-react@0.71.4: - version "0.71.4" - resolved "https://registry.yarnpkg.com/semantic-ui-react/-/semantic-ui-react-0.71.4.tgz#998b4f91a145df1480f3e20a15e7d59b494ee407" +semantic-ui-react@0.72.0: + version "0.72.0" + resolved "https://registry.yarnpkg.com/semantic-ui-react/-/semantic-ui-react-0.72.0.tgz#d3d3f61e2d1e86a7a1d83de551ed6d62e014fbb0" dependencies: - babel-runtime "^6.22.0" - classnames "^2.1.5" - debug "^2.6.3" - lodash "^4.17.2" - prop-types "15.5.8" + babel-runtime "^6.25.0" + classnames "^2.2.5" + debug "^3.0.0" + lodash "^4.17.4" + prop-types "^15.5.10" semver-diff@^2.0.0: version "2.1.0" @@ -7528,10 +7468,6 @@ timers-browserify@^2.0.2: dependencies: setimmediate "^1.0.4" -tinycolor2@^1.1.2: - version "1.4.1" - resolved "https://registry.yarnpkg.com/tinycolor2/-/tinycolor2-1.4.1.tgz#f4fad333447bc0b07d4dc8e9209d8f39a8ac77e8" - tmp@^0.0.31: version "0.0.31" resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.31.tgz#8f38ab9438e17315e5dbd8b3657e8bfb277ae4a7"