Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
F
frontend
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
vicotor
frontend
Commits
d99fe2d6
Commit
d99fe2d6
authored
Jul 31, 2024
by
tom
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'release/v1_33_0-fixes' of github.com:blockscout/frontend into release/v1_33_0-fixes
parents
271447cb
ec539c44
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
7 deletions
+10
-7
AddressMudTable.tsx
ui/address/mud/AddressMudTable.tsx
+1
-1
TableColumnFilterWrapper.tsx
ui/shared/filters/TableColumnFilterWrapper.tsx
+9
-6
No files found.
ui/address/mud/AddressMudTable.tsx
View file @
d99fe2d6
...
@@ -76,7 +76,7 @@ const AddressMudTable = ({ scrollRef, tableId, isQueryEnabled = true }: Props) =
...
@@ -76,7 +76,7 @@ const AddressMudTable = ({ scrollRef, tableId, isQueryEnabled = true }: Props) =
}
}
const
filtersTags
=
hasActiveFilters
?
(
const
filtersTags
=
hasActiveFilters
?
(
<
HStack
gap=
{
3
}
mb=
{
1
}
>
<
HStack
gap=
{
3
}
mb=
{
1
}
flexWrap=
"wrap"
>
{
Object
.
entries
(
filters
).
map
(([
key
,
value
])
=>
{
{
Object
.
entries
(
filters
).
map
(([
key
,
value
])
=>
{
const
index
=
key
as
FilterKeys
===
'
filter_key0
'
?
0
:
1
;
const
index
=
key
as
FilterKeys
===
'
filter_key0
'
?
0
:
1
;
return
(
return
(
...
...
ui/shared/filters/TableColumnFilterWrapper.tsx
View file @
d99fe2d6
...
@@ -5,6 +5,7 @@ import {
...
@@ -5,6 +5,7 @@ import {
useDisclosure
,
useDisclosure
,
IconButton
,
IconButton
,
chakra
,
chakra
,
Portal
,
}
from
'
@chakra-ui/react
'
;
}
from
'
@chakra-ui/react
'
;
import
React
from
'
react
'
;
import
React
from
'
react
'
;
...
@@ -32,7 +33,7 @@ const TableColumnFilterWrapper = ({ columnName, isActive, className, children, i
...
@@ -32,7 +33,7 @@ const TableColumnFilterWrapper = ({ columnName, isActive, className, children, i
);
);
return
(
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
>
<
PopoverTrigger
>
<
IconButton
<
IconButton
onClick=
{
onToggle
}
onClick=
{
onToggle
}
...
@@ -47,11 +48,13 @@ const TableColumnFilterWrapper = ({ columnName, isActive, className, children, i
...
@@ -47,11 +48,13 @@ const TableColumnFilterWrapper = ({ columnName, isActive, className, children, i
color=
"text_secondary"
color=
"text_secondary"
/>
/>
</
PopoverTrigger
>
</
PopoverTrigger
>
<
PopoverContent
className=
{
className
}
>
<
Portal
>
<
PopoverBody
px=
{
4
}
py=
{
6
}
display=
"flex"
flexDir=
"column"
rowGap=
{
3
}
>
<
PopoverContent
className=
{
className
}
>
{
modifiedChildren
}
<
PopoverBody
px=
{
4
}
py=
{
6
}
display=
"flex"
flexDir=
"column"
rowGap=
{
3
}
>
</
PopoverBody
>
{
modifiedChildren
}
</
PopoverContent
>
</
PopoverBody
>
</
PopoverContent
>
</
Portal
>
</
Popover
>
</
Popover
>
);
);
};
};
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment