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

package/dist/es/packages/layout/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/loading/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 */
@@ -24,16 +34,16 @@
 }
 .nut-loading .nut-loading-icon-box .nut-loading-icon {
   color: var(--nutui-loading-icon-color, var(--nutui-color-text-help, #888b94));
-  width: var(--nutui-loading-icon-size, var(--nutui-font-size-s, 12px));
-  height: var(--nutui-loading-icon-size, var(--nutui-font-size-s, 12px));
-  font-size: var(--nutui-loading-icon-size, var(--nutui-font-size-s, 12px));
+  width: var(--nutui-loading-icon-size, var(--nutui-font-size-s, calc(12px * var(--nut-scale-font, var(--nut-scale-f, 1)))));
+  height: var(--nutui-loading-icon-size, var(--nutui-font-size-s, calc(12px * var(--nut-scale-font, var(--nut-scale-f, 1)))));
+  font-size: var(--nutui-loading-icon-size, var(--nutui-font-size-s, calc(12px * var(--nut-scale-font, var(--nut-scale-f, 1)))));
 }
 .nut-loading .nut-loading-text {
   color: var(--nutui-loading-color, var(--nutui-color-text-help, #888b94));
-  font-size: var(--nutui-loading-font-size, var(--nutui-font-size-s, 12px));
+  font-size: var(--nutui-loading-font-size, var(--nutui-font-size-s, calc(12px * var(--nut-scale-font, var(--nut-scale-f, 1)))));
 }
 .nut-loading-vertical .nut-loading-text {
-  padding-top: var(--nutui-spacing-base, 8px);
+  padding-top: var(--nutui-spacing-base, calc(8px * var(--nut-scale-f, 1)));
 }
 
 @keyframes nut-loading-rotation {

package/dist/es/packages/lottie/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/menu/menu.js

@@ -117,13 +117,9 @@ export var Menu = function(props) {
                     if (titleIcon) return titleIcon;
                     if (icon) return icon;
                     return direction === 'up' ? /*#__PURE__*/ React.createElement(ArrowUp, {
-                        className: "nut-menu-title-icon",
-                        width: "12px",
-                        height: "12px"
+                        className: "nut-menu-title-icon"
                     }) : /*#__PURE__*/ React.createElement(ArrowDown, {
-                        className: "nut-menu-title-icon",
-                        width: "12px",
-                        height: "12px"
+                        className: "nut-menu-title-icon"
                     });
                 };
                 return /*#__PURE__*/ React.createElement("div", {

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

@@ -41,6 +41,8 @@
   }
 
   &-icon {
+    width: $icon-size-12;
+    height: $icon-size-12;
     flex-shrink: 0;
     transition: all 0.2s linear;
   }

package/dist/es/packages/menu/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 */
@@ -15,9 +25,9 @@
 .nut-menu-bar {
   position: relative;
   display: flex;
-  line-height: var(--nutui-menu-bar-line-height, 48px);
+  line-height: var(--nutui-menu-bar-line-height, calc(48px * var(--nut-scale-f, 1)));
   background-color: var(--nutui-color-background-overlay, #ffffff);
-  box-shadow: var(--nutui-menu-bar-box-shadow, 0 2px 12px rgba(89, 89, 89, 0.12));
+  box-shadow: var(--nutui-menu-bar-box-shadow, 0 calc(2px * var(--nut-scale-f, 1)) calc(12px * var(--nut-scale-f, 1)) rgba(89, 89, 89, 0.12));
 }
 .nut-menu-bar.opened {
   z-index: var(--nutui-menu-bar-opened-z-index, 1000);
@@ -26,7 +36,7 @@
 .nut-menu-title {
   flex: 1;
   text-align: center;
-  font-size: var(--nutui-menu-title-font-size, var(--nutui-font-size-base, 14px));
+  font-size: var(--nutui-menu-title-font-size, var(--nutui-font-size-base, calc(14px * var(--nut-scale-font, var(--nut-scale-f, 1)))));
   color: var(--nutui-menu-title-color, var(--nutui-color-title, #1a1a1a));
   min-width: 0;
   display: flex;
@@ -39,9 +49,11 @@
   overflow: hidden;
   text-overflow: ellipsis;
   display: block;
-  padding: var(--nutui-menu-title-padding, 0 8px);
+  padding: var(--nutui-menu-title-padding, 0 calc(8px * var(--nut-scale-f, 1)));
 }
 .nut-menu-title-icon {
+  width: var(--nutui-icon-size-12, calc(12px * var(--nut-scale-icon, var(--nut-scale-f, 1))));
+  height: var(--nutui-icon-size-12, calc(12px * var(--nut-scale-icon, var(--nut-scale-f, 1))));
   flex-shrink: 0;
   transition: all 0.2s linear;
 }

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

@@ -41,6 +41,8 @@
   }
 
   &-icon {
+    width: $icon-size-12;
+    height: $icon-size-12;
     flex-shrink: 0;
     transition: all 0.2s linear;
   }

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

@@ -42,6 +42,8 @@
   padding: var(--nutui-menu-title-padding, 0 8px);
 }
 .nut-menu-title-icon {
+  width: var(--nutui-icon-size-12, 12px);
+  height: var(--nutui-icon-size-12, 12px);
   flex-shrink: 0;
   transition: all 0.2s linear;
 }

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

@@ -41,6 +41,8 @@
   }
 
   &-icon {
+    width: $icon-size-12;
+    height: $icon-size-12;
     flex-shrink: 0;
     transition: all 0.2s linear;
   }

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

@@ -42,6 +42,8 @@
   padding: var(--nutui-menu-title-padding, 0 8px);
 }
 .nut-menu-title-icon {
+  width: var(--nutui-icon-size-12, 12px);
+  height: var(--nutui-icon-size-12, 12px);
   flex-shrink: 0;
   transition: all 0.2s linear;
 }

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

@@ -26,6 +26,11 @@
       color: $menu-item-active-color;
     }
 
+    &-icon {
+      display: flex;
+      align-items: center;
+    }
+
     .nut-icon {
       /* #ifdef dynamic*/
       display: flex;
@@ -72,7 +77,7 @@
 
 .nut-menu-container-down-enter {
   opacity: 0;
-  transform: translate(0, -30px);
+  transform: translate(0, scale-px(-30px));
 }
 
 .nut-menu-container-down-enter-done {
@@ -93,7 +98,7 @@
 
 .nut-menu-container-up-enter {
   opacity: 0;
-  transform: translate(0, 30px);
+  transform: translate(0, scale-px(30px));
 }
 
 .nut-menu-container-up-enter-done {

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

@@ -1,10 +1,20 @@
+: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-menu-container-content {
-  padding: var(--nutui-menu-content-padding, 12px 24px);
-  max-height: var(--nutui-menu-content-max-height, 214px);
+  padding: var(--nutui-menu-content-padding, calc(12px * var(--nut-scale-f, 1)) calc(24px * var(--nut-scale-f, 1)));
+  max-height: var(--nutui-menu-content-max-height, calc(214px * var(--nut-scale-f, 1)));
   overflow-y: auto;
   display: flex;
   flex-wrap: wrap;
@@ -19,13 +29,17 @@
   display: flex;
   align-items: center;
   color: var(--nutui-color-title, #1a1a1a);
-  font-size: var(--nutui-font-size-base, 14px);
-  padding: var(--nutui-menu-item-padding, 12px 0);
+  font-size: var(--nutui-font-size-base, calc(14px * var(--nut-scale-font, var(--nut-scale-f, 1))));
+  padding: var(--nutui-menu-item-padding, calc(12px * var(--nut-scale-f, 1)) 0);
 }
 .nut-menu-container-item.active {
   font-weight: var(--nutui-menu-item-active-font-weight, var(--nutui-font-weight-bold, 600));
   color: var(--nutui-menu-item-active-color, var(--nutui-color-primary, #ff0f23));
 }
+.nut-menu-container-item-icon {
+  display: flex;
+  align-items: center;
+}
 .nut-menu-container-item .nut-icon {
   /* #ifdef dynamic*/
   display: flex;
@@ -34,7 +48,7 @@
   display: inline-flex;
   /* #endif */
   align-items: center;
-  margin-right: var(--nutui-menu-item-icon-margin, 8px);
+  margin-right: var(--nutui-menu-item-icon-margin, calc(8px * var(--nut-scale-f, 1)));
   flex-shrink: 0;
 }
 .nut-menu-container-wrap, .nut-menu-container-wrap-up {
@@ -44,7 +58,7 @@
   overflow: hidden;
 }
 .nut-menu-container-wrap-up {
-  bottom: var(--nutui-menu-bar-line-height, 48px);
+  bottom: var(--nutui-menu-bar-line-height, calc(48px * var(--nut-scale-f, 1)));
 }
 
 .overlay-fade-enter-active.nut-menu-container-overlay {
@@ -66,7 +80,7 @@
 
 .nut-menu-container-down-enter {
   opacity: 0;
-  transform: translate(0, -30px);
+  transform: translate(0, calc(-30px * var(--nut-scale-f, 1)));
 }
 
 .nut-menu-container-down-enter-done {
@@ -87,7 +101,7 @@
 
 .nut-menu-container-up-enter {
   opacity: 0;
-  transform: translate(0, 30px);
+  transform: translate(0, calc(30px * var(--nut-scale-f, 1)));
 }
 
 .nut-menu-container-up-enter-done {
@@ -109,7 +123,7 @@
 [dir=rtl] .nut-menu-container-item .nut-icon,
 .nut-rtl .nut-menu-container-item .nut-icon {
   margin-right: 0;
-  margin-left: var(--nutui-menu-item-icon-margin, 8px);
+  margin-left: var(--nutui-menu-item-icon-margin, calc(8px * var(--nut-scale-f, 1)));
 }
 [dir=rtl] .nut-menu-container .nut-icon,
 .nut-rtl .nut-menu-container .nut-icon {

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

@@ -26,6 +26,11 @@
       color: $menu-item-active-color;
     }
 
+    &-icon {
+      display: flex;
+      align-items: center;
+    }
+
     .nut-icon {
       /* #ifdef dynamic*/
       display: flex;
@@ -72,7 +77,7 @@
 
 .nut-menu-container-down-enter {
   opacity: 0;
-  transform: translate(0, -30px);
+  transform: translate(0, scale-px(-30px));
 }
 
 .nut-menu-container-down-enter-done {
@@ -93,7 +98,7 @@
 
 .nut-menu-container-up-enter {
   opacity: 0;
-  transform: translate(0, 30px);
+  transform: translate(0, scale-px(30px));
 }
 
 .nut-menu-container-up-enter-done {

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

@@ -26,6 +26,10 @@
   font-weight: var(--nutui-menu-item-active-font-weight, var(--nutui-font-weight-bold));
   color: var(--nutui-menu-item-active-color, var(--nutui-color-primary));
 }
+.nut-menu-container-item-icon {
+  display: flex;
+  align-items: center;
+}
 .nut-menu-container-item .nut-icon {
   /* #ifdef dynamic*/
   display: flex;
@@ -66,7 +70,7 @@
 
 .nut-menu-container-down-enter {
   opacity: 0;
-  transform: translate(0, -30px);
+  transform: translate(0, scale-px(-30px));
 }
 
 .nut-menu-container-down-enter-done {
@@ -87,7 +91,7 @@
 
 .nut-menu-container-up-enter {
   opacity: 0;
-  transform: translate(0, 30px);
+  transform: translate(0, scale-px(30px));
 }
 
 .nut-menu-container-up-enter-done {

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

@@ -26,6 +26,11 @@
       color: $menu-item-active-color;
     }
 
+    &-icon {
+      display: flex;
+      align-items: center;
+    }
+
     .nut-icon {
       /* #ifdef dynamic*/
       display: flex;
@@ -72,7 +77,7 @@
 
 .nut-menu-container-down-enter {
   opacity: 0;
-  transform: translate(0, -30px);
+  transform: translate(0, scale-px(-30px));
 }
 
 .nut-menu-container-down-enter-done {
@@ -93,7 +98,7 @@
 
 .nut-menu-container-up-enter {
   opacity: 0;
-  transform: translate(0, 30px);
+  transform: translate(0, scale-px(30px));
 }
 
 .nut-menu-container-up-enter-done {

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

@@ -26,6 +26,10 @@
   font-weight: var(--nutui-menu-item-active-font-weight, var(--nutui-font-weight-bold));
   color: var(--nutui-menu-item-active-color, var(--nutui-color-primary, #ff6666));
 }
+.nut-menu-container-item-icon {
+  display: flex;
+  align-items: center;
+}
 .nut-menu-container-item .nut-icon {
   /* #ifdef dynamic*/
   display: flex;
@@ -66,7 +70,7 @@
 
 .nut-menu-container-down-enter {
   opacity: 0;
-  transform: translate(0, -30px);
+  transform: translate(0, scale-px(-30px));
 }
 
 .nut-menu-container-down-enter-done {
@@ -87,7 +91,7 @@
 
 .nut-menu-container-up-enter {
   opacity: 0;
-  transform: translate(0, 30px);
+  transform: translate(0, scale-px(30px));
 }
 
 .nut-menu-container-up-enter-done {

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

@@ -12,7 +12,7 @@
   font-size: $navbar-font-size;
   color: $navbar-color;
   overflow: hidden;
-  padding: 0 16px;
+  padding: 0 scale-px(16px);
 
   &-fixed {
     position: fixed;
@@ -48,9 +48,10 @@
     font-size: $navbar-title-font-size;
     font-weight: $navbar-title-font-weight;
     color: $navbar-title-font-color;
+    white-space: nowrap;
 
     &-center {
-      max-width: 129px;
+      max-width: scale-px(129px);
       justify-content: center;
     }
   }
@@ -64,31 +65,31 @@
     display: flex;
     align-items: center;
     flex-direction: row;
-    max-width: 124px;
+    max-width: scale-px(124px);
     height: 100%;
     cursor: pointer;
     /* #ifndef harmony jd h5 weapp*/
     .nut-icon,
     .nutui-iconfont {
-      width: 20px;
-      height: 20px;
-      font-size: 20px;
+      width: scale-px(20px);
+      height: scale-px(20px);
+      font-size: $font-size-2xl;
     }
 
     /* #endif */
     &-maxwidth {
       box-sizing: border-box;
-      width: calc(124px - 16px);
+      width: calc(scale-px(124px) - scale-px(16px));
     }
   }
 
   &-left {
-    padding-right: 16px;
-    gap: 16px;
+    padding-right: scale-px(16px);
+    gap: scale-px(16px);
 
     &-rtl {
       padding-right: 0;
-      padding-left: 16px;
+      padding-left: scale-px(16px);
     }
 
     &-back {
@@ -96,7 +97,7 @@
       flex-direction: row;
       align-items: center;
       justify-content: center;
-      gap: 16px;
+      gap: scale-px(16px);
     }
 
     &-hidden {
@@ -106,12 +107,12 @@
   }
 
   &-right {
-    padding-left: 16px;
+    padding-left: scale-px(16px);
     justify-content: flex-end;
-    gap: 16px;
+    gap: scale-px(16px);
 
     &-rtl {
-      padding-right: 16px;
+      padding-right: scale-px(16px);
       padding-left: 0;
     }
   }

package/dist/es/packages/navbar/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 */
@@ -9,14 +19,14 @@
   flex-direction: row;
   justify-content: space-between;
   align-items: center;
-  height: var(--nutui-navbar-height, 44px);
+  height: var(--nutui-navbar-height, calc(44px * var(--nut-scale-f, 1)));
   box-sizing: border-box;
   background: var(--nutui-navbar-background, #ffffff);
   box-shadow: var(--nutui-navbar-box-shadow, none);
-  font-size: var(--nutui-navbar-font-size, var(--nutui-font-size-base, 14px));
+  font-size: var(--nutui-navbar-font-size, var(--nutui-font-size-base, calc(14px * var(--nut-scale-font, var(--nut-scale-f, 1)))));
   color: var(--nutui-navbar-color, var(--nutui-color-title, #1a1a1a));
   overflow: hidden;
-  padding: 0 16px;
+  padding: 0 calc(16px * var(--nut-scale-f, 1));
 }
 .nut-navbar-fixed {
   position: fixed;
@@ -45,12 +55,13 @@
   flex: 1;
   flex-direction: row;
   align-items: center;
-  font-size: var(--nutui-navbar-title-font-size, var(--nutui-font-size-xl, 18px));
+  font-size: var(--nutui-navbar-title-font-size, var(--nutui-font-size-xl, calc(18px * var(--nut-scale-font, var(--nut-scale-f, 1)))));
   font-weight: var(--nutui-navbar-title-font-weight, var(--nutui-font-weight-bold, 600));
   color: var(--nutui-navbar-title-font-color, var(--nutui-color-title, #1a1a1a));
+  white-space: nowrap;
 }
 .nut-navbar-title-center {
-  max-width: 129px;
+  max-width: calc(129px * var(--nut-scale-f, 1));
   justify-content: center;
 }
 .nut-navbar-title ::-webkit-scrollbar {
@@ -60,7 +71,7 @@
   display: flex;
   align-items: center;
   flex-direction: row;
-  max-width: 124px;
+  max-width: calc(124px * var(--nut-scale-f, 1));
   height: 100%;
   cursor: pointer;
   /* #ifndef harmony jd h5 weapp*/
@@ -69,40 +80,40 @@
 .nut-navbar-left .nut-icon,
 .nut-navbar-left .nutui-iconfont, .nut-navbar-right .nut-icon,
 .nut-navbar-right .nutui-iconfont {
-  width: 20px;
-  height: 20px;
-  font-size: 20px;
+  width: calc(20px * var(--nut-scale-f, 1));
+  height: calc(20px * var(--nut-scale-f, 1));
+  font-size: var(--nutui-font-size-2xl, calc(20px * var(--nut-scale-font, var(--nut-scale-f, 1))));
 }
 .nut-navbar-left-maxwidth, .nut-navbar-right-maxwidth {
   box-sizing: border-box;
-  width: 108px;
+  width: calc(124px * var(--nut-scale-f, 1) - 16px * var(--nut-scale-f, 1));
 }
 .nut-navbar-left {
-  padding-right: 16px;
-  gap: 16px;
+  padding-right: calc(16px * var(--nut-scale-f, 1));
+  gap: calc(16px * var(--nut-scale-f, 1));
 }
 .nut-navbar-left-rtl {
   padding-right: 0;
-  padding-left: 16px;
+  padding-left: calc(16px * var(--nut-scale-f, 1));
 }
 .nut-navbar-left-back {
   display: flex;
   flex-direction: row;
   align-items: center;
   justify-content: center;
-  gap: 16px;
+  gap: calc(16px * var(--nut-scale-f, 1));
 }
 .nut-navbar-left-hidden {
   padding-left: 0;
   padding-right: 0;
 }
 .nut-navbar-right {
-  padding-left: 16px;
+  padding-left: calc(16px * var(--nut-scale-f, 1));
   justify-content: flex-end;
-  gap: 16px;
+  gap: calc(16px * var(--nut-scale-f, 1));
 }
 .nut-navbar-right-rtl {
-  padding-right: 16px;
+  padding-right: calc(16px * var(--nut-scale-f, 1));
   padding-left: 0;
 }
 .nut-navbar-rtl .nut-icon-ArrowLeft {