yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-16 12:02:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #13687 from strapi/ML-folder/fix-select-tree-disabled

Browse Source 
[ML Folder] Select Tree disabled state
This commit is contained in:
Julie Plantey 2022-07-05 17:19:25 +02:00 committed by GitHub
commit dd38b618e7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
packages/core/helper-plugin/lib/src/components/ReactSelect/utils/getSelectStyles.js
View File

@ -7,24 +7,17 @@ const getSelectStyles = (theme, error) => {
lineHeight: 'normal',
}),
control: (base, state) => {
let border;
let borderBottom;
let border = `1px solid ${theme.colors.neutral200} !important`;
let backgroundColor;
if (state.isFocused) {
border = `1px solid ${theme.colors.primary600} !important`;
border = `1px solid ${theme.colors.primary200} !important`;
} else if (error) {
border = `1px solid ${theme.colors.danger600} !important`;
} else {
border = `1px solid ${theme.colors.neutral200} !important`;
}
if (state.menuIsOpen === true) {
borderBottom = `1px solid ${theme.colors.primary600} !important`;
}
if (state.isDisabled) {
backgroundColor = '#fafafb !important';
backgroundColor = `${theme.colors.neutral150} !important`;
}
return {
@ -35,7 +28,6 @@ const getSelectStyles = (theme, error) => {
outline: 0,
boxShadow: 0,
borderRadius: '2px !important',
borderBottom,
backgroundColor,
borderTopLeftRadius: '4px !important',
borderTopRightRadius: '4px !important',
@ -90,7 +82,15 @@ const getSelectStyles = (theme, error) => {
};
},
placeholder: base => ({ ...base, marginLeft: 0 }),
singleValue: base => ({ ...base, marginLeft: 0, color: theme.colors.neutral800 }),
singleValue: (base, state) => {
let color = theme.colors.neutral800;
if (state.isDisabled) {
color = theme.colors.neutral600;
}
return { ...base, marginLeft: 0, color };
},
valueContainer: base => ({
...base,
padding: 0,

2
packages/core/upload/admin/src/components/EditAssetDialog/index.js
View File

@ -270,7 +270,7 @@ export const EditAssetDialog = ({
}}
menuPortalTarget={document.querySelector('body')}
inputId="asset-folder"
disabled={formDisabled}
isDisabled={formDisabled}
error={errors?.parent}
ariaErrorMessage="folder-parent-error"
/>

1
packages/core/upload/admin/src/components/EditFolderDialog/EditFolderDialog.js
View File

@ -201,6 +201,7 @@ export const EditFolderDialog = ({ onClose, folder, parentFolderId }) => {
onChange={value => {
setFieldValue('parent', value);
}}
isDisabled={formDisabled}
defaultValue={values.parent}
name="parent"
menuPortalTarget={document.querySelector('body')}