Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
I
interface
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
LuckySwap
interface
Commits
86785c72
Unverified
Commit
86785c72
authored
Sep 26, 2022
by
lynn
Committed by
GitHub
Sep 26, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: simplify search bar filter string handling and reduce # of state changes (#4716)
fix search bar filter handling
parent
10fe7f52
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
18 deletions
+8
-18
SearchBar.tsx
src/components/Tokens/TokenTable/SearchBar.tsx
+7
-8
index.tsx
src/pages/Tokens/index.tsx
+1
-10
No files found.
src/components/Tokens/TokenTable/SearchBar.tsx
View file @
86785c72
...
@@ -2,7 +2,7 @@ import { Trans } from '@lingui/macro'
...
@@ -2,7 +2,7 @@ import { Trans } from '@lingui/macro'
import
searchIcon
from
'
assets/svg/search.svg
'
import
searchIcon
from
'
assets/svg/search.svg
'
import
xIcon
from
'
assets/svg/x.svg
'
import
xIcon
from
'
assets/svg/x.svg
'
import
useDebounce
from
'
hooks/useDebounce
'
import
useDebounce
from
'
hooks/useDebounce
'
import
{
use
AtomValue
,
useUpdateAtom
}
from
'
jotai/utils
'
import
{
use
ResetAtom
,
useUpdateAtom
}
from
'
jotai/utils
'
import
{
useEffect
,
useState
}
from
'
react
'
import
{
useEffect
,
useState
}
from
'
react
'
import
styled
from
'
styled-components/macro
'
import
styled
from
'
styled-components/macro
'
...
@@ -59,18 +59,17 @@ const SearchInput = styled.input`
...
@@ -59,18 +59,17 @@ const SearchInput = styled.input`
`
`
export
default
function
SearchBar
()
{
export
default
function
SearchBar
()
{
const
currentString
=
useAtomValue
(
filterStringAtom
)
const
[
localFilterString
,
setLocalFilterString
]
=
useState
(
''
)
const
[
localFilterString
,
setLocalFilterString
]
=
useState
(
currentString
)
const
setFilterString
=
useUpdateAtom
(
filterStringAtom
)
const
setFilterString
=
useUpdateAtom
(
filterStringAtom
)
const
resetFilterString
=
useResetAtom
(
filterStringAtom
)
const
debouncedLocalFilterString
=
useDebounce
(
localFilterString
,
300
)
const
debouncedLocalFilterString
=
useDebounce
(
localFilterString
,
300
)
useEffect
(()
=>
{
setLocalFilterString
(
currentString
)
},
[
currentString
])
useEffect
(()
=>
{
useEffect
(()
=>
{
setFilterString
(
debouncedLocalFilterString
)
setFilterString
(
debouncedLocalFilterString
)
},
[
debouncedLocalFilterString
,
setFilterString
])
return
()
=>
{
resetFilterString
()
}
},
[
debouncedLocalFilterString
,
setFilterString
,
resetFilterString
])
return
(
return
(
<
SearchBarContainer
>
<
SearchBarContainer
>
...
...
src/pages/Tokens/index.tsx
View file @
86785c72
...
@@ -2,7 +2,6 @@ import { Trans } from '@lingui/macro'
...
@@ -2,7 +2,6 @@ import { Trans } from '@lingui/macro'
import
{
PageName
}
from
'
analytics/constants
'
import
{
PageName
}
from
'
analytics/constants
'
import
{
Trace
}
from
'
analytics/Trace
'
import
{
Trace
}
from
'
analytics/Trace
'
import
{
MAX_WIDTH_MEDIA_BREAKPOINT
,
MEDIUM_MEDIA_BREAKPOINT
}
from
'
components/Tokens/constants
'
import
{
MAX_WIDTH_MEDIA_BREAKPOINT
,
MEDIUM_MEDIA_BREAKPOINT
}
from
'
components/Tokens/constants
'
import
{
filterStringAtom
}
from
'
components/Tokens/state
'
import
FavoriteButton
from
'
components/Tokens/TokenTable/FavoriteButton
'
import
FavoriteButton
from
'
components/Tokens/TokenTable/FavoriteButton
'
import
NetworkFilter
from
'
components/Tokens/TokenTable/NetworkFilter
'
import
NetworkFilter
from
'
components/Tokens/TokenTable/NetworkFilter
'
import
SearchBar
from
'
components/Tokens/TokenTable/SearchBar
'
import
SearchBar
from
'
components/Tokens/TokenTable/SearchBar
'
...
@@ -11,9 +10,7 @@ import TokenTable, { LoadingTokenTable } from 'components/Tokens/TokenTable/Toke
...
@@ -11,9 +10,7 @@ import TokenTable, { LoadingTokenTable } from 'components/Tokens/TokenTable/Toke
import
{
FavoriteTokensVariant
,
useFavoriteTokensFlag
}
from
'
featureFlags/flags/favoriteTokens
'
import
{
FavoriteTokensVariant
,
useFavoriteTokensFlag
}
from
'
featureFlags/flags/favoriteTokens
'
import
{
isValidBackendChainName
}
from
'
graphql/data/util
'
import
{
isValidBackendChainName
}
from
'
graphql/data/util
'
import
{
useOnGlobalChainSwitch
}
from
'
hooks/useGlobalChainSwitch
'
import
{
useOnGlobalChainSwitch
}
from
'
hooks/useGlobalChainSwitch
'
import
{
useResetAtom
}
from
'
jotai/utils
'
import
{
useNavigate
}
from
'
react-router-dom
'
import
{
useEffect
}
from
'
react
'
import
{
useLocation
,
useNavigate
}
from
'
react-router-dom
'
import
styled
from
'
styled-components/macro
'
import
styled
from
'
styled-components/macro
'
import
{
ThemedText
}
from
'
theme
'
import
{
ThemedText
}
from
'
theme
'
...
@@ -70,12 +67,6 @@ const FiltersWrapper = styled.div`
...
@@ -70,12 +67,6 @@ const FiltersWrapper = styled.div`
`
`
const
Tokens
=
()
=>
{
const
Tokens
=
()
=>
{
const
resetFilterString
=
useResetAtom
(
filterStringAtom
)
const
location
=
useLocation
()
useEffect
(()
=>
{
resetFilterString
()
},
[
location
,
resetFilterString
])
const
navigate
=
useNavigate
()
const
navigate
=
useNavigate
()
useOnGlobalChainSwitch
((
chain
)
=>
{
useOnGlobalChainSwitch
((
chain
)
=>
{
if
(
isValidBackendChainName
(
chain
))
navigate
(
`/tokens/
${
chain
.
toLowerCase
()}
`
)
if
(
isValidBackendChainName
(
chain
))
navigate
(
`/tokens/
${
chain
.
toLowerCase
()}
`
)
...
...
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