@nutui/nutui-react-taro 3.0.0-beta.1 → 3.0.0-beta.11

package/dist/cjs/packages/popover/style/style.harmony.css

@@ -1,3 +1,7 @@
+/* #ifdef harmony */
+/* #endif */
+/* #ifndef harmony */
+/* #endif */
 .nut-popover {
   position: absolute;
   display: inline-block;
@@ -5,98 +9,78 @@
 }
 .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: #ffffff;
 }
 .nut-popover-arrow-top {
-  bottom: 0;
-  border-top-color: #ffffff;
-  border-bottom-width: 0;
-  margin-bottom: -8px;
+  bottom: -4px;
 }
 .nut-popover-arrow-bottom {
-  top: 0px;
-  border-bottom-color: #ffffff;
-  border-top-width: 0;
-  margin-top: -8px;
+  top: -4px;
 }
 .nut-popover-arrow-left {
-  right: 0px;
-  border-left-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: #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: #ffffff;
-  border-radius: 8px;
+  background: #ffffff;
+  border-radius: 4px;
   font-size: 12px;
-  font-family: PingFangSC;
-  font-weight: normal;
-  color: #1A1A1A;
-  box-shadow: 0 2px 12px rgba(50, 50, 51, 0.1215686275);
+  color: rgba(0, 0, 0, 0.7);
+  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: 8px;
+  padding: 0 8px;
   border-bottom: 1px solid rgba(0, 0, 0, 0.06);
+  max-width: 160px;
+  word-wrap: break-word;
 }
 .nut-popover .nut-popover-content .nut-popover-menu-item:last-child {
   margin-bottom: 0px;
   border-bottom: none;
 }
-.nut-popover .nut-popover-content .nut-popover-menu-item:hover {
-  cursor: pointer;
-  color: #1A1A1A;
-  background-color: #fff;
-}
-.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;
@@ -105,14 +89,18 @@
   height: 12px;
   font-size: 12px;
 }
+.nut-popover .nut-popover-content .nut-popover-menu-item-icon .nut-icon {
+  width: 12px;
+  height: 12px;
+  font-size: 12px;
+}
 .nut-popover .nut-popover-content .nut-popover-menu-item-name {
-  width: 100%;
+  width: calc(100% - 34px);
   word-break: keep-all;
-  margin-left: 4px;
+  margin: 0 8px 0 4px;
+  flex: 1;
 }
 .nut-popover .nut-popover-content .nut-popover-menu-item-action-icon {
-  position: absolute;
-  right: 8px;
   display: flex;
   justify-content: center;
   align-items: center;
@@ -121,8 +109,13 @@
   font-size: 12px;
   color: #505259;
 }
+.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: #C2C4CC;
+  color: #c2c4cc;
   cursor: not-allowed;
 }
 .nut-popover .nut-popover-content .nut-popover-menu-item.nut-popover-menu-taroitem {
@@ -130,21 +123,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%;
@@ -177,47 +173,21 @@
   top: 0;
 }
 
