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

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

@@ -1,92 +1,36 @@
 import { FunctionComponent, ReactNode } from 'react';
 import { BasicComponent } from "../../utils/typings";
 export type ImagePreviewCloseIconPosition = 'top-right' | 'top-left' | 'bottom';
-export interface ImagePreviewProps extends BasicComponent {
-    /**
-    * 预览图片数组
-    * @default []
-    */
-    images: Array<{
+export interface ImageOption {
+    src: string;
+    index?: number;
+}
+export interface VideoOption {
+    source: {
         src: string;
-    }>
-    /**
-    * 预览的视频数组（视频自动放到图片之前）
-    * @default []
-    */
-    videos: Array<{
-        source: {
-            src: string;
-            type: string;
-        };
-        options: {
-            muted: boolean;
-            controls: boolean;
-        };
-    }>
-    /**
-    * 是否展示预览图片
-    * @default false
-    */
-    visible: boolean
-    /**
-    * 自动轮播时长，0表示不会自动轮播
-    * @default 3000
-    */
-    autoPlay: boolean
-    /**
-    * 页码，受控
-    * @default 1
-    */
-    value?: number
-    /**
-    * 初始页码
-    * @default 1
-    */
-    defaultValue: number
-    /**
-    * 点击图片可以退出预览
-    * @default false
-    */
-    closeOnContentClick: boolean
-    /**
-    * 分页是否展示
-    * @default true
-    */
-    pagination: boolean
-    /**
-    * 分页指示器是否展示
-    * @default false
-    */
-    indicator: boolean
-    /**
-    * 分页指示器选中的颜色
-    * @default #fff
-    */
-    indicatorColor: string
-    /**
-    * 关闭按钮
-    * @default false
-    */
-    closeIcon: boolean | ReactNode
-    /**
-    * 关闭按钮位置
-    * @default top-right
-    */
-    closeIconPosition: ImagePreviewCloseIconPosition
-    /**
-    * 开启长按图片显示识别小程序码菜单
-    * @default false
-    */
-    showMenuByLongpress: boolean
-    /**
-    * 切换时触发
-    * @default -
-    */
-    onChange: (value: number) => void
-    /**
-    * 点击遮罩关闭图片预览时触发
-    * @default -
-    */
-    onClose: () => void
+        type: string;
+    };
+    options: {
+        muted: boolean;
+        controls: boolean;
+    };
+    index?: number;
+}
+export interface ImagePreviewProps extends BasicComponent {
+    images: Array<ImageOption>;
+    videos: Array<VideoOption>;
+    visible: boolean;
+    autoPlay: boolean;
+    value?: number;
+    defaultValue: number;
+    closeOnContentClick: boolean;
+    pagination: boolean;
+    indicator: boolean;
+    indicatorColor: string;
+    closeIcon: boolean | ReactNode;
+    closeIconPosition: ImagePreviewCloseIconPosition;
+    showMenuByLongpress: boolean;
+    onChange: (value: number) => void;
+    onClose: () => void;
 }
 export declare const ImagePreview: FunctionComponent<Partial<ImagePreviewProps>>;

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

@@ -3,7 +3,7 @@ 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, View } from "@tarojs/components";
 import classNames from "classnames";
 import { Close } from "@nutui/icons-react-taro";
 import Popup from "../popup/index";
@@ -149,6 +149,7 @@ export var ImagePreview = function(props) {
     ]);
     var scaleNow = function() {
         if (ref.current) {
+            ;
             ref.current.style.transform = "scale(".concat(store.scale, ")");
         }
     };
@@ -186,11 +187,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 +209,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/imagepreview.scss

@@ -34,6 +34,10 @@
     background: transparent;
     color: $white;
 
+    .nut-icon {
+      color: $white;
+    }
+
     &.top-right {
       top: 50px;
       right: 20px;
@@ -68,6 +72,13 @@
       justify-content: center;
       height: 100%;
 
+      .nut-image,
+      .nut-video {
+        display: flex;
+        justify-content: center;
+        align-items: center;
+      }
+
       .nut-image-preview-box {
         width: 100%;
       }

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

@@ -1,4 +1,8 @@
 @charset "UTF-8";
+/* #ifdef harmony */
+/* #endif */
+/* #ifndef harmony */
+/* #endif */
 .nut-overlay {
   /* #ifdef rn */
   position: absolute;
@@ -12,22 +16,13 @@
   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-black-10));
   z-index: var(--nutui-overlay-zIndex, 1000);
 }
 
