taro-ui 3.2.1 → 3.3.0

package/dist/index.esm.js

@@ -1415,13 +1415,15 @@ function delay(delayTime) {
 function delayQuerySelector(selectorStr, delayTime) {
     if (delayTime === void 0) { delayTime = 500; }
     return new Promise(function (resolve) {
-        var selector = Taro.createSelectorQuery();
-        delay(delayTime).then(function () {
-            selector
-                .select(selectorStr)
-                .boundingClientRect()
-                .exec(function (res) {
-                resolve(res);
+        Taro.nextTick(function () {
+            var selector = Taro.createSelectorQuery();
+            delay(delayTime).then(function () {
+                selector
+                    .select(selectorStr)
+                    .boundingClientRect()
+                    .exec(function (res) {
+                    resolve(res);
+                });
             });
         });
     });
@@ -1564,13 +1566,7 @@ function handleTouchScroll(flag) {
 function pxTransform(size) {
     if (!size)
         return '';
-    var designWidth = 750;
-    var deviceRatio = {
-        640: 2.34 / 2,
-        750: 1,
-        828: 1.81 / 2
-    };
-    return "".concat(size / deviceRatio[designWidth], "rpx");
+    return Taro.pxTransform(size);
 }
 function objectToString$2(style) {
     if (style && typeof style === 'object') {
@@ -1600,18 +1596,6 @@ function mergeStyle(style1, style2) {
         return Object.assign({}, style1, style2);
     }
     return objectToString$2(style1) + objectToString$2(style2);
-}
-/**
- * 自定义验证器，用于验证参数是否是 JSX.Element
- * @param {any} props
- * @param {string} propName
- * @param {string} componentName
- * @returns
- */
-function isJSXElement(props, propName, componentName) {
-    if (!React.isValidElement(props[propName])) {
-        return new Error("Invalid prop ".concat(propName, " supplied to ").concat(componentName, ". It must be a valid JSX element."));
-    }
 }
 
 var AtLoading = /** @class */ (function (_super) {
@@ -2122,16 +2106,16 @@ AtListItem.defaultProps = {
     iconInfo: { value: '' }
 };
 AtListItem.propTypes = {
-    note: isJSXElement,
+    note: propTypes.oneOfType([propTypes.string, propTypes.element]),
     disabled: propTypes.bool,
-    title: isJSXElement,
+    title: propTypes.oneOfType([propTypes.string, propTypes.element]),
     thumb: propTypes.string,
     onClick: propTypes.func,
     isSwitch: propTypes.bool,
     hasBorder: propTypes.bool,
     switchColor: propTypes.string,
     switchIsCheck: propTypes.bool,
-    extraText: isJSXElement,
+    extraText: propTypes.oneOfType([propTypes.string, propTypes.element]),
     extraThumb: propTypes.string,
     onSwitchChange: propTypes.func,
     arrow: propTypes.oneOf(['up', 'down', 'right']),
@@ -4509,8 +4493,7 @@ var AtTabs = /** @class */ (function (_super) {
             transformStyle = "translate3d(-".concat(current * 100, "%, 0px, 0px)");
         }
         Object.assign(bodyStyle, {
-            transform: transformStyle,
-            '-webkit-transform': transformStyle
+            transform: transformStyle
         });
         if (!animated) {
             bodyStyle.transition = 'unset';
@@ -5162,22 +5145,7 @@ var AtSwipeAction = /** @class */ (function (_super) {
         };
         _this.onTouchEnd = function (e) {
             var maxOffsetSize = _this.state.maxOffsetSize;
-            if (_this.moveX === -maxOffsetSize) {
-                _this._reset(true);
-                _this.handleOpened(e);
-                return;
-            }
-            if (_this.moveX === 0) {
-                _this._reset(false);
-                _this.handleClosed(e);
-                return;
-            }
-            if (_this.state._isOpened && _this.moveX < 0) {
-                _this._reset(false);
-                _this.handleClosed(e);
-                return;
-            }
-            if (Math.abs(_this.moveX) < maxOffsetSize * _this.moveRatio) {
+            if (Math.abs(_this.moveX) < maxOffsetSize / 2) {
                 _this._reset(false);
                 _this.handleClosed(e);
             }
@@ -5189,7 +5157,7 @@ var AtSwipeAction = /** @class */ (function (_super) {
         _this.onChange = function (e) {
             _this.moveX = e.detail.x;
         };
-        var isOpened = props.isOpened, moveRatio = props.moveRatio;
+        var isOpened = props.isOpened;
         _this.state = {
             componentId: uuid(),
             // eslint-disable-next-line no-extra-boolean-cast
@@ -5200,7 +5168,6 @@ var AtSwipeAction = /** @class */ (function (_super) {
             maxOffsetSize: 0
         };
         _this.moveX = _this.state.offsetSize;
-        _this.moveRatio = moveRatio || 0.5;
         return _this;
     }
     AtSwipeAction.prototype.componentDidMount = function () {
@@ -6201,7 +6168,8 @@ var AtIndexes = /** @class */ (function (_super) {
             _scrollTop: 0,
             _tipText: '',
             _isShowToast: false,
-            isWEB: Taro.getEnv() === Taro.ENV_TYPE.WEB
+            isWEB: Taro.getEnv() === Taro.ENV_TYPE.WEB,
+            currentIndex: -1
         };
         // 右侧导航高度
         _this.menuHeight = 0;
@@ -6212,6 +6180,7 @@ var AtIndexes = /** @class */ (function (_super) {
         // 当前索引
         _this.currentIndex = -1;
         _this.listId = isTest() ? 'indexes-list-AOTU2018' : "list-".concat(uuid());
+        _this.indexMap = [];
         return _this;
     }
     AtIndexes.prototype.jumpTarget = function (_scrollIntoView, idx) {
@@ -6269,21 +6238,69 @@ var AtIndexes = /** @class */ (function (_super) {
         }
     };
     AtIndexes.prototype.initData = function () {
-        var _this = this;
-        delayQuerySelector('.at-indexes__menu').then(function (rect) {
-            var len = _this.props.list.length;
-            _this.menuHeight = rect[0].height;
-            _this.startTop = rect[0].top;
-            _this.itemHeight = Math.floor(_this.menuHeight / (len + 1));
+        var _a, _b, _c, _d;
+        return __awaiter(this, void 0, void 0, function () {
+            var headerHeight, itemHeight, titleHeight;
+            var _this = this;
+            return __generator(this, function (_e) {
+                switch (_e.label) {
+                    case 0:
+                        delayQuerySelector('.at-indexes__menu').then(function (rect) {
+                            var len = _this.props.list.length;
+                            _this.menuHeight = rect[0].height;
+                            _this.startTop = rect[0].top;
+                            _this.itemHeight = Math.floor(_this.menuHeight / (len + 1));
+                        });
+                        return [4 /*yield*/, delayQuerySelector('#at-indexes__top')];
+                    case 1:
+                        headerHeight = ((_b = (_a = (_e.sent())) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.height) || 0;
+                        return [4 /*yield*/, delayQuerySelector('.at-list__item')];
+                    case 2:
+                        itemHeight = ((_c = (_e.sent())) === null || _c === void 0 ? void 0 : _c[0].height) || 0;
+                        return [4 /*yield*/, delayQuerySelector('.at-indexes__list-title')];
+                    case 3:
+                        titleHeight = ((_d = (_e.sent())) === null || _d === void 0 ? void 0 : _d[0].height) || 0;
+                        this.indexMap = [];
+                        this.props.list.forEach(function (dataList, i) {
+                            if (i === 0) {
+                                _this.indexMap.push({
+                                    key: dataList.key,
+                                    startHeight: headerHeight,
+                                    endHeight: dataList.items.length * itemHeight + headerHeight + titleHeight
+                                });
+                            }
+                            else {
+                                var prev = _this.indexMap[i - 1];
+                                _this.indexMap.push({
+                                    key: dataList.key,
+                                    startHeight: prev.endHeight,
+                                    endHeight: prev.endHeight + dataList.items.length * itemHeight + titleHeight
+                                });
+                            }
+                        });
+                        return [2 /*return*/];
+                }
+            });
         });
     };
     AtIndexes.prototype.handleScroll = function (e) {
         if (e && e.detail) {
+            var scrollTop = e.detail.scrollTop;
             this.setState({
-                _scrollTop: e.detail.scrollTop
+                _scrollTop: scrollTop
             });
+            this.getAnchorIndex(scrollTop);
         }
     };
+    // 根据滚动高度，判断当前应该显示的索引值
+    AtIndexes.prototype.getAnchorIndex = function (scrollTop) {
+        var index = this.indexMap.findIndex(function (item) {
+            return scrollTop >= item.startHeight && scrollTop < item.endHeight;
+        });
+        this.setState({
+            currentIndex: index
+        });
+    };
     AtIndexes.prototype.UNSAFE_componentWillReceiveProps = function (nextProps) {
         if (nextProps.list.length !== this.props.list.length) {
             this.initData();
@@ -6302,13 +6319,15 @@ var AtIndexes = /** @class */ (function (_super) {
     AtIndexes.prototype.render = function () {
         var _this = this;
         var _a = this.props, className = _a.className, customStyle = _a.customStyle, animation = _a.animation, topKey = _a.topKey, list = _a.list;
-        var _b = this.state, _scrollTop = _b._scrollTop, _scrollIntoView = _b._scrollIntoView, _tipText = _b._tipText, _isShowToast = _b._isShowToast, isWEB = _b.isWEB;
+        var _b = this.state, _scrollTop = _b._scrollTop, _scrollIntoView = _b._scrollIntoView, _tipText = _b._tipText, _isShowToast = _b._isShowToast, isWEB = _b.isWEB, currentIndex = _b.currentIndex;
         var toastStyle = { minWidth: pxTransform(100) };
         var rootCls = classnames('at-indexes', className);
         var menuList = list.map(function (dataList, i) {
             var key = dataList.key;
             var targetView = "at-indexes__list-".concat(key);
-            return (React.createElement(View, { className: 'at-indexes__menu-item', key: key, onClick: _this.jumpTarget.bind(_this, targetView, i + 1) }, key));
+            return (React.createElement(View, { className: classnames('at-indexes__menu-item', {
+                    'at-indexes__menu-item--active': currentIndex === i
+                }), key: key, onClick: _this.jumpTarget.bind(_this, targetView, i + 1) }, key));
         });
         var indexesList = list.map(function (dataList) { return (React.createElement(View, { id: "at-indexes__list-".concat(dataList.key), className: 'at-indexes__list', key: dataList.key },
             React.createElement(View, { className: 'at-indexes__list-title' }, dataList.title),