@nutui/nutui-react 3.0.20 → 4.0.0-beta.1

package/dist/es/packages/tabs/style-jrkf/tabs.scss

@@ -33,14 +33,14 @@
   &-left {
     justify-content: flex-start;
     .nut-tabs-titles-item {
-      padding: 0 22px;
+      padding: 0 scale-px(22px);
     }
   }
 
   &-right {
     justify-content: flex-end;
     .nut-tabs-titles-item {
-      padding: 0 22px;
+      padding: 0 scale-px(22px);
     }
   }
 
@@ -92,12 +92,17 @@
 
       .nut-icon {
         position: absolute;
-        font-size: 20px;
+        font-size: $font-size-2xl;
         width: 100%;
         height: 100%;
       }
     }
 
+    &-smile-icon {
+      width: scale-px(40px);
+      height: scale-px(20px);
+    }
+
     &-active {
       .nut-icon {
         color: $tabs-titles-item-active-color;
@@ -122,8 +127,8 @@
         /* #ifndef dynamic*/
         overflow: unset;
         /* #endif */
-        width: 40px;
-        height: 20px;
+        width: scale-px(40px);
+        height: scale-px(20px);
 
         .nut-icon {
           color: $tabs-titles-item-active-color;
@@ -166,14 +171,14 @@
 
   &-button {
     .nut-tabs-titles-item {
-      padding: 0 10px;
+      padding: 0 scale-px(10px);
       .nut-tabs-titles-item-text {
         flex: 1;
-        height: 28px;
+        height: scale-px(28px);
         display: flex;
         align-items: center;
         justify-content: center;
-        padding: 0 8px;
+        padding: 0 scale-px(8px);
       }
     }
     .nut-tabs-titles-item-active {
@@ -189,7 +194,7 @@
   }
 
   &-divider {
-    border-bottom: 1px solid $color-border;
+    border-bottom: scale-px(1px) solid $color-border;
 
     .nut-tabs-titles-item {
       position: relative;
@@ -200,7 +205,7 @@
         right: 0;
         top: 50%;
         height: 50%;
-        width: 1px;
+        width: scale-px(1px);
         background: $color-border;
         transform: translateY(-50%);
       }
@@ -218,12 +223,12 @@
   .nut-tabs-ellipsis {
     white-space: break-spaces;
     /* #ifdef harmony dynamic*/
-    padding-left: 12px;
+    padding-left: scale-px(12px);
     /* #endif */
     /* #ifndef harmony dynamic*/
-    padding-left: 6px;
+    padding-left: scale-px(6px);
     /* #endif */
-    width: 90px;
+    width: scale-px(90px);
     line-height: $font-size-base;
   }
 
@@ -259,14 +264,14 @@
     &-active {
       background-color: $tabs-titles-item-active-background-color;
       .nut-tabs-titles-item-line {
-        left: 10px;
+        left: scale-px(10px);
         width: $tabs-vertical-tab-line-width;
         height: $tabs-vertical-tab-line-height;
         background: $tabs-vertical-tab-line-color;
       }
 
       .nut-tabs-titles-item-smile {
-        right: -12px;
+        right: scale-px(-12px);
         bottom: -2%;
         left: auto;
         transform: rotate(320deg);
@@ -305,7 +310,7 @@
       .nut-tabs-titles-item-smile {
         left: 50%;
         right: auto;
-        bottom: -3px;
+        bottom: scale-px(-3px);
         transform: translate(-50%, 0) rotate(0deg);
       }
     }
@@ -360,7 +365,7 @@
     &-line {
       .nut-tabs-titles-item {
         padding-left: 0;
-        padding-right: 14px;
+        padding-right: scale-px(14px);
       }
     }
   }
@@ -369,11 +374,11 @@
     &-active {
       .nut-tabs-titles-item-line {
         left: auto;
-        right: 10px;
+        right: scale-px(10px);
       }
 
       .nut-tabs-titles-item-smile {
-        left: -12px;
+        left: scale-px(-12px);
         right: auto;
         transform: rotate(-320deg);
       }

package/dist/es/packages/tabs/tabs.js

@@ -165,8 +165,7 @@ export var Tabs = function(props) {
             className: "".concat(classPrefix, "-titles-item-smile")
         }, /*#__PURE__*/ React.createElement(JoySmile, {
             color: activeColor,
-            width: 40,
-            height: 20
+            className: "".concat(classPrefix, "-titles-item-smile-icon")
         })), /*#__PURE__*/ React.createElement("div", {
             className: classNames(_define_property({}, "".concat(classPrefix, "-ellipsis"), direction === 'vertical'), "".concat(classPrefix, "-titles-item-text")),
             style: {

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

@@ -1,26 +1,36 @@
+: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-tag {
-  padding: var(--nutui-tag-padding, 0px 2px);
+  padding: var(--nutui-tag-padding, 0px calc(2px * var(--nut-scale-f, 1)));
   display: flex;
   flex-direction: row;
   justify-content: center;
   align-items: center;
-  font-size: var(--nutui-tag-font-size, var(--nutui-font-size-xxs, 10px));
-  border-radius: var(--nutui-tag-border-radius, 2px);
-  height: var(--nutui-tag-height, 14px);
+  font-size: var(--nutui-tag-font-size, var(--nutui-font-size-xxs, calc(10px * var(--nut-scale-font, var(--nut-scale-f, 1)))));
+  border-radius: var(--nutui-tag-border-radius, calc(2px * var(--nut-scale-f, 1)));
+  height: var(--nutui-tag-height, calc(14px * var(--nut-scale-f, 1)));
   color: var(--nutui-tag-color, #ffffff);
-  border: var(--nutui-tag-border-width, 1px) solid transparent;
+  border: var(--nutui-tag-border-width, calc(1px * var(--nut-scale-f, 1))) solid transparent;
 }
 .nut-tag .nut-icon {
   vertical-align: middle;
-  margin-left: 4px;
+  margin-left: calc(4px * var(--nut-scale-f, 1));
   color: var(--nutui-tag-color, #ffffff);
 }
 .nut-tag-text {
-  font-size: var(--nutui-tag-font-size, var(--nutui-font-size-xxs, 10px));
+  font-size: var(--nutui-tag-font-size, var(--nutui-font-size-xxs, calc(10px * var(--nut-scale-font, var(--nut-scale-f, 1)))));
   color: var(--nutui-tag-color, #ffffff);
 }
 .nut-tag-text-plain {
@@ -30,10 +40,10 @@
   background: var(--nutui-tag-background-color, var(--nutui-color-title, #1a1a1a));
 }
 .nut-tag-primary {
-  background: var(--nutui-tag-primary-background-color, linear-gradient(135deg, var(--nutui-color-primary-stop-1, #ff475d) 0%, var(--nutui-color-primary-stop-2, #ff0f23) 100%));
+  background: #fa2c19;
 }
 .nut-tag-info {
-  background: var(--nutui-tag-info-background-color, var(--nutui-color-info, #0073ff));
+  background: var(--nutui-tag-info-background-color, var(--nutui-color-info, #0c82f7));
 }
 .nut-tag-success {
   background: var(--nutui-tag-success-background-color, #4fc08d);
@@ -42,13 +52,13 @@
   background: var(--nutui-tag-danger-background-color, var(--nutui-color-danger, #ff0f23));
 }
 .nut-tag-warning {
-  background: var(--nutui-tag-warning-background-color, var(--nutui-color-warning, #ffbf00));
+  background: var(--nutui-tag-warning-background-color, var(--nutui-color-warning, #ffaa00));
 }
 .nut-tag-round {
-  border-radius: var(--nutui-tag-round-border-radius, 8px);
+  border-radius: var(--nutui-tag-round-border-radius, calc(8px * var(--nut-scale-f, 1)));
 }
 .nut-tag-mark {
-  border-radius: var(--nutui-tag-mark-border-radius, 0 8px 8px 0);
+  border-radius: var(--nutui-tag-mark-border-radius, 0 calc(8px * var(--nut-scale-f, 1)) calc(8px * var(--nut-scale-f, 1)) 0);
 }
 .nut-tag-close {
   cursor: pointer;
@@ -62,17 +72,21 @@
   /* #endif */
   align-items: center;
   justify-content: center;
-  font-size: var(--nutui-tag-font-size, var(--nutui-font-size-xxs, 10px));
+  font-size: var(--nutui-tag-font-size, var(--nutui-font-size-xxs, calc(10px * var(--nut-scale-font, var(--nut-scale-f, 1)))));
   color: var(--nutui-tag-color, #ffffff);
-  margin-left: 4px;
+  margin-left: calc(4px * var(--nut-scale-f, 1));
 }
 .nut-tag-plain {
   background-color: #fff;
-  border: var(--nutui-tag-border-width, 1px) solid var(--nutui-color-title, #1a1a1a);
+  border: var(--nutui-tag-border-width, calc(1px * var(--nut-scale-f, 1))) solid var(--nutui-color-title, #1a1a1a);
+}
+.nut-tag-close-icon {
+  width: var(--nutui-icon-size-8, calc(8px * var(--nut-scale-icon, var(--nut-scale-f, 1))));
+  height: var(--nutui-icon-size-8, calc(8px * var(--nut-scale-icon, var(--nut-scale-f, 1))));
 }
 
 [dir=rtl] .nut-tag .nut-icon,
 .nut-rtl .nut-tag .nut-icon {
   margin-left: 0;
-  margin-right: 4px;
+  margin-right: calc(4px * var(--nut-scale-f, 1));
 }

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

@@ -12,7 +12,7 @@
 
   .nut-icon {
     vertical-align: middle;
-    margin-left: 4px;
+    margin-left: scale-px(4px);
     color: $tag-color;
   }
 
@@ -30,7 +30,7 @@
   }
 
   &-primary {
-    background: $tag-primary-background-color;
+    background: #fa2c19;
   }
 
   &-info {
@@ -72,19 +72,24 @@
     justify-content: center;
     font-size: $tag-font-size;
     color: $tag-color;
-    margin-left: 4px;
+    margin-left: scale-px(4px);
   }
 
   &-plain {
     background-color: #fff;
     border: $tag-border-width solid $color-title;
   }
+
+  &-close-icon {
+    width: $icon-size-8;
+    height: $icon-size-8;
+  }
 }
 
 [dir='rtl'] .nut-tag,
 .nut-rtl .nut-tag {
   .nut-icon {
     margin-left: 0;
-    margin-right: 4px;
+    margin-right: scale-px(4px);
   }
 }

package/dist/es/packages/tag/style-jmapp/style.css

@@ -16,7 +16,7 @@
 }
 .nut-tag .nut-icon {
   vertical-align: middle;
-  margin-left: 4px;
+  margin-left: scale-px(4px);
   color: var(--nutui-tag-color, var(--nutui-color-text-dark));
 }
 .nut-tag-text {
@@ -30,7 +30,7 @@
   background: var(--nutui-tag-background-color, var(--nutui-color-title));
 }
 .nut-tag-primary {
-  background: var(--nutui-tag-primary-background-color, var(--nutui-color-primary));
+  background: #fa2c19;
 }
 .nut-tag-info {
   background: var(--nutui-tag-info-background-color, var(--nutui-color-info));
@@ -64,15 +64,19 @@
   justify-content: center;
   font-size: var(--nutui-tag-font-size, var(--nutui-font-text-xs));
   color: var(--nutui-tag-color, var(--nutui-color-text-dark));
-  margin-left: 4px;
+  margin-left: scale-px(4px);
 }
 .nut-tag-plain {
   background-color: #fff;
   border: var(--nutui-tag-border-width, 1px) solid var(--nutui-color-title);
 }
+.nut-tag-close-icon {
+  width: var(--nutui-icon-size-8, 8px);
+  height: var(--nutui-icon-size-8, 8px);
+}
 
 [dir=rtl] .nut-tag .nut-icon,
 .nut-rtl .nut-tag .nut-icon {
   margin-left: 0;
-  margin-right: 4px;
+  margin-right: scale-px(4px);
 }

package/dist/es/packages/tag/style-jmapp/tag.scss

@@ -12,7 +12,7 @@
 
   .nut-icon {
     vertical-align: middle;
-    margin-left: 4px;
+    margin-left: scale-px(4px);
     color: $tag-color;
   }
 
@@ -30,7 +30,7 @@
   }
 
   &-primary {
-    background: $tag-primary-background-color;
+    background: #fa2c19;
   }
 
   &-info {
@@ -72,19 +72,24 @@
     justify-content: center;
     font-size: $tag-font-size;
     color: $tag-color;
-    margin-left: 4px;
+    margin-left: scale-px(4px);
   }
 
   &-plain {
     background-color: #fff;
     border: $tag-border-width solid $color-title;
   }
+
+  &-close-icon {
+    width: $icon-size-8;
+    height: $icon-size-8;
+  }
 }
 
 [dir='rtl'] .nut-tag,
 .nut-rtl .nut-tag {
   .nut-icon {
     margin-left: 0;
-    margin-right: 4px;
+    margin-right: scale-px(4px);
   }
 }

package/dist/es/packages/tag/style-jrkf/style.css

@@ -16,7 +16,7 @@
 }
 .nut-tag .nut-icon {
   vertical-align: middle;
-  margin-left: 4px;
+  margin-left: scale-px(4px);
   color: var(--nutui-tag-color, var(--nutui-color-text-dark));
 }
 .nut-tag-text {
@@ -30,7 +30,7 @@
   background: var(--nutui-tag-background-color, var(--nutui-color-title));
 }
 .nut-tag-primary {
-  background: var(--nutui-tag-primary-background-color, var(--nutui-color-primary, #ff6666));
+  background: #fa2c19;
 }
 .nut-tag-info {
   background: var(--nutui-tag-info-background-color, var(--nutui-color-info));
@@ -64,15 +64,19 @@
   justify-content: center;
   font-size: var(--nutui-tag-font-size, var(--nutui-font-text-xs));
   color: var(--nutui-tag-color, var(--nutui-color-text-dark));
-  margin-left: 4px;
+  margin-left: scale-px(4px);
 }
 .nut-tag-plain {
   background-color: #fff;
   border: var(--nutui-tag-border-width, 1px) solid var(--nutui-color-title);
 }
+.nut-tag-close-icon {
+  width: var(--nutui-icon-size-8, 8px);
+  height: var(--nutui-icon-size-8, 8px);
+}
 
 [dir=rtl] .nut-tag .nut-icon,
 .nut-rtl .nut-tag .nut-icon {
   margin-left: 0;
-  margin-right: 4px;
+  margin-right: scale-px(4px);
 }

package/dist/es/packages/tag/style-jrkf/tag.scss

@@ -12,7 +12,7 @@
 
   .nut-icon {
     vertical-align: middle;
-    margin-left: 4px;
+    margin-left: scale-px(4px);
     color: $tag-color;
   }
 
@@ -30,7 +30,7 @@
   }
 
   &-primary {
-    background: $tag-primary-background-color;
+    background: #fa2c19;
   }
 
   &-info {
@@ -72,19 +72,24 @@
     justify-content: center;
     font-size: $tag-font-size;
     color: $tag-color;
-    margin-left: 4px;
+    margin-left: scale-px(4px);
   }
 
   &-plain {
     background-color: #fff;
     border: $tag-border-width solid $color-title;
   }
+
+  &-close-icon {
+    width: $icon-size-8;
+    height: $icon-size-8;
+  }
 }
 
 [dir='rtl'] .nut-tag,
 .nut-rtl .nut-tag {
   .nut-icon {
     margin-left: 0;
-    margin-right: 4px;
+    margin-right: scale-px(4px);
   }
 }

package/dist/es/packages/tag/tag.js

@@ -65,8 +65,7 @@ export var Tag = function(props) {
             onClose && onClose(e);
         }
     }, closeIcon) : /*#__PURE__*/ React.createElement(Close, {
-        width: 8,
-        height: 8,
+        className: "".concat(classPrefix, "-close-icon"),
         onClick: function(e) {
             setVisible(false);
             onClose && onClose(e);

package/dist/es/packages/textarea/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 */
@@ -8,22 +18,22 @@
   position: relative;
   width: 100%;
   box-sizing: border-box;
-  font-size: var(--nutui-font-size-base, 14px);
-  border-radius: var(--nutui-radius-s, 6px);
+  font-size: var(--nutui-font-size-base, calc(14px * var(--nut-scale-font, var(--nut-scale-f, 1))));
+  border-radius: var(--nutui-radius-s, calc(6px * var(--nut-scale-f, 1)));
 }
 .nut-textarea-container {
-  padding: var(--nutui-textarea-padding, 12px);
+  padding: var(--nutui-textarea-padding, calc(12px * var(--nut-scale-f, 1)));
   background-color: var(--nutui-color-background-overlay, #ffffff);
 }
 .nut-textarea-error {
-  border: 0.5px solid var(--nutui-color-danger, #ff0f23);
+  border: calc(0.5px * var(--nut-scale-f, 1)) solid var(--nutui-color-danger, #ff0f23);
   background-color: var(--nutui-color-danger-light, #ffebef);
 }
 .nut-textarea-limit {
   text-align: right;
-  font-size: var(--nutui-font-size-base, 14px);
-  line-height: var(--nutui-font-size-base, 14px);
-  margin-top: var(--nutui-spacing-base, 8px);
+  font-size: var(--nutui-font-size-base, calc(14px * var(--nut-scale-font, var(--nut-scale-f, 1))));
+  line-height: var(--nutui-font-size-base, calc(14px * var(--nut-scale-font, var(--nut-scale-f, 1))));
+  margin-top: var(--nutui-spacing-base, calc(8px * var(--nut-scale-f, 1)));
   color: var(--nutui-color-text-help, #888b94);
 }
 .nut-textarea-limit-disabled {
@@ -35,11 +45,11 @@
   display: block;
   box-sizing: border-box;
   width: 100%;
-  height: 40px;
+  height: calc(40px * var(--nut-scale-f, 1));
   min-width: 0;
   margin: 0;
   padding: 0;
-  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))));
   color: var(--nutui-textarea-text-color, var(--nutui-color-title, #1a1a1a));
   caret-color: var(--nutui-textarea-text-curror-color, var(--nutui-color-primary, #ff0f23));
   text-align: left;
@@ -70,7 +80,7 @@
 }
 .nut-textarea.nut-textarea-rtl-limit {
   right: auto;
-  left: 15px;
+  left: calc(15px * var(--nut-scale-f, 1));
 }
 
 .taro-textarea {

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

@@ -13,7 +13,7 @@
   }
 
   &-error {
-    border: 0.5px solid $color-danger;
+    border: scale-px(0.5px) solid $color-danger;
     background-color: $color-danger-light;
   }
 
@@ -34,7 +34,7 @@
     display: block;
     box-sizing: border-box;
     width: 100%;
-    height: 40px;
+    height: scale-px(40px);
     min-width: 0;
     margin: 0;
     padding: 0;
@@ -87,7 +87,7 @@
   &.nut-textarea-rtl {
     &-limit {
       right: auto;
-      left: 15px;
+      left: scale-px(15px);
     }
   }
 }

package/dist/es/packages/textarea/style-jmapp/style.css

@@ -16,7 +16,7 @@
   background-color: var(--nutui-color-surface-2);
 }
 .nut-textarea-error {
-  border: 0.5px solid var(--nutui-color-danger);
+  border: scale-px(0.5px) solid var(--nutui-color-danger);
   background-color: var(--nutui-color-danger-light);
 }
 .nut-textarea-limit {
@@ -35,7 +35,7 @@
   display: block;
   box-sizing: border-box;
   width: 100%;
-  height: 40px;
+  height: scale-px(40px);
   min-width: 0;
   margin: 0;
   padding: 0;
@@ -70,7 +70,7 @@
 }
 .nut-textarea.nut-textarea-rtl-limit {
   right: auto;
-  left: 15px;
+  left: scale-px(15px);
 }
 
 .taro-textarea {

package/dist/es/packages/textarea/style-jmapp/textarea.scss

@@ -13,7 +13,7 @@
   }
 
   &-error {
-    border: 0.5px solid $color-danger;
+    border: scale-px(0.5px) solid $color-danger;
     background-color: $color-danger-light;
   }
 
@@ -34,7 +34,7 @@
     display: block;
     box-sizing: border-box;
     width: 100%;
-    height: 40px;
+    height: scale-px(40px);
     min-width: 0;
     margin: 0;
     padding: 0;
@@ -87,7 +87,7 @@
   &.nut-textarea-rtl {
     &-limit {
       right: auto;
-      left: 15px;
+      left: scale-px(15px);
     }
   }
 }

package/dist/es/packages/textarea/style-jrkf/style.css

@@ -16,7 +16,7 @@
   background-color: var(--nutui-color-surface-2);
 }
 .nut-textarea-error {
-  border: 0.5px solid var(--nutui-color-danger);
+  border: scale-px(0.5px) solid var(--nutui-color-danger);
   background-color: var(--nutui-color-danger-light);
 }
 .nut-textarea-limit {
@@ -35,7 +35,7 @@
   display: block;
   box-sizing: border-box;
   width: 100%;
-  height: 40px;
+  height: scale-px(40px);
   min-width: 0;
   margin: 0;
   padding: 0;
@@ -70,7 +70,7 @@
 }
 .nut-textarea.nut-textarea-rtl-limit {
   right: auto;
-  left: 15px;
+  left: scale-px(15px);
 }
 
 .taro-textarea {

package/dist/es/packages/textarea/style-jrkf/textarea.scss

@@ -13,7 +13,7 @@
   }
 
   &-error {
-    border: 0.5px solid $color-danger;
+    border: scale-px(0.5px) solid $color-danger;
     background-color: $color-danger-light;
   }
 
@@ -34,7 +34,7 @@
     display: block;
     box-sizing: border-box;
     width: 100%;
-    height: 40px;
+    height: scale-px(40px);
     min-width: 0;
     margin: 0;
     padding: 0;
@@ -87,7 +87,7 @@
   &.nut-textarea-rtl {
     &-limit {
       right: auto;
-      left: 15px;
+      left: scale-px(15px);
     }
   }
 }

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

@@ -1,3 +1,3 @@
 import React from 'react';
 import { WebTextAreaProps } from "../../types";
-export declare const TextArea: React.ForwardRefExoticComponent<Partial<WebTextAreaProps> & Omit<React.HTMLAttributes<HTMLTextAreaElement>, "onFocus" | "onBlur" | "onChange"> & React.RefAttributes<unknown>>;
+export declare const TextArea: React.ForwardRefExoticComponent<Partial<WebTextAreaProps> & Omit<React.HTMLAttributes<HTMLTextAreaElement>, "onChange" | "onBlur" | "onFocus"> & React.RefAttributes<unknown>>;