-[dir=rtl] .nut-overlay,
-.nut-rtl .nut-overlay {
-  left: auto;
-  right: 0;
-}
-
 .nut-overflow-hidden {
   overflow: hidden !important;
 }
-.nut-overflow-hidden .taro_page {
-  overflow: hidden !important;
-}
 
 @keyframes nut-fade-in {
   0% {
@@ -62,49 +57,63 @@
   animation-duration: var(--nutui-overlay-animation-duration, 0.3s);
 }
 
+[dir=rtl] .nut-overlay,
+.nut-rtl .nut-overlay {
+  left: auto;
+  right: 0;
+}
+
 .nut-popup {
   position: fixed;
-  min-height: 26%;
+  min-height: 46%;
   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-gray-1));
   -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);
   padding: var(--nutui-popup-title-padding, 16px);
   position: relative;
 }
-.nut-popup-title-left {
-  position: absolute;
-  left: var(--nutui-popup-title-padding, 16px);
+.nut-popup-title-wrapper {
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
 }
 .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));
+  color: var(--nutui-gray-7);
+  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-5, #888b94);
-  font-size: var(--nutui-popup-description-font-size, var(--nutui-font-size-1, 10px));
+  color: var(--nutui-gray-6);
+  font-size: var(--nutui-popup-description-font-size, var(--nutui-font-size-base, 14px));
   font-weight: var(--nutui-font-weight, 400);
 }
+.nut-popup-title-description-gap {
+  margin-top: var(--nutui-popup-description-spacing, var(--nutui-spacing-base, 8px));
+}
+.nut-popup-title-left {
+  position: absolute;
+  top: var(--nutui-popup-title-padding, 16px);
+  left: var(--nutui-popup-title-padding, 16px);
+}
 .nut-popup-title-right {
-  position: absolute !important;
-  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));
-  display: flex;
-  justify-content: center;
-  align-items: center;
+  position: absolute;
   top: var(--nutui-popup-title-padding, 16px);
   right: var(--nutui-popup-title-padding, 16px);
