diff --git a/frontend/src/Editor/Components/Table/Filter.jsx b/frontend/src/Editor/Components/Table/Filter.jsx index 7b31aedf51..6a35e75568 100644 --- a/frontend/src/Editor/Components/Table/Filter.jsx +++ b/frontend/src/Editor/Components/Table/Filter.jsx @@ -1,11 +1,12 @@ import React from 'react'; -import SelectSearch, { fuzzySearch } from 'react-select-search'; +import Select from '@/_ui/Select'; +import defaultStyles from '@/_ui/Select/styles'; import { useTranslation } from 'react-i18next'; export function Filter(props) { const { t } = useTranslation(); - const { mergeToFilterDetails, filterDetails, setAllFilters } = props; + const { mergeToFilterDetails, filterDetails, setAllFilters, darkMode } = props; const { filters } = filterDetails; function filterColumnChanged(index, value) { @@ -61,6 +62,16 @@ export function Filter(props) { setAllFilters([]); } + const selectStyles = (width) => { + return { + ...defaultStyles(darkMode, width), + menuPortal: (provided) => ({ ...provided, zIndex: 999 }), + menuList: (base) => ({ + ...base, + }), + }; + }; + return (
@@ -80,19 +91,19 @@ export function Filter(props) { {index > 0 ? 'and' : 'where'}
- { filterColumnChanged(index, value); }} - filterOptions={fuzzySearch} placeholder={t('globals.select', 'Select') + '...'} + styles={selectStyles('100%')} />
- { filterOperationChanged(index, value); }} - filterOptions={fuzzySearch} - placeholder="Select.." + placeholder={t('globals.select', 'Select') + '...'} + styles={selectStyles('100%')} />
@@ -125,7 +136,7 @@ export function Filter(props) {