From 58423aff8ffd3c4ce3f921d6e4c8413e8b1672e5 Mon Sep 17 00:00:00 2001 From: Jarvis Date: Sat, 7 Nov 2026 23:55:43 +0800 Subject: [PATCH] fix(h5): prefer scrollTop in pageScrollTo --- packages/taro-h5/__tests__/ui/scroll.test.ts | 11 +++++++++++ packages/taro-h5/src/api/ui/scroll/index.ts | 8 +++++--- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/packages/taro-h5/__tests__/ui/scroll.test.ts b/packages/taro-h5/__tests__/ui/scroll.test.ts index b4868750120a..912ac8d24edc 100644 --- a/packages/taro-h5/__tests__/ui/scroll.test.ts +++ b/packages/taro-h5/__tests__/ui/scroll.test.ts @@ -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 }) diff --git a/packages/taro-h5/src/api/ui/scroll/index.ts b/packages/taro-h5/src/api/ui/scroll/index.ts index 37b6772ae565..671c95174490 100644 --- a/packages/taro-h5/src/api/ui/scroll/index.ts +++ b/packages/taro-h5/src/api/ui/scroll/index.ts @@ -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) => { @@ -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 @@ -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