Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
fix(h5): prefer scrollTop in pageScrollTo
  • Loading branch information
Jarvis636431 authored and Single-Dancer committed Nov 10, 2026
commit 58423aff8ffd3c4ce3f921d6e4c8413e8b1672e5
11 changes: 11 additions & 0 deletions packages/taro-h5/__tests__/ui/scroll.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,17 @@ describe.each([false, true])('pageScrollTo target (window scroll: %s)', usingWin
expect(jest.getTimerCount()).toBe(0)
})

test.each([0, 200])('prefers scrollTop=%s over a selector and its offset', async scrollTop => {
jest.spyOn(console, 'warn').mockImplementation(() => {})
Object.defineProperty(document.querySelector('#target'), 'offsetTop', { value: 500 })

await expect(pageScrollTo({ scrollTop, selector: '#target', offsetTop: 25, duration: 0 }))
.resolves.toEqual({ errMsg: 'pageScrollTo:ok' })

expect(position).toBe(scrollTop)
expect(console.warn).toHaveBeenCalledTimes(1)
})

test('scrolls upwards from a nonzero position to exactly zero', async () => {
position = 400
const result = pageScrollTo({ scrollTop: 0, duration: 34 })
Expand Down
8 changes: 5 additions & 3 deletions packages/taro-h5/src/api/ui/scroll/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,9 @@ const FRAME_DURATION = 17
/**
* 将页面滚动到目标位置
*/
export const pageScrollTo: typeof Taro.pageScrollTo = ({ scrollTop, selector = '', offsetTop = 0, duration = 300, success, fail, complete }) => {
export const pageScrollTo: typeof Taro.pageScrollTo = ({ scrollTop, selector: requestedSelector = '', offsetTop = 0, duration = 300, success, fail, complete }) => {
const hasScrollTop = typeof scrollTop === 'number'
const selector = hasScrollTop ? '' : requestedSelector
let scrollFunc
const handle = new MethodHandler({ name: 'pageScrollTo', success, fail, complete })
return new Promise((resolve, reject) => {
Expand Down Expand Up @@ -54,7 +56,7 @@ export const pageScrollTo: typeof Taro.pageScrollTo = ({ scrollTop, selector = '
}
}

if (scrollTop && selector) {
if (hasScrollTop && requestedSelector) {
console.warn('"scrollTop" 或 "selector" 建议只设一个值,全部设置会忽略selector')
}
let to: number
Expand All @@ -66,7 +68,7 @@ export const pageScrollTo: typeof Taro.pageScrollTo = ({ scrollTop, selector = '
}
to = (target.offsetTop || 0) + offsetTop
} else {
to = typeof scrollTop === 'number' ? scrollTop : 0
to = hasScrollTop ? scrollTop : 0
}
const from = scrollFunc()
const delta = to - from
Expand Down
Loading