@nutui/nutui-react-taro 3.0.0-beta.0 → 3.0.0-beta.10

package/dist/es/packages/popover/style/style.css

@@ -1,4 +1,8 @@
 @charset "UTF-8";
+/* #ifdef harmony */
+/* #endif */
+/* #ifndef harmony */
+/* #endif */
 .nut-overlay {
   /* #ifdef rn */
   position: absolute;
@@ -12,22 +16,13 @@
   right: 0;
   width: 100%;
   height: 100%;
-  background-color: var(--nutui-overlay-bg-color, var(--nutui-black-10, 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;
 }
-.nut-overflow-hidden .taro_page {
-  overflow: hidden !important;
-}
 
 @keyframes nut-fade-in {
   0% {
@@ -62,49 +57,63 @@
   animation-duration: var(--nutui-overlay-animation-duration, 0.3s);
 }
 
+[dir=rtl] .nut-overlay,
+.nut-rtl .nut-overlay {
+  left: auto;
+  right: 0;
+}
+
 .nut-popup {
   position: fixed;
-  min-height: 26%;
+  min-height: 46%;
   max-height: 100%;
-  overflow-y: auto;
-  background-color: var(--nutui-overlay-content-bg-color, var(--nutui-gray-1, #ffffff));
-  color: var(--nutui-gray-7, #1a1a1a);
+  background-color: var(--nutui-overlay-content-bg-color, var(--nutui-gray-1));
   -webkit-overflow-scrolling: touch;
-  font-size: var(--nutui-font-size-3, 14px);
+  font-size: var(--nutui-font-size-base, 14px);
 }
 .nut-popup-title {
   display: flex;
+  flex-direction: row;
   align-items: center;
   justify-content: center;
   border-bottom: var(--nutui-popup-title-border-bottom, 0);
   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-wrapper {
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
 }
 .nut-popup-title-title {
-  font-weight: var(--nutui-font-weight-bold, 500);
-  font-size: var(--nutui-popup-title-font-size, var(--nutui-font-size-6, 20px));
+  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-l, 16px));
+  line-height: var(--nutui-popup-title-font-size, var(--nutui-font-size-l, 16px));
 }
 .nut-popup-title-description {
-  color: var(--nutui-gray-5, #888b94);
-  font-size: var(--nutui-popup-description-font-size, var(--nutui-font-size-1, 10px));
+  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 !important;
-  z-index: 1;
-  cursor: pointer;
-  width: var(--nutui-popup-icon-size, var(--nutui-font-size-6, 20px));
-  height: var(--nutui-popup-icon-size, var(--nutui-font-size-6, 20px));
-  display: flex;
-  justify-content: center;
-  align-items: center;
+  position: absolute;
   top: var(--nutui-popup-title-padding, 16px);
   right: var(--nutui-popup-title-padding, 16px);
-  color: var(--nutui-gray-5, #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;
@@ -125,13 +134,14 @@
   top: 50%;
   left: 50%;
   min-height: 10%;
+  max-width: 295px;
   transform: translate(-50%, -50%);
 }
 .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;
@@ -139,21 +149,25 @@
   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;
+  width: 100px;
+  height: 100%;
 }
 .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;
+  width: 100px;
+  height: 100%;
 }
 .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;
@@ -161,7 +175,7 @@
   width: 100%;
 }
 .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 {
   /* 从顶部滑出 */
@@ -313,7 +327,7 @@
   display: none;
 }
 .nut-popup .nut-overflow-hidden {
-  overflow: hidden !important;
+  overflow: hidden;
 }
 
 [dir=rtl] .nut-popup-title-left,
@@ -369,93 +383,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: 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);
-  font-size: var(--nutui-popover-font-size, var(--nutui-font-size-2, 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);
+  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));
+  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-black-3, 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;
 }
 .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: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;
@@ -470,9 +469,10 @@
   font-size: 12px;
 }
 .nut-popover .nut-popover-content .nut-popover-menu-item-name {
-  width: 100%;
+  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 {
   display: flex;
@@ -481,10 +481,15 @@
   width: 12px;
   height: 12px;
   font-size: 12px;
-  color: var(--nutui-gray-6, #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 {
@@ -492,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%;
@@ -540,22 +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 {
-  border-bottom-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/es/packages/popup/popup.d.ts

@@ -3,96 +3,24 @@ import { ITouchEvent } from '@tarojs/components';
 import { OverlayProps } from "../overlay/overlay";
 type Teleport = HTMLElement | (() => HTMLElement) | null;
 export interface PopupProps extends OverlayProps {
-    /**
-    * 弹出位置
-    * @default center
-    */
-    position: string
-    /**
-    * 动画名
-    * @default -
-    */
-    transition: string
-    /**
-    * 自定义遮罩样式
-    * @default -
-    */
-    overlayStyle: React.CSSProperties
-    /**
-    * 自定义遮罩类名
-    * @default -
-    */
-    overlayClassName: string
-    /**
-    * 是否显示关闭按钮
-    * @default false
-    */
-    closeable: boolean
-    /**
-    * 关闭按钮位置
-    * @default top-right
-    */
-    closeIconPosition: string
-    /**
-    * 自定义 Icon
-    * @default close
-    */
-    closeIcon: ReactNode
-    /**
-    * 标题左侧部分
-    * @default -
-    */
-    left: ReactNode
-    /**
-    * 标题中间部分
-    * @default -
-    */
-    title: ReactNode
-    /**
-    * 子标题/描述部分
-    * @default -
-    */
-    description: ReactNode
-    /**
-    * 组件不可见时，卸载内容
-    * @default false
-    */
-    destroyOnClose: boolean
-    /**
-    * 指定节点挂载
-    * @default null
-    */
-    portal: Teleport
-    /**
-    * 是否显示遮罩
-    * @default true
-    */
-    overlay: boolean
-    /**
-    * 是否显示圆角
-    * @default false
-    */
-    round: boolean
-    /**
-    * 打开弹框时触发
-    * @default -
-    */
-    onOpen: () => void
-    /**
-    * 关闭弹框时触发
-    * @default -
-    */
-    onClose: () => void
-    /**
-    * 点击遮罩触发
-    * @default -
-    */
-    onOverlayClick: (e: ITouchEvent) => boolean | void
-    /**
-    * 点击关闭图标时触发
-    * @default -
-    */
-    onCloseIconClick: (e: ITouchEvent) => boolean | void
+    position: string;
+    transition: string;
+    overlayStyle: React.CSSProperties;
+    overlayClassName: string;
+    closeable: boolean;
+    closeIconPosition: string;
+    closeIcon: ReactNode;
+    left: ReactNode;
+    title: ReactNode;
+    description: ReactNode;
+    destroyOnClose: boolean;
+    portal: Teleport;
+    overlay: boolean;
+    round: boolean;
+    onOpen: () => void;
+    onClose: () => void;
+    onOverlayClick: (e: ITouchEvent) => boolean | void;
+    onCloseIconClick: (e: ITouchEvent) => boolean | void;
 }
 export declare const Popup: FunctionComponent<Partial<PopupProps> & Omit<React.HTMLAttributes<HTMLDivElement>, 'onClick' | 'title'>>;
 export {};

package/dist/es/packages/popup/popup.js

@@ -96,16 +96,11 @@ export var Popup = function(props) {
     var onHandleClosed = function(e) {
         afterClose && afterClose();
     };
-    var resolveContainer = function(getContainer) {
-        var container = typeof getContainer === 'function' ? getContainer() : getContainer;
-        return container || document.body;
-    };
-    var renderToContainer = function(getContainer, node) {
-        if (getContainer) {
-            var container = resolveContainer(getContainer);
-            return /*#__PURE__*/ createPortal(node, container);
-        }
-        return node;
+    var renderCloseIcon = function() {
+        return /*#__PURE__*/ React.createElement(React.Fragment, null, closeable && /*#__PURE__*/ React.createElement(View, {
+            className: closeClasses,
+            onClick: onHandleClickCloseIcon
+        }, /*#__PURE__*/ React.isValidElement(closeIcon) ? closeIcon : /*#__PURE__*/ React.createElement(Close, null)));
     };
     var renderTitle = function() {
         if (left || title || description) {
@@ -114,23 +109,20 @@ export var Popup = function(props) {
             }, position === 'bottom' && /*#__PURE__*/ React.createElement(React.Fragment, null, left && /*#__PURE__*/ React.createElement(View, {
                 className: "".concat(classPrefix, "-title-left")
             }, left), (title || description) && /*#__PURE__*/ React.createElement(View, {
+                className: "".concat(classPrefix, "-title-wrapper")
+            }, title && /*#__PURE__*/ React.createElement(View, {
                 className: "".concat(classPrefix, "-title-title")
-            }, title, description && /*#__PURE__*/ React.createElement(View, {
-                className: "".concat(classPrefix, "-title-description")
-            }, description))), closeable && /*#__PURE__*/ React.createElement(View, {
-                className: closeClasses,
-                onClick: onHandleClickCloseIcon
-            }, /*#__PURE__*/ React.isValidElement(closeIcon) ? closeIcon : /*#__PURE__*/ React.createElement(Close, null)));
+            }, title), description && /*#__PURE__*/ React.createElement(View, {
+                className: "".concat(classPrefix, "-title-description ").concat(title ? "".concat(classPrefix, "-title-description-gap") : '')
+            }, description))), renderCloseIcon());
         }
         if (closeable) {
-            return /*#__PURE__*/ React.createElement(React.Fragment, null, closeable && /*#__PURE__*/ React.createElement(View, {
-                className: closeClasses,
-                onClick: onHandleClickCloseIcon
-            }, /*#__PURE__*/ React.isValidElement(closeIcon) ? closeIcon : /*#__PURE__*/ React.createElement(Close, null)));
+            return renderCloseIcon();
         }
     };
     var renderPop = function() {
         return /*#__PURE__*/ React.createElement(CSSTransition, {
+            nodeRef: refObject,
             classNames: transitionName,
             mountOnEnter: true,
             unmountOnExit: destroyOnClose,
@@ -147,7 +139,7 @@ export var Popup = function(props) {
         }, renderTitle(), showChildren ? children : ''));
     };
     var renderNode = function() {
-        return /*#__PURE__*/ React.createElement(React.Fragment, null, overlay ? /*#__PURE__*/ React.createElement(React.Fragment, null, /*#__PURE__*/ React.createElement(Overlay, {
+        return /*#__PURE__*/ React.createElement(React.Fragment, null, overlay ? /*#__PURE__*/ React.createElement(Overlay, {
             style: overlayStyles,
             className: overlayClassName,
             visible: innerVisible,
@@ -155,11 +147,10 @@ export var Popup = function(props) {
             lockScroll: lockScroll,
             duration: duration,
             onClick: onHandleClickOverlay
-        }), renderPop()) : /*#__PURE__*/ React.createElement(React.Fragment, null, renderPop()));
+        }) : null, renderPop());
     };
     useEffect(function() {
-        visible && open();
-        !visible && close();
+        visible ? open() : close();
     }, [
         visible
     ]);
@@ -169,6 +160,17 @@ export var Popup = function(props) {
         position,
         transition
     ]);
+    var resolveContainer = function(getContainer) {
+        var container = typeof getContainer === 'function' ? getContainer() : getContainer;
+        return container || document.body;
+    };
+    var renderToContainer = function(getContainer, node) {
+        if (getContainer) {
+            var container = resolveContainer(getContainer);
+            return /*#__PURE__*/ createPortal(node, container);
+        }
+        return node;
+    };
     return /*#__PURE__*/ React.createElement(React.Fragment, null, renderToContainer(portal, renderNode()));
 };
 Popup.displayName = 'NutPopup';