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

update react select package #3622

Merged
merged 7 commits into from
Sep 22, 2023
Merged

update react select package #3622

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
51f902f
update react select package
Sofien-Sellami Aug 29, 2023
e202346
fix select style
Sofien-Sellami Sep 19, 2023
6cd1f2f
update react select package
Sofien-Sellami Aug 29, 2023
92cf20c
fix select style
Sofien-Sellami Sep 19, 2023
b92f065
Merge remote-tracking branch 'origin/upgrade_react-select_package' in…
Sofien-Sellami Sep 22, 2023
7a9c444
Merge branch 'OHIF:master' into upgrade_react-select_package
Sofien-Sellami Sep 22, 2023
255f47e
fix deploy and dropdown
sedghi Sep 22, 2023
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
8 changes: 4 additions & 4 deletions extensions/cornerstone-dicom-seg/.webpack/webpack.prod.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,10 @@ module.exports = (env, argv) => {
new webpack.optimize.LimitChunkCountPlugin({
maxChunks: 1,
}),
// new MiniCssExtractPlugin({
// filename: `./dist/${outputName}.css`,
// chunkFilename: `./dist/${outputName}.css`,
// }),
new MiniCssExtractPlugin({
filename: `./dist/${outputName}.css`,
chunkFilename: `./dist/${outputName}.css`,
}),
],
});
};
2 changes: 0 additions & 2 deletions platform/app/src/routes/WorkList/WorkList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -336,8 +336,6 @@ function WorkList({
>
<div className="flex flex-row gap-2">
{appConfig.loadedModes.map((mode, i) => {
const isFirst = i === 0;

const modalitiesToCheck = modalities.replaceAll('/', '\\');

const isValidMode = mode.isValidMode({
Expand Down
2 changes: 1 addition & 1 deletion platform/ui/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
"react-error-boundary": "^3.1.3",
"react-modal": "3.11.2",
"react-outside-click-handler": "^1.3.0",
"react-select": "3.0.8",
"react-select": "5.7.4",
"react-window": "^1.8.9",
"react-with-direction": "^1.3.1",
"swiper": "^8.4.2",
Expand Down
1 change: 1 addition & 0 deletions platform/ui/src/components/Header/Header.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ function Header({
id="options"
showDropdownIcon={false}
list={menuOptions}
alignment="right"
>
<IconButton
id={'options-settings-icon'}
Expand Down
20 changes: 6 additions & 14 deletions platform/ui/src/components/Select/Select.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,13 @@
}

.customSelect__wrapper .customSelect__option {
color: #d6d6d6;
font-size: 14px;
display: flex;
align-items: center;
@apply flex flex-row items-center;
}

.customSelect__wrapper .customSelect__option:focus {
@apply bg-primary-main;
}

.customSelect__wrapper .customSelect__option--is-selected {
@apply bg-transparent;
}
Expand All @@ -55,7 +55,7 @@
@apply inline-block truncate px-3 py-2;
}

.customSelect__menu {
.ohif-select .customSelect__menu {
background-color: transparent !important;
border-radius: 6px;
}
Expand All @@ -79,18 +79,10 @@
border-radius: 10px;
}

.customSelect__option:focus {
.customSelect__option--is-focused {
background-color: #0944b391 !important;
}

.ohif-select .customSelect__option,
.ohif-select .customSelect__option label {
color: #d6d6d6;
font-size: 14px;
display: flex;
align-items: center;
}

.ohif-select .customSelect__option:hover {
background-color: #0944b391;
}
Expand Down
47 changes: 0 additions & 47 deletions platform/ui/src/tailwind.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,51 +25,4 @@ body {
height: 2.1rem;
}

.customSelect__menu {
background-color: transparent !important;
border-radius: 6px;
}

.css-4ljt47-MenuList {
overflow-x: hidden !important;
margin-right: 4px;
margin-top: 4px;
padding-top: 0px !important;
}
.css-4ljt47-MenuList::-webkit-scrollbar {
width: 6px;
border-radius: 10px;
}

.css-4ljt47-MenuList::-webkit-scrollbar-thumb {
background-color: #0944b3;
border-radius: 10px;
}

.customSelect__option:focus {
background-color: #0944b391 !important;
}
.customSelect__option label {
color: #d6d6d6;
font-size: 14px;
display: flex;
align-items: center;
}

.css-1n7v3ny-option {
background-color: #0944b391 !important;
}

.css-1n7v3ny-option:focus {
background-color: #0944b391 !important;
}

.customSelect__option:hover {
background-color: #0944b391;
}

.css-26l3qy-menu {
border: 2px solid #0944b3;
border-radius: 6px;
background-color: #151515 !important;
}
Loading