@nutui/nutui-react-taro 3.0.18-cpp.beta.1 → 3.0.19-beta.1

package/dist/es/packages/toast/style-jmapp/toast.scss

@@ -94,6 +94,10 @@
     color: #ffffff;
     text-align: $toast-inner-text-align;
     line-height: 20px;
+    /* #ifdef harmony dynamic*/
+    line-height: normal;
+    /* #endif */
+    height: auto;
   }
 
   &-title {
@@ -102,6 +106,9 @@
     font-weight: 600;
     text-align: $toast-inner-text-align;
     line-height: 22px;
+    /* #ifdef harmony dynamic*/
+    line-height: normal;
+    /* #endif */
   }
 
   .nut-icon {

package/dist/es/packages/toast/style-jrkf/style.css

@@ -83,6 +83,10 @@
   color: #ffffff;
   text-align: var(--nutui-toast-inner-text-align, center);
   line-height: 20px;
+  /* #ifdef harmony dynamic*/
+  line-height: normal;
+  /* #endif */
+  height: auto;
 }
 .nut-toast-title {
   color: #ffffff;
@@ -90,6 +94,9 @@
   font-weight: 600;
   text-align: var(--nutui-toast-inner-text-align, center);
   line-height: 22px;
+  /* #ifdef harmony dynamic*/
+  line-height: normal;
+  /* #endif */
 }
 .nut-toast .nut-icon {
   width: 24px;

package/dist/es/packages/toast/style-jrkf/toast.scss

@@ -94,6 +94,10 @@
     color: #ffffff;
     text-align: $toast-inner-text-align;
     line-height: 20px;
+    /* #ifdef harmony dynamic*/
+    line-height: normal;
+    /* #endif */
+    height: auto;
   }
 
   &-title {
@@ -102,6 +106,9 @@
     font-weight: 600;
     text-align: $toast-inner-text-align;
     line-height: 22px;
+    /* #ifdef harmony dynamic*/
+    line-height: normal;
+    /* #endif */
   }
 
   .nut-icon {

package/dist/es/packages/toast/toast.js

@@ -11,7 +11,7 @@ import { defaultOverlayProps } from "../overlay/overlay";
 import { customEvents, useCustomEvent, useCustomEventsPath, useParams } from "../../hooks/taro/use-custom-event";
 import { usePropsValue } from "../../hooks/use-props-value";
 import { useRtl } from "../configprovider/index";
-import { harmony } from "../../utils/taro/platform";
+import { harmony, td } from "../../utils/taro/platform";
 import { mergeProps } from "../../utils/merge-props";
 var defaultProps = _object_spread_props(_object_spread({}, defaultOverlayProps), {
     id: '',
@@ -132,12 +132,15 @@ export var Toast = function(props) {
         id: id
     }, /*#__PURE__*/ React.createElement(View, {
         className: classNames("".concat(classPrefix, "-inner"), "".concat(classPrefix, "-").concat(position), contentClassName, "".concat(classPrefix, "-inner-").concat(size), "".concat(classPrefix, "-inner-").concat(wordBreak), _define_property({}, "".concat(classPrefix, "-inner-descrption"), content)),
-        style: _object_spread({}, styles, contentStyle)
+        style: _object_spread({}, styles, contentStyle),
+        ariaRole: "alert"
     }, renderIcon(), title && /*#__PURE__*/ React.createElement(Text, {
         className: "".concat(classPrefix, "-title")
-    }, title), content && /*#__PURE__*/ React.createElement(Text, {
+    }, title), content && (td() ? /*#__PURE__*/ React.createElement(Text, {
         className: "".concat(classPrefix, "-text")
-    }, content)))));
+    }, content) : /*#__PURE__*/ React.createElement(View, {
+        className: "".concat(classPrefix, "-text")
+    }, content))))));
 };
 export function show(selector, options) {
     // eslint-disable-next-line react-hooks/rules-of-hooks

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

@@ -18,7 +18,9 @@
   display: block;
   padding: var(--nutui-tour-content-padding, 10px 12px);
   min-width: var(--nutui-tour-content-min-width, 200px);
+  /* #ifndef dynamic*/
   box-sizing: content-box;
+  /* #endif */
 }
 .nut-tour-content-top {
   display: block;

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

@@ -83,8 +83,8 @@
 .nut-popup-title-title {
   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));