-[dir=rtl] .nut-popover-arrow-left {
-  right: auto;
-  left: 0px;
-  border-left-color: currentcolor;
-  border-right-color: #ffffff;
-  border-right-width: medium;
-  border-left-width: 0;
-  margin-right: 0;
-  margin-left: -8px;
+.nut-popover-dark {
+  background: rgba(0, 0, 0, 0.7);
+  color: #ffffff;
 }
-
-.nut-rtl .nut-popover-arrow-left {
-  right: auto;
-  left: 0px;
-  border-left-color: currentcolor;
-  border-right-color: #ffffff;
-  border-right-width: medium;
-  border-left-width: 0;
-  margin-right: 0;
-  margin-left: -8px;
-}
-[dir=rtl] .nut-popover-arrow-right {
-  left: auto;
-  right: 0px;
-  border-right-color: currentcolor;
-  border-left-color: #ffffff;
-  border-left-width: medium;
-  border-right-width: 0;
-  margin-left: 0;
-  margin-right: -8px;
+.nut-popover-dark .nut-popover-arrow .nut-icon-ArrowRadius {
+  color: rgba(0, 0, 0, 0.7);
 }
-.nut-rtl .nut-popover-arrow-right {
-  left: auto;
-  right: 0px;
-  border-right-color: currentcolor;
-  border-left-color: #ffffff;
-  border-left-width: medium;
-  border-right-width: 0;
-  margin-left: 0;
-  margin-right: -8px;
+.nut-popover-dark .nut-popover-content {
+  background: rgba(0, 0, 0, 0.7) !important;
+  color: #ffffff !important;
+}
+.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,
 .nut-rtl .nut-popover .nut-popover-content .nut-popover-menu-item-name {
   margin-left: 0;

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

@@ -108,16 +108,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(_components.View, {
+            className: closeClasses,
+            onClick: onHandleClickCloseIcon
+        }, /*#__PURE__*/ _react.default.isValidElement(closeIcon) ? closeIcon : /*#__PURE__*/ _react.default.createElement(_iconsreacttaro.Close, null)));
     };
     var renderTitle = function renderTitle() {
         if (left || title || description) {
@@ -126,19 +121,15 @@ var Popup = function Popup(props) {
             }, position === 'bottom' && /*#__PURE__*/ _react.default.createElement(_react.default.Fragment, null, left && /*#__PURE__*/ _react.default.createElement(_components.View, {
                 className: "".concat(classPrefix, "-title-left")
             }, left), (title || description) && /*#__PURE__*/ _react.default.createElement(_components.View, {
+                className: "".concat(classPrefix, "-title-wrapper")
+            }, title && /*#__PURE__*/ _react.default.createElement(_components.View, {
                 className: "".concat(classPrefix, "-title-title")
-            }, title, description && /*#__PURE__*/ _react.default.createElement(_components.View, {
-                className: "".concat(classPrefix, "-title-description")
-            }, description))), closeable && /*#__PURE__*/ _react.default.createElement(_components.View, {
-                className: closeClasses,
-                onClick: onHandleClickCloseIcon
-            }, /*#__PURE__*/ _react.default.isValidElement(closeIcon) ? closeIcon : /*#__PURE__*/ _react.default.createElement(_iconsreacttaro.Close, null)));
+            }, title), description && /*#__PURE__*/ _react.default.createElement(_components.View, {
+                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(_components.View, {
-                className: closeClasses,
-                onClick: onHandleClickCloseIcon
-            }, /*#__PURE__*/ _react.default.isValidElement(closeIcon) ? closeIcon : /*#__PURE__*/ _react.default.createElement(_iconsreacttaro.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';

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

@@ -1,15 +1,8 @@
 .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: $overlay-content-bg-color;
-  color: $color-title;
   -webkit-overflow-scrolling: touch;
   font-size: $font-size-base;
 
@@ -22,38 +15,45 @@
     padding: $popup-title-padding;
     position: relative;
 
-    &-left {
-      position: absolute;
-      left: $popup-title-padding;
-    }
-
-    &-title {
+    &-wrapper {
       display: flex;
       flex-direction: column;
       justify-content: center;
       align-items: center;
+    }
+
+    &-title {
+      color: $color-title;
       font-weight: $font-weight-bold;
       font-size: $popup-title-font-size;
+      line-height: $popup-title-font-size;
     }
 
     &-description {
-      color: $color-text-help;
+      color: $color-text;
       font-size: $popup-description-font-size;
       font-weight: $font-weight;
+      &-gap {
+        margin-top: $popup-description-spacing;
+      }
+    }
+
+    &-left {
+      position: absolute;
+      top: $popup-title-padding;
+      left: $popup-title-padding;
     }
 
     &-right {
       position: absolute;
+      top: $popup-title-padding;
+      right: $popup-title-padding;
+
       z-index: 1;
-      cursor: pointer;
       width: $popup-icon-size;
       height: $popup-icon-size;
-      display: flex;
-      justify-content: center;
-      align-items: center;
-      top: $popup-title-padding;
-      right: $popup-title-padding;
-      color: $color-text-help;
+      color: $color-title;
+      cursor: pointer;
 
       &:active {
         opacity: 0.7;
@@ -80,9 +80,8 @@
     top: 50%;
     left: 50%;
     min-height: 10%;
-    /* #ifndef rn */
+    max-width: 295px;
     transform: translate(-50%, -50%);
-    /* #endif */
 
     &.nut-popup-round {
       border-radius: $popup-border-radius;
@@ -91,16 +90,13 @@
 
   &-bottom,
   &-top {
-    max-height: 83%;
+    max-height: 87%;
   }
 
   &-bottom {
     bottom: 0;
     left: 0;
     width: 100%;
-    /* #ifdef rn */
-    height: 300px;
-    /* #endif */
 
     &.nut-popup-round {
       border-radius: $popup-border-radius $popup-border-radius 0 0;
@@ -110,10 +106,8 @@
   &-right {
     top: 0;
     right: 0;
-    /* #ifdef rn */
     width: 100px;
     height: 100%;
-    /* #endif */
 
     &.nut-popup-round {
       border-radius: $popup-border-radius 0 0 $popup-border-radius;
@@ -123,10 +117,8 @@
   &-left {
     top: 0;
     left: 0;
-    /* #ifdef rn */
     width: 100px;
     height: 100%;
-    /* #endif */
 
     &.nut-popup-round {
       border-radius: 0 $popup-border-radius $popup-border-radius 0;
@@ -137,9 +129,6 @@
     top: 0;
     left: 0;
     width: 100%;
-    /* #ifdef rn */
-    height: 100px;
-    /* #endif */
 
     &.nut-popup-round {
       border-radius: 0 0 $popup-border-radius $popup-border-radius;
@@ -218,25 +207,19 @@
     /* 从顶部滑出 */
     @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 */
       }
     }
 
     &-top-enter-active,
     &-top-appear-active {
-      /* #ifndef rn */
       transform: translate3d(0, 0%, 0);
-      /* #endif*/
       animation-fill-mode: both;
       animation-name: popup-slide-top-enter;
       animation-duration: $popup-animation-duration;
@@ -251,25 +234,19 @@
     /* 从右侧滑出 */
     @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*/
       }
     }
 
     &-right-enter-active,
     &-right-appear-active {
-      /* #ifndef rn */
       transform: translate3d(0, 0, 0);
-      /* #endif*/
       animation-fill-mode: both;
       animation-name: popup-slide-right-enter;
       animation-duration: $popup-animation-duration;
@@ -284,25 +261,19 @@
     /* 从底部滑出 */
     @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 */
       }
     }
 
     &-bottom-enter-active,
     &-bottom-appear-active {
-      /* #ifndef rn */
       transform: translate(0, 0);
-      /* #endif */
       animation-fill-mode: both;
       animation-name: popup-slide-bottom-enter;
       animation-duration: $popup-animation-duration;
@@ -317,17 +288,13 @@
     /* 从左侧滑出 */
     @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 */
       }
     }
 
@@ -399,9 +366,7 @@
   &-center {
     left: auto;
     right: 50%;
-    /* #ifndef rn */
     transform: translate(50%, -50%);
-    /* #endif*/
   }
 
   &-bottom {