@nutui/nutui-react-taro 3.0.21-cpp → 3.1.0-beta.2

package/dist/cjs/packages/toast/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 */
@@ -42,15 +52,15 @@
   flex-direction: column;
   justify-content: center;
   align-items: center;
-  min-width: 96px;
+  min-width: calc(96px * var(--nut-scale-f, 1));
   max-width: 60%;
   box-sizing: border-box;
-  font-size: var(--nutui-toast-text-font-size, 14px);
+  font-size: var(--nutui-toast-text-font-size, var(--nutui-font-size-base, calc(14px * var(--nut-scale-font, var(--nut-scale-f, 1)))));
   text-align: var(--nutui-toast-inner-text-align, center);
-  padding: var(--nutui-toast-inner-padding, 13px 16px);
+  padding: var(--nutui-toast-inner-padding, calc(13px * var(--nut-scale-f, 1)) calc(16px * var(--nut-scale-f, 1)));
   word-break: break-all;
   background: var(--nutui-toast-inner-bg-color, var(--nutui-color-mask, rgba(0, 0, 0, 0.7)));
-  border-radius: var(--nutui-toast-inner-border-radius, var(--nutui-radius-xl, 12px));
+  border-radius: var(--nutui-toast-inner-border-radius, var(--nutui-radius-xl, calc(12px * var(--nut-scale-f, 1))));
   color: var(--nutui-toast-font-color, #ffffff);
 }
 .nut-toast-inner-descrption {
@@ -65,10 +75,10 @@
   word-wrap: break-word;
 }
 .nut-toast-inner-small {
-  font-size: var(--nutui-font-size-s, 12px);
+  font-size: var(--nutui-font-size-s, calc(12px * var(--nut-scale-font, var(--nut-scale-f, 1))));
 }
 .nut-toast-inner-large {
-  font-size: var(--nutui-font-size-l, 15px);
+  font-size: var(--nutui-font-size-l, calc(15px * var(--nut-scale-font, var(--nut-scale-f, 1))));
 }
 .nut-toast-center {
   top: var(--nutui-toast-inner-top, 48%);
@@ -82,25 +92,29 @@
 .nut-toast-text {
   color: #ffffff;
   text-align: var(--nutui-toast-inner-text-align, center);
-  line-height: 20px;
   /* #ifdef harmony dynamic*/
   line-height: normal;
   /* #endif */
+  /* #ifndef harmony dynamic*/
+  line-height: calc(20px * var(--nut-scale-f, 1));
+  /* #endif */
   height: auto;
 }
 .nut-toast-title {
   color: #ffffff;
-  font-size: var(--nutui-toast-title-font-size, 16px);
+  font-size: var(--nutui-toast-title-font-size, var(--nutui-font-size-md, calc(16px * var(--nut-scale-font, var(--nut-scale-f, 1)))));
   font-weight: 600;
   text-align: var(--nutui-toast-inner-text-align, center);
-  line-height: 22px;
   /* #ifdef harmony dynamic*/
   line-height: normal;
   /* #endif */
+  /* #ifndef harmony dynamic*/
+  line-height: calc(22px * var(--nut-scale-f, 1));
+  /* #endif */
 }
 .nut-toast .nut-icon {
-  width: 24px;
-  height: 24px;
+  width: calc(24px * var(--nut-scale-f, 1));
+  height: calc(24px * var(--nut-scale-f, 1));
   color: #ffffff;
 }
 .nut-toast-icon-wrapper {
@@ -108,12 +122,12 @@
   display: flex;
   align-items: center;
   justify-content: center;
-  margin: 3px 0 5px;
+  margin: calc(3px * var(--nut-scale-f, 1)) 0 calc(5px * var(--nut-scale-f, 1));
   color: #ffffff;
 }
 .nut-toast-icon-wrapper-icon {
-  width: 24px;
-  height: 24px;
+  width: calc(24px * var(--nut-scale-f, 1));
+  height: calc(24px * var(--nut-scale-f, 1));
 }
 .nut-toast-rtl {
   left: auto;

package/dist/cjs/packages/toast/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 */
@@ -96,15 +106,15 @@
   flex-direction: column;
   justify-content: center;
   align-items: center;
-  min-width: 96px;
+  min-width: calc(96px * var(--nut-scale-f, 1));
   max-width: 60%;
   box-sizing: border-box;
-  font-size: var(--nutui-toast-text-font-size, 14px);
+  font-size: var(--nutui-toast-text-font-size, var(--nutui-font-size-base, calc(14px * var(--nut-scale-font, var(--nut-scale-f, 1)))));
   text-align: var(--nutui-toast-inner-text-align, center);
-  padding: var(--nutui-toast-inner-padding, 13px 16px);
+  padding: var(--nutui-toast-inner-padding, calc(13px * var(--nut-scale-f, 1)) calc(16px * var(--nut-scale-f, 1)));
   word-break: break-all;
   background: var(--nutui-toast-inner-bg-color, var(--nutui-color-mask, rgba(0, 0, 0, 0.7)));
-  border-radius: var(--nutui-toast-inner-border-radius, var(--nutui-radius-xl, 12px));
+  border-radius: var(--nutui-toast-inner-border-radius, var(--nutui-radius-xl, calc(12px * var(--nut-scale-f, 1))));
   color: var(--nutui-toast-font-color, #ffffff);
 }
 .nut-toast-inner-descrption {
@@ -119,10 +129,10 @@
   word-wrap: break-word;
 }
 .nut-toast-inner-small {
-  font-size: var(--nutui-font-size-s, 12px);
+  font-size: var(--nutui-font-size-s, calc(12px * var(--nut-scale-font, var(--nut-scale-f, 1))));
 }
 .nut-toast-inner-large {
-  font-size: var(--nutui-font-size-l, 15px);
+  font-size: var(--nutui-font-size-l, calc(15px * var(--nut-scale-font, var(--nut-scale-f, 1))));
 }
 .nut-toast-center {
   top: var(--nutui-toast-inner-top, 48%);
@@ -136,25 +146,29 @@
 .nut-toast-text {
   color: #ffffff;
   text-align: var(--nutui-toast-inner-text-align, center);
-  line-height: 20px;
   /* #ifdef harmony dynamic*/
   line-height: normal;
   /* #endif */
+  /* #ifndef harmony dynamic*/
+  line-height: calc(20px * var(--nut-scale-f, 1));
+  /* #endif */
   height: auto;
 }
 .nut-toast-title {
   color: #ffffff;
-  font-size: var(--nutui-toast-title-font-size, 16px);
+  font-size: var(--nutui-toast-title-font-size, var(--nutui-font-size-md, calc(16px * var(--nut-scale-font, var(--nut-scale-f, 1)))));
   font-weight: 600;
   text-align: var(--nutui-toast-inner-text-align, center);
-  line-height: 22px;
   /* #ifdef harmony dynamic*/
   line-height: normal;
   /* #endif */
+  /* #ifndef harmony dynamic*/
+  line-height: calc(22px * var(--nut-scale-f, 1));
+  /* #endif */
 }
 .nut-toast .nut-icon {
-  width: 24px;
-  height: 24px;
+  width: calc(24px * var(--nut-scale-f, 1));
+  height: calc(24px * var(--nut-scale-f, 1));
   color: #ffffff;
 }
 .nut-toast-icon-wrapper {
@@ -162,12 +176,12 @@
   display: flex;
   align-items: center;
   justify-content: center;
-  margin: 3px 0 5px;
+  margin: calc(3px * var(--nut-scale-f, 1)) 0 calc(5px * var(--nut-scale-f, 1));
   color: #ffffff;
 }
 .nut-toast-icon-wrapper-icon {
-  width: 24px;
-  height: 24px;
+  width: calc(24px * var(--nut-scale-f, 1));
+  height: calc(24px * var(--nut-scale-f, 1));
 }
 .nut-toast-rtl {
   left: auto;

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

@@ -42,7 +42,7 @@
     flex-direction: column;
     justify-content: center;
     align-items: center;
-    min-width: 96px;
+    min-width: scale-px(96px);
     max-width: 60%;
     // max-width: 224px;
     box-sizing: border-box;
@@ -93,10 +93,12 @@
   &-text {
     color: #ffffff;
     text-align: $toast-inner-text-align;
-    line-height: 20px;
     /* #ifdef harmony dynamic*/
     line-height: normal;
     /* #endif */
+    /* #ifndef harmony dynamic*/
+    line-height: scale-px(20px);
+    /* #endif */
     height: auto;
   }
 
@@ -105,15 +107,17 @@
     font-size: $toast-title-font-size;
     font-weight: 600;
     text-align: $toast-inner-text-align;
-    line-height: 22px;
     /* #ifdef harmony dynamic*/
     line-height: normal;
     /* #endif */
+    /* #ifndef harmony dynamic*/
+    line-height: scale-px(22px);
+    /* #endif */
   }
 
   .nut-icon {
-    width: 24px;
-    height: 24px;
+    width: scale-px(24px);
+    height: scale-px(24px);
     color: #ffffff;
   }
 
@@ -122,12 +126,12 @@
     display: flex;
     align-items: center;
     justify-content: center;
-    margin: 3px 0 5px;
+    margin: scale-px(3px) 0 scale-px(5px);
     color: #ffffff;
 
     &-icon {
-      width: 24px;
-      height: 24px;
+      width: scale-px(24px);
+      height: scale-px(24px);
     }
   }
 

package/dist/cjs/packages/toast/style-jmapp/style.css

@@ -42,7 +42,7 @@
   flex-direction: column;
   justify-content: center;
   align-items: center;
-  min-width: 96px;
+  min-width: scale-px(96px);
   max-width: 60%;
   box-sizing: border-box;
   font-size: var(--nutui-toast-text-font-size, 14px);
@@ -82,10 +82,12 @@
 .nut-toast-text {
   color: #ffffff;
   text-align: var(--nutui-toast-inner-text-align, center);
-  line-height: 20px;
   /* #ifdef harmony dynamic*/
   line-height: normal;
   /* #endif */
+  /* #ifndef harmony dynamic*/
+  line-height: scale-px(20px);
+  /* #endif */
   height: auto;
 }
 .nut-toast-title {
@@ -93,14 +95,16 @@
   font-size: var(--nutui-toast-title-font-size, 16px);
   font-weight: 600;
   text-align: var(--nutui-toast-inner-text-align, center);
-  line-height: 22px;
   /* #ifdef harmony dynamic*/
   line-height: normal;
   /* #endif */
+  /* #ifndef harmony dynamic*/
+  line-height: scale-px(22px);
+  /* #endif */
 }
 .nut-toast .nut-icon {
-  width: 24px;
-  height: 24px;
+  width: scale-px(24px);
+  height: scale-px(24px);
   color: #ffffff;
 }
 .nut-toast-icon-wrapper {
@@ -108,12 +112,12 @@
   display: flex;
   align-items: center;
   justify-content: center;
-  margin: 3px 0 5px;
+  margin: scale-px(3px) 0 scale-px(5px);
   color: #ffffff;
 }
 .nut-toast-icon-wrapper-icon {
-  width: 24px;
-  height: 24px;
+  width: scale-px(24px);
+  height: scale-px(24px);
 }
 .nut-toast-rtl {
   left: auto;

package/dist/cjs/packages/toast/style-jmapp/toast.scss

@@ -42,7 +42,7 @@
     flex-direction: column;
     justify-content: center;
     align-items: center;
-    min-width: 96px;
+    min-width: scale-px(96px);
     max-width: 60%;
     // max-width: 224px;
     box-sizing: border-box;
@@ -93,10 +93,12 @@
   &-text {
     color: #ffffff;
     text-align: $toast-inner-text-align;
-    line-height: 20px;
     /* #ifdef harmony dynamic*/
     line-height: normal;
     /* #endif */
+    /* #ifndef harmony dynamic*/
+    line-height: scale-px(20px);
+    /* #endif */
     height: auto;
   }
 
@@ -105,15 +107,17 @@
     font-size: $toast-title-font-size;
     font-weight: 600;
     text-align: $toast-inner-text-align;
-    line-height: 22px;
     /* #ifdef harmony dynamic*/
     line-height: normal;
     /* #endif */
+    /* #ifndef harmony dynamic*/
+    line-height: scale-px(22px);
+    /* #endif */
   }
 
   .nut-icon {
-    width: 24px;
-    height: 24px;
+    width: scale-px(24px);
+    height: scale-px(24px);
     color: #ffffff;
   }
 
@@ -122,12 +126,12 @@
     display: flex;
     align-items: center;
     justify-content: center;
-    margin: 3px 0 5px;
+    margin: scale-px(3px) 0 scale-px(5px);
     color: #ffffff;
 
     &-icon {
-      width: 24px;
-      height: 24px;
+      width: scale-px(24px);
+      height: scale-px(24px);
     }
   }
 

package/dist/cjs/packages/toast/style-jrkf/style.css

@@ -42,7 +42,7 @@
   flex-direction: column;
   justify-content: center;
   align-items: center;
-  min-width: 96px;
+  min-width: scale-px(96px);
   max-width: 60%;
   box-sizing: border-box;
   font-size: var(--nutui-toast-text-font-size, 14px);
@@ -82,10 +82,12 @@
 .nut-toast-text {
   color: #ffffff;
   text-align: var(--nutui-toast-inner-text-align, center);
-  line-height: 20px;
   /* #ifdef harmony dynamic*/
   line-height: normal;
   /* #endif */
+  /* #ifndef harmony dynamic*/
+  line-height: scale-px(20px);
+  /* #endif */
   height: auto;
 }
 .nut-toast-title {
@@ -93,14 +95,16 @@
   font-size: var(--nutui-toast-title-font-size, 16px);
   font-weight: 600;
   text-align: var(--nutui-toast-inner-text-align, center);
-  line-height: 22px;
   /* #ifdef harmony dynamic*/
   line-height: normal;
   /* #endif */
+  /* #ifndef harmony dynamic*/
+  line-height: scale-px(22px);
+  /* #endif */
 }
 .nut-toast .nut-icon {
-  width: 24px;
-  height: 24px;
+  width: scale-px(24px);
+  height: scale-px(24px);
   color: #ffffff;
 }
 .nut-toast-icon-wrapper {
@@ -108,12 +112,12 @@
   display: flex;
   align-items: center;
   justify-content: center;
-  margin: 3px 0 5px;
+  margin: scale-px(3px) 0 scale-px(5px);
   color: #ffffff;
 }
 .nut-toast-icon-wrapper-icon {
-  width: 24px;
-  height: 24px;
+  width: scale-px(24px);
+  height: scale-px(24px);
 }
 .nut-toast-rtl {
   left: auto;

package/dist/cjs/packages/toast/style-jrkf/toast.scss

@@ -42,7 +42,7 @@
     flex-direction: column;
     justify-content: center;
     align-items: center;
-    min-width: 96px;
+    min-width: scale-px(96px);
     max-width: 60%;
     // max-width: 224px;
     box-sizing: border-box;
@@ -93,10 +93,12 @@
   &-text {
     color: #ffffff;
     text-align: $toast-inner-text-align;
-    line-height: 20px;
     /* #ifdef harmony dynamic*/
     line-height: normal;
     /* #endif */
+    /* #ifndef harmony dynamic*/
+    line-height: scale-px(20px);
+    /* #endif */
     height: auto;
   }
 
@@ -105,15 +107,17 @@
     font-size: $toast-title-font-size;
     font-weight: 600;
     text-align: $toast-inner-text-align;
-    line-height: 22px;
     /* #ifdef harmony dynamic*/
     line-height: normal;
     /* #endif */
+    /* #ifndef harmony dynamic*/
+    line-height: scale-px(22px);
+    /* #endif */
   }
 
   .nut-icon {
-    width: 24px;
-    height: 24px;
+    width: scale-px(24px);
+    height: scale-px(24px);
     color: #ffffff;
   }
 
@@ -122,12 +126,12 @@
     display: flex;
     align-items: center;
     justify-content: center;
-    margin: 3px 0 5px;
+    margin: scale-px(3px) 0 scale-px(5px);
     color: #ffffff;
 
     &-icon {
-      width: 24px;
-      height: 24px;
+      width: scale-px(24px);
+      height: scale-px(24px);
     }
   }
 

