Merge branch '2.x' into dev

src/index-bar/index.js

@@ -5,7 +5,6 @@ import {
   isDef,
   isHidden,
   getScrollTop,
-  getElementTop,
   preventDefault,
   createNamespace,
   getRootScrollTop,
@@ -92,18 +91,6 @@ export default createComponent({
       };
     };
 
-    const getAnchorTop = (element, scrollParentRect) => {
-      if (
-        scrollParent.value === window ||
-        scrollParent.value === document.body
-      ) {
-        return getElementTop(element);
-      }
-
-      const rect = useRect(element);
-      return rect.top - scrollParentRect.top + getScrollTop(scrollParent);
-    };
-
     const getActiveAnchor = (scrollTop, rects) => {
       for (let i = children.length - 1; i >= 0; i--) {
         const prevHeight = i > 0 ? rects[i - 1].height : 0;
@@ -126,10 +113,9 @@ export default createComponent({
       const scrollTop = getScrollTop(scrollParent.value);
       const scrollParentRect = getScrollerRect();
 
-      const rects = children.map((item) => ({
-        height: item.height.value,
-        top: getAnchorTop(item.$el, scrollParentRect),
-      }));
+      const rects = children.map((item) =>
+        item.getRect(scrollParent.value, scrollParentRect)
+      );
 
       const active = getActiveAnchor(scrollTop, rects);
 
@@ -137,7 +123,7 @@ export default createComponent({
 
       if (sticky) {
         children.forEach((item, index) => {
-          const { state, height, $el } = item;
+          const { state, $el } = item;
           if (index === active || index === active - 1) {
             const rect = $el.getBoundingClientRect();
             state.left = rect.left;
@@ -155,7 +141,8 @@ export default createComponent({
           } else if (index === active - 1) {
             const activeItemTop = rects[active].top - scrollTop;
             state.active = activeItemTop > 0;
-            state.top = activeItemTop + scrollParentRect.top - height.value;
+            state.top =
+              activeItemTop + scrollParentRect.top - rects[index].height;
           } else {
             state.active = false;
           }

src/index-bar/test/index.legacy.js

@@ -1,13 +1,5 @@
 import { mount, trigger, triggerDrag, mockScrollIntoView } from '../../../test';
 
-function mockOffsetHeight(offsetHeight) {
-  Object.defineProperty(HTMLElement.prototype, 'offsetHeight', {
-    get() {
-      return offsetHeight;
-    },
-  });
-}
-
 test('should allow to custom anchor text', () => {
   const wrapper = mount({
     template: `
@@ -97,11 +89,10 @@ test('should update active anchor after page scroll', () => {
     const { index } = this.dataset;
     return {
       top: index ? index * 10 : 0,
+      height: 10,
     };
   };
 
-  mockOffsetHeight(10);
-
   const wrapper = mount({
     template: `
       <van-index-bar :sticky="sticky">
@@ -138,11 +129,10 @@ test('should emit change event when active index changed', () => {
     const { index } = this.dataset;
     return {
       top: index ? index * 10 : 0,
+      height: 10,
     };
   };
 
-  mockOffsetHeight(10);
-
   const onChange = jest.fn();
 
   mount({