Skip to content

Commit 398fb81

Browse files
committed
UGN-371 bugfix - remove deprecated chakra-react-select styles, fix input alignment issues, fix theme colors application.
1 parent 1e23d8b commit 398fb81

File tree

2 files changed

+31
-41
lines changed

2 files changed

+31
-41
lines changed

src/components/Selects/MatchColumnSelect.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ export const MatchColumnSelect = ({ onChange, value, options, placeholder, name
1717
<Select<SelectOption, false>
1818
value={value || null}
1919
colorScheme="gray"
20+
useBasicStyles
2021
onChange={onChange}
2122
placeholder={placeholder}
2223
options={options}

src/theme.ts

Lines changed: 30 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -217,44 +217,16 @@ export const themeOverrides = {
217217
},
218218
},
219219
select: {
220-
dropdownIndicator: (provided) => ({
221-
...provided,
222-
background: "none",
223-
border: "none",
224-
p: 0,
225-
w: "40px",
226-
color: "textColor",
227-
}),
228220
control: (provided) => ({
229221
...provided,
230-
background: "none",
231-
borderRadius: "6px",
232-
p: 0,
233-
// _focus, _hover, _invalid, _readonly pseudoselectors can be used here for alternate border colors
234-
_focus: undefined,
235-
}),
236-
input: (provided) => ({
237-
...provided,
238-
background: "none",
239-
border: "none",
240-
p: 0,
241-
}),
242-
indicatorSeparator: (provided) => ({
243-
...provided,
244-
opacity: 0,
245-
}),
246-
singleValue: (provided) => ({
247-
...provided,
248-
ml: 0,
249-
mr: 0,
250-
}),
251-
placeholder: (provided) => ({
252-
...provided,
253-
color: "inactiveColor",
254-
}),
255-
valueContainer: (provided) => ({
256-
...provided,
257-
color: "textColor",
222+
borderColor: "border",
223+
_hover: {
224+
borderColor: "border",
225+
},
226+
["&[data-focus-visible]"]: {
227+
borderColor: "border",
228+
boxShadow: "none",
229+
},
258230
}),
259231
menu: (provided) => ({
260232
...provided,
@@ -264,12 +236,12 @@ export const themeOverrides = {
264236
menuList: (provided) => ({
265237
...provided,
266238
bg: "background",
267-
minW: "initial",
239+
borderColor: "border",
268240
}),
269241
option: (provided, state) => ({
270242
...provided,
271243
color: "textColor",
272-
bg: state.isSelected || state.isFocused ? "highlight" : provided.bg,
244+
bg: state.isSelected || state.isFocused ? "highlight" : "background",
273245
overflow: "hidden",
274246
textOverflow: "ellipsis",
275247
display: "block",
@@ -278,6 +250,14 @@ export const themeOverrides = {
278250
bg: "highlight",
279251
},
280252
}),
253+
placeholder: (provided) => ({
254+
...provided,
255+
color: "inactiveColor",
256+
}),
257+
noOptionsMessage: (provided) => ({
258+
...provided,
259+
color: "inactiveColor",
260+
}),
281261
} as ChakraStylesConfig<SelectOption>,
282262
},
283263
},
@@ -292,24 +272,33 @@ export const themeOverrides = {
292272
...provided,
293273
py: 0,
294274
px: 1.5,
295-
color: "gray.400",
296275
}),
297276
inputContainer: (provided) => ({ ...provided, py: 0 }),
298277
control: (provided) => ({ ...provided, border: "none" }),
278+
input: (provided) => ({ ...provided, color: "textColor" }),
299279
menu: (provided) => ({
300280
...provided,
301281
p: 0,
302282
mt: 0,
303283
}),
284+
menuList: (provided) => ({
285+
...provided,
286+
bg: "background",
287+
borderColor: "border",
288+
}),
304289
option: (provided, state) => ({
305290
...provided,
306-
color: state.isSelected ? "gray.900" : provided.color,
307-
bg: state.isSelected || state.isFocused ? "secondaryBackground" : provided.bg,
291+
color: "textColor",
292+
bg: state.isSelected || state.isFocused ? "highlight" : "background",
308293
overflow: "hidden",
309294
textOverflow: "ellipsis",
310295
display: "block",
311296
whiteSpace: "nowrap",
312297
}),
298+
noOptionsMessage: (provided) => ({
299+
...provided,
300+
color: "inactiveColor",
301+
}),
313302
} as ChakraStylesConfig<SelectOption>,
314303
},
315304
},

0 commit comments

Comments
 (0)