Skip to content

Commit

Permalink
Merge branch 'release/v1_33_0-fixes' of github.com:blockscout/fronten…
Browse files Browse the repository at this point in the history
…d into release/v1_33_0-fixes
  • Loading branch information
tom2drum committed Jul 31, 2024
2 parents 271447c + ec539c4 commit d99fe2d
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 7 deletions.
2 changes: 1 addition & 1 deletion ui/address/mud/AddressMudTable.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ const AddressMudTable = ({ scrollRef, tableId, isQueryEnabled = true }: Props) =
}

const filtersTags = hasActiveFilters ? (
<HStack gap={ 3 } mb={ 1 }>
<HStack gap={ 3 } mb={ 1 } flexWrap="wrap">
{ Object.entries(filters).map(([ key, value ]) => {
const index = key as FilterKeys === 'filter_key0' ? 0 : 1;
return (
Expand Down
15 changes: 9 additions & 6 deletions ui/shared/filters/TableColumnFilterWrapper.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import {
useDisclosure,
IconButton,
chakra,
Portal,
} from '@chakra-ui/react';
import React from 'react';

Expand Down Expand Up @@ -32,7 +33,7 @@ const TableColumnFilterWrapper = ({ columnName, isActive, className, children, i
);

return (
<Popover isOpen={ isOpen } onClose={ onClose } placement="bottom-start" isLazy lazyBehavior="unmount" strategy="fixed">
<Popover isOpen={ isOpen } onClose={ onClose } placement="bottom-start" isLazy lazyBehavior="unmount">
<PopoverTrigger>
<IconButton
onClick={ onToggle }
Expand All @@ -47,11 +48,13 @@ const TableColumnFilterWrapper = ({ columnName, isActive, className, children, i
color="text_secondary"
/>
</PopoverTrigger>
<PopoverContent className={ className }>
<PopoverBody px={ 4 } py={ 6 } display="flex" flexDir="column" rowGap={ 3 }>
{ modifiedChildren }
</PopoverBody>
</PopoverContent>
<Portal>
<PopoverContent className={ className }>
<PopoverBody px={ 4 } py={ 6 } display="flex" flexDir="column" rowGap={ 3 }>
{ modifiedChildren }
</PopoverBody>
</PopoverContent>
</Portal>
</Popover>
);
};
Expand Down

0 comments on commit d99fe2d

Please sign in to comment.