diff --git a/package/src/components/DataTableFilter/DataTableFilter.js b/package/src/components/DataTableFilter/DataTableFilter.js index 28fca598..17f8cea9 100644 --- a/package/src/components/DataTableFilter/DataTableFilter.js +++ b/package/src/components/DataTableFilter/DataTableFilter.js @@ -109,6 +109,7 @@ const DataTableFilter = React.forwardRef(function DataTableFilter(props, ref) { control={} label={label} disabled={isDisabled} + checked={Array.isArray(value) && value.includes(optionValue)} /> ); @@ -117,9 +118,15 @@ const DataTableFilter = React.forwardRef(function DataTableFilter(props, ref) { menuItems = ( onSelect(event.target.value)} - defaultValue={value} + value={value || ""} aria-label={title} > + } + value="" + /> {options.map((option, index) => { const { label, @@ -151,9 +158,14 @@ const DataTableFilter = React.forwardRef(function DataTableFilter(props, ref) { {title} - - {menuItems} - + + + {menuItems} + + + ); @@ -189,6 +201,11 @@ const DataTableFilter = React.forwardRef(function DataTableFilter(props, ref) { {menuItems} + + + );