@nutui/nutui-react-taro 3.0.0-beta.0 → 3.0.0-beta.10

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

@@ -9,9 +9,8 @@
   &-listitem {
     height: $countup-height;
     overflow: hidden;
-    color: $color-title;
-    font-size: $countup-base-size;
-    font-weight: $font-weight-bold;
+    user-select: none;
+    -webkit-tap-highlight-color: transparent;
 
     &-number {
       margin: 0 $countup-lr-margin;
@@ -25,7 +24,9 @@
     display: flex;
     height: 80%;
     align-items: flex-end;
-    color: $countup-bg-color;
+    color: $countup-separator-color;
+    font-size: $countup-base-size;
+    font-weight: $font-weight-bold;
   }
 
   &-number {
@@ -33,10 +34,15 @@
     flex-direction: column;
     align-items: center;
     width: $countup-width;
+    transition: transform 1s ease-in-out;
+    transform: translate(0, 0);
 
-    span {
+    &-text {
       height: $countup-height;
       line-height: $countup-height;
+      color: $countup-color;
+      font-size: $countup-base-size;
+      font-weight: $font-weight-bold;
     }
   }
 }

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

@@ -1,3 +1,7 @@
+/* #ifdef harmony */
+/* #endif */
+/* #ifndef harmony */
+/* #endif */
 .nut-countup-list {
   display: inline-flex;
   height: var(--nutui-countup-height, 32px);
@@ -7,29 +11,35 @@
 .nut-countup-listitem {
   height: var(--nutui-countup-height, 32px);
   overflow: hidden;
-  color: var(--nutui-gray-7, #1a1a1a);
-  font-size: var(--nutui-countup-base-size, 18px);
-  font-weight: var(--nutui-font-weight-bold, 500);
+  user-select: none;
+  -webkit-tap-highlight-color: transparent;
 }
 .nut-countup-listitem-number {
   margin: 0 var(--nutui-countup-lr-margin, 0);
   border-radius: var(--nutui-countup-border-radius, 4px);
-  color: var(--nutui-countup-color, var(--nutui-gray-7, #1a1a1a));
+  color: var(--nutui-countup-color, var(--nutui-gray-7));
   background-color: var(--nutui-countup-bg-color, inherit);
 }
 .nut-countup-separator {
   display: flex;
   height: 80%;
   align-items: flex-end;
-  color: var(--nutui-countup-bg-color, inherit);
+  color: var(--nutui-countup-separator-color, var(--nutui-gray-7));
+  font-size: var(--nutui-countup-base-size, 18px);
+  font-weight: var(--nutui-font-weight-bold, 600);
 }
 .nut-countup-number {
   display: flex;
   flex-direction: column;
   align-items: center;
   width: var(--nutui-countup-width, auto);
+  transition: transform 1s ease-in-out;
+  transform: translate(0, 0);
 }
-.nut-countup-number span {
+.nut-countup-number-text {
   height: var(--nutui-countup-height, 32px);
   line-height: var(--nutui-countup-height, 32px);
+  color: var(--nutui-countup-color, var(--nutui-gray-7));
+  font-size: var(--nutui-countup-base-size, 18px);
+  font-weight: var(--nutui-font-weight-bold, 600);
 }

package/dist/cjs/packages/datepicker/datepicker.js

@@ -186,7 +186,7 @@ var DatePicker = function DatePicker(props) {
             if (!isEqual) {
                 setSelectedDate(formatValue(newDate));
             }
-            props.onChange && props.onChange(selectedOptions, [
+            onChange === null || onChange === void 0 ? void 0 : onChange(selectedOptions, [
                 String(newDate.getFullYear()),
                 String(newDate.getMonth() + 1),
                 String(newDate.getDate())
@@ -267,8 +267,8 @@ var DatePicker = function DatePicker(props) {
         }
         pickerValue[columnIndex] = (_arr_index = arr[index]) === null || _arr_index === void 0 ? void 0 : _arr_index.value;
         setPickerValue((0, _to_consumable_array._)(pickerValue));
-        if (props.filter && props.filter(type, arr)) {
-            return props.filter(type, arr);
+        if (filter === null || filter === void 0 ? void 0 : filter(type, arr)) {
+            return filter === null || filter === void 0 ? void 0 : filter(type, arr);
         }
         return arr;
     };
@@ -312,7 +312,7 @@ var DatePicker = function DatePicker(props) {
         className: "nut-datepicker ".concat(className),
         style: style,
         catchMove: true
-    }, rest), pickerOptions.length && /*#__PURE__*/ _react.default.createElement(_index.default, (0, _object_spread_props._)((0, _object_spread._)({}, pickerProps), {
+    }, rest), pickerOptions.length > 0 && /*#__PURE__*/ _react.default.createElement(_index.default, (0, _object_spread_props._)((0, _object_spread._)({}, pickerProps), {
         title: title,
         visible: visible,
         options: pickerOptions,
@@ -328,5 +328,4 @@ var DatePicker = function DatePicker(props) {
         threeDimensional: threeDimensional
     })));
 };
-DatePicker.defaultProps = defaultProps;
 DatePicker.displayName = 'NutDatePicker';

package/dist/cjs/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,22 +16,13 @@
   right: 0;
   width: 100%;
   height: 100%;
-  background-color: var(--nutui-overlay-bg-color, var(--nutui-black-10, 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;
 }
-.nut-overflow-hidden .taro_page {
-  overflow: hidden !important;
-}
 
 @keyframes nut-fade-in {
   0% {
@@ -62,49 +57,63 @@
   animation-duration: var(--nutui-overlay-animation-duration, 0.3s);
 }
 
+[dir=rtl] .nut-overlay,
+.nut-rtl .nut-overlay {
+  left: auto;
+  right: 0;
+}
+
 .nut-popup {
   position: fixed;
-  min-height: 26%;
+  min-height: 46%;
   max-height: 100%;
-  overflow-y: auto;
-  background-color: var(--nutui-overlay-content-bg-color, var(--nutui-gray-1, #ffffff));
-  color: var(--nutui-gray-7, #1a1a1a);
+  background-color: var(--nutui-overlay-content-bg-color, var(--nutui-gray-1));
   -webkit-overflow-scrolling: touch;
-  font-size: var(--nutui-font-size-3, 14px);
+  font-size: var(--nutui-font-size-base, 14px);
 }
 .nut-popup-title {
   display: flex;
+  flex-direction: row;
   align-items: center;
   justify-content: center;
   border-bottom: var(--nutui-popup-title-border-bottom, 0);
   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-wrapper {
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
 }
 .nut-popup-title-title {
-  font-weight: var(--nutui-font-weight-bold, 500);
-  font-size: var(--nutui-popup-title-font-size, var(--nutui-font-size-6, 20px));
+  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-l, 16px));
+  line-height: var(--nutui-popup-title-font-size, var(--nutui-font-size-l, 16px));
 }
 .nut-popup-title-description {
-  color: var(--nutui-gray-5, #888b94);
-  font-size: var(--nutui-popup-description-font-size, var(--nutui-font-size-1, 10px));
+  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 !important;
-  z-index: 1;
-  cursor: pointer;
-  width: var(--nutui-popup-icon-size, var(--nutui-font-size-6, 20px));
-  height: var(--nutui-popup-icon-size, var(--nutui-font-size-6, 20px));
-  display: flex;
-  justify-content: center;
-  align-items: center;
+  position: absolute;
   top: var(--nutui-popup-title-padding, 16px);
   right: var(--nutui-popup-title-padding, 16px);
-  color: var(--nutui-gray-5, #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;
@@ -125,13 +134,14 @@
   top: 50%;
   left: 50%;
   min-height: 10%;
+  max-width: 295px;
   transform: translate(-50%, -50%);
 }
 .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;
@@ -139,21 +149,25 @@
   width: 100%;
 }
 .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;
+  width: 100px;
+  height: 100%;
 }
 .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;
+  width: 100px;
+  height: 100%;
 }
 .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;
@@ -161,7 +175,7 @@
   width: 100%;
 }
 .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 {
   /* 从顶部滑出 */
@@ -313,7 +327,7 @@
   display: none;
 }
 .nut-popup .nut-overflow-hidden {
-  overflow: hidden !important;
+  overflow: hidden;
 }
 
 [dir=rtl] .nut-popup-title-left,
@@ -363,24 +377,24 @@
 }
 
 .nut-picker {
-  background-color: var(--nutui-gray-1, #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-6, 20px));
+  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-gray-6, #505259));
-  font-size: var(--nutui-picker-title-cancel-font-size, var(--nutui-font-size-3, 14px));
+  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));
-  font-size: var(--nutui-picker-title-ok-font-size, var(--nutui-font-size-3, 14px));
+  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 {
   flex: 1;
@@ -388,9 +402,9 @@
   text-overflow: ellipsis;
   white-space: nowrap;
   text-align: center;
-  color: var(--nutui-gray-7, #1a1a1a);
-  font-size: var(--nutui-popup-title-font-size, var(--nutui-font-size-6, 20px));
-  font-weight: var(--nutui-popup-title-font-weight, var(--nutui-font-weight-bold, 500));
+  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 {
   display: flex;
@@ -401,11 +415,11 @@
   top: 108px;
   height: var(--nutui-picker-item-height, 36px);
   width: 100%;
-  border: var(--nutui-picker-item-active-line-border, 1px solid var(--nutui-black-3, 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-gray-7, #1a1a1a));
-  font-size: var(--nutui-picker-item-text-font-size, var(--nutui-font-size-3, 14px));
+  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;
 }
 .nut-picker-indicator-taro {
@@ -413,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-black-3, 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;
 }
@@ -461,8 +475,8 @@
   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-gray-7, #1a1a1a));
-  font-size: var(--nutui-picker-item-text-font-size, var(--nutui-font-size-3, 14px));
+  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;
 }
 .nut-picker-item {
@@ -487,8 +501,8 @@
   height: var(--nutui-picker-item-height, 36px);
   line-height: var(--nutui-picker-item-height, 36px);
   text-align: center;
-  color: var(--nutui-gray-7, #1a1a1a);
-  font-size: var(--nutui-font-size-3, 14px);
+  color: var(--nutui-gray-7);
+  font-size: var(--nutui-font-size-base, 14px);
 }
 .nut-picker-roller-item-hidden {
   visibility: hidden;

package/dist/cjs/packages/dialog/dialog.js

@@ -38,6 +38,7 @@ var _configprovider = require("../configprovider/configprovider");
 var _index1 = /*#__PURE__*/ _interop_require_default._(require("../overlay/index"));
 var _usecustomevent = require("../../utils/use-custom-event");
 var _uselockscolltaro = require("../../utils/use-lock-scoll-taro");
+var _mergeprops = require("../../utils/merge-props");
 var defaultProps = {
     title: '',
     content: '',
@@ -68,7 +69,7 @@ var BaseDialog = function BaseDialog(props) {
     var classPrefix = 'nut-dialog';
     var locale = (0, _configprovider.useConfig)().locale;
     var _useState = (0, _sliced_to_array._)((0, _react.useState)(false), 2), loading = _useState[0], setLoading = _useState[1];
-    var _useParams = (0, _usecustomevent.useParams)((0, _object_spread._)({}, 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, onOverlayClick = _useParams_params.onOverlayClick, confirmText = _useParams_params.confirmText, cancelText = _useParams_params.cancelText, overlay = _useParams_params.overlay, closeIconPosition = _useParams_params.closeIconPosition, closeIcon = _useParams_params.closeIcon, onClose = _useParams_params.onClose, onCancel = _useParams_params.onCancel, onConfirm = _useParams_params.onConfirm, beforeCancel = _useParams_params.beforeCancel, beforeClose = _useParams_params.beforeClose, setParams = _useParams.setParams;
+    var _useParams = (0, _usecustomevent.useParams)((0, _mergeprops.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, onOverlayClick = _useParams_params.onOverlayClick, confirmText = _useParams_params.confirmText, cancelText = _useParams_params.cancelText, overlay = _useParams_params.overlay, closeIconPosition = _useParams_params.closeIconPosition, closeIcon = _useParams_params.closeIcon, onClose = _useParams_params.onClose, onCancel = _useParams_params.onCancel, onConfirm = _useParams_params.onConfirm, beforeCancel = _useParams_params.beforeCancel, beforeClose = _useParams_params.beforeClose, setParams = _useParams.setParams;
     (0, _usecustomevent.useCustomEvent)(id, function(param) {
         var status = param.status, options = param.options;
         if (status) {
@@ -91,7 +92,7 @@ var BaseDialog = function BaseDialog(props) {
             onClose === null || onClose === void 0 ? void 0 : onClose();
             onCancel === null || onCancel === void 0 ? void 0 : onCancel();
         };
-        var handleOk = function() {
+        var handleOk = /*#__PURE__*/ function() {
             var _ref = (0, _async_to_generator._)(function(e) {
                 var e1;
                 return (0, _ts_generator._)(this, function(_state) {
@@ -137,15 +138,23 @@ var BaseDialog = function BaseDialog(props) {
                 return _ref.apply(this, arguments);
             };
         }();
-        return footer || /*#__PURE__*/ _react.default.createElement(_react.default.Fragment, null, !hideCancelButton && /*#__PURE__*/ _react.default.createElement(_index.default, {
+        var btnClass = hideCancelButton || hideConfirmButton ? "".concat(classPrefix, "-footer-block") : '';
+        return footer || /*#__PURE__*/ _react.default.createElement(_react.default.Fragment, null, !hideCancelButton && (footerDirection === 'vertical' ? /*#__PURE__*/ _react.default.createElement(_components.View, {
+            className: "".concat(classPrefix, "-footer-cancel ").concat(btnClass),
+            onClick: function onClick(e) {
+                return handleCancel(e);
+            }
+        }, cancelText || locale.cancel) : /*#__PURE__*/ _react.default.createElement(_index.default, {
             type: "default",
-            className: "".concat(classPrefix, "-footer-cancel"),
+            size: "large",
+            className: "".concat(classPrefix, "-footer-cancel ").concat(btnClass),
             onClick: function onClick(e) {
                 return handleCancel(e);
             }
-        }, cancelText || locale.cancel), !hideConfirmButton && /*#__PURE__*/ _react.default.createElement(_index.default, {
+        }, cancelText || locale.cancel)), !hideConfirmButton && /*#__PURE__*/ _react.default.createElement(_index.default, {
+            size: "large",
             type: "primary",
-            className: (0, _classnames.default)("".concat(classPrefix, "-footer-ok"), {
+            className: (0, _classnames.default)("".concat(classPrefix, "-footer-ok ").concat(btnClass), {
                 disabled: disableConfirmButton
             }),
             disabled: disableConfirmButton,
@@ -165,10 +174,11 @@ var BaseDialog = function BaseDialog(props) {
         };
         var _obj;
         var closeClasses = (0, _classnames.default)((_obj = {}, (0, _define_property._)(_obj, "".concat(classPrefix, "-close"), true), (0, _define_property._)(_obj, "".concat(classPrefix, "-close-").concat(closeIconPosition), true), _obj));
+        var systomIcon = closeIconPosition !== 'bottom' ? /*#__PURE__*/ _react.default.createElement(_iconsreacttaro.Close, null) : /*#__PURE__*/ _react.default.createElement(_iconsreacttaro.Failure, null);
         return /*#__PURE__*/ _react.default.createElement(_components.View, {
             className: closeClasses,
             onClick: handleCancel
-        }, /*#__PURE__*/ _react.default.isValidElement(closeIcon) ? closeIcon : /*#__PURE__*/ _react.default.createElement(_iconsreacttaro.Close, null));
+        }, /*#__PURE__*/ _react.default.isValidElement(closeIcon) ? closeIcon : systomIcon);
     };
     var onHandleClickOverlay = function onHandleClickOverlay(e) {
         if (closeOnOverlayClick && visible && e.target === e.currentTarget) {
@@ -221,7 +231,6 @@ function close(selector) {
         status: false
     });
 }
-BaseDialog.defaultProps = defaultProps;
 BaseDialog.displayName = 'NutDialog';
 BaseDialog.open = open;
 BaseDialog.close = close;

package/dist/cjs/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%;
+      }
     }
   }
 }