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

package/dist/es/packages/notify/notify.js

@@ -6,9 +6,8 @@ import React, { useState, useEffect, useRef } from "react";
 import classNames from "classnames";
 import { CSSTransition } from "react-transition-group";
 import { View } from "@tarojs/components";
-import Taro from "@tarojs/taro";
 import { ComponentDefaults } from "../../utils/typings";
-import { customEvents, useCustomEvent, useCustomEventsPath } from "../../utils/use-custom-event";
+import { customEvents, useCustomEvent, useCustomEventsPath } from "../../hooks/use-custom-event";
 import { mergeProps } from "../../utils/merge-props";
 var defaultProps = _object_spread_props(_object_spread({}, ComponentDefaults), {
     id: '',
@@ -61,7 +60,7 @@ export var Notify = function(props) {
     };
     var _obj;
     var classes = classNames((_obj = {}, _define_property(_obj, "".concat(classPrefix, "-popup-top"), position === 'top'), _define_property(_obj, "".concat(classPrefix, "-popup-bottom"), position === 'bottom'), _define_property(_obj, "".concat(classPrefix), true), _define_property(_obj, "".concat(classPrefix, "-").concat(type), true), _obj));
-    return /*#__PURE__*/ React.createElement(React.Fragment, null, Taro.getEnv() !== Taro.ENV_TYPE.RN ? /*#__PURE__*/ React.createElement(CSSTransition, {
+    return /*#__PURE__*/ React.createElement(CSSTransition, {
         nodeRef: cssRef,
         in: showNotify,
         timeout: 300,
@@ -74,13 +73,7 @@ export var Notify = function(props) {
         className: "".concat(classes, " ").concat(className),
         style: style,
         onClick: clickHandle
-    }, children)) : /*#__PURE__*/ React.createElement(React.Fragment, null, showNotify ? /*#__PURE__*/ React.createElement(View, {
-        className: "".concat(classes, " ").concat(className),
-        style: _object_spread_props(_object_spread({}, style), {
-            position: 'absolute'
-        }),
-        onClick: clickHandle
-    }, children) : null));
+    }, children));
 };
 export function open(selector) {
     // eslint-disable-next-line react-hooks/rules-of-hooks

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

@@ -73,17 +73,17 @@
   bottom: 0;
 }
 .nut-notify-base {
-  background: var(--nutui-notify-base-background-color, var(--nutui-brand-6));
+  background: var(--nutui-notify-base-background-color, var(--nutui-color-primary, #ff0f23));
 }
 .nut-notify-primary {
   background: var(--nutui-notify-primary-background-color, var(--nutui-color-info, #0073ff));
 }
 .nut-notify-success {
-  background: var(--nutui-notify-success-background-color, var(--nutui-green-2));
+  background: var(--nutui-notify-success-background-color, var(--nutui-color-success, #00d900));
 }
 .nut-notify-danger {
-  background: var(--nutui-notify-danger-background-color, var(--nutui-brand-6));
+  background: var(--nutui-notify-danger-background-color, var(--nutui-color-primary, #ff0f23));
 }
 .nut-notify-warning {
-  background: var(--nutui-notify-warning-background-color, var(--nutui-yellow-2));
+  background: var(--nutui-notify-warning-background-color, var(--nutui-color-warning, #ffbf00));
 }

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

@@ -1,5 +1,5 @@
 import React, { FunctionComponent, ReactNode } from 'react';
-import { PopupProps } from "../popup/popup";
+import { PopupProps } from "../popup/index";
 export interface NumberKeyboardProps extends PopupProps {
     visible: boolean;
     rightActions: ReactNode;

package/dist/es/packages/numberkeyboard/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 {
@@ -380,7 +375,7 @@
   width: 100%;
   padding: var(--nutui-numberkeyboard-padding, 0 0 22px 0);
   user-select: none;
-  background-color: var(--nutui-numberkeyboard-background-color, var(--nutui-gray-3));
+  background-color: var(--nutui-numberkeyboard-background-color, var(--nutui-color-background, #f2f3f5));
 }
 .nut-numberkeyboard-header {
   position: relative;
@@ -389,11 +384,11 @@
   justify-content: center;
   box-sizing: content-box;
   padding: var(--nutui-popup-title-padding, 16px);
-  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));
 }
 .nut-numberkeyboard-header-title {
-  color: var(--nutui-gray-7);
+  color: var(--nutui-color-title, #1a1a1a);
   display: inline-block;
   font-size: var(--nutui-popup-title-font-size, var(--nutui-font-size-l, 16px));
 }
@@ -404,7 +399,7 @@
   top: 50%;
   transform: translateY(-50%);
   padding: var(--nutui-numberkeyboard-header-close-padding, 0 16px);
-  color: var(--nutui-numberkeyboard-header-close-color, var(--nutui-gray-6));
+  color: var(--nutui-numberkeyboard-header-close-color, var(--nutui-color-text, #505259));
   font-size: var(--nutui-numberkeyboard-header-close-font-size, 14px);
   background-color: var(--nutui-numberkeyboard-header-close-background-color, transparent);
   border: none;
@@ -430,7 +425,7 @@
   /* #endif */
   box-sizing: border-box;
   padding: 0 6px 6px 0;
-  background-color: var(--nutui-numberkeyboard-wrapper-background-color, var(--nutui-color-background-sunken, var(--nutui-gray-2)));
+  background-color: var(--nutui-numberkeyboard-wrapper-background-color, var(--nutui-color-background-sunken, #f7f8fc));
 }
 .nut-numberkeyboard-body-wrapper .key {
   display: flex;
@@ -439,8 +434,8 @@
   height: var(--nutui-numberkeyboard-key-height, 48px);
   font-size: var(--nutui-numberkeyboard-key-font-size, var(--nutui-font-size-xl, 18px));
   line-height: var(--nutui-numberkeyboard-key-line-height, 1.5);
-  background-color: var(--nutui-numberkeyboard-key-background-color, var(--nutui-gray-1));
-  color: var(--nutui-numberkeyboard-key-color, var(--nutui-gray-6));
+  background-color: var(--nutui-numberkeyboard-key-background-color, var(--nutui-color-background-overlay, #ffffff));
+  color: var(--nutui-numberkeyboard-key-color, var(--nutui-color-text, #505259));
   border-radius: var(--nutui-numberkeyboard-key-border-radius, 8px);
   border: var(--nutui-numberkeyboard-key-border, none);
   font-weight: var(--nutui-font-weight-bold, 600);
@@ -469,7 +464,7 @@
 .nut-numberkeyboard-sidebar .nut-numberkeyboard-body-wrapper .confirm {
   font-size: var(--nutui-numberkeyboard-key-confirm-font-size, var(--nutui-font-size-l, 16px));
   color: var(--nutui-numberkeyboard-key-confirm-color, #fff);
-  background-color: var(--nutui-numberkeyboard-key-confirm-background-color, var(--nutui-brand-6));
+  background-color: var(--nutui-numberkeyboard-key-confirm-background-color, var(--nutui-color-primary, #ff0f23));
 }
 .nut-numberkeyboard-sidebar .nut-numberkeyboard-body-wrapper .confirm.active {
   background-color: rgba(255, 0, 0, 0.7);

package/dist/es/packages/nutui.react.build.d.ts

@@ -90,6 +90,8 @@ import NumberKeyboard from "./numberkeyboard/index";
 export * from "./numberkeyboard/index";
 import Picker from "./picker/index";
 export * from "./picker/index";
+import PickerView from "./pickerview/index";
+export * from "./pickerview/index";
 import Radio from "./radio/index";
 export * from "./radio/index";
 import RadioGroup from "./radiogroup/index";
@@ -208,4 +210,4 @@ import WaterMark from "./watermark/index";
 export * from "./watermark/index";
 import AvatarCropper from "./avatarcropper/index";
 export * from "./avatarcropper/index";
-export { Button, Cell, CellGroup, ConfigProvider, Image, Overlay, Col, Divider, Grid, GridItem, Layout, Row, Space, Sticky, SafeArea, BackTop, Elevator, FixedNav, HoverButton, HoverButtonItem, NavBar, SideNavBar, SideBar, SideBarItem, SideNavBarItem, SubSideNavBar, Tabbar, TabbarItem, TabPane, Tabs, Address, Calendar, CalendarItem, CalendarCard, Cascader, Checkbox, CheckboxGroup, DatePicker, Form, FormItem, Input, InputNumber, Menu, MenuItem, NumberKeyboard, Picker, Radio, RadioGroup, Range, Rate, SearchBar, ShortPassword, Signature, Switch, TextArea, Uploader, ActionSheet, Badge, Dialog, Drag, Empty, ResultPage, InfiniteLoading, Loading, NoticeBar, Notify, Popover, Popup, PullToRefresh, Skeleton, Swipe, Toast, Animate, AnimatingNumbers, Audio, Avatar, AvatarGroup, CircleProgress, Collapse, CollapseItem, CountDown, Ellipsis, ImagePreview, Indicator, Lottie, Pagination, Segmented, Price, Progress, Step, Steps, Swiper, SwiperItem, Table, Tag, Tour, Video, VirtualList, Barrage, Card, TimeDetail, TimeSelect, TrendArrow, WaterMark, AvatarCropper };
+export { Button, Cell, CellGroup, ConfigProvider, Image, Overlay, Col, Divider, Grid, GridItem, Layout, Row, Space, Sticky, SafeArea, BackTop, Elevator, FixedNav, HoverButton, HoverButtonItem, NavBar, SideNavBar, SideBar, SideBarItem, SideNavBarItem, SubSideNavBar, Tabbar, TabbarItem, TabPane, Tabs, Address, Calendar, CalendarItem, CalendarCard, Cascader, Checkbox, CheckboxGroup, DatePicker, Form, FormItem, Input, InputNumber, Menu, MenuItem, NumberKeyboard, Picker, PickerView, Radio, RadioGroup, Range, Rate, SearchBar, ShortPassword, Signature, Switch, TextArea, Uploader, ActionSheet, Badge, Dialog, Drag, Empty, ResultPage, InfiniteLoading, Loading, NoticeBar, Notify, Popover, Popup, PullToRefresh, Skeleton, Swipe, Toast, Animate, AnimatingNumbers, Audio, Avatar, AvatarGroup, CircleProgress, Collapse, CollapseItem, CountDown, Ellipsis, ImagePreview, Indicator, Lottie, Pagination, Segmented, Price, Progress, Step, Steps, Swiper, SwiperItem, Table, Tag, Tour, Video, VirtualList, Barrage, Card, TimeDetail, TimeSelect, TrendArrow, WaterMark, AvatarCropper };

package/dist/es/packages/nutui.react.build.js

@@ -90,6 +90,8 @@ import NumberKeyboard from "./numberkeyboard/index";
 export * from "./numberkeyboard/index";
 import Picker from "./picker/index";
 export * from "./picker/index";
+import PickerView from "./pickerview/index";
+export * from "./pickerview/index";
 import Radio from "./radio/index";
 export * from "./radio/index";
 import RadioGroup from "./radiogroup/index";
@@ -208,4 +210,4 @@ import WaterMark from "./watermark/index";
 export * from "./watermark/index";
 import AvatarCropper from "./avatarcropper/index";
 export * from "./avatarcropper/index";
-export { Button, Cell, CellGroup, ConfigProvider, Image, Overlay, Col, Divider, Grid, GridItem, Layout, Row, Space, Sticky, SafeArea, BackTop, Elevator, FixedNav, HoverButton, HoverButtonItem, NavBar, SideNavBar, SideBar, SideBarItem, SideNavBarItem, SubSideNavBar, Tabbar, TabbarItem, TabPane, Tabs, Address, Calendar, CalendarItem, CalendarCard, Cascader, Checkbox, CheckboxGroup, DatePicker, Form, FormItem, Input, InputNumber, Menu, MenuItem, NumberKeyboard, Picker, Radio, RadioGroup, Range, Rate, SearchBar, ShortPassword, Signature, Switch, TextArea, Uploader, ActionSheet, Badge, Dialog, Drag, Empty, ResultPage, InfiniteLoading, Loading, NoticeBar, Notify, Popover, Popup, PullToRefresh, Skeleton, Swipe, Toast, Animate, AnimatingNumbers, Audio, Avatar, AvatarGroup, CircleProgress, Collapse, CollapseItem, CountDown, Ellipsis, ImagePreview, Indicator, Lottie, Pagination, Segmented, Price, Progress, Step, Steps, Swiper, SwiperItem, Table, Tag, Tour, Video, VirtualList, Barrage, Card, TimeDetail, TimeSelect, TrendArrow, WaterMark, AvatarCropper };
+export { Button, Cell, CellGroup, ConfigProvider, Image, Overlay, Col, Divider, Grid, GridItem, Layout, Row, Space, Sticky, SafeArea, BackTop, Elevator, FixedNav, HoverButton, HoverButtonItem, NavBar, SideNavBar, SideBar, SideBarItem, SideNavBarItem, SubSideNavBar, Tabbar, TabbarItem, TabPane, Tabs, Address, Calendar, CalendarItem, CalendarCard, Cascader, Checkbox, CheckboxGroup, DatePicker, Form, FormItem, Input, InputNumber, Menu, MenuItem, NumberKeyboard, Picker, PickerView, Radio, RadioGroup, Range, Rate, SearchBar, ShortPassword, Signature, Switch, TextArea, Uploader, ActionSheet, Badge, Dialog, Drag, Empty, ResultPage, InfiniteLoading, Loading, NoticeBar, Notify, Popover, Popup, PullToRefresh, Skeleton, Swipe, Toast, Animate, AnimatingNumbers, Audio, Avatar, AvatarGroup, CircleProgress, Collapse, CollapseItem, CountDown, Ellipsis, ImagePreview, Indicator, Lottie, Pagination, Segmented, Price, Progress, Step, Steps, Swiper, SwiperItem, Table, Tag, Tour, Video, VirtualList, Barrage, Card, TimeDetail, TimeSelect, TrendArrow, WaterMark, AvatarCropper };

package/dist/es/packages/overlay/index.d.ts

@@ -1,3 +1,3 @@
 import { Overlay } from "./overlay";
-export type { OverlayProps } from "./overlay";
+export type { OverlayProps } from './types.taro';
 export default Overlay;

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

@@ -1,15 +1,4 @@
 import React, { FunctionComponent } from 'react';
-import { ITouchEvent } from '@tarojs/components';
-import { BasicComponent } from "../../utils/typings";
-export interface OverlayProps extends BasicComponent {
-    zIndex: number;
-    duration: number;
-    closeOnOverlayClick: boolean;
-    visible: boolean;
-    lockScroll: boolean;
-    onClick: (event: ITouchEvent) => void;
-    afterShow: () => void;
-    afterClose: () => void;
-}
+import { OverlayProps } from './types.taro';
 export declare const defaultOverlayProps: OverlayProps;
 export declare const Overlay: FunctionComponent<Partial<OverlayProps> & Omit<React.HTMLAttributes<HTMLDivElement>, 'onClick'>>;

package/dist/es/packages/overlay/overlay.js

@@ -7,27 +7,19 @@ import { CSSTransition } from "react-transition-group";
 import classNames from "classnames";
 import { View } from "@tarojs/components";
 import { ComponentDefaults } from "../../utils/typings";
-import { useLockScrollTaro } from "../../utils/use-lock-scoll-taro";
-import { harmonyAndRn } from "../../utils/platform-taro";
+import { useLockScrollTaro } from "../../hooks/use-lock-scoll-taro";
+import { harmony } from "../../utils/platform-taro";
 export var defaultOverlayProps = _object_spread_props(_object_spread({}, ComponentDefaults), {
     zIndex: 1000,
     duration: 300,
     closeOnOverlayClick: true,
     visible: false,
     lockScroll: true,
-    onClick: function(event) {}
+    onClick: function() {},
+    afterShow: function() {},
+    afterClose: function() {}
 });
 export var Overlay = function(props) {
-    var renderHarmony = function renderHarmony() {
-        return innerVisible ? /*#__PURE__*/ React.createElement(View, _object_spread_props(_object_spread({
-            ref: nodeRef,
-            className: classes,
-            style: styles
-        }, rest), {
-            catchMove: lockScroll,
-            onClick: handleClick
-        }), children) : null;
-    };
     var _ref = _object_spread({}, defaultOverlayProps, props), children = _ref.children, zIndex = _ref.zIndex, duration = _ref.duration, className = _ref.className, closeOnOverlayClick = _ref.closeOnOverlayClick, visible = _ref.visible, lockScroll = _ref.lockScroll, style = _ref.style, afterShow = _ref.afterShow, afterClose = _ref.afterClose, onClick = _ref.onClick, rest = _object_without_properties(_ref, [
         "children",
         "zIndex",
@@ -41,46 +33,41 @@ export var Overlay = function(props) {
         "afterClose",
         "onClick"
     ]);
-    var classPrefix = "nut-overlay";
+    var classPrefix = 'nut-overlay';
     var _useState = _sliced_to_array(useState(visible), 2), innerVisible = _useState[0], setInnerVisible = _useState[1];
     var nodeRef = useLockScrollTaro(!!lockScroll && innerVisible);
     useEffect(function() {
-        if (visible) {
-            setInnerVisible(true);
-        } else {
-            setInnerVisible(false);
-        }
+        setInnerVisible(visible);
     }, [
         visible
     ]);
     var classes = classNames(classPrefix, className);
-    var styles = _object_spread({}, style);
+    var styles = _object_spread_props(_object_spread({}, style), {
+        zIndex: zIndex
+    });
     var handleClick = function(e) {
         if (closeOnOverlayClick) {
             onClick && onClick(e);
         }
     };
-    var onHandleOpened = function(e) {
-        afterShow && afterShow();
-    };
-    var onHandleClosed = function(e) {
-        afterClose && afterClose();
+    var renderOverlay = function() {
+        return /*#__PURE__*/ React.createElement(View, _object_spread_props(_object_spread({
+            ref: nodeRef,
+            className: classes,
+            style: styles
+        }, rest), {
+            catchMove: lockScroll,
+            onClick: handleClick
+        }), children);
     };
-    return /*#__PURE__*/ React.createElement(React.Fragment, null, !harmonyAndRn() ? /*#__PURE__*/ React.createElement(CSSTransition, {
+    return /*#__PURE__*/ React.createElement(React.Fragment, null, !harmony() ? /*#__PURE__*/ React.createElement(CSSTransition, {
         nodeRef: nodeRef,
         classNames: "".concat(classPrefix, "-slide"),
         unmountOnExit: true,
         timeout: duration,
         in: innerVisible,
-        onEntered: onHandleOpened,
-        onExited: onHandleClosed
-    }, /*#__PURE__*/ React.createElement(View, _object_spread_props(_object_spread({
-        ref: nodeRef,
-        className: classes,
-        style: styles
-    }, rest), {
-        catchMove: lockScroll,
-        onClick: handleClick
-    }), children)) : renderHarmony());
+        onEntered: afterShow,
+        onExited: afterClose
+    }, renderOverlay()) : innerVisible && renderOverlay());
 };
 Overlay.displayName = 'NutOverlay';

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

@@ -1,10 +1,5 @@
 .nut-overlay {
-  /* #ifdef rn */
-  position: absolute;
-  /* #endif */
-  /* #ifndef rn */
   position: fixed;
-  /* #endif */
   top: 0;
   left: 0;
   bottom: 0;

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

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

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

@@ -7,7 +7,7 @@ import React, { useMemo } from "react";
 import classNames from "classnames";
 import { View } from "@tarojs/components";
 import { useConfig } from "../configprovider/index";
-import { usePropsValue } from "../../utils/use-props-value";
+import { usePropsValue } from "../../hooks/use-props-value";
 import { ComponentDefaults } from "../../utils/typings";
 import addColorForHarmony from "../../utils/add-color-for-harmony";
 var defaultProps = _object_spread_props(_object_spread({}, ComponentDefaults), {

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

@@ -7,11 +7,11 @@ import React, { useState, useEffect, useRef, useImperativeHandle } from "react";
 import classNames from "classnames";
 import Taro from "@tarojs/taro";
 import { View, PickerView, PickerViewColumn } from "@tarojs/components";
-import { Popup } from "../popup/popup";
+import Popup from "../popup/index";
 import PickerPanel from "./pickerpanel";
-import useRefs from "../../utils/use-refs";
+import useRefs from "../../hooks/use-refs";
 import { useConfig } from "../configprovider/index";
-import { usePropsValue } from "../../utils/use-props-value";
+import { usePropsValue } from "../../hooks/use-props-value";
 import { ComponentDefaults } from "../../utils/typings";
 var defaultProps = _object_spread_props(_object_spread({}, ComponentDefaults), {
     visible: false,

package/dist/es/packages/picker/pickerpanel.js

@@ -3,7 +3,7 @@ import { _ as _sliced_to_array } from "@swc/helpers/_/_sliced_to_array";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import React, { useState, useEffect, useRef, useImperativeHandle } from "react";
 import { View } from "@tarojs/components";
-import { useTouch } from "../../utils/use-touch";
+import { useTouch } from "../../hooks/use-touch";
 import { getRectByTaro } from "../../utils/get-rect-by-taro";
 import { passiveSupported } from "../../utils/supports-passive";
 var InternalPickerPanel = function(props, ref) {

package/dist/es/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,14 +422,14 @@
   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;
 }
 .nut-picker-list {
   flex: 1;
   position: relative;
-  height: var(--nutui-picker-list-height, 252px);
+  height: calc(var(--nutui-picker-item-height, 36px) * 7);
   overflow: hidden;
   text-align: center;
 }
@@ -455,7 +450,7 @@
   z-index: 3;
 }
 .nut-picker-view-panel {
-  height: var(--nutui-picker-list-height, 252px);
+  height: calc(var(--nutui-picker-item-height, 36px) * 7);
   flex-grow: 1;
 }
 .nut-picker-content, .nut-picker-roller {
@@ -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 {