Skip to content

[core - v2.2.9] : Update - Device driven background scroll control #992

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
May 16, 2022
Merged

[core - v2.2.9] : Update - Device driven background scroll control #992

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
00bc9a3
Refactor scroll handling to be device specific
Adamj1232 May 9, 2022
5184a2b
Refactor for cleanliness
Adamj1232 May 9, 2022
320c6d7
Merge branch 'v2-web3-onboard' into fix/device_driven_background_scroll
Adamj1232 May 10, 2022
2f98ef6
replace removeEventHandler and refactor
Adamj1232 May 10, 2022
07a9715
Revert demo change
Adamj1232 May 10, 2022
2df9231
Merge branch 'v2-web3-onboard-develop' into fix/device_driven_backgro…
Adamj1232 May 12, 2022
50d38f5
Merge in new develop branch as base
Adamj1232 May 12, 2022
798b9e1
Merge in new develop branch as base
Adamj1232 May 12, 2022
d9d683d
Handle merge conflicts with develop branch
Adamj1232 May 15, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/core/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@web3-onboard/core",
"version": "2.2.8",
"version": "2.2.9-alpha.1",
"scripts": {
"build": "rollup -c",
"dev": "rollup -c -w",
Expand Down
35 changes: 21 additions & 14 deletions packages/core/src/views/shared/Modal.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,30 +16,37 @@
<script lang="ts">
import { fade } from 'svelte/transition'
import { onDestroy, onMount } from 'svelte'
import { getDevice } from '../../utils'

const device = getDevice()

const body = document.body
onMount(() => {
window.addEventListener(
'scroll',
() => {
document.documentElement.style.setProperty(
'--scroll-y',
`${window.scrollY}px`
)
},
{ passive: true }
const html = document.documentElement
const trackYScrollPosition = () => {
document.documentElement.style.setProperty(
'--scroll-y',
`${window.scrollY}px`
)
const scrollY =
document.documentElement.style.getPropertyValue('--scroll-y')
body.style.position = 'fixed'
}

onMount(() => {
window.addEventListener('scroll', trackYScrollPosition, { passive: true })
const scrollY = html.style.getPropertyValue('--scroll-y')
device.type === 'mobile'
? (html.style.position = 'fixed')
: (html.style.overflow = 'hidden')

body.style.top = `-${scrollY}`
})

onDestroy(() => {
device.type === 'mobile'
? (html.style.position = '')
: (html.style.overflow = 'auto')
const scrollY = body.style.top
body.style.position = ''
body.style.top = ''
window.scrollTo(0, parseInt(scrollY || '0') * -1)
window.removeEventListener('scroll', trackYScrollPosition)
})
export let close: () => void
</script>
Expand Down
6 changes: 3 additions & 3 deletions packages/react/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@web3-onboard/react",
"version": "2.1.6",
"version": "2.1.7-alpha.1",
"description": "Collection of React Hooks for web3-onboard",
"module": "dist/index.js",
"browser": "dist/index.js",
Expand All @@ -21,8 +21,8 @@
"typescript": "^4.5.5"
},
"dependencies": {
"@web3-onboard/common": "^2.0.7",
"@web3-onboard/core": "^2.2.7"
"@web3-onboard/core": "^2.2.9-alpha.1",
"@web3-onboard/common": "^2.0.7"
},
"peerDependencies": {
"react": "^17.0.2"
Expand Down