@tarojs/components-advanced 3.6.0-beta.0 → 3.6.0-beta.2

package/dist/components/virtual-list/index.d.ts

@@ -1,6 +1,5 @@
 import type { BaseEventOrig, BaseEventOrigFunction, ScrollViewProps, StandardProps } from '@tarojs/components';
 import type { Component, ComponentType, CSSProperties, ReactNode } from 'react';
-import type { VuePlugin } from '../../../typings/vue';
 interface VirtualListProps extends Omit<StandardProps, 'children'> {
     /** 列表的高度。 */
     height: string | number;
@@ -186,6 +185,5 @@ declare namespace VirtualListProps {
 declare class VirtualListComponent extends Component<VirtualListProps> {
 }
 declare const VirtualList: typeof VirtualListComponent;
-export declare const registerVirtualList: VuePlugin;
 export { VirtualList, VirtualListProps };
 export default VirtualList;

package/dist/components/virtual-list/index.js

@@ -98,7 +98,6 @@
  * @see https://taro-docs.jd.com/docs/virtual-list
  */
 
-var VirtualList = require('./react').default;
-export var registerVirtualList = require('./vue').default;
+var VirtualList = process.env.FRAMEWORK === 'vue' || process.env.FRAMEWORK === 'vue3' ? require('./vue').default : require('./react').default;
 export { VirtualList };
 export default VirtualList;

package/dist/components/virtual-list/list-set.js

@@ -4,7 +4,6 @@ import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
 import _createClass from "@babel/runtime/helpers/esm/createClass";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import { isFunction } from '@tarojs/shared';
-import { IS_PROD } from '../../utils/constants';
 import { isHorizontalFunc } from './utils';
 var ListSet = /*#__PURE__*/function () {
   function ListSet(props, refresh) {
@@ -62,7 +61,7 @@ var ListSet = /*#__PURE__*/function () {
         width = _this$props.width;
       var isHorizontal = isHorizontalFunc(this.props);
       var size = isHorizontal ? width : height;
-      if (!IS_PROD && typeof size !== 'number') {
+      if (process.env.NODE_ENV !== 'production' && typeof size !== 'number') {
         console.warn("In mode ".concat(isHorizontal ? 'horizontal, width' : 'vertical, height', " parameter should be a number, but got ").concat(_typeof(size), "."));
       }
       return size;

package/dist/components/virtual-list/preset.d.ts

@@ -3,6 +3,7 @@ import ListSet from './list-set';
 import { defaultItemKey } from './utils';
 import type { VirtualListProps } from './';
 export interface IProps extends Partial<VirtualListProps> {
+    children?: VirtualListProps['item'];
     direction?: 'ltr' | 'rtl' | 'horizontal' | 'vertical';
     itemKey?: typeof defaultItemKey;
     itemTagName?: string;
@@ -20,6 +21,16 @@ export default class Preset {
     protected refresh?: TFunc;
     itemList: ListSet;
     constructor(props: IProps, refresh?: TFunc);
+    wrapperField: {
+        scrollLeft: number;
+        scrollTop: number;
+        scrollHeight: number;
+        scrollWidth: number;
+        clientHeight: number;
+        clientWidth: number;
+        diffOffset: number;
+    };
+    diffList: number[];
     init(props: IProps): void;
     update(props: IProps): void;
     get id(): string;
@@ -30,6 +41,9 @@ export default class Preset {
     get outerTagName(): string | import("react").ComponentType<{}>;
     get innerTagName(): string | import("react").ComponentType<{}>;
     get itemTagName(): string | import("react").ComponentType<{}>;
+    get field(): Record<string, number>;
+    set field(o: Record<string, number>);
+    isShaking(diff?: number): boolean;
     getItemStyleCache: import("memoize-one").MemoizedFn<(_itemSize?: IProps['itemSize'] | false, _layout?: IProps['layout'] | false, _direction?: IProps['direction'] | false) => {}>;
     getItemStyle(index: number): any;
 }

package/dist/components/virtual-list/preset.js

@@ -3,7 +3,7 @@ import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
 import _createClass from "@babel/runtime/helpers/esm/createClass";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import memoizeOne from 'memoize-one';
-import { convertNumber2PX } from '../../utils';
+import { convertNumber2PX, isCosDistributing } from '../../utils';
 import ListSet from './list-set';
 import { isHorizontalFunc, isRtlFunc } from './utils';
 var INSTANCE_ID = 0;
@@ -13,6 +13,16 @@ var Preset = /*#__PURE__*/function () {
     this.props = props;
     this.refresh = refresh;
     _defineProperty(this, "itemList", void 0);
+    _defineProperty(this, "wrapperField", {
+      scrollLeft: 0,
+      scrollTop: 0,
+      scrollHeight: 0,
+      scrollWidth: 0,
+      clientHeight: 0,
+      clientWidth: 0,
+      diffOffset: 0
+    });
+    _defineProperty(this, "diffList", [0, 0, 0]);
     _defineProperty(this, "getItemStyleCache", memoizeOne(function (_itemSize, _layout, _direction) {
       // TODO: Cache of item styles, keyed by item index.
       return {};
@@ -71,6 +81,28 @@ var Preset = /*#__PURE__*/function () {
     get: function get() {
       return this.props.itemElementType || this.props.itemTagName || 'div';
     }
+  }, {
+    key: "field",
+    get: function get() {
+      return this.wrapperField;
+    },
+    set: function set(o) {
+      Object.assign(this.wrapperField, o);
+      // Object.keys(o).forEach(key => {
+      //   if (typeof o[key] === 'number' && typeof this.wrapperField[key] === 'number') {
+      //     this.wrapperField[key] = o[key]
+      //   }
+      // })
+    }
+  }, {
+    key: "isShaking",
+    value: function isShaking(diff) {
+      var list = this.diffList.slice(-3);
+      this.diffList.push(diff);
+      return list.findIndex(function (e) {
+        return Math.abs(e) === Math.abs(diff);
+      }) !== -1 || isCosDistributing(this.diffList.slice(-4));
+    }
   }, {
     key: "getItemStyle",
     value: function getItemStyle(index) {

package/dist/components/virtual-list/react/index.js

@@ -45,6 +45,10 @@ var VirtualList = React.forwardRef(function VirtualList(props, ref) {
     _ref2$overscanCount = _ref2.overscanCount,
     overscanCount = _ref2$overscanCount === void 0 ? 1 : _ref2$overscanCount,
     rest = _objectWithoutProperties(_ref2, _excluded2);
+  if ('children' in rest) {
+    console.warn('Taro(VirtualList): children props have been deprecated. ' + 'Please use the item props instead.');
+    rest.item = rest.children;
+  }
   if (rest.item instanceof Array) {
     console.warn('Taro(VirtualList): item should not be an array');
     rest.item = rest.item[0];

package/dist/components/virtual-list/react/list.d.ts

@@ -14,22 +14,12 @@ export interface IState {
 export default class List extends React.PureComponent<IProps, IState> {
     static defaultProps: IProps;
     static getDerivedStateFromProps(nextProps: IProps, prevState: IState): any;
-    shouldComponentUpdate: (_nextProps: IProps, nextState: IState) => boolean;
     itemList: ListSet;
     preset: Preset;
     constructor(props: IProps);
     refresh: () => void;
     _outerRef: any;
     _resetIsScrollingTimeoutId: any;
-    field: {
-        scrollLeft: number;
-        scrollTop: number;
-        scrollHeight: number;
-        scrollWidth: number;
-        clientHeight: number;
-        clientWidth: number;
-        diffOffset: number;
-    };
     _callOnItemsRendered: import("memoize-one").MemoizedFn<(this: any, overscanStartIndex: any, overscanStopIndex: any, visibleStartIndex: any, visibleStopIndex: any) => any>;
     _callOnScroll: import("memoize-one").MemoizedFn<(this: any, scrollDirection: any, scrollOffset: any, scrollUpdateWasRequested: any, detail: any) => void>;
     _callPropsCallbacks(prevProps?: any, prevState?: any): void;

package/dist/components/virtual-list/react/list.js

@@ -11,7 +11,6 @@ import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 var _excluded = ["className", "direction", "height", "innerRef", "item", "itemCount", "itemData", "itemKey", "layout", "style", "useIsScrolling", "width", "renderTop", "renderBottom"];
 import memoizeOne from 'memoize-one';
 import React from 'react';
-import { IS_PREACT } from '../../../utils/constants';
 import { convertNumber2PX } from '../../../utils/convert';
 import { omit } from '../../../utils/lodash';
 import { cancelTimeout, requestTimeout } from '../../../utils/timer';
@@ -27,32 +26,22 @@ var List = /*#__PURE__*/function (_React$PureComponent) {
     var _this;
     _classCallCheck(this, List);
     _this = _super.call(this, props);
-    _defineProperty(_assertThisInitialized(_this), "shouldComponentUpdate", IS_PREACT ? function (_nextProps, nextState) {
-      if (_this.state.refreshCount !== nextState.refreshCount) {
-        return true;
-      }
-    } : undefined);
     _defineProperty(_assertThisInitialized(_this), "itemList", void 0);
     _defineProperty(_assertThisInitialized(_this), "preset", void 0);
     _defineProperty(_assertThisInitialized(_this), "refresh", function () {
-      return _this.setState(function (_ref) {
-        var refreshCount = _ref.refreshCount;
-        return {
-          refreshCount: ++refreshCount
-        };
-      });
+      if (process.env.FRAMEWORK === 'preact') {
+        _this.forceUpdate();
+      } else {
+        _this.setState(function (_ref) {
+          var refreshCount = _ref.refreshCount;
+          return {
+            refreshCount: ++refreshCount
+          };
+        });
+      }
     });
     _defineProperty(_assertThisInitialized(_this), "_outerRef", undefined);
     _defineProperty(_assertThisInitialized(_this), "_resetIsScrollingTimeoutId", null);
-    _defineProperty(_assertThisInitialized(_this), "field", {
-      scrollLeft: 0,
-      scrollTop: 0,
-      scrollHeight: 0,
-      scrollWidth: 0,
-      clientHeight: 0,
-      clientWidth: 0,
-      diffOffset: 0
-    });
     _defineProperty(_assertThisInitialized(_this), "_callOnItemsRendered", memoizeOne(function (overscanStartIndex, overscanStopIndex, visibleStartIndex, visibleStopIndex) {
       return _this.props.onItemsRendered({
         overscanStartIndex: overscanStartIndex,
@@ -102,15 +91,17 @@ var List = /*#__PURE__*/function (_React$PureComponent) {
         scrollLeft = _event$currentTarget.scrollLeft,
         scrollHeight = _event$currentTarget.scrollHeight,
         scrollWidth = _event$currentTarget.scrollWidth;
-      _this.field.scrollHeight = scrollHeight;
-      _this.field.scrollWidth = _this.itemList.getOffsetSize();
-      _this.field.scrollTop = scrollTop;
-      _this.field.scrollLeft = scrollLeft;
-      _this.field.clientHeight = scrollHeight;
-      _this.field.clientWidth = clientWidth;
+      _this.preset.field = {
+        scrollHeight: scrollHeight,
+        scrollWidth: _this.itemList.getOffsetSize(),
+        scrollTop: scrollTop,
+        scrollLeft: scrollLeft,
+        clientHeight: scrollHeight,
+        clientWidth: scrollWidth
+      };
       _this.setState(function (prevState) {
-        var diffOffset = _this.field.scrollLeft - scrollLeft;
-        if (prevState.scrollOffset === scrollLeft || _this.field.diffOffset === -diffOffset) {
+        var diffOffset = _this.preset.field.scrollLeft - scrollLeft;
+        if (prevState.scrollOffset === scrollLeft || _this.preset.isShaking(diffOffset)) {
           // Scroll position may have been updated by cDM/cDU,
           // In which case we don't need to trigger another render,
           // And we don't want to update state.isScrolling.
@@ -132,8 +123,9 @@ var List = /*#__PURE__*/function (_React$PureComponent) {
           }
         } // Prevent Safari's elastic scrolling from causing visual shaking when scrolling past bounds.
 
-        scrollOffset = Math.max(0, Math.min(scrollOffset, scrollWidth - clientWidth));
-        _this.field.scrollWidth = scrollOffset;
+        _this.preset.field = {
+          scrollWidth: scrollOffset
+        };
         return {
           isScrolling: true,
           scrollDirection: prevState.scrollOffset < scrollLeft ? 'forward' : 'backward',
@@ -150,8 +142,8 @@ var List = /*#__PURE__*/function (_React$PureComponent) {
         scrollTop = _event$currentTarget2.scrollTop,
         scrollLeft = _event$currentTarget2.scrollLeft;
       _this.setState(function (prevState) {
-        var diffOffset = _this.field.scrollTop - scrollTop;
-        if (prevState.scrollOffset === scrollTop || _this.field.diffOffset === -diffOffset) {
+        var diffOffset = _this.preset.field.scrollTop - scrollTop;
+        if (prevState.scrollOffset === scrollTop || _this.preset.isShaking(diffOffset)) {
           // Scroll position may have been updated by cDM/cDU,
           // In which case we don't need to trigger another render,
           // And we don't want to update state.isScrolling.
@@ -160,13 +152,15 @@ var List = /*#__PURE__*/function (_React$PureComponent) {
         // FIXME preact 中使用时，该组件会出现触底滚动事件重复触发导致的抖动问题，后续修复
         // Prevent Safari's elastic scrolling from causing visual shaking when scrolling past bounds.
         var scrollOffset = Math.max(0, Math.min(scrollTop, scrollHeight - clientHeight));
-        _this.field.scrollHeight = _this.itemList.getOffsetSize();
-        _this.field.scrollWidth = scrollWidth;
-        _this.field.scrollTop = scrollOffset;
-        _this.field.scrollLeft = scrollLeft;
-        _this.field.clientHeight = clientHeight;
-        _this.field.clientWidth = scrollWidth;
-        _this.field.diffOffset = diffOffset;
+        _this.preset.field = {
+          scrollHeight: _this.itemList.getOffsetSize(),
+          scrollWidth: scrollWidth,
+          scrollTop: scrollOffset,
+          scrollLeft: scrollLeft,
+          clientHeight: clientHeight,
+          clientWidth: scrollWidth,
+          diffOffset: _this.preset.field.scrollTop - scrollOffset
+        };
         return {
           isScrolling: true,
           scrollDirection: prevState.scrollOffset < scrollOffset ? 'forward' : 'backward',
@@ -237,7 +231,7 @@ var List = /*#__PURE__*/function (_React$PureComponent) {
       }
       if (typeof this.props.onScroll === 'function') {
         if (!prevState || prevState.scrollDirection !== this.state.scrollDirection || prevState.scrollOffset !== this.state.scrollOffset || prevState.scrollUpdateWasRequested !== this.state.scrollUpdateWasRequested) {
-          this._callOnScroll(this.state.scrollDirection, this.state.scrollOffset, this.state.scrollUpdateWasRequested, this.field);
+          this._callOnScroll(this.state.scrollDirection, this.state.scrollOffset, this.state.scrollUpdateWasRequested, this.preset.field);
         }
       }
       setTimeout(function () {
@@ -428,9 +422,9 @@ var List = /*#__PURE__*/function (_React$PureComponent) {
         }, style)
       });
       if (isHorizontal) {
-        outerElementProps.scrollLeft = scrollUpdateWasRequested ? scrollOffset : this.field.scrollLeft;
+        outerElementProps.scrollLeft = scrollUpdateWasRequested ? scrollOffset : this.preset.field.scrollLeft;
       } else {
-        outerElementProps.scrollTop = scrollUpdateWasRequested ? scrollOffset : this.field.scrollTop;
+        outerElementProps.scrollTop = scrollUpdateWasRequested ? scrollOffset : this.preset.field.scrollTop;
       }
       if (this.preset.isRelative) {
         var pre = convertNumber2PX(this.itemList.getOffsetSize(startIndex));
@@ -469,8 +463,6 @@ var List = /*#__PURE__*/function (_React$PureComponent) {
     value: function getDerivedStateFromProps(nextProps, prevState) {
       return validateListProps(nextProps, prevState);
     }
-
-    // Note: preact 不会在未使用的 state 更新后主动更新，需新增判断
   }]);
   return List;
 }(React.PureComponent); // NOTE: I considered further wrapping individual items with a pure ListItem component.

package/dist/components/virtual-list/react/validate.js

@@ -1,8 +1,7 @@
 import _typeof from "@babel/runtime/helpers/esm/typeof";
-import { IS_PROD } from '../../../utils/constants';
 var devWarningsDirection = null;
 var devWarningsTagName = null;
-if (!IS_PROD) {
+if (process.env.NODE_ENV !== 'production') {
   if (typeof window !== 'undefined' && typeof window.WeakSet !== 'undefined') {
     devWarningsDirection = /* #__PURE__ */
     new WeakSet();
@@ -21,12 +20,12 @@ export var validateListProps = function validateListProps(_ref, _ref2) {
     width = _ref.width,
     itemSize = _ref.itemSize;
   var instance = _ref2.instance;
-  if (!IS_PROD) {
+  if (process.env.NODE_ENV !== 'production') {
     if (!['number', 'function'].includes(_typeof(itemSize))) {
       throw Error('An invalid "itemSize" prop has been specified. ' + 'Value should be a number or function. ' + "\"".concat(itemSize === null ? 'null' : _typeof(itemSize), "\" was specified."));
     }
   }
-  if (!IS_PROD) {
+  if (process.env.NODE_ENV !== 'production') {
     if (innerTagName != null || outerTagName != null || itemTagName != null) {
       if (devWarningsTagName && !devWarningsTagName.has(instance)) {
         devWarningsTagName.add(instance);

package/dist/components/virtual-list/vue/list.d.ts

@@ -93,13 +93,14 @@ declare const _default: {
         scrollOffset: any;
         scrollUpdateWasRequested: boolean;
         resetIsScrollingTimeoutId: any;
+        refreshCount: number;
     };
     methods: {
         refresh(): void;
         scrollTo(scrollOffset: any): void;
         scrollToItem(index: any, align?: string): void;
         _callOnItemsRendered: import("memoize-one").MemoizedFn<(this: any, overscanStartIndex: any, overscanStopIndex: any, visibleStartIndex: any, visibleStopIndex: any) => any>;
-        _callOnScroll: import("memoize-one").MemoizedFn<(this: any, scrollDirection: any, scrollOffset: any, scrollUpdateWasRequested: any) => void>;
+        _callOnScroll: import("memoize-one").MemoizedFn<(this: any, scrollDirection: any, scrollOffset: any, scrollUpdateWasRequested: any, detail: any) => void>;
         _callPropsCallbacks(): void;
         _getSizeUploadSync(index: number, isHorizontal: boolean): Promise<unknown>;
         _getRangeToRender(): any;

package/dist/components/virtual-list/vue/list.js

@@ -1,8 +1,6 @@
 import _typeof from "@babel/runtime/helpers/esm/typeof";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import memoizeOne from 'memoize-one';
-import { nextTick, renderSlot } from 'vue';
-import { IS_VUE3, IS_WEB } from '../../../utils/constants';
 import { convertNumber2PX } from '../../../utils/convert';
 import { omit } from '../../../utils/lodash';
 import { cancelTimeout, requestTimeout } from '../../../utils/timer';
@@ -47,7 +45,7 @@ export default {
     },
     innerElementType: {
       type: String,
-      default: IS_WEB ? 'taro-view-core' : 'view'
+      default: process.env.TARO_ENV === 'h5' ? 'taro-view-core' : 'view'
     },
     direction: {
       type: String,
@@ -74,15 +72,15 @@ export default {
     itemKey: String,
     itemTagName: {
       type: String,
-      default: IS_WEB ? 'taro-view-core' : 'view'
+      default: process.env.TARO_ENV === 'h5' ? 'taro-view-core' : 'view'
     },
     innerTagName: {
       type: String,
-      default: IS_WEB ? 'taro-view-core' : 'view'
+      default: process.env.TARO_ENV === 'h5' ? 'taro-view-core' : 'view'
     },
     outerTagName: {
       type: String,
-      default: IS_WEB ? 'taro-scroll-view-core' : 'scroll-view'
+      default: process.env.TARO_ENV === 'h5' ? 'taro-scroll-view-core' : 'scroll-view'
     },
     itemElementType: String,
     outerElementType: String,
@@ -106,12 +104,13 @@ export default {
       scrollDirection: 'forward',
       scrollOffset: typeof this.$props.initialScrollOffset === 'number' ? this.$props.initialScrollOffset : 0,
       scrollUpdateWasRequested: false,
-      resetIsScrollingTimeoutId: null
+      resetIsScrollingTimeoutId: null,
+      refreshCount: 0
     };
   },
   methods: {
     refresh: function refresh() {
-      this.$forceUpdate();
+      this.refreshCount = this.refreshCount + 1;
     },
     scrollTo: function scrollTo(scrollOffset) {
       scrollOffset = Math.max(0, scrollOffset);
@@ -121,7 +120,7 @@ export default {
       this.scrollDirection = this.scrollOffset < scrollOffset ? 'forward' : 'backward';
       this.scrollOffset = scrollOffset;
       this.scrollUpdateWasRequested = true;
-      nextTick(this._resetIsScrollingDebounced);
+      this.$nextTick(this._resetIsScrollingDebounced);
     },
     scrollToItem: function scrollToItem(index) {
       var align = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'auto';
@@ -138,11 +137,12 @@ export default {
         visibleStopIndex: visibleStopIndex
       });
     }),
-    _callOnScroll: memoizeOne(function (scrollDirection, scrollOffset, scrollUpdateWasRequested) {
+    _callOnScroll: memoizeOne(function (scrollDirection, scrollOffset, scrollUpdateWasRequested, detail) {
       this.$emit('scroll', {
         scrollDirection: scrollDirection,
         scrollOffset: scrollOffset,
-        scrollUpdateWasRequested: scrollUpdateWasRequested
+        scrollUpdateWasRequested: scrollUpdateWasRequested,
+        detail: detail
       });
     }),
     _callPropsCallbacks: function _callPropsCallbacks() {
@@ -159,7 +159,7 @@ export default {
           this._callOnItemsRendered(overscanStartIndex, overscanStopIndex, visibleStartIndex, visibleStopIndex);
         }
       }
-      this._callOnScroll(this.scrollDirection, this.scrollOffset, this.scrollUpdateWasRequested);
+      this._callOnScroll(this.scrollDirection, this.scrollOffset, this.scrollUpdateWasRequested, this.preset.field);
       setTimeout(function () {
         var _this$_getRangeToRend3 = _this._getRangeToRender(),
           _this$_getRangeToRend4 = _slicedToArray(_this$_getRangeToRend3, 2),
@@ -202,14 +202,25 @@ export default {
       return this.itemList.getRangeToRender(this.$data.scrollDirection, this.$data.scrollOffset, this.$data.isScrolling);
     },
     _onScrollHorizontal: function _onScrollHorizontal(event) {
-      var clientWidth = this.$props.width;
       var _event$currentTarget = event.currentTarget,
+        clientWidth = _event$currentTarget.clientWidth,
+        scrollTop = _event$currentTarget.scrollTop,
         scrollLeft = _event$currentTarget.scrollLeft,
+        scrollHeight = _event$currentTarget.scrollHeight,
         scrollWidth = _event$currentTarget.scrollWidth;
+      this.preset.field = {
+        scrollHeight: scrollHeight,
+        scrollWidth: this.itemList.getOffsetSize(),
+        scrollTop: scrollTop,
+        scrollLeft: scrollLeft,
+        clientHeight: scrollHeight,
+        clientWidth: scrollWidth
+      };
       if (this.$props.onScrollNative) {
         this.$props.onScrollNative(event);
       }
-      if (this.scrollOffset === scrollLeft) {
+      var diffOffset = this.preset.field.scrollLeft - scrollLeft;
+      if (this.scrollOffset === scrollLeft || this.preset.isShaking(diffOffset)) {
         return;
       }
       var scrollOffset = scrollLeft;
@@ -230,31 +241,46 @@ export default {
 
       // Prevent Safari's elastic scrolling from causing visual shaking when scrolling past bounds.
       scrollOffset = Math.max(0, Math.min(scrollOffset, scrollWidth - clientWidth));
+      this.preset.field = {
+        scrollWidth: scrollOffset
+      };
       this.isScrolling = true;
       this.scrollDirection = this.scrollOffset < scrollLeft ? 'forward' : 'backward';
       this.scrollOffset = scrollOffset;
       this.scrollUpdateWasRequested = false;
-      nextTick(this._resetIsScrollingDebounced);
+      this.$nextTick(this._resetIsScrollingDebounced);
     },
     _onScrollVertical: function _onScrollVertical(event) {
-      var clientHeight = this.$props.height;
       var _event$currentTarget2 = event.currentTarget,
+        clientHeight = _event$currentTarget2.clientHeight,
         scrollHeight = _event$currentTarget2.scrollHeight,
-        scrollTop = _event$currentTarget2.scrollTop;
+        scrollWidth = _event$currentTarget2.scrollWidth,
+        scrollTop = _event$currentTarget2.scrollTop,
+        scrollLeft = _event$currentTarget2.scrollLeft;
       if (this.$props.onScrollNative) {
         this.$props.onScrollNative(event);
       }
-      if (this.scrollOffset === scrollTop) {
+      var diffOffset = this.preset.field.scrollTop - scrollTop;
+      if (this.scrollOffset === scrollTop || this.preset.isShaking(diffOffset)) {
         return;
       }
 
       // Prevent Safari's elastic scrolling from causing visual shaking when scrolling past bounds.
       var scrollOffset = Math.max(0, Math.min(scrollTop, scrollHeight - clientHeight));
+      this.preset.field = {
+        scrollHeight: this.itemList.getOffsetSize(),
+        scrollWidth: scrollWidth,
+        scrollTop: scrollOffset,
+        scrollLeft: scrollLeft,
+        clientHeight: clientHeight,
+        clientWidth: scrollWidth,
+        diffOffset: this.preset.field.scrollTop - scrollOffset
+      };
       this.isScrolling = true;
       this.scrollDirection = this.scrollOffset < scrollOffset ? 'forward' : 'backward';
       this.scrollOffset = scrollOffset;
       this.scrollUpdateWasRequested = false;
-      nextTick(this._resetIsScrollingDebounced);
+      this.$nextTick(this._resetIsScrollingDebounced);
     },
     _outerRefSetter: function _outerRefSetter(ref) {
       var outerRef = this.$props.outerRef;
@@ -275,7 +301,7 @@ export default {
       var _this3 = this;
       this.resetIsScrollingTimeoutId = null;
       this.isScrolling = false;
-      nextTick(function () {
+      this.$nextTick(function () {
         _this3.preset.getItemStyleCache(-1, null);
       });
     }
@@ -422,13 +448,14 @@ export default {
       }
     };
     if (isHorizontal) {
-      outerElementProps.scrollLeft = scrollUpdateWasRequested ? scrollOffset : this.field.scrollLeft;
+      outerElementProps.scrollLeft = scrollUpdateWasRequested ? scrollOffset : this.preset.field.scrollLeft;
     } else {
-      outerElementProps.scrollTop = scrollUpdateWasRequested ? scrollOffset : this.field.scrollTop;
+      outerElementProps.scrollTop = scrollUpdateWasRequested ? scrollOffset : this.preset.field.scrollTop;
     }
     if (this.preset.isRelative) {
+      var _this$$slots$top, _this$$slots, _this$$slots$bottom, _this$$slots2;
       var pre = convertNumber2PX(this.itemList.getOffsetSize(startIndex));
-      return _render(this.preset.outerTagName, outerElementProps, [IS_VUE3 ? renderSlot(this.$slots, 'top') : this.$slots.top, _render(this.preset.itemTagName, {
+      return _render(this.preset.outerTagName, outerElementProps, [process.env.FRAMEWORK === 'vue3' ? (_this$$slots$top = (_this$$slots = this.$slots).top) === null || _this$$slots$top === void 0 ? void 0 : _this$$slots$top.call(_this$$slots) : this.$slots.top, _render(this.preset.itemTagName, {
         key: "".concat(id, "-pre"),
         id: "".concat(id, "-pre"),
         style: {
@@ -443,9 +470,10 @@ export default {
           pointerEvents: isScrolling ? 'none' : 'auto',
           position: 'relative'
         }
-      }, items), IS_VUE3 ? renderSlot(this.$slots, 'bottom') : this.$slots.bottom]);
+      }, items), process.env.FRAMEWORK === 'vue3' ? (_this$$slots$bottom = (_this$$slots2 = this.$slots).bottom) === null || _this$$slots$bottom === void 0 ? void 0 : _this$$slots$bottom.call(_this$$slots2) : this.$slots.bottom]);
     } else {
-      return _render(this.preset.outerTagName, outerElementProps, [IS_VUE3 ? renderSlot(this.$slots, 'top') : this.$slots.top, _render(this.preset.innerTagName, {
+      var _this$$slots$top2, _this$$slots3, _this$$slots$bottom2, _this$$slots4;
+      return _render(this.preset.outerTagName, outerElementProps, [process.env.FRAMEWORK === 'vue3' ? (_this$$slots$top2 = (_this$$slots3 = this.$slots).top) === null || _this$$slots$top2 === void 0 ? void 0 : _this$$slots$top2.call(_this$$slots3) : this.$slots.top, _render(this.preset.innerTagName, {
         ref: innerRef,
         key: "".concat(id, "-inner"),
         id: "".concat(id, "-inner"),
@@ -455,7 +483,7 @@ export default {
           position: 'relative',
           width: !isHorizontal ? '100%' : estimatedTotalSize
         }
-      }, items), IS_VUE3 ? renderSlot(this.$slots, 'bottom') : this.$slots.bottom]);
+      }, items), process.env.FRAMEWORK === 'vue3' ? (_this$$slots$bottom2 = (_this$$slots4 = this.$slots).bottom) === null || _this$$slots$bottom2 === void 0 ? void 0 : _this$$slots$bottom2.call(_this$$slots4) : this.$slots.bottom]);
     }
   }
 };

package/dist/components/virtual-list/vue/render.js

@@ -2,7 +2,6 @@ import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 var _excluded = ["attrs", "on", "props", "slots"];
 import { h } from 'vue';
-import { IS_VUE3 } from '../../../utils/constants';
 export default function (componentName, options, children) {
   var _options$attrs = options.attrs,
     attrs = _options$attrs === void 0 ? {} : _options$attrs,
@@ -13,7 +12,7 @@ export default function (componentName, options, children) {
     _options$slots = options.slots,
     slots = _options$slots === void 0 ? {} : _options$slots,
     el = _objectWithoutProperties(options, _excluded);
-  if (IS_VUE3) {
+  if (process.env.FRAMEWORK === 'vue3') {
     // Events
     Object.keys(on).forEach(function (key) {
       var name = "on".concat(key.charAt(0).toUpperCase()).concat(key.slice(1));

package/dist/utils/index.d.ts

@@ -1,2 +1,4 @@
 export * from './convert';
+export * from './lodash';
+export * from './math';
 export * from './timer';

package/dist/utils/index.js

@@ -1,2 +1,4 @@
 export * from './convert';
+export * from './lodash';
+export * from './math';
 export * from './timer';

package/dist/utils/math.d.ts

@@ -0,0 +1,2 @@
+export declare function getMiddleNumber(...list: number[]): number;
+export declare function isCosDistributing(list: number[], datum?: number): boolean;

package/dist/utils/math.js

@@ -0,0 +1,18 @@
+export function getMiddleNumber() {
+  for (var _len = arguments.length, list = new Array(_len), _key = 0; _key < _len; _key++) {
+    list[_key] = arguments[_key];
+  }
+  return list.sort(function (a, b) {
+    return a - b;
+  })[Math.floor(list.length / 2)];
+}
+export function isCosDistributing(list) {
+  var datum = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
+  var flags = 0;
+  for (var i = 0; i < list.length - 1; i++) {
+    if (getMiddleNumber(list[i], datum, list[i + 1]) === datum) {
+      flags++;
+    }
+  }
+  return flags === list.length - 1;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/components-advanced",
-  "version": "3.6.0-beta.0",
+  "version": "3.6.0-beta.2",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -14,8 +14,8 @@
   "dependencies": {
     "memoize-one": "^6.0.0",
     "postcss": "^8.4.18",
-    "@tarojs/components": "3.6.0-beta.0",
-    "@tarojs/shared": "3.6.0-beta.0"
+    "@tarojs/components": "3.6.0-beta.2",
+    "@tarojs/shared": "3.6.0-beta.2"
   },
   "devDependencies": {
     "@babel/cli": "^7.14.5",
@@ -26,7 +26,7 @@
     "react-dom": "^18.2.0",
     "typescript": "^4.7.4",
     "vue": "^3.0.0",
-    "babel-preset-taro": "3.6.0-beta.0"
+    "babel-preset-taro": "3.6.0-beta.2"
   },
   "peerDependencies": {
     "react": ">=17"

package/dist/utils/constants.d.ts

@@ -1,4 +0,0 @@
-export declare const IS_PROD: boolean;
-export declare const IS_WEB: boolean;
-export declare const IS_PREACT: boolean;
-export declare const IS_VUE3: boolean;

package/dist/utils/constants.js

@@ -1,4 +0,0 @@
-export var IS_PROD = process.env.NODE_ENV === 'production';
-export var IS_WEB = process.env.TARO_ENV === 'h5';
-export var IS_PREACT = process.env.FRAMEWORK === 'preact';
-export var IS_VUE3 = process.env.FRAMEWORK === 'vue3';