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

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

@@ -3,19 +3,14 @@
 /* #ifndef harmony */
 /* #endif */
 .nut-overlay {
-  /* #ifdef rn */
-  position: absolute;
-  /* #endif */
-  /* #ifndef rn */
   position: fixed;
-  /* #endif */
   top: 0;
   left: 0;
   bottom: 0;
   right: 0;
   width: 100%;
   height: 100%;
-  background-color: var(--nutui-overlay-bg-color, var(--nutui-black-10));
+  background-color: var(--nutui-overlay-bg-color, var(--nutui-color-mask, rgba(0, 0, 0, 0.7)));
   z-index: var(--nutui-overlay-zIndex, 1000);
 }
 

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

@@ -3,12 +3,7 @@
 /* #ifndef harmony */
 /* #endif */
 .nut-overlay {
-  /* #ifdef rn */
-  position: absolute;
-  /* #endif */
-  /* #ifndef rn */
   position: fixed;
-  /* #endif */
   top: 0;
   left: 0;
   bottom: 0;

package/dist/cjs/packages/overlay/types.d.ts

@@ -0,0 +1,11 @@
+import { BasicComponent } from "../../utils/typings";
+export interface OverlayProps extends BasicComponent {
+    zIndex: number;
+    duration: number;
+    closeOnOverlayClick: boolean;
+    visible: boolean;
+    lockScroll: boolean;
+    onClick: (event: React.MouseEvent) => void;
+    afterShow: () => void;
+    afterClose: () => void;
+}

package/dist/cjs/packages/overlay/types.js

@@ -0,0 +1,4 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});

package/dist/cjs/packages/overlay/types.taro.d.ts

@@ -0,0 +1,5 @@
+import { ITouchEvent } from '@tarojs/components';
+import { OverlayProps as OverlayWebProps } from './types';
+export type OverlayProps = Omit<OverlayWebProps, 'onClick'> & {
+    onClick: (event: ITouchEvent) => void;
+};

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

@@ -6,7 +6,7 @@
   display: flex;
   flex-direction: row;
   font-size: var(--nutui-pagination-font-size, var(--nutui-font-size-base, 14px));
