github/hedgedoc
1
0
Fork 0
mirror of https://github.com/hedgedoc/hedgedoc.git synced 2024-11-29 02:14:24 -05:00
Code Issues Projects Releases Packages Wiki Activity

Update dependency react-bootstrap to v1.2.1 (#320)

Browse source 
* Update dependency react-bootstrap to v1.2.1

* Fixed sort-button event name

With the upgrade to Bootstrap-React 1.2.1 the ButtonProps extend now React.HTMLAttributes which in favor extends the DOMAttributes interface. This interface defines almost every possible attribute for DOM-/HTML-elements.

Our SortButtonProps interface introduced an onChange event handler with a type matching our condition. With the BS-React upgrade the onChange event must not be redefined/overriden with this type and therefore I renamed it.

* updated react-bootstrap to 1.2.2

* fixed wrong prop name in HistoryToolbar

Co-authored-by: Renovate Bot <bot@renovateapp.com>
Co-authored-by: Erik Michelson <github@erik.michelson.eu>
Co-authored-by: Philip Molares <philip.molares@udo.edu>
This commit is contained in:
renovate[bot] 2020-07-15 23:34:34 +02:00 committed by GitHub
parent 12bd76a8c1
commit 1a5d4f6db8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 48 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
package.json
View file

@ -64,7 +64,7 @@
"moment": "2.27.0", "moment": "2.27.0",
"node-sass": "4.14.1", "node-sass": "4.14.1",
"react": "16.13.1", "react": "16.13.1",
"react-bootstrap": "1.0.1", "react-bootstrap": "1.2.2",
"react-bootstrap-typeahead": "5.1.0", "react-bootstrap-typeahead": "5.1.0",
"react-codemirror2": "7.2.1", "react-codemirror2": "7.2.1",
"react-dom": "16.13.1", "react-dom": "16.13.1",

6
src/components/common/sort-button/sort-button.tsx
View file

@ -22,7 +22,7 @@ const getIcon = (direction: SortModeEnum): IconName => {
} }
export interface SortButtonProps extends ButtonProps { export interface SortButtonProps extends ButtonProps {
onChange: (direction: SortModeEnum) => void onDirectionChange: (direction: SortModeEnum) => void
direction: SortModeEnum direction: SortModeEnum
} }
@ -38,9 +38,9 @@ const toggleDirection = (direction: SortModeEnum) => {
} }
} }
export const SortButton: React.FC<SortButtonProps> = ({ children, variant, onChange, direction }) => { export const SortButton: React.FC<SortButtonProps> = ({ children, variant, onDirectionChange, direction }) => {
const toggleSort = () => { const toggleSort = () => {
onChange(toggleDirection(direction)) onDirectionChange(toggleDirection(direction))
} }
return <IconButton onClick={toggleSort} variant={variant} icon={getIcon(direction)}>{children}</IconButton> return <IconButton onClick={toggleSort} variant={variant} icon={getIcon(direction)}>{children}</IconButton>

4
src/components/landing/pages/history/history-toolbar/history-toolbar.tsx
View file

@ -97,11 +97,11 @@ export const HistoryToolbar: React.FC<HistoryToolbarProps> = ({ onSettingsChange
/> />
</InputGroup> </InputGroup>
<InputGroup className={'mr-1 mb-1'}> <InputGroup className={'mr-1 mb-1'}>
<SortButton onChange={titleSortChanged} direction={state.titleSortDirection} variant={'light'}><Trans <SortButton onDirectionChange={titleSortChanged} direction={state.titleSortDirection} variant={'light'}><Trans
i18nKey={'landing.history.toolbar.sortByTitle'}/></SortButton> i18nKey={'landing.history.toolbar.sortByTitle'}/></SortButton>
</InputGroup> </InputGroup>
<InputGroup className={'mr-1 mb-1'}> <InputGroup className={'mr-1 mb-1'}>
<SortButton onChange={lastVisitedSortChanged} direction={state.lastVisitedSortDirection} <SortButton onDirectionChange={lastVisitedSortChanged} direction={state.lastVisitedSortDirection}
variant={'light'}><Trans i18nKey={'landing.history.toolbar.sortByLastVisited'}/></SortButton> variant={'light'}><Trans i18nKey={'landing.history.toolbar.sortByLastVisited'}/></SortButton>
</InputGroup> </InputGroup>
<InputGroup className={'mr-1 mb-1'}> <InputGroup className={'mr-1 mb-1'}>

54
yarn.lock
View file

@ -1475,6 +1475,11 @@
dependencies: dependencies:
"@babel/types" "^7.3.0" "@babel/types" "^7.3.0"
"@types/classnames@^2.2.10":
version "2.2.10"
resolved "https://registry.yarnpkg.com/@types/classnames/-/classnames-2.2.10.tgz#cc658ca319b6355399efc1f5b9e818f1a24bf999"
integrity sha512-1UzDldn9GfYYEsWWnn/P4wkTlkZDH7lDb0wBMGbtIQc9zXEQq7FlKBdZUn6OBqD8sKZZ2RQO2mAjGpXiDGoRmQ==
"@types/codemirror@0.0.96": "@types/codemirror@0.0.96":
version "0.0.96" version "0.0.96"
resolved "https://registry.yarnpkg.com/@types/codemirror/-/codemirror-0.0.96.tgz#73b52e784a246cebef31d544fef45ea764de5bad" resolved "https://registry.yarnpkg.com/@types/codemirror/-/codemirror-0.0.96.tgz#73b52e784a246cebef31d544fef45ea764de5bad"
@ -1555,6 +1560,11 @@
"@types/domutils" "*" "@types/domutils" "*"
"@types/node" "*" "@types/node" "*"
"@types/invariant@^2.2.33":
version "2.2.33"
resolved "https://registry.yarnpkg.com/@types/invariant/-/invariant-2.2.33.tgz#ec5eec29c63bf5e4ca164e9feb3ef7337cdcbadb"
integrity sha512-/jUNmS8d4bCKdqslfxW6dg/9Gksfzxz67IYfqApHn+HvHlMVXwYv2zpTDnS/yaK9BB0i0GlBTaYci0EFE62Hmw==
"@types/istanbul-lib-coverage@*", "@types/istanbul-lib-coverage@^2.0.0": "@types/istanbul-lib-coverage@*", "@types/istanbul-lib-coverage@^2.0.0":
version "2.0.1" version "2.0.1"
resolved "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.1.tgz#42995b446db9a48a11a07ec083499a860e9138ff" resolved "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.1.tgz#42995b446db9a48a11a07ec083499a860e9138ff"
@ -1660,7 +1670,7 @@
resolved "https://registry.yarnpkg.com/@types/parse-json/-/parse-json-4.0.0.tgz#2f8bb441434d163b35fb8ffdccd7138927ffb8c0" resolved "https://registry.yarnpkg.com/@types/parse-json/-/parse-json-4.0.0.tgz#2f8bb441434d163b35fb8ffdccd7138927ffb8c0"
integrity sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA== integrity sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==
"@types/prop-types@*": "@types/prop-types@*", "@types/prop-types@^15.7.3":
version "15.7.3" version "15.7.3"
resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.3.tgz#2ab0d5da2e5815f94b0b9d4b95d1e5f243ab2ca7" resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.3.tgz#2ab0d5da2e5815f94b0b9d4b95d1e5f243ab2ca7"
integrity sha512-KfRL3PuHmqQLOG+2tGpRO26Ctg+Cq1E01D2DMriKEATHgWLfeNDmq9e29Q9WIky0dQ3NPkd1mzYH8Lm936Z9qw== integrity sha512-KfRL3PuHmqQLOG+2tGpRO26Ctg+Cq1E01D2DMriKEATHgWLfeNDmq9e29Q9WIky0dQ3NPkd1mzYH8Lm936Z9qw==
@ -1747,7 +1757,14 @@
"@types/history" "*" "@types/history" "*"
"@types/react" "*" "@types/react" "*"
"@types/react@*", "@types/react@^16.9.11", "@types/react@^16.9.23": "@types/react-transition-group@^4.4.0":
version "4.4.0"
resolved "https://registry.yarnpkg.com/@types/react-transition-group/-/react-transition-group-4.4.0.tgz#882839db465df1320e4753e6e9f70ca7e9b4d46d"
integrity sha512-/QfLHGpu+2fQOqQaXh8MG9q03bFENooTb/it4jr5kKaZlDQfWvjqWZg48AwzPVMBHlRuTRAY7hRHCEOXz5kV6w==
dependencies:
"@types/react" "*"
"@types/react@*", "@types/react@^16.9.11":
version "16.9.34" version "16.9.34"
resolved "https://registry.yarnpkg.com/@types/react/-/react-16.9.34.tgz#f7d5e331c468f53affed17a8a4d488cd44ea9349" resolved "https://registry.yarnpkg.com/@types/react/-/react-16.9.34.tgz#f7d5e331c468f53affed17a8a4d488cd44ea9349"
integrity sha512-8AJlYMOfPe1KGLKyHpflCg5z46n0b5DbRfqDksxBLBTUpB75ypDBAO9eCUcjNwE6LCUslwTz00yyG/X9gaVtow== integrity sha512-8AJlYMOfPe1KGLKyHpflCg5z46n0b5DbRfqDksxBLBTUpB75ypDBAO9eCUcjNwE6LCUslwTz00yyG/X9gaVtow==
@ -1763,6 +1780,14 @@
"@types/prop-types" "*" "@types/prop-types" "*"
csstype "^2.2.0" csstype "^2.2.0"
"@types/react@^16.9.35":
version "16.9.42"
resolved "https://registry.yarnpkg.com/@types/react/-/react-16.9.42.tgz#9776508d59c1867bbf9bd7f036dab007fdaa1cb7"
integrity sha512-iGy6HwfVfotqJ+PfRZ4eqPHPP5NdPZgQlr0lTs8EfkODRBV9cYy8QMKcC9qPCe1JrESC1Im6SrCFR6tQgg74ag==
dependencies:
"@types/prop-types" "*"
csstype "^2.2.0"
"@types/redux-devtools-extension@2.13.2": "@types/redux-devtools-extension@2.13.2":
version "2.13.2" version "2.13.2"
resolved "https://registry.yarnpkg.com/@types/redux-devtools-extension/-/redux-devtools-extension-2.13.2.tgz#b2e09a8c163b2b0f5072e6a5ac41474000df2111" resolved "https://registry.yarnpkg.com/@types/redux-devtools-extension/-/redux-devtools-extension-2.13.2.tgz#b2e09a8c163b2b0f5072e6a5ac41474000df2111"
@ -9684,21 +9709,26 @@ react-bootstrap-typeahead@5.1.0:
scroll-into-view-if-needed "^2.2.20" scroll-into-view-if-needed "^2.2.20"
warning "^4.0.1" warning "^4.0.1"
react-bootstrap@1.0.1: react-bootstrap@1.2.2:
version "1.0.1" version "1.2.2"
resolved "https://registry.yarnpkg.com/react-bootstrap/-/react-bootstrap-1.0.1.tgz#044b51f34a9db8e17dbfb321a71267a8d6ad11b4" resolved "https://registry.yarnpkg.com/react-bootstrap/-/react-bootstrap-1.2.2.tgz#dbae0c3d4fb20cd545c8efc62f49190f690cea2b"
integrity sha512-xMHwsvDN7sIv26P9wWiosWjITZije2dRCjEJHVfV2KFoSJY+8uv2zttEw0XMB7xviQcW3zuIGLJXuj8vf6lYEg== integrity sha512-G+QcEyBqFtakBNghdDugie+yU/ABDeqw3n+SOeRGxEn1m0dbIyHTroZpectcQk6FB3aS4RJGkZTuLVYH86Cu2A==
dependencies: dependencies:
"@babel/runtime" "^7.4.2" "@babel/runtime" "^7.4.2"
"@restart/context" "^2.1.4" "@restart/context" "^2.1.4"
"@restart/hooks" "^0.3.21" "@restart/hooks" "^0.3.21"
"@types/react" "^16.9.23" "@types/classnames" "^2.2.10"
"@types/invariant" "^2.2.33"
"@types/prop-types" "^15.7.3"
"@types/react" "^16.9.35"
"@types/react-transition-group" "^4.4.0"
"@types/warning" "^3.0.0"
classnames "^2.2.6" classnames "^2.2.6"
dom-helpers "^5.1.2" dom-helpers "^5.1.2"
invariant "^2.2.4" invariant "^2.2.4"
prop-types "^15.7.2" prop-types "^15.7.2"
prop-types-extra "^1.1.0" prop-types-extra "^1.1.0"
react-overlays "^3.1.2" react-overlays "^4.0.0"
react-transition-group "^4.0.0" react-transition-group "^4.0.0"
uncontrollable "^7.0.0" uncontrollable "^7.0.0"
warning "^4.0.3" warning "^4.0.3"
@ -9798,10 +9828,10 @@ react-overlays@^2.0.0:
uncontrollable "^7.0.0" uncontrollable "^7.0.0"
warning "^4.0.3" warning "^4.0.3"
react-overlays@^3.1.2: react-overlays@^4.0.0:
version "3.1.3" version "4.0.0"
resolved "https://registry.yarnpkg.com/react-overlays/-/react-overlays-3.1.3.tgz#e6ac2b43fd2179924491bd794508072399940128" resolved "https://registry.yarnpkg.com/react-overlays/-/react-overlays-4.0.0.tgz#7fbcb60d12fee3733e9e4dd216b225e94fb3befe"
integrity sha512-FH82W0R9lFJm/YCTDeSvEKQxXyTaZmjMEQlAjRhgjQhknTkyMsft+X4Wep5l95QveqdxGVxl/P41WUOzTGJUcw== integrity sha512-LpznWocwgeB5oWKg6cDdkqKP7MbX4ClKbJqgZGUMXPRBBYcqrgM6TjjZ/8DeurNU//GuqwQMjhmo/JVma4XEWw==
dependencies: dependencies:
"@babel/runtime" "^7.4.5" "@babel/runtime" "^7.4.5"
"@popperjs/core" "^2.0.0" "@popperjs/core" "^2.0.0"