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

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

@@ -3,11 +3,11 @@
   flex-direction: column;
   position: relative;
   box-sizing: border-box;
-  color: var(--nutui-grid-item-text-color, var(--nutui-gray-7, #1a1a1a));
+  color: var(--nutui-grid-item-text-color, var(--nutui-color-title, #1a1a1a));
 }
 .nut-grid-item-text {
-  color: var(--nutui-grid-item-text-color, var(--nutui-gray-7, #1a1a1a));
-  font-size: var(--nutui-grid-item-text-font-size, var(--nutui-font-size-2, 12px));
+  color: var(--nutui-grid-item-text-color, var(--nutui-color-title, #1a1a1a));
+  font-size: var(--nutui-grid-item-text-font-size, var(--nutui-font-size-s, 12px));
   word-break: break-all;
   margin: var(--nutui-grid-item-text-margin, 8px) 0 0 0;
 }
@@ -28,7 +28,7 @@
   width: 100%;
   padding: var(--nutui-grid-item-content-padding, 16px 8px);
   background: var(--nutui-grid-item-content-bg-color, #ffffff);
-  border: 0 solid var(--nutui-grid-border-color, var(--nutui-black-3, rgba(0, 0, 0, 0.06)));
+  border: 0 solid var(--nutui-grid-border-color, var(--nutui-color-border, rgba(0, 0, 0, 0.06)));
 }
 .nut-grid-item-content-border {
   border-right-width: 1px;
@@ -63,9 +63,9 @@
   left: 50%;
   width: 100%;
   height: 100%;
-  background-color: var(--nutui-black-10, rgba(0, 0, 0, 0.7));
+  background-color: var(--nutui-color-mask, rgba(0, 0, 0, 0.7));
   border: inherit;
-  border-color: var(--nutui-black-10, rgba(0, 0, 0, 0.7));
+  border-color: var(--nutui-color-mask, rgba(0, 0, 0, 0.7));
   border-radius: inherit;
   transform: translate(-50%, -50%);
   opacity: 0;

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

@@ -1,4 +1,8 @@
 .nut-hoverbutton {
+  display: flex;
+  flex-direction: column;
+  gap: $hoverbutton-spacing;
+
   &-container {
     position: fixed;
     right: $hoverbutton-position-right;
@@ -9,10 +13,6 @@
   &-container-rn {
     position: absolute;
   }
-
-  display: flex;
-  flex-direction: column;
-  gap: $hoverbutton-spacing;
 }
 
 [dir='rtl'] .nut-hoverbutton-container,

package/dist/es/packages/image/image.js

@@ -38,7 +38,6 @@ export var Image = function(props) {
         setInnerLoading(false);
         onLoad && onLoad(e);
     };
-    // 图片加载失败
     var handleError = function(e) {
         if (src) {
             setIsError(true);

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

@@ -21,7 +21,7 @@
   flex-direction: column;
   align-items: center;
   justify-content: center;
-  background: var(--nutui-gray-3, #f5f6fa);
+  background: var(--nutui-color-background, #f5f6fa);
   background-size: 100% 100%;
 }
 .nut-image-error {
@@ -34,7 +34,7 @@
   flex-direction: column;
   align-items: center;
   justify-content: center;
-  background: var(--nutui-gray-3, #f5f6fa);
+  background: var(--nutui-color-background, #f5f6fa);
   background-size: 100% 100%;
 }
 

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

@@ -1,28 +1,32 @@
 import { FunctionComponent, ReactNode } from 'react';
 import { BasicComponent } from "../../utils/typings";
 export type ImagePreviewCloseIconPosition = 'top-right' | 'top-left' | 'bottom';
+export interface ImageOption {
+    src: string;
+    index?: number;
+}
+export interface VideoOption {
+    source: {
+        src: string;
+        type: string;
+    };
+    options: {
+        muted: boolean;
+        controls: boolean;
+    };
+    index?: number;
+}
 export interface ImagePreviewProps extends BasicComponent {
     /**
     * 预览图片数组
     * @default []
     */
-    images: Array<{
-        src: string;
-    }>
+    images: Array<ImageOption>
     /**
     * 预览的视频数组（视频自动放到图片之前）
     * @default []
     */
-    videos: Array<{
-        source: {
-            src: string;
-            type: string;
-        };
-        options: {
-            muted: boolean;
-            controls: boolean;
-        };
-    }>
+    videos: Array<VideoOption>
     /**
     * 是否展示预览图片
     * @default false

package/dist/es/packages/imagepreview/imagepreview.js

@@ -3,11 +3,10 @@ import { _ as _object_spread_props } from "@swc/helpers/_/_object_spread_props";
 import { _ as _sliced_to_array } from "@swc/helpers/_/_sliced_to_array";
 import React, { useEffect, useState, useRef } from "react";
 import Taro from "@tarojs/taro";
-import { Video as TaroVideo } from "@tarojs/components";
+import { Video as TaroVideo, Image, View } from "@tarojs/components";
 import classNames from "classnames";
 import { Close } from "@nutui/icons-react-taro";
 import Popup from "../popup/index";
-import Image from "../image/index";
 import Swiper from "../swiper/index";
 import SwiperItem from "../swiperitem/index";
 import { ComponentDefaults } from "../../utils/typings";
@@ -149,6 +148,7 @@ export var ImagePreview = function(props) {
     ]);
     var scaleNow = function() {
         if (ref.current) {
+            ;
             ref.current.style.transform = "scale(".concat(store.scale, ")");
         }
     };
@@ -186,11 +186,10 @@ export var ImagePreview = function(props) {
             width: '100%'
         },
         onClick: onCloseInner
-    }, /*#__PURE__*/ React.createElement("div", {
+    }, /*#__PURE__*/ React.createElement(View, {
         className: classNames(classPrefix, className),
         style: style,
         ref: ref,
-        onClick: closeOnImg,
         onTouchStart: onTouchStart
     }, /*#__PURE__*/ React.createElement(Swiper, {
         autoPlay: autoPlay,
@@ -209,32 +208,55 @@ export var ImagePreview = function(props) {
         },
         defaultValue: innerNo && (innerNo > maxNo ? maxNo - 1 : innerNo - 1),
         indicator: indicator
-    }, (videos && videos.length > 0 ? videos.map(function(item, index) {
-        return /*#__PURE__*/ React.createElement(SwiperItem, {
-            key: index,
-            className: "nut-imagepreview-swiper-item"
-        }, /*#__PURE__*/ React.createElement(TaroVideo, {
-            src: item.source.src,
-            controls: item.options.controls,
-            autoplay: false,
-            loop: false,
-            muted: item.options.muted
-        }));
-    }) : []).concat(images && images.length > 0 ? images.map(function(item, index) {
-        return /*#__PURE__*/ React.createElement(SwiperItem, {
-            key: index,
-            className: "nut-imagepreview-swiper-item"
-        }, Taro.getEnv() === 'WEB' ? /*#__PURE__*/ React.createElement(Image, {
-            src: item.src,
-            mode: "aspectFit"
-        }) : /*#__PURE__*/ React.createElement(Image, {
-            src: item.src,
-            mode: "aspectFit",
-            showMenuByLongpress: !!showMenuByLongpress
-        }));
-    }) : []))), pagination ? /*#__PURE__*/ React.createElement("div", {
+    }, (videos !== null && videos !== void 0 ? videos : []).map(function(item) {
+        return {
+            type: 'video',
+            data: item
+        };
+    }).concat((images !== null && images !== void 0 ? images : []).map(function(item) {
+        return {
+            type: 'image',
+            data: item
+        };
+    })).sort(function(a, b) {
+        var _a_data, _b_data;
+        var _a_data_index, _b_data_index;
+        return ((_a_data_index = (_a_data = a.data) === null || _a_data === void 0 ? void 0 : _a_data.index) !== null && _a_data_index !== void 0 ? _a_data_index : 0) - ((_b_data_index = (_b_data = b.data) === null || _b_data === void 0 ? void 0 : _b_data.index) !== null && _b_data_index !== void 0 ? _b_data_index : 0);
+    }).map(function(item, index) {
+        if (item.type === 'video') {
+            var _item_data = item.data, source = _item_data.source, options = _item_data.options;
+            return /*#__PURE__*/ React.createElement(SwiperItem, {
+                key: index,
+                className: "nut-imagepreview-swiper-item"
+            }, /*#__PURE__*/ React.createElement(TaroVideo, {
+                src: source.src,
+                onClick: closeOnImg,
+                controls: options.controls,
+                autoplay: false,
+                loop: false,
+                muted: options.muted
+            }));
+        }
+        if (item.type === 'image') {
+            var src = item.data.src;
+            return /*#__PURE__*/ React.createElement(SwiperItem, {
+                key: index,
+                className: "nut-imagepreview-swiper-item"
+            }, "(", /*#__PURE__*/ React.createElement(Image, _object_spread({
+                src: src,
+                mode: "widthFix",
+                onClick: closeOnImg,
+                style: {
+                    width: '100%'
+                }
+            }, Taro.getEnv() !== 'WEB' && {
+                showMenuByLongpress: showMenuByLongpress
+            })), ")");
+        }
+        return null;
+    }))), pagination ? /*#__PURE__*/ React.createElement(View, {
         className: "".concat(classPrefix, "-index")
-    }, active, "/", (images ? images.length : 0) + (videos ? videos.length : 0)) : null, closeIcon !== false ? /*#__PURE__*/ React.createElement("div", {
+    }, active, "/", (images ? images.length : 0) + (videos ? videos.length : 0)) : null, closeIcon !== false ? /*#__PURE__*/ React.createElement(View, {
         className: "".concat(classPrefix, "-close ").concat(closeIconPosition),
         onClick: onCloseInner
     }, closeIcon === true ? /*#__PURE__*/ React.createElement(Close, null) : closeIcon) : null);

package/dist/es/packages/imagepreview/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 {
@@ -376,7 +423,7 @@
   width: var(--nutui-indicator-dot-size, 4px);
   height: var(--nutui-indicator-dot-size, 4px);
   border-radius: 50%;
-  background-color: var(--nutui-indicator-dot-color, var(--nutui-black-3, rgba(0, 0, 0, 0.06)));
+  background-color: var(--nutui-indicator-dot-color, var(--nutui-color-border, rgba(0, 0, 0, 0.06)));
   margin: 0 var(--nutui-indicator-dot-margin, 2px);
 }
 .nut-indicator-dot:first-child {
@@ -534,7 +581,7 @@
   flex-direction: column;
   align-items: center;
   justify-content: center;
-  background: var(--nutui-gray-3, #f5f6fa);
+  background: var(--nutui-color-background, #f5f6fa);
   background-size: 100% 100%;
 }
 .nut-image-error {
@@ -547,7 +594,7 @@
   flex-direction: column;
   align-items: center;
   justify-content: center;
-  background: var(--nutui-gray-3, #f5f6fa);
+  background: var(--nutui-color-background, #f5f6fa);
   background-size: 100% 100%;
 }
 

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

@@ -12,7 +12,7 @@
   width: var(--nutui-indicator-dot-size, 4px);
   height: var(--nutui-indicator-dot-size, 4px);
   border-radius: 50%;
-  background-color: var(--nutui-indicator-dot-color, var(--nutui-black-3, rgba(0, 0, 0, 0.06)));
+  background-color: var(--nutui-indicator-dot-color, var(--nutui-color-border, rgba(0, 0, 0, 0.06)));
   margin: 0 var(--nutui-indicator-dot-margin, 2px);
 }
 .nut-indicator-dot:first-child {

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

@@ -1,61 +1,18 @@
 import React, { FunctionComponent, ReactNode } from 'react';
+import { ScrollViewProps } from '@tarojs/components';
 import { BasicComponent } from "../../utils/typings";
 import { InfiniteLoadingType } from './types';
-export interface InfiniteLoadingProps extends BasicComponent {
-    /**
-    * 主题类型
-    * @default default
-    */
-    type: InfiniteLoadingType
-    /**
-    * 是否还有更多数据
-    * @default true
-    */
-    hasMore: boolean
-    /**
-    * 距离底部多远加载
-    * @default 200
-    */
-    threshold: number
-    /**
-    * 获取监听的目标元素
-    * @default -
-    */
-    target: string
-    /**
-    * 是否开启下拉刷新
-    * @default false
-    */
-    pullRefresh: boolean
-    /**
-    * 下拉刷新提示文案
-    * @default 松手刷新
-    */
-    pullingText: ReactNode
-    /**
-    * 上拉加载提示文案
-    * @default 刷新中
-    */
-    loadingText: ReactNode
-    /**
-    * “没有更多数据”展示文案
-    * @default 哎呀，这里是底部了啦
-    */
-    loadMoreText: ReactNode
-    /**
-    * 下拉刷新事件回调
-    * @default -
-    */
-    onRefresh: () => Promise<void>
-    /**
-    * 继续加载的回调函数
-    * @default -
-    */
-    onLoadMore: () => Promise<void>
-    /**
-    * 实时监听滚动高度
-    * @default -
-    */
-    onScroll: (param: number) => void
+export interface InfiniteLoadingProps extends BasicComponent, Omit<ScrollViewProps, 'style' | 'type' | 'onScroll'> {
+    type: InfiniteLoadingType;
+    hasMore: boolean;
+    threshold: number;
+    target: string;
+    pullRefresh: boolean;
+    pullingText: ReactNode;
+    loadingText: ReactNode;
+    loadMoreText: ReactNode;
+    onRefresh: () => Promise<void>;
+    onLoadMore: () => Promise<void>;
+    onScroll: (param: number) => void;
 }
 export declare const InfiniteLoading: FunctionComponent<Partial<InfiniteLoadingProps> & Omit<React.HTMLAttributes<HTMLDivElement>, 'onScroll'>>;