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

package/dist/es/packages/avatarcropper/avatarcropper.js

@@ -4,8 +4,8 @@ import { _ as _object_spread_props } from "@swc/helpers/_/_object_spread_props";
 import { _ as _object_without_properties } from "@swc/helpers/_/_object_without_properties";
 import { _ as _sliced_to_array } from "@swc/helpers/_/_sliced_to_array";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
-import React, { useState, useEffect, useMemo, useCallback, useLayoutEffect } from "react";
-import Taro, { createSelectorQuery } from "@tarojs/taro";
+import React, { useState, useEffect, useMemo, useCallback } from "react";
+import Taro, { useReady, createSelectorQuery } from "@tarojs/taro";
 import classNames from "classnames";
 import { Canvas, View } from "@tarojs/components";
 import { getWindowInfo } from "../../utils/taro/get-system-info";
@@ -46,7 +46,7 @@ var defaultProps = _object_spread_props(_object_spread({}, ComponentDefaults), {
     shape: 'square'
 });
 var classPrefix = "nut-avatar-cropper";
-export var AvatarCropper = function(props) {
+export var AvatarCropper = function AvatarCropper(props) {
     var locale = useConfig().locale;
     defaultProps.toolbar = [
         /*#__PURE__*/ React.createElement(Button, {
@@ -65,7 +65,7 @@ export var AvatarCropper = function(props) {
         }, locale.confirm)
     ];
     defaultProps.editText = locale.edit;
-    var _ref = _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 = _object_without_properties(_ref, [
+    var _$_object_spread = _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 = _object_without_properties(_$_object_spread, [
         "children",
         "toolbar",
         "maxZoom",
@@ -117,7 +117,7 @@ export var AvatarCropper = function(props) {
         cropperCanvas: null,
         cropperCanvasContext: null
     }), 2), canvasAll = _useState5[0], setCanvasAll = _useState5[1];
-    useLayoutEffect(function() {
+    useReady(function() {
         if (showAlipayCanvas2D) {
             var canvasId = canvasAll.canvasId;
             createSelectorQuery().select("#".concat(canvasId)).node(function(param) {
@@ -129,11 +129,7 @@ export var AvatarCropper = function(props) {
                 }));
             }).exec();
         }
-    }, [
-        showAlipayCanvas2D,
-        state.displayHeight,
-        state.displayWidth
-    ]);
+    });
     useEffect(function() {
         setCanvasAll(_object_spread_props(_object_spread({}, canvasAll), {
             cropperCanvasContext: Taro.createCanvasContext(canvasAll.canvasId)
@@ -193,7 +189,7 @@ export var AvatarCropper = function(props) {
         state
     ]);
     // base64转图片
-    var dataURLToImage = function(dataURL) {
+    var dataURLToImage = function dataURLToImage(dataURL) {
         return new Promise(function(resolve) {
             var img = new Image();
             img.onload = function() {
@@ -203,7 +199,7 @@ export var AvatarCropper = function(props) {
         });
     };
     // base64转图片(canvasImage)
-    var dataURLToCanvasImage = function(canvas, dataURL) {
+    var dataURLToCanvasImage = function dataURLToCanvasImage(canvas, dataURL) {
         return new Promise(function(resolve) {
             var img = canvas.createImage();
             img.onload = function() {
@@ -311,7 +307,7 @@ export var AvatarCropper = function(props) {
         draw
     ]);
     // 设置绘制图片
-    var setDrawImgInfo = function(image) {
+    var setDrawImgInfo = function setDrawImgInfo(image) {
         return _async_to_generator(function() {
             var displayWidth, cropperWidth, copyDrawImg, imgWidth, imgHeight, isPortrait, rate, scale;
             return _ts_generator(this, function(_state) {
@@ -364,20 +360,20 @@ export var AvatarCropper = function(props) {
             });
         })();
     };
-    var chooseImage = function() {
+    var chooseImage = function chooseImage() {
         Taro.chooseImage({
             count: 1,
             // 可以指定是原图还是压缩图，默认二者都有
             sizeType: sizeType,
             sourceType: sourceType,
-            success: function(res) {
+            success: function success(res) {
                 // 返回选定照片的本地文件路径列表，tempFilePath可以作为img标签的src属性显示图片
                 var tempFiles = res.tempFiles;
                 !!tempFiles.length && imageChange(tempFiles[0]);
             }
         });
     };
-    var imageChange = function(file) {
+    var imageChange = function imageChange(file) {
         return _async_to_generator(function() {
             return _ts_generator(this, function(_state) {
                 Taro.getImageInfo({
@@ -392,7 +388,7 @@ export var AvatarCropper = function(props) {
             });
         })();
     };
-    var resetScale = function(scale) {
+    var resetScale = function resetScale(scale) {
         setState(_object_spread_props(_object_spread({}, state), {
             moveX: 0,
             moveY: 0,
@@ -401,7 +397,7 @@ export var AvatarCropper = function(props) {
             defScale: scale || state.defScale
         }));
     };
-    var setScale = function(scale) {
+    var setScale = function setScale(scale) {
         scale = clamp(scale, +0.3, +maxZoom + 1);
         if (scale !== state.scale) {
             setState(_object_spread_props(_object_spread({}, state), {
@@ -410,7 +406,7 @@ export var AvatarCropper = function(props) {
         }
     };
     // 计算两个点的距离
-    var getDistance = function(touches) {
+    var getDistance = function getDistance(touches) {
         return Math.sqrt(Math.pow(touches[0].clientX - touches[1].clientX, 2) + Math.pow(touches[0].clientY - touches[1].clientY, 2));
     };
     var _useState6 = _sliced_to_array(useState({
@@ -420,7 +416,7 @@ export var AvatarCropper = function(props) {
         startDistance: 0
     }), 2), startMove = _useState6[0], setStartMove = _useState6[1];
     var startMoveX = startMove.startMoveX, startMoveY = startMove.startMoveY, startScale = startMove.startScale, startDistance = startMove.startDistance;
-    var onTouchStart = function(event) {
+    var onTouchStart = function onTouchStart(event) {
         var touches = event.touches;
         var offsetX = touch.offsetX;
         touch.start(event);
@@ -438,7 +434,7 @@ export var AvatarCropper = function(props) {
             }));
         }
     };
-    var onTouchMove = function(event) {
+    var onTouchMove = function onTouchMove(event) {
         var touches = event.touches;
         touch.move(event);
         if (moving || zooming) {
@@ -459,7 +455,7 @@ export var AvatarCropper = function(props) {
             setScale(scale);
         }
     };
-    var onTouchEnd = function(event) {
+    var onTouchEnd = function onTouchEnd(event) {
         var stopPropagation = false;
         if (moving || zooming) {
             stopPropagation = !(moving && startMoveX === state.moveX && startMoveY === state.moveY);
@@ -490,12 +486,12 @@ export var AvatarCropper = function(props) {
         preventDefault(event, stopPropagation);
         touch.reset();
     };
-    var reset = function() {
+    var reset = function reset() {
         setState(_object_spread_props(_object_spread({}, state), {
             angle: 0
         }));
     };
-    var rotate = function() {
+    var rotate = function rotate() {
         if (state.angle === 270) {
             setState(_object_spread_props(_object_spread({}, state), {
                 angle: 0
@@ -506,14 +502,14 @@ export var AvatarCropper = function(props) {
             angle: state.angle + 90
         }));
     };
-    var cancel = function() {
+    var cancel = function cancel() {
         var isEmit = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : true;
         setVisible(false);
         resetScale();
         isEmit && onCancel && onCancel();
     };
     // web裁剪图片
-    var confirmWEB = function() {
+    var confirmWEB = function confirmWEB() {
         var cropperWidth = state.cropperWidth, displayHeight = state.displayHeight;
         var canvasDom = document.getElementById(canvasAll.canvasId);
         var canvas = canvasDom;
@@ -536,7 +532,7 @@ export var AvatarCropper = function(props) {
         cancel(false);
     };
     // 支付宝基础库2.7.0以上支持，需要开启支付宝小程序canvas2d
-    var confirmALIPAY = function() {
+    var confirmALIPAY = function confirmALIPAY() {
         var cropperWidth = state.cropperWidth, displayHeight = state.displayHeight;
         var cropperCanvas = canvasAll.cropperCanvas;
         Taro.canvasToTempFilePath({
@@ -547,7 +543,7 @@ export var AvatarCropper = function(props) {
             height: cropperWidth,
             destWidth: cropperWidth,
             destHeight: cropperWidth,
-            success: function(res) {
+            success: function success(res) {
                 return _async_to_generator(function() {
                     var filePath;
                     return _ts_generator(this, function(_state) {
@@ -563,7 +559,7 @@ export var AvatarCropper = function(props) {
         });
     };
     // 裁剪图片
-    var confirm = function() {
+    var confirm = function confirm() {
         if (Taro.getEnv() === 'WEB') {
             confirmWEB();
             return;
@@ -583,7 +579,7 @@ export var AvatarCropper = function(props) {
             height: cropperWidth,
             destWidth: cropperWidth * systemInfo.pixelRatio,
             destHeight: cropperWidth * systemInfo.pixelRatio,
-            success: function(res) {
+            success: function success(res) {
                 return _async_to_generator(function() {
                     var filePath;
                     return _ts_generator(this, function(_state) {
@@ -598,7 +594,7 @@ export var AvatarCropper = function(props) {
             }
         });
     };
-    var ToolBar = function() {
+    var ToolBar = function ToolBar() {
         var actions = [
             cancel,
             reset,
@@ -611,13 +607,13 @@ export var AvatarCropper = function(props) {
             return /*#__PURE__*/ React.createElement(View, {
                 key: index,
                 className: "".concat(classPrefix, "-popup-toolbar-item"),
-                onClick: function(_e) {
+                onClick: function onClick(_e) {
                     return action();
                 }
             }, toolbar[index]);
         }));
     };
-    var CropperPopup = function() {
+    var CropperPopup = function CropperPopup() {
         var canvasId = canvasAll.canvasId;
         return /*#__PURE__*/ React.createElement(View, {
             className: "".concat(classPrefix, "-popup"),

package/dist/es/packages/avatargroup/avatargroup.js

@@ -14,7 +14,7 @@ var defaultProps = _object_spread_props(_object_spread({}, ComponentDefaults), {
     level: 'left'
 });
 var classPrefix = "nut-avatar-group";
-export var AvatarGroup = function(props) {
+export var AvatarGroup = function AvatarGroup(props) {
     var propAvatarGroup = _object_spread({}, defaultProps, props);
     var className = propAvatarGroup.className, style = propAvatarGroup.style, children = propAvatarGroup.children;
     var avatarGroupRef = useRef(null);

package/dist/es/packages/backtop/backtop.js

@@ -14,7 +14,7 @@ var defaultProps = _object_spread_props(_object_spread({}, ComponentDefaults), {
     zIndex: 900,
     duration: 1000
 });
-export var BackTop = function(props) {
+export var BackTop = function BackTop(props) {
     var _$_object_spread = _object_spread({}, defaultProps, props), children = _$_object_spread.children, threshold = _$_object_spread.threshold, zIndex = _$_object_spread.zIndex, className = _$_object_spread.className, duration = _$_object_spread.duration, icon = _$_object_spread.icon, style = _$_object_spread.style, scrollRes = _$_object_spread.scrollRes, onClick = _$_object_spread.onClick;
     var classPrefix = 'nut-backtop';
     var _useState = _sliced_to_array(useState(false), 2), backTop = _useState[0], setBackTop = _useState[1];
@@ -57,12 +57,12 @@ export var BackTop = function(props) {
             zIndex: zIndex
         }, style),
         icon: !children && (icon || /*#__PURE__*/ React.createElement(Top, null)),
-        onClick: function(e) {
+        onClick: function onClick(e) {
             goTop(e);
         }
     }, children && /*#__PURE__*/ React.createElement(View, {
         className: "nut-hoverbutton-item-container",
-        onClick: function(e) {
+        onClick: function onClick(e) {
             goTop(e);
         }
     }, children));

package/dist/es/packages/badge/badge.js

@@ -2,6 +2,7 @@ import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
 import { _ as _define_property } from "@swc/helpers/_/_define_property";
 import { _ as _object_spread } from "@swc/helpers/_/_object_spread";
 import { _ as _object_spread_props } from "@swc/helpers/_/_object_spread_props";
+import { _ as _object_without_properties } from "@swc/helpers/_/_object_without_properties";
 import { _ as _sliced_to_array } from "@swc/helpers/_/_sliced_to_array";
 import { _ as _type_of } from "@swc/helpers/_/_type_of";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
@@ -22,7 +23,7 @@ var defaultProps = _object_spread_props(_object_spread({}, ComponentDefaults), {
     size: 'large',
     disabled: false
 });
-export var Badge = function(props) {
+export var Badge = function Badge(props) {
     var getContent = function getContent() {
         if (dot || value === 0) return null;
         if (typeof value === 'number') {
@@ -41,7 +42,19 @@ export var Badge = function(props) {
     };
     var _this;
     var rtl = useRtl();
-    var _$_object_spread = _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 = _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 = _object_without_properties(_$_object_spread, [
+        "className",
+        "style",
+        "value",
+        "max",
+        "children",
+        "dot",
+        "top",
+        "right",
+        "fill",
+        "size",
+        "disabled"
+    ]);
     var classPrefix = 'nut-badge';
     var isHarmony = harmony();
     var classes = classNames(classPrefix, className);
@@ -54,7 +67,7 @@ export var Badge = function(props) {
             getPositionStyle();
         }
     }, []);
-    var getPositionStyle = function() {
+    var getPositionStyle = function getPositionStyle() {
         return _async_to_generator(function() {
             var style;
             return _ts_generator(this, function(_state) {
@@ -69,11 +82,11 @@ export var Badge = function(props) {
         })();
     };
     var _obj1;
-    return /*#__PURE__*/ React.createElement(View, {
+    return /*#__PURE__*/ React.createElement(View, _object_spread({
         className: classes,
         style: style,
         ref: badgeRef
-    }, isIcon() && /*#__PURE__*/ React.createElement(View, {
+    }, rest), isIcon() && /*#__PURE__*/ React.createElement(View, {
         className: classNames("".concat(classPrefix, "-content"), (_obj1 = {}, _define_property(_obj1, "".concat(classPrefix, "-icon"), true), _define_property(_obj1, "".concat(classPrefix, "-icon-rtl"), rtl), _obj1)),
         style: contentStyle
     }, value), children, !isIcon() && (getContent() || dot) && /*#__PURE__*/ React.createElement(View, {

package/dist/es/packages/barrage/barrage.js

@@ -17,8 +17,8 @@ var defaultProps = _object_spread_props(_object_spread({}, ComponentDefaults), {
     gapY: 10
 });
 var classPrefix = "nut-barrage";
-var InternalBarrage = function(props, ref) {
-    var _ref = _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 = _object_without_properties(_ref, [
+var InternalBarrage = function InternalBarrage(props, ref) {
+    var _$_object_spread = _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 = _object_without_properties(_$_object_spread, [
         "className",
         "interval",
         "loop",
@@ -38,7 +38,7 @@ var InternalBarrage = function(props, ref) {
     var classes = classNames(classPrefix, className);
     useImperativeHandle(ref, function() {
         return {
-            add: function(word) {
+            add: function add(word) {
                 var _index = index.current % list.length;
                 if (!loop && index.current === list.length) {
                     list.splice(list.length, 0, word);
@@ -48,7 +48,7 @@ var InternalBarrage = function(props, ref) {
             }
         };
     });
-    var getNodeWidth = function(node) {
+    var getNodeWidth = function getNodeWidth(node) {
         var type = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : 'width';
         return _async_to_generator(function() {
             var refe;
@@ -78,14 +78,14 @@ var InternalBarrage = function(props, ref) {
             });
         })();
     };
-    var clearDomTimeout = function() {
+    var clearDomTimeout = function clearDomTimeout() {
         if (domTimer.current) {
             clearTimeout(domTimer.current);
             domTimer.current = 0;
         }
     };
     useEffect(function() {
-        var init = function() {
+        var init = function init() {
             return _async_to_generator(function() {
                 var _barrageBody_current;
                 return _ts_generator(this, function(_state) {
@@ -122,7 +122,7 @@ var InternalBarrage = function(props, ref) {
     }, [
         list
     ]);
-    var run = function() {
+    var run = function run() {
         clearTimeout(timer.current);
         var intervalCache = interval;
         var _index = (loop ? index.current % list.length : index.current) % rows;
@@ -134,7 +134,7 @@ var InternalBarrage = function(props, ref) {
             play();
         }, intervalCache);
     };
-    var setStyle = function(el, currentIndex) {
+    var setStyle = function setStyle(el, currentIndex) {
         return _async_to_generator(function() {
             var refe, width, height, elScrollDuration, error;
             return _ts_generator(this, function(_state) {
@@ -190,10 +190,11 @@ var InternalBarrage = function(props, ref) {
             });
         })();
     };
-    var play = function() {
+    var play = function play() {
         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/es/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/es/packages/button/button.js

@@ -4,9 +4,8 @@ import { _ as _object_spread_props } from "@swc/helpers/_/_object_spread_props";
 import { _ as _object_without_properties } from "@swc/helpers/_/_object_without_properties";
 import React, { useCallback, useMemo } from "react";
 import classNames from "classnames";
-import { View, Button as TaroButton } from "@tarojs/components";
+import { View } from "@tarojs/components";
 import { Loading } from "@nutui/icons-react-taro";
-import { getEnv } from "@tarojs/taro";
 import { ComponentDefaults } from "../../utils/typings";
 import { harmony } from "../../utils/taro/platform";
 var prefixCls = 'nut-button';
@@ -21,10 +20,11 @@ var defaultProps = _object_spread_props(_object_spread({}, ComponentDefaults), {
     block: false,
     icon: null,
     rightIcon: null,
-    onClick: function(e) {}
+    onClick: function onClick(e) {}
 });
 export var Button = /*#__PURE__*/ React.forwardRef(function(props, ref) {
-    var _ref = _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 = _object_without_properties(_ref, [
+    var _$_object_spread = _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, // formType,
+    nativeType = _$_object_spread.nativeType, onClick = _$_object_spread.onClick, rest = _object_without_properties(_$_object_spread, [
         "color",
         "shape",
         "fill",
@@ -38,7 +38,6 @@ export var Button = /*#__PURE__*/ React.forwardRef(function(props, ref) {
         "children",
         "className",
         "style",
-        "formType",
         "nativeType",
         "onClick"
     ]);
@@ -92,25 +91,24 @@ export var Button = /*#__PURE__*/ React.forwardRef(function(props, ref) {
     ]);
     var _obj;
     var buttonClassNames = classNames(prefixCls, "".concat(prefixCls, "-").concat(type), (_obj = {}, _define_property(_obj, "".concat(prefixCls, "-").concat(type, "-solid"), type === 'primary' && !props.fill), _define_property(_obj, "".concat(prefixCls, "-").concat(fill), props.fill), _define_property(_obj, "".concat(prefixCls, "-").concat(type, "-").concat(fill), props.fill), _define_property(_obj, "".concat(prefixCls, "-").concat(size), size), _define_property(_obj, "".concat(prefixCls, "-").concat(shape), shape), _define_property(_obj, "".concat(prefixCls, "-").concat(shape, "-").concat(size), shape && size), _define_property(_obj, "".concat(prefixCls, "-block"), block), _define_property(_obj, "".concat(prefixCls, "-disabled"), disabled || loading), _define_property(_obj, "".concat(prefixCls, "-").concat(type).concat(props.fill ? "-".concat(fill) : '', "-disabled"), disabled || loading), _define_property(_obj, "".concat(prefixCls, "-loading"), loading), _define_property(_obj, "".concat(prefixCls, "-icononly"), !children), _obj), className);
-    if (getEnv() === 'WEB') {
-        ;
-        rest.type = formType;
-    }
+    // if (getEnv() === 'WEB') {
+    //   ;(rest as any).type = formType
+    // }
     return (
-        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
         // @ts-ignore
-        // eslint-disable-next-line react/button-has-type
-        /*#__PURE__*/ (React.createElement(TaroButton, _object_spread_props(_object_spread({}, rest), {
+        // <TaroButton
+        /*#__PURE__*/ (React.createElement(View, _object_spread_props(_object_spread({}, rest), {
             ref: ref,
-            formType: formType || nativeType,
+            // formType={formType || nativeType}
             className: buttonClassNames,
             style: _object_spread({}, getStyle, style),
-            onClick: function(e) {
+            onClick: function onClick(e) {
                 return handleClick(e);
             }
         }), /*#__PURE__*/ React.createElement(View, {
             className: "nut-button-wrap"
         }, loading && /*#__PURE__*/ React.createElement(Loading, {
+            ariaHidden: true,
             className: "nut-icon-loading"
         }), !loading && icon, children && /*#__PURE__*/ React.createElement(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/es/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/es/packages/button/style/button.scss

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

package/dist/es/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/es/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/es/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/es/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/es/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/es/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/es/packages/calendar/calendar.js

@@ -23,40 +23,40 @@ var defaultProps = _object_spread_props(_object_spread({}, ComponentDefaults), {
     showSubTitle: true,
     scrollAnimation: true,
     firstDayOfWeek: 0,
-    disableDate: function(date) {
+    disableDate: function disableDate(date) {
         return false;
     },
     renderHeaderButtons: undefined,
     renderDay: undefined,
     renderDayTop: undefined,
     renderDayBottom: undefined,
-    onClose: function() {},
-    onConfirm: function(param) {},
-    onDayClick: function(data) {},
-    onPageChange: function(param) {}
+    onClose: function onClose() {},
+    onConfirm: function onConfirm(param) {},
+    onDayClick: function onDayClick(data) {},
+    onPageChange: function onPageChange(param) {}
 });
 export var Calendar = /*#__PURE__*/ React.forwardRef(function(props, ref) {
     var locale = useConfig().locale;
     var _$_object_spread = _object_spread({}, defaultProps, props), style = _$_object_spread.style, className = _$_object_spread.className, children = _$_object_spread.children, popup = _$_object_spread.popup, visible = _$_object_spread.visible, type = _$_object_spread.type, autoBackfill = _$_object_spread.autoBackfill, title = _$_object_spread.title, defaultValue = _$_object_spread.defaultValue, startDate = _$_object_spread.startDate, endDate = _$_object_spread.endDate, showToday = _$_object_spread.showToday, startText = _$_object_spread.startText, endText = _$_object_spread.endText, confirmText = _$_object_spread.confirmText, showTitle = _$_object_spread.showTitle, showSubTitle = _$_object_spread.showSubTitle, scrollAnimation = _$_object_spread.scrollAnimation, firstDayOfWeek = _$_object_spread.firstDayOfWeek, closeIcon = _$_object_spread.closeIcon, disableDate = _$_object_spread.disableDate, renderHeaderButtons = _$_object_spread.renderHeaderButtons, renderBottomButton = _$_object_spread.renderBottomButton, renderDay = _$_object_spread.renderDay, renderDayTop = _$_object_spread.renderDayTop, renderDayBottom = _$_object_spread.renderDayBottom, onClose = _$_object_spread.onClose, onConfirm = _$_object_spread.onConfirm, onDayClick = _$_object_spread.onDayClick, onPageChange = _$_object_spread.onPageChange;
     var calendarRef = useRef(null);
-    var close = function() {
+    var close = function close() {
         onClose && onClose();
     };
-    var choose = function(param) {
+    var choose = function choose(param) {
         close();
         onConfirm && onConfirm(param);
     };
-    var closePopup = function() {
+    var closePopup = function closePopup() {
         close();
     };
-    var select = function(param) {
+    var select = function select(param) {
         onDayClick && onDayClick(param);
     };
-    var scrollToDate = function(date) {
+    var scrollToDate = function scrollToDate(date) {
         var _calendarRef_current;
         (_calendarRef_current = calendarRef.current) === null || _calendarRef_current === void 0 ? void 0 : _calendarRef_current.scrollToDate(date);
     };
-    var yearMonthChange = function(param) {
+    var yearMonthChange = function yearMonthChange(param) {
         onPageChange && onPageChange(param);
     };
     React.useImperativeHandle(ref, function() {
@@ -64,7 +64,7 @@ export var Calendar = /*#__PURE__*/ React.forwardRef(function(props, ref) {
             scrollToDate: scrollToDate
         };
     });
-    var renderItem = function() {
+    var renderItem = function renderItem() {
         return /*#__PURE__*/ React.createElement(CalendarItem, {
             ref: calendarRef,
             style: style,