@nutui/nutui-react-taro 3.0.20-beta.0 → 3.0.21-cpp

package/dist/es/packages/sticky/sticky.js

@@ -81,8 +81,8 @@ export var Sticky = function(props) {
         threshold,
         zIndex
     ]);
-    var handleScroll = /*#__PURE__*/ function() {
-        var _ref = _async_to_generator(function(scrollTop) {
+    var handleScroll = function(scrollTop) {
+        return _async_to_generator(function() {
             var curRootRect, stickyRect, containerRect, difference, curTransform, curFixed, windowHeight;
             return _ts_generator(this, function(_state) {
                 switch(_state.label){
@@ -150,11 +150,8 @@ export var Sticky = function(props) {
                         ];
                 }
             });
-        });
-        return function handleScroll(scrollTop) {
-            return _ref.apply(this, arguments);
-        };
-    }();
+        })();
+    };
     var getElement = useCallback(function() {
         return getScrollParent(rootRef.current);
     }, []);

package/dist/es/packages/swipe/swipe.js

@@ -3,13 +3,13 @@ import { _ as _object_spread } from "@swc/helpers/_/_object_spread";
 import { _ as _object_spread_props } from "@swc/helpers/_/_object_spread_props";
 import { _ as _sliced_to_array } from "@swc/helpers/_/_sliced_to_array";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
-import React, { forwardRef, useCallback, useEffect, useImperativeHandle, useLayoutEffect, useRef, useState } from "react";
+import React, { forwardRef, useCallback, useEffect, useImperativeHandle, useMemo, useRef, useState } from "react";
 import classNames from "classnames";
 import { View } from "@tarojs/components";
+import { nextTick, useReady } from "@tarojs/taro";
 import { useTouch } from "../../hooks/use-touch";
 import { getRectInMultiPlatform } from "../../utils/taro/get-rect";
 import { ComponentDefaults } from "../../utils/typings";