-  color: var(--nutui-gray-5, #888b94);
+  z-index: 1;
+  width: var(--nutui-popup-icon-size, 20px);
+  height: var(--nutui-popup-icon-size, 20px);
+  color: var(--nutui-gray-7);
+  cursor: pointer;
 }
 .nut-popup-title-right:active {
   opacity: 0.7;
@@ -125,13 +134,14 @@
   top: 50%;
   left: 50%;
   min-height: 10%;
+  max-width: 295px;
   transform: translate(-50%, -50%);
 }
 .nut-popup-center.nut-popup-round {
-  border-radius: var(--nutui-popup-border-radius, 24px);
+  border-radius: var(--nutui-popup-border-radius, var(--nutui-radius-xl, 12px));
 }
 .nut-popup-bottom, .nut-popup-top {
-  max-height: 83%;
+  max-height: 87%;
 }
 .nut-popup-bottom {
   bottom: 0;
@@ -139,21 +149,25 @@
   width: 100%;
 }
 .nut-popup-bottom.nut-popup-round {
-  border-radius: var(--nutui-popup-border-radius, 24px) var(--nutui-popup-border-radius, 24px) 0 0;
+  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-right {
   top: 0;
   right: 0;
+  width: 100px;
+  height: 100%;
 }
 .nut-popup-right.nut-popup-round {
-  border-radius: var(--nutui-popup-border-radius, 24px) 0 0 var(--nutui-popup-border-radius, 24px);
+  border-radius: var(--nutui-popup-border-radius, var(--nutui-radius-xl, 12px)) 0 0 var(--nutui-popup-border-radius, var(--nutui-radius-xl, 12px));
 }
 .nut-popup-left {
   top: 0;
   left: 0;
+  width: 100px;
+  height: 100%;
 }
 .nut-popup-left.nut-popup-round {
-  border-radius: 0 var(--nutui-popup-border-radius, 24px) var(--nutui-popup-border-radius, 24px) 0;
+  border-radius: 0 var(--nutui-popup-border-radius, var(--nutui-radius-xl, 12px)) var(--nutui-popup-border-radius, var(--nutui-radius-xl, 12px)) 0;
 }
 .nut-popup-top {
   top: 0;
@@ -161,7 +175,7 @@
   width: 100%;
 }
 .nut-popup-top.nut-popup-round {
-  border-radius: 0 0 var(--nutui-popup-border-radius, 24px) var(--nutui-popup-border-radius, 24px);
+  border-radius: 0 0 var(--nutui-popup-border-radius, var(--nutui-radius-xl, 12px)) var(--nutui-popup-border-radius, var(--nutui-radius-xl, 12px));
 }
 .nut-popup-slide {
   /* 从顶部滑出 */
@@ -313,7 +327,7 @@
   display: none;
 }
 .nut-popup .nut-overflow-hidden {
-  overflow: hidden !important;
+  overflow: hidden;
 }
 
 [dir=rtl] .nut-popup-title-left,
@@ -364,60 +378,137 @@
 
 .nut-indicator {
   display: flex;
-  flex-direction: row;
   width: auto;
+  flex-direction: row;
   flex-wrap: nowrap;
   align-items: center;
-  justify-content: center;
 }
-.nut-indicator-dot {
+.nut-indicator-fixed-width {
+  width: 21px;
+}
+.nut-indicator-dot, .nut-indicator-line {
   display: inline-block;
   vertical-align: middle;
-  width: var(--nutui-indicator-dot-size, 4px);
-  height: var(--nutui-indicator-dot-size, 4px);
+  width: var(--nutui-indicator-dot-size, 3px);
+  height: var(--nutui-indicator-dot-size, 3px);
   border-radius: 50%;
-  background-color: var(--nutui-indicator-dot-color, var(--nutui-black-3, rgba(0, 0, 0, 0.06)));
-  margin: 0 var(--nutui-indicator-dot-margin, 2px);
+  background-color: var(--nutui-gray-4);
+  margin: 0 var(--nutui-indicator-dot-margin, var(--nutui-spacing-xxxs, 2px));
+  opacity: 0.4;
 }
-.nut-indicator-dot:first-child {
+.nut-indicator-dot:first-child, .nut-indicator-line:first-child {
   margin-left: 0px;
 }
-.nut-indicator-dot:last-child {
+.nut-indicator-dot:last-child, .nut-indicator-line:last-child {
   margin-right: 0px;
 }
-.nut-indicator-active {
-  width: var(--nutui-indicator-dot-active-size, 8px);
-  border-radius: var(--nutui-indicator-border-radius, 2px);
-  background: var(--nutui-indicator-color, var(--nutui-color-primary, #ff0f23));
+.nut-indicator-dot-active, .nut-indicator-line-active {
+  width: var(--nutui-indicator-dot-active-size, 6px);
+  border-radius: var(--nutui-indicator-border-radius, var(--nutui-radius-xxs, 2px));
+  background: var(--nutui-indicator-color, var(--nutui-brand-6));
+  opacity: 1;
+}
+.nut-indicator-fixed-width .nut-indicator-dot {
+  width: 12px;
+  border-radius: var(--nutui-indicator-border-radius, var(--nutui-radius-xxs, 2px));
+}
+.nut-indicator-fixed-width .nut-indicator-dot-active {
+  width: 6px;
+}
+.nut-indicator-vertical.nut-indicator-fixed-width {
+  justify-content: flex-start;
+  height: 21px;
+  width: auto;
+}
+.nut-indicator-vertical.nut-indicator-fixed-width .nut-indicator-dot {
+  width: 3px;
+  height: 12px;
+  border-radius: var(--nutui-indicator-border-radius, var(--nutui-radius-xxs, 2px));
+}
+.nut-indicator-vertical.nut-indicator-fixed-width .nut-indicator-dot-active {
+  height: 6px;
+}
+.nut-indicator-line {
+  width: var(--nutui-indicator-dot-active-size, 6px);
+  margin: 0;
+  border-radius: var(--nutui-indicator-border-radius, var(--nutui-radius-xxs, 2px));
+  background-color: transparent;
+}
+.nut-indicator-line-active {
+  transition: transform 0.3s ease-in-out;
+  background: var(--nutui-indicator-color, var(--nutui-brand-6));
+}
+
+.nut-indicator-track {
+  position: relative;
+}
+.nut-indicator-track:after {
+  display: block;
+  content: " ";
+  position: absolute;
+  width: 100%;
+  height: 100%;
+  box-sizing: border-box;
+  border-radius: var(--nutui-indicator-border-radius, var(--nutui-radius-xxs, 2px));
+  background-color: var(--nutui-gray-4);
+  opacity: 0.4;
+}
+
+.nut-indicator-white .nut-indicator-dot, .nut-indicator-white .nut-indicator-line {
+  position: relative;
+  box-sizing: content-box;
+  background: rgba(255, 255, 255, 0.4);
+  border: 1px solid rgba(0, 0, 0, 0.06);
+  opacity: 1;
+}
+.nut-indicator-white .nut-indicator-line {
+  opacity: 0;
+}
+.nut-indicator-white .nut-indicator-line-active {
+  opacity: 1;
+  background: rgb(255, 255, 255);
 }
+.nut-indicator-white .nut-indicator-dot-active {
+  background: rgb(255, 255, 255);
+}
+
+.nut-indicator-track.nut-indicator-white:after {
+  border: 1px solid rgba(0, 0, 0, 0.06);
+  background: rgba(255, 255, 255, 0.4);
+}
+
 .nut-indicator-vertical {
   display: flex;
   flex-direction: column;
   align-items: center;
   justify-content: center;
 }
-.nut-indicator-vertical-dot {
-  margin: var(--nutui-indicator-dot-margin, 2px) 0;
+.nut-indicator-vertical .nut-indicator-dot {
+  margin: var(--nutui-indicator-dot-margin, var(--nutui-spacing-xxxs, 2px)) 0;
 }
-.nut-indicator-vertical-dot:first-child {
+.nut-indicator-vertical .nut-indicator-dot:first-child {
   margin-top: 0px;
 }
-.nut-indicator-vertical-dot:last-child {
+.nut-indicator-vertical .nut-indicator-dot:last-child {
   margin-bottom: 0px;
 }
-.nut-indicator-vertical-active {
-  width: var(--nutui-indicator-dot-size, 4px);
-  height: var(--nutui-indicator-dot-active-size, 8px);
+.nut-indicator-vertical .nut-indicator-dot-active {
+  width: var(--nutui-indicator-dot-size, 3px);
+  height: var(--nutui-indicator-dot-active-size, 6px);
+}
+.nut-indicator-vertical.nut-indicator-track .nut-indicator-line {
+  width: var(--nutui-indicator-dot-size, 3px);
+  height: var(--nutui-indicator-dot-active-size, 6px);
 }
 
 [dir=rtl] .nut-indicator-dot:first-child,
 .nut-rtl .nut-indicator-dot:first-child {
-  margin-left: var(--nutui-indicator-dot-margin, 2px);
+  margin-left: var(--nutui-indicator-dot-margin, var(--nutui-spacing-xxxs, 2px));
   margin-right: 0px;
 }
 [dir=rtl] .nut-indicator-dot:last-child,
 .nut-rtl .nut-indicator-dot:last-child {
-  margin-right: var(--nutui-indicator-dot-margin, 2px);
+  margin-right: var(--nutui-indicator-dot-margin, var(--nutui-spacing-xxxs, 2px));
   margin-left: 0px;
 }
 
@@ -534,7 +625,7 @@
   flex-direction: column;
   align-items: center;
   justify-content: center;
-  background: var(--nutui-gray-3, #f5f6fa);
+  background: var(--nutui-gray-3);
   background-size: 100% 100%;
 }
 .nut-image-error {
@@ -547,7 +638,7 @@
   flex-direction: column;
   align-items: center;
   justify-content: center;
-  background: var(--nutui-gray-3, #f5f6fa);
+  background: var(--nutui-gray-3);
   background-size: 100% 100%;
 }
 
@@ -595,6 +686,9 @@
   background: transparent;
   color: #ffffff;
 }
+.nut-imagepreview-close .nut-icon {
+  color: #ffffff;
+}
 .nut-imagepreview-close.top-right {
   top: 50px;
   right: 20px;
@@ -623,6 +717,14 @@
   justify-content: center;
   height: 100%;
 }
+.nut-imagepreview-swiper .nut-imagepreview-swiper-item .nut-image,
+.nut-imagepreview-swiper .nut-imagepreview-swiper-item .nut-video,
+.nut-imagepreview-swiper .nut-swiper-item .nut-image,
+.nut-imagepreview-swiper .nut-swiper-item .nut-video {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
 .nut-imagepreview-swiper .nut-imagepreview-swiper-item .nut-image-preview-box,
 .nut-imagepreview-swiper .nut-swiper-item .nut-image-preview-box {
   width: 100%;

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

@@ -1,7 +1,12 @@
-import React, { FunctionComponent } from 'react';
+import { FunctionComponent } from 'react';
+import { ViewProps } from '@tarojs/components';
+export type IndicatorType = 'anchor' | 'slide';
+export type IndicatorColor = 'primary' | 'white';
 export interface IndicatorProps {
     total: number;
     current: number;
     direction: string;
+    color: IndicatorColor;
+    type: IndicatorType;
 }
-export declare const Indicator: FunctionComponent<Partial<IndicatorProps> & React.HTMLAttributes<HTMLDivElement>>;
+export declare const Indicator: FunctionComponent<Partial<IndicatorProps> & ViewProps>;