Skip to content

Commit

Permalink
Update antd to version 4.24.15 (#7505)
Browse files Browse the repository at this point in the history
* bump antd to version 4.24.15

* add version resolution for lib rc-tree for antd 4.24.15 update

* prevent React event handler error

* updated changelog

* apply PR feedback

---------

Co-authored-by: Philipp Otto <philippotto@users.noreply.github.com>
  • Loading branch information
hotzenklotz and philippotto committed Jan 15, 2024
1 parent 5ebdee9 commit 05891c2
Show file tree
Hide file tree
Showing 4 changed files with 233 additions and 150 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.unreleased.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ For upgrade instructions, please check the [migration guide](MIGRATIONS.released
- Updated some dependencies of the backend code (play 2.9, sbt 1.9, minor upgrades for others) for optimized performance. [#7366](https://github.com/scalableminds/webknossos/pull/7366)
- Processing jobs can now be distributed to multiple webknossos-workers with finer-grained configurability. Compare migration guide. [#7463](https://github.com/scalableminds/webknossos/pull/7463)
- Removed Swagger/OpenAPI json description of the HTTP API. [#7494](https://github.com/scalableminds/webknossos/pull/7494)
- Updated antd UI library from version 4.24.8 to 4.24.15. [#7505](https://github.com/scalableminds/webknossos/pull/7505)
- Changed the default dataset search mode to also search in subfolders. [#7539](https://github.com/scalableminds/webknossos/pull/7539)

### Fixed
Expand Down
5 changes: 3 additions & 2 deletions frontend/javascripts/oxalis/view/action-bar/toolbar_view.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,7 @@ function RadioButtonWithTooltip({
disabledTitle,
disabled,
onClick,
onOpenChange,
...props
}: {
title: string | React.ReactNode;
Expand All @@ -194,10 +195,9 @@ function RadioButtonWithTooltip({
onOpenChange?: (open: boolean) => void;
}) {
return (
<Tooltip title={disabled ? disabledTitle : title} onOpenChange={props.onOpenChange}>
<Tooltip title={disabled ? disabledTitle : title} onOpenChange={onOpenChange}>
<Radio.Button
disabled={disabled}
{...props}
onClick={(evt) => {
if (document.activeElement) {
(document.activeElement as HTMLElement).blur();
Expand All @@ -206,6 +206,7 @@ function RadioButtonWithTooltip({
onClick(evt);
}
}}
{...props}
/>
</Tooltip>
);
Expand Down
5 changes: 3 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@
"@types/three": "^0.142.0",
"@zip.js/zip.js": "^2.6.81",
"ansi-to-react": "^6.1.6",
"antd": "^4.24.8",
"antd": "^4.24.15",
"ball-morphology": "^0.1.0",
"base64-js": "^1.2.1",
"beautiful-react-hooks": "^3.11.1",
Expand Down Expand Up @@ -234,7 +234,8 @@
},
"resolutions": {
"**/mini-store": "^1.1.0",
"**/redux": "3.7.2"
"**/redux": "3.7.2",
"**/rc-tree": "^5.7.12"
},
"ava": {
"files": [
Expand Down
Loading

0 comments on commit 05891c2

Please sign in to comment.