@nutui/nutui-react 3.0.0-beta.1 → 3.0.0-beta.10

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

@@ -1,4 +1,8 @@
 @charset "UTF-8";
+/* #ifdef harmony */
+/* #endif */
+/* #ifndef harmony */
+/* #endif */
 .nut-overlay {
   /* #ifdef rn */
   position: absolute;
@@ -12,16 +16,10 @@
   right: 0;
   width: 100%;
   height: 100%;
-  background-color: var(--nutui-overlay-bg-color, var(--nutui-color-mask, rgba(0, 0, 0, 0.7)));
+  background-color: var(--nutui-overlay-bg-color, var(--nutui-black-10));
   z-index: var(--nutui-overlay-zIndex, 1000);
 }
 
-[dir=rtl] .nut-overlay,
-.nut-rtl .nut-overlay {
-  left: auto;
-  right: 0;
-}
-
 .nut-overflow-hidden {
   overflow: hidden !important;
 }
@@ -59,18 +57,17 @@
   animation-duration: var(--nutui-overlay-animation-duration, 0.3s);
 }
 
+[dir=rtl] .nut-overlay,
+.nut-rtl .nut-overlay {
+  left: auto;
+  right: 0;
+}
+
 .nut-popup {
-  /* #ifdef rn */
-  position: absolute;
-  /* #endif */
-  /* #ifndef rn */
   position: fixed;
-  /* #endif */
-  min-height: 26%;
+  min-height: 46%;
   max-height: 100%;
-  overflow-y: auto;
-  background-color: var(--nutui-overlay-content-bg-color, var(--nutui-color-background-overlay, #ffffff));
-  color: var(--nutui-color-title, #1a1a1a);
+  background-color: var(--nutui-overlay-content-bg-color, var(--nutui-gray-1));
   -webkit-overflow-scrolling: touch;
   font-size: var(--nutui-font-size-base, 14px);
 }
@@ -83,35 +80,40 @@
   padding: var(--nutui-popup-title-padding, 16px);
   position: relative;
 }
-.nut-popup-title-left {
-  position: absolute;
-  left: var(--nutui-popup-title-padding, 16px);
-}
-.nut-popup-title-title {
+.nut-popup-title-wrapper {
   display: flex;
   flex-direction: column;
   justify-content: center;
   align-items: center;
+}
+.nut-popup-title-title {
+  color: var(--nutui-gray-7);
   font-weight: var(--nutui-font-weight-bold, 600);
-  font-size: var(--nutui-popup-title-font-size, var(--nutui-font-size-xl, 18px));
+  font-size: var(--nutui-popup-title-font-size, var(--nutui-font-size-l, 16px));
+  line-height: var(--nutui-popup-title-font-size, var(--nutui-font-size-l, 16px));
 }
 .nut-popup-title-description {
-  color: var(--nutui-color-text-help, #888b94);
-  font-size: var(--nutui-popup-description-font-size, var(--nutui-font-size-xs, 11px));
+  color: var(--nutui-gray-6);
+  font-size: var(--nutui-popup-description-font-size, var(--nutui-font-size-base, 14px));
   font-weight: var(--nutui-font-weight, 400);
 }
+.nut-popup-title-description-gap {
+  margin-top: var(--nutui-popup-description-spacing, var(--nutui-spacing-base, 8px));
+}
+.nut-popup-title-left {
+  position: absolute;
+  top: var(--nutui-popup-title-padding, 16px);
+  left: var(--nutui-popup-title-padding, 16px);
+}
 .nut-popup-title-right {
   position: absolute;
-  z-index: 1;
-  cursor: pointer;
-  width: var(--nutui-popup-icon-size, var(--nutui-font-size-xl, 18px));
-  height: var(--nutui-popup-icon-size, var(--nutui-font-size-xl, 18px));
-  display: flex;
-  justify-content: center;
-  align-items: center;
   top: var(--nutui-popup-title-padding, 16px);
   right: var(--nutui-popup-title-padding, 16px);
-  color: var(--nutui-color-text-help, #888b94);
+  z-index: 1;
+  width: var(--nutui-popup-icon-size, 20px);
+  height: var(--nutui-popup-icon-size, 20px);
+  color: var(--nutui-gray-7);
+  cursor: pointer;
 }
 .nut-popup-title-right:active {
   opacity: 0.7;
@@ -132,59 +134,48 @@
   top: 50%;
   left: 50%;
   min-height: 10%;
-  /* #ifndef rn */
+  max-width: 295px;
   transform: translate(-50%, -50%);
-  /* #endif */
 }
 .nut-popup-center.nut-popup-round {
-  border-radius: var(--nutui-popup-border-radius, 24px);
+  border-radius: var(--nutui-popup-border-radius, var(--nutui-radius-xl, 12px));
 }
 .nut-popup-bottom, .nut-popup-top {
-  max-height: 83%;
+  max-height: 87%;
 }
 .nut-popup-bottom {
   bottom: 0;
   left: 0;
   width: 100%;
-  /* #ifdef rn */
-  height: 300px;
-  /* #endif */
 }
 .nut-popup-bottom.nut-popup-round {
-  border-radius: var(--nutui-popup-border-radius, 24px) var(--nutui-popup-border-radius, 24px) 0 0;
+  border-radius: var(--nutui-popup-border-radius, var(--nutui-radius-xl, 12px)) var(--nutui-popup-border-radius, var(--nutui-radius-xl, 12px)) 0 0;
 }
 .nut-popup-right {
   top: 0;
   right: 0;
-  /* #ifdef rn */
   width: 100px;
   height: 100%;
-  /* #endif */
 }
 .nut-popup-right.nut-popup-round {
-  border-radius: var(--nutui-popup-border-radius, 24px) 0 0 var(--nutui-popup-border-radius, 24px);
+  border-radius: var(--nutui-popup-border-radius, var(--nutui-radius-xl, 12px)) 0 0 var(--nutui-popup-border-radius, var(--nutui-radius-xl, 12px));
 }
 .nut-popup-left {
   top: 0;
   left: 0;
-  /* #ifdef rn */
   width: 100px;
   height: 100%;
-  /* #endif */
 }
 .nut-popup-left.nut-popup-round {
-  border-radius: 0 var(--nutui-popup-border-radius, 24px) var(--nutui-popup-border-radius, 24px) 0;
+  border-radius: 0 var(--nutui-popup-border-radius, var(--nutui-radius-xl, 12px)) var(--nutui-popup-border-radius, var(--nutui-radius-xl, 12px)) 0;
 }
 .nut-popup-top {
   top: 0;
   left: 0;
   width: 100%;
-  /* #ifdef rn */
-  height: 100px;
-  /* #endif */
 }
 .nut-popup-top.nut-popup-round {
-  border-radius: 0 0 var(--nutui-popup-border-radius, 24px) var(--nutui-popup-border-radius, 24px);
+  border-radius: 0 0 var(--nutui-popup-border-radius, var(--nutui-radius-xl, 12px)) var(--nutui-popup-border-radius, var(--nutui-radius-xl, 12px));
 }
 .nut-popup-slide {
   /* 从顶部滑出 */
@@ -250,22 +241,16 @@
 }
 @keyframes popup-slide-top-enter {
   from {
-    /* #ifndef rn */
     transform: translate3d(0, -100%, 0);
-    /* #endif */
   }
 }
 @keyframes popup-slide-top-exit {
   to {
-    /* #ifndef rn */
     transform: translate3d(0, -100%, 0);
-    /* #endif */
   }
 }
 .nut-popup-slide-top-enter-active, .nut-popup-slide-top-appear-active {
-  /* #ifndef rn */
   transform: translate3d(0, 0%, 0);
-  /* #endif*/
   animation-fill-mode: both;
   animation-name: popup-slide-top-enter;
   animation-duration: var(--nutui-popup-animation-duration, 0.3s);
@@ -277,22 +262,16 @@
 }
 @keyframes popup-slide-right-enter {
   from {
-    /* #ifndef rn */
     transform: translate3d(100%, 0, 0);
-    /* #endif*/
   }
 }
 @keyframes popup-slide-right-exit {
   to {
-    /* #ifndef rn */
     transform: translate3d(100%, 0, 0);
-    /* #endif*/
   }
 }
 .nut-popup-slide-right-enter-active, .nut-popup-slide-right-appear-active {
-  /* #ifndef rn */
   transform: translate3d(0, 0, 0);
-  /* #endif*/
   animation-fill-mode: both;
   animation-name: popup-slide-right-enter;
   animation-duration: var(--nutui-popup-animation-duration, 0.3s);
@@ -304,22 +283,16 @@
 }
 @keyframes popup-slide-bottom-enter {
   from {
-    /* #ifndef rn */
     transform: translate3d(0, 100%, 0);
-    /* #endif */
   }
 }
 @keyframes slide-bottom-exit {
   to {
-    /* #ifndef rn */
     transform: translate3d(0, 100%, 0);
-    /* #endif */
   }
 }
 .nut-popup-slide-bottom-enter-active, .nut-popup-slide-bottom-appear-active {
-  /* #ifndef rn */
   transform: translate(0, 0);
-  /* #endif */
   animation-fill-mode: both;
   animation-name: popup-slide-bottom-enter;
   animation-duration: var(--nutui-popup-animation-duration, 0.3s);
@@ -331,16 +304,12 @@
 }
 @keyframes popup-slide-left-enter {
   from {
-    /* #ifndef rn */
     transform: translate3d(-100%, 0, 0);
-    /* #endif */
   }
 }
 @keyframes popup-slide-left-exit {
   to {
-    /* #ifndef rn */
     transform: translate3d(-100%, 0, 0);
-    /* #endif */
   }
 }
 .nut-popup-slide-left-enter-active, .nut-popup-slide-left-appear-active {
@@ -394,9 +363,7 @@
 .nut-rtl .nut-popup-center {
   left: auto;
   right: 50%;
-  /* #ifndef rn */
   transform: translate(50%, -50%);
-  /* #endif*/
 }
 [dir=rtl] .nut-popup-bottom,
 .nut-rtl .nut-popup-bottom {
@@ -410,23 +377,23 @@
 }
 
 .nut-picker {
-  background-color: var(--nutui-color-background-overlay, #ffffff);
+  background-color: var(--nutui-gray-1);
   width: 100%;
 }
 .nut-picker-control {
   display: flex;
   height: var(--nutui-popup-title-height, 50px);
-  font-size: var(--nutui-popup-title-font-size, var(--nutui-font-size-xl, 18px));
+  font-size: var(--nutui-popup-title-font-size, var(--nutui-font-size-l, 16px));
   align-items: center;
   justify-content: space-between;
   padding: var(--nutui-popup-title-padding, 16px);
 }
 .nut-picker-cancel-btn {
-  color: var(--nutui-picker-title-cancel-color, var(--nutui-color-text, #505259));
+  color: var(--nutui-picker-title-cancel-color, var(--nutui-gray-6));
   font-size: var(--nutui-picker-title-cancel-font-size, var(--nutui-font-size-base, 14px));
 }
 .nut-picker-confirm-btn {
-  color: var(--nutui-picker-title-ok-color, var(--nutui-color-primary, #ff0f23));
+  color: var(--nutui-picker-title-ok-color, var(--nutui-brand-6));
   font-size: var(--nutui-picker-title-ok-font-size, var(--nutui-font-size-base, 14px));
 }
 .nut-picker-title {
@@ -435,8 +402,8 @@
   text-overflow: ellipsis;
   white-space: nowrap;
   text-align: center;
-  color: var(--nutui-color-title, #1a1a1a);
-  font-size: var(--nutui-popup-title-font-size, var(--nutui-font-size-xl, 18px));
+  color: var(--nutui-gray-7);
+  font-size: var(--nutui-popup-title-font-size, var(--nutui-font-size-l, 16px));
   font-weight: var(--nutui-popup-title-font-weight, var(--nutui-font-weight-bold, 600));
 }
 .nut-picker-panel {
@@ -448,10 +415,10 @@
   top: 108px;
   height: var(--nutui-picker-item-height, 36px);
   width: 100%;
-  border: var(--nutui-picker-item-active-line-border, 1px solid var(--nutui-color-border, rgba(0, 0, 0, 0.06)));
+  border: var(--nutui-picker-item-active-line-border, 1px solid var(--nutui-black-3));
   border-left: 0;
   border-right: 0;
-  color: var(--nutui-picker-item-text-color, var(--nutui-color-title, #1a1a1a));
+  color: var(--nutui-picker-item-text-color, var(--nutui-gray-7));
   font-size: var(--nutui-picker-item-text-font-size, var(--nutui-font-size-base, 14px));
   z-index: 3;
 }
@@ -460,7 +427,7 @@
   border: 0;
 }
 .nut-picker-indicator-taro::before, .nut-picker-indicator-taro::after {
-  border: var(--nutui-picker-item-active-line-border, 1px solid var(--nutui-color-border, rgba(0, 0, 0, 0.06)));
+  border: var(--nutui-picker-item-active-line-border, 1px solid var(--nutui-black-3));
   border-left: 0;
   border-right: 0;
 }
@@ -508,7 +475,7 @@
   text-overflow: ellipsis;
   height: var(--nutui-picker-item-height, 36px);
   line-height: var(--nutui-picker-item-height, 36px);
-  color: var(--nutui-picker-item-text-color, var(--nutui-color-title, #1a1a1a));
+  color: var(--nutui-picker-item-text-color, var(--nutui-gray-7));
   font-size: var(--nutui-picker-item-text-font-size, var(--nutui-font-size-base, 14px));
   text-align: center;
 }
@@ -534,7 +501,7 @@
   height: var(--nutui-picker-item-height, 36px);
   line-height: var(--nutui-picker-item-height, 36px);
   text-align: center;
-  color: var(--nutui-color-title, #1a1a1a);
+  color: var(--nutui-gray-7);
   font-size: var(--nutui-font-size-base, 14px);
 }
 .nut-picker-roller-item-hidden {

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

@@ -7,7 +7,7 @@ import { _ as _sliced_to_array } from "@swc/helpers/_/_sliced_to_array";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import React, { forwardRef, useState } from "react";
 import classNames from "classnames";
-import { Close } from "@nutui/icons-react";
+import { Failure, Close } from "@nutui/icons-react";
 import Button from "../button";
 import confirm from "./confirm";
 import { DialogWrap } from "./dialogwrap";
@@ -35,7 +35,7 @@ var defaultProps = _object_spread_props(_object_spread({}, ComponentDefaults), {
 });
 var BaseDialog = function(props, ref) {
     var locale = useConfig().locale;
-    var _mergeProps = mergeProps(defaultProps, props), visible = _mergeProps.visible, footer = _mergeProps.footer, hideConfirmButton = _mergeProps.hideConfirmButton, hideCancelButton = _mergeProps.hideCancelButton, lockScroll = _mergeProps.lockScroll, disableConfirmButton = _mergeProps.disableConfirmButton, closeOnOverlayClick = _mergeProps.closeOnOverlayClick, confirmText = _mergeProps.confirmText, cancelText = _mergeProps.cancelText, closeIconPosition = _mergeProps.closeIconPosition, closeIcon = _mergeProps.closeIcon, onClose = _mergeProps.onClose, onCancel = _mergeProps.onCancel, onConfirm = _mergeProps.onConfirm, beforeCancel = _mergeProps.beforeCancel, beforeClose = _mergeProps.beforeClose, restProps = _object_without_properties(_mergeProps, [
+    var _mergeProps = mergeProps(defaultProps, props), visible = _mergeProps.visible, footer = _mergeProps.footer, hideConfirmButton = _mergeProps.hideConfirmButton, hideCancelButton = _mergeProps.hideCancelButton, lockScroll = _mergeProps.lockScroll, disableConfirmButton = _mergeProps.disableConfirmButton, closeOnOverlayClick = _mergeProps.closeOnOverlayClick, confirmText = _mergeProps.confirmText, cancelText = _mergeProps.cancelText, closeIconPosition = _mergeProps.closeIconPosition, closeIcon = _mergeProps.closeIcon, footerDirection = _mergeProps.footerDirection, onClose = _mergeProps.onClose, onCancel = _mergeProps.onCancel, onConfirm = _mergeProps.onConfirm, beforeCancel = _mergeProps.beforeCancel, beforeClose = _mergeProps.beforeClose, restProps = _object_without_properties(_mergeProps, [
         "visible",
         "footer",
         "hideConfirmButton",
@@ -47,6 +47,7 @@ var BaseDialog = function(props, ref) {
         "cancelText",
         "closeIconPosition",
         "closeIcon",
+        "footerDirection",
         "onClose",
         "onCancel",
         "onConfirm",
@@ -110,15 +111,23 @@ var BaseDialog = function(props, ref) {
                 return _ref.apply(this, arguments);
             };
         }();
-        return footer || /*#__PURE__*/ React.createElement(React.Fragment, null, !hideCancelButton && /*#__PURE__*/ React.createElement(Button, {
+        var btnClass = hideCancelButton || hideConfirmButton ? "".concat(classPrefix, "-footer-block") : '';
+        return footer || /*#__PURE__*/ React.createElement(React.Fragment, null, !hideCancelButton && (footerDirection === 'vertical' ? /*#__PURE__*/ React.createElement("div", {
+            className: "".concat(classPrefix, "-footer-cancel ").concat(btnClass),
+            onClick: function(e) {
+                return handleCancel(e);
+            }
+        }, cancelText || locale.cancel) : /*#__PURE__*/ React.createElement(Button, {
             type: "default",
-            className: "".concat(classPrefix, "-footer-cancel"),
+            size: "large",
+            className: "".concat(classPrefix, "-footer-cancel ").concat(btnClass),
             onClick: function(e) {
                 return handleCancel(e);
             }
-        }, cancelText || locale.cancel), !hideConfirmButton && /*#__PURE__*/ React.createElement(Button, {
+        }, cancelText || locale.cancel)), !hideConfirmButton && /*#__PURE__*/ React.createElement(Button, {
             type: "primary",
-            className: classNames("".concat(classPrefix, "-footer-ok"), {
+            size: "large",
+            className: classNames("".concat(classPrefix, "-footer-ok ").concat(btnClass), {
                 disabled: disableConfirmButton
             }),
             disabled: disableConfirmButton,
@@ -138,10 +147,11 @@ var BaseDialog = function(props, ref) {
         };
         var _obj;
         var closeClasses = classNames((_obj = {}, _define_property(_obj, "".concat(classPrefix, "-close"), true), _define_property(_obj, "".concat(classPrefix, "-close-").concat(closeIconPosition), true), _obj));
+        var systomIcon = closeIconPosition !== 'bottom' ? /*#__PURE__*/ React.createElement(Close, null) : /*#__PURE__*/ React.createElement(Failure, null);
         return /*#__PURE__*/ React.createElement("div", {
             className: closeClasses,
             onClick: handleCancel
-        }, /*#__PURE__*/ React.isValidElement(closeIcon) ? closeIcon : /*#__PURE__*/ React.createElement(Close, null));
+        }, /*#__PURE__*/ React.isValidElement(closeIcon) ? closeIcon : systomIcon);
     };
     return /*#__PURE__*/ React.createElement("div", {
         style: {

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

@@ -5,6 +5,7 @@
   flex-direction: column;
   align-items: center;
   width: $dialog-width;
+  min-width: $dialog-min-width;
   max-height: 67%;
   min-height: $dialog-min-height;
   padding: $dialog-padding;
@@ -40,27 +41,36 @@
     display: flex;
     justify-content: center;
     align-items: center;
-    top: $dialog-close-top;
     color: $dialog-close-color;
     .nut-icon {
-      font-size: 24px;
-      height: 24px;
-      width: 24px;
+      font-size: $dialog-close-width;
+      width: $dialog-close-width;
+      height: $dialog-close-height;
     }
 
     &-top-right {
+      top: $dialog-close-top;
       right: $dialog-close-right;
     }
 
     &-top-left {
+      top: $dialog-close-top;
       left: $dialog-close-left;
     }
 
     &-bottom {
-      top: initial;
-      bottom: -56px;
+      bottom: -64px;
+      width: $dialog-bottom-close-icon-size;
+      height: $dialog-bottom-close-icon-size;
       left: 50%;
-      transform: translate(-50%);
+      transform: translateX(-50%);
+      .nut-icon {
+        color: $color-text-disabled;
+        background-color: $color-mask-part;
+        border-radius: 50%;
+        width: $dialog-bottom-close-icon-size;
+        height: $dialog-bottom-close-icon-size;
+      }
     }
 
     &:active {
@@ -83,7 +93,7 @@
     max-height: $dialog-content-max-height;
     line-height: $dialog-content-line-height;
     font-size: $font-size-base;
-    color: $color-text;
+    color: $color-title;
     word-wrap: break-word;
     word-break: break-all;
     white-space: pre-wrap;
@@ -102,20 +112,20 @@
 
       .nut-button {
         min-width: 100%;
-        margin: 0;
+      }
+
+      .nut-dialog-footer-ok {
+        order: 1;
+      }
 
-        &.nut-dialog-footer-ok {
-          order: 1;
-        }
-
-        &.nut-dialog-footer-cancel {
-          border: 0;
-          color: $color-text;
-          order: 2;
-          display: flex;
-          align-items: flex-end;
-          margin-top: $dialog-vertical-footer-ok-margin-top;
-        }
+      .nut-dialog-footer-cancel {
+        margin: 0;
+        color: $color-text;
+        font-size: $font-size-base;
+        order: 2;
+        display: flex;
+        justify-content: center;
+        margin-top: $dialog-vertical-footer-ok-margin-top;
       }
     }
 
@@ -129,6 +139,12 @@
 
     &-ok {
       max-width: $dialog-footer-ok-max-width;
+      font-weight: $font-weight-bold;
+    }
+    &-block {
+      &.nut-button {
+        min-width: 100%;
+      }
     }
   }
 }