Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update antd to version 4.24.15 #7505

Merged
merged 11 commits into from
Jan 15, 2024
Merged

Update antd to version 4.24.15 #7505

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
96be333
bump antd to version 4.24.15
hotzenklotz Dec 15, 2023
e5a7ed4
Merge branch 'master' into antd-4.24.15
hotzenklotz Jan 2, 2024
4c5960c
add version resolution for lib rc-tree for antd 4.24.15 update
hotzenklotz Jan 2, 2024
8f34fb3
prevent React event handler error
hotzenklotz Jan 3, 2024
d6ebf56
updated changelog
hotzenklotz Jan 3, 2024
07ae009
Merge branch 'master' of github.com:scalableminds/webknossos into ant…
hotzenklotz Jan 3, 2024
a7af32d
Merge branch 'master' of github.com:scalableminds/webknossos into ant…
hotzenklotz Jan 4, 2024
68e747b
apply PR feedback
hotzenklotz Jan 5, 2024
90b64af
Merge branch 'master' into antd-4.24.15
philippotto Jan 8, 2024
3ed6f17
Merge branch 'master' into antd-4.24.15
hotzenklotz Jan 9, 2024
2d8139d
Merge branch 'master' into antd-4.24.15
philippotto Jan 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.unreleased.md
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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"
Copy link
Member Author

@hotzenklotz hotzenklotz Jan 2, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For some reason, there were several versions of rc-tree, including older ones, being imported by yarn. That leads to typescript errors are necessitates this fix.

See als Slack conversion for reference: https://scm.slack.com/archives/C5AKLAV0B/p1704200386030179

This can likely be remove in antd5.

},
"ava": {
"files": [
Expand Down
Loading