Merge branch 'dev' into next
This commit is contained in:
@@ -30,10 +30,10 @@
|
||||
},
|
||||
"repository": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/youzan/vant.git",
|
||||
"url": "https://github.com/vant-ui/vant.git",
|
||||
"directory": "packages/vant-use"
|
||||
},
|
||||
"bugs": "https://github.com/youzan/vant/issues",
|
||||
"bugs": "https://github.com/vant-ui/vant/issues",
|
||||
"author": "chenjiahan",
|
||||
"license": "MIT",
|
||||
"devDependencies": {
|
||||
|
||||
@@ -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