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
9470c49d
Unverified
Commit
9470c49d
authored
Mar 18, 2022
by
Zach Pomerantz
Committed by
GitHub
Mar 18, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: fix loading delays for cached data (#3549)
* fix: loading transition * fix: add check to usePoll
parent
e1abd81a
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
4 deletions
+7
-4
loading.ts
src/lib/css/loading.ts
+1
-1
useClientSideSmartOrderRouterTrade.ts
src/lib/hooks/routing/useClientSideSmartOrderRouterTrade.ts
+2
-2
usePoll.ts
src/lib/hooks/usePoll.ts
+4
-1
No files found.
src/lib/css/loading.ts
View file @
9470c49d
...
@@ -10,5 +10,5 @@ export const loadingCss = css`
...
@@ -10,5 +10,5 @@ export const loadingCss = css`
// need to use isLoading as `loading` is a reserved prop
// need to use isLoading as `loading` is a reserved prop
export
const
loadingTransitionCss
=
css
<
{
isLoading
:
boolean
}
>
`
export
const
loadingTransitionCss
=
css
<
{
isLoading
:
boolean
}
>
`
${({
isLoading
})
=>
isLoading
&&
loadingCss
}
;
${({
isLoading
})
=>
isLoading
&&
loadingCss
}
;
transition: opacity
0.2
s ease-in-out;
transition: opacity
${({
isLoading
})
=>
(
isLoading
?
0
:
0.2
)}
s ease-in-out;
`
`
src/lib/hooks/routing/useClientSideSmartOrderRouterTrade.ts
View file @
9470c49d
...
@@ -80,7 +80,7 @@ export default function useClientSideSmartOrderRouterTrade<TTradeType extends Tr
...
@@ -80,7 +80,7 @@ export default function useClientSideSmartOrderRouterTrade<TTradeType extends Tr
}
}
},
[
config
,
params
,
queryArgs
,
wrapType
])
},
[
config
,
params
,
queryArgs
,
wrapType
])
const
{
data
,
error
}
=
usePoll
(
getQuoteResult
,
JSON
.
stringify
(
queryArgs
))
??
{
const
{
data
,
error
}
=
usePoll
(
getQuoteResult
,
JSON
.
stringify
(
queryArgs
)
,
isDebouncing
)
??
{
error
:
undefined
,
error
:
undefined
,
}
}
...
@@ -118,7 +118,7 @@ export default function useClientSideSmartOrderRouterTrade<TTradeType extends Tr
...
@@ -118,7 +118,7 @@ export default function useClientSideSmartOrderRouterTrade<TTradeType extends Tr
}
}
// Returns the last trade state while syncing/loading to avoid jank from clearing the last trade while loading.
// Returns the last trade state while syncing/loading to avoid jank from clearing the last trade while loading.
if
(
!
error
)
{
if
(
!
quoteResult
&&
!
error
)
{
if
(
isStale
)
{
if
(
isStale
)
{
return
{
state
:
TradeState
.
LOADING
,
trade
:
undefined
}
return
{
state
:
TradeState
.
LOADING
,
trade
:
undefined
}
}
else
if
(
isDebouncing
)
{
}
else
if
(
isDebouncing
)
{
...
...
src/lib/hooks/usePoll.ts
View file @
9470c49d
...
@@ -7,6 +7,7 @@ const DEFAULT_KEEP_UNUSED_DATA_FOR = ms`10s`
...
@@ -7,6 +7,7 @@ const DEFAULT_KEEP_UNUSED_DATA_FOR = ms`10s`
export
default
function
usePoll
<
T
>
(
export
default
function
usePoll
<
T
>
(
fetch
:
()
=>
Promise
<
T
>
,
fetch
:
()
=>
Promise
<
T
>
,
key
=
''
,
key
=
''
,
check
=
false
,
// set to true to check the cache without initiating a new request
pollingInterval
=
DEFAULT_POLLING_INTERVAL
,
pollingInterval
=
DEFAULT_POLLING_INTERVAL
,
keepUnusedDataFor
=
DEFAULT_KEEP_UNUSED_DATA_FOR
keepUnusedDataFor
=
DEFAULT_KEEP_UNUSED_DATA_FOR
):
T
|
undefined
{
):
T
|
undefined
{
...
@@ -14,6 +15,8 @@ export default function usePoll<T>(
...
@@ -14,6 +15,8 @@ export default function usePoll<T>(
const
[,
setData
]
=
useState
<
{
key
:
string
;
result
?:
T
}
>
({
key
})
const
[,
setData
]
=
useState
<
{
key
:
string
;
result
?:
T
}
>
({
key
})
useEffect
(()
=>
{
useEffect
(()
=>
{
if
(
check
)
return
let
timeout
:
number
let
timeout
:
number
const
entry
=
cache
.
get
(
key
)
const
entry
=
cache
.
get
(
key
)
...
@@ -41,7 +44,7 @@ export default function usePoll<T>(
...
@@ -41,7 +44,7 @@ export default function usePoll<T>(
return
data
.
key
===
key
?
{
key
,
result
}
:
data
return
data
.
key
===
key
?
{
key
,
result
}
:
data
})
})
}
}
},
[
cache
,
fetch
,
keepUnusedDataFor
,
key
,
pollingInterval
])
},
[
cache
,
check
,
fetch
,
keepUnusedDataFor
,
key
,
pollingInterval
])
useEffect
(()
=>
{
useEffect
(()
=>
{
// Cleanup stale entries when a new key is used.
// Cleanup stale entries when a new key is used.
...
...
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