package/dist/cjs/packages/toast/toast.js

@@ -157,7 +157,7 @@ var Toast = function Toast(props) {
         className: (0, _classnames.default)("".concat(classPrefix, "-inner"), "".concat(classPrefix, "-").concat(position), contentClassName, "".concat(classPrefix, "-inner-").concat(size), "".concat(classPrefix, "-inner-").concat(wordBreak), (0, _define_property._)({}, "".concat(classPrefix, "-inner-descrption"), content)),
         style: (0, _object_spread._)({}, styles, contentStyle),
         ariaRole: "alert",
-        ariaLabel: title + content
+        ariaLabel: (title !== null && title !== void 0 ? title : '') + (content !== null && content !== void 0 ? content : '')
     }, renderIcon(), title && /*#__PURE__*/ _react.default.createElement(_components.Text, {
         className: "".concat(classPrefix, "-title")
     }, title), content && ((0, _platform.td)() ? /*#__PURE__*/ _react.default.createElement(_components.Text, {

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

@@ -1,11 +1,21 @@
+: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 */
 /* #endif */
 .nut-tour-mask {
   position: fixed;
-  box-shadow: 0px 0px 0px 150vh var(--nutui-color-mask, rgba(0, 0, 0, 0.7));
-  border-radius: var(--nutui-tour-mask-border-radius, 10px);
+  box-shadow: 0 0 0 150vh var(--nutui-color-mask, rgba(0, 0, 0, 0.7));
+  border-radius: var(--nutui-tour-mask-border-radius, calc(10px * var(--nut-scale-f, 1)));
   z-index: 999;
 }
 .nut-tour-mask-none {
@@ -16,8 +26,8 @@
 }
 .nut-tour-content {
   display: block;
-  padding: var(--nutui-tour-content-padding, 10px 12px);
-  min-width: var(--nutui-tour-content-min-width, 200px);
+  padding: var(--nutui-tour-content-padding, calc(10px * var(--nut-scale-f, 1)) calc(12px * var(--nut-scale-f, 1)));
+  min-width: var(--nutui-tour-content-min-width, calc(200px * var(--nut-scale-f, 1)));
   /* #ifndef dynamic*/
   box-sizing: content-box;
   /* #endif */
@@ -27,16 +37,16 @@
   text-align: end;
 }
 .nut-tour-content-top-close {
-  --nut-icon-width: 10px;
-  --nut-icon-height: 10px;
+  width: calc(10px * var(--nut-scale-f, 1));
+  height: calc(10px * var(--nut-scale-f, 1));
 }
 .nut-tour-content-inner {
-  margin: var(--nutui-tour-content-inner-margin, 10px 0px);
-  font-size: var(--nutui-tour-content-inner-font-size, 14px);
+  margin: var(--nutui-tour-content-inner-margin, calc(10px * var(--nut-scale-f, 1)) 0px);
+  font-size: var(--nutui-tour-content-inner-font-size, var(--nutui-font-size-base, calc(14px * var(--nut-scale-font, var(--nut-scale-f, 1)))));
   white-space: nowrap;
 }
 .nut-tour-content-bottom {
-  margin-top: var(--nutui-tour-content-bottom-margin-top, 10px);
+  margin-top: var(--nutui-tour-content-bottom-margin-top, calc(10px * var(--nut-scale-f, 1)));
   display: flex;
   justify-content: space-between;
 }
@@ -46,11 +56,11 @@
 }
 .nut-tour-content-bottom-operate-btn {
   display: inline-block;
-  border: 1px solid var(--nutui-color-text-disabled, #c2c4cc);
-  margin-left: var(--nutui-tour-content-bottom-btn-margin-left, 4px);
-  padding: var(--nutui-tour-content-bottom-btn-padding, 2px 4px);
-  font-size: var(--nutui-tour-content-bottom-btn-font-size, 12px);
-  border-radius: var(--nutui-tour-content-bottom-btn-border-radius, 4px);
+  border: calc(1px * var(--nut-scale-f, 1)) solid var(--nutui-color-text-disabled, #c2c4cc);
+  margin-left: var(--nutui-tour-content-bottom-btn-margin-left, calc(4px * var(--nut-scale-f, 1)));
+  padding: var(--nutui-tour-content-bottom-btn-padding, calc(2px * var(--nut-scale-f, 1)) calc(4px * var(--nut-scale-f, 1)));
+  font-size: var(--nutui-tour-content-bottom-btn-font-size, var(--nutui-font-size-s, calc(12px * var(--nut-scale-font, var(--nut-scale-f, 1)))));
+  border-radius: var(--nutui-tour-content-bottom-btn-border-radius, calc(4px * var(--nut-scale-f, 1)));
   color: var(--nutui-color-text, #505259);
   cursor: pointer;
 }
@@ -75,7 +85,7 @@
 [dir=rtl] .nut-tour-content-bottom-operate-btn,
 .nut-rtl .nut-tour-content-bottom-operate-btn {
   margin-left: 0;
-  margin-right: var(--nutui-tour-content-bottom-btn-margin-left, 4px);
+  margin-right: var(--nutui-tour-content-bottom-btn-margin-left, calc(4px * var(--nut-scale-f, 1)));
 }
 [dir=rtl] .nut-tour-masked,
 .nut-rtl .nut-tour-masked {