diff --git a/src/calendar/index.js b/src/calendar/index.js index 8a0dd9712..31929c68a 100644 --- a/src/calendar/index.js +++ b/src/calendar/index.js @@ -171,7 +171,6 @@ export default createComponent({ this.init(); }, - /* istanbul ignore next */ activated() { this.init(); }, diff --git a/src/list/index.js b/src/list/index.js index cfb38e2e2..b028c4c02 100644 --- a/src/list/index.js +++ b/src/list/index.js @@ -42,9 +42,22 @@ export default createComponent({ // use sync innerLoading state to avoid repeated loading in some edge cases const loading = ref(false); const root = ref(); - const placeholderRef = ref(); + const placeholder = ref(); const scrollParent = useScrollParent(root); + const getScrollParentRect = () => { + const element = scrollParent.value; + if (element.getBoundingClientRect) { + return element.getBoundingClientRect(); + } + const height = element.innerHeight; + return { + top: 0, + height, + bottom: height, + }; + }; + const check = () => { nextTick(() => { if (loading.value || props.finished || props.error) { @@ -52,27 +65,14 @@ export default createComponent({ } const { offset, direction } = props; - let scrollParentRect; + const scrollParentRect = getScrollParentRect(); - if (scrollParent.value.getBoundingClientRect) { - scrollParentRect = scrollParent.value.getBoundingClientRect(); - } else { - scrollParentRect = { - top: 0, - bottom: scrollParent.value.innerHeight, - }; - } - - const scrollParentHeight = - scrollParentRect.bottom - scrollParentRect.top; - - /* istanbul ignore next */ - if (!scrollParentHeight || isHidden(root)) { + if (!scrollParentRect.height || isHidden(root)) { return false; } let isReachEdge = false; - const placeholderRect = useRect(placeholderRef); + const placeholderRect = useRect(placeholder); if (direction === 'up') { isReachEdge = scrollParentRect.top - placeholderRect.top <= offset; @@ -148,9 +148,7 @@ export default createComponent({ return () => { const Content = slots.default?.(); - const Placeholder = ( -
- ); + const Placeholder =
; return (
diff --git a/src/utils/dom/event.ts b/src/utils/dom/event.ts index baaf9de3e..f65745cc7 100644 --- a/src/utils/dom/event.ts +++ b/src/utils/dom/event.ts @@ -9,7 +9,6 @@ if (inBrowser) { Object.defineProperty(opts, 'passive', { // eslint-disable-next-line getter-return get() { - /* istanbul ignore next */ supportsPassive = true; }, }); diff --git a/src/utils/dom/raf.ts b/src/utils/dom/raf.ts index ca7bc1b42..e87308dbb 100644 --- a/src/utils/dom/raf.ts +++ b/src/utils/dom/raf.ts @@ -6,7 +6,6 @@ import { inBrowser } from '..'; let prev = Date.now(); -/* istanbul ignore next */ function fallback(fn: FrameRequestCallback): number { const curr = Date.now(); const ms = Math.max(0, 16 - (curr - prev)); @@ -15,13 +14,10 @@ function fallback(fn: FrameRequestCallback): number { return id; } -/* istanbul ignore next */ const root = (inBrowser ? window : global) as Window; -/* istanbul ignore next */ const iRaf = root.requestAnimationFrame || fallback; -/* istanbul ignore next */ const iCancel = root.cancelAnimationFrame || root.clearTimeout; export function raf(fn: FrameRequestCallback): number { diff --git a/src/utils/dom/reset-scroll.ts b/src/utils/dom/reset-scroll.ts index 8cdf18a40..acf27992a 100644 --- a/src/utils/dom/reset-scroll.ts +++ b/src/utils/dom/reset-scroll.ts @@ -8,7 +8,6 @@ import { getRootScrollTop, setRootScrollTop } from './scroll'; const isIOS = checkIsIOS(); -/* istanbul ignore next */ export function resetScroll() { if (isIOS) { setRootScrollTop(getRootScrollTop()); diff --git a/src/utils/validate/system.ts b/src/utils/validate/system.ts index bab22ad2d..ec0331241 100644 --- a/src/utils/validate/system.ts +++ b/src/utils/validate/system.ts @@ -1,12 +1,10 @@ import { inBrowser } from '..'; export function isAndroid(): boolean { - /* istanbul ignore next */ return inBrowser ? /android/.test(navigator.userAgent.toLowerCase()) : false; } export function isIOS(): boolean { - /* istanbul ignore next */ return inBrowser ? /ios|iphone|ipad|ipod/.test(navigator.userAgent.toLowerCase()) : false;