@nutui/nutui-react 3.0.0-beta.7 → 3.0.0-beta.9

package/dist/cjs/packages/picker/style/style.css

@@ -16,16 +16,10 @@
   right: 0;
   width: 100%;
   height: 100%;
-  background-color: var(--nutui-overlay-bg-color, var(--nutui-color-mask, rgba(0, 0, 0, 0.7)));
+  background-color: var(--nutui-overlay-bg-color, var(--nutui-black-10));
   z-index: var(--nutui-overlay-zIndex, 1000);
 }
 
-[dir=rtl] .nut-overlay,
-.nut-rtl .nut-overlay {
-  left: auto;
-  right: 0;
-}
-
 .nut-overflow-hidden {
   overflow: hidden !important;
 }
@@ -63,18 +57,17 @@
   animation-duration: var(--nutui-overlay-animation-duration, 0.3s);
 }
 
+[dir=rtl] .nut-overlay,
+.nut-rtl .nut-overlay {
+  left: auto;
+  right: 0;
+}
+
 .nut-popup {
-  /* #ifdef rn */
-  position: absolute;
-  /* #endif */
-  /* #ifndef rn */
   position: fixed;
-  /* #endif */
-  min-height: 26%;
+  min-height: 46%;
   max-height: 100%;
-  overflow-y: auto;
-  background-color: var(--nutui-overlay-content-bg-color, var(--nutui-color-background-overlay, #ffffff));
-  color: var(--nutui-color-title, #1a1a1a);
+  background-color: var(--nutui-overlay-content-bg-color, var(--nutui-gray-1));
   -webkit-overflow-scrolling: touch;
   font-size: var(--nutui-font-size-base, 14px);
 }
@@ -87,35 +80,40 @@
   padding: var(--nutui-popup-title-padding, 16px);
   position: relative;
 }
-.nut-popup-title-left {
-  position: absolute;
-  left: var(--nutui-popup-title-padding, 16px);
-}
-.nut-popup-title-title {
+.nut-popup-title-wrapper {
   display: flex;
   flex-direction: column;
   justify-content: center;
   align-items: center;
+}
+.nut-popup-title-title {
+  color: var(--nutui-gray-7);
   font-weight: var(--nutui-font-weight-bold, 600);
-  font-size: var(--nutui-popup-title-font-size, var(--nutui-font-size-xl, 18px));
+  font-size: var(--nutui-popup-title-font-size, var(--nutui-font-size-l, 16px));
+  line-height: var(--nutui-popup-title-font-size, var(--nutui-font-size-l, 16px));
 }
 .nut-popup-title-description {
-  color: var(--nutui-color-text-help, #888b94);
-  font-size: var(--nutui-popup-description-font-size, var(--nutui-font-size-xs, 11px));
+  color: var(--nutui-gray-6);
+  font-size: var(--nutui-popup-description-font-size, var(--nutui-font-size-base, 14px));
   font-weight: var(--nutui-font-weight, 400);
 }
+.nut-popup-title-description-gap {
+  margin-top: var(--nutui-popup-description-spacing, var(--nutui-spacing-base, 8px));
+}
+.nut-popup-title-left {
+  position: absolute;
+  top: var(--nutui-popup-title-padding, 16px);
+  left: var(--nutui-popup-title-padding, 16px);
+}
 .nut-popup-title-right {
   position: absolute;
-  z-index: 1;
-  cursor: pointer;
-  width: var(--nutui-popup-icon-size, var(--nutui-font-size-xl, 18px));
-  height: var(--nutui-popup-icon-size, var(--nutui-font-size-xl, 18px));
-  display: flex;
-  justify-content: center;
-  align-items: center;
   top: var(--nutui-popup-title-padding, 16px);
   right: var(--nutui-popup-title-padding, 16px);
-  color: var(--nutui-color-text-help, #888b94);
+  z-index: 1;
+  width: var(--nutui-popup-icon-size, 20px);
+  height: var(--nutui-popup-icon-size, 20px);
+  color: var(--nutui-gray-7);
+  cursor: pointer;
 }
 .nut-popup-title-right:active {
   opacity: 0.7;
@@ -136,15 +134,14 @@
   top: 50%;
   left: 50%;
   min-height: 10%;
-  /* #ifndef rn */
+  max-width: 295px;
   transform: translate(-50%, -50%);
-  /* #endif */
 }
 .nut-popup-center.nut-popup-round {
-  border-radius: var(--nutui-popup-border-radius, 24px);
+  border-radius: var(--nutui-popup-border-radius, var(--nutui-radius-xl, 12px));
 }
 .nut-popup-bottom, .nut-popup-top {
-  max-height: 83%;
+  max-height: 87%;
 }
 .nut-popup-bottom {
   bottom: 0;
@@ -152,40 +149,33 @@
   width: 100%;
 }
 .nut-popup-bottom.nut-popup-round {
-  border-radius: var(--nutui-popup-border-radius, 24px) var(--nutui-popup-border-radius, 24px) 0 0;
+  border-radius: var(--nutui-popup-border-radius, var(--nutui-radius-xl, 12px)) var(--nutui-popup-border-radius, var(--nutui-radius-xl, 12px)) 0 0;
 }
 .nut-popup-right {
   top: 0;
   right: 0;
-  /* #ifdef rn */
   width: 100px;
   height: 100%;
-  /* #endif */
 }
 .nut-popup-right.nut-popup-round {
-  border-radius: var(--nutui-popup-border-radius, 24px) 0 0 var(--nutui-popup-border-radius, 24px);
+  border-radius: var(--nutui-popup-border-radius, var(--nutui-radius-xl, 12px)) 0 0 var(--nutui-popup-border-radius, var(--nutui-radius-xl, 12px));
 }
 .nut-popup-left {
   top: 0;
   left: 0;
-  /* #ifdef rn */
   width: 100px;
   height: 100%;
-  /* #endif */
 }
 .nut-popup-left.nut-popup-round {
-  border-radius: 0 var(--nutui-popup-border-radius, 24px) var(--nutui-popup-border-radius, 24px) 0;
+  border-radius: 0 var(--nutui-popup-border-radius, var(--nutui-radius-xl, 12px)) var(--nutui-popup-border-radius, var(--nutui-radius-xl, 12px)) 0;
 }
 .nut-popup-top {
   top: 0;
   left: 0;
   width: 100%;
-  /* #ifdef rn */
-  height: 100px;
-  /* #endif */
 }
 .nut-popup-top.nut-popup-round {
-  border-radius: 0 0 var(--nutui-popup-border-radius, 24px) var(--nutui-popup-border-radius, 24px);
+  border-radius: 0 0 var(--nutui-popup-border-radius, var(--nutui-radius-xl, 12px)) var(--nutui-popup-border-radius, var(--nutui-radius-xl, 12px));
 }
 .nut-popup-slide {
   /* 从顶部滑出 */
@@ -251,22 +241,16 @@
 }
 @keyframes popup-slide-top-enter {
   from {
-    /* #ifndef rn */
     transform: translate3d(0, -100%, 0);
-    /* #endif */
   }
 }
 @keyframes popup-slide-top-exit {
   to {
-    /* #ifndef rn */
     transform: translate3d(0, -100%, 0);
-    /* #endif */
   }
 }
 .nut-popup-slide-top-enter-active, .nut-popup-slide-top-appear-active {
-  /* #ifndef rn */
   transform: translate3d(0, 0%, 0);
-  /* #endif*/
   animation-fill-mode: both;
   animation-name: popup-slide-top-enter;
   animation-duration: var(--nutui-popup-animation-duration, 0.3s);
@@ -278,22 +262,16 @@
 }
 @keyframes popup-slide-right-enter {
   from {
-    /* #ifndef rn */
     transform: translate3d(100%, 0, 0);
-    /* #endif*/
   }
 }
 @keyframes popup-slide-right-exit {
   to {
-    /* #ifndef rn */
     transform: translate3d(100%, 0, 0);
-    /* #endif*/
   }
 }
 .nut-popup-slide-right-enter-active, .nut-popup-slide-right-appear-active {
-  /* #ifndef rn */
   transform: translate3d(0, 0, 0);
-  /* #endif*/
   animation-fill-mode: both;
   animation-name: popup-slide-right-enter;
   animation-duration: var(--nutui-popup-animation-duration, 0.3s);
@@ -305,22 +283,16 @@
 }
 @keyframes popup-slide-bottom-enter {
   from {
-    /* #ifndef rn */
     transform: translate3d(0, 100%, 0);
-    /* #endif */
   }
 }
 @keyframes slide-bottom-exit {
   to {
-    /* #ifndef rn */
     transform: translate3d(0, 100%, 0);
-    /* #endif */
   }
 }
 .nut-popup-slide-bottom-enter-active, .nut-popup-slide-bottom-appear-active {
-  /* #ifndef rn */
   transform: translate(0, 0);
-  /* #endif */
   animation-fill-mode: both;
   animation-name: popup-slide-bottom-enter;
   animation-duration: var(--nutui-popup-animation-duration, 0.3s);
@@ -332,16 +304,12 @@
 }
 @keyframes popup-slide-left-enter {
   from {
-    /* #ifndef rn */
     transform: translate3d(-100%, 0, 0);
-    /* #endif */
   }
 }
 @keyframes popup-slide-left-exit {
   to {
-    /* #ifndef rn */
     transform: translate3d(-100%, 0, 0);
-    /* #endif */
   }
 }
 .nut-popup-slide-left-enter-active, .nut-popup-slide-left-appear-active {
@@ -395,9 +363,7 @@
 .nut-rtl .nut-popup-center {
   left: auto;
   right: 50%;
-  /* #ifndef rn */
   transform: translate(50%, -50%);
-  /* #endif*/
 }
 [dir=rtl] .nut-popup-bottom,
 .nut-rtl .nut-popup-bottom {
@@ -411,23 +377,23 @@
 }
 
 .nut-picker {
-  background-color: var(--nutui-color-background-overlay, #ffffff);
+  background-color: var(--nutui-gray-1);
   width: 100%;
 }
 .nut-picker-control {
   display: flex;
   height: var(--nutui-popup-title-height, 50px);
-  font-size: var(--nutui-popup-title-font-size, var(--nutui-font-size-xl, 18px));
+  font-size: var(--nutui-popup-title-font-size, var(--nutui-font-size-l, 16px));
   align-items: center;
   justify-content: space-between;
   padding: var(--nutui-popup-title-padding, 16px);
 }
 .nut-picker-cancel-btn {
-  color: var(--nutui-picker-title-cancel-color, var(--nutui-color-text, #505259));
+  color: var(--nutui-picker-title-cancel-color, var(--nutui-gray-6));
   font-size: var(--nutui-picker-title-cancel-font-size, var(--nutui-font-size-base, 14px));
 }
 .nut-picker-confirm-btn {
-  color: var(--nutui-picker-title-ok-color, var(--nutui-color-primary, #ff0f23));
+  color: var(--nutui-picker-title-ok-color, var(--nutui-brand-6));
   font-size: var(--nutui-picker-title-ok-font-size, var(--nutui-font-size-base, 14px));
 }
 .nut-picker-title {
@@ -436,8 +402,8 @@
   text-overflow: ellipsis;
   white-space: nowrap;
   text-align: center;
-  color: var(--nutui-color-title, #1a1a1a);
-  font-size: var(--nutui-popup-title-font-size, var(--nutui-font-size-xl, 18px));
+  color: var(--nutui-gray-7);
+  font-size: var(--nutui-popup-title-font-size, var(--nutui-font-size-l, 16px));
   font-weight: var(--nutui-popup-title-font-weight, var(--nutui-font-weight-bold, 600));
 }
 .nut-picker-panel {
@@ -449,10 +415,10 @@
   top: 108px;
   height: var(--nutui-picker-item-height, 36px);
   width: 100%;
-  border: var(--nutui-picker-item-active-line-border, 1px solid var(--nutui-color-border, rgba(0, 0, 0, 0.06)));
+  border: var(--nutui-picker-item-active-line-border, 1px solid var(--nutui-black-3));
   border-left: 0;
   border-right: 0;
-  color: var(--nutui-picker-item-text-color, var(--nutui-color-title, #1a1a1a));
+  color: var(--nutui-picker-item-text-color, var(--nutui-gray-7));
   font-size: var(--nutui-picker-item-text-font-size, var(--nutui-font-size-base, 14px));
   z-index: 3;
 }
@@ -461,7 +427,7 @@
   border: 0;
 }
 .nut-picker-indicator-taro::before, .nut-picker-indicator-taro::after {
-  border: var(--nutui-picker-item-active-line-border, 1px solid var(--nutui-color-border, rgba(0, 0, 0, 0.06)));
+  border: var(--nutui-picker-item-active-line-border, 1px solid var(--nutui-black-3));
   border-left: 0;
   border-right: 0;
 }
@@ -509,7 +475,7 @@
   text-overflow: ellipsis;
   height: var(--nutui-picker-item-height, 36px);
   line-height: var(--nutui-picker-item-height, 36px);
-  color: var(--nutui-picker-item-text-color, var(--nutui-color-title, #1a1a1a));
+  color: var(--nutui-picker-item-text-color, var(--nutui-gray-7));
   font-size: var(--nutui-picker-item-text-font-size, var(--nutui-font-size-base, 14px));
   text-align: center;
 }
@@ -535,7 +501,7 @@
   height: var(--nutui-picker-item-height, 36px);
   line-height: var(--nutui-picker-item-height, 36px);
   text-align: center;
-  color: var(--nutui-color-title, #1a1a1a);
+  color: var(--nutui-gray-7);
   font-size: var(--nutui-font-size-base, 14px);
 }
 .nut-picker-roller-item-hidden {

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

@@ -18,6 +18,7 @@ var _sliced_to_array = require("@swc/helpers/_/_sliced_to_array");
 var _react = /*#__PURE__*/ _interop_require_wildcard._(require("react"));
 var _classnames = /*#__PURE__*/ _interop_require_default._(require("classnames"));
 var _reactdom = require("react-dom");
+var _iconsreact = require("@nutui/icons-react");
 var _popup = /*#__PURE__*/ _interop_require_default._(require("../popup"));
 var _useclientrect = require("../../utils/use-client-rect");
 var _typings = require("../../utils/typings");
@@ -32,7 +33,7 @@ var defaultProps = (0, _object_spread_props._)((0, _object_spread._)({}, _typing
     visible: false,
     offset: [
         0,
-        12
+        8
     ],
     arrowOffset: 0,
     targetId: '',
@@ -138,8 +139,7 @@ var Popover = function Popover(props) {
     var classes = (0, _classnames.default)((_obj = {}, (0, _define_property._)(_obj, "".concat(classPrefix), true), (0, _define_property._)(_obj, "".concat(classPrefix, "-").concat(theme), theme === 'dark'), _obj), className);
     var popoverArrow = function popoverArrow() {
         var prefixCls = 'nut-popover-arrow';
-        var direction = location.split('-')[0];
-        return "".concat(prefixCls, " ").concat(prefixCls, "-").concat(direction, " ").concat(prefixCls, "-").concat(location);
+        return "".concat(prefixCls, " ").concat(prefixCls, "-").concat(location.split('-')[0], " ").concat(prefixCls, "-").concat(location);
     };
     var getRootPosition = function getRootPosition() {
         var _popoverContentRef_current, _popoverContentRef_current1;
@@ -235,22 +235,22 @@ var Popover = function Popover(props) {
     };
     var handleSelect = function handleSelect(item, index) {
         if (!item.disabled) {
-            onSelect === null || onSelect === void 0 ? void 0 : onSelect(item, index);
+            onSelect && onSelect(item, index);
         }
         if (closeOnActionClick) {
-            onClick === null || onClick === void 0 ? void 0 : onClick();
-            onClose === null || onClose === void 0 ? void 0 : onClose();
+            onClick && onClick();
+            onClose && onClose();
         }
     };
     return /*#__PURE__*/ _react.default.createElement(_react.default.Fragment, null, !targetId && /*#__PURE__*/ _react.default.createElement("div", {
         className: "nut-popover-wrapper",
         ref: popoverRef,
         onClick: function onClick1() {
-            onClick === null || onClick === void 0 ? void 0 : onClick();
+            onClick && onClick();
             if (!visible) {
-                onOpen === null || onOpen === void 0 ? void 0 : onOpen();
+                onOpen && onOpen();
             } else {
-                onClose === null || onClose === void 0 ? void 0 : onClose();
+                onClose && onClose();
             }
         },
         style: style
@@ -269,7 +269,10 @@ var Popover = function Popover(props) {
     }, showArrow && /*#__PURE__*/ _react.default.createElement("div", {
         className: popoverArrow(),
         style: arrowStyle()
-    }), Array.isArray(children) ? children[1] : null, list.map(function(item, index) {
+    }, /*#__PURE__*/ _react.default.createElement(_iconsreact.ArrowRadius, {
+        width: 8,
+        height: 4
+    })), Array.isArray(children) ? children[1] : null, list.map(function(item, index) {
         return /*#__PURE__*/ _react.default.createElement("div", {
             className: (0, _classnames.default)({
                 'nut-popover-menu-item': true,
@@ -279,17 +282,17 @@ var Popover = function Popover(props) {
             onClick: function onClick() {
                 return handleSelect(item, index);
             }
-        }, item.icon ? /*#__PURE__*/ _react.default.createElement("div", {
+        }, item.icon && /*#__PURE__*/ _react.default.createElement("div", {
             className: "nut-popover-menu-item-icon"
-        }, item.icon) : null, /*#__PURE__*/ _react.default.createElement("div", {
+        }, item.icon), /*#__PURE__*/ _react.default.createElement("div", {
             className: "nut-popover-menu-item-name"
-        }, item.name), item.action && item.action.icon ? /*#__PURE__*/ _react.default.createElement("div", {
+        }, item.name), item.action && item.action.icon && /*#__PURE__*/ _react.default.createElement("div", {
             className: "nut-popover-menu-item-action-icon",
             onClick: function onClick(e) {
                 var _item_action_onClick, _item_action;
                 return (_item_action = item.action) === null || _item_action === void 0 ? void 0 : (_item_action_onClick = _item_action.onClick) === null || _item_action_onClick === void 0 ? void 0 : _item_action_onClick.call(_item_action, e);
             }
-        }, item.action.icon) : null);
+        }, item.action.icon));
     })))), document.body));
 };
 Popover.displayName = 'NutPopover';

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

@@ -5,93 +5,81 @@
 
   &-arrow {
     position: absolute;
-    width: 0;
-    height: 0;
-    border: 8px solid transparent;
+    width: 8px;
+    height: 4px;
+
+    .nut-icon-ArrowRadius {
+      position: absolute;
+      color: $popover-content-background-color;
+    }
 
     &-top {
-      bottom: 0;
-      border-top-color: $popover-border-color;
-      border-bottom-width: 0;
-      margin-bottom: -8px;
+      bottom: -4px;
     }
 
     &-bottom {
-      top: 0px;
-      border-bottom-color: $popover-border-color;
-      border-top-width: 0;
-      margin-top: -8px;
+      top: -4px;
     }
 
     &-left {
-      right: 0px;
-      border-left-color: $popover-border-color;
-      border-right-width: 0;
-      margin-right: -8px;
+      right: -6px;
+      transform-origin: center top;
 
       &.nut-popover-arrow-left {
         top: 50%;
-        transform: translateY(-50%);
+        transform: rotate(90deg) translateY(-50%);
       }
 
       &.nut-popover-arrow-left-start {
         top: 16px;
-        transform: translateY(0%);
+        right: -8px;
+        transform: rotate(90deg) translateY(0%);
       }
 
       &.nut-popover-arrow-left-end {
         bottom: 16px;
-        transform: translateY(0%);
+        right: -8px;
+        transform: rotate(90deg) translateY(0%);
       }
     }
 
     &-right {
-      left: 0px;
-      border-right-color: $popover-border-color;
-      border-left-width: 0;
-      margin-left: -8px;
-
+      transform-origin: center top;
       &.nut-popover-arrow-right {
         top: 50%;
-        transform: translateY(-50%);
+        left: -6px;
+        transform: rotate(-90deg) translateY(-50%);
       }
 
       &.nut-popover-arrow-right-start {
         top: 16px;
-        transform: translateY(0%);
+        left: -8px;
+        transform: rotate(-90deg) translateY(0%);
       }
 
       &.nut-popover-arrow-right-end {
         bottom: 16px;
-        transform: translateY(0%);
+        left: -8px;
+        transform: rotate(-90deg) translateY(0%);
       }
     }
   }
 
   .nut-popover-content {
     position: absolute;
-    background-color: $popover-content-background-color;
+    background: $popover-content-background-color;
     border-radius: $popover-border-radius;
     font-size: $popover-font-size;
-    font-family: PingFangSC;
-    font-weight: normal;
     color: $popover-text-color;
-    box-shadow: 0 2px 12px #3232331f;
+    line-height: 28px;
     max-height: initial;
     overflow-y: initial;
 
-    &-group {
-      display: block;
-      height: 100%;
-      width: 100%;
-    }
-
     .nut-popover-menu-item {
-      position: relative;
       display: flex;
       align-items: center;
       justify-content: center;
-      padding: $popover-menu-item-padding;
+      padding: 0 $popover-menu-item-padding;
       border-bottom: 1px solid $popover-divider-color;
       max-width: $popover-menu-item-width;
       word-wrap: break-word;
@@ -101,14 +89,6 @@
         border-bottom: none;
       }
 
-      &:hover:nth-of-type(2) {
-        border-radius: 8px 8px 0px 0px;
-      }
-
-      &:hover:last-of-type {
-        border-radius: 0px 0px 8px 8px;
-      }
-
       &-icon {
         display: flex;
         justify-content: center;
@@ -126,7 +106,7 @@
       &-name {
         width: calc(100% - 34px);
         word-break: keep-all;
-        margin: 0 6px 0 4px;
+        margin: 0 8px 0 4px;
         flex: 1;
       }
 
@@ -138,6 +118,11 @@
         height: 12px;
         font-size: 12px;
         color: $color-text;
+        .nut-icon {
+          width: 12px;
+          height: 12px;
+          font-size: 12px;
+        }
       }
 
       &.nut-popover-menu-disabled {
@@ -153,7 +138,8 @@
     &-top {
       .nut-popover-arrow-top {
         left: 50%;
-        transform: translateX(-50%);
+        transform-origin: center left;
+        transform: rotate(180deg) translateX(-50%);
       }
     }
 
@@ -161,7 +147,8 @@
       right: 0;
       .nut-popover-arrow-top-end {
         right: 16px;
-        transform: translateX(0%);
+        bottom: -3.5px;
+        transform: rotate(180deg) translateX(0%);
       }
     }
 
@@ -169,7 +156,8 @@
       left: 0;
       .nut-popover-arrow-top-start {
         left: 16px;
-        transform: translateX(0%);
+        bottom: -3.5px;
+        transform: rotate(180deg) translateX(0%);
       }
     }
 
@@ -219,17 +207,8 @@
   color: $popover-content-background-color;
 
   .nut-popover-arrow {
-    &-top {
-      border-top-color: $popover-text-color;
-    }
-    &-bottom {
-      border-bottom-color: $popover-text-color;
-    }
-    &-left {
-      border-left-color: $popover-text-color;
-    }
-    &-right {
-      border-right-color: $popover-text-color;
+    .nut-icon-ArrowRadius {
+      color: $popover-text-color;
     }
   }
 
@@ -237,10 +216,8 @@
     background: $popover-text-color !important;
     color: $popover-content-background-color !important;
     .nut-popover-menu-item {
-      border-bottom-color: $popover-content-background-color;
-      &:hover {
-        color: $popover-content-background-color;
-        background-color: $popover-text-color;
+      &-action-icon {
+        color: rgba(255, 255, 255, 0.8);
       }
     }
   }