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

package/dist/cjs/packages/popover/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 {
@@ -417,82 +383,71 @@
 }
 .nut-popover-arrow {
   position: absolute;
-  width: 0;
-  height: 0;
-  border: 8px solid transparent;
+  width: 8px;
+  height: 4px;
+}
+.nut-popover-arrow .nut-icon-ArrowRadius {
+  position: absolute;
+  color: var(--nutui-popover-content-background-color, #ffffff);
 }
 .nut-popover-arrow-top {
-  bottom: 0;
-  border-top-color: var(--nutui-popover-border-color, #ffffff);
-  border-bottom-width: 0;
-  margin-bottom: -8px;
+  bottom: -4px;
 }
 .nut-popover-arrow-bottom {
-  top: 0px;
-  border-bottom-color: var(--nutui-popover-border-color, #ffffff);
-  border-top-width: 0;
-  margin-top: -8px;
+  top: -4px;
 }
 .nut-popover-arrow-left {
-  right: 0px;
-  border-left-color: var(--nutui-popover-border-color, #ffffff);
-  border-right-width: 0;
-  margin-right: -8px;
+  right: -6px;
+  transform-origin: center top;
 }
 .nut-popover-arrow-left.nut-popover-arrow-left {
   top: 50%;
-  transform: translateY(-50%);
+  transform: rotate(90deg) translateY(-50%);
 }
 .nut-popover-arrow-left.nut-popover-arrow-left-start {
   top: 16px;
-  transform: translateY(0%);
+  right: -8px;
+  transform: rotate(90deg) translateY(0%);
 }
 .nut-popover-arrow-left.nut-popover-arrow-left-end {
   bottom: 16px;
-  transform: translateY(0%);
+  right: -8px;
+  transform: rotate(90deg) translateY(0%);
 }
 .nut-popover-arrow-right {
-  left: 0px;
-  border-right-color: var(--nutui-popover-border-color, #ffffff);
-  border-left-width: 0;
-  margin-left: -8px;
+  transform-origin: center top;
 }
 .nut-popover-arrow-right.nut-popover-arrow-right {
   top: 50%;
-  transform: translateY(-50%);
+  left: -6px;
+  transform: rotate(-90deg) translateY(-50%);
 }
 .nut-popover-arrow-right.nut-popover-arrow-right-start {
   top: 16px;
-  transform: translateY(0%);
+  left: -8px;
+  transform: rotate(-90deg) translateY(0%);
 }
 .nut-popover-arrow-right.nut-popover-arrow-right-end {
   bottom: 16px;
-  transform: translateY(0%);
+  left: -8px;
+  transform: rotate(-90deg) translateY(0%);
 }
 .nut-popover .nut-popover-content {
   position: absolute;
-  background-color: var(--nutui-popover-content-background-color, #ffffff);
-  border-radius: var(--nutui-popover-border-radius, 8px);
+  background: var(--nutui-popover-content-background-color, #ffffff);
+  border-radius: var(--nutui-popover-border-radius, var(--nutui-radius-xs, 4px));
   font-size: var(--nutui-popover-font-size, var(--nutui-font-size-s, 12px));
-  font-family: PingFangSC;
-  font-weight: normal;
-  color: var(--nutui-popover-text-color, #1a1a1a);
-  box-shadow: 0 2px 12px rgba(50, 50, 51, 0.1215686275);
+  color: var(--nutui-popover-text-color, var(--nutui-black-10));
+  line-height: 28px;
   max-height: initial;
   overflow-y: initial;
 }
-.nut-popover .nut-popover-content-group {
-  display: block;
-  height: 100%;
-  width: 100%;
-}
 .nut-popover .nut-popover-content .nut-popover-menu-item {
-  position: relative;
   display: flex;
   align-items: center;
   justify-content: center;
-  padding: var(--nutui-popover-menu-item-padding, 8px);
-  border-bottom: 1px solid var(--nutui-popover-divider-color, var(--nutui-color-border, rgba(0, 0, 0, 0.06)));
+  padding: 0 var(--nutui-popover-menu-item-padding, 8px);
+  border-bottom: 1px solid var(--nutui-popover-divider-color, var(--nutui-black-3));
   max-width: var(--nutui-popover-menu-item-width, 160px);
   word-wrap: break-word;
 }
@@ -500,12 +455,6 @@
   margin-bottom: 0px;
   border-bottom: none;
 }
-.nut-popover .nut-popover-content .nut-popover-menu-item:hover:nth-of-type(2) {
-  border-radius: 8px 8px 0px 0px;
-}
-.nut-popover .nut-popover-content .nut-popover-menu-item:hover:last-of-type {
-  border-radius: 0px 0px 8px 8px;
-}
 .nut-popover .nut-popover-content .nut-popover-menu-item-icon {
   display: flex;
   justify-content: center;
@@ -522,7 +471,7 @@
 .nut-popover .nut-popover-content .nut-popover-menu-item-name {
   width: calc(100% - 34px);
   word-break: keep-all;
-  margin: 0 6px 0 4px;
+  margin: 0 8px 0 4px;
   flex: 1;
 }
 .nut-popover .nut-popover-content .nut-popover-menu-item-action-icon {
@@ -532,10 +481,15 @@
   width: 12px;
   height: 12px;
   font-size: 12px;
-  color: var(--nutui-color-text, #505259);
+  color: var(--nutui-gray-6);
+}
+.nut-popover .nut-popover-content .nut-popover-menu-item-action-icon .nut-icon {
+  width: 12px;
+  height: 12px;
+  font-size: 12px;
 }
 .nut-popover .nut-popover-content .nut-popover-menu-item.nut-popover-menu-disabled {
-  color: var(--nutui-popover-disable-color, var(--nutui-color-text-disabled, #c2c4cc));
+  color: var(--nutui-popover-disable-color, var(--nutui-gray-4));
   cursor: not-allowed;
 }
 .nut-popover .nut-popover-content .nut-popover-menu-item.nut-popover-menu-taroitem {
@@ -543,21 +497,24 @@
 }
 .nut-popover .nut-popover-content-top .nut-popover-arrow-top {
   left: 50%;
-  transform: translateX(-50%);
+  transform-origin: center left;
+  transform: rotate(180deg) translateX(-50%);
 }
 .nut-popover .nut-popover-content-top-end {
   right: 0;
 }
 .nut-popover .nut-popover-content-top-end .nut-popover-arrow-top-end {
   right: 16px;
-  transform: translateX(0%);
+  bottom: -3.5px;
+  transform: rotate(180deg) translateX(0%);
 }
 .nut-popover .nut-popover-content-top-start {
   left: 0;
 }
 .nut-popover .nut-popover-content-top-start .nut-popover-arrow-top-start {
   left: 16px;
-  transform: translateX(0%);
+  bottom: -3.5px;
+  transform: rotate(180deg) translateX(0%);
 }
 .nut-popover .nut-popover-content-bottom .nut-popover-arrow-bottom {
   left: 50%;
@@ -591,31 +548,18 @@
 }
 
 .nut-popover-dark {
-  background: var(--nutui-popover-text-color, #1a1a1a);
+  background: var(--nutui-popover-text-color, var(--nutui-black-10));
   color: var(--nutui-popover-content-background-color, #ffffff);
 }
-.nut-popover-dark .nut-popover-arrow-top {
-  border-top-color: var(--nutui-popover-text-color, #1a1a1a);
-}
-.nut-popover-dark .nut-popover-arrow-bottom {
-  border-bottom-color: var(--nutui-popover-text-color, #1a1a1a);
-}
-.nut-popover-dark .nut-popover-arrow-left {
-  border-left-color: var(--nutui-popover-text-color, #1a1a1a);
-}
-.nut-popover-dark .nut-popover-arrow-right {
-  border-right-color: var(--nutui-popover-text-color, #1a1a1a);
+.nut-popover-dark .nut-popover-arrow .nut-icon-ArrowRadius {
+  color: var(--nutui-popover-text-color, var(--nutui-black-10));
 }
 .nut-popover-dark .nut-popover-content {
-  background: var(--nutui-popover-text-color, #1a1a1a) !important;
+  background: var(--nutui-popover-text-color, var(--nutui-black-10)) !important;
   color: var(--nutui-popover-content-background-color, #ffffff) !important;
 }
-.nut-popover-dark .nut-popover-content .nut-popover-menu-item {
-  border-bottom-color: var(--nutui-popover-content-background-color, #ffffff);
-}
-.nut-popover-dark .nut-popover-content .nut-popover-menu-item:hover {
-  color: var(--nutui-popover-content-background-color, #ffffff);
-  background-color: var(--nutui-popover-text-color, #1a1a1a);
+.nut-popover-dark .nut-popover-content .nut-popover-menu-item-action-icon {
+  color: rgba(255, 255, 255, 0.8);
 }
 
 [dir=rtl] .nut-popover .nut-popover-content .nut-popover-menu-item-name,

package/dist/cjs/packages/popup/popup.js

@@ -109,16 +109,11 @@ var Popup = function Popup(props) {
     var onHandleClosed = function onHandleClosed(e) {
         afterClose && afterClose();
     };
-    var resolveContainer = function resolveContainer(getContainer) {
-        var container = typeof getContainer === 'function' ? getContainer() : getContainer;
-        return container || document.body;
-    };
-    var renderToContainer = function renderToContainer(getContainer, node) {
-        if (getContainer) {
-            var container = resolveContainer(getContainer);
-            return /*#__PURE__*/ (0, _reactdom.createPortal)(node, container);
-        }
-        return node;
+    var renderCloseIcon = function renderCloseIcon() {
+        return /*#__PURE__*/ _react.default.createElement(_react.default.Fragment, null, closeable && /*#__PURE__*/ _react.default.createElement("div", {
+            className: closeClasses,
+            onClick: onHandleClickCloseIcon
+        }, /*#__PURE__*/ _react.default.isValidElement(closeIcon) ? closeIcon : /*#__PURE__*/ _react.default.createElement(_iconsreact.Close, null)));
     };
     var renderTitle = function renderTitle() {
         if (left || title || description) {
@@ -127,19 +122,15 @@ var Popup = function Popup(props) {
             }, position === 'bottom' && /*#__PURE__*/ _react.default.createElement(_react.default.Fragment, null, left && /*#__PURE__*/ _react.default.createElement("div", {
                 className: "".concat(classPrefix, "-title-left")
             }, left), (title || description) && /*#__PURE__*/ _react.default.createElement("div", {
+                className: "".concat(classPrefix, "-title-wrapper")
+            }, title && /*#__PURE__*/ _react.default.createElement("div", {
                 className: "".concat(classPrefix, "-title-title")
-            }, title, description && /*#__PURE__*/ _react.default.createElement("div", {
-                className: "".concat(classPrefix, "-title-description")
-            }, description))), closeable && /*#__PURE__*/ _react.default.createElement("div", {
-                className: closeClasses,
-                onClick: onHandleClickCloseIcon
-            }, /*#__PURE__*/ _react.default.isValidElement(closeIcon) ? closeIcon : /*#__PURE__*/ _react.default.createElement(_iconsreact.Close, null)));
+            }, title), description && /*#__PURE__*/ _react.default.createElement("div", {
+                className: "".concat(classPrefix, "-title-description ").concat(title ? "".concat(classPrefix, "-title-description-gap") : '')
+            }, description))), renderCloseIcon());
         }
         if (closeable) {
-            return /*#__PURE__*/ _react.default.createElement(_react.default.Fragment, null, closeable && /*#__PURE__*/ _react.default.createElement("div", {
-                className: closeClasses,
-                onClick: onHandleClickCloseIcon
-            }, /*#__PURE__*/ _react.default.isValidElement(closeIcon) ? closeIcon : /*#__PURE__*/ _react.default.createElement(_iconsreact.Close, null)));
+            return renderCloseIcon();
         }
     };
     var renderPop = function renderPop() {
@@ -168,11 +159,10 @@ var Popup = function Popup(props) {
             lockScroll: lockScroll,
             duration: duration,
             onClick: onHandleClickOverlay
-        }) : null, /*#__PURE__*/ _react.default.createElement(_react.default.Fragment, null, renderPop()));
+        }) : null, renderPop());
     };
     (0, _react.useEffect)(function() {
-        visible && open();
-        !visible && close();
+        visible ? open() : close();
     }, [
         visible
     ]);
@@ -182,6 +172,17 @@ var Popup = function Popup(props) {
         position,
         transition
     ]);
+    var resolveContainer = function resolveContainer(getContainer) {
+        var container = typeof getContainer === 'function' ? getContainer() : getContainer;
+        return container || document.body;
+    };
+    var renderToContainer = function renderToContainer(getContainer, node) {
+        if (getContainer) {
+            var container = resolveContainer(getContainer);
+            return /*#__PURE__*/ (0, _reactdom.createPortal)(node, container);
+        }
+        return node;
+    };
     return /*#__PURE__*/ _react.default.createElement(_react.default.Fragment, null, renderToContainer(portal, renderNode()));
 };
 Popup.displayName = 'NutPopup';