fix: compatible nuxt

varletjs · Nov 21, 2021 · d681176 · d681176
1 parent a0bebab
commit d681176
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git 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<boolean> = 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
@@ -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
@@ -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) {