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

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

@@ -81,8 +81,8 @@ export var Sticky = function(props) {
         threshold,
         zIndex
     ]);
-    var handleScroll = function(scrollTop) {
-        return _async_to_generator(function() {
+    var handleScroll = /*#__PURE__*/ function() {
+        var _ref = _async_to_generator(function(scrollTop) {
             var curRootRect, stickyRect, containerRect, difference, curTransform, curFixed, windowHeight;
             return _ts_generator(this, function(_state) {
                 switch(_state.label){
@@ -150,8 +150,11 @@ 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.d.ts

@@ -1,3 +1,3 @@
 import React from 'react';
 import { SwipeRef, TaroSwipeProps } from "../../types";
-export declare const Swipe: React.ForwardRefExoticComponent<Partial<TaroSwipeProps> & Omit<React.HTMLAttributes<HTMLDivElement>, "onTouchEnd" | "onTouchMove" | "onTouchStart"> & React.RefAttributes<SwipeRef>>;
+export declare const Swipe: React.ForwardRefExoticComponent<Partial<TaroSwipeProps> & Omit<React.HTMLAttributes<HTMLDivElement>, "onTouchStart" | "onTouchMove" | "onTouchEnd"> & React.RefAttributes<SwipeRef>>;

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, useMemo, useRef, useState } from "react";
+import React, { forwardRef, useCallback, useEffect, useImperativeHandle, useLayoutEffect, 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,9 +29,100 @@ export var Swipe = /*#__PURE__*/ forwardRef(function(props, instanceRef) {
     var uid = useUuid();
     var leftId = "swipe-left-".concat(uid);
     var rightId = "swipe-right-".concat(uid);
-    var getWidth = function() {
-        return _async_to_generator(function() {
-            var leftRect, rightRect;
+    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;
             return _ts_generator(this, function(_state) {
                 switch(_state.label){
                     case 0:
@@ -69,96 +160,47 @@ 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();
         });
-    });
-    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'
+        return function onTouchStart(event) {
+            return _ref.apply(this, arguments);
         };
-    }, [
-        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);
             }
-            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
-                });
-            });
+            newState.offset = rangeCalculation(touch.deltaX.current + startOffset.current, -actionWidth.current.right || 0, actionWidth.current.left || 0);
+            setState(newState);
         }
     };
     var onTouchEnd = function(event) {
         if (state.dragging) {
             var _props_onTouchEnd;
-            setState(function(prevState) {
-                return _object_spread_props(_object_spread({}, prevState), {
+            setState(function(v) {
+                return _object_spread_props(_object_spread({}, v), {
                     dragging: false
                 });
             });
@@ -189,13 +231,13 @@ export var Swipe = /*#__PURE__*/ forwardRef(function(props, instanceRef) {
             name: name,
             position: side
         });
-        setState(function(prevState) {
-            return _object_spread_props(_object_spread({}, prevState), {
+        setState(function(v) {
+            return _object_spread_props(_object_spread({}, v), {
                 offset: Number(offset) || 0
             });
         });
     };
-    var close = useCallback(function(position) {
+    var close = function(position) {
         if (opened.current) {
             var _props_onClose;
             opened.current = false;
@@ -204,14 +246,12 @@ export var Swipe = /*#__PURE__*/ forwardRef(function(props, instanceRef) {
                 position: position || 'left'
             });
         }
-        setState(function(prevState) {
-            return _object_spread_props(_object_spread({}, prevState), {
+        setState(function(v) {
+            return _object_spread_props(_object_spread({}, v), {
                 offset: 0
             });
         });
-    }, [
-        props
-    ]);
+    };
     var rangeCalculation = function(num, min, max) {
         return Math.min(Math.max(Number(num), Number(min)), Number(max));
     };
@@ -248,7 +288,7 @@ export var Swipe = /*#__PURE__*/ forwardRef(function(props, instanceRef) {
         };
     });
     useEffect(function() {
-        // 并没有生效
+        if (harmony()) return;
         var handler = function(event) {
             var targets = [
                 root
@@ -265,9 +305,7 @@ 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,3 +1,4 @@
+import React from "react";
 import { Swiper } from "./swiper";
 import SwiperItem from "../swiperitem/index";
 var InnerSwiper = Swiper;

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

@@ -82,7 +82,9 @@
 
 .nut-indicator-white .nut-indicator-dot, .nut-indicator-white .nut-indicator-line {
   position: relative;
+  /* #ifndef dynamic*/
   box-sizing: content-box;
+  /* #endif */
   background: rgba(255, 255, 255, 0.4);
   opacity: 1;
 }

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

@@ -5,7 +5,12 @@
 .nut-switch {
   cursor: pointer;
   position: relative;
+  /* #ifdef dynamic*/
+  display: flex;
+  /* #endif */
+  /* #ifndef dynamic*/
   display: inline-flex;
+  /* #endif */
   flex-direction: row;
   align-items: center;
   min-width: var(--nutui-switch-width, 46px);
@@ -60,7 +65,12 @@
   border-radius: 2px;
 }
 .nut-switch-label {
+  /* #ifdef dynamic*/
+  display: flex;
+  /* #endif */
+  /* #ifndef dynamic*/
   display: inline-flex;
+  /* #endif */
   align-items: center;
   height: 100%;
   white-space: nowrap;

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

@@ -5,7 +5,12 @@
 .nut-switch {
   cursor: pointer;
   position: relative;
+  /* #ifdef dynamic*/
+  display: flex;
+  /* #endif */
+  /* #ifndef dynamic*/
   display: inline-flex;
+  /* #endif */
   flex-direction: row;
   align-items: center;
   min-width: var(--nutui-switch-width, 46px);
@@ -60,7 +65,12 @@
   border-radius: 2px;
 }
 .nut-switch-label {
+  /* #ifdef dynamic*/
+  display: flex;
+  /* #endif */
+  /* #ifndef dynamic*/
   display: inline-flex;
+  /* #endif */
   align-items: center;
   height: 100%;
   white-space: nowrap;

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

@@ -1,7 +1,12 @@
 .nut-switch {
   cursor: pointer;
   position: relative;
+  /* #ifdef dynamic*/
+  display: flex;
+  /* #endif */
+  /* #ifndef dynamic*/
   display: inline-flex;
+  /* #endif */
   flex-direction: row;
   align-items: center;
   min-width: $switch-width;
@@ -58,7 +63,12 @@
   }
 
   &-label {
+    /* #ifdef dynamic*/
+    display: flex;
+    /* #endif */
+    /* #ifndef dynamic*/
     display: inline-flex;
+    /* #endif */
     align-items: center;
     height: 100%;
     white-space: nowrap;

package/dist/es/packages/switch/style-jmapp/style.css

@@ -5,7 +5,12 @@
 .nut-switch {
   cursor: pointer;
   position: relative;
+  /* #ifdef dynamic*/
+  display: flex;
+  /* #endif */
+  /* #ifndef dynamic*/
   display: inline-flex;
+  /* #endif */
   flex-direction: row;
   align-items: center;
   min-width: var(--nutui-switch-width, 40px);
@@ -60,7 +65,12 @@
   border-radius: 2px;
 }
 .nut-switch-label {
+  /* #ifdef dynamic*/
+  display: flex;
+  /* #endif */
+  /* #ifndef dynamic*/
   display: inline-flex;
+  /* #endif */
   align-items: center;
   height: 100%;
   white-space: nowrap;

package/dist/es/packages/switch/style-jmapp/switch.scss

@@ -1,7 +1,12 @@
 .nut-switch {
   cursor: pointer;
   position: relative;
+  /* #ifdef dynamic*/
+  display: flex;
+  /* #endif */
+  /* #ifndef dynamic*/
   display: inline-flex;
+  /* #endif */
   flex-direction: row;
   align-items: center;
   min-width: $switch-width;
@@ -58,7 +63,12 @@
   }
 
   &-label {
+    /* #ifdef dynamic*/
+    display: flex;
+    /* #endif */
+    /* #ifndef dynamic*/
     display: inline-flex;
+    /* #endif */
     align-items: center;
     height: 100%;
     white-space: nowrap;

package/dist/es/packages/switch/style-jrkf/style.css

@@ -5,7 +5,12 @@
 .nut-switch {
   cursor: pointer;
   position: relative;
+  /* #ifdef dynamic*/
+  display: flex;
+  /* #endif */
+  /* #ifndef dynamic*/
   display: inline-flex;
+  /* #endif */
   flex-direction: row;
   align-items: center;
   min-width: var(--nutui-switch-width, 40px);
@@ -60,7 +65,12 @@
   border-radius: 2px;
 }
 .nut-switch-label {
+  /* #ifdef dynamic*/
+  display: flex;
+  /* #endif */
+  /* #ifndef dynamic*/
   display: inline-flex;
+  /* #endif */
   align-items: center;
   height: 100%;
   white-space: nowrap;

package/dist/es/packages/switch/style-jrkf/switch.scss

@@ -1,7 +1,12 @@
 .nut-switch {
   cursor: pointer;
   position: relative;
+  /* #ifdef dynamic*/
+  display: flex;
+  /* #endif */
+  /* #ifndef dynamic*/
   display: inline-flex;
+  /* #endif */
   flex-direction: row;
   align-items: center;
   min-width: $switch-width;
@@ -58,7 +63,12 @@
   }
 
   &-label {
+    /* #ifdef dynamic*/
+    display: flex;
+    /* #endif */
+    /* #ifndef dynamic*/
     display: inline-flex;
+    /* #endif */
     align-items: center;
     height: 100%;
     white-space: nowrap;

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

@@ -21,7 +21,7 @@ var defaultProps = _object_spread_props(_object_spread({}, ComponentDefaults), {
     onLoadingChange: function(loading) {}
 });
 export var Switch = function(props) {
-    var _ref = _object_spread({}, defaultProps, props), checked = _ref.checked, defaultChecked = _ref.defaultChecked, disabled = _ref.disabled, activeText = _ref.activeText, inactiveText = _ref.inactiveText, loadingIcon = _ref.loadingIcon, className = _ref.className, style = _ref.style, onChange = _ref.onChange, propLoading = _ref.loading, onLoadingChange = _ref.onLoadingChange, rest = _object_without_properties(_ref, [
+    var _ref = _object_spread({}, defaultProps, props), checked = _ref.checked, defaultChecked = _ref.defaultChecked, disabled = _ref.disabled, activeText = _ref.activeText, inactiveText = _ref.inactiveText, loadingIcon = _ref.loadingIcon, className = _ref.className, style = _ref.style, onChange = _ref.onChange, propLoading = _ref.loading, onLoadingChange = _ref.onLoadingChange, ariaLabel = _ref.ariaLabel, rest = _object_without_properties(_ref, [
         "checked",
         "defaultChecked",
         "disabled",
@@ -32,7 +32,8 @@ export var Switch = function(props) {
         "style",
         "onChange",
         "loading",
-        "onLoadingChange"
+        "onLoadingChange",
+        "ariaLabel"
     ]);
     var classPrefix = 'nut-switch';
     var rtl = useRtl();
@@ -62,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 = function() {
-        return _async_to_generator(function() {
+    var onClick = /*#__PURE__*/ function() {
+        var _ref = _async_to_generator(function() {
             var e;
             return _ts_generator(this, function(_state) {
                 switch(_state.label){
@@ -108,13 +109,22 @@ 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(),
         onClick: onClick,
-        style: style
+        style: style,
+        ariaRole: "switch",
+        // @ts-ignore
+        ariaChecked: value,
+        ariaDisabled: disabled,
+        tabIndex: disabled ? -1 : 0,
+        ariaLabel: ariaLabel
     }, rest), /*#__PURE__*/ React.createElement(View, {
         className: classNames([
             [

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

@@ -4,9 +4,14 @@
 /* #endif */
 .nut-badge {
   position: relative;
+  /* #ifdef dynamic*/
+  display: flex;
+  /* #endif */
+  /* #ifndef dynamic*/
   display: inline-flex;
-  vertical-align: middle;
   box-sizing: content-box;
+  /* #endif */
+  vertical-align: middle;
   width: auto;
 }
 .nut-badge-icon {
@@ -38,7 +43,12 @@
   border-radius: var(--nutui-badge-border-radius, var(--nutui-badge-height, 14px));
 }
 .nut-badge-sup {
+  /* #ifdef dynamic*/
+  display: flex;
+  /* #endif */
+  /* #ifndef dynamic*/
   display: inline-flex;
+  /* #endif */
   text-align: center;
   min-width: var(--nutui-badge-min-width, 6px);
   padding: var(--nutui-badge-padding, 1px 4px);

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

@@ -4,9 +4,14 @@
 /* #endif */
 .nut-badge {
   position: relative;
+  /* #ifdef dynamic*/
+  display: flex;
+  /* #endif */
+  /* #ifndef dynamic*/
   display: inline-flex;
-  vertical-align: middle;
   box-sizing: content-box;
+  /* #endif */
+  vertical-align: middle;
   width: auto;
 }
 .nut-badge-icon {
@@ -38,7 +43,12 @@
   border-radius: var(--nutui-badge-border-radius, var(--nutui-badge-height, 14px));
 }
 .nut-badge-sup {
+  /* #ifdef dynamic*/
+  display: flex;
+  /* #endif */
+  /* #ifndef dynamic*/
   display: inline-flex;
+  /* #endif */
   text-align: center;
   min-width: var(--nutui-badge-min-width, 6px);
   padding: var(--nutui-badge-padding, 1px 4px);