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

package/dist/cjs/packages/griditem/style/griditem.scss

@@ -4,6 +4,7 @@
   position: relative;
   box-sizing: border-box;
   color: $grid-item-text-color;
+  overflow: hidden;
 
   &-text {
     color: $grid-item-text-color;
@@ -35,13 +36,14 @@
     border: 0 solid $grid-border-color;
 
     &-border {
-      border-right-width: 1px;
-      border-bottom-width: 1px;
+      border-right-width: $grid-border-width;
+      border-bottom-width: $grid-border-width;
     }
 
     &-surround {
-      border-top-width: 1px;
-      border-left-width: 1px;
+      border-top-width: $grid-border-width;
+      border-left-width: $grid-border-width;
+      border-radius: $grid-item-border-radius;
     }
 
     &-center {

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

@@ -1,13 +1,18 @@
+/* #ifdef harmony */
+/* #endif */
+/* #ifndef harmony */
+/* #endif */
 .nut-grid-item {
   display: flex;
   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-gray-7));
+  overflow: hidden;
 }
 .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-gray-7));
+  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;
 }
@@ -27,16 +32,17 @@
   flex-direction: column;
   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)));
+  background: var(--nutui-grid-item-content-bg-color, var(--nutui-gray-1));
+  border: 0 solid var(--nutui-grid-border-color, var(--nutui-black-3));
 }
 .nut-grid-item-content-border {
-  border-right-width: 1px;
-  border-bottom-width: 1px;
+  border-right-width: var(--nutui-grid-border-width, 0px);
+  border-bottom-width: var(--nutui-grid-border-width, 0px);
 }
 .nut-grid-item-content-surround {
-  border-top-width: 1px;
-  border-left-width: 1px;
+  border-top-width: var(--nutui-grid-border-width, 0px);
+  border-left-width: var(--nutui-grid-border-width, 0px);
+  border-radius: var(--nutui-grid-item-border-radius, var(--nutui-radius-l, 8px));
 }
 .nut-grid-item-content-center {
   align-items: center;
@@ -63,9 +69,9 @@
   left: 50%;
   width: 100%;
   height: 100%;
-  background-color: var(--nutui-black-10, rgba(0, 0, 0, 0.7));
+  background-color: var(--nutui-black-10);
   border: inherit;
-  border-color: var(--nutui-black-10, rgba(0, 0, 0, 0.7));
+  border-color: var(--nutui-black-10);
   border-radius: inherit;
   transform: translate(-50%, -50%);
   opacity: 0;

package/dist/cjs/packages/hoverbutton/hoverbutton.js

@@ -20,6 +20,7 @@ var _index = require("../configprovider/index");
 var _index1 = /*#__PURE__*/ _interop_require_default._(require("../hoverbuttonitem/index"));
 var _index2 = /*#__PURE__*/ _interop_require_default._(require("../safearea/index"));
 var _pxtransform = /*#__PURE__*/ _interop_require_default._(require("../../utils/px-transform"));
+var _utils = require("./utils");
 var defaultProps = (0, _object_spread._)({}, _typings.ComponentDefaults);
 var classPrefix = 'nut-hoverbutton';
 var HoverButton = function HoverButton(props) {
@@ -27,7 +28,7 @@ var HoverButton = function HoverButton(props) {
     var rtl = (0, _index.useRtl)();
     var baseStyle = (0, _object_spread._)({}, style);
     if (tabbarHeight) {
-        baseStyle.bottom = (0, _pxtransform.default)(tabbarHeight + 16);
+        baseStyle.bottom = (0, _pxtransform.default)(tabbarHeight + _utils.UI_BOTTOM_DISTANCE);
     }
     if (typeof zIndex !== 'undefined') {
         baseStyle.zIndex = zIndex;

package/dist/cjs/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/cjs/packages/hoverbutton/style/style.css

@@ -1,45 +1,70 @@
+/* #ifdef harmony */
+/* #endif */
+/* #ifndef harmony */
+/* #endif */
 .nut-hoverbutton-item-container {
-  width: 40px;
-  height: 40px;
-  border-radius: 20px;
-  border: 1px solid var(--nutui-hoverbutton-item-border-color, var(--nutui-black-3, rgba(0, 0, 0, 0.06)));
-  background-color: var(--nutui-hoverbutton-item-background, var(--nutui-gray-1, #ffffff));
+  width: var(--nutui-hoverbutton-item-size, 40px);
+  height: var(--nutui-hoverbutton-item-size, 40px);
+  border-radius: var(--nutui-hoverbutton-item-size, 40px);
+  border: 1px solid var(--nutui-hoverbutton-item-border-color, rgba(0, 0, 0, 0.12));
+  background-color: var(--nutui-hoverbutton-item-background, var(--nutui-white-12));
 }
 .nut-hoverbutton-item-container:active, .nut-hoverbutton-item-container-active {
-  background-color: var(--nutui-hoverbutton-item-background-active, var(--nutui-gray-3, #f6f6f6));
+  background-color: var(--nutui-hoverbutton-item-background-active, rgba(247, 248, 252, 0.9));
 }
 .nut-hoverbutton-item-container-harmony {
-  margin-bottom: var(--nutui-hoverbutton-spacing, var(--nutui-spacing-16, 16px));
+  margin-bottom: var(--nutui-hoverbutton-spacing, var(--nutui-spacing-base, 8px));
 }
 .nut-hoverbutton-item-container-harmony:last-child {
   margin-bottom: 0;
 }
+.nut-hoverbutton-item-container-icontext {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+}
+.nut-hoverbutton-item-container-icontext .nut-icon {
+  display: block;
+  width: 14px;
+  height: 14px;
+  font-size: 14px;
+}
 .nut-hoverbutton-item-icon {
   width: 20px;
   height: 20px;
   margin: 9px;
-  color: var(--nutui-hoverbutton-item-icon-color, var(--nutui-gray-7, #1a1a1a));
-  fill: var(--nutui-hoverbutton-item-icon-color, var(--nutui-gray-7, #1a1a1a));
+  color: var(--nutui-hoverbutton-item-icon-color, var(--nutui-gray-7));
+  fill: var(--nutui-hoverbutton-item-icon-color, var(--nutui-gray-7));
 }
 .nut-hoverbutton-item-icon .nut-icon {
   display: block;
   width: 20px;
   height: 20px;
+  font-size: 20px;
 }
 .nut-hoverbutton-item-container:active .nut-hoverbutton-item-icon {
-  color: var(--nutui-hoverbutton-item-icon-color-active, var(--nutui-gray-6, #595959));
-  fill: var(--nutui-hoverbutton-item-icon-color-active, var(--nutui-gray-6, #595959));
+  color: var(--nutui-hoverbutton-item-icon-color-active, var(--nutui-gray-7));
+  fill: var(--nutui-hoverbutton-item-icon-color-active, var(--nutui-gray-7));
+}
+.nut-hoverbutton-item-text-icon {
+  width: 14px;
+  height: 5px;
+}
+.nut-hoverbutton-item-text {
+  font-size: 10px;
+  margin-top: 5px;
+  line-height: 9px;
 }
 
 .nut-hoverbutton {
   display: flex;
   flex-direction: column;
-  gap: var(--nutui-hoverbutton-spacing, var(--nutui-spacing-16, 16px));
+  gap: var(--nutui-hoverbutton-spacing, var(--nutui-spacing-base, 8px));
 }
 .nut-hoverbutton-container {
   position: fixed;
-  right: var(--nutui-hoverbutton-position-right, var(--nutui-spacing-16, 16px));
-  bottom: var(--nutui-hoverbutton-position-bottom, 48px);
+  right: var(--nutui-hoverbutton-position-right, var(--nutui-spacing-base, 8px));
+  bottom: var(--nutui-hoverbutton-position-bottom, 60px);
   z-index: 10;
 }
 .nut-hoverbutton-container-rn {
@@ -49,5 +74,5 @@
 [dir=rtl] .nut-hoverbutton-container,
 .nut-hoverbutton-container-rtl {
   right: auto;
-  left: var(--nutui-hoverbutton-position-right, var(--nutui-spacing-16, 16px));
+  left: var(--nutui-hoverbutton-position-right, var(--nutui-spacing-base, 8px));
 }

package/dist/cjs/packages/hoverbutton/utils.d.ts

@@ -0,0 +1 @@
+export declare const UI_BOTTOM_DISTANCE = 60;

package/dist/cjs/packages/hoverbutton/utils.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+Object.defineProperty(exports, "UI_BOTTOM_DISTANCE", {
+    enumerable: true,
+    get: function() {
+        return UI_BOTTOM_DISTANCE;
+    }
+});
+var UI_BOTTOM_DISTANCE = 60;

package/dist/cjs/packages/hoverbuttonitem/hoverbuttonitem.js

@@ -19,6 +19,7 @@ var _classnames = /*#__PURE__*/ _interop_require_default._(require("classnames")
 var _components = require("@tarojs/components");
 var _typings = require("../../utils/typings");
 var _platformtaro = require("../../utils/platform-taro");
+var _utils = require("./utils");
 var defaultProps = (0, _object_spread_props._)((0, _object_spread._)({}, _typings.ComponentDefaults), {
     icon: null,
     onClick: function onClick(value) {}
@@ -27,7 +28,7 @@ var classPrefix = 'nut-hoverbutton-item';
 var isHarmony = (0, _platformtaro.harmony)();
 var isNative = (0, _platformtaro.harmonyAndRn)();
 var HoverButtonItem = function HoverButtonItem(props) {
-    var _$_object_spread = (0, _object_spread._)({}, defaultProps, props), className = _$_object_spread.className, style = _$_object_spread.style, icon = _$_object_spread.icon, onClick = _$_object_spread.onClick;
+    var _$_object_spread = (0, _object_spread._)({}, defaultProps, props), className = _$_object_spread.className, style = _$_object_spread.style, icon = _$_object_spread.icon, onClick = _$_object_spread.onClick, children = _$_object_spread.children;
     var _useState = (0, _sliced_to_array._)((0, _react.useState)(false), 2), isTouchStart = _useState[0], setTouchStart = _useState[1];
     // @TODO 待添加暗黑模式及样式变量功能
     var nativeProps = (0, _react.useMemo)(function() {
@@ -46,22 +47,29 @@ var HoverButtonItem = function HoverButtonItem(props) {
     var handleActiveEnd = function handleActiveEnd(event) {
         isNative && setTouchStart(false);
     };
+    var renderBody = function renderBody() {
+        if (icon && !children) return /*#__PURE__*/ _react.default.createElement(_components.View, {
+            className: "".concat(classPrefix, "-icon")
+        }, (0, _utils.getIcon)(icon));
+        if (icon && children) {
+            return /*#__PURE__*/ _react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/ _react.default.createElement(_components.View, {
+                className: (0, _classnames.default)((0, _define_property._)({}, "".concat(classPrefix, "-text-icon"), true))
+            }), (0, _utils.getIcon)(icon), /*#__PURE__*/ _react.default.createElement(_components.View, {
+                className: (0, _classnames.default)((0, _define_property._)({}, "".concat(classPrefix, "-text"), true))
+            }, children));
+        }
+    };
     var _obj;
     return /*#__PURE__*/ _react.default.createElement(_components.View, {
         className: (0, _classnames.default)([
             "".concat(classPrefix, "-container"),
             className
-        ], (_obj = {}, (0, _define_property._)(_obj, "".concat(classPrefix, "-container-active"), isNative && isTouchStart), (0, _define_property._)(_obj, "".concat(classPrefix, "-container-harmony"), isHarmony), _obj)),
+        ], (_obj = {}, (0, _define_property._)(_obj, "".concat(classPrefix, "-container-active"), isNative && isTouchStart), (0, _define_property._)(_obj, "".concat(classPrefix, "-container-harmony"), isHarmony), (0, _define_property._)(_obj, "".concat(classPrefix, "-container-icontext"), icon && children), _obj)),
         style: style,
         onTouchStart: handleActiveStart,
         onTouchEnd: handleActiveEnd,
         onTouchCancel: handleActiveEnd,
         onClick: handleClick
-    }, /*#__PURE__*/ _react.default.createElement(_components.View, {
-        className: "".concat(classPrefix, "-icon")
-    }, /*#__PURE__*/ _react.default.cloneElement(icon, (0, _object_spread._)({
-        className: 'nut-icon',
-        size: 20
-    }, nativeProps))));
+    }, renderBody());
 };
 HoverButtonItem.displayName = 'NutHoverButtonItem';

package/dist/cjs/packages/hoverbuttonitem/style/hoverbuttonitem.scss

@@ -1,8 +1,8 @@
 .nut-hoverbutton-item {
   &-container {
-    width: 40px;
-    height: 40px;
-    border-radius: 20px;
+    width: $hoverbutton-item-size;
+    height: $hoverbutton-item-size;
+    border-radius: $hoverbutton-item-size;
     border: 1px solid $hoverbutton-item-border-color;
     background-color: $hoverbutton-item-background;
 
@@ -18,6 +18,19 @@
         margin-bottom: 0;
       }
     }
+
+    &-icontext {
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+
+      .nut-icon {
+        display: block;
+        width: 14px;
+        height: 14px;
+        font-size: 14px;
+      }
+    }
   }
 
   &-icon {
@@ -31,6 +44,7 @@
       display: block;
       width: 20px;
       height: 20px;
+      font-size: 20px;
     }
   }
 
@@ -38,4 +52,15 @@
     color: $hoverbutton-item-icon-color-active;
     fill: $hoverbutton-item-icon-color-active;
   }
+
+  &-text-icon {
+    width: 14px;
+    height: 5px;
+  }
+
+  &-text {
+    font-size: 10px;
+    margin-top: 5px;
+    line-height: 9px;
+  }
 }

package/dist/cjs/packages/hoverbuttonitem/style/style.css

@@ -1,32 +1,57 @@
+/* #ifdef harmony */
+/* #endif */
+/* #ifndef harmony */
+/* #endif */
 .nut-hoverbutton-item-container {
-  width: 40px;
-  height: 40px;
-  border-radius: 20px;
-  border: 1px solid var(--nutui-hoverbutton-item-border-color, var(--nutui-black-3, rgba(0, 0, 0, 0.06)));
-  background-color: var(--nutui-hoverbutton-item-background, var(--nutui-gray-1, #ffffff));
+  width: var(--nutui-hoverbutton-item-size, 40px);
+  height: var(--nutui-hoverbutton-item-size, 40px);
+  border-radius: var(--nutui-hoverbutton-item-size, 40px);
+  border: 1px solid var(--nutui-hoverbutton-item-border-color, rgba(0, 0, 0, 0.12));
+  background-color: var(--nutui-hoverbutton-item-background, var(--nutui-white-12));
 }
 .nut-hoverbutton-item-container:active, .nut-hoverbutton-item-container-active {
-  background-color: var(--nutui-hoverbutton-item-background-active, var(--nutui-gray-3, #f6f6f6));
+  background-color: var(--nutui-hoverbutton-item-background-active, rgba(247, 248, 252, 0.9));
 }
 .nut-hoverbutton-item-container-harmony {
-  margin-bottom: var(--nutui-hoverbutton-spacing, var(--nutui-spacing-16, 16px));
+  margin-bottom: var(--nutui-hoverbutton-spacing, var(--nutui-spacing-base, 8px));
 }
 .nut-hoverbutton-item-container-harmony:last-child {
   margin-bottom: 0;
 }
+.nut-hoverbutton-item-container-icontext {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+}
+.nut-hoverbutton-item-container-icontext .nut-icon {
+  display: block;
+  width: 14px;
+  height: 14px;
+  font-size: 14px;
+}
 .nut-hoverbutton-item-icon {
   width: 20px;
   height: 20px;
   margin: 9px;
-  color: var(--nutui-hoverbutton-item-icon-color, var(--nutui-gray-7, #1a1a1a));
-  fill: var(--nutui-hoverbutton-item-icon-color, var(--nutui-gray-7, #1a1a1a));
+  color: var(--nutui-hoverbutton-item-icon-color, var(--nutui-gray-7));
+  fill: var(--nutui-hoverbutton-item-icon-color, var(--nutui-gray-7));
 }
 .nut-hoverbutton-item-icon .nut-icon {
   display: block;
   width: 20px;
   height: 20px;
+  font-size: 20px;
 }
 .nut-hoverbutton-item-container:active .nut-hoverbutton-item-icon {
-  color: var(--nutui-hoverbutton-item-icon-color-active, var(--nutui-gray-6, #595959));
-  fill: var(--nutui-hoverbutton-item-icon-color-active, var(--nutui-gray-6, #595959));
+  color: var(--nutui-hoverbutton-item-icon-color-active, var(--nutui-gray-7));
+  fill: var(--nutui-hoverbutton-item-icon-color-active, var(--nutui-gray-7));
+}
+.nut-hoverbutton-item-text-icon {
+  width: 14px;
+  height: 5px;
+}
+.nut-hoverbutton-item-text {
+  font-size: 10px;
+  margin-top: 5px;
+  line-height: 9px;
 }

package/dist/cjs/packages/hoverbuttonitem/utils.d.ts

@@ -0,0 +1,2 @@
+import React from 'react';
+export declare const getIcon: (icon: React.ReactNode) => string | number | boolean | React.ReactElement<any, string | React.JSXElementConstructor<any>> | Iterable<React.ReactNode> | null | undefined;

package/dist/cjs/packages/hoverbuttonitem/utils.js

@@ -0,0 +1,18 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+Object.defineProperty(exports, "getIcon", {
+    enumerable: true,
+    get: function() {
+        return getIcon;
+    }
+});
+var _interop_require_default = require("@swc/helpers/_/_interop_require_default");
+var _react = /*#__PURE__*/ _interop_require_default._(require("react"));
+var getIcon = function getIcon(icon) {
+    return /*#__PURE__*/ _react.default.isValidElement(icon) ? /*#__PURE__*/ _react.default.cloneElement(icon, {
+        // @ts-ignore
+        className: 'nut-icon'
+    }) : icon;
+};

package/dist/cjs/packages/image/image.js

@@ -19,7 +19,7 @@ var _taro = /*#__PURE__*/ _interop_require_default._(require("@tarojs/taro"));
 var _components = require("@tarojs/components");
 var _iconsreacttaro = require("@nutui/icons-react-taro");
 var _classnames = /*#__PURE__*/ _interop_require_default._(require("classnames"));
-var _platformtaro = require("../../utils/platform-taro");
+var _pxtransform = /*#__PURE__*/ _interop_require_default._(require("../../utils/px-transform"));
 var defaultProps = {
     src: '',
     error: true,
@@ -42,7 +42,7 @@ var Image = function Image(props) {
     var _useState = (0, _sliced_to_array._)((0, _react.useState)(true), 2), innerLoading = _useState[0], setInnerLoading = _useState[1];
     var _useState1 = (0, _sliced_to_array._)((0, _react.useState)(false), 2), isError = _useState1[0], setIsError = _useState1[1];
     var pxCheck = function pxCheck(value) {
-        return Number.isNaN(Number(value)) ? String(value) : "".concat(value, "px");
+        return Number.isNaN(Number(value)) ? String(value) : (0, _pxtransform.default)(+value);
     };
     // 图片加载
     var handleLoad = function handleLoad(e) {
@@ -50,7 +50,6 @@ var Image = function Image(props) {
         setInnerLoading(false);
         onLoad && onLoad(e);
     };
-    // 图片加载失败
     var handleError = function handleError(e) {
         if (src) {
             setIsError(true);
@@ -60,9 +59,9 @@ var Image = function Image(props) {
     };
     var containerStyle = {
         // eslint-disable-next-line no-nested-ternary
-        height: height ? _taro.default.getEnv() === 'RN' ? height : pxCheck(height) : _taro.default.getEnv() === 'WEB' ? '' : '100%',
+        height: height ? pxCheck(height) : _taro.default.getEnv() === 'WEB' ? '' : '100%',
         // eslint-disable-next-line no-nested-ternary
-        width: width ? _taro.default.getEnv() === 'RN' ? width : pxCheck(width) : _taro.default.getEnv() === 'WEB' ? '' : '100%',
+        width: width ? pxCheck(width) : _taro.default.getEnv() === 'WEB' ? '' : '100%',
         overflow: radius !== undefined && radius !== null ? 'hidden' : '',
         borderRadius: radius !== undefined && radius != null ? _taro.default.getEnv() === 'RN' ? radius : pxCheck(radius) : ''
     };
@@ -118,6 +117,6 @@ var Image = function Image(props) {
         onError: function onError(e) {
             return handleError(e);
         }
-    })), !(0, _platformtaro.harmonyAndRn)() && /*#__PURE__*/ _react.default.createElement(_react.default.Fragment, null, renderLoading(), renderErrorImg()));
+    })), /*#__PURE__*/ _react.default.createElement(_react.default.Fragment, null, renderLoading(), renderErrorImg()));
 };
 Image.displayName = 'NutImage';

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

@@ -1,3 +1,7 @@
+/* #ifdef harmony */
+/* #endif */
+/* #ifndef harmony */
+/* #endif */
 .nut-image {
   display: block;
   position: relative;
@@ -21,7 +25,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 {
@@ -34,7 +38,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%;
 }
 

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

@@ -1,20 +1,24 @@
 import { FunctionComponent, ReactNode } from 'react';
 import { BasicComponent } from "../../utils/typings";
 export type ImagePreviewCloseIconPosition = 'top-right' | 'top-left' | 'bottom';
-export interface ImagePreviewProps extends BasicComponent {
-    images: Array<{
+export interface ImageOption {
+    src: string;
+    index?: number;
+}
+export interface VideoOption {
+    source: {
         src: string;
-    }>;
-    videos: Array<{
-        source: {
-            src: string;
-            type: string;
-        };
-        options: {
-            muted: boolean;
-            controls: boolean;
-        };
-    }>;
+        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;

package/dist/cjs/packages/imagepreview/imagepreview.js

@@ -161,6 +161,7 @@ var ImagePreview = function ImagePreview(props) {
     ]);
     var scaleNow = function scaleNow() {
         if (ref.current) {
+            ;
             ref.current.style.transform = "scale(".concat(store.scale, ")");
         }
     };
@@ -198,11 +199,10 @@ var ImagePreview = function ImagePreview(props) {
             width: '100%'
         },
         onClick: onCloseInner
-    }, /*#__PURE__*/ _react.default.createElement("div", {
+    }, /*#__PURE__*/ _react.default.createElement(_components.View, {
         className: (0, _classnames.default)(classPrefix, className),
         style: style,
         ref: ref,
-        onClick: closeOnImg,
         onTouchStart: onTouchStart
     }, /*#__PURE__*/ _react.default.createElement(_index2.default, {
         autoPlay: autoPlay,
@@ -221,32 +221,55 @@ var ImagePreview = function ImagePreview(props) {
         },
         defaultValue: innerNo && (innerNo > maxNo ? maxNo - 1 : innerNo - 1),
         indicator: indicator
-    }, (videos && videos.length > 0 ? videos.map(function(item, index) {
-        return /*#__PURE__*/ _react.default.createElement(_index3.default, {
-            key: index,
-            className: "nut-imagepreview-swiper-item"
-        }, /*#__PURE__*/ _react.default.createElement(_components.Video, {
-            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.default.createElement(_index3.default, {
-            key: index,
-            className: "nut-imagepreview-swiper-item"
-        }, _taro.default.getEnv() === 'WEB' ? /*#__PURE__*/ _react.default.createElement(_index1.default, {
-            src: item.src,
-            mode: "aspectFit"
-        }) : /*#__PURE__*/ _react.default.createElement(_index1.default, {
-            src: item.src,
-            mode: "aspectFit",
-            showMenuByLongpress: !!showMenuByLongpress
-        }));
-    }) : []))), pagination ? /*#__PURE__*/ _react.default.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.default.createElement(_index3.default, {
+                key: index,
+                className: "nut-imagepreview-swiper-item"
+            }, /*#__PURE__*/ _react.default.createElement(_components.Video, {
+                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.default.createElement(_index3.default, {
+                key: index,
+                className: "nut-imagepreview-swiper-item"
+            }, /*#__PURE__*/ _react.default.createElement(_index1.default, (0, _object_spread._)({
+                src: src,
+                mode: "widthFix",
+                onClick: closeOnImg,
+                style: {
+                    width: '100%'
+                }
+            }, _taro.default.getEnv() !== 'WEB' && {
+                showMenuByLongpress: showMenuByLongpress
+            })));
+        }
+        return null;
+    }))), pagination ? /*#__PURE__*/ _react.default.createElement(_components.View, {
         className: "".concat(classPrefix, "-index")
-    }, active, "/", (images ? images.length : 0) + (videos ? videos.length : 0)) : null, closeIcon !== false ? /*#__PURE__*/ _react.default.createElement("div", {
+    }, active, "/", (images ? images.length : 0) + (videos ? videos.length : 0)) : null, closeIcon !== false ? /*#__PURE__*/ _react.default.createElement(_components.View, {
         className: "".concat(classPrefix, "-close ").concat(closeIconPosition),
         onClick: onCloseInner
     }, closeIcon === true ? /*#__PURE__*/ _react.default.createElement(_iconsreacttaro.Close, null) : closeIcon) : null);