From f383fbb6a7ed21c5014638c81ff516830ba5222e Mon Sep 17 00:00:00 2001 From: ronronscelestes Date: Tue, 5 Jul 2022 16:14:51 +0200 Subject: [PATCH] feedback fixes --- .../ReactSelect/utils/getSelectStyles.js | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/packages/core/helper-plugin/lib/src/components/ReactSelect/utils/getSelectStyles.js b/packages/core/helper-plugin/lib/src/components/ReactSelect/utils/getSelectStyles.js index 97077646a2..a1978e20e1 100644 --- a/packages/core/helper-plugin/lib/src/components/ReactSelect/utils/getSelectStyles.js +++ b/packages/core/helper-plugin/lib/src/components/ReactSelect/utils/getSelectStyles.js @@ -7,22 +7,13 @@ 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 if (state.isDisabled) { - border = `1px solid ${theme.colors.neutral200} !important`; - } else { - border = `1px solid ${theme.colors.neutral200} !important`; - } - - if (state.menuIsOpen === true) { - borderBottom = `1px solid ${theme.colors.primary600} !important`; } if (state.isDisabled) { @@ -37,7 +28,6 @@ const getSelectStyles = (theme, error) => { outline: 0, boxShadow: 0, borderRadius: '2px !important', - borderBottom, backgroundColor, borderTopLeftRadius: '4px !important', borderTopRightRadius: '4px !important', @@ -93,12 +83,10 @@ const getSelectStyles = (theme, error) => { }, placeholder: base => ({ ...base, marginLeft: 0 }), singleValue: (base, state) => { - let color; + let color = theme.colors.neutral800; if (state.isDisabled) { color = theme.colors.neutral600; - } else { - color = theme.colors.neutral800; } return { ...base, marginLeft: 0, color };