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

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

@@ -0,0 +1,79 @@
+.nut-pickerview {
+  --nutui-picker-item-height: 36px;
+  position: relative;
+  display: flex;
+  width: 100%;
+  height: $picker-list-height;
+  $pickerview-top: calc(($picker-list-height - $picker-item-height) / 2);
+  overflow: hidden;
+
+  &-mask,
+  &-indicator {
+    position: absolute;
+    left: 0;
+    right: 0;
+    z-index: 3;
+    pointer-events: none;
+  }
+
+  &-mask {
+    top: 0;
+    bottom: 0;
+    background-image: $picker-mask-background;
+    background-position: top, bottom;
+    background-size: 100% $pickerview-top;
+    background-repeat: no-repeat;
+    transform: translateZ(0);
+  }
+
+  &-indicator {
+    top: $pickerview-top;
+    height: $picker-item-height;
+    border: $picker-item-active-line-border;
+    border-left: 0;
+    border-right: 0;
+    box-sizing: border-box;
+  }
+
+  &-list {
+    position: relative;
+    flex: 1;
+    height: $picker-list-height;
+    overflow: hidden;
+    touch-action: none;
+  }
+
+  &-roller {
+    position: absolute;
+    top: $pickerview-top;
+    width: 100%;
+    height: $picker-item-height;
+    z-index: 1;
+    transform-style: preserve-3d;
+  }
+
+  &-roller-item {
+    position: absolute;
+    top: 0;
+    backface-visibility: hidden;
+    -moz-backface-visibility: hidden;
+    -webkit-backface-visibility: hidden;
+    &-hidden {
+      visibility: hidden;
+      opacity: 0;
+    }
+  }
+
+  &-roller-item,
+  &-roller-item-tiled {
+    width: 100%;
+    height: $picker-item-height;
+    line-height: $picker-item-height;
+    color: $picker-item-text-color;
+    font-size: $picker-item-text-font-size;
+    text-align: center;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+  }
+}

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

@@ -0,0 +1,73 @@
+/* #ifdef harmony */
+/* #endif */
+/* #ifndef harmony */
+/* #endif */
+.nut-pickerview {
+  --nutui-picker-item-height: 36px;
+  position: relative;
+  display: flex;
+  width: 100%;
+  height: calc(var(--nutui-picker-item-height, 36px) * 7);
+  overflow: hidden;
+}
+.nut-pickerview-mask, .nut-pickerview-indicator {
+  position: absolute;
+  left: 0;
+  right: 0;
+  z-index: 3;
+  pointer-events: none;
+}
+.nut-pickerview-mask {
+  top: 0;
+  bottom: 0;
+  background-image: var(--picker-mask-background, linear-gradient(180deg, var(--nutui-white-12), var(--nutui-white-7)), linear-gradient(0deg, var(--nutui-white-12), var(--nutui-white-7)));
+  background-position: top, bottom;
+  background-size: 100% calc((var(--nutui-picker-item-height, 36px) * 7 - var(--nutui-picker-item-height, 36px)) / 2);
+  background-repeat: no-repeat;
+  transform: translateZ(0);
+}
+.nut-pickerview-indicator {
+  top: calc((var(--nutui-picker-item-height, 36px) * 7 - var(--nutui-picker-item-height, 36px)) / 2);
+  height: var(--nutui-picker-item-height, 36px);
+  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;
+  box-sizing: border-box;
+}
+.nut-pickerview-list {
+  position: relative;
+  flex: 1;
+  height: calc(var(--nutui-picker-item-height, 36px) * 7);
+  overflow: hidden;
+  touch-action: none;
+}
+.nut-pickerview-roller {
+  position: absolute;
+  top: calc((var(--nutui-picker-item-height, 36px) * 7 - var(--nutui-picker-item-height, 36px)) / 2);
+  width: 100%;
+  height: var(--nutui-picker-item-height, 36px);
+  z-index: 1;
+  transform-style: preserve-3d;
+}
+.nut-pickerview-roller-item {
+  position: absolute;
+  top: 0;
+  backface-visibility: hidden;
+  -moz-backface-visibility: hidden;
+  -webkit-backface-visibility: hidden;
+}
+.nut-pickerview-roller-item-hidden {
+  visibility: hidden;
+  opacity: 0;
+}
+.nut-pickerview-roller-item, .nut-pickerview-roller-item-tiled {
+  width: 100%;
+  height: var(--nutui-picker-item-height, 36px);
+  line-height: var(--nutui-picker-item-height, 36px);
+  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;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}

package/dist/es/packages/pickerview/types.d.ts

