@nutui/nutui-react-taro 3.0.21-cpp → 4.0.0-beta.1

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

@@ -1,3 +1,13 @@
+:root,
+page {
+  --nut-scale-f: 1;
+  --nut-scale-font: var(--nut-scale-f, 1);
+  --nut-scale-icon: var(--nut-scale-f, 1);
+  --nut-icon-height: calc(16px * var(--nut-scale-icon, var(--nut-scale-f, 1))) !important;
+  --nut-icon-width: calc(16px * var(--nut-scale-icon, var(--nut-scale-f, 1))) !important;
+  --nut-icon-line-height: calc(16px * var(--nut-scale-icon, var(--nut-scale-f, 1))) !important;
+}
+
 /* #ifdef harmony */
 /* #endif */
 /* #ifndef harmony */

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

@@ -1,3 +1,13 @@
+:root,
+page {
+  --nut-scale-f: 1;
+  --nut-scale-font: var(--nut-scale-f, 1);
+  --nut-scale-icon: var(--nut-scale-f, 1);
+  --nut-icon-height: calc(16px * var(--nut-scale-icon, var(--nut-scale-f, 1))) !important;
+  --nut-icon-width: calc(16px * var(--nut-scale-icon, var(--nut-scale-f, 1))) !important;
+  --nut-icon-line-height: calc(16px * var(--nut-scale-icon, var(--nut-scale-f, 1))) !important;
+}
+
 /* #ifdef harmony */
 /* #endif */
 /* #ifndef harmony */
@@ -6,7 +16,7 @@
   position: relative;
   display: flex;
   width: 100%;
