@nutui/nutui-react-taro 3.0.5 → 3.0.7

package/dist/es/packages/pickerview/pickerroller.js

@@ -30,6 +30,7 @@ var InternalPickerRoller = function(props, ref) {
     var isMoving = useRef(false);
     var rollerRef = useRef(null);
     var pickerRollerRef = useRef(null);
+    var placeholderRef = useRef(null);
     var _useState3 = _sliced_to_array(useState(0), 2), startTime = _useState3[0], setStartTime = _useState3[1];
     var _useState4 = _sliced_to_array(useState(0), 2), startY = _useState4[0], setStartY = _useState4[1];
     var transformY = useRef(0);
@@ -124,7 +125,7 @@ var InternalPickerRoller = function(props, ref) {
                         ]);
                         return [
                             4,
-                            getRectByTaro(rollerRef.current)
+                            getRectByTaro(placeholderRef.current)
                         ];
                     case 1:
                         placeholder = _state.sent();
@@ -172,7 +173,7 @@ var InternalPickerRoller = function(props, ref) {
         }
     }, [
         pickerRollerRef.current,
-        rollerRef.current
+        placeholderRef.current
     ]);
     useEffect(function() {
         isMoving.current = false;
@@ -214,6 +215,10 @@ var InternalPickerRoller = function(props, ref) {
         className: "nut-pickerview-list",
         ref: pickerRollerRef
     }, /*#__PURE__*/ React.createElement(View, {
+        className: "".concat(classPrefix, "-placeholder"),
+        ref: placeholderRef,
+        id: "".concat(classPrefix, "-placeholder-").concat(uuid)
+    }), /*#__PURE__*/ React.createElement(View, {
         className: classPrefix,
         id: "".concat(classPrefix, "-").concat(uuid),
         ref: rollerRef,

package/dist/es/packages/pickerview/style/pickerview.scss

@@ -49,6 +49,9 @@
     height: $picker-item-height;
     z-index: 1;
     transform-style: preserve-3d;
+    &-placeholder {
+      height: $picker-item-height;
+    }
   }
 
   &-roller-item {

package/dist/es/packages/pickerview/style/style.css

@@ -48,6 +48,9 @@
   z-index: 1;
   transform-style: preserve-3d;
 }
+.nut-pickerview-roller-placeholder {
+  height: var(--nutui-picker-item-height, 36px);
+}
 .nut-pickerview-roller-item {
   position: absolute;
   top: 0;

package/dist/es/packages/pickerview/style/style.harmony.css

@@ -48,6 +48,9 @@
   z-index: 1;
   transform-style: preserve-3d;
 }
+.nut-pickerview-roller-placeholder {
+  height: 36px;
+}
 .nut-pickerview-roller-item {
   position: absolute;
   top: 0;

package/dist/es/packages/popover/popover.d.ts

@@ -1,10 +1,3 @@
 import React, { FunctionComponent } from 'react';
 import { TaroPopoverProps } from "../../types";
-export interface RootPosition {
-    width: number;
-    height: number;
-    left: number;
-    top: number;
-    right: number;
-}
 export declare const Popover: FunctionComponent<Partial<TaroPopoverProps> & Omit<React.HTMLAttributes<HTMLDivElement>, 'onSelect'>>;

package/dist/es/packages/popover/popover.js

@@ -7,14 +7,15 @@ import { _ as _sliced_to_array } from "@swc/helpers/_/_sliced_to_array";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import React, { useEffect, useRef, useState } from "react";
 import classNames from "classnames";
-import Taro, { createSelectorQuery } from "@tarojs/taro";
-import { View } from "@tarojs/components";
+import { nextTick } from "@tarojs/taro";
+import { Text, View } from "@tarojs/components";
 import { ArrowRadius } from "@nutui/icons-react-taro";
 import Popup from "../popup/index";
 import { getRectByTaro } from "../../utils/get-rect-by-taro";
 import { ComponentDefaults } from "../../utils/typings";
-import { getRect } from "../../hooks/use-client-rect";
 import { useRtl } from "../configprovider/index";
+import pxTransform from "../../utils/px-transform";
+import useUuid from "../../hooks/use-uuid";
 var defaultProps = _object_spread_props(_object_spread({}, ComponentDefaults), {
     list: [],
     theme: 'light',
@@ -26,7 +27,6 @@ var defaultProps = _object_spread_props(_object_spread({}, ComponentDefaults), {
     ],
     arrowOffset: 0,
     targetId: '',
-    className: '',
     showArrow: true,
     closeOnOutsideClick: true,
     closeOnActionClick: true,
@@ -61,129 +61,100 @@ export var Popover = function(props) {
     var popoverRef = useRef(null);
     var popoverContentRef = useRef(null);
     var _useState = _sliced_to_array(useState(false), 2), showPopup = _useState[0], setShowPopup = _useState[1];
-    var _useState1 = _sliced_to_array(useState(0), 2), elWidth = _useState1[0], setElWidth = _useState1[1];
-    var _useState2 = _sliced_to_array(useState(0), 2), elHeight = _useState2[0], setElHeight = _useState2[1];
-    var _useState3 = _sliced_to_array(useState(), 2), rootPosition = _useState3[0], setRootPosition = _useState3[1];
+    var _useState1 = _sliced_to_array(useState(0), 2), popWidth = _useState1[0], setPopWidth = _useState1[1];
+    var _useState2 = _sliced_to_array(useState(0), 2), popHeight = _useState2[0], setPopHeight = _useState2[1];
+    var _useState3 = _sliced_to_array(useState(), 2), wrapperPosition = _useState3[0], setWrapperPosition = _useState3[1];
     useEffect(function() {
         setShowPopup(visible);
         if (visible) {
-            setTimeout(function() {
-                getContentWidth();
-            }, 0);
+            getWrapperPosition();
         }
     }, [
         visible
     ]);
-    var getContentWidth = /*#__PURE__*/ function() {
+    var uid = useUuid();
+    var popoverId = "popover-".concat(uid);
+    var getWrapperPosition = /*#__PURE__*/ function() {
         var _ref = _async_to_generator(function() {
-            var rect;
             return _ts_generator(this, function(_state) {
-                createSelectorQuery().selectViewport().scrollOffset(/*#__PURE__*/ function() {
-                    var _ref = _async_to_generator(function(res) {
-                        var distance;
-                        return _ts_generator(this, function(_state) {
-                            switch(_state.label){
-                                case 0:
-                                    distance = res.scrollTop;
-                                    if (!targetId) return [
-                                        3,
-                                        4
-                                    ];
-                                    if (!(Taro.getEnv() === Taro.ENV_TYPE.WEB)) return [
-                                        3,
-                                        1
-                                    ];
-                                    rect = getRect(document.querySelector("#".concat(targetId)));
-                                    return [
-                                        3,
-                                        3
-                                    ];
-                                case 1:
-                                    return [
-                                        4,
-                                        getRectTaro(targetId)
-                                    ];
-                                case 2:
-                                    rect = _state.sent();
-                                    _state.label = 3;
-                                case 3:
-                                    return [
-                                        3,
-                                        6
-                                    ];
-                                case 4:
-                                    return [
-                                        4,
-                                        getRectByTaro(popoverRef.current)
-                                    ];
-                                case 5:
-                                    rect = _state.sent();
-                                    _state.label = 6;
-                                case 6:
-                                    setRootPosition({
-                                        width: rect.width,
-                                        height: rect.height,
-                                        left: rtl ? rect.right : rect.left,
-                                        top: rect.top + distance,
-                                        right: rtl ? rect.left : rect.right
-                                    });
-                                    return [
-                                        2
-                                    ];
-                            }
-                        });
+                nextTick(/*#__PURE__*/ _async_to_generator(function() {
+                    var rect, _tmp, width, height, right, left, top;
+                    return _ts_generator(this, function(_state) {
+                        switch(_state.label){
+                            case 0:
+                                if (!targetId) return [
+                                    3,
+                                    2
+                                ];
+                                return [
+                                    4,
+                                    getRectByTaro(document.querySelector("#".concat(targetId)), targetId)
+                                ];
+                            case 1:
+                                _tmp = _state.sent();
+                                return [
+                                    3,
+                                    4
+                                ];
+                            case 2:
+                                return [
+                                    4,
+                                    getRectByTaro(popoverRef.current, popoverId)
+                                ];
+                            case 3:
+                                _tmp = _state.sent();
+                                _state.label = 4;
+                            case 4:
+                                rect = _tmp;
+                                width = rect.width, height = rect.height, right = rect.right, left = rect.left, top = rect.top;
+                                setWrapperPosition({
+                                    width: width,
+                                    height: height,
+                                    left: rtl ? right : left,
+                                    top: top,
+                                    right: rtl ? left : right
+                                });
+                                getPopoverContentW();
+                                return [
+                                    2
+                                ];
+                        }
                     });
-                    return function(res) {
-                        return _ref.apply(this, arguments);
-                    };
-                }()).exec();
-                setTimeout(function() {
-                    getPopoverContentW();
-                }, 300);
+                }));
                 return [
                     2
                 ];
             });
         });
-        return function getContentWidth() {
-            return _ref.apply(this, arguments);
-        };
-    }();
-    var getRectTaro = /*#__PURE__*/ function() {
-        var _ref = _async_to_generator(function(targetId) {
-            return _ts_generator(this, function(_state) {
-                return [
-                    2,
-                    new Promise(function(resolve) {
-                        createSelectorQuery().select("#".concat(targetId)).boundingClientRect().exec(function(res) {
-                            resolve(res[0]);
-                        });
-                    })
-                ];
-            });
-        });
-        return function getRectTaro(targetId) {
+        return function getWrapperPosition() {
             return _ref.apply(this, arguments);
         };
     }();
     var getPopoverContentW = /*#__PURE__*/ function() {
         var _ref = _async_to_generator(function() {
-            var rectContent;
             return _ts_generator(this, function(_state) {
-                switch(_state.label){
-                    case 0:
-                        return [
-                            4,
-                            getRectByTaro(popoverContentRef.current)
-                        ];
-                    case 1:
-                        rectContent = _state.sent();
-                        setElWidth(rectContent.width);
-                        setElHeight(rectContent.height);
-                        return [
-                            2
-                        ];
-                }
+                nextTick(/*#__PURE__*/ _async_to_generator(function() {
+                    var rectContent;
+                    return _ts_generator(this, function(_state) {
+                        switch(_state.label){
+                            case 0:
+                                return [
+                                    4,
+                                    getRectByTaro(popoverContentRef.current)
+                                ];
+                            case 1:
+                                rectContent = _state.sent();
+                                setPopWidth(rectContent.width);
+                                setPopHeight(rectContent.height);
+                                return [
+                                    2
+                                ];
+                        }
+                    });
+                }));
+                return [
+                    2
+                ];
             });
         });
         return function getPopoverContentW() {
@@ -192,23 +163,23 @@ export var Popover = function(props) {
     }();
     var clickAway = function() {
         if (closeOnOutsideClick) {
-            onClick && onClick();
-            onClose && onClose();
+            onClick === null || onClick === void 0 ? void 0 : onClick();
+            onClose === null || onClose === void 0 ? void 0 : onClose();
         }
     };
-    var _obj;
-    var classes = classNames((_obj = {}, _define_property(_obj, "".concat(classPrefix), true), _define_property(_obj, "".concat(classPrefix, "-").concat(theme), theme === 'dark'), _obj), className);
+    var classes = classNames(classPrefix, _define_property({}, "".concat(classPrefix, "-").concat(theme), theme === 'dark'), className);
     var popoverArrow = function() {
         var prefixCls = 'nut-popover-arrow';
-        return "".concat(prefixCls, " ").concat(prefixCls, "-").concat(location.split('-')[0], " ").concat(prefixCls, "-").concat(location);
+        var direction = location.split('-')[0];
+        return "".concat(prefixCls, " ").concat(prefixCls, "-").concat(direction, " ").concat(prefixCls, "-").concat(location);
     };
-    var getRootPosition = function() {
+    var getPopoverPosition = function() {
         var styles = {};
-        if (!rootPosition) {
+        if (!wrapperPosition) {
             styles.visibility = 'hidden';
             return styles;
         }
-        var width = rootPosition.width, height = rootPosition.height, left = rootPosition.left, top = rootPosition.top, right = rootPosition.right;
+        var width = wrapperPosition.width, height = wrapperPosition.height, left = wrapperPosition.left, top = wrapperPosition.top, right = wrapperPosition.right;
         var direction = location.split('-')[0];
         var skew = location.split('-')[1];
         var cross = 0;
@@ -224,36 +195,36 @@ export var Popover = function(props) {
                 'bottom',
                 'top'
             ].includes(direction)) {
-                var h = direction === 'bottom' ? height + cross : -(elHeight + cross);
-                styles.top = "".concat(top + h, "px");
+                var h = direction === 'bottom' ? height + cross : -(popHeight + cross);
+                styles.top = pxTransform(top + h);
                 if (!skew) {
-                    styles[dir] = "".concat(-(elWidth - width) / 2 + rootPosition[dir] + parallel, "px");
+                    styles[dir] = pxTransform(-(popWidth - width) / 2 + wrapperPosition[dir] + parallel);
                 }
-                if (skew === 'start') {
-                    styles.left = "".concat(left + parallel, "px");
+                if (skew === 'left') {
+                    styles.left = pxTransform(left + parallel);
                 }
-                if (skew === 'end') {
-                    styles.left = "".concat(right + parallel, "px");
+                if (skew === 'right') {
+                    styles.left = pxTransform(right + parallel);
                 }
             }
             if ([
                 'left',
                 'right'
             ].includes(direction)) {
-                var contentW = direction === 'left' ? -(elWidth + cross) : width + cross;
-                styles.left = "".concat(left + contentW, "px");
+                var contentW = direction === 'left' ? -(popWidth + cross) : width + cross;
+                styles.left = pxTransform(left + contentW);
                 if (!skew) {
-                    styles.top = "".concat(top - elHeight / 2 + height / 2 - 4 + parallel, "px");
+                    styles.top = pxTransform(top - popHeight / 2 + height / 2 - 4 + parallel);
                 }
-                if (skew === 'start') {
-                    styles.top = "".concat(top + parallel, "px");
+                if (skew === 'top') {
+                    styles.top = pxTransform(top + parallel);
                 }
-                if (skew === 'end') {
-                    styles.top = "".concat(top + height + parallel, "px");
+                if (skew === 'bottom') {
+                    styles.top = pxTransform(top + height + parallel);
                 }
             }
         }
-        styles.visibility = elWidth === 0 ? 'hidden' : 'initial';
+        styles.visibility = popWidth === 0 ? 'hidden' : 'initial';
         return styles;
     };
     var popoverArrowStyle = function() {
@@ -271,10 +242,10 @@ export var Popover = function(props) {
                 if (!skew) {
                     styles[dir] = "calc(50% + ".concat(arrowOffset, "px)");
                 }
-                if (skew === 'start') {
+                if (skew === 'left') {
                     styles[dir] = "".concat(base + arrowOffset, "px");
                 }
-                if (skew === 'end') {
+                if (skew === 'right') {
                     styles[dir2] = "".concat(base - arrowOffset, "px");
                 }
             }
@@ -285,10 +256,10 @@ export var Popover = function(props) {
                 if (!skew) {
                     styles.top = "calc(50% - ".concat(arrowOffset, "px)");
                 }
-                if (skew === 'start') {
+                if (skew === 'top') {
                     styles.top = "".concat(base - arrowOffset, "px");
                 }
-                if (skew === 'end') {
+                if (skew === 'bottom') {
                     styles.bottom = "".concat(base + arrowOffset, "px");
                 }
             }
@@ -307,6 +278,7 @@ export var Popover = function(props) {
     return /*#__PURE__*/ React.createElement(React.Fragment, null, !targetId && /*#__PURE__*/ React.createElement(View, {
         className: "nut-popover-wrapper",
         ref: popoverRef,
+        id: popoverId,
         onClick: function() {
             var _props_onClick;
             props === null || props === void 0 ? void 0 : (_props_onClick = props.onClick) === null || _props_onClick === void 0 ? void 0 : _props_onClick.call(props);
@@ -319,7 +291,7 @@ export var Popover = function(props) {
         style: style
     }, Array.isArray(children) ? children[0] : children), /*#__PURE__*/ React.createElement(View, {
         className: classes,
-        style: getRootPosition()
+        style: _object_spread({}, getPopoverPosition(), style)
     }, /*#__PURE__*/ React.createElement(Popup, _object_spread({
         className: "nut-popover-content nut-popover-content-".concat(location),
         position: "none",
@@ -334,22 +306,23 @@ export var Popover = function(props) {
     }, /*#__PURE__*/ React.createElement(ArrowRadius, {
         width: 8,
         height: 4
-    })), Array.isArray(children) ? children[1] : '', list.map(function(item, index) {
+    })), Array.isArray(children) ? children[1] : null, list.map(function(item, index) {
+        var _item_action;
         return /*#__PURE__*/ React.createElement(View, {
             className: classNames({
-                'nut-popover-menu-item': true,
-                'nut-popover-menu-disabled': item.disabled
+                'nut-popover-item': true,
+                'nut-popover-item-disabled': item.disabled
             }, item.className),
             key: item.key || index,
             onClick: function() {
                 return handleSelect(item, index);
             }
         }, item.icon && /*#__PURE__*/ React.createElement(View, {
-            className: "nut-popover-menu-item-icon"
-        }, item.icon), /*#__PURE__*/ React.createElement(View, {
-            className: "nut-popover-menu-item-name"
-        }, item.name), item.action && item.action.icon && /*#__PURE__*/ React.createElement(View, {
-            className: "nut-popover-menu-item-action-icon",
+            className: "nut-popover-item-icon"
+        }, item.icon), /*#__PURE__*/ React.createElement(Text, {
+            className: "nut-popover-item-name"
+        }, item.name), ((_item_action = item.action) === null || _item_action === void 0 ? void 0 : _item_action.icon) && /*#__PURE__*/ React.createElement(View, {
+            className: "nut-popover-item-action-icon",
             onClick: function(e) {
                 var _item_action_onClick, _item_action;
                 return (_item_action = item.action) === null || _item_action === void 0 ? void 0 : (_item_action_onClick = _item_action.onClick) === null || _item_action_onClick === void 0 ? void 0 : _item_action_onClick.call(_item_action, e);