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

package/dist/cjs/packages/toast/style/toast.scss

@@ -9,12 +9,7 @@
 }
 
 .nut-toast {
-  /* #ifdef rn */
-  position: absolute;
-  /* #endif */
-  /* #ifndef rn */
   position: fixed;
-  /* #endif */
   left: 0;
   top: 0;
   display: flex;
@@ -28,17 +23,14 @@
 
   &-overlay-default {
     --nutui-overlay-bg-color: rgba(0, 0, 0, 0);
-    --nutui-overlay-zIndex: 1300;
   }
 
   &-overlay-default-taro {
     /* #ifdef harmony */
     background-color: rgba(0, 0, 0, 0);
-    z-index: 1300;
     /* #endif */
     /* #ifndef harmony */
     --nutui-overlay-bg-color: rgba(0, 0, 0, 0);
-    --nutui-overlay-zIndex: 1300;
     /* #endif */
   }
 
@@ -87,12 +79,7 @@
   }
 
   &-center {
-    /* #ifdef rn */
-    top: var(--nutui-toast-inner-top, 38%);
-    /* #endif */
-    /* #ifndef rn */
     top: var(--nutui-toast-inner-top, 48%);
-    /* #endif */
   }
 
   &-bottom {

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

@@ -1,26 +1,5 @@
 import React, { FunctionComponent } from 'react';
-import { BasicComponent } from "../../utils/typings";
-export type ToastPosition = 'top' | 'bottom' | 'center';
-export type ToastSize = 'small' | 'base' | 'large';
-export type ToastWordBreak = 'normal' | 'break-all' | 'break-word';
-export interface ToastProps extends BasicComponent {
-    id?: string;
-    duration: number;
-    position?: ToastPosition;
-    title: string;
-    closeOnOverlayClick: boolean;
-    lockScroll: boolean;
-    size: ToastSize;
-    icon: React.ReactNode;
-    maskClassName?: string;
-    content: React.ReactNode;
-    contentClassName?: string;
-    contentStyle?: React.CSSProperties;
-    type: string;
-    visible: boolean;
-    wordBreak?: ToastWordBreak;
-    onClose: () => void;
-}
+import { ToastProps } from "./index";
 export declare const Toast: FunctionComponent<Partial<ToastProps> & Omit<React.HTMLAttributes<HTMLDivElement>, 'content'>> & {
     show: typeof show;
     hide: typeof hide;

package/dist/cjs/packages/toast/toast.js

@@ -30,13 +30,13 @@ var _classnames = /*#__PURE__*/ _interop_require_default._(require("classnames")
 var _components = require("@tarojs/components");
 var _iconsreacttaro = require("@nutui/icons-react-taro");
 var _index = /*#__PURE__*/ _interop_require_default._(require("../overlay/index"));
-var _typings = require("../../utils/typings");
-var _usecustomevent = require("../../utils/use-custom-event");
-var _usepropsvalue = require("../../utils/use-props-value");
+var _overlay = require("../overlay/overlay");
+var _usecustomevent = require("../../hooks/use-custom-event");
+var _usepropsvalue = require("../../hooks/use-props-value");
 var _index1 = require("../configprovider/index");
 var _platformtaro = require("../../utils/platform-taro");
 var _mergeprops = require("../../utils/merge-props");
-var defaultProps = (0, _object_spread_props._)((0, _object_spread._)({}, _typings.ComponentDefaults), {
+var defaultProps = (0, _object_spread_props._)((0, _object_spread._)({}, _overlay.defaultOverlayProps), {
     id: '',
     duration: 2,
     position: 'center',
@@ -44,17 +44,18 @@ var defaultProps = (0, _object_spread_props._)((0, _object_spread._)({}, _typing
     size: 'base',
     icon: null,
     content: '',
-    type: 'text',
+    contentClassName: '',
+    contentStyle: {},
     closeOnOverlayClick: false,
     lockScroll: false,
-    contentClassName: '',
     visible: false,
     wordBreak: 'break-all',
+    zIndex: 1300,
     onClose: function onClose() {}
 });
-var classPrefix = 'nut-toast';
 var Toast = function Toast(props) {
-    var _useParams = (0, _usecustomevent.useParams)((0, _mergeprops.mergeProps)(defaultProps, props)), _useParams_params = _useParams.params, id = _useParams_params.id, position = _useParams_params.position, contentStyle = _useParams_params.contentStyle, icon = _useParams_params.icon, content = _useParams_params.content, duration = _useParams_params.duration, type = _useParams_params.type, title = _useParams_params.title, closeOnOverlayClick = _useParams_params.closeOnOverlayClick, lockScroll = _useParams_params.lockScroll, contentClassName = _useParams_params.contentClassName, visible = _useParams_params.visible, size = _useParams_params.size, className = _useParams_params.className, style = _useParams_params.style, onClose = _useParams_params.onClose, wordBreak = _useParams_params.wordBreak, setParams = _useParams.setParams;
+    var _useParams = (0, _usecustomevent.useParams)((0, _mergeprops.mergeProps)(defaultProps, props)), _useParams_params = _useParams.params, id = _useParams_params.id, position = _useParams_params.position, contentStyle = _useParams_params.contentStyle, icon = _useParams_params.icon, content = _useParams_params.content, duration = _useParams_params.duration, title = _useParams_params.title, closeOnOverlayClick = _useParams_params.closeOnOverlayClick, lockScroll = _useParams_params.lockScroll, contentClassName = _useParams_params.contentClassName, visible = _useParams_params.visible, size = _useParams_params.size, className = _useParams_params.className, style = _useParams_params.style, wordBreak = _useParams_params.wordBreak, zIndex = _useParams_params.zIndex, onClose = _useParams_params.onClose, setParams = _useParams.setParams;
+    var classPrefix = 'nut-toast';
     var timer = (0, _react.useRef)(-1);
     var rtl = (0, _index1.useRtl)();
     var _usePropsValue = (0, _sliced_to_array._)((0, _usepropsvalue.usePropsValue)({
@@ -115,19 +116,21 @@ var Toast = function Toast(props) {
             _$hide();
         }
     };
-    var hasIcon = function hasIcon() {
-        return type !== 'text' || !!icon;
-    };
-    var iconName = function iconName() {
-        if (icon) {
-            return icon;
+    var renderIcon = function renderIcon() {
+        var iconNode = icon;
+        if (typeof icon === 'string') {
+            iconNode = ({
+                success: /*#__PURE__*/ _react.default.createElement(_iconsreacttaro.Success, null),
+                fail: /*#__PURE__*/ _react.default.createElement(_iconsreacttaro.Failure, null),
+                warn: /*#__PURE__*/ _react.default.createElement(_iconsreacttaro.Tips, null),
+                loading: /*#__PURE__*/ _react.default.createElement(_iconsreacttaro.Loading, {
+                    className: "nut-icon-loading"
+                })
+            })[icon];
         }
-        return ({
-            success: /*#__PURE__*/ _react.default.createElement(_iconsreacttaro.Success, null),
-            fail: /*#__PURE__*/ _react.default.createElement(_iconsreacttaro.Failure, null),
-            warn: /*#__PURE__*/ _react.default.createElement(_iconsreacttaro.Tips, null),
-            loading: /*#__PURE__*/ _react.default.createElement(_iconsreacttaro.Loading, null)
-        })[type];
+        return iconNode && /*#__PURE__*/ _react.default.createElement(_components.View, {
+            className: "".concat(classPrefix, "-icon-wrapper")
+        }, iconNode);
     };
     var classes = (0, _classnames.default)({
         'nut-toast-has-icon': icon,
@@ -137,9 +140,10 @@ var Toast = function Toast(props) {
         left: '50%',
         transform: 'translate(-50%, -50%)'
     } : null;
-    return /*#__PURE__*/ _react.default.createElement(_react.default.Fragment, null, innerVisible ? /*#__PURE__*/ _react.default.createElement(_index.default, {
+    return /*#__PURE__*/ _react.default.createElement(_react.default.Fragment, null, innerVisible && /*#__PURE__*/ _react.default.createElement(_index.default, {
         visible: innerVisible,
         style: style,
+        zIndex: zIndex,
         className: "".concat(classPrefix, "-overlay-default-taro ").concat(className),
         closeOnOverlayClick: closeOnOverlayClick,
         lockScroll: lockScroll,
@@ -152,13 +156,11 @@ var Toast = function Toast(props) {
     }, /*#__PURE__*/ _react.default.createElement(_components.View, {
         className: (0, _classnames.default)("".concat(classPrefix, "-inner"), "".concat(classPrefix, "-").concat(position), contentClassName, "".concat(classPrefix, "-inner-").concat(size), "".concat(classPrefix, "-inner-").concat(wordBreak), (0, _define_property._)({}, "".concat(classPrefix, "-inner-descrption"), content)),
         style: (0, _object_spread._)({}, styles, contentStyle)
-    }, hasIcon() ? /*#__PURE__*/ _react.default.createElement(_components.View, {
-        className: "".concat(classPrefix, "-icon-wrapper")
-    }, iconName()) : null, title ? /*#__PURE__*/ _react.default.createElement(_components.Text, {
+    }, renderIcon(), title && /*#__PURE__*/ _react.default.createElement(_components.Text, {
         className: "".concat(classPrefix, "-title")
-    }, title) : null, content ? /*#__PURE__*/ _react.default.createElement(_components.Text, {
+    }, title), content && /*#__PURE__*/ _react.default.createElement(_components.Text, {
         className: "".concat(classPrefix, "-text")
-    }, content) : null))) : null);
+    }, content)))));
 };
 function show(selector, options) {
     // eslint-disable-next-line react-hooks/rules-of-hooks

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

@@ -0,0 +1,17 @@
+import { OverlayProps } from "../overlay/types";
+export type ToastPosition = 'top' | 'bottom' | 'center';
+export type ToastIcon = 'success' | 'fail' | 'loading' | 'warn' | React.ReactNode;
+export type ToastWordBreak = 'normal' | 'break-all' | 'break-word';
+export type ToastSize = 'small' | 'base' | 'large';
+export interface ToastProps extends Omit<OverlayProps, 'onClick'> {
+    id: string;
+    position: ToastPosition;
+    title: string;
+    size: ToastSize;
+    icon: ToastIcon;
+    content: React.ReactNode;
+    contentClassName: string;
+    contentStyle: React.CSSProperties;
+    wordBreak: ToastWordBreak;
+    onClose: () => void;
+}

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

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

package/dist/cjs/packages/tour/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 {
@@ -666,7 +661,7 @@
 
 .nut-tour-mask {
   position: fixed;
-  box-shadow: 0px 0px 0px 150vh var(--nutui-black-10);
+  box-shadow: 0px 0px 0px 150vh var(--nutui-color-mask, rgba(0, 0, 0, 0.7));
   border-radius: var(--nutui-tour-mask-border-radius, 10px);
   z-index: 999;
 }
@@ -706,18 +701,18 @@
 }
 .nut-tour-content-bottom-operate-btn {
   display: inline-block;
-  border: 1px solid var(--nutui-gray-4);
+  border: 1px solid var(--nutui-color-text-disabled, #c2c4cc);
   margin-left: var(--nutui-tour-content-bottom-btn-margin-left, 4px);
   padding: var(--nutui-tour-content-bottom-btn-padding, 2px 4px);
   font-size: var(--nutui-tour-content-bottom-btn-font-size, 12px);
   border-radius: var(--nutui-tour-content-bottom-btn-border-radius, 4px);
-  color: var(--nutui-gray-6);
+  color: var(--nutui-color-text, #505259);
   cursor: pointer;
 }
 .nut-tour-content-bottom-operate-btn.active {
   color: #fff;
   border: 0;
-  background: var(--nutui-brand-6);
+  background: var(--nutui-color-primary, #ff0f23);
 }
 .nut-tour-content-tile .nut-tour-content-inner {
   margin: 0;

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

@@ -14,7 +14,7 @@ export type TourType = 'step' | 'tile';
 export interface TourProps extends BasicComponent {
     visible: boolean;
     type: TourType;
-    location: PopoverLocation | string;
+    location: PopoverLocation;
     mask: boolean;
     maskWidth: number | string;
     maskHeight: number | string;

package/dist/cjs/packages/tour/tour.js

@@ -18,7 +18,7 @@ var _iconsreacttaro = require("@nutui/icons-react-taro");
 var _classnames = /*#__PURE__*/ _interop_require_default._(require("classnames"));
 var _components = require("@tarojs/components");
 var _index = /*#__PURE__*/ _interop_require_default._(require("../popover/index"));
-var _usetarorect = require("../../utils/use-taro-rect");
+var _usetarorect = require("../../hooks/use-taro-rect");
 var _typings = require("../../utils/typings");
 var _index1 = require("../configprovider/index");
 var defaultProps = (0, _object_spread_props._)((0, _object_spread._)({}, _typings.ComponentDefaults), {

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

@@ -6,7 +6,7 @@
   display: flex;
   flex-direction: row;
   align-items: center;
-  color: var(--nutui-gray-7);
+  color: var(--nutui-color-title, #1a1a1a);
   font-size: var(--nutui-trendarrow-font-size, 14px);
 }
 .nut-trendarrow-icon-before {

package/dist/cjs/packages/uploader/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: "";
@@ -89,7 +89,7 @@
   display: flex;
   align-items: center;
   justify-content: center;
-  background: var(--nutui-uploader-background, var(--nutui-gray-3));
+  background: var(--nutui-uploader-background, var(--nutui-color-background, #f2f3f5));
   width: var(--nutui-uploader-image-width, 100px);
   height: var(--nutui-uploader-image-height, 100px);
   border: var(--nutui-uploader-image-border, 0px);
@@ -100,11 +100,11 @@
   flex-direction: column;
   justify-content: center;
   align-items: center;
-  color: var(--nutui-uploader-image-color, var(--nutui-gray-5));
+  color: var(--nutui-uploader-image-color, var(--nutui-color-text-help, #888b94));
 }
 .nut-uploader-icon i,
 .nut-uploader-icon .nut-icon {
-  color: var(--nutui-uploader-image-color, var(--nutui-gray-5));
+  color: var(--nutui-uploader-image-color, var(--nutui-color-text-help, #888b94));
   margin-bottom: var(--nutui-uploader-image-icon-margin-bottom, 6px);
 }
 .nut-uploader-icon-tip {
@@ -124,12 +124,12 @@
   cursor: not-allowed;
 }
 .nut-uploader-upload-disabled {
-  background: var(--nutui-uploader-background-disabled, var(--nutui-gray-3));
-  color: var(--nutui-uploader-image-disabled, var(--nutui-gray-4));
+  background: var(--nutui-uploader-background-disabled, var(--nutui-color-background, #f2f3f5));
+  color: var(--nutui-uploader-image-disabled, var(--nutui-color-text-disabled, #c2c4cc));
 }
 .nut-uploader-upload-disabled .nut-uploader-icon i,
 .nut-uploader-upload-disabled .nut-uploader-icon .nut-icon {
-  color: var(--nutui-uploader-image-disabled, var(--nutui-gray-4));
+  color: var(--nutui-uploader-image-disabled, var(--nutui-color-text-disabled, #c2c4cc));
   margin-bottom: var(--nutui-uploader-image-icon-margin-bottom, 6px);
 }
 .nut-uploader-preview {
@@ -149,14 +149,14 @@
   justify-content: center;
   width: 100%;
   height: 100%;
-  background: var(--nutui-uploader-preview-progress-background, var(--nutui-black-10));
+  background: var(--nutui-uploader-preview-progress-background, var(--nutui-color-mask, rgba(0, 0, 0, 0.7)));
   border-radius: var(--nutui-uploader-image-border-radius, 4px);
 }
 .nut-uploader-preview-progress i {
   margin-bottom: var(--nutui-uploader-image-icon-margin-bottom, 6px);
 }
 .nut-uploader-preview-progress-msg {
-  color: var(--nutui-gray-5);
+  color: var(--nutui-color-text-help, #888b94);
   font-size: 12px;
 }
 .nut-uploader-preview.list {
@@ -174,7 +174,7 @@
   align-items: center;
   justify-content: space-between;
   padding: 0 10px;
-  background-color: var(--nutui-color-background-sunken, var(--nutui-gray-2));
+  background-color: var(--nutui-color-background-sunken, #f7f8fc);
 }
 .nut-uploader-preview-list .nut-uploader-preview-img-file-name {
   display: flex;
@@ -210,7 +210,7 @@
   overflow: hidden;
 }
 .nut-uploader-preview-img i {
-  color: var(--nutui-gray-7);
+  color: var(--nutui-color-title, #1a1a1a);
 }
 .nut-uploader-preview-img .tips {
   position: absolute;
@@ -252,7 +252,7 @@
   display: flex;
   width: 90%;
   font-size: 12px;
-  color: var(--nutui-gray-6);
+  color: var(--nutui-color-text, #505259);
   display: -webkit-box;
   -webkit-box-orient: vertical;
   -webkit-line-clamp: 2;

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

@@ -1,10 +1,11 @@
+import { FixAutoComplete } from "../../types/fix-string-literal-union";
 export type FileItem = {
     status?: FileItemStatus;
     message?: string;
     uid?: string | number;
     name?: string;
     url?: string;
-    type?: 'image' | 'list' | string;
+    type?: FixAutoComplete<'image' | 'list'>;
     path?: string;
     loadingIcon?: React.ReactNode;
     failIcon?: React.ReactNode;

package/dist/cjs/packages/uploader/uploader.js

@@ -26,7 +26,7 @@ var _index = /*#__PURE__*/ _interop_require_default._(require("../button/index")
 var _index1 = require("../configprovider/index");
 var _interceptor = require("../../utils/interceptor");
 var _typings = require("../../utils/typings");
-var _usepropsvalue = require("../../utils/use-props-value");
+var _usepropsvalue = require("../../hooks/use-props-value");
 var _preview = require("./preview");
 var defaultProps = (0, _object_spread_props._)((0, _object_spread._)({}, _typings.ComponentDefaults), {
     maxCount: Number.MAX_VALUE,

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

@@ -8,8 +8,8 @@
 .nut-horizontal-items li {
   display: block;
   float: left;
-  color: var(--nutui-gray-7);
-  background: var(--nutui-gray-1);
+  color: var(--nutui-color-title, #1a1a1a);
+  background: var(--nutui-color-background-overlay, #ffffff);
   padding: 10px;
   margin-right: 20px;
 }
@@ -22,8 +22,8 @@
 
 .nut-vertical-items li {
   display: block;
-  color: var(--nutui-gray-7);
-  background: var(--nutui-gray-1);
+  color: var(--nutui-color-title, #1a1a1a);
+  background: var(--nutui-color-background-overlay, #ffffff);
   border-radius: 7px;
   box-shadow: 0 1px 6px 0 rgb(237, 238, 241);
   margin-top: 20px;

package/dist/cjs/packages/virtuallist/virtuallist.js

@@ -16,8 +16,8 @@ var _object_without_properties = require("@swc/helpers/_/_object_without_propert
 var _sliced_to_array = require("@swc/helpers/_/_sliced_to_array");
 var _react = /*#__PURE__*/ _interop_require_wildcard._(require("react"));
 var _components = require("@tarojs/components");
-var _taro = require("@tarojs/taro");
 var _classnames = /*#__PURE__*/ _interop_require_default._(require("classnames"));
+var _getsysteminfo = require("../../utils/get-system-info");
 var _utils = require("./utils");
 var _typings = require("../../utils/typings");
 var defaultProps = (0, _object_spread_props._)((0, _object_spread._)({}, _typings.ComponentDefaults), {
@@ -41,7 +41,7 @@ var VirtualList = function VirtualList(props) {
         "containerHeight"
     ]);
     var clientHeight = (0, _react.useMemo)(function() {
-        return (0, _taro.getSystemInfoSync)().windowHeight - 5 || 667;
+        return (0, _getsysteminfo.getWindowInfo)().windowHeight - 5 || 667;
     }, []);
     var containerHeight = (0, _react.useMemo)(function() {
         return origContainerHeight !== null && origContainerHeight !== void 0 ? origContainerHeight : clientHeight;

package/dist/cjs/utils/get-rect-by-taro.js

@@ -20,8 +20,7 @@ var _async_to_generator = require("@swc/helpers/_/_async_to_generator");
 var _sliced_to_array = require("@swc/helpers/_/_sliced_to_array");
 var _ts_generator = require("@swc/helpers/_/_ts_generator");
 var _taro = require("@tarojs/taro");
-var _useclientrect = require("./use-client-rect");
-var _platformtaro = require("./platform-taro");
+var _useclientrect = require("../hooks/use-client-rect");
 function makeRect(width, height) {
     return {
         top: 0,
@@ -42,19 +41,6 @@ var getRectByTaro = /*#__PURE__*/ function() {
                         Promise.resolve((0, _useclientrect.getRect)(element))
                     ];
                 }
-                if ((0, _platformtaro.rn)()) {
-                    return [
-                        2,
-                        new Promise(function(resolve) {
-                            element.measure(function(xPos, yPos, measureWidth, measureHeight, pageX, pageY) {
-                                var rect = makeRect(measureWidth, measureHeight);
-                                rect.left = pageX;
-                                rect.top = pageY;
-                                resolve(rect);
-                            });
-                        })
-                    ];
-                }
                 // 小程序下的逻辑
                 return [
                     2,

package/dist/cjs/utils/get-system-info.d.ts

@@ -0,0 +1,19 @@
+import Taro from '@tarojs/taro';
+interface IDeviceInfo extends Omit<Taro.getDeviceInfo.Result, 'deviceAbi' | 'CPUType'> {
+}
+/**
+ * 获取设备基础信息，兼容新旧 API
+ * @returns {IDeviceInfo} 设备基础信息
+ */
+export declare const getDeviceInfo: () => IDeviceInfo;
+/**
+ * 获取窗口信息，兼容新旧 API
+ * @returns {Taro.getWindowInfo.Result} 窗口信息
+ */
+export declare const getWindowInfo: () => Taro.getWindowInfo.Result;
+/**
+ * 获取应用基础信息，兼容新旧 API
+ * @returns {Taro.getAppBaseInfo.Result} 应用基础信息
+ */
+export declare const getAppBaseInfo: () => Taro.getAppBaseInfo.Result;
+export {};

package/dist/cjs/utils/get-system-info.js

@@ -0,0 +1,32 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+function _export(target, all) {
+    for(var name in all)Object.defineProperty(target, name, {
+        enumerable: true,
+        get: all[name]
+    });
+}
+_export(exports, {
+    getAppBaseInfo: function() {
+        return getAppBaseInfo;
+    },
+    getDeviceInfo: function() {
+        return getDeviceInfo;
+    },
+    getWindowInfo: function() {
+        return getWindowInfo;
+    }
+});
+var _interop_require_default = require("@swc/helpers/_/_interop_require_default");
+var _taro = /*#__PURE__*/ _interop_require_default._(require("@tarojs/taro"));
+var getDeviceInfo = function getDeviceInfo() {
+    return _taro.default.canIUse('getDeviceInfo') ? _taro.default.getDeviceInfo() : _taro.default.getSystemInfoSync();
+};
+var getWindowInfo = function getWindowInfo() {
+    return _taro.default.canIUse('getWindowInfo') ? _taro.default.getWindowInfo() : _taro.default.getSystemInfoSync();
+};
+var getAppBaseInfo = function getAppBaseInfo() {
+    return _taro.default.canIUse('getAppBaseInfo') ? _taro.default.getAppBaseInfo() : _taro.default.getSystemInfoSync();
+};

package/dist/cjs/utils/platform-taro.d.ts

@@ -1,5 +1,3 @@
-export declare const harmonyAndRn: () => boolean;
 export declare const harmony: () => boolean;
-export declare const rn: () => boolean;
 export declare const web: () => boolean;
 export declare const miniprogram: () => boolean;

package/dist/cjs/utils/platform-taro.js

@@ -12,30 +12,15 @@ _export(exports, {
     harmony: function() {
         return harmony;
     },
-    harmonyAndRn: function() {
-        return harmonyAndRn;
-    },
     miniprogram: function() {
         return miniprogram;
     },
-    rn: function() {
-        return rn;
-    },
     web: function() {
         return web;
     }
 });
 var _interop_require_default = require("@swc/helpers/_/_interop_require_default");
 var _taro = /*#__PURE__*/ _interop_require_default._(require("@tarojs/taro"));
-var harmonyAndRn = function harmonyAndRn() {
-    return [
-        'rn',
-        'jdrn',
-        'harmony',
-        'jdharmony',
-        'harmonyhybrid'
-    ].includes(_taro.default.getEnv().toLowerCase());
-};
 var harmony = function harmony() {
     return [
         'harmony',
@@ -43,12 +28,6 @@ var harmony = function harmony() {
         'jdharmony'
     ].includes(_taro.default.getEnv().toLowerCase());
 };
-var rn = function rn() {
-    return [
-        'rn',
-        'jdrn'
-    ].includes(_taro.default.getEnv().toLowerCase());
-};
 var web = function web() {
     return [
         'web'