@nutui/nutui-react-taro 3.0.19 → 3.0.20-cpp

package/dist/cjs/packages/swipe/swipe.js

@@ -18,10 +18,10 @@ var _ts_generator = require("@swc/helpers/_/_ts_generator");
 var _react = /*#__PURE__*/ _interop_require_wildcard._(require("react"));
 var _classnames = /*#__PURE__*/ _interop_require_default._(require("classnames"));
 var _components = require("@tarojs/components");
+var _taro = require("@tarojs/taro");
 var _usetouch = require("../../hooks/use-touch");
 var _getrect = require("../../utils/taro/get-rect");
 var _typings = require("../../utils/typings");
-var _platform = require("../../utils/taro/platform");
 var _userefstate = require("../../hooks/use-ref-state");
 var _useuuid = require("../../hooks/use-uuid");
 function preventDefault(event, isStopPropagation) {
@@ -41,100 +41,9 @@ var Swipe = /*#__PURE__*/ (0, _react.forwardRef)(function(props, instanceRef) {
     var uid = (0, _useuuid.useUuid)();
     var leftId = "swipe-left-".concat(uid);
     var rightId = "swipe-right-".concat(uid);
-    var _$_object_spread = (0, _object_spread._)({}, defaultProps, props), children = _$_object_spread.children, className = _$_object_spread.className, style = _$_object_spread.style;
-    var root = (0, _react.useRef)();
-    var opened = (0, _react.useRef)(false);
-    var lockClick = (0, _react.useRef)(false);
-    var startOffset = (0, _react.useRef)(0);
-    var _useState = (0, _sliced_to_array._)((0, _react.useState)({
-        offset: 0,
-        dragging: false
-    }), 2), state = _useState[0], setState = _useState[1];
-    var _useRefState = (0, _sliced_to_array._)((0, _userefstate.useRefState)({
-        left: 0,
-        right: 0
-    }), 2), actionWidth = _useRefState[0], updateState = _useRefState[1];
-    var setActionWidth = (0, _react.useCallback)(function(fn) {
-        var res = fn();
-        if (res.left !== undefined) {
-            updateState((0, _object_spread_props._)((0, _object_spread._)({}, actionWidth.current), {
-                left: res.left
-            }));
-        }
-        if (res.right !== undefined) {
-            updateState((0, _object_spread_props._)((0, _object_spread._)({}, actionWidth.current), {
-                right: res.right
-            }));
-        }
-    }, [
-        actionWidth,
-        updateState
-    ]);
-    // 获取元素的时候要在页面 onReady 后，需要参考小程序的事件周期
-    (0, _react.useLayoutEffect)(function() {
-        var getWidth = /*#__PURE__*/ function() {
-            var _ref = (0, _async_to_generator._)(function() {
-                var leftRect, rightRect;
-                return (0, _ts_generator._)(this, function(_state) {
-                    switch(_state.label){
-                        case 0:
-                            if (!leftWrapper.current) return [
-                                3,
-                                2
-                            ];
-                            return [
-                                4,
-                                (0, _getrect.getRectInMultiPlatform)(leftWrapper.current, leftId)
-                            ];
-                        case 1:
-                            leftRect = _state.sent();
-                            leftRect && setActionWidth(function(v) {
-                                return (0, _object_spread_props._)((0, _object_spread._)({}, v), {
-                                    left: leftRect.width
-                                });
-                            });
-                            _state.label = 2;
-                        case 2:
-                            if (!rightWrapper.current) return [
-                                3,
-                                4
-                            ];
-                            return [
-                                4,
-                                (0, _getrect.getRectInMultiPlatform)(rightWrapper.current, rightId)
-                            ];
-                        case 3:
-                            rightRect = _state.sent();
-                            rightRect && setActionWidth(function(v) {
-                                return (0, _object_spread_props._)((0, _object_spread._)({}, v), {
-                                    right: rightRect.width
-                                });
-                            });
-                            _state.label = 4;
-                        case 4:
-                            return [
-                                2
-                            ];
-                    }
-                });
-            });
-            return function getWidth() {
-                return _ref.apply(this, arguments);
-            };
-        }();
-        getWidth();
-    }, [
-        leftId,
-        rightId,
-        setActionWidth
-    ]);
-    var wrapperStyle = {
-        transform: "translate(".concat(state.offset).concat(!(0, _platform.harmony)() ? 'px' : '', ", 0)"),
-        transitionDuration: state.dragging ? '0s' : '.6s'
-    };
-    var onTouchStart = /*#__PURE__*/ function() {
-        var _ref = (0, _async_to_generator._)(function(event) {
-            var leftRect, rightRect, _props_onTouchStart;
+    var getWidth = function getWidth() {
+        return (0, _async_to_generator._)(function() {
+            var leftRect, rightRect;
             return (0, _ts_generator._)(this, function(_state) {
                 switch(_state.label){
                     case 0:
@@ -172,47 +81,96 @@ var Swipe = /*#__PURE__*/ (0, _react.forwardRef)(function(props, instanceRef) {
                         });
                         _state.label = 4;
                     case 4:
-                        if (!props.disabled) {
-                            ;
-                            startOffset.current = state.offset;
-                            touch.start(event);
-                            (_props_onTouchStart = props.onTouchStart) === null || _props_onTouchStart === void 0 ? void 0 : _props_onTouchStart.call(props, event);
-                        }
                         return [
                             2
                         ];
                 }
             });
+        })();
+    };
+    // 获取元素的时候要在页面 onReady 后，需要参考小程序的事件周期
+    (0, _taro.useReady)(function() {
+        (0, _taro.nextTick)(function() {
+            return getWidth();
         });
-        return function onTouchStart(event) {
-            return _ref.apply(this, arguments);
+    });
+    var _$_object_spread = (0, _object_spread._)({}, defaultProps, props), children = _$_object_spread.children, className = _$_object_spread.className, style = _$_object_spread.style;
+    var root = (0, _react.useRef)();
+    var opened = (0, _react.useRef)(false);
+    var lockClick = (0, _react.useRef)(false);
+    var startOffset = (0, _react.useRef)(0);
+    var _useState = (0, _sliced_to_array._)((0, _react.useState)({
+        offset: 0,
+        dragging: false
+    }), 2), state = _useState[0], setState = _useState[1];
+    var _useRefState = (0, _sliced_to_array._)((0, _userefstate.useRefState)({
+        left: 0,
+        right: 0
+    }), 2), actionWidth = _useRefState[0], updateState = _useRefState[1];
+    var setActionWidth = function setActionWidth(fn) {
+        var res = fn();
+        if (res.left !== undefined) {
+            updateState((0, _object_spread_props._)((0, _object_spread._)({}, actionWidth.current), {
+                left: res.left
+            }));
+        }
+        if (res.right !== undefined) {
+            updateState((0, _object_spread_props._)((0, _object_spread._)({}, actionWidth.current), {
+                right: res.right
+            }));
+        }
+    };
+    var wrapperStyle = (0, _react.useMemo)(function() {
+        return {
+            transform: "translate(".concat(state.offset, "px, 0)"),
+            transitionDuration: state.dragging ? '0.01s' : '.6s'
         };
-    }();
+    }, [
+        state.offset,
+        state.dragging
+    ]);
+    var onTouchStart = function onTouchStart(event) {
+        return (0, _async_to_generator._)(function() {
+            var _props_onTouchStart;
+            return (0, _ts_generator._)(this, function(_state) {
+                if (!props.disabled) {
+                    ;
+                    getWidth();
+                    startOffset.current = state.offset;
+                    touch.start(event);
+                    (_props_onTouchStart = props.onTouchStart) === null || _props_onTouchStart === void 0 ? void 0 : _props_onTouchStart.call(props, event);
+                }
+                return [
+                    2
+                ];
+            });
+        })();
+    };
     var onTouchMove = function onTouchMove(event) {
         var _props_onTouchMove;
-        if (props.disabled) {
-            return;
-        }
+        if (props.disabled) return;
         touch.move(event);
         (_props_onTouchMove = props.onTouchMove) === null || _props_onTouchMove === void 0 ? void 0 : _props_onTouchMove.call(props, event);
         if (touch.isHorizontal()) {
             lockClick.current = true;
-            var newState = (0, _object_spread_props._)((0, _object_spread._)({}, state), {
-                dragging: true
-            });
             var isEdge = !opened || touch.deltaX.current * startOffset.current < 0;
             if (isEdge) {
                 preventDefault(event, true);
             }
-            newState.offset = rangeCalculation(touch.deltaX.current + startOffset.current, -actionWidth.current.right || 0, actionWidth.current.left || 0);
-            setState(newState);
+            var offset = rangeCalculation(touch.deltaX.current + startOffset.current, -actionWidth.current.right || 0, actionWidth.current.left || 0);
+            setState(function(prevState) {
+                return (0, _object_spread_props._)((0, _object_spread._)({}, prevState), {
+                    dragging: true,
+                    offset: Number(offset) || 0
+                });
+            });
         }
     };
     var onTouchEnd = function onTouchEnd(event) {
         if (state.dragging) {
             var _props_onTouchEnd;
-            setState(function(v) {
-                return (0, _object_spread_props._)((0, _object_spread._)({}, v), {
+            setState(function(prevState) {
+                return (0, _object_spread_props._)((0, _object_spread._)({}, prevState), {
                     dragging: false
                 });
             });
@@ -243,13 +201,13 @@ var Swipe = /*#__PURE__*/ (0, _react.forwardRef)(function(props, instanceRef) {
             name: name,
             position: side
         });
-        setState(function(v) {
-            return (0, _object_spread_props._)((0, _object_spread._)({}, v), {
+        setState(function(prevState) {
+            return (0, _object_spread_props._)((0, _object_spread._)({}, prevState), {
                 offset: Number(offset) || 0
             });
         });
     };
-    var close = function close(position) {
+    var close = (0, _react.useCallback)(function(position) {
         if (opened.current) {
             var _props_onClose;
             opened.current = false;
@@ -258,12 +216,14 @@ var Swipe = /*#__PURE__*/ (0, _react.forwardRef)(function(props, instanceRef) {
                 position: position || 'left'
             });
         }
-        setState(function(v) {
-            return (0, _object_spread_props._)((0, _object_spread._)({}, v), {
+        setState(function(prevState) {
+            return (0, _object_spread_props._)((0, _object_spread._)({}, prevState), {
                 offset: 0
             });
         });
-    };
+    }, [
+        props
+    ]);
     var rangeCalculation = function rangeCalculation(num, min, max) {
         return Math.min(Math.max(Number(num), Number(min)), Number(max));
     };
@@ -300,7 +260,7 @@ var Swipe = /*#__PURE__*/ (0, _react.forwardRef)(function(props, instanceRef) {
         };
     });
     (0, _react.useEffect)(function() {
-        if ((0, _platform.harmony)()) return;
+        // 并没有生效
         var handler = function handler(event) {
             var targets = [
                 root
@@ -317,7 +277,9 @@ var Swipe = /*#__PURE__*/ (0, _react.forwardRef)(function(props, instanceRef) {
         return function() {
             document.removeEventListener('touchstart', handler);
         };
-    }, []);
+    }, [
+        close
+    ]);
     return /*#__PURE__*/ _react.default.createElement(_components.View, {
         ref: root,
         className: (0, _classnames.default)(classPrefix, className),

package/dist/cjs/packages/swiper/index.js

@@ -9,7 +9,6 @@ Object.defineProperty(exports, "default", {
     }
 });
 var _interop_require_default = require("@swc/helpers/_/_interop_require_default");
-var _react = /*#__PURE__*/ _interop_require_default._(require("react"));
 var _swiper = require("./swiper");
 var _index = /*#__PURE__*/ _interop_require_default._(require("../swiperitem/index"));
 var InnerSwiper = _swiper.Swiper;

package/dist/cjs/packages/switch/switch.js

@@ -75,8 +75,8 @@ var Switch = function Switch(props) {
             (_obj = {}, (0, _define_property._)(_obj, "".concat(classPrefix, "-close"), !value), (0, _define_property._)(_obj, "".concat(classPrefix, "-disabled"), disabled), (0, _define_property._)(_obj, "".concat(classPrefix, "-disabled-close"), disabled && !value), _obj)
         ]);
     };
-    var onClick = /*#__PURE__*/ function() {
-        var _ref = (0, _async_to_generator._)(function() {
+    var onClick = function onClick() {
+        return (0, _async_to_generator._)(function() {
             var e;
             return (0, _ts_generator._)(this, function(_state) {
                 switch(_state.label){
@@ -121,11 +121,8 @@ var Switch = function Switch(props) {
                         ];
                 }
             });
-        });
-        return function onClick() {
-            return _ref.apply(this, arguments);
-        };
-    }();
+        })();
+    };
     var _obj, _obj1;
     return /*#__PURE__*/ _react.default.createElement(_components.View, (0, _object_spread._)({
         className: classes(),

package/dist/cjs/packages/table/style/style.css

@@ -108,7 +108,7 @@
 }
 .nut-table-main-body {
   /* #ifndef dynamic*/
-  display: table-row-group;
+  display: table-header-group;
   /* #endif */
 }
 .nut-table-sticky-left, .nut-table-sticky-right {

package/dist/cjs/packages/table/style/style.harmony.css

@@ -108,7 +108,7 @@
 }
 .nut-table-main-body {
   /* #ifndef dynamic*/
-  display: table-row-group;
+  display: table-header-group;
   /* #endif */
 }
 .nut-table-sticky-left, .nut-table-sticky-right {

package/dist/cjs/packages/table/style/table.scss

@@ -135,7 +135,7 @@
 
     &-body {
       /* #ifndef dynamic*/
-      display: table-row-group;
+      display: table-header-group;
       /* #endif */
     }
   }

package/dist/cjs/packages/table/style-jmapp/style.css

@@ -108,7 +108,7 @@
 }
 .nut-table-main-body {
   /* #ifndef dynamic*/
-  display: table-row-group;
+  display: table-header-group;
   /* #endif */
 }
 .nut-table-sticky-left, .nut-table-sticky-right {

package/dist/cjs/packages/table/style-jmapp/table.scss

@@ -135,7 +135,7 @@
 
     &-body {
       /* #ifndef dynamic*/
-      display: table-row-group;
+      display: table-header-group;
       /* #endif */
     }
   }

package/dist/cjs/packages/table/style-jrkf/style.css

@@ -108,7 +108,7 @@
 }
 .nut-table-main-body {
   /* #ifndef dynamic*/
-  display: table-row-group;
+  display: table-header-group;
   /* #endif */
 }
 .nut-table-sticky-left, .nut-table-sticky-right {

package/dist/cjs/packages/table/style-jrkf/table.scss

@@ -135,7 +135,7 @@
 
     &-body {
       /* #ifndef dynamic*/
-      display: table-row-group;
+      display: table-header-group;
       /* #endif */
     }
   }

package/dist/cjs/packages/tabs/tabs.js

@@ -63,6 +63,7 @@ var Tabs = function Tabs(props) {
         onChange: onChange
     }), 2), value = _usePropsValue[0], setValue = _usePropsValue[1];
     var titleItemsRef = (0, _react.useRef)([]);
+    var tabsRef = (0, _react.useRef)(null);
     var getTitles = function getTitles() {
         var titles = [];
         _react.default.Children.forEach(children, function(child, idx) {
@@ -102,7 +103,8 @@ var Tabs = function Tabs(props) {
     var classesTitle = (0, _classnames.default)("".concat(classPrefix, "-titles"), (_obj = {}, (0, _define_property._)(_obj, "".concat(classPrefix, "-titles-").concat(activeType), activeType), (0, _define_property._)(_obj, "".concat(classPrefix, "-titles-").concat(align), align), _obj));
     var getRect = function getRect(selector) {
         return new Promise(function(resolve) {
-            (0, _taro.createSelectorQuery)().select(selector).boundingClientRect().exec(function() {
+            var _tabsRef_current;
+            (0, _taro.createSelectorQuery)().in(((_tabsRef_current = tabsRef.current) === null || _tabsRef_current === void 0 ? void 0 : _tabsRef_current._scope) || tabsRef.current).select(selector).boundingClientRect().exec(function() {
                 var rect = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : [];
                 resolve(rect[0]);
             });
@@ -110,7 +112,8 @@ var Tabs = function Tabs(props) {
     };
     var getAllRect = function getAllRect(selector) {
         return new Promise(function(resolve) {
-            (0, _taro.createSelectorQuery)().selectAll(selector).boundingClientRect().exec(function() {
+            var _tabsRef_current;
+            (0, _taro.createSelectorQuery)().in(((_tabsRef_current = tabsRef.current) === null || _tabsRef_current === void 0 ? void 0 : _tabsRef_current._scope) || tabsRef.current).selectAll(selector).boundingClientRect().exec(function() {
                 var rect = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : [];
                 resolve(rect[0]);
             });
@@ -190,9 +193,11 @@ var Tabs = function Tabs(props) {
             setValue(item.value);
         }
     };
-    return /*#__PURE__*/ _react.default.createElement(_components.View, (0, _object_spread._)({
+    return /*#__PURE__*/ _react.default.createElement(_components.View, (0, _object_spread_props._)((0, _object_spread._)({
         className: classes
-    }, rest), /*#__PURE__*/ _react.default.createElement(_components.ScrollView, {
+    }, rest), {
+        ref: tabsRef
+    }), /*#__PURE__*/ _react.default.createElement(_components.ScrollView, {
         enableFlex: true,
         scrollX: direction === 'horizontal',
         scrollY: direction === 'vertical',
@@ -224,7 +229,9 @@ var Tabs = function Tabs(props) {
                 background: activeColor
             }
         }), activeType === 'smile' && /*#__PURE__*/ _react.default.createElement(_components.View, {
-            className: "".concat(classPrefix, "-titles-item-smile")
+            className: "".concat(classPrefix, "-titles-item-smile"),
+            // @ts-ignore
+            ariaHidden: true
         }, /*#__PURE__*/ _react.default.createElement(_iconsreacttaro.JoySmile, {
             color: activeColor
         })), /*#__PURE__*/ _react.default.createElement(_components.View, {

package/dist/cjs/packages/tag/style/style.css

@@ -30,7 +30,7 @@
   background: var(--nutui-tag-background-color, var(--nutui-color-title, #1a1a1a));
 }
 .nut-tag-primary {
-  background: var(--nutui-tag-primary-background-color, linear-gradient(135deg, var(--nutui-color-primary-stop-1, #ff475d) 0%, var(--nutui-color-primary-stop-2, #ff0f23) 100%));
+  background: #fa2c19;
 }
 .nut-tag-info {
   background: var(--nutui-tag-info-background-color, var(--nutui-color-info, #0073ff));

package/dist/cjs/packages/tag/style/style.harmony.css

@@ -30,7 +30,7 @@
   background: var(--nutui-tag-background-color, var(--nutui-color-title, #1a1a1a));
 }
 .nut-tag-primary {
-  background: var(--nutui-tag-primary-background-color, linear-gradient(135deg, var(--nutui-color-primary-stop-1, #ff475d) 0%, var(--nutui-color-primary-stop-2, #ff0f23) 100%));
+  background: #fa2c19;
 }
 .nut-tag-info {
   background: var(--nutui-tag-info-background-color, var(--nutui-color-info, #0073ff));

package/dist/cjs/packages/tag/style/tag.scss

@@ -30,7 +30,7 @@
   }
 
   &-primary {
-    background: $tag-primary-background-color;
+    background: #fa2c19;
   }
 
   &-info {

package/dist/cjs/packages/tag/style-jmapp/style.css

@@ -30,7 +30,7 @@
   background: var(--nutui-tag-background-color, var(--nutui-color-title));
 }
 .nut-tag-primary {
-  background: var(--nutui-tag-primary-background-color, var(--nutui-color-primary));
+  background: #fa2c19;
 }
 .nut-tag-info {
   background: var(--nutui-tag-info-background-color, var(--nutui-color-info));

package/dist/cjs/packages/tag/style-jmapp/tag.scss

@@ -30,7 +30,7 @@
   }
 
   &-primary {
-    background: $tag-primary-background-color;
+    background: #fa2c19;
   }
 
   &-info {

package/dist/cjs/packages/tag/style-jrkf/style.css

@@ -30,7 +30,7 @@
   background: var(--nutui-tag-background-color, var(--nutui-color-title));
 }
 .nut-tag-primary {
-  background: var(--nutui-tag-primary-background-color, var(--nutui-color-primary, #ff6666));
+  background: #fa2c19;
 }
 .nut-tag-info {
   background: var(--nutui-tag-info-background-color, var(--nutui-color-info));

package/dist/cjs/packages/tag/style-jrkf/tag.scss

@@ -30,7 +30,7 @@
   }
 
   &-primary {
-    background: $tag-primary-background-color;
+    background: #fa2c19;
   }
 
   &-info {