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

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

@@ -22,10 +22,10 @@ export interface TourProps extends BasicComponent {
     */
     type: TourType
     /**
-    * 弹出层位置,同 Popopver 的[location 属性](https://nutui.jd.com/h5/react/2x/#/zh-CN/component/popover)
+    * 弹出层位置,同 Popopver 的[location 属性](#/zh-CN/component/popover)
     * @default bottom
     */
-    location: PopoverLocation | string
+    location: PopoverLocation
     /**
     * 是否显示镂空遮罩
     * @default true
@@ -77,7 +77,7 @@ export interface TourProps extends BasicComponent {
     */
     showPrev: boolean
     /**
-    * 是否在点击镂空遮罩层后关闭,同 Popopver 的[closeOnClickOverlay 属性](https://nutui.jd.com/h5/react/2x/#/zh-CN/component/popover)
+    * 是否在点击镂空遮罩层后关闭,同 Popopver 的[closeOnClickOverlay 属性](#/zh-CN/component/popover)
     * @default true
     */
     closeOnOverlayClick: boolean

package/dist/es/packages/tour/tour.js

@@ -6,7 +6,7 @@ import React, { useState, useEffect } from "react";
 import { Close } from "@nutui/icons-react";
 import classNames from "classnames";
 import Popover from "../popover";
-import { getRect } from "../../utils/use-client-rect";
+import { getRect } from "../../hooks/use-client-rect";
 import { ComponentDefaults } from "../../utils/typings";
 import { useConfig } from "../configprovider";
 var defaultProps = _object_spread_props(_object_spread({}, ComponentDefaults), {

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

@@ -12,7 +12,7 @@ import { useConfig } from "../configprovider";
 import { funcInterceptor } from "../../utils/interceptor";
 import { ComponentDefaults } from "../../utils/typings";
 import Button from "../button";
-import { usePropsValue } from "../../utils/use-props-value";
+import { usePropsValue } from "../../hooks/use-props-value";
 import { Preview } from "./preview";
 import { mergeProps } from "../../utils/merge-props";
 var defaultProps = _object_spread_props(_object_spread({}, ComponentDefaults), {

package/dist/es/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/es/types/fix-string-literal-union.d.ts

@@ -0,0 +1 @@
+export type FixAutoComplete<T extends string> = T | (string & {});

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

@@ -2,8 +2,7 @@ import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
 import { _ as _sliced_to_array } from "@swc/helpers/_/_sliced_to_array";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import { createSelectorQuery } from "@tarojs/taro";
-import { getRect, inBrowser } from "./use-client-rect";
-import { rn } from "./platform-taro";
+import { getRect, inBrowser } from "../hooks/use-client-rect";
 export function makeRect(width, height) {
     return {
         top: 0,
@@ -24,19 +23,6 @@ export var getRectByTaro = /*#__PURE__*/ function() {
                         Promise.resolve(getRect(element))
                     ];
                 }
-                if (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/es/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/es/utils/get-system-info.js

@@ -0,0 +1,19 @@
+import Taro from "@tarojs/taro";
+/**
+ * 获取设备基础信息，兼容新旧 API
+ * @returns {IDeviceInfo} 设备基础信息
+ */ export var getDeviceInfo = function() {
+    return Taro.canIUse('getDeviceInfo') ? Taro.getDeviceInfo() : Taro.getSystemInfoSync();
+};
+/**
+ * 获取窗口信息，兼容新旧 API
+ * @returns {Taro.getWindowInfo.Result} 窗口信息
+ */ export var getWindowInfo = function() {
+    return Taro.canIUse('getWindowInfo') ? Taro.getWindowInfo() : Taro.getSystemInfoSync();
+};
+/**
+ * 获取应用基础信息，兼容新旧 API
+ * @returns {Taro.getAppBaseInfo.Result} 应用基础信息
+ */ export var getAppBaseInfo = function() {
+    return Taro.canIUse('getAppBaseInfo') ? Taro.getAppBaseInfo() : Taro.getSystemInfoSync();
+};

package/dist/es/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/es/utils/platform-taro.js

@@ -1,13 +1,4 @@
 import Taro from "@tarojs/taro";
-export var harmonyAndRn = function() {
-    return [
-        'rn',
-        'jdrn',
-        'harmony',
-        'jdharmony',
-        'harmonyhybrid'
-    ].includes(Taro.getEnv().toLowerCase());
-};
 export var harmony = function() {
     return [
         'harmony',
@@ -15,12 +6,6 @@ export var harmony = function() {
         'jdharmony'
     ].includes(Taro.getEnv().toLowerCase());
 };
-export var rn = function() {
-    return [
-        'rn',
-        'jdrn'
-    ].includes(Taro.getEnv().toLowerCase());
-};
 export var web = function() {
     return [
         'web'

package/dist/es/utils/px-transform.js

@@ -1,8 +1,7 @@
 import { pxTransform as transform } from "@tarojs/taro";
-import { harmony, rn } from "./platform-taro";
+import { harmony } from "./platform-taro";
 export default function pxTransform(value, radix) {
     // @ts-ignore
     if (harmony()) return transform(value, radix || 375);
-    if (rn()) return value;
     return "".concat(value, "px");
 }