Commit c5eab4f

committed

fix: should not disableBodyScroll when modelValueLocal is false

1 parent db22629 commit c5eab4fCopy full SHA for c5eab4f

File tree

-2

lines changed

packages/vue-final-modal/src/components/CoreModal
- CoreModal.vue
- useBodyScrollLock.ts

-2

lines changed

Lines changed: 4 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -55,8 +55,11 @@ const vfmContentEl = ref<HTMLDivElement>()`
`55`	`55`
`56`	`56`	`const { focus, blur } = useFocusTrap(props, { focusEl: vfmRootEl })`
`57`	`57`	`const { zIndex, refreshZIndex, resetZIndex } = useZIndex(props)`
`58`		`-const { enableBodyScroll, disableBodyScroll } = useLockScroll(props, { lockScrollEl: vfmRootEl })`
`59`	`58`	`const { modelValueLocal } = useModelValue(props, emit)`
	`59`	`+const { enableBodyScroll, disableBodyScroll } = useLockScroll(props, {`
	`60`	`+ lockScrollEl: vfmRootEl,`
	`61`	`+ modelValueLocal,`
	`62`	`+})`
`60`	`63`	`const { emitEvent } = useEvent(emit)`
`61`	`64`
`62`	`65`	`let resolveToggle: (res: string) => void = (noop)`

Lines changed: 4 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -235,8 +235,9 @@ export const enableBodyScroll = (targetElement?: HTMLElement) => {`
`235`	`235`
`236`	`236`	`export function useLockScroll(props: InstanceType<typeof CoreModal>['$props'], options: {`
`237`	`237`	`lockScrollEl: Ref<undefined \| HTMLElement>`
	`238`	`+ modelValueLocal: Ref<boolean>`
`238`	`239`	`}) {`
`239`		`- const { lockScrollEl } = options`
	`240`	`+ const { lockScrollEl, modelValueLocal } = options`
`240`	`241`
`241`	`242`	`let _lockScrollEl: HTMLElement`
`242`	`243`	`watch(lockScrollEl, (val) => {`
`@@ -257,6 +258,8 @@ export function useLockScroll(props: InstanceType<typeof CoreModal>['$props'], o`
`257`	`258`	`}`
`258`	`259`
`259`	`260`	`function _disableBodyScroll() {`
	`261`	`+ if (!modelValueLocal.value)`
	`262`	`+ return`
`260`	`263`	`props.lockScroll && _lockScrollEl`
`261`	`264`	`&& disableBodyScroll(_lockScrollEl, {`
`262`	`265`	`reserveScrollBarGap: true,`

Comments

(0)