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

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

@@ -9,21 +9,23 @@
 }
 .nut-popover-arrow {
   position: absolute;
-  width: 8px;
-  height: 4px;
+  width: scale-px(8px);
+  height: scale-px(4px);
 }
 .nut-popover-arrow .nut-icon-ArrowRadius {
   position: absolute;
   color: var(--nutui-popover-content-background-color, #ffffff);
+  width: scale-px(8px);
+  height: scale-px(4px);
 }
 .nut-popover-arrow-top {
-  bottom: -4px;
+  bottom: scale-px(-4px);
 }
 .nut-popover-arrow-bottom {
-  top: -4px;
+  top: scale-px(-4px);
 }
 .nut-popover-arrow-left {
-  right: -6px;
+  right: scale-px(-6px);
   transform-origin: center top;
 }
 .nut-popover-arrow-left.nut-popover-arrow-left {
@@ -31,14 +33,14 @@
   transform: rotate(90deg) translateY(-50%);
 }
 .nut-popover-arrow-left.nut-popover-arrow-left-top {
-  top: 16px;
-  right: -8px;
+  top: scale-px(16px);
+  right: scale-px(-8px);
   transform: rotate(90deg) translateY(0%);
 }
 .nut-popover-arrow-left.nut-popover-arrow-left-bottom {
   top: auto;
-  bottom: 16px;
-  right: -8px;
+  bottom: scale-px(16px);
+  right: scale-px(-8px);
   transform: rotate(90deg) translateY(0%);
 }
 .nut-popover-arrow-right {
@@ -46,17 +48,17 @@
 }
 .nut-popover-arrow-right.nut-popover-arrow-right {
   top: 50%;
-  left: -6px;
+  left: scale-px(-6px);
   transform: rotate(-90deg) translateY(-50%);
 }
 .nut-popover-arrow-right.nut-popover-arrow-right-top {
-  top: 16px;
-  left: -8px;
+  top: scale-px(16px);
+  left: scale-px(-8px);
   transform: rotate(-90deg) translateY(0%);
 }
 .nut-popover-arrow-right.nut-popover-arrow-right-bottom {
-  bottom: 16px;
-  left: -8px;
+  bottom: scale-px(16px);
+  left: scale-px(-8px);
   transform: rotate(-90deg) translateY(0%);
 }
 .nut-popover .nut-popover-content {
@@ -65,7 +67,7 @@
   border-radius: var(--nutui-popover-border-radius, var(--nutui-radius-s));
   font-size: var(--nutui-popover-font-size, var(--nutui-font-text));
   color: var(--nutui-popover-text-color, var(--nutui-color-text));
-  line-height: 28px;
+  line-height: scale-px(28px);
   /* #ifndef dynamic*/
   max-height: initial;
   overflow-y: initial;
@@ -78,12 +80,12 @@
   display: flex;
   align-items: center;
   justify-content: center;
-  border-bottom: 1px solid var(--nutui-popover-divider-color, none);
+  border-bottom: scale-px(1px) solid var(--nutui-popover-divider-color, none);
   max-width: var(--nutui-popover-item-width, 160px);
   word-wrap: break-word;
 }
 .nut-popover .nut-popover-content .nut-popover-item:last-child {
-  margin-bottom: 0px;
+  margin-bottom: 0;
   border-bottom: none;
 }
 .nut-popover .nut-popover-content .nut-popover-item-icon, .nut-popover .nut-popover-content .nut-popover-item-action-icon {
@@ -103,7 +105,7 @@
   margin-right: var(--nutui-spacing-xxs);
 }
 .nut-popover .nut-popover-content .nut-popover-item-name {
-  width: calc(100% - 34px);
+  width: calc(100% - scale-px(34px));
   word-break: keep-all;
   flex: 1;
 }
@@ -127,16 +129,16 @@
   right: 0;
 }
 .nut-popover .nut-popover-content-top-right .nut-popover-arrow-top-right {
-  right: 16px;
-  bottom: -3.5px;
+  right: scale-px(16px);
+  bottom: scale-px(-3.5px);
   transform: rotate(180deg) translateX(0%);
 }
 .nut-popover .nut-popover-content-top-left {
   left: 0;
 }
 .nut-popover .nut-popover-content-top-left .nut-popover-arrow-top-left {
-  left: 16px;
-  bottom: -3.5px;
+  left: scale-px(16px);
+  bottom: scale-px(-3.5px);
   transform: rotate(180deg) translateX(0%);
 }
 .nut-popover .nut-popover-content-bottom .nut-popover-arrow-bottom {
@@ -147,14 +149,14 @@
   right: 0;
 }
 .nut-popover .nut-popover-content-bottom-right .nut-popover-arrow-bottom-right {
-  right: 16px;
+  right: scale-px(16px);
   transform: translateX(0%);
 }
 .nut-popover .nut-popover-content-bottom-left {
   left: 0;
 }
 .nut-popover .nut-popover-content-bottom-left .nut-popover-arrow-bottom-left {
-  left: 16px;
+  left: scale-px(16px);
   transform: translateX(0%);
 }
 .nut-popover .nut-popover-content-left-bottom {
@@ -188,7 +190,7 @@
 [dir=rtl] .nut-popover .nut-popover-content .nut-popover-item-name,
 .nut-rtl .nut-popover .nut-popover-content .nut-popover-item-name {
   margin-left: 0;
-  margin-right: 4px;
+  margin-right: scale-px(4px);
 }
 [dir=rtl] .nut-popover .nut-popover-content .nut-popover-item-action-icon,
 .nut-rtl .nut-popover .nut-popover-content .nut-popover-item-action-icon {
@@ -208,7 +210,7 @@
 [dir=rtl] .nut-popover .nut-popover-content-top-right .nut-popover-arrow-top-right,
 .nut-rtl .nut-popover .nut-popover-content-top-right .nut-popover-arrow-top-right {
   right: auto;
-  left: 16px;
+  left: scale-px(16px);
 }
 [dir=rtl] .nut-popover .nut-popover-content-top-left,
 .nut-rtl .nut-popover .nut-popover-content-top-left {
@@ -218,7 +220,7 @@
 [dir=rtl] .nut-popover .nut-popover-content-top-left .nut-popover-arrow-top-left,
 .nut-rtl .nut-popover .nut-popover-content-top-left .nut-popover-arrow-top-left {
   left: auto;
-  right: 16px;
+  right: scale-px(16px);
 }
 [dir=rtl] .nut-popover .nut-popover-content-bottom .nut-popover-arrow-bottom,
 .nut-rtl .nut-popover .nut-popover-content-bottom .nut-popover-arrow-bottom {
@@ -234,7 +236,7 @@
 [dir=rtl] .nut-popover .nut-popover-content-bottom-right .nut-popover-arrow-bottom-right,
 .nut-rtl .nut-popover .nut-popover-content-bottom-right .nut-popover-arrow-bottom-right {
   right: auto;
-  left: 16px;
+  left: scale-px(16px);
 }
 [dir=rtl] .nut-popover .nut-popover-content-bottom-left,
 .nut-rtl .nut-popover .nut-popover-content-bottom-left {
@@ -244,7 +246,7 @@
 [dir=rtl] .nut-popover .nut-popover-content-bottom-left .nut-popover-arrow-bottom-left,
 .nut-rtl .nut-popover .nut-popover-content-bottom-left .nut-popover-arrow-bottom-left {
   left: auto;
-  right: 16px;
+  right: scale-px(16px);
 }
 
 .nut-popover-enter-from,
@@ -283,5 +285,5 @@
 
 .nut-popover-content-copy {
   position: absolute;
-  top: -99999px;
+  top: scale-px(-99999px);
 }

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

@@ -26,7 +26,6 @@
       color: $color-title;
       font-weight: $font-weight-bold;
       font-size: $popup-title-font-size;
-      line-height: $popup-title-font-size;
     }
 
     &-description {
@@ -48,7 +47,9 @@
       position: absolute;
       top: $popup-title-padding;
       right: $popup-title-padding;
-
+      display: flex;
+      align-items: center;
+      justify-content: center;
       z-index: 1;
       width: $popup-icon-size;
       height: $popup-icon-size;
@@ -79,8 +80,10 @@
   &-center {
     top: 50%;
     left: 50%;
+    right: auto;
+    bottom: auto;
     min-height: 10%;
-    max-width: 295px;
+    max-width: scale-px(295px);
     transform: translate(-50%, -50%);
 
     &.nut-popup-round {
@@ -91,6 +94,8 @@
   &-bottom {
     bottom: 0;
     left: 0;
+    right: auto;
+    top: auto;
     width: 100%;
 
     &.nut-popup-round {
@@ -105,7 +110,9 @@
   &-right {
     top: 0;
     right: 0;
-    width: 100px;
+    left: auto;
+    bottom: auto;
+    width: scale-px(100px);
     height: 100%;
 
     &.nut-popup-round {
@@ -116,7 +123,9 @@
   &-left {
     top: 0;
     left: 0;
-    width: 100px;
+    right: auto;
+    bottom: auto;
+    width: scale-px(100px);
     height: 100%;
 
     &.nut-popup-round {
@@ -127,6 +136,8 @@
   &-top {
     top: 0;
     left: 0;
+    right: auto;
+    bottom: auto;
     width: 100%;
 
     &.nut-popup-round {
@@ -210,6 +221,9 @@
     }
 
     @keyframes popup-slide-top-exit {
+      from {
+        transform: translate3d(0, 0%, 0);
+      }
       to {
         transform: translate3d(0, -100%, 0);
       }
@@ -240,6 +254,9 @@
     }
 
     @keyframes popup-slide-right-exit {
+      from {
+        transform: translate3d(0%, 0, 0);
+      }
       to {
         transform: translate3d(100%, 0, 0);
       }
@@ -270,6 +287,9 @@
     }
 
     @keyframes slide-bottom-exit {
+      from {
+        transform: translate3d(0, 0%, 0);
+      }
       to {
         transform: translate3d(0, 100%, 0);
       }
@@ -300,6 +320,9 @@
     }
 
     @keyframes popup-slide-left-exit {
+      from {
+        transform: translate3d(0%, 0, 0);
+      }
       to {
         transform: translate3d(-100%, 0, 0);
       }

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

@@ -1,4 +1,14 @@
 @charset "UTF-8";
+: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,7 +19,7 @@
   max-height: 100%;
   background-color: var(--nutui-overlay-content-bg-color, var(--nutui-color-background-overlay, #ffffff));
   -webkit-overflow-scrolling: touch;
-  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))));
 }
 .nut-popup-title {
   display: flex;
@@ -17,7 +27,7 @@
   align-items: center;
   justify-content: center;
   border-bottom: var(--nutui-popup-title-border-bottom, 0);
-  padding: var(--nutui-popup-title-padding, 16px);
+  padding: var(--nutui-popup-title-padding, calc(16px * var(--nut-scale-f, 1)));
   position: relative;
 }
 .nut-popup-title-wrapper {
@@ -29,29 +39,31 @@
 .nut-popup-title-title {
   color: var(--nutui-color-title, #1a1a1a);
   font-weight: var(--nutui-font-weight-bold, 600);
-  font-size: var(--nutui-popup-title-font-size, var(--nutui-font-size-xl, 18px));
-  line-height: var(--nutui-popup-title-font-size, var(--nutui-font-size-xl, 18px));
+  font-size: var(--nutui-popup-title-font-size, var(--nutui-font-size-xl, calc(18px * var(--nut-scale-font, var(--nut-scale-f, 1)))));
 }
 .nut-popup-title-description {
   color: var(--nutui-color-text, #505259);
-  font-size: var(--nutui-popup-description-font-size, var(--nutui-font-size-base, 14px));
+  font-size: var(--nutui-popup-description-font-size, var(--nutui-font-size-base, calc(14px * var(--nut-scale-font, var(--nut-scale-f, 1)))));
   font-weight: var(--nutui-font-weight, 400);
 }
 .nut-popup-title-description-gap {
-  margin-top: var(--nutui-popup-description-spacing, var(--nutui-spacing-base, 8px));
+  margin-top: var(--nutui-popup-description-spacing, var(--nutui-spacing-base, calc(8px * var(--nut-scale-f, 1))));
 }
 .nut-popup-title-left {
   position: absolute;
-  top: var(--nutui-popup-title-padding, 16px);
-  left: var(--nutui-popup-title-padding, 16px);
+  top: var(--nutui-popup-title-padding, calc(16px * var(--nut-scale-f, 1)));
+  left: var(--nutui-popup-title-padding, calc(16px * var(--nut-scale-f, 1)));
 }
 .nut-popup-title-right {
   position: absolute;
-  top: var(--nutui-popup-title-padding, 16px);
-  right: var(--nutui-popup-title-padding, 16px);
+  top: var(--nutui-popup-title-padding, calc(16px * var(--nut-scale-f, 1)));
+  right: var(--nutui-popup-title-padding, calc(16px * var(--nut-scale-f, 1)));
+  display: flex;
+  align-items: center;
+  justify-content: center;
   z-index: 1;
-  width: var(--nutui-popup-icon-size, 20px);
-  height: var(--nutui-popup-icon-size, 20px);
+  width: var(--nutui-popup-icon-size, calc(20px * var(--nut-scale-f, 1)));
+  height: var(--nutui-popup-icon-size, calc(20px * var(--nut-scale-f, 1)));
   color: var(--nutui-color-title, #1a1a1a);
   cursor: pointer;
 }
@@ -59,34 +71,38 @@
   opacity: 0.7;
 }
 .nut-popup-title-right-top-left {
-  top: var(--nutui-popup-title-padding, 16px);
-  left: var(--nutui-popup-title-padding, 16px);
+  top: var(--nutui-popup-title-padding, calc(16px * var(--nut-scale-f, 1)));
+  left: var(--nutui-popup-title-padding, calc(16px * var(--nut-scale-f, 1)));
 }
 .nut-popup-title-right-bottom-left {
-  bottom: var(--nutui-popup-title-padding, 16px);
-  left: var(--nutui-popup-title-padding, 16px);
+  bottom: var(--nutui-popup-title-padding, calc(16px * var(--nut-scale-f, 1)));
+  left: var(--nutui-popup-title-padding, calc(16px * var(--nut-scale-f, 1)));
 }
 .nut-popup-title-right-bottom-right {
-  right: var(--nutui-popup-title-padding, 16px);
-  bottom: var(--nutui-popup-title-padding, 16px);
+  right: var(--nutui-popup-title-padding, calc(16px * var(--nut-scale-f, 1)));
+  bottom: var(--nutui-popup-title-padding, calc(16px * var(--nut-scale-f, 1)));
 }
 .nut-popup-center {
   top: 50%;
   left: 50%;
+  right: auto;
+  bottom: auto;
   min-height: 10%;
-  max-width: 295px;
+  max-width: calc(295px * var(--nut-scale-f, 1));
   transform: translate(-50%, -50%);
 }
 .nut-popup-center.nut-popup-round {
-  border-radius: var(--nutui-popup-border-radius, var(--nutui-radius-xl, 12px));
+  border-radius: var(--nutui-popup-border-radius, var(--nutui-radius-xl, calc(12px * var(--nut-scale-f, 1))));
 }
 .nut-popup-bottom {
   bottom: 0;
   left: 0;
+  right: auto;
+  top: auto;
   width: 100%;
 }
 .nut-popup-bottom.nut-popup-round {
-  border-radius: var(--nutui-popup-border-radius, var(--nutui-radius-xl, 12px)) var(--nutui-popup-border-radius, var(--nutui-radius-xl, 12px)) 0 0;
+  border-radius: var(--nutui-popup-border-radius, var(--nutui-radius-xl, calc(12px * var(--nut-scale-f, 1)))) var(--nutui-popup-border-radius, var(--nutui-radius-xl, calc(12px * var(--nut-scale-f, 1)))) 0 0;
 }
 .nut-popup-bottom-top {
   position: absolute;
@@ -94,28 +110,34 @@
 .nut-popup-right {
   top: 0;
   right: 0;
-  width: 100px;
+  left: auto;
+  bottom: auto;
+  width: calc(100px * var(--nut-scale-f, 1));
   height: 100%;
 }
 .nut-popup-right.nut-popup-round {
-  border-radius: var(--nutui-popup-border-radius, var(--nutui-radius-xl, 12px)) 0 0 var(--nutui-popup-border-radius, var(--nutui-radius-xl, 12px));
+  border-radius: var(--nutui-popup-border-radius, var(--nutui-radius-xl, calc(12px * var(--nut-scale-f, 1)))) 0 0 var(--nutui-popup-border-radius, var(--nutui-radius-xl, calc(12px * var(--nut-scale-f, 1))));
 }
 .nut-popup-left {
   top: 0;
   left: 0;
-  width: 100px;
+  right: auto;
+  bottom: auto;
+  width: calc(100px * var(--nut-scale-f, 1));
   height: 100%;
 }
 .nut-popup-left.nut-popup-round {
-  border-radius: 0 var(--nutui-popup-border-radius, var(--nutui-radius-xl, 12px)) var(--nutui-popup-border-radius, var(--nutui-radius-xl, 12px)) 0;
+  border-radius: 0 var(--nutui-popup-border-radius, var(--nutui-radius-xl, calc(12px * var(--nut-scale-f, 1)))) var(--nutui-popup-border-radius, var(--nutui-radius-xl, calc(12px * var(--nut-scale-f, 1)))) 0;
 }
 .nut-popup-top {
   top: 0;
   left: 0;
+  right: auto;
+  bottom: auto;
   width: 100%;
 }
 .nut-popup-top.nut-popup-round {
-  border-radius: 0 0 var(--nutui-popup-border-radius, var(--nutui-radius-xl, 12px)) var(--nutui-popup-border-radius, var(--nutui-radius-xl, 12px));
+  border-radius: 0 0 var(--nutui-popup-border-radius, var(--nutui-radius-xl, calc(12px * var(--nut-scale-f, 1)))) var(--nutui-popup-border-radius, var(--nutui-radius-xl, calc(12px * var(--nut-scale-f, 1))));
 }
 .nut-popup-slide {
   /* 从顶部滑出 */
@@ -188,6 +210,9 @@
   }
 }
 @keyframes popup-slide-top-exit {
+  from {
+    transform: translate3d(0, 0%, 0);
+  }
   to {
     transform: translate3d(0, -100%, 0);
   }
@@ -212,6 +237,9 @@
   }
 }
 @keyframes popup-slide-right-exit {
+  from {
+    transform: translate3d(0%, 0, 0);
+  }
   to {
     transform: translate3d(100%, 0, 0);
   }
@@ -236,6 +264,9 @@
   }
 }
 @keyframes slide-bottom-exit {
+  from {
+    transform: translate3d(0, 0%, 0);
+  }
   to {
     transform: translate3d(0, 100%, 0);
   }
@@ -260,6 +291,9 @@
   }
 }
 @keyframes popup-slide-left-exit {
+  from {
+    transform: translate3d(0%, 0, 0);
+  }
   to {
     transform: translate3d(-100%, 0, 0);
   }
@@ -285,27 +319,27 @@
 [dir=rtl] .nut-popup-title-left,
 .nut-rtl .nut-popup-title-left {
   left: auto;
-  right: var(--nutui-popup-title-padding, 16px);
+  right: var(--nutui-popup-title-padding, calc(16px * var(--nut-scale-f, 1)));
 }
 [dir=rtl] .nut-popup-title-right,
 .nut-rtl .nut-popup-title-right {
   right: auto;
-  left: var(--nutui-popup-title-padding, 16px);
+  left: var(--nutui-popup-title-padding, calc(16px * var(--nut-scale-f, 1)));
 }
 [dir=rtl] .nut-popup-title-right-top-left,
 .nut-rtl .nut-popup-title-right-top-left {
   left: auto;
-  right: var(--nutui-popup-title-padding, 16px);
+  right: var(--nutui-popup-title-padding, calc(16px * var(--nut-scale-f, 1)));
 }
 [dir=rtl] .nut-popup-title-right-bottom-left,
 .nut-rtl .nut-popup-title-right-bottom-left {
   left: auto;
-  right: var(--nutui-popup-title-padding, 16px);
+  right: var(--nutui-popup-title-padding, calc(16px * var(--nut-scale-f, 1)));
 }
 [dir=rtl] .nut-popup-title-right-bottom-right,
 .nut-rtl .nut-popup-title-right-bottom-right {
   right: auto;
-  left: var(--nutui-popup-title-padding, 16px);
+  left: var(--nutui-popup-title-padding, calc(16px * var(--nut-scale-f, 1)));
 }
 [dir=rtl] .nut-popup-title .nut-icon-ArrowLeft,
 .nut-rtl .nut-popup-title .nut-icon-ArrowLeft {

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

@@ -26,7 +26,6 @@
       color: $color-title;
       font-weight: $font-weight-bold;
       font-size: $popup-title-font-size;
-      line-height: $popup-title-font-size;
     }
 
     &-description {
@@ -48,7 +47,9 @@
       position: absolute;
       top: $popup-title-padding;
       right: $popup-title-padding;
-
+      display: flex;
+      align-items: center;
+      justify-content: center;
       z-index: 1;
       width: $popup-icon-size;
       height: $popup-icon-size;
@@ -79,8 +80,10 @@
   &-center {
     top: 50%;
     left: 50%;
+    right: auto;
+    bottom: auto;
     min-height: 10%;
-    max-width: 295px;
+    max-width: scale-px(295px);
     transform: translate(-50%, -50%);
 
     &.nut-popup-round {
@@ -91,6 +94,8 @@
   &-bottom {
     bottom: 0;
     left: 0;
+    right: auto;
+    top: auto;
     width: 100%;
 
     &.nut-popup-round {
@@ -105,7 +110,9 @@
   &-right {
     top: 0;
     right: 0;
-    width: 100px;
+    left: auto;
+    bottom: auto;
+    width: scale-px(100px);
     height: 100%;
 
     &.nut-popup-round {
@@ -116,7 +123,9 @@
   &-left {
     top: 0;
     left: 0;
-    width: 100px;
+    right: auto;
+    bottom: auto;
+    width: scale-px(100px);
     height: 100%;
 
     &.nut-popup-round {
@@ -127,6 +136,8 @@
   &-top {
     top: 0;
     left: 0;
+    right: auto;
+    bottom: auto;
     width: 100%;
 
     &.nut-popup-round {
@@ -210,6 +221,9 @@
     }
 
     @keyframes popup-slide-top-exit {
+      from {
+        transform: translate3d(0, 0%, 0);
+      }
       to {
         transform: translate3d(0, -100%, 0);
       }
@@ -240,6 +254,9 @@
     }
 
     @keyframes popup-slide-right-exit {
+      from {
+        transform: translate3d(0%, 0, 0);
+      }
       to {
         transform: translate3d(100%, 0, 0);
       }
@@ -270,6 +287,9 @@
     }
 
     @keyframes slide-bottom-exit {
+      from {
+        transform: translate3d(0, 0%, 0);
+      }
       to {
         transform: translate3d(0, 100%, 0);
       }
@@ -300,6 +320,9 @@
     }
 
     @keyframes popup-slide-left-exit {
+      from {
+        transform: translate3d(0%, 0, 0);
+      }
       to {
         transform: translate3d(-100%, 0, 0);
       }