Skip to content

Commit

Permalink
Ad UI 9632 combobox style (#3641)
Browse files Browse the repository at this point in the history
* fix(combobox): add style for comboboxsearch

* feat(combobox): +focus primary border

* feat(combobox): fix import style order
  • Loading branch information
FelixBlaisThon authored Mar 19, 2024
1 parent ec5bfb3 commit 67d466c
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 3 deletions.
10 changes: 10 additions & 0 deletions packages/mantine/src/styles/Combobox.module.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
.search {
margin: 0;
border-radius: 8px;
border: 1px solid;
width: 100%;
border-color: var(--mantine-color-gray-4);
&:focus {
border-color: var(--mantine-primary-color-filled);
}
}
12 changes: 10 additions & 2 deletions packages/mantine/src/theme/Theme.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {CheckSize16Px, InfoSize24Px} from '@coveord/plasma-react-icons';
import {CheckSize16Px, FilterSize16Px, InfoSize24Px} from '@coveord/plasma-react-icons';
import {color} from '@coveord/plasma-tokens';
import {
ActionIcon,
Expand All @@ -10,6 +10,7 @@ import {
Checkbox,
ColorSwatch,
Combobox,
ComboboxSearch,
Divider,
InputWrapper,
List,
Expand Down Expand Up @@ -43,6 +44,7 @@ import AppShellNavBarClasses from '../styles/AppShellNavBar.module.css';
import BadgeClasses from '../styles/Badge.module.css';
import ButtonClasses from '../styles/Button.module.css';
import CheckboxClasses from '../styles/Checkbox.module.css';
import ComboboxClasses from '../styles/Combobox.module.css';
import DatePickerClasses from '../styles/DatePicker.module.css';
import InputWrapperClasses from '../styles/InputWrapper.module.css';
import ListClasses from '../styles/List.module.css';
Expand Down Expand Up @@ -245,7 +247,13 @@ export const plasmaTheme: MantineThemeOverride = createTheme({
classNames: {input: SelectClasses.input, option: SelectClasses.option},
}),
Combobox: Combobox.extend({
classNames: {option: SelectClasses.option},
classNames: {option: SelectClasses.option, search: ComboboxClasses.search},
}),
ComboboxSearch: ComboboxSearch.extend({
defaultProps: {
placeholder: 'Search...',
rightSection: <FilterSize16Px height={16} color="gray.5" />,
},
}),
NavLink: NavLink.extend({classNames: NavLinkClasses}),
AppShellNavbar: AppShellNavbar.extend({
Expand Down
2 changes: 1 addition & 1 deletion packages/website/src/App.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import {AppShell, Notifications, Plasmantine} from '@coveord/plasma-mantine';
import '@mantine/core/styles.css';
import '@mantine/dates/styles.css';
import '@mantine/notifications/styles.css';
import {AppShell, Notifications, Plasmantine} from '@coveord/plasma-mantine';
import {Provider} from 'react-redux';
import {Outlet} from 'react-router-dom';
import {Navigation} from './Navigation';
Expand Down

0 comments on commit 67d466c

Please sign in to comment.