-import { harmony } from "../../utils/taro/platform";
 import { useRefState } from "../../hooks/use-ref-state";
 import { useUuid } from "../../hooks/use-uuid";
 function preventDefault(event, isStopPropagation) {
@@ -29,100 +29,9 @@ export var Swipe = /*#__PURE__*/ forwardRef(function(props, instanceRef) {
     var uid = useUuid();
     var leftId = "swipe-left-".concat(uid);
     var rightId = "swipe-right-".concat(uid);
-    var _$_object_spread = _object_spread({}, defaultProps, props), children = _$_object_spread.children, className = _$_object_spread.className, style = _$_object_spread.style;
-    var root = useRef();
-    var opened = useRef(false);
-    var lockClick = useRef(false);
-    var startOffset = useRef(0);
-    var _useState = _sliced_to_array(useState({
-        offset: 0,
-        dragging: false
-    }), 2), state = _useState[0], setState = _useState[1];
-    var _useRefState = _sliced_to_array(useRefState({
-        left: 0,
-        right: 0
-    }), 2), actionWidth = _useRefState[0], updateState = _useRefState[1];
-    var setActionWidth = useCallback(function(fn) {
-        var res = fn();
-        if (res.left !== undefined) {
-            updateState(_object_spread_props(_object_spread({}, actionWidth.current), {
-                left: res.left
-            }));
-        }
-        if (res.right !== undefined) {
-            updateState(_object_spread_props(_object_spread({}, actionWidth.current), {
-                right: res.right
-            }));
-        }
-    }, [
-        actionWidth,
-        updateState
-    ]);
-    // 获取元素的时候要在页面 onReady 后，需要参考小程序的事件周期
-    useLayoutEffect(function() {
-        var getWidth = /*#__PURE__*/ function() {
-            var _ref = _async_to_generator(function() {
-                var leftRect, rightRect;
-                return _ts_generator(this, function(_state) {
-                    switch(_state.label){
-                        case 0:
-                            if (!leftWrapper.current) return [
-                                3,
-                                2
-                            ];
-                            return [
-                                4,
-                                getRectInMultiPlatform(leftWrapper.current, leftId)
-                            ];
-                        case 1:
-                            leftRect = _state.sent();
-                            leftRect && setActionWidth(function(v) {
-                                return _object_spread_props(_object_spread({}, v), {
-                                    left: leftRect.width
-                                });
-                            });
-                            _state.label = 2;
-                        case 2:
-                            if (!rightWrapper.current) return [
-                                3,
-                                4
-                            ];
-                            return [
-                                4,
-                                getRectInMultiPlatform(rightWrapper.current, rightId)
-                            ];
-                        case 3:
-                            rightRect = _state.sent();
-                            rightRect && setActionWidth(function(v) {
-                                return _object_spread_props(_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(!harmony() ? 'px' : '', ", 0)"),
-        transitionDuration: state.dragging ? '0s' : '.6s'
-    };
-    var onTouchStart = /*#__PURE__*/ function() {
-        var _ref = _async_to_generator(function(event) {
-            var leftRect, rightRect, _props_onTouchStart;
+    var getWidth = function() {
+        return _async_to_generator(function() {
+            var leftRect, rightRect;
             return _ts_generator(this, function(_state) {
                 switch(_state.label){
                     case 0:
@@ -160,47 +69,96 @@ export var Swipe = /*#__PURE__*/ 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 后，需要参考小程序的事件周期
+    useReady(function() {
+        nextTick(function() {
+            return getWidth();
         });
-        return function onTouchStart(event) {
-            return _ref.apply(this, arguments);
+    });
+    var _$_object_spread = _object_spread({}, defaultProps, props), children = _$_object_spread.children, className = _$_object_spread.className, style = _$_object_spread.style;
+    var root = useRef();
+    var opened = useRef(false);
+    var lockClick = useRef(false);
+    var startOffset = useRef(0);
+    var _useState = _sliced_to_array(useState({
+        offset: 0,
+        dragging: false
+    }), 2), state = _useState[0], setState = _useState[1];
+    var _useRefState = _sliced_to_array(useRefState({
+        left: 0,
+        right: 0
+    }), 2), actionWidth = _useRefState[0], updateState = _useRefState[1];
+    var setActionWidth = function(fn) {
+        var res = fn();
+        if (res.left !== undefined) {
+            updateState(_object_spread_props(_object_spread({}, actionWidth.current), {
+                left: res.left
+            }));
+        }
+        if (res.right !== undefined) {
+            updateState(_object_spread_props(_object_spread({}, actionWidth.current), {
+                right: res.right
+            }));
+        }
+    };
+    var wrapperStyle = useMemo(function() {
+        return {
+            transform: "translate(".concat(state.offset, "px, 0)"),
+            transitionDuration: state.dragging ? '0.01s' : '.6s'
         };
-    }();
+    }, [
+        state.offset,
+        state.dragging
+    ]);
+    var onTouchStart = function(event) {
+        return _async_to_generator(function() {
+            var _props_onTouchStart;
+            return _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(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 = _object_spread_props(_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 _object_spread_props(_object_spread({}, prevState), {
+                    dragging: true,
+                    offset: Number(offset) || 0
+                });
+            });
         }
     };
     var onTouchEnd = function(event) {
         if (state.dragging) {
             var _props_onTouchEnd;
-            setState(function(v) {
-                return _object_spread_props(_object_spread({}, v), {
+            setState(function(prevState) {
+                return _object_spread_props(_object_spread({}, prevState), {
                     dragging: false
                 });
             });
@@ -231,13 +189,13 @@ export var Swipe = /*#__PURE__*/ forwardRef(function(props, instanceRef) {
             name: name,
             position: side
         });
-        setState(function(v) {
-            return _object_spread_props(_object_spread({}, v), {
+        setState(function(prevState) {
+            return _object_spread_props(_object_spread({}, prevState), {
                 offset: Number(offset) || 0
             });
         });
     };
-    var close = function(position) {
+    var close = useCallback(function(position) {
         if (opened.current) {
             var _props_onClose;
             opened.current = false;
@@ -246,12 +204,14 @@ export var Swipe = /*#__PURE__*/ forwardRef(function(props, instanceRef) {
                 position: position || 'left'
             });
         }
-        setState(function(v) {
-            return _object_spread_props(_object_spread({}, v), {
+        setState(function(prevState) {
+            return _object_spread_props(_object_spread({}, prevState), {
                 offset: 0
             });
         });
-    };
+    }, [
+        props
+    ]);
     var rangeCalculation = function(num, min, max) {
         return Math.min(Math.max(Number(num), Number(min)), Number(max));
     };
@@ -288,7 +248,7 @@ export var Swipe = /*#__PURE__*/ forwardRef(function(props, instanceRef) {
         };
     });
     useEffect(function() {
-        if (harmony()) return;
+        // 并没有生效
         var handler = function(event) {
             var targets = [
                 root
@@ -305,7 +265,9 @@ export var Swipe = /*#__PURE__*/ forwardRef(function(props, instanceRef) {
         return function() {
             document.removeEventListener('touchstart', handler);
         };
-    }, []);
+    }, [
+        close
+    ]);
     return /*#__PURE__*/ React.createElement(View, {
         ref: root,
         className: classNames(classPrefix, className),

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

@@ -1,4 +1,3 @@
-import React from "react";
 import { Swiper } from "./swiper";
 import SwiperItem from "../swiperitem/index";
 var InnerSwiper = Swiper;

package/dist/es/packages/switch/switch.js

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

package/dist/es/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/es/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/es/packages/table/style/table.scss

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

package/dist/es/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/es/packages/table/style-jmapp/table.scss

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

package/dist/es/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/es/packages/table/style-jrkf/table.scss

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

package/dist/es/packages/tabs/tabs.js

@@ -51,6 +51,7 @@ export var Tabs = function(props) {
         onChange: onChange
     }), 2), value = _usePropsValue[0], setValue = _usePropsValue[1];
     var titleItemsRef = useRef([]);
+    var tabsRef = useRef(null);
     var getTitles = function() {
         var titles = [];
         React.Children.forEach(children, function(child, idx) {
@@ -90,7 +91,8 @@ export var Tabs = function(props) {
     var classesTitle = classNames("".concat(classPrefix, "-titles"), (_obj = {}, _define_property(_obj, "".concat(classPrefix, "-titles-").concat(activeType), activeType), _define_property(_obj, "".concat(classPrefix, "-titles-").concat(align), align), _obj));
     var getRect = function(selector) {
         return new Promise(function(resolve) {
-            createSelectorQuery().select(selector).boundingClientRect().exec(function() {
+            var _tabsRef_current;
+            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]);
             });
@@ -98,7 +100,8 @@ export var Tabs = function(props) {
     };
     var getAllRect = function(selector) {
         return new Promise(function(resolve) {
-            createSelectorQuery().selectAll(selector).boundingClientRect().exec(function() {
+            var _tabsRef_current;
+            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]);
             });
@@ -178,9 +181,11 @@ export var Tabs = function(props) {
             setValue(item.value);
         }
     };
-    return /*#__PURE__*/ React.createElement(View, _object_spread({
+    return /*#__PURE__*/ React.createElement(View, _object_spread_props(_object_spread({
         className: classes
-    }, rest), /*#__PURE__*/ React.createElement(ScrollView, {
+    }, rest), {
+        ref: tabsRef
+    }), /*#__PURE__*/ React.createElement(ScrollView, {
         enableFlex: true,
         scrollX: direction === 'horizontal',
         scrollY: direction === 'vertical',
@@ -212,7 +217,9 @@ export var Tabs = function(props) {
                 background: activeColor
             }
         }), activeType === 'smile' && /*#__PURE__*/ React.createElement(View, {
-            className: "".concat(classPrefix, "-titles-item-smile")
+            className: "".concat(classPrefix, "-titles-item-smile"),
+            // @ts-ignore
+            ariaHidden: true
         }, /*#__PURE__*/ React.createElement(JoySmile, {
             color: activeColor
         })), /*#__PURE__*/ React.createElement(View, {

package/dist/es/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/es/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/es/packages/tag/style/tag.scss

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

package/dist/es/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/es/packages/tag/style-jmapp/tag.scss

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

package/dist/es/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/es/packages/tag/style-jrkf/tag.scss

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