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

package/dist/cjs/packages/popover/popover.js

@@ -28,18 +28,21 @@ var _getscrollparent = require("../../utils/get-scroll-parent");
 var _configprovider = require("../configprovider");
 var defaultProps = (0, _object_spread_props._)((0, _object_spread._)({}, _typings.ComponentDefaults), {
     list: [],
-    theme: 'light',
+    type: 'status',
+    theme: 'dark',
     location: 'bottom',
     visible: false,
     offset: [
         0,
         8
     ],
-    arrowOffset: 0,
+    arrowOffset: 20,
     targetId: '',
     showArrow: true,
     closeOnOutsideClick: true,
     closeOnActionClick: true,
+    autoShow: false,
+    duration: 0,
     overlay: false,
     onClick: function onClick() {},
     onOpen: function onOpen() {},
@@ -48,9 +51,10 @@ var defaultProps = (0, _object_spread_props._)((0, _object_spread._)({}, _typing
 var classPrefix = "nut-popover";
 var Popover = function Popover(props) {
     var rtl = (0, _configprovider.useRtl)();
-    var _$_object_spread = (0, _object_spread._)({}, defaultProps, props), children = _$_object_spread.children, list = _$_object_spread.list, theme = _$_object_spread.theme, location = _$_object_spread.location, visible = _$_object_spread.visible, offset = _$_object_spread.offset, arrowOffset = _$_object_spread.arrowOffset, targetId = _$_object_spread.targetId, overlay = _$_object_spread.overlay, closeOnOutsideClick = _$_object_spread.closeOnOutsideClick, closeOnActionClick = _$_object_spread.closeOnActionClick, className = _$_object_spread.className, showArrow = _$_object_spread.showArrow, style = _$_object_spread.style, onClick = _$_object_spread.onClick, onOpen = _$_object_spread.onOpen, onClose = _$_object_spread.onClose, onSelect = _$_object_spread.onSelect, rest = (0, _object_without_properties._)(_$_object_spread, [
+    var _$_object_spread = (0, _object_spread._)({}, defaultProps, props), children = _$_object_spread.children, list = _$_object_spread.list, type = _$_object_spread.type, theme = _$_object_spread.theme, location = _$_object_spread.location, visible = _$_object_spread.visible, offset = _$_object_spread.offset, arrowOffset = _$_object_spread.arrowOffset, targetId = _$_object_spread.targetId, overlay = _$_object_spread.overlay, closeOnOutsideClick = _$_object_spread.closeOnOutsideClick, closeOnActionClick = _$_object_spread.closeOnActionClick, autoShow = _$_object_spread.autoShow, duration = _$_object_spread.duration, className = _$_object_spread.className, showArrow = _$_object_spread.showArrow, style = _$_object_spread.style, onClick = _$_object_spread.onClick, onOpen = _$_object_spread.onOpen, onClose = _$_object_spread.onClose, onSelect = _$_object_spread.onSelect, rest = (0, _object_without_properties._)(_$_object_spread, [
         "children",
         "list",
+        "type",
         "theme",
         "location",
         "visible",
@@ -60,6 +64,8 @@ var Popover = function Popover(props) {
         "overlay",
         "closeOnOutsideClick",
         "closeOnActionClick",
+        "autoShow",
+        "duration",
         "className",
         "showArrow",
         "style",
@@ -83,6 +89,27 @@ var Popover = function Popover(props) {
         visible,
         location
     ]);
+    (0, _react.useEffect)(function() {
+        if (autoShow) {
+            onOpen === null || onOpen === void 0 ? void 0 : onOpen();
+        }
+    }, []);
+    (0, _react.useEffect)(function() {
+        if (visible && duration > 0) {
+            var timer = setTimeout(function() {
+                onClick === null || onClick === void 0 ? void 0 : onClick();
+                onClose === null || onClose === void 0 ? void 0 : onClose();
+            }, duration);
+            return function() {
+                return clearTimeout(timer);
+            };
+        }
+    }, [
+        visible,
+        duration,
+        onClick,
+        onClose
+    ]);
     var update = (0, _react.useRef)(function(e) {
         getWrapperPosition();
     });
@@ -137,7 +164,7 @@ var Popover = function Popover(props) {
             right: rtl ? left : right
         });
     };
-    var classes = (0, _classnames.default)(classPrefix, (0, _define_property._)({}, "".concat(classPrefix, "-").concat(theme), theme === 'dark'), className);
+    var classes = (0, _classnames.default)(classPrefix, "".concat(classPrefix, "--").concat(type), (0, _define_property._)({}, "".concat(classPrefix, "-light"), theme === 'light'), className);
     var popoverArrow = function popoverArrow() {
         var prefixCls = 'nut-popover-arrow';
         var direction = location.split('-')[0];
@@ -164,6 +191,7 @@ var Popover = function Popover(props) {
         }
         if (width) {
             var dir = rtl ? 'right' : 'left';
+            var edgeOffset = arrowOffset;
             if ([
                 'bottom',
                 'top'
@@ -174,10 +202,10 @@ var Popover = function Popover(props) {
                     styles[dir] = "".concat(-(popWidth - width) / 2 + wrapperPosition[dir] + parallel, "px");
                 }
                 if (skew === 'left') {
-                    styles.left = "".concat(left + parallel, "px");
+                    styles.left = "".concat(left + width / 2 - edgeOffset + parallel, "px");
                 }
                 if (skew === 'right') {
-                    styles.left = "".concat(right + parallel, "px");
+                    styles.left = "".concat(left + width / 2 + edgeOffset + parallel, "px");
                 }
             }
             if ([
@@ -187,7 +215,7 @@ var Popover = function Popover(props) {
                 var contentW = direction === 'left' ? -(popWidth + cross) : width + cross;
                 styles.left = "".concat(left + contentW, "px");
                 if (!skew) {
-                    styles.top = "".concat(top - popHeight / 2 + height / 2 - 4 + parallel, "px");
+                    styles.top = "".concat(top - popHeight / 2 + height / 2 + parallel, "px");
                 }
                 if (skew === 'top') {
                     styles.top = "".concat(top + parallel, "px");
@@ -204,37 +232,18 @@ var Popover = function Popover(props) {
         var styles = {};
         var direction = location.split('-')[0];
         var skew = location.split('-')[1];
-        var base = 16;
-        if (arrowOffset !== 0) {
-            var dir = rtl ? 'right' : 'left';
-            var dir2 = rtl ? 'left' : 'right';
-            if ([
-                'bottom',
-                'top'
-            ].includes(direction)) {
-                if (!skew) {
-                    styles[dir] = "calc(50% + ".concat(arrowOffset, "px)");
-                }
-                if (skew === 'left') {
-                    styles[dir] = "".concat(base + arrowOffset, "px");
-                }
-                if (skew === 'right') {
-                    styles[dir2] = "".concat(base - arrowOffset, "px");
-                }
+        var dir = rtl ? 'right' : 'left';
+        var dir2 = rtl ? 'left' : 'right';
+        var edgeOffset = arrowOffset;
+        if ([
+            'bottom',
+            'top'
+        ].includes(direction)) {
+            if (skew === 'left') {
+                styles[dir] = "".concat(edgeOffset, "px");
             }
-            if ([
-                'left',
-                'right'
-            ].includes(direction)) {
-                if (!skew) {
-                    styles.top = "calc(50% - ".concat(arrowOffset, "px)");
-                }
-                if (skew === 'top') {
-                    styles.top = "".concat(base - arrowOffset, "px");
-                }
-                if (skew === 'bottom') {
-                    styles.bottom = "".concat(base + arrowOffset, "px");
-                }
+            if (skew === 'right') {
+                styles[dir2] = "".concat(edgeOffset, "px");
             }
         }
         return styles;

package/dist/cjs/packages/popover/style/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);
       }
     }
   }