-  height: calc(var(--nutui-picker-item-height, 36px) * 7);
+  height: calc(var(--nutui-picker-item-height, calc(36px * var(--nut-scale-f, 1))) * 7);
   overflow: hidden;
 }
 .nut-pickerview-mask, .nut-pickerview-indicator {
@@ -21,14 +31,14 @@
   bottom: 0;
   background-image: var(--picker-mask-background, linear-gradient(180deg, var(--nutui-white-12), var(--nutui-white-7)), linear-gradient(0deg, var(--nutui-white-12), var(--nutui-white-7)));
   background-position: top, bottom;
-  background-size: 100% calc((var(--nutui-picker-item-height, 36px) * 7 - var(--nutui-picker-item-height, 36px)) / 2);
+  background-size: 100% calc((var(--nutui-picker-item-height, calc(36px * var(--nut-scale-f, 1))) * 7 - var(--nutui-picker-item-height, calc(36px * var(--nut-scale-f, 1)))) / 2);
   background-repeat: no-repeat;
   transform: translateZ(0);
 }
 .nut-pickerview-indicator {
-  top: calc((var(--nutui-picker-item-height, 36px) * 7 - var(--nutui-picker-item-height, 36px)) / 2);
-  height: var(--nutui-picker-item-height, 36px);
-  border: var(--nutui-picker-item-active-line-border, 1px solid var(--nutui-color-border, rgba(0, 0, 0, 0.06)));
+  top: calc((var(--nutui-picker-item-height, calc(36px * var(--nut-scale-f, 1))) * 7 - var(--nutui-picker-item-height, calc(36px * var(--nut-scale-f, 1)))) / 2);
+  height: var(--nutui-picker-item-height, calc(36px * var(--nut-scale-f, 1)));
+  border: var(--nutui-picker-item-active-line-border, calc(1px * var(--nut-scale-f, 1)) solid var(--nutui-color-border, rgba(0, 0, 0, 0.06)));
   border-left: 0;
   border-right: 0;
   box-sizing: border-box;
@@ -36,20 +46,20 @@
 .nut-pickerview-list {
   position: relative;
   flex: 1;
-  height: calc(var(--nutui-picker-item-height, 36px) * 7);
+  height: calc(var(--nutui-picker-item-height, calc(36px * var(--nut-scale-f, 1))) * 7);
   overflow: hidden;
   touch-action: none;
 }
 .nut-pickerview-roller {
   position: absolute;
-  top: calc((var(--nutui-picker-item-height, 36px) * 7 - var(--nutui-picker-item-height, 36px)) / 2);
+  top: calc((var(--nutui-picker-item-height, calc(36px * var(--nut-scale-f, 1))) * 7 - var(--nutui-picker-item-height, calc(36px * var(--nut-scale-f, 1)))) / 2);
   width: 100%;
-  height: var(--nutui-picker-item-height, 36px);
+  height: var(--nutui-picker-item-height, calc(36px * var(--nut-scale-f, 1)));
   z-index: 1;
   transform-style: preserve-3d;
 }
 .nut-pickerview-roller-placeholder {
-  height: var(--nutui-picker-item-height, 36px);
+  height: var(--nutui-picker-item-height, calc(36px * var(--nut-scale-f, 1)));
 }
 .nut-pickerview-roller-item {
   position: absolute;
@@ -64,10 +74,10 @@
 }
 .nut-pickerview-roller-item, .nut-pickerview-roller-item-tiled {
   width: 100%;
-  height: var(--nutui-picker-item-height, 36px);
-  line-height: var(--nutui-picker-item-height, 36px);
+  height: var(--nutui-picker-item-height, calc(36px * var(--nut-scale-f, 1)));
+  line-height: var(--nutui-picker-item-height, calc(36px * var(--nut-scale-f, 1)));
   color: var(--nutui-picker-item-text-color, var(--nutui-color-title, #1a1a1a));
-  font-size: var(--nutui-picker-item-text-font-size, var(--nutui-font-size-base, 14px));
+  font-size: var(--nutui-picker-item-text-font-size, var(--nutui-font-size-base, calc(14px * var(--nut-scale-font, var(--nut-scale-f, 1)))));
   text-align: center;
   overflow: hidden;
   text-overflow: ellipsis;

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

@@ -8,6 +8,7 @@ import React, { useState } from "react";
 import classNames from "classnames";
 import { View } from "@tarojs/components";
 import { Failure, Close } from "@nutui/icons-react-taro";
+import { CSSTransition } from "react-transition-group";
 import Button from "../button/index";
 import { Content, defaultContentProps } from "./content";
 import { useConfig } from "../configprovider/configprovider";
@@ -180,11 +181,7 @@ export var BaseDialog = function(props) {
         };
         var _obj;
         var closeClasses = classNames((_obj = {}, _define_property(_obj, "".concat(classPrefix, "-close"), true), _define_property(_obj, "".concat(classPrefix, "-close-").concat(closeIconPosition), true), _obj));
-        var systemIcon = closeIconPosition !== 'bottom' ? /*#__PURE__*/ React.createElement(Close, {
-            ariaHidden: true
-        }) : /*#__PURE__*/ React.createElement(Failure, {
-            ariaHidden: true
-        });
+        var systomIcon = closeIconPosition !== 'bottom' ? /*#__PURE__*/ React.createElement(Close, null) : /*#__PURE__*/ React.createElement(Failure, null);
         return /*#__PURE__*/ React.createElement(View, {
             className: closeClasses,
             onClick: handleClose,
@@ -192,7 +189,7 @@ export var BaseDialog = function(props) {
             ariaLabel: locale.close,
             // @ts-ignore
             tabIndex: 0
-        }, /*#__PURE__*/ React.isValidElement(closeIcon) ? closeIcon : systemIcon);
+        }, /*#__PURE__*/ React.isValidElement(closeIcon) ? closeIcon : systomIcon);
     };
     var onHandleClickOverlay = function(e) {
         if (closeOnOverlayClick && visible && e.target === e.currentTarget) {
@@ -203,29 +200,24 @@ export var BaseDialog = function(props) {
     var renderContent = function() {
         var contentZIndex = harmony() ? zIndex + 1 : zIndex // 解决harmony层级问题
         ;
-        return (
-            // <CSSTransition
-            //   in={visible}
-            //   timeout={300}
-            //   classNames="fadeDialog"
-            //   unmountOnExit
-            //   appear
-            // >
-            /*#__PURE__*/ (React.createElement(Content, {
-                className: className,
-                style: _object_spread_props(_object_spread({
-                    zIndex: contentZIndex
-                }, style), {
-                    display: visible ? 'block' : 'none'
-                }),
-                title: title,
-                header: header,
-                close: renderCloseIcon(),
-                footer: renderFooter(),
-                footerDirection: footerDirection,
-                visible: visible
-            }, content || children))
-        );
+        return /*#__PURE__*/ React.createElement(CSSTransition, {
+            in: visible,
+            timeout: 300,
+            classNames: "fadeDialog",
+            unmountOnExit: true,
+            appear: true
+        }, /*#__PURE__*/ React.createElement(Content, {
+            className: className,
+            style: _object_spread({
+                zIndex: contentZIndex
+            }, style),
+            title: title,
+            header: header,
+            close: renderCloseIcon(),
+            footer: renderFooter(),
+            footerDirection: footerDirection,
+            visible: visible
+        }, content || children));
     };
     return /*#__PURE__*/ React.createElement(View, {
         style: {

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

@@ -58,7 +58,7 @@
     }
 
     &-bottom {
-      bottom: -64px;
+      bottom: scale-px(-64px);
       width: $dialog-bottom-close-icon-size;
       height: $dialog-bottom-close-icon-size;
       left: 50%;
@@ -128,7 +128,7 @@
     .nut-button {
       min-width: $dialog-footer-button-min-width;
       border-radius: $dialog-footer-button-border;
-      padding: var(--nutui-button-large-padding, 0);
+      padding: var(--nutui-button-large-padding, 0 scale-px(12px));
     }
 
     &-cancel.nut-dialog-footer-cancel {

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

@@ -1,3 +1,13 @@
+:root,
+page {
+  --nut-scale-f: 1;
+  --nut-scale-font: var(--nut-scale-f, 1);
+  --nut-scale-icon: var(--nut-scale-f, 1);
+  --nut-icon-height: calc(16px * var(--nut-scale-icon, var(--nut-scale-f, 1))) !important;
+  --nut-icon-width: calc(16px * var(--nut-scale-icon, var(--nut-scale-f, 1))) !important;
+  --nut-icon-line-height: calc(16px * var(--nut-scale-icon, var(--nut-scale-f, 1))) !important;
+}
+
 /* #ifdef harmony */
 /* #endif */
 /* #ifndef harmony */
@@ -6,13 +16,13 @@
   display: flex;
   flex-direction: column;
   align-items: center;
-  width: var(--nutui-dialog-width, 295px);
-  min-width: var(--nutui-dialog-min-width, 240px);
+  width: var(--nutui-dialog-width, calc(295px * var(--nut-scale-f, 1)));
+  min-width: var(--nutui-dialog-min-width, calc(240px * var(--nut-scale-f, 1)));
   /* #ifndef harmony dynamic*/
   max-height: 67%;
   /* #endif */
-  min-height: var(--nutui-dialog-min-height, 124px);
-  padding: var(--nutui-dialog-padding, 24px);
+  min-height: var(--nutui-dialog-min-height, calc(124px * var(--nut-scale-f, 1)));
+  padding: var(--nutui-dialog-padding, calc(24px * var(--nut-scale-f, 1)));
   box-sizing: border-box;
 }
 .nut-dialog-outer {
@@ -27,37 +37,37 @@
   left: 50%;
   -webkit-transform: translate(-50%, -50%);
   transform: translate(-50%, -50%);
-  border-radius: var(--nutui-dialog-border-radius, var(--nutui-radius-xl, 12px));
+  border-radius: var(--nutui-dialog-border-radius, var(--nutui-radius-xl, calc(12px * var(--nut-scale-f, 1))));
   animation-duration: 0.3s;
 }
 .nut-dialog-close {
   position: absolute !important;
   z-index: 1;
   cursor: pointer;
-  width: var(--nutui-dialog-close-width, 16px);
-  height: var(--nutui-dialog-close-height, 16px);
+  width: var(--nutui-dialog-close-width, calc(16px * var(--nut-scale-f, 1)));
+  height: var(--nutui-dialog-close-height, calc(16px * var(--nut-scale-f, 1)));
   display: flex;
   justify-content: center;
   align-items: center;
   color: var(--nutui-dialog-close-color, #ffffff);
 }
 .nut-dialog-close .nut-icon {
-  font-size: var(--nutui-dialog-close-width, 16px);
-  width: var(--nutui-dialog-close-width, 16px);
-  height: var(--nutui-dialog-close-height, 16px);
+  font-size: var(--nutui-dialog-close-width, calc(16px * var(--nut-scale-f, 1)));
+  width: var(--nutui-dialog-close-width, calc(16px * var(--nut-scale-f, 1)));
+  height: var(--nutui-dialog-close-height, calc(16px * var(--nut-scale-f, 1)));
 }
 .nut-dialog-close-top-right {
-  top: var(--nutui-dialog-close-top, 16px);
-  right: var(--nutui-dialog-close-right, 16px);
+  top: var(--nutui-dialog-close-top, calc(16px * var(--nut-scale-f, 1)));
+  right: var(--nutui-dialog-close-right, calc(16px * var(--nut-scale-f, 1)));
 }
 .nut-dialog-close-top-left {
-  top: var(--nutui-dialog-close-top, 16px);
-  left: var(--nutui-dialog-close-left, 16px);
+  top: var(--nutui-dialog-close-top, calc(16px * var(--nut-scale-f, 1)));
+  left: var(--nutui-dialog-close-left, calc(16px * var(--nut-scale-f, 1)));
 }
 .nut-dialog-close-bottom {
-  bottom: -64px;
-  width: var(--nutui-dialog-bottom-close-icon-size, 24px);
-  height: var(--nutui-dialog-bottom-close-icon-size, 24px);
+  bottom: calc(-64px * var(--nut-scale-f, 1));
+  width: var(--nutui-dialog-bottom-close-icon-size, var(--nutui-font-size-xxl, calc(24px * var(--nut-scale-font, var(--nut-scale-f, 1)))));
+  height: var(--nutui-dialog-bottom-close-icon-size, var(--nutui-font-size-xxl, calc(24px * var(--nut-scale-font, var(--nut-scale-f, 1)))));
   left: 50%;
   transform: translateX(-50%);
 }
@@ -65,8 +75,8 @@
   color: var(--nutui-color-text-disabled, #c2c4cc);
   background-color: var(--nutui-color-mask-part, rgba(0, 0, 0, 0.4));
   border-radius: 50%;
-  width: var(--nutui-dialog-bottom-close-icon-size, 24px);
-  height: var(--nutui-dialog-bottom-close-icon-size, 24px);
+  width: var(--nutui-dialog-bottom-close-icon-size, var(--nutui-font-size-xxl, calc(24px * var(--nut-scale-font, var(--nut-scale-f, 1)))));
+  height: var(--nutui-dialog-bottom-close-icon-size, var(--nutui-font-size-xxl, calc(24px * var(--nut-scale-font, var(--nut-scale-f, 1)))));
 }
 .nut-dialog-close:active {
   opacity: 0.7;
@@ -74,10 +84,10 @@
 .nut-dialog-header {
   display: block;
   text-align: center;
-  font-size: var(--nutui-dialog-header-font-size, var(--nutui-font-size-xl, 18px));
+  font-size: var(--nutui-dialog-header-font-size, var(--nutui-font-size-xl, calc(18px * var(--nut-scale-font, var(--nut-scale-f, 1)))));
   font-weight: var(--nutui-dialog-header-font-weight, var(--nutui-font-weight-bold, 600));
   color: var(--nutui-color-title, #1a1a1a);
-  margin-bottom: var(--nutui-dialog-title-margin-bottom, 8px);
+  margin-bottom: var(--nutui-dialog-title-margin-bottom, calc(8px * var(--nut-scale-f, 1)));
   width: 100%;
   overflow: hidden;
   text-overflow: ellipsis;
@@ -85,10 +95,10 @@
 }
 .nut-dialog-content {
   width: 100%;
-  margin: var(--nutui-dialog-content-margin, 0 0 20px 0);
-  max-height: var(--nutui-dialog-content-max-height, 268px);
-  line-height: var(--nutui-dialog-content-line-height, 20px);
-  font-size: var(--nutui-font-size-base, 14px);
+  margin: var(--nutui-dialog-content-margin, 0 0 calc(20px * var(--nut-scale-f, 1)) 0);
+  max-height: var(--nutui-dialog-content-max-height, calc(268px * var(--nut-scale-f, 1)));
+  line-height: var(--nutui-dialog-content-line-height, calc(20px * var(--nut-scale-f, 1)));
+  font-size: var(--nutui-font-size-base, calc(14px * var(--nut-scale-font, var(--nut-scale-f, 1))));
   color: var(--nutui-color-title, #1a1a1a);
   word-wrap: break-word;
   word-break: break-all;
@@ -111,19 +121,19 @@
 .nut-dialog-footer.vertical .nut-dialog-footer-cancel {
   margin: 0;
   color: var(--nutui-color-text, #505259);
-  font-size: var(--nutui-font-size-base, 14px);
+  font-size: var(--nutui-font-size-base, calc(14px * var(--nut-scale-font, var(--nut-scale-f, 1))));
   display: flex;
   justify-content: center;
-  margin-top: var(--nutui-dialog-vertical-footer-ok-margin-top, 16px);
+  margin-top: var(--nutui-dialog-vertical-footer-ok-margin-top, calc(16px * var(--nut-scale-f, 1)));
   background: transparent;
 }
 .nut-dialog-footer .nut-button {
-  min-width: var(--nutui-dialog-footer-button-min-width, 117px);
-  border-radius: var(--nutui-dialog-footer-button-border, 6px);
-  padding: var(--nutui-button-large-padding, 0);
+  min-width: var(--nutui-dialog-footer-button-min-width, calc(117px * var(--nut-scale-f, 1)));
+  border-radius: var(--nutui-dialog-footer-button-border, calc(6px * var(--nut-scale-f, 1)));
+  padding: var(--nutui-button-large-padding, 0 calc(12px * var(--nut-scale-f, 1)));
 }
 .nut-dialog-footer-cancel.nut-dialog-footer-cancel {
-  margin-right: var(--nutui-dialog-footer-cancel-margin-right, 12px);
+  margin-right: var(--nutui-dialog-footer-cancel-margin-right, calc(12px * var(--nut-scale-f, 1)));
   background: var(--nutui-dialog-footer-cancel-bg, var(--nutui-color-background-sunken, #f7f8fc));
   color: var(--nutui-button-default-color, var(--nutui-color-title, #1a1a1a));
   border-color: var(--nutui-button-default-border-color, transparent);
@@ -141,18 +151,18 @@
 .nut-dialog-footer-ok-container .nut-dialog-footer-ok-badge {
   position: absolute;
   right: 0;
-  top: var(--nutui-dialog-footer-badge-top, -8px);
+  top: var(--nutui-dialog-footer-badge-top, calc(-8px * var(--nut-scale-f, 1)));
   display: flex;
   align-items: center;
-  height: var(--nutui-dialog-footer-badge-height, 14px);
-  padding: var(--nutui-dialog-footer-badge-padding, 0 3px);
+  height: var(--nutui-dialog-footer-badge-height, calc(14px * var(--nut-scale-f, 1)));
+  padding: var(--nutui-dialog-footer-badge-padding, 0 calc(3px * var(--nut-scale-f, 1)));
   background: var(--nutui-dialog-footer-badge-bg-ok, var(--nutui-color-danger-light, #ffebef));
-  border-radius: var(--nutui-dialog-footer-badge-border-radius, 2px 2px 0px 2px);
-  font-size: var(--nutui-dialog-footer-badge-fontsize, 10px);
+  border-radius: var(--nutui-dialog-footer-badge-border-radius, calc(2px * var(--nut-scale-f, 1)) calc(2px * var(--nut-scale-f, 1)) 0px calc(2px * var(--nut-scale-f, 1)));
+  font-size: var(--nutui-dialog-footer-badge-fontsize, calc(10px * var(--nut-scale-f, 1)));
   color: var(--nutui-dialog-footer-badge-color-ok, var(--nutui-color-primary, #ff0f23));
 }
 .nut-dialog-footer-ok {
-  max-width: var(--nutui-dialog-footer-ok-max-width, 128px);
+  max-width: var(--nutui-dialog-footer-ok-max-width, calc(128px * var(--nut-scale-f, 1)));
   font-weight: var(--nutui-font-weight-medium, 500);
 }
 .nut-dialog-footer-ok .nut-button-children {
@@ -170,15 +180,15 @@
 }
 .nut-dialog-footer-cancel-container .nut-dialog-footer-cancel-badge {
   position: absolute;
-  right: var(--nutui-dialog-footer-cancel-margin-right, 12px);
-  top: var(--nutui-dialog-footer-badge-top, -8px);
+  right: var(--nutui-dialog-footer-cancel-margin-right, calc(12px * var(--nut-scale-f, 1)));
+  top: var(--nutui-dialog-footer-badge-top, calc(-8px * var(--nut-scale-f, 1)));
   display: flex;
   align-items: center;
-  height: var(--nutui-dialog-footer-badge-height, 14px);
-  padding: var(--nutui-dialog-footer-badge-padding, 0 3px);
+  height: var(--nutui-dialog-footer-badge-height, calc(14px * var(--nut-scale-f, 1)));
+  padding: var(--nutui-dialog-footer-badge-padding, 0 calc(3px * var(--nut-scale-f, 1)));
   background: var(--nutui-dialog-footer-badge-bg-cancel, var(--nutui-color-danger-light, #ffebef));
-  border-radius: var(--nutui-dialog-footer-badge-border-radius, 2px 2px 0px 2px);
-  font-size: var(--nutui-dialog-footer-badge-fontsize, 10px);
+  border-radius: var(--nutui-dialog-footer-badge-border-radius, calc(2px * var(--nut-scale-f, 1)) calc(2px * var(--nut-scale-f, 1)) 0px calc(2px * var(--nut-scale-f, 1)));
+  font-size: var(--nutui-dialog-footer-badge-fontsize, calc(10px * var(--nut-scale-f, 1)));
   color: var(--nutui-dialog-footer-badge-color-cancel, var(--nutui-color-primary, #ff0f23));
 }
 
@@ -192,17 +202,17 @@
 [dir=rtl] .nut-dialog-close-top-right,
 .nut-rtl .nut-dialog-close-top-right {
   right: auto;
-  left: var(--nutui-dialog-close-right, 16px);
+  left: var(--nutui-dialog-close-right, calc(16px * var(--nut-scale-f, 1)));
 }
 [dir=rtl] .nut-dialog-close-top-left,
 .nut-rtl .nut-dialog-close-top-left {
   left: auto;
-  right: var(--nutui-dialog-close-left, 16px);
+  right: var(--nutui-dialog-close-left, calc(16px * var(--nut-scale-f, 1)));
 }
 [dir=rtl] .nut-dialog-footer-cancel.nut-dialog-footer-cancel,
 .nut-rtl .nut-dialog-footer-cancel.nut-dialog-footer-cancel {
   margin-right: 0;
-  margin-left: var(--nutui-dialog-footer-cancel-margin-right, 12px);
+  margin-left: var(--nutui-dialog-footer-cancel-margin-right, calc(12px * var(--nut-scale-f, 1)));
 }
 [dir=rtl] .nut-dialog-content,
 .nut-rtl .nut-dialog-content {