@nutui/nutui-react 4.0.0-beta.5 → 4.0.0-beta.7

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

@@ -10,22 +10,22 @@
 .nut-popover-arrow {
   position: absolute;
   width: scale-px(8px);
-  height: scale-px(4px);
+  height: scale-px(8px);
 }
 .nut-popover-arrow .nut-icon-ArrowRadius {
   position: absolute;
-  color: var(--nutui-popover-content-background-color, #ffffff);
+  color: var(--nutui-popover-content-background-color, var(--nutui-color-surface-overlay));
   width: scale-px(8px);
-  height: scale-px(4px);
+  height: scale-px(8px);
 }
 .nut-popover-arrow-top {
-  bottom: scale-px(-4px);
+  bottom: scale-px(-8px);
 }
 .nut-popover-arrow-bottom {
-  top: scale-px(-4px);
+  top: scale-px(-8px);
 }
 .nut-popover-arrow-left {
-  right: scale-px(-6px);
+  right: scale-px(-8px);
   transform-origin: center top;
 }
 .nut-popover-arrow-left.nut-popover-arrow-left {
@@ -33,14 +33,11 @@
   transform: rotate(90deg) translateY(-50%);
 }
 .nut-popover-arrow-left.nut-popover-arrow-left-top {
-  top: scale-px(16px);
-  right: scale-px(-8px);
+  right: scale-px(-12px);
   transform: rotate(90deg) translateY(0%);
 }
 .nut-popover-arrow-left.nut-popover-arrow-left-bottom {
-  top: auto;
-  bottom: scale-px(16px);
-  right: scale-px(-8px);
+  right: scale-px(-12px);
   transform: rotate(90deg) translateY(0%);
 }
 .nut-popover-arrow-right {
@@ -48,40 +45,40 @@
 }
 .nut-popover-arrow-right.nut-popover-arrow-right {
   top: 50%;
-  left: scale-px(-6px);
+  left: scale-px(-8px);
   transform: rotate(-90deg) translateY(-50%);
 }
 .nut-popover-arrow-right.nut-popover-arrow-right-top {
-  top: scale-px(16px);
-  left: scale-px(-8px);
+  left: scale-px(-12px);
   transform: rotate(-90deg) translateY(0%);
 }
 .nut-popover-arrow-right.nut-popover-arrow-right-bottom {
-  bottom: scale-px(16px);
-  left: scale-px(-8px);
+  left: scale-px(-12px);
   transform: rotate(-90deg) translateY(0%);
 }
 .nut-popover .nut-popover-content {
   position: absolute;
-  background: var(--nutui-popover-content-background-color, #ffffff);
+  background: var(--nutui-popover-content-background-color, var(--nutui-color-surface-overlay));
   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: scale-px(28px);
+  font-size: var(--nutui-popover-font-size, var(--nutui-font-text-small));
+  color: var(--nutui-popover-text-color, var(--nutui-color-text-dark));
   /* #ifndef dynamic*/
   max-height: initial;
   overflow-y: initial;
   /* #endif */
 }
 .nut-popover .nut-popover-content-group {
-  padding: 0 var(--nutui-popover-padding, var(--nutui-spacing-xl));
+  padding: 0 var(--nutui-popover-padding-horizontal, 8px);
+  overflow: visible;
 }
 .nut-popover .nut-popover-content .nut-popover-item {
+  box-sizing: border-box;
   display: flex;
   align-items: center;
   justify-content: center;
-  border-bottom: scale-px(1px) solid var(--nutui-popover-divider-color, none);
-  max-width: var(--nutui-popover-item-width, 160px);
+  min-height: var(--nutui-popover-height, 28px);
+  padding: var(--nutui-popover-padding-vertical, 6px) 0;
+  border-bottom: scale-px(1px) solid var(--nutui-popover-divider-color, rgba(255, 255, 255, 0.12));
   word-wrap: break-word;
 }
 .nut-popover .nut-popover-content .nut-popover-item:last-child {
@@ -89,29 +86,42 @@
   border-bottom: none;
 }
 .nut-popover .nut-popover-content .nut-popover-item-icon, .nut-popover .nut-popover-content .nut-popover-item-action-icon {
+  position: relative;
   display: flex;
   justify-content: center;
   align-items: center;
-  width: var(--nutui-font-text-small);
-  height: var(--nutui-font-text-small);
-  font-size: var(--nutui-font-text-small);
+  flex-shrink: 0;
+  align-self: stretch;
+  width: var(--nutui-popover-icon-size, 12px);
+  color: var(--nutui-popover-icon-color, rgba(255, 255, 255, 0.8));
+}
+.nut-popover .nut-popover-content .nut-popover-item-icon::before, .nut-popover .nut-popover-content .nut-popover-item-action-icon::before {
+  content: "";
+  position: absolute;
+  top: 0;
+  bottom: 0;
+  left: 50%;
+  width: var(--nutui-popover-action-hotspot-size, 36px);
+  transform: translateX(-50%);
 }
 .nut-popover .nut-popover-content .nut-popover-item-icon .nut-icon, .nut-popover .nut-popover-content .nut-popover-item-action-icon .nut-icon {
-  width: var(--nutui-font-text-small);
-  height: var(--nutui-font-text-small);
-  font-size: var(--nutui-font-text-small);
+  position: relative;
+  z-index: 1;
+  width: var(--nutui-popover-icon-size, 12px);
+  height: var(--nutui-popover-icon-size, 12px);
 }
 .nut-popover .nut-popover-content .nut-popover-item-icon {
   margin-right: var(--nutui-spacing-xxs);
 }
 .nut-popover .nut-popover-content .nut-popover-item-name {
-  width: calc(100% - scale-px(34px));
   word-break: keep-all;
   flex: 1;
+  min-width: 0;
+  text-align: center;
+  line-height: calc(var(--nutui-popover-height, 28px) - var(--nutui-popover-padding-vertical, 6px) * 2);
 }
 .nut-popover .nut-popover-content .nut-popover-item-action-icon {
-  color: var(--nutui-color-text);
-  margin-left: var(--nutui-spacing-base);
+  margin-left: var(--nutui-spacing-xxs);
 }
 .nut-popover .nut-popover-content .nut-popover-item.nut-popover-item-disabled {
   color: var(--nutui-popover-disable-color, var(--nutui-color-text-disabled));
@@ -129,17 +139,15 @@
   right: 0;
 }
 .nut-popover .nut-popover-content-top-right .nut-popover-arrow-top-right {
-  right: scale-px(16px);
-  bottom: scale-px(-3.5px);
-  transform: rotate(180deg) translateX(0%);
+  transform-origin: center right;
+  transform: rotate(180deg) translateX(50%);
 }
 .nut-popover .nut-popover-content-top-left {
   left: 0;
 }
 .nut-popover .nut-popover-content-top-left .nut-popover-arrow-top-left {
-  left: scale-px(16px);
-  bottom: scale-px(-3.5px);
-  transform: rotate(180deg) translateX(0%);
+  transform-origin: center left;
+  transform: rotate(180deg) translateX(-50%);
 }
 .nut-popover .nut-popover-content-bottom .nut-popover-arrow-bottom {
   left: 50%;
@@ -149,15 +157,13 @@
   right: 0;
 }
 .nut-popover .nut-popover-content-bottom-right .nut-popover-arrow-bottom-right {
-  right: scale-px(16px);
-  transform: translateX(0%);
+  transform: translateX(50%);
 }
 .nut-popover .nut-popover-content-bottom-left {
   left: 0;
 }
 .nut-popover .nut-popover-content-bottom-left .nut-popover-arrow-bottom-left {
-  left: scale-px(16px);
-  transform: translateX(0%);
+  transform: translateX(-50%);
 }
 .nut-popover .nut-popover-content-left-bottom {
   bottom: 0;
@@ -171,30 +177,40 @@
 .nut-popover .nut-popover-content-right-top {
   top: 0;
 }
+.nut-popover--status .nut-popover-content .nut-popover-item {
+  max-width: var(--nutui-popover-status-max-width, 240px);
+}
+.nut-popover--description .nut-popover-content .nut-popover-item {
+  max-width: var(--nutui-popover-description-max-width, 208px);
+}
 
-.nut-popover-dark {
-  background: var(--nutui-popover-text-color, var(--nutui-color-text));
-  color: var(--nutui-popover-content-background-color, #ffffff);
+.nut-popover-light .nut-popover-arrow .nut-icon-ArrowRadius,
+.nut-popover-light .nut-popover-arrow .nut-popover-arrow-svg {
+  color: var(--nutui-popover-light-content-background-color, #ffffff);
 }
-.nut-popover-dark .nut-popover-arrow .nut-icon-ArrowRadius {
-  color: var(--nutui-popover-text-color, var(--nutui-color-text));
+.nut-popover-light .nut-popover-content {
+  background: var(--nutui-popover-light-content-background-color, #ffffff) !important;
+  color: var(--nutui-popover-light-text-color, var(--nutui-color-surface-overlay)) !important;
 }
-.nut-popover-dark .nut-popover-content {
-  background: var(--nutui-popover-text-color, var(--nutui-color-text)) !important;
-  color: var(--nutui-popover-content-background-color, #ffffff) !important;
+.nut-popover-light .nut-popover-content .nut-popover-item {
+  border-bottom-color: var(--nutui-popover-light-divider-color, var(--nutui-color-border));
 }
-.nut-popover-dark .nut-popover-content .nut-popover-item-action-icon {
-  color: rgba(255, 255, 255, 0.8);
+.nut-popover-light .nut-popover-content .nut-popover-item-icon, .nut-popover-light .nut-popover-content .nut-popover-item-action-icon {
+  color: var(--nutui-popover-light-icon-color, rgba(17, 20, 26, 0.8));
+}
+.nut-popover-light .nut-popover-content .nut-popover-item-icon .nut-icon, .nut-popover-light .nut-popover-content .nut-popover-item-action-icon .nut-icon {
+  color: var(--nutui-popover-light-icon-color, rgba(17, 20, 26, 0.8));
 }
 
-[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: scale-px(4px);
+[dir=rtl] .nut-popover .nut-popover-content .nut-popover-item-icon,
+.nut-rtl .nut-popover .nut-popover-content .nut-popover-item-icon {
+  margin-right: 0;
+  margin-left: var(--nutui-spacing-xxs);
 }
 [dir=rtl] .nut-popover .nut-popover-content .nut-popover-item-action-icon,
 .nut-rtl .nut-popover .nut-popover-content .nut-popover-item-action-icon {
-  right: auto;
+  margin-left: 0;
+  margin-right: var(--nutui-spacing-xxs);
 }
 [dir=rtl] .nut-popover .nut-popover-content-top .nut-popover-arrow-top,
 .nut-rtl .nut-popover .nut-popover-content-top .nut-popover-arrow-top {
@@ -210,7 +226,6 @@
 [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: scale-px(16px);
 }
 [dir=rtl] .nut-popover .nut-popover-content-top-left,
 .nut-rtl .nut-popover .nut-popover-content-top-left {
@@ -220,7 +235,6 @@
 [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: 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 {
@@ -236,7 +250,6 @@
 [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: scale-px(16px);
 }
 [dir=rtl] .nut-popover .nut-popover-content-bottom-left,
 .nut-rtl .nut-popover .nut-popover-content-bottom-left {
@@ -246,7 +259,6 @@
 [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: scale-px(16px);
 }
 
 .nut-popover-enter-from,

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

@@ -6,25 +6,25 @@
   &-arrow {
     position: absolute;
     width: scale-px(8px);
-    height: scale-px(4px);
+    height: scale-px(8px);
 
     .nut-icon-ArrowRadius {
       position: absolute;
       color: $popover-content-background-color;
       width: scale-px(8px);
-      height: scale-px(4px);
+      height: scale-px(8px);
     }
 
     &-top {
-      bottom: scale-px(-4px);
+      bottom: scale-px(-8px);
     }
 
     &-bottom {
-      top: scale-px(-4px);
+      top: scale-px(-8px);
     }
 
     &-left {
-      right: scale-px(-6px);
+      right: scale-px(-8px);
       transform-origin: center top;
 
       &.nut-popover-arrow-left {
@@ -33,15 +33,12 @@
       }
 
       &.nut-popover-arrow-left-top {
-        top: scale-px(16px);
-        right: scale-px(-8px);
+        right: scale-px(-12px);
         transform: rotate(90deg) translateY(0%);
       }
 
       &.nut-popover-arrow-left-bottom {
-        top: auto;
-        bottom: scale-px(16px);
-        right: scale-px(-8px);
+        right: scale-px(-12px);
         transform: rotate(90deg) translateY(0%);
       }
     }
@@ -50,19 +47,17 @@
       transform-origin: center top;
       &.nut-popover-arrow-right {
         top: 50%;
-        left: scale-px(-6px);
+        left: scale-px(-8px);
         transform: rotate(-90deg) translateY(-50%);
       }
 
       &.nut-popover-arrow-right-top {
-        top: scale-px(16px);
-        left: scale-px(-8px);
+        left: scale-px(-12px);
         transform: rotate(-90deg) translateY(0%);
       }
 
       &.nut-popover-arrow-right-bottom {
-        bottom: scale-px(16px);
-        left: scale-px(-8px);
+        left: scale-px(-12px);
         transform: rotate(-90deg) translateY(0%);
       }
     }
@@ -74,22 +69,24 @@
     border-radius: $popover-border-radius;
     font-size: $popover-font-size;
     color: $popover-text-color;
-    line-height: scale-px(28px);
     /* #ifndef dynamic*/
     max-height: initial;
     overflow-y: initial;
     /* #endif */
 
     &-group {
-      padding: 0 $popover-padding;
+      padding: 0 $popover-padding-horizontal;
+      overflow: visible;
     }
 
     .nut-popover-item {
+      box-sizing: border-box;
       display: flex;
       align-items: center;
       justify-content: center;
+      min-height: $popover-height;
+      padding: $popover-padding-vertical 0;
       border-bottom: scale-px(1px) solid $popover-divider-color;
-      max-width: $popover-item-width;
       word-wrap: break-word;
 
       &:last-child {
@@ -99,16 +96,30 @@
 
       &-icon,
       &-action-icon {
+        position: relative;
         display: flex;
         justify-content: center;
         align-items: center;
-        width: $font-size-s;
-        height: $font-size-s;
-        font-size: $font-size-s;
+        flex-shrink: 0;
+        align-self: stretch;
+        width: $popover-icon-size;
+        color: $popover-icon-color;
+
+        &::before {
+          content: '';
+          position: absolute;
+          top: 0;
+          bottom: 0;
+          left: 50%;
+          width: $popover-action-hotspot-size;
+          transform: translateX(-50%);
+        }
+
         .nut-icon {
-          width: $font-size-s;
-          height: $font-size-s;
-          font-size: $font-size-s;
+          position: relative;
+          z-index: 1;
+          width: $popover-icon-size;
+          height: $popover-icon-size;
         }
       }
 
@@ -117,14 +128,17 @@
       }
 
       &-name {
-        width: calc(100% - scale-px(34px));
         word-break: keep-all;
         flex: 1;
+        min-width: 0;
+        text-align: center;
+        line-height: calc(
+          #{$popover-height} - #{$popover-padding-vertical} * 2
+        );
       }
 
       &-action-icon {
-        color: $color-text;
-        margin-left: $spacing-base;
+        margin-left: $spacing-xxs;
       }
 
       &.nut-popover-item-disabled {
@@ -148,18 +162,16 @@
     &-top-right {
       right: 0;
       .nut-popover-arrow-top-right {
-        right: scale-px(16px);
-        bottom: scale-px(-3.5px);
-        transform: rotate(180deg) translateX(0%);
+        transform-origin: center right;
+        transform: rotate(180deg) translateX(50%);
       }
     }
 
     &-top-left {
       left: 0;
       .nut-popover-arrow-top-left {
-        left: scale-px(16px);
-        bottom: scale-px(-3.5px);
-        transform: rotate(180deg) translateX(0%);
+        transform-origin: center left;
+        transform: rotate(180deg) translateX(-50%);
       }
     }
 
@@ -173,16 +185,14 @@
     &-bottom-right {
       right: 0;
       .nut-popover-arrow-bottom-right {
-        right: scale-px(16px);
-        transform: translateX(0%);
+        transform: translateX(50%);
       }
     }
 
     &-bottom-left {
       left: 0;
       .nut-popover-arrow-bottom-left {
-        left: scale-px(16px);
-        transform: translateX(0%);
+        transform: translateX(-50%);
       }
     }
 
@@ -202,24 +212,42 @@
       top: 0;
     }
   }
-}
 
-.nut-popover-dark {
-  background: $popover-text-color;
-  color: $popover-content-background-color;
+  &--status {
+    .nut-popover-content .nut-popover-item {
+      max-width: $popover-status-max-width;
+    }
+  }
 
+  &--description {
+    .nut-popover-content .nut-popover-item {
+      max-width: $popover-description-max-width;
+    }
+  }
+}
+
+.nut-popover-light {
   .nut-popover-arrow {
-    .nut-icon-ArrowRadius {
-      color: $popover-text-color;
+    .nut-icon-ArrowRadius,
+    .nut-popover-arrow-svg {
+      color: $popover-light-content-background-color;
     }
   }
 
   .nut-popover-content {
-    background: $popover-text-color !important;
-    color: $popover-content-background-color !important;
+    background: $popover-light-content-background-color !important;
+    color: $popover-light-text-color !important;
+
     .nut-popover-item {
+      border-bottom-color: $popover-light-divider-color;
+
+      &-icon,
       &-action-icon {
-        color: rgba(255, 255, 255, 0.8);
+        color: $popover-light-icon-color;
+
+        .nut-icon {
+          color: $popover-light-icon-color;
+        }
       }
     }
   }
@@ -229,13 +257,14 @@
 .nut-rtl .nut-popover {
   .nut-popover-content {
     .nut-popover-item {
-      &-name {
-        margin-left: 0;
-        margin-right: scale-px(4px);
+      &-icon {
+        margin-right: 0;
+        margin-left: $spacing-xxs;
       }
 
       &-action-icon {
-        right: auto;
+        margin-left: 0;
+        margin-right: $spacing-xxs;
       }
     }
     &-top {
@@ -251,7 +280,6 @@
 
       .nut-popover-arrow-top-right {
         right: auto;
-        left: scale-px(16px);
       }
     }
 
@@ -261,7 +289,6 @@
 
       .nut-popover-arrow-top-left {
         left: auto;
-        right: scale-px(16px);
       }
     }
 
@@ -279,7 +306,6 @@
 
       .nut-popover-arrow-bottom-right {
         right: auto;
-        left: scale-px(16px);
       }
     }
 
@@ -289,7 +315,6 @@
 
       .nut-popover-arrow-bottom-left {
         left: auto;
-        right: scale-px(16px);
       }
     }
   }