@@ -0,0 +1,32 @@
+import { BasicComponent } from "../../utils/typings";
+export type PickerValue = string | number | null;
+export interface PickerOption {
+    label: string | number;
+    value: string | number;
+    children?: PickerOptions;
+}
+export type PickerOptions = PickerOption[];
+export interface PickerRollerProps {
+    options: PickerOptions;
+    keyIndex: number;
+    value: PickerValue;
+    threeDimensional?: boolean;
+    duration?: number | string;
+    onSelect: (option: PickerOption, index: number) => void;
+    renderLabel: (item: PickerOption) => React.ReactNode;
+}
+export interface PickerOnChangeCallbackParameter {
+    value: PickerValue[];
+    index: number;
+    selectedOptions: PickerOptions;
+}
+export interface PickerViewProps extends BasicComponent {
+    setRefs?: (ref: any) => any;
+    options: PickerOptions[];
+    value?: PickerValue[];
+    defaultValue?: PickerValue[];
+    threeDimensional?: boolean;
+    duration?: number | string;
+    renderLabel: (item: PickerOption) => React.ReactNode;
+    onChange?: (arg0: PickerOnChangeCallbackParameter) => void;
+}

package/dist/es/packages/pickerview/types.js

@@ -0,0 +1 @@
+export { };

package/dist/es/packages/pickerview/utils.d.ts

@@ -0,0 +1,14 @@
+export declare const momentum: (distance: number, duration: number) => number;
+export declare const useStyles: (touchTime: number, touchDeg: string, scrollDistance: number, lineSpacing: React.MutableRefObject<number>, rotation: number) => {
+    touchRollerStyle: () => {
+        transition: string;
+        transform: string;
+    };
+    touchTiledStyle: () => {
+        transition: string;
+        transform: string;
+    };
+    rollerStyle: (index: number) => {
+        transform: string;
+    };
+};

package/dist/es/packages/pickerview/utils.js

@@ -0,0 +1,28 @@
+export var momentum = function(distance, duration) {
+    var speed = Math.abs(distance / duration);
+    return speed / 0.003 * (distance < 0 ? -1 : 1);
+};
+export var useStyles = function(touchTime, touchDeg, scrollDistance, lineSpacing, rotation) {
+    var getTransitionStyle = function(transformValue) {
+        return {
+            transition: "transform ".concat(touchTime, "ms cubic-bezier(0.17, 0.89, 0.45, 1)"),
+            transform: transformValue
+        };
+    };
+    var touchRollerStyle = function() {
+        return getTransitionStyle("rotate3d(1, 0, 0, ".concat(touchDeg, ")"));
+    };
+    var touchTiledStyle = function() {
+        return getTransitionStyle("translate3d(0, ".concat(scrollDistance, "px, 0)"));
+    };
+    var rollerStyle = function(index) {
+        return {
+            transform: "rotate3d(1, 0, 0, ".concat(-rotation * (index + 1), "deg) translate3d(0px, 0px, ").concat(Math.round(lineSpacing.current * 3.2), "px)")
+        };
+    };
+    return {
+        touchRollerStyle: touchRollerStyle,
+        touchTiledStyle: touchTiledStyle,
+        rollerStyle: rollerStyle
+    };
+};

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

@@ -1,10 +1,10 @@
 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[];
-    theme: PopoverTheme | string;
-    location: PopoverLocation | string;
+    theme: PopoverTheme;
+    location: PopoverLocation;
     visible: boolean;
     offset: string[] | number[];
     arrowOffset: number;

package/dist/es/packages/popover/popover.js

@@ -7,10 +7,10 @@ import React, { useEffect, useMemo, useRef, useState } from "react";
 import classNames from "classnames";
 import { createPortal } from "react-dom";
 import { ArrowRadius } from "@nutui/icons-react";
-import Popup from "../popup";
-import { getRect } from "../../utils/use-client-rect";
+import Popup from "../popup/index";
+import { getRect } from "../../hooks/use-client-rect";
 import { ComponentDefaults } from "../../utils/typings";
-import useClickAway from "../../utils/use-click-away";
+import useClickAway from "../../hooks/use-click-away";
 import { canUseDom } from "../../utils/can-use-dom";
 import { getAllScrollableParents } from "../../utils/get-scroll-parent";
 import { useRtl } from "../configprovider";
