Skip to content
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

fix(h5): 修复h5下的pageScrollTo函数功能 #8050

Merged
merged 2 commits into from
Dec 12, 2020
Merged

fix(h5): 修复h5下的pageScrollTo函数功能 #8050

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cff9f7a
fix(h5): 修复h5下的pageScrollTo函数的selector参数支持问题
Nov 17, 2020
2f9c924
Merge branch 'next' into fix/pageScrollTo_h5
ZakaryCode Dec 12, 2020
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
22 changes: 17 additions & 5 deletions packages/taro-h5/src/api/scroll/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import { getTimingFunc, easeInOut } from '../utils/index'
/**
* @typedef {object} PageScrollToParam pageScrollTo参数
* @property {number} scrollTop 滚动到页面的目标位置，单位 px
* @property {string} selector 选择器, css selector
* @property {number} [duration=300] 滚动动画的时长，单位 ms
* @property {function} [success] 接口调用成功的回调函数
* @property {function} [fail] 接口调用失败的回调函数
Expand All @@ -17,13 +18,21 @@ const FRAME_DURATION = 17
* 将页面滚动到目标位置
* @param {PageScrollToParam} object 参数
*/
export const pageScrollTo = ({ scrollTop, duration = 300, success, fail, complete }) => {
export const pageScrollTo = ({ scrollTop, selector, duration = 300, success, fail, complete }) => {
return new Promise((resolve, reject) => {
try {
if (scrollTop === undefined) {
throw Error('"scrollTop" is required')
if (!scrollTop && !selector) {
throw Error('"scrollTop" 或 "selector" 需要其之一')
}

let el
if (document.querySelector('.taro-tabbar__tabbar') === null) {
// 没设置tabbar
el = window
} else {
// 有设置tabbar
el = document.querySelector('.taro-tabbar__panel')
}
const el = document.querySelector('.taro-tabbar__panel') || window

if (!scrollFunc) {
if (el === window) {
Expand All @@ -45,8 +54,11 @@ export const pageScrollTo = ({ scrollTop, duration = 300, success, fail, complet
}
}

if (scrollTop && selector) {
console.warn('"scrollTop" 或 "selector" 建议只设一个值，全部设置会忽略selector')
}
const from = scrollFunc()
const to = scrollTop
const to = scrollTop || document.querySelector(selector).offsetTop
const delta = to - from

const frameCnt = duration / FRAME_DURATION
Expand Down