@nutui/nutui-react-taro 3.0.6 → 3.0.8

package/dist/es/packages/dialog/dialog.js

@@ -13,10 +13,10 @@ import Button from "../button/index";
 import { Content, defaultContentProps } from "./content";
 import { useConfig } from "../configprovider/configprovider";
 import Overlay from "../overlay/index";
+import { defaultOverlayProps } from "../overlay/overlay";
 import { customEvents, useCustomEvent, useCustomEventsPath, useParams } from "../../hooks/use-custom-event";
 import { useLockScrollTaro } from "../../hooks/use-lock-scoll-taro";
 import { mergeProps } from "../../utils/merge-props";
-import { defaultOverlayProps } from "../overlay/overlay";
 import { harmony } from "../../utils/platform-taro";
 var defaultProps = _object_spread_props(_object_spread({}, defaultOverlayProps, defaultContentProps), {
     title: '',
@@ -25,15 +25,15 @@ var defaultProps = _object_spread_props(_object_spread({}, defaultOverlayProps,
     footer: '',
     confirmText: '',
     cancelText: '',
-    overlay: true,
-    overlayStyle: {},
-    overlayClassName: 'nut-dialog-overlay',
     hideConfirmButton: false,
     hideCancelButton: false,
     disableConfirmButton: false,
     footerDirection: 'horizontal',
     closeIconPosition: 'bottom',
     closeIcon: false,
+    overlay: true,
+    overlayStyle: {},
+    overlayClassName: 'nut-dialog-overlay',
     zIndex: 1200,
     beforeCancel: function() {
         return true;
@@ -43,15 +43,16 @@ var defaultProps = _object_spread_props(_object_spread({}, defaultOverlayProps,
     },
     onCancel: function() {},
     onClose: function() {},
+    onConfirm: function() {},
     onOverlayClick: function() {
         return true;
     }
 });
 export var BaseDialog = function(props) {
+    var _useParams = useParams(mergeProps(defaultProps, props)), _useParams_params = _useParams.params, id = _useParams_params.id, closeOnOverlayClick = _useParams_params.closeOnOverlayClick, confirmText = _useParams_params.confirmText, cancelText = _useParams_params.cancelText, children = _useParams_params.children, className = _useParams_params.className, closeIconPosition = _useParams_params.closeIconPosition, closeIcon = _useParams_params.closeIcon, content = _useParams_params.content, disableConfirmButton = _useParams_params.disableConfirmButton, footer = _useParams_params.footer, footerDirection = _useParams_params.footerDirection, header = _useParams_params.header, hideConfirmButton = _useParams_params.hideConfirmButton, hideCancelButton = _useParams_params.hideCancelButton, lockScroll = _useParams_params.lockScroll, overlay = _useParams_params.overlay, overlayStyle = _useParams_params.overlayStyle, overlayClassName = _useParams_params.overlayClassName, style = _useParams_params.style, title = _useParams_params.title, visible = _useParams_params.visible, zIndex = _useParams_params.zIndex, beforeCancel = _useParams_params.beforeCancel, beforeClose = _useParams_params.beforeClose, onClose = _useParams_params.onClose, onCancel = _useParams_params.onCancel, onConfirm = _useParams_params.onConfirm, onOverlayClick = _useParams_params.onOverlayClick, setParams = _useParams.setParams;
     var classPrefix = 'nut-dialog';
     var locale = useConfig().locale;
     var _useState = _sliced_to_array(useState(false), 2), loading = _useState[0], setLoading = _useState[1];
-    var _useParams = useParams(mergeProps(defaultProps, props)), _useParams_params = _useParams.params, id = _useParams_params.id, className = _useParams_params.className, style = _useParams_params.style, visible = _useParams_params.visible, footer = _useParams_params.footer, title = _useParams_params.title, header = _useParams_params.header, content = _useParams_params.content, children = _useParams_params.children, footerDirection = _useParams_params.footerDirection, hideConfirmButton = _useParams_params.hideConfirmButton, hideCancelButton = _useParams_params.hideCancelButton, lockScroll = _useParams_params.lockScroll, disableConfirmButton = _useParams_params.disableConfirmButton, closeOnOverlayClick = _useParams_params.closeOnOverlayClick, confirmText = _useParams_params.confirmText, cancelText = _useParams_params.cancelText, overlay = _useParams_params.overlay, overlayStyle = _useParams_params.overlayStyle, overlayClassName = _useParams_params.overlayClassName, closeIconPosition = _useParams_params.closeIconPosition, closeIcon = _useParams_params.closeIcon, zIndex = _useParams_params.zIndex, beforeCancel = _useParams_params.beforeCancel, beforeClose = _useParams_params.beforeClose, onClose = _useParams_params.onClose, onCancel = _useParams_params.onCancel, onConfirm = _useParams_params.onConfirm, onOverlayClick = _useParams_params.onOverlayClick, setParams = _useParams.setParams;
     useCustomEvent(id, function(param) {
         var status = param.status, options = param.options;
         setParams(_object_spread_props(_object_spread({}, options), {
@@ -65,8 +66,8 @@ export var BaseDialog = function(props) {
             e.stopPropagation();
             if (!(beforeCancel === null || beforeCancel === void 0 ? void 0 : beforeCancel())) return;
             if (!(beforeClose === null || beforeClose === void 0 ? void 0 : beforeClose())) return;
-            onClose === null || onClose === void 0 ? void 0 : onClose();
-            onCancel === null || onCancel === void 0 ? void 0 : onCancel();
+            onClose();
+            onCancel();
         };
         var handleOk = /*#__PURE__*/ function() {
             var _ref = _async_to_generator(function(e) {
@@ -91,7 +92,7 @@ export var BaseDialog = function(props) {
                         case 2:
                             _state.sent();
                             setLoading(false);
-                            onClose === null || onClose === void 0 ? void 0 : onClose();
+                            onClose();
                             return [
                                 3,
                                 4
@@ -135,8 +136,8 @@ export var BaseDialog = function(props) {
         };
         var renderConfirm = function() {
             return !hideConfirmButton && /*#__PURE__*/ React.createElement(Button, {
-                size: "large",
                 type: "primary",
+                size: "large",
                 className: classNames("".concat(classPrefix, "-footer-ok ").concat(btnClass), {
                     disabled: disableConfirmButton
                 }),
@@ -154,8 +155,8 @@ export var BaseDialog = function(props) {
         var handleCancel = function() {
             if (!(beforeCancel === null || beforeCancel === void 0 ? void 0 : beforeCancel())) return;
             if (!(beforeClose === null || beforeClose === void 0 ? void 0 : beforeClose())) return;
-            onClose === null || onClose === void 0 ? void 0 : onClose();
-            onCancel === null || onCancel === void 0 ? void 0 : onCancel();
+            onClose();
+            onCancel();
         };
         var _obj;
         var closeClasses = classNames((_obj = {}, _define_property(_obj, "".concat(classPrefix, "-close"), true), _define_property(_obj, "".concat(classPrefix, "-close-").concat(closeIconPosition), true), _obj));
@@ -168,8 +169,8 @@ export var BaseDialog = function(props) {
     var onHandleClickOverlay = function(e) {
         if (closeOnOverlayClick && visible && e.target === e.currentTarget) {
             var closed = onOverlayClick && onOverlayClick(e);
-            closed && onClose && onClose();
-            closed && onCancel && onCancel();
+            closed && onClose();
+            closed && onCancel();
         }
     };
     var renderContent = function() {

package/dist/es/packages/dialog/index.d.ts

@@ -1,3 +1,3 @@
 import { BaseDialog } from "./dialog";
-export type { DialogConfigType, DialogCloseIconPosition, DialogFooterDirection, ContentProps, DialogWrapProps, DialogBasicProps, DialogConfirmProps, DialogReturnProps, } from './types.taro';
+export type { DialogConfigType, DialogCloseIconPosition, DialogFooterDirection, TaroContentProps as ContentProps, DialogWrapProps, TaroDialogProps as DialogProps, DialogReturnProps, } from "../../types";
 export default BaseDialog;

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

@@ -127,6 +127,7 @@
 
     &-cancel.nut-dialog-footer-cancel {
       margin-right: $dialog-footer-cancel-margin-right;
+      background: $dialog-footer-cancel-bg;
     }
 
     &-ok {

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

@@ -94,18 +94,6 @@
 .nut-button-round {
   border-radius: var(--nutui-button-border-radius, var(--nutui-radius-s, 6px));
 }
-.nut-button-round-xlarge {
-  border-radius: var(--nutui-button-xlarge-border-radius, var(--nutui-radius-base, 8px));
-}
-.nut-button-round-large {
-  border-radius: var(--nutui-button-large-border-radius, var(--nutui-radius-base, 8px));
-}
-.nut-button-round-small {
-  border-radius: var(--nutui-button-small-border-radius, var(--nutui-radius-s, 6px));
-}
-.nut-button-round-mini {
-  border-radius: var(--nutui-button-mini-border-radius, var(--nutui-radius-xs, 4px));
-}
 .nut-button-default {
   padding: var(--nutui-button-default-padding, 0px 12px);
   border-style: solid;
@@ -131,7 +119,7 @@
   height: var(--nutui-button-xlarge-height, 48px);
   padding: var(--nutui-button-xlarge-padding, 0px 24px);
   font-size: var(--nutui-button-xlarge-font-size, var(--nutui-font-size-xl, 18px));
-  border-radius: var(--nutui-radius-base, 8px);
+  border-radius: var(--nutui-button-xlarge-border-radius, var(--nutui-radius-base, 8px));
 }
 .nut-button-xlarge .nut-button-text {
   margin-left: var(--nutui-button-xlarge-text-icon-margin, 6px);
@@ -151,7 +139,7 @@
   height: var(--nutui-button-large-height, 40px);
   padding: var(--nutui-button-large-padding, 0px 16px);
   font-size: var(--nutui-button-large-font-size, var(--nutui-font-size-l, 16px));
-  border-radius: var(--nutui-radius-s, 6px);
+  border-radius: var(--nutui-button-large-border-radius, var(--nutui-radius-base, 8px));
 }
 .nut-button-large .nut-button-text {
   margin-left: var(--nutui-button-xlarge-text-icon-margin, 6px);
@@ -171,7 +159,7 @@
   height: var(--nutui-button-small-height, 28px);
   padding: var(--nutui-button-small-padding, 0px 8px);
   font-size: var(--nutui-button-small-font-size, var(--nutui-font-size-s, 12px));
-  border-radius: var(--nutui-radius-xs, 4px);
+  border-radius: var(--nutui-button-small-border-radius, var(--nutui-radius-s, 6px));
 }
 .nut-button-small .nut-icon {
   font-size: var(--nutui-button-small-font-size, var(--nutui-font-size-s, 12px));
@@ -185,7 +173,7 @@
   height: var(--nutui-button-mini-height, 24px);
   padding: var(--nutui-button-mini-padding, 0px 8px);
   font-size: var(--nutui-button-mini-font-size, var(--nutui-font-size-xs, 11px));
-  border-radius: var(--nutui-radius-xs, 4px);
+  border-radius: var(--nutui-button-mini-border-radius, var(--nutui-radius-xs, 4px));
 }
 .nut-button-mini .nut-icon {
   font-size: var(--nutui-button-mini-font-size, var(--nutui-font-size-xs, 11px));
@@ -562,6 +550,7 @@
 }
 .nut-dialog-footer-cancel.nut-dialog-footer-cancel {
   margin-right: var(--nutui-dialog-footer-cancel-margin-right, 12px);
+  background: var(--nutui-dialog-footer-cancel-bg, var(--nutui-button-default-background-color, transparent));
 }
 .nut-dialog-footer-ok {
   max-width: var(--nutui-dialog-footer-ok-max-width, 128px);

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

@@ -118,6 +118,7 @@
 }
 .nut-dialog-footer-cancel.nut-dialog-footer-cancel {
   margin-right: 12px;
+  background: transparent;
 }
 .nut-dialog-footer-ok {
   max-width: 128px;

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

@@ -94,18 +94,6 @@
 .nut-button-round {
   border-radius: var(--nutui-button-border-radius, var(--nutui-radius-s, 6px));
 }
-.nut-button-round-xlarge {
-  border-radius: var(--nutui-button-xlarge-border-radius, var(--nutui-radius-base, 8px));
-}
-.nut-button-round-large {
-  border-radius: var(--nutui-button-large-border-radius, var(--nutui-radius-base, 8px));
-}
-.nut-button-round-small {
-  border-radius: var(--nutui-button-small-border-radius, var(--nutui-radius-s, 6px));
-}
-.nut-button-round-mini {
-  border-radius: var(--nutui-button-mini-border-radius, var(--nutui-radius-xs, 4px));
-}
 .nut-button-default {
   padding: var(--nutui-button-default-padding, 0px 12px);
   border-style: solid;
@@ -131,7 +119,7 @@
   height: var(--nutui-button-xlarge-height, 48px);
   padding: var(--nutui-button-xlarge-padding, 0px 24px);
   font-size: var(--nutui-button-xlarge-font-size, var(--nutui-font-size-xl, 18px));
-  border-radius: var(--nutui-radius-base, 8px);
+  border-radius: var(--nutui-button-xlarge-border-radius, var(--nutui-radius-base, 8px));
 }
 .nut-button-xlarge .nut-button-text {
   margin-left: var(--nutui-button-xlarge-text-icon-margin, 6px);
@@ -151,7 +139,7 @@
   height: var(--nutui-button-large-height, 40px);
   padding: var(--nutui-button-large-padding, 0px 16px);
   font-size: var(--nutui-button-large-font-size, var(--nutui-font-size-l, 16px));
-  border-radius: var(--nutui-radius-s, 6px);
+  border-radius: var(--nutui-button-large-border-radius, var(--nutui-radius-base, 8px));
 }
 .nut-button-large .nut-button-text {
   margin-left: var(--nutui-button-xlarge-text-icon-margin, 6px);
@@ -171,7 +159,7 @@
   height: var(--nutui-button-small-height, 28px);
   padding: var(--nutui-button-small-padding, 0px 8px);
   font-size: var(--nutui-button-small-font-size, var(--nutui-font-size-s, 12px));
-  border-radius: var(--nutui-radius-xs, 4px);
+  border-radius: var(--nutui-button-small-border-radius, var(--nutui-radius-s, 6px));
 }
 .nut-button-small .nut-icon {
   font-size: var(--nutui-button-small-font-size, var(--nutui-font-size-s, 12px));
@@ -185,7 +173,7 @@
   height: var(--nutui-button-mini-height, 24px);
   padding: var(--nutui-button-mini-padding, 0px 8px);
   font-size: var(--nutui-button-mini-font-size, var(--nutui-font-size-xs, 11px));
-  border-radius: var(--nutui-radius-xs, 4px);
+  border-radius: var(--nutui-button-mini-border-radius, var(--nutui-radius-xs, 4px));
 }
 .nut-button-mini .nut-icon {
   font-size: var(--nutui-button-mini-font-size, var(--nutui-font-size-xs, 11px));

package/dist/es/packages/image/image.js

@@ -1,3 +1,4 @@
+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";
@@ -45,15 +46,14 @@ export var Image = function(props) {
             onError && onError(e);
         }
     };
-    var containerStyle = {
-        // eslint-disable-next-line no-nested-ternary
-        height: height ? pxCheck(height) : Taro.getEnv() === 'WEB' ? '' : '100%',
-        // eslint-disable-next-line no-nested-ternary
-        width: width ? pxCheck(width) : Taro.getEnv() === 'WEB' ? '' : '100%',
-        overflow: radius !== undefined && radius !== null ? 'hidden' : '',
-        borderRadius: // eslint-disable-next-line no-nested-ternary
-        radius !== undefined && radius != null ? pxCheck(radius) : ''
-    };
+    var containerStyle = _object_spread({}, height ? {
+        height: pxCheck(height)
+    } : {}, width ? {
+        width: pxCheck(width)
+    } : {}, radius !== undefined && radius !== null ? {
+        overflow: 'hidden',
+        borderRadius: pxCheck(radius)
+    } : {});
     var imgStyle = _object_spread_props(_object_spread({}, style), {
         width: width,
         height: height
@@ -94,7 +94,7 @@ export var Image = function(props) {
         innerLoading
     ]);
     return /*#__PURE__*/ React.createElement(View, {
-        className: classNames(classPrefix, className),
+        className: classNames(classPrefix, _define_property({}, "".concat(classPrefix, "-basic"), Taro.getEnv() !== 'WEB'), className),
         style: containerStyle
     }, /*#__PURE__*/ React.createElement(TImage, _object_spread_props(_object_spread({}, rest), {
         className: "".concat(classPrefix, "-default ").concat(className ? "".concat(className, "-image") : ''),

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

@@ -12,7 +12,10 @@
     border-radius: 50%;
     overflow: hidden;
   }
-
+  &-basic {
+    width: 100%;
+    height: 100%;
+  }
   &-loading {
     width: 100%;
     height: 100%;

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

@@ -15,6 +15,10 @@
   border-radius: 50%;
   overflow: hidden;
 }
+.nut-image-basic {
+  width: 100%;
+  height: 100%;
+}
 .nut-image-loading {
   width: 100%;
   height: 100%;

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

@@ -15,6 +15,10 @@
   border-radius: 50%;
   overflow: hidden;
 }
+.nut-image-basic {
+  width: 100%;
+  height: 100%;
+}
 .nut-image-loading {
   width: 100%;
   height: 100%;

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

@@ -60,7 +60,7 @@
 
 .nut-popup {
   position: fixed;
-  min-height: 46%;
+  min-height: 26%;
   max-height: 100%;
   background-color: var(--nutui-overlay-content-bg-color, var(--nutui-color-background-overlay, #ffffff));
   -webkit-overflow-scrolling: touch;
@@ -198,12 +198,12 @@
     transform: scale(0.8);
   }
 }
-.nut-popup-slide-default-enter-active {
+.nut-popup-slide-none-enter-active {
   animation-fill-mode: both;
   animation-name: popup-scale-fade-in;
   animation-duration: var(--nutui-popup-animation-duration, 0.3s);
 }
-.nut-popup-slide-default-exit-active {
+.nut-popup-slide-none-exit-active {
   animation-fill-mode: both;
   animation-name: popup-scale-fade-out;
   animation-duration: var(--nutui-popup-animation-duration, 0.3s);
@@ -330,7 +330,7 @@
   animation-name: popup-slide-left-exit;
   animation-duration: var(--nutui-popup-animation-duration, 0.3s);
 }
-.nut-popup-slide-default-exit-done.nut-popup, .nut-popup-slide-center-exit-done.nut-popup, .nut-popup-slide-left-exit-done.nut-popup, .nut-popup-slide-right-exit-done.nut-popup, .nut-popup-slide-top-exit-done.nut-popup, .nut-popup-slide-bottom-exit-done.nut-popup {
+.nut-popup-slide-none-exit-done.nut-popup, .nut-popup-slide-center-exit-done.nut-popup, .nut-popup-slide-left-exit-done.nut-popup, .nut-popup-slide-right-exit-done.nut-popup, .nut-popup-slide-top-exit-done.nut-popup, .nut-popup-slide-bottom-exit-done.nut-popup {
   display: none;
 }
 .nut-popup .nut-overflow-hidden {
@@ -608,6 +608,10 @@
   border-radius: 50%;
   overflow: hidden;
 }
+.nut-image-basic {
+  width: 100%;
+  height: 100%;
+}
 .nut-image-loading {
   width: 100%;
   height: 100%;

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

@@ -60,7 +60,7 @@
 
 .nut-popup {
   position: fixed;
-  min-height: 46%;
+  min-height: 26%;
   max-height: 100%;
   background-color: var(--nutui-overlay-content-bg-color, var(--nutui-color-background-overlay, #ffffff));
   -webkit-overflow-scrolling: touch;
@@ -198,12 +198,12 @@
     transform: scale(0.8);
   }
 }
-.nut-popup-slide-default-enter-active {
+.nut-popup-slide-none-enter-active {
   animation-fill-mode: both;
   animation-name: popup-scale-fade-in;
   animation-duration: var(--nutui-popup-animation-duration, 0.3s);
 }
-.nut-popup-slide-default-exit-active {
+.nut-popup-slide-none-exit-active {
   animation-fill-mode: both;
   animation-name: popup-scale-fade-out;
   animation-duration: var(--nutui-popup-animation-duration, 0.3s);
@@ -330,7 +330,7 @@
   animation-name: popup-slide-left-exit;
   animation-duration: var(--nutui-popup-animation-duration, 0.3s);
 }
-.nut-popup-slide-default-exit-done.nut-popup, .nut-popup-slide-center-exit-done.nut-popup, .nut-popup-slide-left-exit-done.nut-popup, .nut-popup-slide-right-exit-done.nut-popup, .nut-popup-slide-top-exit-done.nut-popup, .nut-popup-slide-bottom-exit-done.nut-popup {
+.nut-popup-slide-none-exit-done.nut-popup, .nut-popup-slide-center-exit-done.nut-popup, .nut-popup-slide-left-exit-done.nut-popup, .nut-popup-slide-right-exit-done.nut-popup, .nut-popup-slide-top-exit-done.nut-popup, .nut-popup-slide-bottom-exit-done.nut-popup {
   display: none;
 }
 .nut-popup .nut-overflow-hidden {

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

@@ -60,7 +60,7 @@
 
 .nut-popup {
   position: fixed;
-  min-height: 46%;
+  min-height: 26%;
   max-height: 100%;
   background-color: var(--nutui-overlay-content-bg-color, var(--nutui-color-background-overlay, #ffffff));
   -webkit-overflow-scrolling: touch;
@@ -198,12 +198,12 @@
     transform: scale(0.8);
   }
 }
-.nut-popup-slide-default-enter-active {
+.nut-popup-slide-none-enter-active {
   animation-fill-mode: both;
   animation-name: popup-scale-fade-in;
   animation-duration: var(--nutui-popup-animation-duration, 0.3s);
 }
-.nut-popup-slide-default-exit-active {
+.nut-popup-slide-none-exit-active {
   animation-fill-mode: both;
   animation-name: popup-scale-fade-out;
   animation-duration: var(--nutui-popup-animation-duration, 0.3s);
@@ -330,7 +330,7 @@
   animation-name: popup-slide-left-exit;
   animation-duration: var(--nutui-popup-animation-duration, 0.3s);
 }
-.nut-popup-slide-default-exit-done.nut-popup, .nut-popup-slide-center-exit-done.nut-popup, .nut-popup-slide-left-exit-done.nut-popup, .nut-popup-slide-right-exit-done.nut-popup, .nut-popup-slide-top-exit-done.nut-popup, .nut-popup-slide-bottom-exit-done.nut-popup {
+.nut-popup-slide-none-exit-done.nut-popup, .nut-popup-slide-center-exit-done.nut-popup, .nut-popup-slide-left-exit-done.nut-popup, .nut-popup-slide-right-exit-done.nut-popup, .nut-popup-slide-top-exit-done.nut-popup, .nut-popup-slide-bottom-exit-done.nut-popup {
   display: none;
 }
 .nut-popup .nut-overflow-hidden {

package/dist/es/packages/popover/popover.d.ts

@@ -1,10 +1,3 @@
 import React, { FunctionComponent } from 'react';
 import { TaroPopoverProps } from "../../types";
-export interface RootPosition {
-    width: number;
-    height: number;
-    left: number;
-    top: number;
-    right: number;
-}
 export declare const Popover: FunctionComponent<Partial<TaroPopoverProps> & Omit<React.HTMLAttributes<HTMLDivElement>, 'onSelect'>>;