+  font-size: var(--nutui-popup-title-font-size, var(--nutui-font-size-xl, 18px));
+  line-height: var(--nutui-popup-title-font-size, var(--nutui-font-size-xl, 18px));
 }
 .nut-popup-title-description {
   color: var(--nutui-color-text, #505259);
@@ -134,9 +134,6 @@
 .nut-popup-center.nut-popup-round {
   border-radius: var(--nutui-popup-border-radius, var(--nutui-radius-xl, 12px));
 }
-.nut-popup-bottom, .nut-popup-top {
-  max-height: 87%;
-}
 .nut-popup-bottom {
   bottom: 0;
   left: 0;
@@ -145,6 +142,9 @@
 .nut-popup-bottom.nut-popup-round {
   border-radius: var(--nutui-popup-border-radius, var(--nutui-radius-xl, 12px)) var(--nutui-popup-border-radius, var(--nutui-radius-xl, 12px)) 0 0;
 }
+.nut-popup-bottom-top {
+  position: absolute;
+}
 .nut-popup-right {
   top: 0;
   right: 0;
@@ -446,8 +446,10 @@
   font-size: var(--nutui-popover-font-size, var(--nutui-font-size-s, 12px));
   color: var(--nutui-popover-text-color, var(--nutui-color-mask, rgba(0, 0, 0, 0.7)));
   line-height: 28px;
+  /* #ifndef dynamic*/
   max-height: initial;
   overflow-y: initial;
+  /* #endif */
 }
 .nut-popover .nut-popover-content-group {
   padding: 0 var(--nutui-popover-padding, 8px);
@@ -680,7 +682,9 @@
   display: block;
   padding: var(--nutui-tour-content-padding, 10px 12px);
   min-width: var(--nutui-tour-content-min-width, 200px);
+  /* #ifndef dynamic*/
   box-sizing: content-box;
+  /* #endif */
 }
 .nut-tour-content-top {
   display: block;

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

@@ -18,7 +18,9 @@
     display: block;
     padding: $tour-content-padding;
     min-width: $tour-content-min-width;
+    /* #ifndef dynamic*/
     box-sizing: content-box;
+    /* #endif */
 
     &-top {
       display: block;

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

@@ -18,7 +18,9 @@
   display: block;
   padding: var(--nutui-tour-content-padding, 10px 12px);
   min-width: var(--nutui-tour-content-min-width, 200px);
+  /* #ifndef dynamic*/
   box-sizing: content-box;
+  /* #endif */
 }
 .nut-tour-content-top {
   display: block;

package/dist/es/packages/tour/style-jmapp/tour.scss

@@ -18,7 +18,9 @@
     display: block;
     padding: $tour-content-padding;
     min-width: $tour-content-min-width;
+    /* #ifndef dynamic*/
     box-sizing: content-box;
+    /* #endif */
 
     &-top {
       display: block;

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

@@ -18,7 +18,9 @@
   display: block;
   padding: var(--nutui-tour-content-padding, 10px 12px);
   min-width: var(--nutui-tour-content-min-width, 200px);
+  /* #ifndef dynamic*/
   box-sizing: content-box;
+  /* #endif */
 }
 .nut-tour-content-top {
   display: block;

package/dist/es/packages/tour/style-jrkf/tour.scss

@@ -18,7 +18,9 @@
     display: block;
     padding: $tour-content-padding;
     min-width: $tour-content-min-width;
+    /* #ifndef dynamic*/
     box-sizing: content-box;
+    /* #endif */
 
     &-top {
       display: block;

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

@@ -164,7 +164,9 @@
   justify-content: center;
   align-items: center;
   height: 100%;
+  /* #ifndef dynamic*/
   position: initial;
+  /* #endif */
   border-radius: var(--nutui-uploader-image-border-radius, 4px);
 }
 .nut-uploader-preview-img-file {

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

@@ -224,7 +224,9 @@
   justify-content: center;
   align-items: center;
   height: 100%;
+  /* #ifndef dynamic*/
   position: initial;
+  /* #endif */
   border-radius: var(--nutui-uploader-image-border-radius, 4px);
 }
 .nut-uploader-preview-img-file {

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

@@ -179,7 +179,9 @@
         justify-content: center;
         align-items: center;
         height: 100%;
+        /* #ifndef dynamic*/
         position: initial;
+        /* #endif */
         border-radius: $uploader-image-border-radius;
       }
 

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

@@ -164,7 +164,9 @@
   justify-content: center;
   align-items: center;
   height: 100%;
+  /* #ifndef dynamic*/
   position: initial;
+  /* #endif */
   border-radius: var(--nutui-uploader-image-border-radius, var(--nutui-radius-xs));
 }
 .nut-uploader-preview-img-file {

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

@@ -179,7 +179,9 @@
         justify-content: center;
         align-items: center;
         height: 100%;
+        /* #ifndef dynamic*/
         position: initial;
+        /* #endif */
         border-radius: $uploader-image-border-radius;
       }
 

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

@@ -164,7 +164,9 @@
   justify-content: center;
   align-items: center;
   height: 100%;
+  /* #ifndef dynamic*/
   position: initial;
+  /* #endif */
   border-radius: var(--nutui-uploader-image-border-radius, var(--nutui-radius-xs));
 }
 .nut-uploader-preview-img-file {

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

@@ -179,7 +179,9 @@
         justify-content: center;
         align-items: center;
         height: 100%;
+        /* #ifndef dynamic*/
         position: initial;
+        /* #endif */
         border-radius: $uploader-image-border-radius;
       }
 

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

@@ -106,22 +106,24 @@ var InternalUploader = function(props, ref) {
     var classes = classNames(className, 'nut-uploader');
     useImperativeHandle(ref, function() {
         return {
-            submit: /*#__PURE__*/ _async_to_generator(function() {
-                return _ts_generator(this, function(_state) {
-                    switch(_state.label){
-                        case 0:
-                            return [
-                                4,
-                                uploadAction(uploadQueue)
-                            ];
-                        case 1:
-                            _state.sent();
-                            return [
-                                2
-                            ];
-                    }
-                });
-            }),
+            submit: function() {
+                return _async_to_generator(function() {
+                    return _ts_generator(this, function(_state) {
+                        switch(_state.label){
+                            case 0:
+                                return [
+                                    4,
+                                    uploadAction(uploadQueue)
+                                ];
+                            case 1:
+                                _state.sent();
+                                return [
+                                    2
+                                ];
+                        }
+                    });
+                })();
+            },
             clear: function() {
                 clearUploadQueue();
             }
@@ -168,7 +170,8 @@ var InternalUploader = function(props, ref) {
         if ([
             'WEAPP',
             'JD',
-            'WEB'
+            'WEB',
+            'ASCF'
         ].includes(env) && chooseMedia) {
             chooseMedia({
                 count: multiple ? maxCount * 1 - fileList.length : 1,
@@ -189,8 +192,8 @@ var InternalUploader = function(props, ref) {
             });
         }
     };
-    var uploadAction = /*#__PURE__*/ function() {
-        var _ref = _async_to_generator(function(tasks) {
+    var uploadAction = function(tasks) {
+        return _async_to_generator(function() {
             var taskIds, list;
             return _ts_generator(this, function(_state) {
                 switch(_state.label){
@@ -210,8 +213,8 @@ var InternalUploader = function(props, ref) {
                         setFileList(list);
                         return [
                             4,
-                            Promise.all(tasks.map(/*#__PURE__*/ function() {
-                                var _ref = _async_to_generator(function(currentTask, index) {
+                            Promise.all(tasks.map(function(currentTask, index) {
+                                return _async_to_generator(function() {
                                     var result, list, e, list1;
                                     return _ts_generator(this, function(_state) {
                                         switch(_state.label){
@@ -258,11 +261,8 @@ var InternalUploader = function(props, ref) {
                                                 ];
                                         }
                                     });
-                                });
-                                return function(currentTask, index) {
-                                    return _ref.apply(this, arguments);
-                                };
-                            }())).catch(function(errs) {
+                                })();
+                            })).catch(function(errs) {
                                 return console.error(errs);
                             })
                         ];
@@ -273,14 +273,11 @@ var InternalUploader = function(props, ref) {
                         ];
                 }
             });
-        });
-        return function uploadAction(tasks) {
-            return _ref.apply(this, arguments);
-        };
-    }();
+        })();
+    };
     var idCountRef = useRef(0);
-    var readFile = /*#__PURE__*/ function() {
-        var _ref = _async_to_generator(function(files) {
+    var readFile = function(files) {
+        return _async_to_generator(function() {
             var tasks;
             return _ts_generator(this, function(_state) {
                 switch(_state.label){
@@ -338,11 +335,8 @@ var InternalUploader = function(props, ref) {
                         ];
                 }
             });
-        });
-        return function readFile(files) {
-            return _ref.apply(this, arguments);
-        };
-    }();
+        })();
+    };
     var filterFiles = function(files) {
         var maximum = maxCount * 1;
         var maximize = maxFileSize * 1;
@@ -381,8 +375,8 @@ var InternalUploader = function(props, ref) {
             }
         });
     };
-    var onChangeMedia = /*#__PURE__*/ function() {
-        var _ref = _async_to_generator(function(res) {
+    var onChangeMedia = function(res) {
+        return _async_to_generator(function() {
             var tempFiles, _files;
             return _ts_generator(this, function(_state) {
                 // 返回选定照片的本地文件路径列表，tempFilePath可以作为img标签的src属性显示图片
@@ -401,13 +395,10 @@ var InternalUploader = function(props, ref) {
                     2
                 ];
             });
-        });
-        return function onChangeMedia(res) {
-            return _ref.apply(this, arguments);
-        };
-    }();
-    var onChangeImage = /*#__PURE__*/ function() {
-        var _ref = _async_to_generator(function(res) {
+        })();
+    };
+    var onChangeImage = function(res) {
+        return _async_to_generator(function() {
             var tempFiles, _files;
             return _ts_generator(this, function(_state) {
                 tempFiles = res.tempFiles;
@@ -425,11 +416,8 @@ var InternalUploader = function(props, ref) {
                     2
                 ];
             });
-        });
-        return function onChangeImage(res) {
-            return _ref.apply(this, arguments);
-        };
-    }();
+        })();
+    };
     var handleItemClick = function(file, index) {
         onFileItemClick === null || onFileItemClick === void 0 ? void 0 : onFileItemClick(file, index);
     };

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

@@ -35,7 +35,9 @@
 }
 
 .nut-virtualList-box {
+  /* #ifndef dynamic*/
   overflow: auto;
+  /* #endif */
 }
 
 .nut-virtuallist {

package/dist/es/packages/virtuallist/style/style.harmony.css

@@ -35,7 +35,9 @@
 }
 
 .nut-virtualList-box {
+  /* #ifndef dynamic*/
   overflow: auto;
+  /* #endif */
 }
 
 .nut-virtuallist {

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

@@ -35,7 +35,9 @@
 }
 
 .nut-virtualList-box {
+  /* #ifndef dynamic*/
   overflow: auto;
+  /* #endif */
 }
 
 .nut-virtuallist {

package/dist/es/packages/virtuallist/style-jmapp/style.css

@@ -35,7 +35,9 @@
 }
 
 .nut-virtualList-box {
+  /* #ifndef dynamic*/
   overflow: auto;
+  /* #endif */
 }
 
 .nut-virtuallist {

package/dist/es/packages/virtuallist/style-jmapp/virtuallist.scss

@@ -35,7 +35,9 @@
 }
 
 .nut-virtualList-box {
+  /* #ifndef dynamic*/
   overflow: auto;
+  /* #endif */
 }
 
 .nut-virtuallist {

package/dist/es/packages/virtuallist/style-jrkf/style.css

@@ -35,7 +35,9 @@
 }
 
 .nut-virtualList-box {
+  /* #ifndef dynamic*/
   overflow: auto;
+  /* #endif */
 }
 
 .nut-virtuallist {

package/dist/es/packages/virtuallist/style-jrkf/virtuallist.scss

@@ -35,7 +35,9 @@
 }
 
 .nut-virtualList-box {
+  /* #ifndef dynamic*/
   overflow: auto;
+  /* #endif */
 }
 
 .nut-virtuallist {

package/dist/es/packages/watermark/watermark.js

@@ -79,20 +79,16 @@ export var WaterMark = function(props) {
                         setBase64Url(canvas.toDataURL());
                     };
                 } else if (content) {
-                    ctx.textBaseline = 'middle' // 设置或返回在绘制文本时使用的当前文本基线。(正中)
-                    ;
-                    ctx.textAlign = 'center' // 设置或返回文本内容的当前对齐方式。
-                    ;
+                    ctx.textBaseline = 'middle'; // 设置或返回在绘制文本时使用的当前文本基线。(正中)
+                    ctx.textAlign = 'center'; // 设置或返回文本内容的当前对齐方式。
                     // 文字绕中间旋转
                     ctx.translate(markWidth / 2, markHeight / 2);
                     ctx.rotate(Math.PI / 180 * Number(rotate));
                     var markSize = Number(fontSize) * ratio;
                     ctx.font = "".concat(fontStyle, " normal ").concat(fontWeight, " ").concat(markSize, "px/").concat(markHeight, "px ").concat(fontFamily);
                     ctx.fillStyle = color;
-                    ctx.fillText(content, startX, startY) // 在画布上绘制"被填充的"文本。
-                    ;
-                    ctx.restore() // 返回之前保存过的路径状态和属性。
-                    ;
+                    ctx.fillText(content, startX, startY); // 在画布上绘制"被填充的"文本。
+                    ctx.restore(); // 返回之前保存过的路径状态和属性。
                     setBase64Url(canvas.toDataURL());
                 }
             } else {

package/dist/es/types/spec/address/base.js

@@ -1 +1 @@
-import React from "react";
+export { };

package/dist/es/types/spec/avatar/taro.d.ts

@@ -1,7 +1,13 @@
-import { ITouchEvent } from '@tarojs/components';
+import { ITouchEvent, ImageProps } from '@tarojs/components';
 import { BaseAvatar, BaseAvatarGroup } from './base';
 export interface TaroAvatarProps extends Omit<BaseAvatar, 'onClick'> {
     avatarIndex: number;
+    /** 图片裁剪、缩放的模式，同 Taro Image 的 mode 属性 */
+    mode: keyof ImageProps.Mode;
+    /**
+     * @deprecated 请使用 mode 属性代替
+     */
+    fit: BaseAvatar['fit'];
     onClick: (e: ITouchEvent) => void;
 }
 export interface TaroAvatarGroupProps extends BaseAvatarGroup {

package/dist/es/types/spec/dialog/base.d.ts

@@ -38,6 +38,8 @@ export interface BaseDialog extends DialogWrapProps {
     * 取消按钮文案
     */
     cancelText: ReactNode
+    confirmBadge: ReactNode;
+    cancelBadge: ReactNode;
     /**
     * 是否隐藏确定按钮
     */
@@ -70,6 +72,7 @@ export interface BaseDialog extends DialogWrapProps {
     * 确定按钮回调
     */
     onConfirm: (e?: MouseEvent<HTMLButtonElement>) => PromiseLike<any> | void
+    ariaLabel?: string;
 }
 export type DialogReturnProps = {
     update: (newConfig: Partial<BaseDialog>) => void;

package/dist/es/types/spec/dialog/h5.d.ts

@@ -1,6 +1,8 @@
 import { BaseDialog, BaseContentProps } from './base';
 export interface WebContentProps extends BaseContentProps {
     onClick: (event: MouseEvent) => void;
+    ariaRole?: string;
+    ariaLabel?: string;
 }
 export interface WebDialogProps extends BaseDialog {
 }

package/dist/es/types/spec/dialog/taro.d.ts

@@ -2,6 +2,8 @@ import { ITouchEvent } from '@tarojs/components';
 import { BaseDialog, BaseContentProps } from './base';
 export interface TaroContentProps extends BaseContentProps {
     onClick: (event: ITouchEvent) => void;
+    ariaRole?: string;
+    ariaLabel?: string;
 }
 export interface TaroDialogProps extends Omit<BaseDialog, 'onOverlayClick' | 'onClick'> {
     onClick: (event: ITouchEvent) => void;

package/dist/es/types/spec/overlay/base.d.ts

@@ -32,4 +32,5 @@ export interface BaseOverlay extends BaseProps {
     * 点击时触发
     */
     onClick: (event: any) => void
+    ariaLabel?: string;
 }

package/dist/es/types/spec/popup/base.d.ts

@@ -34,6 +34,10 @@ export interface BasePopup extends BaseProps, BaseOverlay {
     */
     title?: ReactNode
     /**
+    * 頂部佔位
+    */
+    top?: ReactNode
+    /**
     * 子标题/描述部分
     */
     description?: ReactNode
@@ -50,6 +54,14 @@ export interface BasePopup extends BaseProps, BaseOverlay {
     */
     round: boolean
     /**
+    * 上下滑动调整高度，当前只支持从底部弹出
+    */
+    resizable: boolean
+    /**
+    * 设置最小高度
+    */
+    minHeight: string
+    /**
     * 打开弹框时触发
     */
     onOpen: () => void
@@ -65,4 +77,17 @@ export interface BasePopup extends BaseProps, BaseOverlay {
     * 点击关闭图标时触发
     */
     onCloseIconClick: (e: any) => boolean | void
+    /**
+    * 滑动时触发
+    */
+    onTouchMove: (height: number, e: any, direction: 'up' | 'down') => void
+    /**
+    * 开始触碰时触发
+    */
+    onTouchStart: (height: number, e: any) => void
+    /**
+    * 结束触碰时触发
+    */
+    onTouchEnd: (height: number, e: any) => void
+    closeAriaLabel?: string;
 }