@nutui/nutui-react-taro 3.0.0-beta.0 → 3.0.0-beta.1

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

@@ -12,7 +12,7 @@
   right: 0;
   width: 100%;
   height: 100%;
-  background-color: var(--nutui-overlay-bg-color, var(--nutui-black-10, rgba(0, 0, 0, 0.7)));
+  background-color: var(--nutui-overlay-bg-color, var(--nutui-color-mask, rgba(0, 0, 0, 0.7)));
   z-index: var(--nutui-overlay-zIndex, 1000);
 }
 
@@ -25,9 +25,6 @@
 .nut-overflow-hidden {
   overflow: hidden !important;
 }
-.nut-overflow-hidden .taro_page {
-  overflow: hidden !important;
-}
 
 @keyframes nut-fade-in {
   0% {
@@ -63,17 +60,23 @@
 }
 
 .nut-popup {
+  /* #ifdef rn */
+  position: absolute;
+  /* #endif */
+  /* #ifndef rn */
   position: fixed;
+  /* #endif */
   min-height: 26%;
   max-height: 100%;
   overflow-y: auto;
-  background-color: var(--nutui-overlay-content-bg-color, var(--nutui-gray-1, #ffffff));
-  color: var(--nutui-gray-7, #1a1a1a);
+  background-color: var(--nutui-overlay-content-bg-color, var(--nutui-color-background-overlay, #ffffff));
+  color: var(--nutui-color-title, #1a1a1a);
   -webkit-overflow-scrolling: touch;
-  font-size: var(--nutui-font-size-3, 14px);
+  font-size: var(--nutui-font-size-base, 14px);
 }
 .nut-popup-title {
   display: flex;
+  flex-direction: row;
   align-items: center;
   justify-content: center;
   border-bottom: var(--nutui-popup-title-border-bottom, 0);
@@ -85,26 +88,30 @@
   left: var(--nutui-popup-title-padding, 16px);
 }
 .nut-popup-title-title {
-  font-weight: var(--nutui-font-weight-bold, 500);
-  font-size: var(--nutui-popup-title-font-size, var(--nutui-font-size-6, 20px));
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+  font-weight: var(--nutui-font-weight-bold, 600);
+  font-size: var(--nutui-popup-title-font-size, var(--nutui-font-size-xl, 18px));
 }
 .nut-popup-title-description {
-  color: var(--nutui-gray-5, #888b94);
-  font-size: var(--nutui-popup-description-font-size, var(--nutui-font-size-1, 10px));
+  color: var(--nutui-color-text-help, #888b94);
+  font-size: var(--nutui-popup-description-font-size, var(--nutui-font-size-xs, 11px));
   font-weight: var(--nutui-font-weight, 400);
 }
 .nut-popup-title-right {
-  position: absolute !important;
+  position: absolute;
   z-index: 1;
   cursor: pointer;
-  width: var(--nutui-popup-icon-size, var(--nutui-font-size-6, 20px));
-  height: var(--nutui-popup-icon-size, var(--nutui-font-size-6, 20px));
+  width: var(--nutui-popup-icon-size, var(--nutui-font-size-xl, 18px));
+  height: var(--nutui-popup-icon-size, var(--nutui-font-size-xl, 18px));
   display: flex;
   justify-content: center;
   align-items: center;
   top: var(--nutui-popup-title-padding, 16px);
   right: var(--nutui-popup-title-padding, 16px);
-  color: var(--nutui-gray-5, #888b94);
+  color: var(--nutui-color-text-help, #888b94);
 }
 .nut-popup-title-right:active {
   opacity: 0.7;
@@ -125,7 +132,9 @@
   top: 50%;
   left: 50%;
   min-height: 10%;
+  /* #ifndef rn */
   transform: translate(-50%, -50%);
+  /* #endif */
 }
 .nut-popup-center.nut-popup-round {
   border-radius: var(--nutui-popup-border-radius, 24px);
@@ -137,6 +146,9 @@
   bottom: 0;
   left: 0;
   width: 100%;
+  /* #ifdef rn */
+  height: 300px;
+  /* #endif */
 }
 .nut-popup-bottom.nut-popup-round {
   border-radius: var(--nutui-popup-border-radius, 24px) var(--nutui-popup-border-radius, 24px) 0 0;
@@ -144,6 +156,10 @@
 .nut-popup-right {
   top: 0;
   right: 0;
+  /* #ifdef rn */
+  width: 100px;
+  height: 100%;
+  /* #endif */
 }
 .nut-popup-right.nut-popup-round {
   border-radius: var(--nutui-popup-border-radius, 24px) 0 0 var(--nutui-popup-border-radius, 24px);
@@ -151,6 +167,10 @@
 .nut-popup-left {
   top: 0;
   left: 0;
+  /* #ifdef rn */
+  width: 100px;
+  height: 100%;
+  /* #endif */
 }
 .nut-popup-left.nut-popup-round {
   border-radius: 0 var(--nutui-popup-border-radius, 24px) var(--nutui-popup-border-radius, 24px) 0;
@@ -159,6 +179,9 @@
   top: 0;
   left: 0;
   width: 100%;
+  /* #ifdef rn */
+  height: 100px;
+  /* #endif */
 }
 .nut-popup-top.nut-popup-round {
   border-radius: 0 0 var(--nutui-popup-border-radius, 24px) var(--nutui-popup-border-radius, 24px);
@@ -227,16 +250,22 @@
 }
 @keyframes popup-slide-top-enter {
   from {
+    /* #ifndef rn */
     transform: translate3d(0, -100%, 0);
+    /* #endif */
   }
 }
 @keyframes popup-slide-top-exit {
   to {
+    /* #ifndef rn */
     transform: translate3d(0, -100%, 0);
+    /* #endif */
   }
 }
 .nut-popup-slide-top-enter-active, .nut-popup-slide-top-appear-active {
+  /* #ifndef rn */
   transform: translate3d(0, 0%, 0);
+  /* #endif*/
   animation-fill-mode: both;
   animation-name: popup-slide-top-enter;
   animation-duration: var(--nutui-popup-animation-duration, 0.3s);
@@ -248,16 +277,22 @@
 }
 @keyframes popup-slide-right-enter {
   from {
+    /* #ifndef rn */
     transform: translate3d(100%, 0, 0);
+    /* #endif*/
   }
 }
 @keyframes popup-slide-right-exit {
   to {
+    /* #ifndef rn */
     transform: translate3d(100%, 0, 0);
+    /* #endif*/
   }
 }
 .nut-popup-slide-right-enter-active, .nut-popup-slide-right-appear-active {
+  /* #ifndef rn */
   transform: translate3d(0, 0, 0);
+  /* #endif*/
   animation-fill-mode: both;
   animation-name: popup-slide-right-enter;
   animation-duration: var(--nutui-popup-animation-duration, 0.3s);
@@ -269,16 +304,22 @@
 }
 @keyframes popup-slide-bottom-enter {
   from {
+    /* #ifndef rn */
     transform: translate3d(0, 100%, 0);
+    /* #endif */
   }
 }
 @keyframes slide-bottom-exit {
   to {
+    /* #ifndef rn */
     transform: translate3d(0, 100%, 0);
+    /* #endif */
   }
 }
 .nut-popup-slide-bottom-enter-active, .nut-popup-slide-bottom-appear-active {
+  /* #ifndef rn */
   transform: translate(0, 0);
+  /* #endif */
   animation-fill-mode: both;
   animation-name: popup-slide-bottom-enter;
   animation-duration: var(--nutui-popup-animation-duration, 0.3s);
@@ -290,12 +331,16 @@
 }
 @keyframes popup-slide-left-enter {
   from {
+    /* #ifndef rn */
     transform: translate3d(-100%, 0, 0);
+    /* #endif */
   }
 }
 @keyframes popup-slide-left-exit {
   to {
+    /* #ifndef rn */
     transform: translate3d(-100%, 0, 0);
+    /* #endif */
   }
 }
 .nut-popup-slide-left-enter-active, .nut-popup-slide-left-appear-active {
@@ -313,7 +358,7 @@
   display: none;
 }
 .nut-popup .nut-overflow-hidden {
-  overflow: hidden !important;
+  overflow: hidden;
 }
 
 [dir=rtl] .nut-popup-title-left,
@@ -349,7 +394,9 @@
 .nut-rtl .nut-popup-center {
   left: auto;
   right: 50%;
+  /* #ifndef rn */
   transform: translate(50%, -50%);
+  /* #endif*/
 }
 [dir=rtl] .nut-popup-bottom,
 .nut-rtl .nut-popup-bottom {
@@ -425,7 +472,7 @@
   position: absolute;
   background-color: var(--nutui-popover-content-background-color, #ffffff);
   border-radius: var(--nutui-popover-border-radius, 8px);
-  font-size: var(--nutui-popover-font-size, var(--nutui-font-size-2, 12px));
+  font-size: var(--nutui-popover-font-size, var(--nutui-font-size-s, 12px));
   font-family: PingFangSC;
   font-weight: normal;
   color: var(--nutui-popover-text-color, #1a1a1a);
@@ -444,7 +491,7 @@
   align-items: center;
   justify-content: center;
   padding: var(--nutui-popover-menu-item-padding, 8px);
-  border-bottom: 1px solid var(--nutui-popover-divider-color, var(--nutui-black-3, rgba(0, 0, 0, 0.06)));
+  border-bottom: 1px solid var(--nutui-popover-divider-color, var(--nutui-color-border, rgba(0, 0, 0, 0.06)));
 }
 .nut-popover .nut-popover-content .nut-popover-menu-item:last-child {
   margin-bottom: 0px;
@@ -481,7 +528,7 @@
   width: 12px;
   height: 12px;
   font-size: 12px;
-  color: var(--nutui-gray-6, #505259);
+  color: var(--nutui-color-text, #505259);
 }
 .nut-popover .nut-popover-content .nut-popover-menu-item.nut-popover-menu-disabled {
   color: var(--nutui-popover-disable-color, var(--nutui-color-text-disabled, #c2c4cc));
@@ -662,7 +709,7 @@
 
 .nut-tour-mask {
   position: fixed;
-  box-shadow: 0px 0px 0px 150vh var(--nutui-black-10, rgba(0, 0, 0, 0.7));
+  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;
 }
@@ -707,7 +754,7 @@
   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, #505259);
+  color: var(--nutui-color-text, #505259);
   cursor: pointer;
 }
 .nut-tour-content-bottom-operate-btn.active {

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

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

package/dist/es/packages/uploader/preview.js

@@ -1,10 +1,10 @@
 import React from "react";
 import { Del, Failure, Link as LinkIcon, Loading } from "@nutui/icons-react-taro";
-import { Image } from "@tarojs/components";
+import { Image, View } from "@tarojs/components";
 import Progress from "../progress/index";
 import { ERROR } from "./utils";
 export var Preview = function(param) {
-    var fileList = param.fileList, previewType = param.previewType, deletable = param.deletable, onDeleteItem = param.onDeleteItem, handleItemClick = param.handleItemClick, previewUrl = param.previewUrl, children = param.children;
+    var fileList = param.fileList, previewType = param.previewType, deletable = param.deletable, onDeleteItem = param.onDeleteItem, handleItemClick = param.handleItemClick, previewUrl = param.previewUrl, deleteIcon = param.deleteIcon, children = param.children;
     var renderIcon = function(item) {
         if (item.status === ERROR) {
             return item.failIcon || /*#__PURE__*/ React.createElement(Failure, {
@@ -18,24 +18,23 @@ export var Preview = function(param) {
     };
     return /*#__PURE__*/ React.createElement(React.Fragment, null, fileList.length !== 0 && fileList.map(function(item, index) {
         var _item_type;
-        return /*#__PURE__*/ React.createElement("div", {
+        return /*#__PURE__*/ React.createElement(View, {
             className: "nut-uploader-preview ".concat(previewType),
             key: item.uid
-        }, previewType === 'picture' && !children && deletable && /*#__PURE__*/ React.createElement(Failure, {
-            color: "rgba(0,0,0,0.6)",
+        }, previewType === 'picture' && !children && deletable && /*#__PURE__*/ React.createElement(View, {
             className: "close",
             onClick: function() {
                 return onDeleteItem(item, index);
             }
-        }), previewType === 'picture' && !children && /*#__PURE__*/ React.createElement("div", {
+        }, deleteIcon), previewType === 'picture' && !children && /*#__PURE__*/ React.createElement(View, {
             className: "nut-uploader-preview-img"
-        }, item.status === 'ready' ? /*#__PURE__*/ React.createElement("div", {
+        }, item.status === 'ready' ? /*#__PURE__*/ React.createElement(View, {
             className: "nut-uploader-preview-progress"
-        }, /*#__PURE__*/ React.createElement("div", {
+        }, /*#__PURE__*/ React.createElement(View, {
             className: "nut-uploader-preview-progress-msg"
-        }, item.message)) : item.status !== 'success' && /*#__PURE__*/ React.createElement("div", {
+        }, item.message)) : item.status !== 'success' && /*#__PURE__*/ React.createElement(View, {
             className: "nut-uploader-preview-progress"
-        }, renderIcon(item), /*#__PURE__*/ React.createElement("div", {
+        }, renderIcon(item), /*#__PURE__*/ React.createElement(View, {
             className: "nut-uploader-preview-progress-msg"
         }, item.message)), ((_item_type = item.type) === null || _item_type === void 0 ? void 0 : _item_type.includes('image')) ? /*#__PURE__*/ React.createElement(React.Fragment, null, item.url && /*#__PURE__*/ React.createElement(Image, {
             className: "nut-uploader-preview-img-c",
@@ -54,20 +53,20 @@ export var Preview = function(param) {
             onClick: function() {
                 return handleItemClick(item, index);
             }
-        }) : /*#__PURE__*/ React.createElement("div", {
+        }) : /*#__PURE__*/ React.createElement(View, {
             className: "nut-uploader-preview-img-file"
-        }, /*#__PURE__*/ React.createElement("div", {
+        }, /*#__PURE__*/ React.createElement(View, {
             onClick: function() {
                 return handleItemClick(item, index);
             },
             className: "nut-uploader-preview-img-file-name"
         }, /*#__PURE__*/ React.createElement(LinkIcon, {
             color: "#808080"
-        }), /*#__PURE__*/ React.createElement("span", null, "\xa0", item.name)))), item.status === 'success' ? /*#__PURE__*/ React.createElement("div", {
+        }), /*#__PURE__*/ React.createElement("span", null, "\xa0", item.name)))), item.status === 'success' ? /*#__PURE__*/ React.createElement(View, {
             className: "tips"
-        }, item.name) : null), previewType === 'list' && /*#__PURE__*/ React.createElement("div", {
+        }, item.name) : null), previewType === 'list' && /*#__PURE__*/ React.createElement(View, {
             className: "nut-uploader-preview-list"
-        }, /*#__PURE__*/ React.createElement("div", {
+        }, /*#__PURE__*/ React.createElement(View, {
             className: "nut-uploader-preview-img-file-name ".concat(item.status),
             onClick: function() {
                 return handleItemClick(item, index);

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

@@ -8,7 +8,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, #f5f6fa));
+  background: var(--nutui-progress-background, var(--nutui-color-background, #f5f6fa));
 }
 .nut-progress-outer .nut-progress-active:before {
   content: "";
@@ -27,7 +27,7 @@
   justify-content: center;
   transition: all 0.4s;
   border-radius: var(--nutui-progress-border-radius, 12px);
-  background: var(--nutui-progress-color, linear-gradient(135deg, var(--nutui-color-primary-stop-1, #ff475d) 0%, var(--nutui-color-primary-stop-2, #ff0f23) 100%));
+  background-color: var(--nutui-progress-color, #ff0f23);
 }
 .nut-progress-text {
   display: flex;
@@ -36,10 +36,11 @@
   top: var(--nutui-progress-text-position-top, -4px);
   bottom: var(--nutui-progress-text-position-bottom, -4px);
   transition: all 0.4s;
-  transform: translate(-50%);
 }
 .nut-progress-text-inner {
   display: flex;
+  flex-direction: row;
+  justify-content: center;
   align-items: center;
   height: 100%;
   width: 100%;
@@ -48,7 +49,7 @@
   border-radius: var(--nutui-progress-text-border-radius, 5px);
   font-size: var(--nutui-progress-text-font-size, 9px);
   line-height: 1;
-  background: var(--nutui-progress-text-background, var(--nutui-progress-color, linear-gradient(135deg, var(--nutui-color-primary-stop-1, #ff475d) 0%, var(--nutui-color-primary-stop-2, #ff0f23) 100%)));
+  background: var(--nutui-progress-text-background, #ff0f23);
 }
 @keyframes progressActive {
   0% {
@@ -83,7 +84,7 @@
   display: flex;
   align-items: center;
   justify-content: center;
-  background: var(--nutui-uploader-background, var(--nutui-gray-3, #f5f6fa));
+  background: var(--nutui-uploader-background, var(--nutui-color-background, #f5f6fa));
   width: var(--nutui-uploader-image-width, 100px);
   height: var(--nutui-uploader-image-height, 100px);
   border: var(--nutui-uploader-image-border, 0px);
@@ -94,11 +95,11 @@
   flex-direction: column;
   justify-content: center;
   align-items: center;
-  color: var(--nutui-uploader-image-color, var(--nutui-gray-5, #888b94));
+  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, #888b94));
+  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 {
@@ -118,7 +119,7 @@
   cursor: not-allowed;
 }
 .nut-uploader-upload-disabled {
-  background: var(--nutui-uploader-background-disabled, var(--nutui-gray-3, #f5f6fa));
+  background: var(--nutui-uploader-background-disabled, var(--nutui-color-background, #f5f6fa));
   color: var(--nutui-uploader-image-disabled, var(--nutui-color-text-disabled, #c2c4cc));
 }
 .nut-uploader-upload-disabled .nut-uploader-icon i,
@@ -143,14 +144,14 @@
   justify-content: center;
   width: 100%;
   height: 100%;
-  background: var(--nutui-uploader-preview-progress-background, var(--nutui-black-10, rgba(0, 0, 0, 0.7)));
+  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, #888b94);
+  color: var(--nutui-color-text-help, #888b94);
   font-size: 12px;
 }
 .nut-uploader-preview.list {
@@ -168,7 +169,7 @@
   align-items: center;
   justify-content: space-between;
   padding: 0 10px;
-  background-color: var(--nutui-gray-2, #f7f8fc);
+  background-color: var(--nutui-color-background-sunken, #f7f8fc);
 }
 .nut-uploader-preview-list .nut-uploader-preview-img-file-name {
   display: flex;
@@ -204,7 +205,7 @@
   overflow: hidden;
 }
 .nut-uploader-preview-img i {
-  color: var(--nutui-gray-7, #1a1a1a);
+  color: var(--nutui-color-title, #1a1a1a);
 }
 .nut-uploader-preview-img .tips {
   position: absolute;
@@ -227,7 +228,9 @@
   white-space: nowrap;
 }
 .nut-uploader-preview-img-c {
-  width: 100%;
+  display: flex;
+  justify-content: center;
+  align-items: center;
   height: 100%;
   position: initial;
   border-radius: var(--nutui-uploader-image-border-radius, 4px);
@@ -244,7 +247,7 @@
   display: flex;
   width: 90%;
   font-size: 12px;
-  color: var(--nutui-gray-6, #505259);
+  color: var(--nutui-color-text, #505259);
   display: -webkit-box;
   -webkit-box-orient: vertical;
   -webkit-line-clamp: 2;

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

@@ -174,7 +174,9 @@
       }
 
       &-c {
-        width: 100%;
+        display: flex;
+        justify-content: center;
+        align-items: center;
         height: 100%;
         position: initial;
         border-radius: $uploader-image-border-radius;
@@ -193,6 +195,7 @@
           width: 90%;
           font-size: 12px;
           color: $color-text;
+          @include moreline-ellipsis();
 
           &.error {
             color: red !important;
@@ -205,8 +208,6 @@
           .nut-icon-Link {
             flex-shrink: 0;
           }
-
-          @include moreline-ellipsis();
         }
       }
     }

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

@@ -3,21 +3,18 @@ import Taro from '@tarojs/taro';
 import { UploadOptions } from './utils';
 import { BasicComponent } from "../../utils/typings";
 import { FileItem } from "./file-item";
-/** 图片的尺寸 */
 interface sizeType {
     /** 原图 */
     original: string;
     /** compressed */
     compressed: string;
 }
-/** 图片的来源 */
 interface sourceType {
     /** 从相册选图 */
     album: string;
     /** 使用相机 */
     camera: string;
 }
-/** 视频的来源 */
 interface mediaType {
     /** 只能拍摄图片或从相册选择图片 */
     image: string;
@@ -78,6 +75,11 @@ export interface UploaderProps extends BasicComponent {
     */
     uploadIcon?: React.ReactNode
     /**
+    * 删除区域的图标名称
+    * @default -
+    */
+    deleteIcon?: React.ReactNode
+    /**
     * 上传区域图片下方文字
     * @default ""
     */
@@ -195,6 +197,11 @@ export interface UploaderProps extends BasicComponent {
     */
     onChange?: (files: FileItem[]) => void
     /**
+    * 上传前的函数需要返回一个Promise对象
+    * @default -
+    */
+    beforeUpload?: (files: Taro.chooseImage.ImageFile[] | Taro.chooseMedia.ChooseMedia[] | any) => Promise<File[] | boolean>
+    /**
     * 执行 XHR 上传时，自定义方式
     * @default -
     */