Commit a9a2e8a

committed

feat: replace body-scroll-lock with scroll-lock #403

1 parent cbd2766 commit a9a2e8aCopy full SHA for a9a2e8a

File tree

6 files changed

+134

-360

lines changed

packages/vue-final-modal
- package.json
- src/components/VueFinalModal
- vite.config.ts
pnpm-lock.yaml

6 files changed

+134

-360

lines changed

`‎packages/vue-final-modal/package.json`

Lines changed: 4 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -35,19 +35,22 @@`
`35`	`35`	`"devDependencies": {`
`36`	`36`	`"@cypress/vue": "^5.0.5",`
`37`	`37`	`"@release-it/conventional-changelog": "^5.1.1",`
	`38`	`+ "@types/scroll-lock": "^2.1.3",`
`38`	`39`	`"@vueuse/core": "^10.7.1",`
`39`	`40`	`"@vueuse/integrations": "^10.7.1",`
`40`	`41`	`"cypress": "^13.6.0",`
`41`	`42`	`"focus-trap": "^7.5.4",`
`42`	`43`	`"release-it": "^16.1.3",`
	`44`	`+ "scroll-lock": "^2.1.5",`
`43`	`45`	`"vite-plugin-dts": "^3.6.3",`
`44`	`46`	`"vue": "^3.4.7"`
`45`	`47`	`},`
`46`	`48`	`"peerDependencies": {`
	`49`	`+ "@vue/composition-api": "^1.0.0-rc.1",`
`47`	`50`	`"@vueuse/core": ">=10.0.0",`
`48`	`51`	`"@vueuse/integrations": ">=10.0.0",`
`49`	`52`	`"focus-trap": ">=7.2.0",`
`50`		`- "@vue/composition-api": "^1.0.0-rc.1",`
	`53`	`+ "scroll-lock": ">=2.1.5",`
`51`	`54`	`"vue": ">=2.7.0 \|\| >=3.0.0"`
`52`	`55`	`},`
`53`	`56`	`"homepage": "https://vue-final-modal.org/",`

`‎packages/vue-final-modal/src/components/VueFinalModal/VueFinalModal.vue`

Lines changed: 6 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ import { useTransition } from './useTransition'`
`5`	`5`	`import { useToClose } from './useToClose'`
`6`	`6`	`import { useModelValue } from './useModelValue'`
`7`	`7`	`import { useFocusTrap } from './useFocusTrap'`
`8`		`-import { useLockScroll } from './useBodyScrollLock'`
	`8`	`+import { useScrollLock } from './useScrollLock'`
`9`	`9`	`import { useZIndex } from './useZIndex'`
`10`	`10`	`import { vVisible } from './vVisible'`
`11`	`11`	`import { arrayMoveItemToLast, arrayRemoveItem, noop, once } from '~/utils'`
`@@ -50,7 +50,7 @@ const vfmContentEl = ref<HTMLDivElement>()`
`50`	`50`	`const { focus, blur } = useFocusTrap(props, { focusEl: vfmRootEl })`
`51`	`51`	`const { zIndex, refreshZIndex, resetZIndex } = useZIndex(props)`
`52`	`52`	`const { modelValueLocal } = useModelValue(props, emit, { open, close })`
`53`		`-const { enableBodyScroll, disableBodyScroll } = useLockScroll(props, {`
	`53`	`+const { disablePageScroll, enablePageScroll } = useScrollLock(props, {`
`54`	`54`	`lockScrollEl: vfmRootEl,`
`55`	`55`	`modelValueLocal,`
`56`	`56`	`})`
`@@ -74,7 +74,7 @@ const {`
`74`	`74`	`modelValueLocal,`
`75`	`75`	`onEntering() {`
`76`	`76`	`nextTick(() => {`
`77`		`- disableBodyScroll()`
	`77`	`+ disablePageScroll()`
`78`	`78`	`focus()`
`79`	`79`	`})`
`80`	`80`	`},`
`@@ -87,7 +87,7 @@ const {`
`87`	`87`	`onLeave() {`
`88`	`88`	`arrayRemoveItem(openedModals, instance)`
`89`	`89`	`resetZIndex()`
`90`		`- enableBodyScroll()`
	`90`	`+ enablePageScroll()`
`91`	`91`	`emit('closed')`
`92`	`92`	`// eslint-disable-next-line vue/custom-event-name-casing`
`93`	`93`	`emit('_closed')`
`@@ -143,7 +143,7 @@ function close(): boolean {`
`143`	`143`	`}`
`144`	`144`
`145`	`145`	`onBeforeUnmount(() => {`
`146`		`- enableBodyScroll()`
	`146`	`+ enablePageScroll()`
`147`	`147`	`arrayRemoveItem(modals, instance)`
`148`	`148`	`arrayRemoveItem(openedModals, instance)`
`149`	`149`	`blur()`
`@@ -208,6 +208,7 @@ export default {`
`208`	`208`	`:style="{ zIndex }"`
`209`	`209`	`role="dialog"`
`210`	`210`	`aria-modal="true"`
	`211`	`+ data-scroll-lock-scrollable`
`211`	`212`	`@keydown.esc="() => onEsc()"`
`212`	`213`	`@mouseup.self="() => onMouseupRoot()"`
`213`	`214`	`@mousedown.self="e => onMousedown(e)"`

`‎packages/vue-final-modal/src/components/VueFinalModal/useBodyScrollLock.ts`

Lines changed: 0 additions & 282 deletions

This file was deleted.

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit a9a2e8a

File tree

6 files changed

6 files changed

`‎packages/vue-final-modal/package.json`

`‎packages/vue-final-modal/src/components/VueFinalModal/VueFinalModal.vue`

`‎packages/vue-final-modal/src/components/VueFinalModal/useBodyScrollLock.ts`

0 commit comments