diff --git a/packages/varlet-ui/src/back-top/BackTop.vue b/packages/varlet-ui/src/back-top/BackTop.vue index 5b9f67473b7..ba1e6cfbbc3 100644 --- a/packages/varlet-ui/src/back-top/BackTop.vue +++ b/packages/varlet-ui/src/back-top/BackTop.vue @@ -24,7 +24,7 @@ export default defineComponent({ }, props, setup(props) { - let element: HTMLElement | Window = window + let element: HTMLElement | Window const show: Ref = ref(false) const click = () => { @@ -54,7 +54,7 @@ export default defineComponent({ } onMounted(() => { - if (props.target) element = getHTMLElement() + element = props.target ? getHTMLElement() : window element.addEventListener('scroll', throttleScroll) }) diff --git a/packages/varlet-ui/src/pull-refresh/PullRefresh.vue b/packages/varlet-ui/src/pull-refresh/PullRefresh.vue index a3dbf0530e4..64039be9fa7 100644 --- a/packages/varlet-ui/src/pull-refresh/PullRefresh.vue +++ b/packages/varlet-ui/src/pull-refresh/PullRefresh.vue @@ -30,7 +30,7 @@ import type { RefreshStatus } from './props' const MAX_DISTANCE = 100 const CONTROL_POSITION = -50 -let scroller: HTMLElement | Window = window +let scroller: HTMLElement | Window export default defineComponent({ name: 'VarPullRefresh', diff --git a/packages/varlet-ui/src/utils/elements.ts b/packages/varlet-ui/src/utils/elements.ts index 591f55f6638..34c43c9776a 100644 --- a/packages/varlet-ui/src/utils/elements.ts +++ b/packages/varlet-ui/src/utils/elements.ts @@ -148,11 +148,11 @@ export const toSizeUnit = (value: unknown) => { } export function requestAnimationFrame(fn: FrameRequestCallback): number { - return window.requestAnimationFrame ? window.requestAnimationFrame(fn) : window.setTimeout(fn, 16) + return globalThis.requestAnimationFrame ? globalThis.requestAnimationFrame(fn) : globalThis.setTimeout(fn, 16) } export function cancelAnimationFrame(handle: number): void { - window.cancelAnimationFrame ? window.cancelAnimationFrame(handle) : window.clearTimeout(handle) + globalThis.cancelAnimationFrame ? globalThis.cancelAnimationFrame(handle) : globalThis.clearTimeout(handle) } export function nextTickFrame(fn: FrameRequestCallback) {