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
c2342a86
Unverified
Commit
c2342a86
authored
Dec 12, 2022
by
Mike Grabowski
Committed by
GitHub
Dec 12, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: pointer events on Swap (#5654)
* feat: decouple landing from swap * implement pointer events
parent
504cd5b8
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
26 additions
and
18 deletions
+26
-18
styleds.tsx
src/components/swap/styleds.tsx
+2
-4
index.tsx
src/pages/Landing/index.tsx
+21
-2
index.tsx
src/pages/Swap/index.tsx
+3
-12
No files found.
src/components/swap/styleds.tsx
View file @
c2342a86
...
@@ -23,19 +23,17 @@ export const PageWrapper = styled.div`
...
@@ -23,19 +23,17 @@ export const PageWrapper = styled.div`
`
`
// Mostly copied from `AppBody` but it was getting too hard to maintain backwards compatibility.
// Mostly copied from `AppBody` but it was getting too hard to maintain backwards compatibility.
export
const
SwapWrapper
=
styled
.
main
<
{
margin
?:
string
;
maxWidth
?:
string
;
open
:
boolean
}
>
`
export
const
SwapWrapper
=
styled
.
main
`
position: relative;
position: relative;
background:
${({
theme
})
=>
theme
.
backgroundSurface
}
;
background:
${({
theme
})
=>
theme
.
backgroundSurface
}
;
border-radius: 16px;
border-radius: 16px;
border: 1px solid
${({
theme
})
=>
theme
.
backgroundOutline
}
;
border: 1px solid
${({
theme
})
=>
theme
.
backgroundOutline
}
;
padding: 8px;
padding: 8px;
z-index:
${
Z_INDEX
.
deprecated_content
}
;
z-index:
${
Z_INDEX
.
deprecated_content
}
;
cursor:
${({
open
})
=>
open
&&
'
pointer
'
}
;
transition: transform 250ms ease;
transition: transform 250ms ease;
&:hover {
&:hover {
border: 1px solid
${({
theme
,
open
})
=>
(
open
?
theme
.
accentAction
:
theme
.
backgroundOutline
)}
;
border: 1px solid
${({
theme
})
=>
theme
.
backgroundOutline
}
;
transform:
${({
open
})
=>
(
open
?
`translateY(-4px)`
:
`none`
)}
;
}
}
`
`
...
...
src/pages/Landing/index.tsx
View file @
c2342a86
...
@@ -5,7 +5,7 @@ import { LandingPageVariant, useLandingPageFlag } from 'featureFlags/flags/landi
...
@@ -5,7 +5,7 @@ import { LandingPageVariant, useLandingPageFlag } from 'featureFlags/flags/landi
import
Swap
from
'
pages/Swap
'
import
Swap
from
'
pages/Swap
'
import
{
useEffect
}
from
'
react
'
import
{
useEffect
}
from
'
react
'
import
{
useLocation
}
from
'
react-router-dom
'
import
{
useLocation
}
from
'
react-router-dom
'
import
{
Link
}
from
'
react-router-dom
'
import
{
Link
as
NativeLink
}
from
'
react-router-dom
'
import
{
useIsDarkMode
}
from
'
state/user/hooks
'
import
{
useIsDarkMode
}
from
'
state/user/hooks
'
import
styled
from
'
styled-components/macro
'
import
styled
from
'
styled-components/macro
'
import
{
BREAKPOINTS
}
from
'
theme
'
import
{
BREAKPOINTS
}
from
'
theme
'
...
@@ -168,6 +168,23 @@ const ActionsWrapper = styled.span`
...
@@ -168,6 +168,23 @@ const ActionsWrapper = styled.span`
}
}
`
`
const
LandingSwap
=
styled
(
Swap
)
`
* {
pointer-events: none;
}
&:hover {
border: 1px solid
${({
theme
})
=>
theme
.
accentAction
}
;
transform: translateY(-4px);
}
`
const
Link
=
styled
(
NativeLink
)
`
text-decoration: none;
max-width: 480px;
width: 100%;
`
export
default
function
Landing
()
{
export
default
function
Landing
()
{
const
isDarkMode
=
useIsDarkMode
()
const
isDarkMode
=
useIsDarkMode
()
...
@@ -193,7 +210,9 @@ export default function Landing() {
...
@@ -193,7 +210,9 @@ export default function Landing() {
return
(
return
(
<
Trace
page=
{
PageName
.
LANDING_PAGE
}
shouldLogImpression
>
<
Trace
page=
{
PageName
.
LANDING_PAGE
}
shouldLogImpression
>
<
PageWrapper
>
<
PageWrapper
>
<
Swap
/>
<
Link
to=
"/swap"
>
<
LandingSwap
/>
</
Link
>
<
Glow
/>
<
Glow
/>
<
Gradient
isDarkMode=
{
isDarkMode
}
/>
<
Gradient
isDarkMode=
{
isDarkMode
}
/>
<
ContentWrapper
isDarkMode=
{
isDarkMode
}
>
<
ContentWrapper
isDarkMode=
{
isDarkMode
}
>
...
...
src/pages/Swap/index.tsx
View file @
c2342a86
...
@@ -14,7 +14,6 @@ import UnsupportedCurrencyFooter from 'components/swap/UnsupportedCurrencyFooter
...
@@ -14,7 +14,6 @@ import UnsupportedCurrencyFooter from 'components/swap/UnsupportedCurrencyFooter
import
TokenSafetyModal
from
'
components/TokenSafety/TokenSafetyModal
'
import
TokenSafetyModal
from
'
components/TokenSafety/TokenSafetyModal
'
import
{
MouseoverTooltip
}
from
'
components/Tooltip
'
import
{
MouseoverTooltip
}
from
'
components/Tooltip
'
import
{
isSupportedChain
}
from
'
constants/chains
'
import
{
isSupportedChain
}
from
'
constants/chains
'
import
{
LandingPageVariant
,
useLandingPageFlag
}
from
'
featureFlags/flags/landingPage
'
import
{
usePermit2Enabled
}
from
'
featureFlags/flags/permit2
'
import
{
usePermit2Enabled
}
from
'
featureFlags/flags/permit2
'
import
usePermit
,
{
PermitState
}
from
'
hooks/usePermit2
'
import
usePermit
,
{
PermitState
}
from
'
hooks/usePermit2
'
import
{
useSwapCallback
}
from
'
hooks/useSwapCallback
'
import
{
useSwapCallback
}
from
'
hooks/useSwapCallback
'
...
@@ -24,7 +23,7 @@ import { formatSwapQuoteReceivedEventProperties } from 'lib/utils/analytics'
...
@@ -24,7 +23,7 @@ import { formatSwapQuoteReceivedEventProperties } from 'lib/utils/analytics'
import
{
useCallback
,
useEffect
,
useMemo
,
useState
}
from
'
react
'
import
{
useCallback
,
useEffect
,
useMemo
,
useState
}
from
'
react
'
import
{
ReactNode
}
from
'
react
'
import
{
ReactNode
}
from
'
react
'
import
{
AlertTriangle
,
ArrowDown
,
CheckCircle
,
HelpCircle
,
Info
}
from
'
react-feather
'
import
{
AlertTriangle
,
ArrowDown
,
CheckCircle
,
HelpCircle
,
Info
}
from
'
react-feather
'
import
{
use
Location
,
use
Navigate
}
from
'
react-router-dom
'
import
{
useNavigate
}
from
'
react-router-dom
'
import
{
Text
}
from
'
rebass
'
import
{
Text
}
from
'
rebass
'
import
{
useToggleWalletModal
}
from
'
state/application/hooks
'
import
{
useToggleWalletModal
}
from
'
state/application/hooks
'
import
{
InterfaceTrade
}
from
'
state/routing/types
'
import
{
InterfaceTrade
}
from
'
state/routing/types
'
...
@@ -146,7 +145,7 @@ function largerPercentValue(a?: Percent, b?: Percent) {
...
@@ -146,7 +145,7 @@ function largerPercentValue(a?: Percent, b?: Percent) {
const
TRADE_STRING
=
'
SwapRouter
'
const
TRADE_STRING
=
'
SwapRouter
'
export
default
function
Swap
()
{
export
default
function
Swap
(
{
className
}:
{
className
?:
string
}
)
{
const
navigate
=
useNavigate
()
const
navigate
=
useNavigate
()
const
{
account
,
chainId
}
=
useWeb3React
()
const
{
account
,
chainId
}
=
useWeb3React
()
const
loadedUrlParams
=
useDefaultsFromURLSearch
()
const
loadedUrlParams
=
useDefaultsFromURLSearch
()
...
@@ -550,10 +549,6 @@ export default function Swap() {
...
@@ -550,10 +549,6 @@ export default function Swap() {
!
showWrap
&&
userHasSpecifiedInputOutput
&&
(
trade
||
routeIsLoading
||
routeIsSyncing
)
!
showWrap
&&
userHasSpecifiedInputOutput
&&
(
trade
||
routeIsLoading
||
routeIsSyncing
)
)
)
const
location
=
useLocation
()
const
landingPageFlag
=
useLandingPageFlag
()
return
(
return
(
<
Trace
page=
{
PageName
.
SWAP_PAGE
}
shouldLogImpression
>
<
Trace
page=
{
PageName
.
SWAP_PAGE
}
shouldLogImpression
>
<>
<>
...
@@ -566,11 +561,7 @@ export default function Swap() {
...
@@ -566,11 +561,7 @@ export default function Swap() {
showCancel=
{
true
}
showCancel=
{
true
}
/>
/>
<
PageWrapper
>
<
PageWrapper
>
<
SwapWrapper
<
SwapWrapper
className=
{
className
}
id=
"swap-page"
>
onClick=
{
()
=>
landingPageFlag
===
LandingPageVariant
.
Enabled
&&
navigate
(
'
/swap
'
)
}
open=
{
landingPageFlag
===
LandingPageVariant
.
Enabled
&&
location
.
pathname
===
'
/
'
}
id=
"swap-page"
>
<
SwapHeader
allowedSlippage=
{
allowedSlippage
}
/>
<
SwapHeader
allowedSlippage=
{
allowedSlippage
}
/>
<
ConfirmSwapModal
<
ConfirmSwapModal
isOpen=
{
showConfirm
}
isOpen=
{
showConfirm
}
...
...
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