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

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

@@ -13,7 +13,7 @@ import { ArrowRadius } from "@nutui/icons-react-taro";
 import Popup from "../popup/index";
 import { getRectByTaro } from "../../utils/get-rect-by-taro";
 import { ComponentDefaults } from "../../utils/typings";
-import { getRect } from "../../utils/use-client-rect";
+import { getRect } from "../../hooks/use-client-rect";
 import { useRtl } from "../configprovider/index";
 var defaultProps = _object_spread_props(_object_spread({}, ComponentDefaults), {
     list: [],
@@ -322,7 +322,7 @@ export var Popover = function(props) {
         style: getRootPosition()
     }, /*#__PURE__*/ React.createElement(Popup, _object_spread({
         className: "nut-popover-content nut-popover-content-".concat(location),
-        position: "default",
+        position: "none",
         overlay: overlay,
         visible: showPopup
     }, rest), /*#__PURE__*/ React.createElement(View, {

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.taro';
 export default Popup;

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

@@ -10,9 +10,8 @@ import { Close } from "@nutui/icons-react-taro";
 import { View } from "@tarojs/components";
 import { defaultOverlayProps } from "../overlay/overlay";
 import Overlay from "../overlay/index";
-import { ComponentDefaults } from "../../utils/typings";
-import { useLockScrollTaro } from "../../utils/use-lock-scoll-taro";
-var defaultProps = _object_spread(_object_spread_props(_object_spread({}, ComponentDefaults), {
+import { useLockScrollTaro } from "../../hooks/use-lock-scoll-taro";
+var defaultProps = _object_spread_props(_object_spread({}, defaultOverlayProps), {
     position: 'center',
     transition: '',
     overlayStyle: {},
@@ -26,13 +25,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) {
@@ -44,17 +43,12 @@ export var Popup = function(props) {
     var _useState3 = _sliced_to_array(useState(''), 2), transitionName = _useState3[0], setTransitionName = _useState3[1];
     var refObject = useLockScrollTaro(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);
@@ -76,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(View, {
             className: closeClasses,
-            onClick: onHandleClickCloseIcon
+            onClick: handleCloseIconClick
         }, /*#__PURE__*/ React.isValidElement(closeIcon) ? closeIcon : /*#__PURE__*/ React.createElement(Close, null)));
     };
     var renderTitle = function() {
@@ -128,26 +112,27 @@ export var Popup = function(props) {
             unmountOnExit: destroyOnClose,
             timeout: duration,
             in: innerVisible,
-            onEntered: onHandleOpened,
-            onExited: onHandleClosed
+            onEntered: afterShow,
+            onExited: afterClose
         }, /*#__PURE__*/ React.createElement(View, {
             ref: refObject,
             style: popStyles,
             className: popClassName,
-            onClick: onHandleClick,
+            onClick: onClick,
             catchMove: lockScroll
-        }, renderTitle(), showChildren ? children : ''));
+        }, renderTitle(), showChildren ? children : null));
     };
     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 +146,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 @@
+export { };

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

@@ -0,0 +1,8 @@
+import { ITouchEvent } from '@tarojs/components';
+import { PopupProps as PopupWebProps } from './types';
+export type { CloseIconPosition, Teleport } from './types';
+export type PopupProps = Omit<PopupWebProps, 'onOverlayClick' | 'onCloseIconClick' | 'onClick'> & {
+    onClick: (event: ITouchEvent) => void;
+    onOverlayClick: (e: ITouchEvent) => boolean | void;
+    onCloseIconClick: (e: ITouchEvent) => boolean | void;
+};

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/progress.js

@@ -10,8 +10,8 @@ import { View } from "@tarojs/components";
 import pxTransform from "../../utils/px-transform";
 import { ComponentDefaults } from "../../utils/typings";
 import { useRtl } from "../configprovider/index";
-import useUuid from "../../utils/use-uuid";
-import { harmony, harmonyAndRn, rn, web } from "../../utils/platform-taro";
+import useUuid from "../../hooks/use-uuid";
+import { harmony, web } from "../../utils/platform-taro";
 var defaultProps = _object_spread_props(_object_spread({}, ComponentDefaults), {
     percent: 0,
     showText: false,
@@ -132,7 +132,7 @@ export var Progress = function(props) {
     useEffect(function() {
         if (web()) {
             handleWebObserver();
-        } else if (!harmonyAndRn()) {
+        } else if (!harmony()) {
             handleOtherObserver();
         }
     }, []);
@@ -147,19 +147,16 @@ export var Progress = function(props) {
         if (children) {
             return 0;
         }
-        if (!harmonyAndRn()) {
+        if (!harmony()) {
             return Math.floor("".concat(percent, "%").length * 9 / 2);
         }
-        if (rn()) {
-            return "".concat(percent, "%").length * 9 + 4;
-        }
         return Math.floor(("".concat(percent, "%").length * 9 + 4) / 2);
     };
     var computeInnerStyle = function() {
         var style = {
             backgroundColor: color || '#ff0f23'
         };
-        if (harmonyAndRn()) {
+        if (harmony()) {
             style.width = harmony() ? pxTransform("".concat(percent, "%").length * 9 + 4) : "".concat(percent, "%").length * 9 + 4;
         }
         return style;

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: "";

package/dist/es/packages/pulltorefresh/pulltorefresh.js

@@ -10,12 +10,12 @@ import { View } from "@tarojs/components";
 import { Loading, More } from "@nutui/icons-react-taro";
 import Taro from "@tarojs/taro";
 import { useConfig } from "../configprovider/index";
-import { useTouch } from "../../utils/use-touch";
+import { useTouch } from "../../hooks/use-touch";
 import { rubberbandIfOutOfBounds } from "../../utils/rubberband";
 import { sleep } from "../../utils/sleep";
 import { ComponentDefaults } from "../../utils/typings";
 import pxTransform from "../../utils/px-transform";
-import { rn } from "../../utils/platform-taro";
+import { getDeviceInfo } from "../../utils/get-system-info";
 var defaultProps = _object_spread_props(_object_spread({}, ComponentDefaults), {
     type: 'default',
     pullingText: '',
@@ -87,11 +87,6 @@ export var PullToRefresh = function(p) {
             setStatus(height > threshold ? 'canRelease' : 'pulling');
         }
         clearTimeout(timer.current);
-        if (rn()) {
-            timer.current = setTimeout(function() {
-                handleTouchEnd();
-            }, 300);
-        }
     };
     function _doRefresh() {
         _doRefresh = _async_to_generator(function() {
@@ -161,7 +156,7 @@ export var PullToRefresh = function(p) {
         }
     };
     // 安卓微信小程序onTouchMove回调次数少导致下拉卡顿，增加动效会更顺畅
-    var isAndroidWeApp = Taro.getSystemInfoSync().platform === 'android' && Taro.getEnv() === 'WEAPP';
+    var isAndroidWeApp = getDeviceInfo().platform === 'android' && Taro.getEnv() === 'WEAPP';
     var springStyles = _object_spread({
         height: pxTransform(height)
     }, !pullingRef.current || isAndroidWeApp ? {

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

@@ -12,7 +12,7 @@
   bottom: 0;
   left: 0;
   width: 100%;
-  color: var(--nutui-gray-5);
+  color: var(--nutui-color-text-help, #888b94);
   display: flex;
   flex-direction: column;
   justify-content: center;
@@ -24,13 +24,13 @@
   margin-bottom: 4px;
 }
 .nut-pulltorefresh-primary {
-  background: var(--nutui-pulltorefresh-color-primary, var(--nutui-brand-6));
+  background: var(--nutui-pulltorefresh-color-primary, var(--nutui-color-primary, #ff0f23));
 }
 .nut-pulltorefresh-primary-content {
-  color: var(--nutui-white-12);
+  color: var(--nutui-color-text-dark, rgba(255, 255, 255, 0.9));
 }
 .nut-pulltorefresh-primary-head-content {
-  color: var(--nutui-white-12);
+  color: var(--nutui-color-text-dark, rgba(255, 255, 255, 0.9));
 }
 .nut-pulltorefresh-primary-status-text {
   color: #ffffff;

package/dist/es/packages/radio/radio.js

@@ -9,7 +9,7 @@ import classNames from "classnames";
 import { View } from "@tarojs/components";
 import RadioContext from "../radiogroup/context";
 import { ComponentDefaults } from "../../utils/typings";
-import { usePropsValue } from "../../utils/use-props-value";
+import { usePropsValue } from "../../hooks/use-props-value";
 var defaultProps = _object_spread_props(_object_spread({}, ComponentDefaults), {
     disabled: false,
     shape: 'round',