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

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

@@ -221,7 +221,7 @@
   align-items: center;
   justify-content: center;
   border-bottom: var(--nutui-popup-title-border-bottom, 0);
-  padding: var(--nutui-popup-title-padding, 16px);
+  padding: var(--nutui-popup-title-padding, 11px);
   position: relative;
 }
 .nut-popup-title-wrapper {
@@ -234,7 +234,6 @@
   color: var(--nutui-color-title, #1a1a1a);
   font-weight: var(--nutui-font-weight-bold, 600);
   font-size: var(--nutui-popup-title-font-size, var(--nutui-font-size-xl, 18px));
-  line-height: var(--nutui-popup-title-font-size, var(--nutui-font-size-xl, 18px));
 }
 .nut-popup-title-description {
   color: var(--nutui-color-text, #505259);
@@ -246,13 +245,13 @@
 }
 .nut-popup-title-left {
   position: absolute;
-  top: var(--nutui-popup-title-padding, 16px);
-  left: var(--nutui-popup-title-padding, 16px);
+  top: var(--nutui-popup-title-padding, 11px);
+  left: var(--nutui-popup-title-padding, 11px);
 }
 .nut-popup-title-right {
   position: absolute;
-  top: var(--nutui-popup-title-padding, 16px);
-  right: var(--nutui-popup-title-padding, 16px);
+  top: var(--nutui-popup-title-padding, 11px);
+  right: var(--nutui-popup-title-padding, 11px);
   z-index: 1;
   width: var(--nutui-popup-icon-size, 20px);
   height: var(--nutui-popup-icon-size, 20px);
@@ -263,20 +262,22 @@
   opacity: 0.7;
 }
 .nut-popup-title-right-top-left {
-  top: var(--nutui-popup-title-padding, 16px);
-  left: var(--nutui-popup-title-padding, 16px);
+  top: var(--nutui-popup-title-padding, 11px);
+  left: var(--nutui-popup-title-padding, 11px);
 }
 .nut-popup-title-right-bottom-left {
-  bottom: var(--nutui-popup-title-padding, 16px);
-  left: var(--nutui-popup-title-padding, 16px);
+  bottom: var(--nutui-popup-title-padding, 11px);
+  left: var(--nutui-popup-title-padding, 11px);
 }
 .nut-popup-title-right-bottom-right {
-  right: var(--nutui-popup-title-padding, 16px);
-  bottom: var(--nutui-popup-title-padding, 16px);
+  right: var(--nutui-popup-title-padding, 11px);
+  bottom: var(--nutui-popup-title-padding, 11px);
 }
 .nut-popup-center {
   top: 50%;
   left: 50%;
+  right: auto;
+  bottom: auto;
   min-height: 10%;
   max-width: 295px;
   transform: translate(-50%, -50%);
@@ -287,6 +288,8 @@
 .nut-popup-bottom {
   bottom: 0;
   left: 0;
+  right: auto;
+  top: auto;
   width: 100%;
 }
 .nut-popup-bottom.nut-popup-round {
@@ -298,6 +301,8 @@
 .nut-popup-right {
   top: 0;
   right: 0;
+  left: auto;
+  bottom: auto;
   width: 100px;
   height: 100%;
 }
@@ -307,6 +312,8 @@
 .nut-popup-left {
   top: 0;
   left: 0;
+  right: auto;
+  bottom: auto;
   width: 100px;
   height: 100%;
 }
@@ -316,6 +323,8 @@
 .nut-popup-top {
   top: 0;
   left: 0;
+  right: auto;
+  bottom: auto;
   width: 100%;
 }
 .nut-popup-top.nut-popup-round {
@@ -392,6 +401,9 @@
   }
 }
 @keyframes popup-slide-top-exit {
+  from {
+    transform: translate3d(0, 0%, 0);
+  }
   to {
     transform: translate3d(0, -100%, 0);
   }
@@ -416,6 +428,9 @@
   }
 }
 @keyframes popup-slide-right-exit {
+  from {
+    transform: translate3d(0%, 0, 0);
+  }
   to {
     transform: translate3d(100%, 0, 0);
   }
@@ -440,6 +455,9 @@
   }
 }
 @keyframes slide-bottom-exit {
+  from {
+    transform: translate3d(0, 0%, 0);
+  }
   to {
     transform: translate3d(0, 100%, 0);
   }
@@ -464,6 +482,9 @@
   }
 }
 @keyframes popup-slide-left-exit {
+  from {
+    transform: translate3d(0%, 0, 0);
+  }
   to {
     transform: translate3d(-100%, 0, 0);
   }
@@ -489,27 +510,27 @@
 [dir=rtl] .nut-popup-title-left,
 .nut-rtl .nut-popup-title-left {
   left: auto;
-  right: var(--nutui-popup-title-padding, 16px);
+  right: var(--nutui-popup-title-padding, 11px);
 }
 [dir=rtl] .nut-popup-title-right,
 .nut-rtl .nut-popup-title-right {
   right: auto;
-  left: var(--nutui-popup-title-padding, 16px);
+  left: var(--nutui-popup-title-padding, 11px);
 }
 [dir=rtl] .nut-popup-title-right-top-left,
 .nut-rtl .nut-popup-title-right-top-left {
   left: auto;
-  right: var(--nutui-popup-title-padding, 16px);
+  right: var(--nutui-popup-title-padding, 11px);
 }
 [dir=rtl] .nut-popup-title-right-bottom-left,
 .nut-rtl .nut-popup-title-right-bottom-left {
   left: auto;
-  right: var(--nutui-popup-title-padding, 16px);
+  right: var(--nutui-popup-title-padding, 11px);
 }
 [dir=rtl] .nut-popup-title-right-bottom-right,
 .nut-rtl .nut-popup-title-right-bottom-right {
   right: auto;
-  left: var(--nutui-popup-title-padding, 16px);
+  left: var(--nutui-popup-title-padding, 11px);
 }
 [dir=rtl] .nut-popup-title .nut-icon-ArrowLeft,
 .nut-rtl .nut-popup-title .nut-icon-ArrowLeft {

package/dist/cjs/packages/animatingnumbers/countup.js

@@ -59,7 +59,9 @@ var CountUp = function CountUp(props) {
     var isLoaded = (0, _react.useRef)(false);
     var setNumberTransform = (0, _react.useCallback)(function() {
         if (countupRef.current && numberArr.length) {
-            (0, _taro.createSelectorQuery)().selectAll('.nut-countup-listitem').node(function(numberItems) {
+            var _countupRef_current;
+            (0, _taro.createSelectorQuery)() // @ts-ignore
+            .in(((_countupRef_current = countupRef.current) === null || _countupRef_current === void 0 ? void 0 : _countupRef_current._scope) || countupRef.current).selectAll('.nut-countup-listitem').node(function(numberItems) {
                 var transformArrCache = [];
                 Object.keys(numberItems).forEach(function(key) {
                     var elem = numberItems[Number(key)];

package/dist/cjs/packages/audio/audio.js

@@ -53,7 +53,7 @@ var Audio = function Audio(props) {
     };
     var classPrefix = 'nut-audio';
     var locale = (0, _index2.useConfig)().locale;
-    var _ref = (0, _object_spread._)({}, defaultProps, props), className = _ref.className, src = _ref.src, style = _ref.style, autoplay = _ref.autoplay, loop = _ref.loop, type = _ref.type, onFastBack = _ref.onFastBack, onForward = _ref.onForward, onPause = _ref.onPause, onPlay = _ref.onPlay, onPlayEnd = _ref.onPlayEnd, onCanPlay = _ref.onCanPlay, children = _ref.children, iconClassPrefix = _ref.iconClassPrefix, iconFontClassName = _ref.iconFontClassName, rest = (0, _object_without_properties._)(_ref, [
+    var _$_object_spread = (0, _object_spread._)({}, defaultProps, props), className = _$_object_spread.className, src = _$_object_spread.src, style = _$_object_spread.style, autoplay = _$_object_spread.autoplay, loop = _$_object_spread.loop, type = _$_object_spread.type, onFastBack = _$_object_spread.onFastBack, onForward = _$_object_spread.onForward, onPause = _$_object_spread.onPause, onPlay = _$_object_spread.onPlay, onPlayEnd = _$_object_spread.onPlayEnd, onCanPlay = _$_object_spread.onCanPlay, children = _$_object_spread.children, iconClassPrefix = _$_object_spread.iconClassPrefix, iconFontClassName = _$_object_spread.iconFontClassName, rest = (0, _object_without_properties._)(_$_object_spread, [
         "className",
         "src",
         "style",

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

@@ -60,9 +60,6 @@
   /* #ifdef dynamic*/
   pointer-events: none;
   /* #endif */
-  /* #ifndef dynamic*/
-  pointer-events: auto;
-  /* #endif */
 }
 .nut-button::after {
   border: none;

package/dist/cjs/packages/avatar/avatar.js

@@ -13,6 +13,7 @@ var _interop_require_wildcard = require("@swc/helpers/_/_interop_require_wildcar
 var _define_property = require("@swc/helpers/_/_define_property");
 var _object_spread = require("@swc/helpers/_/_object_spread");
 var _object_spread_props = require("@swc/helpers/_/_object_spread_props");
+var _object_without_properties = require("@swc/helpers/_/_object_without_properties");
 var _sliced_to_array = require("@swc/helpers/_/_sliced_to_array");
 var _react = /*#__PURE__*/ _interop_require_wildcard._(require("react"));
 var _components = require("@tarojs/components");
@@ -37,7 +38,23 @@ var defaultProps = (0, _object_spread_props._)((0, _object_spread._)({}, _typing
 });
 var classPrefix = "nut-avatar";
 var Avatar = function Avatar(props) {
-    var _$_object_spread = (0, _object_spread._)({}, defaultProps, props), children = _$_object_spread.children, size = _$_object_spread.size, shape = _$_object_spread.shape, background = _$_object_spread.background, color = _$_object_spread.color, src = _$_object_spread.src, icon = _$_object_spread.icon, mode = _$_object_spread.mode, fit = _$_object_spread.fit, avatarIndex = _$_object_spread.avatarIndex, className = _$_object_spread.className, style = _$_object_spread.style, onClick = _$_object_spread.onClick, onError = _$_object_spread.onError;
+    var _$_object_spread = (0, _object_spread._)({}, defaultProps, props), children = _$_object_spread.children, size = _$_object_spread.size, shape = _$_object_spread.shape, background = _$_object_spread.background, color = _$_object_spread.color, src = _$_object_spread.src, alt = _$_object_spread.alt, icon = _$_object_spread.icon, mode = _$_object_spread.mode, fit = _$_object_spread.fit, avatarIndex = _$_object_spread.avatarIndex, className = _$_object_spread.className, style = _$_object_spread.style, onClick = _$_object_spread.onClick, onError = _$_object_spread.onError, rest = (0, _object_without_properties._)(_$_object_spread, [
+        "children",
+        "size",
+        "shape",
+        "background",
+        "color",
+        "src",
+        "alt",
+        "icon",
+        "mode",
+        "fit",
+        "avatarIndex",
+        "className",
+        "style",
+        "onClick",
+        "onError"
+    ]);
     var _useState // 是否显示的最大头像个数
      = (0, _sliced_to_array._)((0, _react.useState)(false), 2), showMax = _useState[0], setShowMax = _useState[1];
     var avatarRef = (0, _react.useRef)(null);
@@ -74,7 +91,8 @@ var Avatar = function Avatar(props) {
         }
     }, [
         avatarIndex,
-        groupCount
+        groupCount,
+        groupMax
     ]);
     var errorEvent = function errorEvent() {
         onError && onError();
@@ -82,19 +100,26 @@ var Avatar = function Avatar(props) {
     var clickAvatar = function clickAvatar(e) {
         onClick && onClick(e);
     };
-    return /*#__PURE__*/ _react.default.createElement(_react.default.Fragment, null, (showMax || !groupMax || avatarIndex <= groupMax) && /*#__PURE__*/ _react.default.createElement(_components.View, {
+    return /*#__PURE__*/ _react.default.createElement(_react.default.Fragment, null, (showMax || !groupMax || avatarIndex <= groupMax) && /*#__PURE__*/ _react.default.createElement(_components.View, (0, _object_spread._)({
         className: cls,
         style: !showMax ? styles : maxStyles,
         onClick: clickAvatar,
-        ref: avatarRef
-    }, (!groupMax || avatarIndex <= groupMax) && /*#__PURE__*/ _react.default.createElement(_react.default.Fragment, null, src && /*#__PURE__*/ _react.default.createElement(_components.Image, {
+        ref: avatarRef,
+        // @ts-ignore
+        ariaRole: onClick ? 'button' : undefined
+    }, rest), (!groupMax || avatarIndex <= groupMax) && /*#__PURE__*/ _react.default.createElement(_react.default.Fragment, null, src && /*#__PURE__*/ _react.default.createElement(_components.Image, {
         className: "nut-avatar-img nut-avatar-".concat(groupSize || size || 'normal', "-img"),
         src: src,
+        nativeProps: {
+            alt: alt
+        },
         style: {
             objectFit: fit
         },
         mode: mode,
-        onError: errorEvent
+        onError: errorEvent,
+        // @ts-ignore
+        ariaHidden: true
     }), /*#__PURE__*/ _react.default.isValidElement(icon) ? /*#__PURE__*/ _react.default.createElement(_components.View, {
         className: "nut-avatar-text"
     }, /*#__PURE__*/ _react.default.cloneElement(icon, (0, _object_spread_props._)((0, _object_spread._)({}, icon.props), {
@@ -108,6 +133,7 @@ var Avatar = function Avatar(props) {
     }, children), !src && !icon && !children && /*#__PURE__*/ _react.default.createElement(_components.View, {
         className: "nut-avatar-text"
     }, /*#__PURE__*/ _react.default.createElement(_iconsreacttaro.User, {
+        ariaHidden: true,
         style: {
             color: color
         },

package/dist/cjs/packages/avatarcropper/avatarcropper.js

@@ -77,7 +77,7 @@ var AvatarCropper = function AvatarCropper(props) {
         }, locale.confirm)
     ];
     defaultProps.editText = locale.edit;
-    var _ref = (0, _object_spread._)({}, defaultProps, props), children = _ref.children, toolbar = _ref.toolbar, maxZoom = _ref.maxZoom, space = _ref.space, toolbarPosition = _ref.toolbarPosition, editText = _ref.editText, sizeType = _ref.sizeType, sourceType = _ref.sourceType, shape = _ref.shape, className = _ref.className, style = _ref.style, onConfirm = _ref.onConfirm, onCancel = _ref.onCancel, rest = (0, _object_without_properties._)(_ref, [
+    var _$_object_spread = (0, _object_spread._)({}, defaultProps, props), children = _$_object_spread.children, toolbar = _$_object_spread.toolbar, maxZoom = _$_object_spread.maxZoom, space = _$_object_spread.space, toolbarPosition = _$_object_spread.toolbarPosition, editText = _$_object_spread.editText, sizeType = _$_object_spread.sizeType, sourceType = _$_object_spread.sourceType, shape = _$_object_spread.shape, className = _$_object_spread.className, style = _$_object_spread.style, onConfirm = _$_object_spread.onConfirm, onCancel = _$_object_spread.onCancel, rest = (0, _object_without_properties._)(_$_object_spread, [
         "children",
         "toolbar",
         "maxZoom",
@@ -129,7 +129,7 @@ var AvatarCropper = function AvatarCropper(props) {
         cropperCanvas: null,
         cropperCanvasContext: null
     }), 2), canvasAll = _useState5[0], setCanvasAll = _useState5[1];
-    (0, _react.useLayoutEffect)(function() {
+    (0, _taro.useReady)(function() {
         if (showAlipayCanvas2D) {
             var canvasId = canvasAll.canvasId;
             (0, _taro.createSelectorQuery)().select("#".concat(canvasId)).node(function(param) {
@@ -141,11 +141,7 @@ var AvatarCropper = function AvatarCropper(props) {
                 }));
             }).exec();
         }
-    }, [
-        showAlipayCanvas2D,
-        state.displayHeight,
-        state.displayWidth
-    ]);
+    });
     (0, _react.useEffect)(function() {
         setCanvasAll((0, _object_spread_props._)((0, _object_spread._)({}, canvasAll), {
             cropperCanvasContext: _taro.default.createCanvasContext(canvasAll.canvasId)

package/dist/cjs/packages/badge/badge.js

@@ -14,6 +14,7 @@ var _async_to_generator = require("@swc/helpers/_/_async_to_generator");
 var _define_property = require("@swc/helpers/_/_define_property");
 var _object_spread = require("@swc/helpers/_/_object_spread");
 var _object_spread_props = require("@swc/helpers/_/_object_spread_props");
+var _object_without_properties = require("@swc/helpers/_/_object_without_properties");
 var _sliced_to_array = require("@swc/helpers/_/_sliced_to_array");
 var _type_of = require("@swc/helpers/_/_type_of");
 var _ts_generator = require("@swc/helpers/_/_ts_generator");
@@ -53,7 +54,19 @@ var Badge = function Badge(props) {
     };
     var _this;
     var rtl = (0, _index.useRtl)();
-    var _$_object_spread = (0, _object_spread._)({}, defaultProps, props), className = _$_object_spread.className, style = _$_object_spread.style, value = _$_object_spread.value, max = _$_object_spread.max, children = _$_object_spread.children, dot = _$_object_spread.dot, top = _$_object_spread.top, right = _$_object_spread.right, fill = _$_object_spread.fill, size = _$_object_spread.size, disabled = _$_object_spread.disabled;
+    var _$_object_spread = (0, _object_spread._)({}, defaultProps, props), className = _$_object_spread.className, style = _$_object_spread.style, value = _$_object_spread.value, max = _$_object_spread.max, children = _$_object_spread.children, dot = _$_object_spread.dot, top = _$_object_spread.top, right = _$_object_spread.right, fill = _$_object_spread.fill, size = _$_object_spread.size, disabled = _$_object_spread.disabled, rest = (0, _object_without_properties._)(_$_object_spread, [
+        "className",
+        "style",
+        "value",
+        "max",
+        "children",
+        "dot",
+        "top",
+        "right",
+        "fill",
+        "size",
+        "disabled"
+    ]);
     var classPrefix = 'nut-badge';
     var isHarmony = (0, _platform.harmony)();
     var classes = (0, _classnames.default)(classPrefix, className);
@@ -81,11 +94,11 @@ var Badge = function Badge(props) {
         })();
     };
     var _obj1;
-    return /*#__PURE__*/ _react.default.createElement(_components.View, {
+    return /*#__PURE__*/ _react.default.createElement(_components.View, (0, _object_spread._)({
         className: classes,
         style: style,
         ref: badgeRef
-    }, isIcon() && /*#__PURE__*/ _react.default.createElement(_components.View, {
+    }, rest), isIcon() && /*#__PURE__*/ _react.default.createElement(_components.View, {
         className: (0, _classnames.default)("".concat(classPrefix, "-content"), (_obj1 = {}, (0, _define_property._)(_obj1, "".concat(classPrefix, "-icon"), true), (0, _define_property._)(_obj1, "".concat(classPrefix, "-icon-rtl"), rtl), _obj1)),
         style: contentStyle
     }, value), children, !isIcon() && (getContent() || dot) && /*#__PURE__*/ _react.default.createElement(_components.View, {

package/dist/cjs/packages/barrage/barrage.js

@@ -30,7 +30,7 @@ var defaultProps = (0, _object_spread_props._)((0, _object_spread._)({}, _typing
 });
 var classPrefix = "nut-barrage";
 var InternalBarrage = function InternalBarrage(props, ref) {
-    var _ref = (0, _object_spread._)({}, defaultProps, props), className = _ref.className, interval = _ref.interval, loop = _ref.loop, list = _ref.list, duration = _ref.duration, rows = _ref.rows, gapY = _ref.gapY, restProps = (0, _object_without_properties._)(_ref, [
+    var _$_object_spread = (0, _object_spread._)({}, defaultProps, props), className = _$_object_spread.className, interval = _$_object_spread.interval, loop = _$_object_spread.loop, list = _$_object_spread.list, duration = _$_object_spread.duration, rows = _$_object_spread.rows, gapY = _$_object_spread.gapY, restProps = (0, _object_without_properties._)(_$_object_spread, [
         "className",
         "interval",
         "loop",
@@ -206,6 +206,7 @@ var InternalBarrage = function InternalBarrage(props, ref) {
         if (!loop && index.current >= list.length) {
             return;
         }
+        if (typeof document === 'undefined' || typeof document.createElement !== 'function') return;
         var _index = loop ? index.current % list.length : index.current;
         var el = document.createElement("View");
         var currentIndex = _index % rows;

package/dist/cjs/packages/button/button.d.ts

@@ -1,25 +1,3 @@
 import React from 'react';
-import type { MouseEvent } from 'react';
-import { ButtonProps as MiniProgramButtonProps } from '@tarojs/components';
-import { BasicComponent } from "../../utils/typings";
-type OmitMiniProgramButtonProps = Omit<MiniProgramButtonProps, 'size' | 'type' | 'onClick' | 'style'>;
-export type ButtonType = 'default' | 'primary' | 'info' | 'success' | 'warning' | 'danger';
-export type ButtonSize = 'xlarge' | 'large' | 'normal' | 'small' | 'mini';
-export type ButtonShape = 'square' | 'round';
-export type ButtonFill = 'solid' | 'outline' | 'dashed' | 'none';
-export interface ButtonProps extends BasicComponent, OmitMiniProgramButtonProps {
-    color: string;
-    shape: ButtonShape;
-    type: ButtonType;
-    size: ButtonSize;
-    fill: ButtonFill;
-    block: boolean;
-    loading: boolean;
-    disabled: boolean;
-    icon: React.ReactNode;
-    rightIcon: React.ReactNode;
-    nativeType: 'submit' | 'reset';
-    onClick: (e: MouseEvent<HTMLButtonElement>) => void;
-}
-export declare const Button: React.ForwardRefExoticComponent<Omit<Partial<ButtonProps>, "ref"> & React.RefAttributes<HTMLButtonElement>>;
-export {};
+import { TaroButtonProps } from "../../types";
+export declare const Button: React.ForwardRefExoticComponent<Omit<Partial<TaroButtonProps>, "ref"> & React.RefAttributes<HTMLButtonElement>>;

package/dist/cjs/packages/button/button.js

@@ -18,7 +18,6 @@ var _react = /*#__PURE__*/ _interop_require_wildcard._(require("react"));
 var _classnames = /*#__PURE__*/ _interop_require_default._(require("classnames"));
 var _components = require("@tarojs/components");
 var _iconsreacttaro = require("@nutui/icons-react-taro");
-var _taro = require("@tarojs/taro");
 var _typings = require("../../utils/typings");
 var _platform = require("../../utils/taro/platform");
 var prefixCls = 'nut-button';
@@ -36,7 +35,7 @@ var defaultProps = (0, _object_spread_props._)((0, _object_spread._)({}, _typing
     onClick: function onClick(e) {}
 });
 var Button = /*#__PURE__*/ _react.default.forwardRef(function(props, ref) {
-    var _ref = (0, _object_spread._)({}, defaultProps, props), color = _ref.color, shape = _ref.shape, fill = _ref.fill, loading = _ref.loading, disabled = _ref.disabled, type = _ref.type, size = _ref.size, block = _ref.block, icon = _ref.icon, rightIcon = _ref.rightIcon, children = _ref.children, className = _ref.className, style = _ref.style, formType = _ref.formType, nativeType = _ref.nativeType, onClick = _ref.onClick, rest = (0, _object_without_properties._)(_ref, [
+    var _$_object_spread = (0, _object_spread._)({}, defaultProps, props), color = _$_object_spread.color, shape = _$_object_spread.shape, fill = _$_object_spread.fill, loading = _$_object_spread.loading, disabled = _$_object_spread.disabled, type = _$_object_spread.type, size = _$_object_spread.size, block = _$_object_spread.block, icon = _$_object_spread.icon, rightIcon = _$_object_spread.rightIcon, children = _$_object_spread.children, className = _$_object_spread.className, style = _$_object_spread.style, nativeType = _$_object_spread.nativeType, onClick = _$_object_spread.onClick, rest = (0, _object_without_properties._)(_$_object_spread, [
         "color",
         "shape",
         "fill",
@@ -50,7 +49,6 @@ var Button = /*#__PURE__*/ _react.default.forwardRef(function(props, ref) {
         "children",
         "className",
         "style",
-        "formType",
         "nativeType",
         "onClick"
     ]);
@@ -104,16 +102,14 @@ var Button = /*#__PURE__*/ _react.default.forwardRef(function(props, ref) {
     ]);
     var _obj;
     var buttonClassNames = (0, _classnames.default)(prefixCls, "".concat(prefixCls, "-").concat(type), (_obj = {}, (0, _define_property._)(_obj, "".concat(prefixCls, "-").concat(type, "-solid"), type === 'primary' && !props.fill), (0, _define_property._)(_obj, "".concat(prefixCls, "-").concat(fill), props.fill), (0, _define_property._)(_obj, "".concat(prefixCls, "-").concat(type, "-").concat(fill), props.fill), (0, _define_property._)(_obj, "".concat(prefixCls, "-").concat(size), size), (0, _define_property._)(_obj, "".concat(prefixCls, "-").concat(shape), shape), (0, _define_property._)(_obj, "".concat(prefixCls, "-").concat(shape, "-").concat(size), shape && size), (0, _define_property._)(_obj, "".concat(prefixCls, "-block"), block), (0, _define_property._)(_obj, "".concat(prefixCls, "-disabled"), disabled || loading), (0, _define_property._)(_obj, "".concat(prefixCls, "-").concat(type).concat(props.fill ? "-".concat(fill) : '', "-disabled"), disabled || loading), (0, _define_property._)(_obj, "".concat(prefixCls, "-loading"), loading), (0, _define_property._)(_obj, "".concat(prefixCls, "-icononly"), !children), _obj), className);
-    if ((0, _taro.getEnv)() === 'WEB') {
-        ;
-        rest.type = formType;
-    }
-    return(// eslint-disable-next-line @typescript-eslint/ban-ts-comment
-    // @ts-ignore
-    // eslint-disable-next-line react/button-has-type
-    /*#__PURE__*/ /*#__PURE__*/ _react.default.createElement(_components.Button, (0, _object_spread_props._)((0, _object_spread._)({}, rest), {
+    // if (getEnv() === 'WEB') {
+    //   ;(rest as any).type = formType
+    // }
+    return(// @ts-ignore
+    // <TaroButton
+    /*#__PURE__*/ /*#__PURE__*/ _react.default.createElement(_components.View, (0, _object_spread_props._)((0, _object_spread._)({}, rest), {
         ref: ref,
-        formType: formType || nativeType,
+        // formType={formType || nativeType}
         className: buttonClassNames,
         style: (0, _object_spread._)({}, getStyle, style),
         onClick: function onClick(e) {
@@ -122,6 +118,7 @@ var Button = /*#__PURE__*/ _react.default.forwardRef(function(props, ref) {
     }), /*#__PURE__*/ _react.default.createElement(_components.View, {
         className: "nut-button-wrap"
     }, loading && /*#__PURE__*/ _react.default.createElement(_iconsreacttaro.Loading, {
+        ariaHidden: true,
         className: "nut-icon-loading"
     }), !loading && icon, children && /*#__PURE__*/ _react.default.createElement(_components.View, {
         className: "nut-button-children nut-button-".concat(size, "-children nut-button-").concat(type, "-children ").concat(!(props.fill || disabled || loading) ? '' : "nut-button-".concat(type).concat(props.fill ? "-".concat(fill) : '').concat(disabled || loading ? '-disabled' : '')).concat(icon || loading ? " nut-button-text" : '').concat(rightIcon ? ' nut-button-text-right' : ''),

package/dist/cjs/packages/button/index.d.ts

@@ -1,3 +1,2 @@
 import { Button } from "./button";
-export type { ButtonType, ButtonProps, ButtonSize, ButtonShape, ButtonFill, } from "./button";
 export default Button;

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

@@ -58,9 +58,6 @@
     /* #ifdef dynamic*/
     pointer-events: none;
     /* #endif */
-    /* #ifndef dynamic*/
-    pointer-events: auto;
-    /* #endif */
   }
 
   &::after {

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

@@ -60,9 +60,6 @@
   /* #ifdef dynamic*/
   pointer-events: none;
   /* #endif */
-  /* #ifndef dynamic*/
-  pointer-events: auto;
-  /* #endif */
 }
 .nut-button::after {
   border: none;

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

@@ -60,9 +60,6 @@
   /* #ifdef dynamic*/
   pointer-events: none;
   /* #endif */
-  /* #ifndef dynamic*/
-  pointer-events: auto;
-  /* #endif */
 }
 .nut-button::after {
   border: none;

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

@@ -58,9 +58,6 @@
     /* #ifdef dynamic*/
     pointer-events: none;
     /* #endif */
-    /* #ifndef dynamic*/
-    pointer-events: auto;
-    /* #endif */
   }
 
   &::after {

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

@@ -60,9 +60,6 @@
   /* #ifdef dynamic*/
   pointer-events: none;
   /* #endif */
-  /* #ifndef dynamic*/
-  pointer-events: auto;
-  /* #endif */
 }
 .nut-button::after {
   border: none;

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

@@ -58,9 +58,6 @@
     /* #ifdef dynamic*/
     pointer-events: none;
     /* #endif */
-    /* #ifndef dynamic*/
-    pointer-events: auto;
-    /* #endif */
   }
 
   &::after {

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

@@ -60,9 +60,6 @@
   /* #ifdef dynamic*/
   pointer-events: none;
   /* #endif */
-  /* #ifndef dynamic*/
-  pointer-events: auto;
-  /* #endif */
 }
 .nut-button::after {
   border: none;

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

@@ -125,9 +125,20 @@
     font-weight: $calendar-day-font-weight;
     margin-bottom: 4px;
 
+    // 部分 Taro 机型下子节点不会稳定继承父级 color，颜色直接落到最内层文案。
+    &-day,
+    &-info-curr {
+      color: $color-title;
+    }
+
     &:nth-child(7n + 0),
     &:nth-child(7n + 1) {
       color: $color-primary;
+
+      .nut-calendar-day-day,
+      .nut-calendar-day-info-curr {
+        color: $color-primary;
+      }
     }
 
     &-info,
@@ -168,7 +179,12 @@
         border-bottom-right-radius: $calendar-day-active-border-radius;
       }
 
-      .nut-calendar-day-info {
+      &.nut-calendar-day-active .nut-calendar-day-info {
+        color: $color-primary-text;
+      }
+
+      &.nut-calendar-day-active .nut-calendar-day-day,
+      &.nut-calendar-day-active .nut-calendar-day-info-curr {
         color: $color-primary-text;
       }
     }
@@ -176,6 +192,11 @@
     &-disabled {
       color: $calendar-disable-color !important;
 
+      &.nut-calendar-day-disabled .nut-calendar-day-day,
+      &.nut-calendar-day-disabled .nut-calendar-day-info-curr {
+        color: $calendar-disable-color;
+      }
+
       .nut-calendar-day-info-curr {
         display: none;
       }
@@ -185,10 +206,20 @@
       background-color: $calendar-choose-background-color;
       color: $calendar-choose-color;
 
+      &.nut-calendar-day-choose .nut-calendar-day-day,
+      &.nut-calendar-day-choose .nut-calendar-day-info-curr {
+        color: $calendar-choose-color;
+      }
+
       &-disabled {
         background-color: $calendar-choose-disable-background-color;
         color: $calendar-disable-color !important;
 
+        &.nut-calendar-day-choose-disabled .nut-calendar-day-day,
+        &.nut-calendar-day-choose-disabled .nut-calendar-day-info-curr {
+          color: $calendar-disable-color;
+        }
+
         .nut-calendar-day-info-curr {
           display: none;
         }