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

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

@@ -12,7 +12,7 @@
   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-color-mask, rgba(0, 0, 0, 0.7)));
   z-index: var(--nutui-overlay-zIndex, 1000);
 }
 
@@ -25,9 +25,6 @@
 .nut-overflow-hidden {
   overflow: hidden !important;
 }
-.nut-overflow-hidden .taro_page {
-  overflow: hidden !important;
-}
 
 @keyframes nut-fade-in {
   0% {
@@ -63,17 +60,23 @@
 }
 
 .nut-popup {
+  /* #ifdef rn */
+  position: absolute;
+  /* #endif */
+  /* #ifndef rn */
   position: fixed;
+  /* #endif */
   min-height: 26%;
   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-color-background-overlay, #ffffff));
+  color: var(--nutui-color-title, #1a1a1a);
   -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);
@@ -85,26 +88,30 @@
   left: var(--nutui-popup-title-padding, 16px);
 }
 .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));
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+  font-weight: var(--nutui-font-weight-bold, 600);
+  font-size: var(--nutui-popup-title-font-size, var(--nutui-font-size-xl, 18px));
 }
 .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-color-text-help, #888b94);
+  font-size: var(--nutui-popup-description-font-size, var(--nutui-font-size-xs, 11px));
   font-weight: var(--nutui-font-weight, 400);
 }
 .nut-popup-title-right {
-  position: absolute !important;
+  position: absolute;
   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));
+  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-gray-5, #888b94);
+  color: var(--nutui-color-text-help, #888b94);
 }
 .nut-popup-title-right:active {
   opacity: 0.7;
@@ -125,7 +132,9 @@
   top: 50%;
   left: 50%;
   min-height: 10%;
+  /* #ifndef rn */
   transform: translate(-50%, -50%);
+  /* #endif */
 }
 .nut-popup-center.nut-popup-round {
   border-radius: var(--nutui-popup-border-radius, 24px);
@@ -137,6 +146,9 @@
   bottom: 0;
   left: 0;
   width: 100%;
+  /* #ifdef rn */
+  height: 300px;
+  /* #endif */
 }
 .nut-popup-bottom.nut-popup-round {
   border-radius: var(--nutui-popup-border-radius, 24px) var(--nutui-popup-border-radius, 24px) 0 0;
@@ -144,6 +156,10 @@
 .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);
@@ -151,6 +167,10 @@
 .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;
@@ -159,6 +179,9 @@
   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);
@@ -227,16 +250,22 @@
 }
 @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);
@@ -248,16 +277,22 @@
 }
 @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);
@@ -269,16 +304,22 @@
 }
 @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);
@@ -290,12 +331,16 @@
 }
 @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 {
@@ -313,7 +358,7 @@
   display: none;
 }
 .nut-popup .nut-overflow-hidden {
-  overflow: hidden !important;
+  overflow: hidden;
 }
 
 [dir=rtl] .nut-popup-title-left,
@@ -349,7 +394,9 @@
 .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 {
@@ -425,7 +472,7 @@
   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-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);
@@ -444,7 +491,7 @@
   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)));
+  border-bottom: 1px solid var(--nutui-popover-divider-color, var(--nutui-color-border, rgba(0, 0, 0, 0.06)));
 }
 .nut-popover .nut-popover-content .nut-popover-menu-item:last-child {
   margin-bottom: 0px;
@@ -481,7 +528,7 @@
   width: 12px;
   height: 12px;
   font-size: 12px;
-  color: var(--nutui-gray-6, #505259);
+  color: var(--nutui-color-text, #505259);
 }
 .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));

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

@@ -131,6 +131,7 @@ export var Popup = function(props) {
     };
     var renderPop = function() {
         return /*#__PURE__*/ React.createElement(CSSTransition, {
+            nodeRef: refObject,
             classNames: transitionName,
             mountOnEnter: true,
             unmountOnExit: destroyOnClose,
@@ -147,7 +148,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,7 +156,7 @@ export var Popup = function(props) {
             lockScroll: lockScroll,
             duration: duration,
             onClick: onHandleClickOverlay
-        }), renderPop()) : /*#__PURE__*/ React.createElement(React.Fragment, null, renderPop()));
+        }) : null, /*#__PURE__*/ React.createElement(React.Fragment, null, renderPop()));
     };
     useEffect(function() {
         visible && open();

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

@@ -1,5 +1,10 @@
 .nut-popup {
+  /* #ifdef rn */
+  position: absolute;
+  /* #endif */
+  /* #ifndef rn */
   position: fixed;
+  /* #endif */
   min-height: 26%;
   max-height: 100%;
   overflow-y: auto;
@@ -10,9 +15,9 @@
 
   &-title {
     display: flex;
+    flex-direction: row;
     align-items: center;
     justify-content: center;
-    // height: $popup-title-height;
     border-bottom: $popup-title-border-bottom;
     padding: $popup-title-padding;
     position: relative;
@@ -23,6 +28,10 @@
     }
 
     &-title {
+      display: flex;
+      flex-direction: column;
+      justify-content: center;
+      align-items: center;
       font-weight: $font-weight-bold;
       font-size: $popup-title-font-size;
     }
@@ -34,7 +43,7 @@
     }
 
     &-right {
-      position: absolute !important;
+      position: absolute;
       z-index: 1;
       cursor: pointer;
       width: $popup-icon-size;
@@ -71,7 +80,9 @@
     top: 50%;
     left: 50%;
     min-height: 10%;
+    /* #ifndef rn */
     transform: translate(-50%, -50%);
+    /* #endif */
 
     &.nut-popup-round {
       border-radius: $popup-border-radius;
@@ -87,6 +98,9 @@
     bottom: 0;
     left: 0;
     width: 100%;
+    /* #ifdef rn */
+    height: 300px;
+    /* #endif */
 
     &.nut-popup-round {
       border-radius: $popup-border-radius $popup-border-radius 0 0;
@@ -96,6 +110,10 @@
   &-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;
@@ -105,6 +123,10 @@
   &-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;
@@ -115,6 +137,9 @@
     top: 0;
     left: 0;
     width: 100%;
+    /* #ifdef rn */
+    height: 100px;
+    /* #endif */
 
     &.nut-popup-round {
       border-radius: 0 0 $popup-border-radius $popup-border-radius;
@@ -193,19 +218,25 @@
     /* 从顶部滑出 */
     @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;
@@ -220,19 +251,25 @@
     /* 从右侧滑出 */
     @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;
@@ -247,19 +284,25 @@
     /* 从底部滑出 */
     @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;
@@ -274,13 +317,17 @@
     /* 从左侧滑出 */
     @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 */
       }
     }
 
@@ -312,7 +359,7 @@
   }
 
   .nut-overflow-hidden {
-    overflow: hidden !important;
+    overflow: hidden;
   }
 }
 
@@ -352,7 +399,9 @@
   &-center {
     left: auto;
     right: 50%;
+    /* #ifndef rn */
     transform: translate(50%, -50%);
+    /* #endif*/
   }
 
   &-bottom {