@@ -249,7 +249,7 @@ export var Popover = function(props) {
         className: "nut-popover-content nut-popover-content-".concat(location),
         visible: showPopup,
         overlay: overlay,
-        position: "default",
+        position: "none",
         lockScroll: false
     }, rest), /*#__PURE__*/ React.createElement("div", {
         className: "nut-popover-content-group",

package/dist/es/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/es/packages/popover/types.d.ts

@@ -1,5 +1,6 @@
-export type PopoverTheme = 'light' | 'dark';
-export type PopoverLocation = 'bottom' | 'top' | 'left' | 'right' | 'top-start' | 'top-end' | 'bottom-start' | 'bottom-end' | 'left-start' | 'left-end' | 'right-start' | 'right-end';
+import { FixAutoComplete } from "../../types/fix-string-literal-union";
+export type PopoverTheme = FixAutoComplete<'light' | 'dark'>;
+export type PopoverLocation = FixAutoComplete<'bottom' | 'top' | 'left' | 'right' | 'top-start' | 'top-end' | 'bottom-start' | 'bottom-end' | 'left-start' | 'left-end' | 'right-start' | 'right-end'>;
 export interface PopoverList {
     key?: string;
     name: string;

package/dist/es/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';
 export default Popup;

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

@@ -1,25 +1,3 @@
-import React, { FunctionComponent, MouseEvent, ReactNode } from 'react';
-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: MouseEvent) => boolean | void;
-    onCloseIconClick: (e: MouseEvent) => boolean | void;
-}
+import React, { FunctionComponent } from 'react';
+import { PopupProps } from './types';
 export declare const Popup: FunctionComponent<Partial<PopupProps> & Omit<React.HTMLAttributes<HTMLDivElement>, 'title'>>;
-export {};

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

@@ -9,9 +9,8 @@ import classNames from "classnames";
 import { Close } from "@nutui/icons-react";
 import { defaultOverlayProps } from "../overlay/overlay";
 import Overlay from "../overlay";
-import { ComponentDefaults } from "../../utils/typings";
-import { useLockScroll } from "../../utils/use-lock-scroll";
-var defaultProps = _object_spread(_object_spread_props(_object_spread({}, ComponentDefaults), {
+import { useLockScroll } from "../../hooks/use-lock-scroll";
+var defaultProps = _object_spread_props(_object_spread({}, defaultOverlayProps), {
     position: 'center',
     transition: '',
     overlayStyle: {},
@@ -25,13 +24,13 @@ var defaultProps = _object_spread(_object_spread_props(_object_spread({}, Compon
     round: false,
     onOpen: function() {},
     onClose: function() {},
-    onOverlayClick: function(e) {
+    onOverlayClick: function() {
         return true;
     },
-    onCloseIconClick: function(e) {
+    onCloseIconClick: function() {
         return true;
     }
-}), defaultOverlayProps);
+});
 // 默认1000，参看variables
 var _zIndex = 1100;
 export var Popup = function(props) {
@@ -42,20 +41,14 @@ export var Popup = function(props) {
     var _useState1 = _sliced_to_array(useState(visible), 2), innerVisible = _useState1[0], setInnerVisible = _useState1[1];
     var _useState2 = _sliced_to_array(useState(true), 2), showChildren = _useState2[0], setShowChildren = _useState2[1];
     var _useState3 = _sliced_to_array(useState(''), 2), transitionName = _useState3[0], setTransitionName = _useState3[1];
-    var shouldLockScroll = !innerVisible ? false : lockScroll;
-    useLockScroll(nodeRef, shouldLockScroll);
+    useLockScroll(nodeRef, innerVisible && lockScroll);
     var classPrefix = 'nut-popup';
-    var baseStyle = {
+    var overlayStyles = _object_spread({}, overlayStyle);
+    var popStyles = _object_spread_props(_object_spread({}, style), {
         zIndex: index
-    };
-    var overlayStyles = _object_spread_props(_object_spread({}, overlayStyle), {
-        '--nutui-overlay-zIndex': index
     });
-    var popStyles = _object_spread({}, style, baseStyle);
     var _obj;
-    var popClassName = classNames((_obj = {}, _define_property(_obj, "".concat(classPrefix), true), _define_property(_obj, "".concat(classPrefix, "-round"), round || position === 'bottom'), _define_property(_obj, "".concat(classPrefix, "-").concat(position), true), _obj), className);
-    var _obj1;
-    var closeClasses = classNames((_obj1 = {}, _define_property(_obj1, "".concat(classPrefix, "-title-right"), true), _define_property(_obj1, "".concat(classPrefix, "-title-right-").concat(closeIconPosition), true), _obj1));
+    var popClassName = classNames(classPrefix, (_obj = {}, _define_property(_obj, "".concat(classPrefix, "-round"), round || position === 'bottom'), _define_property(_obj, "".concat(classPrefix, "-").concat(position), true), _obj), className);
     var open = function() {
         if (!innerVisible) {
             setInnerVisible(true);
@@ -77,30 +70,20 @@ export var Popup = function(props) {
             onClose && onClose();
         }
     };
-    var onHandleClickOverlay = function(e) {
+    var handleOverlayClick = function(e) {
         e.stopPropagation();
-        if (closeOnOverlayClick) {
-            var closed = onOverlayClick && onOverlayClick(e);
-            closed && close();
+        if (closeOnOverlayClick && onOverlayClick(e)) {
+            close();
         }
     };
-    var onHandleClick = function(e) {
-        onClick && onClick(e);
-    };
-    var onHandleClickCloseIcon = function(e) {
-        var closed = onCloseIconClick && onCloseIconClick(e);
-        closed && close();
-    };
-    var onHandleOpened = function(e) {
-        afterShow && afterShow();
-    };
-    var onHandleClosed = function(e) {
-        afterClose && afterClose();
+    var handleCloseIconClick = function(e) {
+        onCloseIconClick(e) && close();
     };
     var renderCloseIcon = function() {
+        var closeClasses = classNames("".concat(classPrefix, "-title-right"), "".concat(classPrefix, "-title-right-").concat(closeIconPosition));
         return /*#__PURE__*/ React.createElement(React.Fragment, null, closeable && /*#__PURE__*/ React.createElement("div", {
             className: closeClasses,
-            onClick: onHandleClickCloseIcon
+            onClick: handleCloseIconClick
         }, /*#__PURE__*/ React.isValidElement(closeIcon) ? closeIcon : /*#__PURE__*/ React.createElement(Close, null)));
     };
     var renderTitle = function() {
@@ -129,25 +112,26 @@ export var Popup = function(props) {
             unmountOnExit: destroyOnClose,
             timeout: duration,
             in: innerVisible,
-            onEntered: onHandleOpened,
-            onExited: onHandleClosed
+            onEntered: afterShow,
+            onExited: afterClose
         }, /*#__PURE__*/ React.createElement("div", {
             ref: nodeRef,
             style: popStyles,
             className: popClassName,
-            onClick: onHandleClick
-        }, renderTitle(), showChildren ? children : ''));
+            onClick: onClick
+        }, renderTitle(), showChildren && children));
     };
     var renderNode = function() {
-        return /*#__PURE__*/ React.createElement(React.Fragment, null, overlay ? /*#__PURE__*/ React.createElement(Overlay, {
+        return /*#__PURE__*/ React.createElement(React.Fragment, null, overlay && /*#__PURE__*/ React.createElement(Overlay, {
+            zIndex: index,
             style: overlayStyles,
             className: overlayClassName,
             visible: innerVisible,
             closeOnOverlayClick: closeOnOverlayClick,
             lockScroll: lockScroll,
             duration: duration,
-            onClick: onHandleClickOverlay
-        }) : null, renderPop());
+            onClick: handleOverlayClick
+        }), renderPop());
     };
     useEffect(function() {
         visible ? open() : close();
@@ -161,8 +145,7 @@ export var Popup = function(props) {
         transition
     ]);
     var resolveContainer = function(getContainer) {
-        var container = typeof getContainer === 'function' ? getContainer() : getContainer;
-        return container || document.body;
+        return (typeof getContainer === 'function' ? getContainer() : getContainer) || document.body;
     };
     var renderToContainer = function(getContainer, node) {
         if (getContainer) {

package/dist/es/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/es/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/es/packages/popup/types.js

@@ -0,0 +1 @@
+import React from "react";

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

@@ -20,7 +20,7 @@
 }
 .nut-price-primary .nut-price-symbol, .nut-price-primary .nut-price-integer, .nut-price-primary .nut-price-decimal {
   font-family: "JD-Bold";
-  color: var(--nutui-price-color, var(--nutui-brand-6));
+  color: var(--nutui-price-color, var(--nutui-color-primary, #ff0f23));
 }
 .nut-price-symbol {
   padding-right: var(--nutui-price-symbol-padding-right, 0px);

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

@@ -12,7 +12,7 @@
   flex: auto;
   border-radius: var(--nutui-progress-border-radius, 12px);
   height: var(--nutui-progress-height, 10px);
-  background: var(--nutui-progress-background, var(--nutui-gray-3));
+  background: var(--nutui-progress-background, var(--nutui-color-background, #f2f3f5));
 }
 .nut-progress-outer .nut-progress-active:before {
   content: "";