-  color: var(--nutui-pagination-color, var(--nutui-brand-6));
+  color: var(--nutui-pagination-color, var(--nutui-color-primary, #ff0f23));
 }
 
 .nut-pagination-prev,
@@ -20,10 +20,10 @@
   align-items: center;
   justify-content: center;
   font-size: var(--nutui-pagination-font-size, var(--nutui-font-size-base, 14px));
-  color: var(--nutui-pagination-color, var(--nutui-brand-6));
+  color: var(--nutui-pagination-color, var(--nutui-color-primary, #ff0f23));
   background: #ffffff;
   border-radius: var(--nutui-pagination-item-border-radius, 2px);
-  border: var(--nutui-pagination-item-border-width, 1px) solid var(--nutui-pagination-item-border-color, var(--nutui-black-3));
+  border: var(--nutui-pagination-item-border-width, 1px) solid var(--nutui-pagination-item-border-color, var(--nutui-color-border, rgba(0, 0, 0, 0.06)));
   cursor: pointer;
 }
 
@@ -45,13 +45,13 @@
 .nut-pagination-item-active {
   color: #ffffff;
   border-width: 0;
-  background-color: var(--nutui-brand-6);
+  background-color: var(--nutui-color-primary, #ff0f23);
 }
 
 .nut-pagination-item-disabled,
 .nut-pagination-next-disabled,
 .nut-pagination-prev-disabled {
-  color: var(--nutui-pagination-disable-color, var(--nutui-gray-4));
+  color: var(--nutui-pagination-disable-color, var(--nutui-color-text-disabled, #c2c4cc));
   background-color: var(--nutui-pagination-disable-background-color, #f7f8fa);
   cursor: not-allowed;
 }
@@ -62,11 +62,11 @@
   line-height: 39px;
   text-align: center;
   font-size: var(--nutui-pagination-font-size, var(--nutui-font-size-base, 14px));
-  color: var(--nutui-pagination-color, var(--nutui-brand-6));
+  color: var(--nutui-pagination-color, var(--nutui-color-primary, #ff0f23));
 }
 
 .nut-pagination-simple-border {
-  border-right: var(--nutui-pagination-item-border-width, 1px) solid var(--nutui-pagination-item-border-color, var(--nutui-black-3));
+  border-right: var(--nutui-pagination-item-border-width, 1px) solid var(--nutui-pagination-item-border-color, var(--nutui-color-border, rgba(0, 0, 0, 0.06)));
 }
 
 .nut-pagination-lite {

package/dist/cjs/packages/picker/picker.d.ts

@@ -1,5 +1,5 @@
 import React, { RefObject } from 'react';
-import { PopupProps } from "../popup/popup";
+import { PopupProps } from "../popup/index";
 import { PickerOption } from './types';
 import { BasicComponent } from "../../utils/typings";
 export type PickerActions = {

package/dist/cjs/packages/picker/picker.js

@@ -19,10 +19,10 @@ var _react = /*#__PURE__*/ _interop_require_wildcard._(require("react"));
 var _classnames = /*#__PURE__*/ _interop_require_default._(require("classnames"));
 var _taro = /*#__PURE__*/ _interop_require_default._(require("@tarojs/taro"));
 var _components = require("@tarojs/components");
-var _popup = require("../popup/popup");
+var _index = /*#__PURE__*/ _interop_require_default._(require("../popup/index"));
 var _pickerpanel = /*#__PURE__*/ _interop_require_default._(require("./pickerpanel"));
 var _userefs = /*#__PURE__*/ _interop_require_default._(require("../../utils/use-refs"));
-var _index = require("../configprovider/index");
+var _index1 = require("../configprovider/index");
 var _usepropsvalue = require("../../utils/use-props-value");
 var _typings = require("../../utils/typings");
 var defaultProps = (0, _object_spread_props._)((0, _object_spread._)({}, _typings.ComponentDefaults), {
@@ -36,7 +36,7 @@ var defaultProps = (0, _object_spread_props._)((0, _object_spread._)({}, _typing
     duration: 1000
 });
 var InternalPicker = function InternalPicker(props, ref) {
-    var locale = (0, _index.useConfig)().locale;
+    var locale = (0, _index1.useConfig)().locale;
     var _ref = (0, _object_spread._)({}, defaultProps, props), children = _ref.children, visible = _ref.visible, title = _ref.title, _ref_options = _ref.options, options = _ref_options === void 0 ? [] : _ref_options, closeOnOverlayClick = _ref.closeOnOverlayClick, _ref_popupProps = _ref.popupProps, popupProps = _ref_popupProps === void 0 ? {} : _ref_popupProps, _ref_defaultValue = _ref.defaultValue, defaultValue = _ref_defaultValue === void 0 ? [] : _ref_defaultValue, className = _ref.className, style = _ref.style, threeDimensional = _ref.threeDimensional, duration = _ref.duration, onConfirm = _ref.onConfirm, onCancel = _ref.onCancel, onClose = _ref.onClose, afterClose = _ref.afterClose, onChange = _ref.onChange, rest = (0, _object_without_properties._)(_ref, [
         "children",
         "visible",
@@ -311,7 +311,7 @@ var InternalPicker = function InternalPicker(props, ref) {
         // 选择的是哪个 option
         chooseItem(columnsList[changeIndex][data.detail.value[changeIndex]], changeIndex);
     };
-    return /*#__PURE__*/ _react.default.createElement(_react.default.Fragment, null, typeof children === 'function' && children(selectedValue), /*#__PURE__*/ _react.default.createElement(_popup.Popup, (0, _object_spread_props._)((0, _object_spread._)({}, popupProps), {
+    return /*#__PURE__*/ _react.default.createElement(_react.default.Fragment, null, typeof children === 'function' && children(selectedValue), /*#__PURE__*/ _react.default.createElement(_index.default, (0, _object_spread_props._)((0, _object_spread._)({}, popupProps), {
         visible: innerVisible,
         position: "bottom",
         onOverlayClick: function onOverlayClick() {

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

@@ -4,19 +4,14 @@
 /* #ifndef harmony */
 /* #endif */
 .nut-overlay {
-  /* #ifdef rn */
-  position: absolute;
-  /* #endif */
-  /* #ifndef rn */
   position: fixed;
-  /* #endif */
   top: 0;
   left: 0;
   bottom: 0;
   right: 0;
   width: 100%;
   height: 100%;
-  background-color: var(--nutui-overlay-bg-color, var(--nutui-black-10));
+  background-color: var(--nutui-overlay-bg-color, var(--nutui-color-mask, rgba(0, 0, 0, 0.7)));
   z-index: var(--nutui-overlay-zIndex, 1000);
 }
 
@@ -67,7 +62,7 @@
   position: fixed;
   min-height: 46%;
   max-height: 100%;
-  background-color: var(--nutui-overlay-content-bg-color, var(--nutui-gray-1));
+  background-color: var(--nutui-overlay-content-bg-color, var(--nutui-color-background-overlay, #ffffff));
   -webkit-overflow-scrolling: touch;
   font-size: var(--nutui-font-size-base, 14px);
 }
@@ -87,13 +82,13 @@
   align-items: center;
 }
 .nut-popup-title-title {
-  color: var(--nutui-gray-7);
+  color: var(--nutui-color-title, #1a1a1a);
   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-6);
+  color: var(--nutui-color-text, #505259);
   font-size: var(--nutui-popup-description-font-size, var(--nutui-font-size-base, 14px));
   font-weight: var(--nutui-font-weight, 400);
 }
@@ -112,7 +107,7 @@
   z-index: 1;
   width: var(--nutui-popup-icon-size, 20px);
   height: var(--nutui-popup-icon-size, 20px);
-  color: var(--nutui-gray-7);
+  color: var(--nutui-color-title, #1a1a1a);
   cursor: pointer;
 }
 .nut-popup-title-right:active {
@@ -377,7 +372,7 @@
 }
 
 .nut-picker {
-  background-color: var(--nutui-gray-1);
+  background-color: var(--nutui-color-background-overlay, #ffffff);
   width: 100%;
 }
 .nut-picker-control {
@@ -389,11 +384,11 @@
   padding: var(--nutui-popup-title-padding, 16px);
 }
 .nut-picker-cancel-btn {
-  color: var(--nutui-picker-title-cancel-color, var(--nutui-gray-6));
+  color: var(--nutui-picker-title-cancel-color, var(--nutui-color-text, #505259));
   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-brand-6));
+  color: var(--nutui-picker-title-ok-color, var(--nutui-color-primary, #ff0f23));
   font-size: var(--nutui-picker-title-ok-font-size, var(--nutui-font-size-base, 14px));
 }
 .nut-picker-title {
@@ -402,7 +397,7 @@
   text-overflow: ellipsis;
   white-space: nowrap;
   text-align: center;
-  color: var(--nutui-gray-7);
+  color: var(--nutui-color-title, #1a1a1a);
   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));
 }
@@ -415,10 +410,10 @@
   top: 108px;
   height: var(--nutui-picker-item-height, 36px);
   width: 100%;
-  border: var(--nutui-picker-item-active-line-border, 1px solid var(--nutui-black-3));
+  border: var(--nutui-picker-item-active-line-border, 1px solid var(--nutui-color-border, rgba(0, 0, 0, 0.06)));
   border-left: 0;
   border-right: 0;
-  color: var(--nutui-picker-item-text-color, var(--nutui-gray-7));
+  color: var(--nutui-picker-item-text-color, var(--nutui-color-title, #1a1a1a));
   font-size: var(--nutui-picker-item-text-font-size, var(--nutui-font-size-base, 14px));
   z-index: 3;
 }
@@ -427,7 +422,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-black-3));
+  border: var(--nutui-picker-item-active-line-border, 1px solid var(--nutui-color-border, rgba(0, 0, 0, 0.06)));
   border-left: 0;
   border-right: 0;
 }
@@ -475,7 +470,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-gray-7));
+  color: var(--nutui-picker-item-text-color, var(--nutui-color-title, #1a1a1a));
   font-size: var(--nutui-picker-item-text-font-size, var(--nutui-font-size-base, 14px));
   text-align: center;
 }
@@ -501,7 +496,7 @@
   height: var(--nutui-picker-item-height, 36px);
   line-height: var(--nutui-picker-item-height, 36px);
   text-align: center;
-  color: var(--nutui-gray-7);
+  color: var(--nutui-color-title, #1a1a1a);
   font-size: var(--nutui-font-size-base, 14px);
 }
 .nut-picker-roller-item-hidden {

package/dist/cjs/packages/popover/popover.d.ts

@@ -1,5 +1,5 @@
 import React, { FunctionComponent } from 'react';
-import { PopupProps } from "../popup/popup";
+import { PopupProps } from "../popup/index";
 import { PopoverTheme, PopoverLocation, PopoverList } from './types';
 export interface PopoverProps extends PopupProps {
     list: PopoverList[];

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

@@ -334,7 +334,7 @@ var Popover = function Popover(props) {
         style: getRootPosition()
     }, /*#__PURE__*/ _react.default.createElement(_index.default, (0, _object_spread._)({
         className: "nut-popover-content nut-popover-content-".concat(location),
-        position: "default",
+        position: "none",
         overlay: overlay,
         visible: showPopup
     }, rest), /*#__PURE__*/ _react.default.createElement(_components.View, {

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

@@ -4,19 +4,14 @@
 /* #ifndef harmony */
 /* #endif */
 .nut-overlay {
-  /* #ifdef rn */
-  position: absolute;
-  /* #endif */
-  /* #ifndef rn */
   position: fixed;
-  /* #endif */
   top: 0;
   left: 0;
   bottom: 0;
   right: 0;
   width: 100%;
   height: 100%;
-  background-color: var(--nutui-overlay-bg-color, var(--nutui-black-10));
+  background-color: var(--nutui-overlay-bg-color, var(--nutui-color-mask, rgba(0, 0, 0, 0.7)));
   z-index: var(--nutui-overlay-zIndex, 1000);
 }
 
@@ -67,7 +62,7 @@
   position: fixed;
   min-height: 46%;
   max-height: 100%;
-  background-color: var(--nutui-overlay-content-bg-color, var(--nutui-gray-1));
+  background-color: var(--nutui-overlay-content-bg-color, var(--nutui-color-background-overlay, #ffffff));
   -webkit-overflow-scrolling: touch;
   font-size: var(--nutui-font-size-base, 14px);
 }
@@ -87,13 +82,13 @@
   align-items: center;
 }
 .nut-popup-title-title {
-  color: var(--nutui-gray-7);
+  color: var(--nutui-color-title, #1a1a1a);
   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-6);
+  color: var(--nutui-color-text, #505259);
   font-size: var(--nutui-popup-description-font-size, var(--nutui-font-size-base, 14px));
   font-weight: var(--nutui-font-weight, 400);
 }
@@ -112,7 +107,7 @@
   z-index: 1;
   width: var(--nutui-popup-icon-size, 20px);
   height: var(--nutui-popup-icon-size, 20px);
-  color: var(--nutui-gray-7);
+  color: var(--nutui-color-title, #1a1a1a);
   cursor: pointer;
 }
 .nut-popup-title-right:active {
@@ -437,7 +432,7 @@
   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));
+  color: var(--nutui-popover-text-color, var(--nutui-color-mask, rgba(0, 0, 0, 0.7)));
   line-height: 28px;
   max-height: initial;
   overflow-y: initial;
@@ -447,7 +442,7 @@
   align-items: center;
   justify-content: center;
   padding: 0 var(--nutui-popover-menu-item-padding, 8px);
-  border-bottom: 1px solid var(--nutui-popover-divider-color, var(--nutui-black-3));
+  border-bottom: 1px solid var(--nutui-popover-divider-color, var(--nutui-color-border, rgba(0, 0, 0, 0.06)));
   max-width: var(--nutui-popover-menu-item-width, 160px);
   word-wrap: break-word;
 }
@@ -481,7 +476,7 @@
   width: 12px;
   height: 12px;
   font-size: 12px;
-  color: var(--nutui-gray-6);
+  color: var(--nutui-color-text, #505259);
 }
 .nut-popover .nut-popover-content .nut-popover-menu-item-action-icon .nut-icon {
   width: 12px;
@@ -489,7 +484,7 @@
   font-size: 12px;
 }
 .nut-popover .nut-popover-content .nut-popover-menu-item.nut-popover-menu-disabled {
-  color: var(--nutui-popover-disable-color, var(--nutui-gray-4));
+  color: var(--nutui-popover-disable-color, var(--nutui-color-text-disabled, #c2c4cc));
   cursor: not-allowed;
 }
 .nut-popover .nut-popover-content .nut-popover-menu-item.nut-popover-menu-taroitem {
@@ -548,14 +543,14 @@
 }
 
 .nut-popover-dark {
-  background: var(--nutui-popover-text-color, var(--nutui-black-10));
+  background: var(--nutui-popover-text-color, var(--nutui-color-mask, rgba(0, 0, 0, 0.7)));
   color: var(--nutui-popover-content-background-color, #ffffff);
 }
 .nut-popover-dark .nut-popover-arrow .nut-icon-ArrowRadius {
-  color: var(--nutui-popover-text-color, var(--nutui-black-10));
+  color: var(--nutui-popover-text-color, var(--nutui-color-mask, rgba(0, 0, 0, 0.7)));
 }
 .nut-popover-dark .nut-popover-content {
-  background: var(--nutui-popover-text-color, var(--nutui-black-10)) !important;
+  background: var(--nutui-popover-text-color, var(--nutui-color-mask, rgba(0, 0, 0, 0.7))) !important;
   color: var(--nutui-popover-content-background-color, #ffffff) !important;
 }
 .nut-popover-dark .nut-popover-content .nut-popover-menu-item-action-icon {

package/dist/cjs/packages/popup/index.d.ts

@@ -1,3 +1,3 @@
 import { Popup } from "./popup";
-export type { PopupProps } from "./popup";
+export type { PopupProps, CloseIconPosition, Teleport } from './types.taro';
 export default Popup;

package/dist/cjs/packages/popup/popup.d.ts

@@ -1,26 +1,3 @@
-import React, { FunctionComponent, ReactNode } from 'react';
-import { ITouchEvent } from '@tarojs/components';
-import { OverlayProps } from "../overlay/overlay";
-type Teleport = HTMLElement | (() => HTMLElement) | null;
-export interface PopupProps extends OverlayProps {
-    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;
-}
+import React, { FunctionComponent } from 'react';
+import { PopupProps } from './types.taro';
 export declare const Popup: FunctionComponent<Partial<PopupProps> & Omit<React.HTMLAttributes<HTMLDivElement>, 'onClick' | 'title'>>;
-export {};

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

@@ -22,9 +22,8 @@ var _iconsreacttaro = require("@nutui/icons-react-taro");
 var _components = require("@tarojs/components");
 var _overlay = require("../overlay/overlay");
 var _index = /*#__PURE__*/ _interop_require_default._(require("../overlay/index"));
-var _typings = require("../../utils/typings");
 var _uselockscolltaro = require("../../utils/use-lock-scoll-taro");
-var defaultProps = (0, _object_spread._)((0, _object_spread_props._)((0, _object_spread._)({}, _typings.ComponentDefaults), {
+var defaultProps = (0, _object_spread_props._)((0, _object_spread._)({}, _overlay.defaultOverlayProps), {
     position: 'center',
     transition: '',
     overlayStyle: {},
@@ -38,13 +37,13 @@ var defaultProps = (0, _object_spread._)((0, _object_spread_props._)((0, _object
     round: false,
     onOpen: function onOpen() {},
     onClose: function onClose() {},
-    onOverlayClick: function onOverlayClick(e) {
+    onOverlayClick: function onOverlayClick() {
         return true;
     },
-    onCloseIconClick: function onCloseIconClick(e) {
+    onCloseIconClick: function onCloseIconClick() {
         return true;
     }
-}), _overlay.defaultOverlayProps);
+});
 // 默认1000，参看variables
 var _zIndex = 1100;
 var Popup = function Popup(props) {
@@ -56,17 +55,12 @@ var Popup = function Popup(props) {
     var _useState3 = (0, _sliced_to_array._)((0, _react.useState)(''), 2), transitionName = _useState3[0], setTransitionName = _useState3[1];
     var refObject = (0, _uselockscolltaro.useLockScrollTaro)(innerVisible && lockScroll);
     var classPrefix = 'nut-popup';
-    var baseStyle = {
+    var overlayStyles = (0, _object_spread._)({}, overlayStyle);
+    var popStyles = (0, _object_spread_props._)((0, _object_spread._)({}, style), {
         zIndex: index
-    };
-    var overlayStyles = (0, _object_spread_props._)((0, _object_spread._)({}, overlayStyle), {
-        '--nutui-overlay-zIndex': index
     });
-    var popStyles = (0, _object_spread._)({}, style, baseStyle);
     var _obj;
-    var popClassName = (0, _classnames.default)((_obj = {}, (0, _define_property._)(_obj, "".concat(classPrefix), true), (0, _define_property._)(_obj, "".concat(classPrefix, "-round"), round || position === 'bottom'), (0, _define_property._)(_obj, "".concat(classPrefix, "-").concat(position), true), _obj), className);
-    var _obj1;
-    var closeClasses = (0, _classnames.default)((_obj1 = {}, (0, _define_property._)(_obj1, "".concat(classPrefix, "-title-right"), true), (0, _define_property._)(_obj1, "".concat(classPrefix, "-title-right-").concat(closeIconPosition), true), _obj1));
+    var popClassName = (0, _classnames.default)(classPrefix, (_obj = {}, (0, _define_property._)(_obj, "".concat(classPrefix, "-round"), round || position === 'bottom'), (0, _define_property._)(_obj, "".concat(classPrefix, "-").concat(position), true), _obj), className);
     var open = function open() {
         if (!innerVisible) {
             setInnerVisible(true);
@@ -88,30 +82,20 @@ var Popup = function Popup(props) {
             onClose && onClose();
         }
     };
-    var onHandleClickOverlay = function onHandleClickOverlay(e) {
+    var handleOverlayClick = function handleOverlayClick(e) {
         e.stopPropagation();
-        if (closeOnOverlayClick) {
-            var closed = onOverlayClick && onOverlayClick(e);
-            closed && close();
+        if (closeOnOverlayClick && onOverlayClick(e)) {
+            close();
         }
     };
-    var onHandleClick = function onHandleClick(e) {
-        onClick && onClick(e);
-    };
-    var onHandleClickCloseIcon = function onHandleClickCloseIcon(e) {
-        var closed = onCloseIconClick && onCloseIconClick(e);
-        closed && close();
-    };
-    var onHandleOpened = function onHandleOpened(e) {
-        afterShow && afterShow();
-    };
-    var onHandleClosed = function onHandleClosed(e) {
-        afterClose && afterClose();
+    var handleCloseIconClick = function handleCloseIconClick(e) {
+        onCloseIconClick(e) && close();
     };
     var renderCloseIcon = function renderCloseIcon() {
+        var closeClasses = (0, _classnames.default)("".concat(classPrefix, "-title-right"), "".concat(classPrefix, "-title-right-").concat(closeIconPosition));
         return /*#__PURE__*/ _react.default.createElement(_react.default.Fragment, null, closeable && /*#__PURE__*/ _react.default.createElement(_components.View, {
             className: closeClasses,
-            onClick: onHandleClickCloseIcon
+            onClick: handleCloseIconClick
         }, /*#__PURE__*/ _react.default.isValidElement(closeIcon) ? closeIcon : /*#__PURE__*/ _react.default.createElement(_iconsreacttaro.Close, null)));
     };
     var renderTitle = function renderTitle() {
@@ -140,26 +124,27 @@ var Popup = function Popup(props) {
             unmountOnExit: destroyOnClose,
             timeout: duration,
             in: innerVisible,
-            onEntered: onHandleOpened,
-            onExited: onHandleClosed
+            onEntered: afterShow,
+            onExited: afterClose
         }, /*#__PURE__*/ _react.default.createElement(_components.View, {
             ref: refObject,
             style: popStyles,
             className: popClassName,
-            onClick: onHandleClick,
+            onClick: onClick,
             catchMove: lockScroll
-        }, renderTitle(), showChildren ? children : ''));
+        }, renderTitle(), showChildren ? children : null));
     };
     var renderNode = function renderNode() {
-        return /*#__PURE__*/ _react.default.createElement(_react.default.Fragment, null, overlay ? /*#__PURE__*/ _react.default.createElement(_index.default, {
+        return /*#__PURE__*/ _react.default.createElement(_react.default.Fragment, null, overlay && /*#__PURE__*/ _react.default.createElement(_index.default, {
+            zIndex: index,
             style: overlayStyles,
             className: overlayClassName,
             visible: innerVisible,
             closeOnOverlayClick: closeOnOverlayClick,
             lockScroll: lockScroll,
             duration: duration,
-            onClick: onHandleClickOverlay
-        }) : null, renderPop());
+            onClick: handleOverlayClick
+        }), renderPop());
     };
     (0, _react.useEffect)(function() {
         visible ? open() : close();
@@ -173,8 +158,7 @@ var Popup = function Popup(props) {
         transition
     ]);
     var resolveContainer = function resolveContainer(getContainer) {
-        var container = typeof getContainer === 'function' ? getContainer() : getContainer;
-        return container || document.body;
+        return (typeof getContainer === 'function' ? getContainer() : getContainer) || document.body;
     };
     var renderToContainer = function renderToContainer(getContainer, node) {
         if (getContainer) {

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

@@ -4,19 +4,14 @@
 /* #ifndef harmony */
 /* #endif */
 .nut-overlay {
-  /* #ifdef rn */
-  position: absolute;
-  /* #endif */
-  /* #ifndef rn */
   position: fixed;
-  /* #endif */
   top: 0;
   left: 0;
   bottom: 0;
   right: 0;
   width: 100%;
   height: 100%;
-  background-color: var(--nutui-overlay-bg-color, var(--nutui-black-10));
+  background-color: var(--nutui-overlay-bg-color, var(--nutui-color-mask, rgba(0, 0, 0, 0.7)));
   z-index: var(--nutui-overlay-zIndex, 1000);
 }
 
@@ -67,7 +62,7 @@
   position: fixed;
   min-height: 46%;
   max-height: 100%;
-  background-color: var(--nutui-overlay-content-bg-color, var(--nutui-gray-1));
+  background-color: var(--nutui-overlay-content-bg-color, var(--nutui-color-background-overlay, #ffffff));
   -webkit-overflow-scrolling: touch;
   font-size: var(--nutui-font-size-base, 14px);
 }
@@ -87,13 +82,13 @@
   align-items: center;
 }
 .nut-popup-title-title {
-  color: var(--nutui-gray-7);
+  color: var(--nutui-color-title, #1a1a1a);
   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-6);
+  color: var(--nutui-color-text, #505259);
   font-size: var(--nutui-popup-description-font-size, var(--nutui-font-size-base, 14px));
   font-weight: var(--nutui-font-weight, 400);
 }
@@ -112,7 +107,7 @@
   z-index: 1;
   width: var(--nutui-popup-icon-size, 20px);
   height: var(--nutui-popup-icon-size, 20px);
-  color: var(--nutui-gray-7);
+  color: var(--nutui-color-title, #1a1a1a);
   cursor: pointer;
 }
 .nut-popup-title-right:active {

package/dist/cjs/packages/popup/types.d.ts

@@ -0,0 +1,25 @@
+import React, { ReactNode } from 'react';
+import { OverlayProps } from "../overlay/types";
+export type Teleport = HTMLElement | (() => HTMLElement) | null;
+export type Position = 'top' | 'bottom' | 'left' | 'right' | 'center' | 'none';
+export type CloseIconPosition = 'top-left' | 'top-right' | 'bottom-left' | 'bottom-right';
+export interface PopupProps extends OverlayProps {
+    position: Position;
+    transition: string;
+    overlayStyle: React.CSSProperties;
+    overlayClassName: string;
+    closeable: boolean;
+    closeIconPosition: CloseIconPosition;
+    closeIcon: ReactNode;
+    left?: ReactNode;
+    title?: ReactNode;
+    description?: ReactNode;
+    destroyOnClose: boolean;
+    portal: Teleport;
+    overlay: boolean;
+    round: boolean;
+    onOpen: () => void;
+    onClose: () => void;
+    onOverlayClick: (e: React.MouseEvent) => boolean | void;
+    onCloseIconClick: (e: React.MouseEvent) => boolean | void;
+}

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

@@ -0,0 +1,4 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});