mirror of
https://github.com/youzan/vant.git
synced 2026-02-27 02:00:20 +08:00
Merge branch 'dev' into next
This commit is contained in:
@@ -107,7 +107,7 @@ export function useCountDown(options: UseCountDownOptions) {
|
||||
|
||||
const tick = () => {
|
||||
// should not start counting in server
|
||||
// see: https://github.com/youzan/vant/issues/7807
|
||||
// see: https://github.com/vant-ui/vant/issues/7807
|
||||
if (!inBrowser) {
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -15,7 +15,7 @@ function isElement(node: Element) {
|
||||
);
|
||||
}
|
||||
|
||||
// https://github.com/youzan/vant/issues/3823
|
||||
// https://github.com/vant-ui/vant/issues/3823
|
||||
export function getScrollParent(
|
||||
el: Element,
|
||||
root: ScrollElement | undefined = defaultRoot
|
||||
|
||||
Reference in New Issue
Block a user