@nutui/nutui-react-taro 2.6.11 → 2.6.13

package/dist/nutui.react.es.js

@@ -1,5 +1,5 @@
 /*!
-* @nutui/nutui-react-taro v2.6.11 Fri Jun 28 2024 14:38:04 GMT+0800 (China Standard Time)
+* @nutui/nutui-react-taro v2.6.13 Fri Jul 12 2024 13:57:50 GMT+0800 (China Standard Time)
 * (c) 2023 @jdf2e.
 * Released under the MIT License.
 */
@@ -3385,6 +3385,19 @@ function getScrollParent(el, root2 = defaultRoot) {
   }
   return root2;
 }
+let passiveSupported = false;
+if (canUseDom) {
+  try {
+    const opts = Object.defineProperty({}, "passive", {
+      get() {
+        passiveSupported = true;
+      }
+    });
+    window.addEventListener("test-passive-supported", null, opts);
+  } catch (e2) {
+    console.log(e2);
+  }
+}
 let totalLockCount = 0;
 const BODY_LOCK_CLASS = "nut-overflow-hidden";
 function getScrollableElement(el) {
@@ -3432,7 +3445,7 @@ function useLockScroll(rootRef, shouldLock) {
     document.addEventListener(
       "touchmove",
       onTouchMove,
-      false
+      passiveSupported ? { passive: false } : false
     );
     if (!totalLockCount) {
       document.body.classList.add(BODY_LOCK_CLASS);
@@ -6762,6 +6775,7 @@ const CalendarItem = React__default.forwardRef((props, ref) => {
     const scrollTop2 = e2.target.scrollTop;
     Taro.getEnv() === "WEB" && setScrollTop(scrollTop2);
     let current = Math.floor(scrollTop2 / avgHeight);
+    if (current < 0) return;
     if (!monthsData[current + 1]) return;
     const nextTop = monthsData[current + 1].scrollTop;
     const nextHeight = monthsData[current + 1].cssHeight;
@@ -7963,7 +7977,7 @@ const InternalPickerPanel = (props, ref) => {
     moving: moving.current
   }));
   useEffect(() => {
-    const eventOptions = false;
+    const eventOptions = passiveSupported ? { passive: false, once: true } : false;
     const element = pickerPanelRef.current;
     element.addEventListener("touchstart", touchStart, eventOptions);
     element.addEventListener("touchmove", touchMove, eventOptions);
@@ -12874,8 +12888,7 @@ const InternalUploader = (props, ref) => {
       setUploadQueue(uploadQueue);
     } else {
       setUploadQueue([]);
-      fileList.splice(0, fileList.length);
-      setFileList([...fileList]);
+      setFileList([]);
     }
   };
   const _chooseImage = () => {
@@ -12898,7 +12911,7 @@ const InternalUploader = (props, ref) => {
         document.body.appendChild(obj);
       }
     }
-    if (getEnv() === "WEAPP" && chooseMedia) {
+    if ((getEnv() === "WEAPP" || getEnv() === "JD") && chooseMedia) {
       chooseMedia({
         /** 最多可以选择的文件个数 */
         count: multiple ? maxCount * 1 - fileList.length : 1,
@@ -13050,8 +13063,7 @@ const InternalUploader = (props, ref) => {
       if (preview) {
         fileItem.url = fileType === "video" ? file.thumbTempFilePath : filepath;
       }
-      fileList.push(fileItem);
-      setFileList(fileList);
+      setFileList([...fileList, fileItem]);
       executeUpload(fileItem, index);
     });
   };
@@ -13498,7 +13510,18 @@ const defaultProps$F = {
   className: "myDrag"
 };
 const Drag = (props) => {
-  const { attract, direction, boundary, children, className, style, ...reset } = {
+  const {
+    attract,
+    direction,
+    boundary,
+    onDrag,
+    onDragStart,
+    onDragEnd,
+    children,
+    className,
+    style,
+    ...reset
+  } = {
     ...defaultProps$F,
     ...props
   };
@@ -13533,7 +13556,7 @@ const Drag = (props) => {
     }
   };
   const touchStart = (e2) => {
-    e2.currentTarget;
+    onDragStart == null ? void 0 : onDragStart();
     const touches = e2.touches[0];
     axisCache.current = { x: touches.clientX, y: touches.clientY };
     transformCache.current = { x: translateX.current, y: translateY.current };
@@ -13545,6 +13568,9 @@ const Drag = (props) => {
       const y = touch.clientY - axisCache.current.y;
       translateX.current = x + transformCache.current.x;
       translateY.current = y + transformCache.current.y;
+      onDrag == null ? void 0 : onDrag({
+        offset: [translateX.current, translateY.current]
+      });
       if (translateX.current < boundaryState.left) {
         translateX.current = boundaryState.left;
       } else if (translateX.current > boundaryState.right) {
@@ -13560,6 +13586,9 @@ const Drag = (props) => {
     }
   };
   const touchEnd = (e2) => {
+    onDragEnd == null ? void 0 : onDragEnd({
+      offset: [translateX.current, translateY.current]
+    });
     if (direction !== "y" && attract && dragRef.current) {
       if (translateX.current < middleLine.current) {
         translateX.current = boundaryState.left;
@@ -16794,6 +16823,7 @@ const defaultProps$g = {
   autoPlay: false,
   defaultValue: 1,
   closeOnContentClick: false,
+  pagination: true,
   indicator: false,
   indicatorColor: "#fff",
   closeIcon: false,
@@ -16814,6 +16844,7 @@ const ImagePreview = (props) => {
     visible,
     defaultValue,
     indicatorColor,
+    pagination,
     indicator,
     autoPlay,
     closeOnContentClick,
@@ -16975,7 +17006,6 @@ const ImagePreview = (props) => {
         className: classNames(classPrefix2, className),
         style,
         ref,
-        onClick: closeOnImg,
         onTouchStart
       },
       /* @__PURE__ */ React__default.createElement(
@@ -17007,6 +17037,7 @@ const ImagePreview = (props) => {
               Video$1,
               {
                 src: item.source.src,
+                onClick: closeOnImg,
                 controls: item.options.controls,
                 autoplay: false,
                 loop: false,
@@ -17022,20 +17053,26 @@ const ImagePreview = (props) => {
                 key: index,
                 className: "nut-imagepreview-swiper-item"
               },
-              Taro.getEnv() === "WEB" ? /* @__PURE__ */ React__default.createElement(Image$1, { src: item.src, mode: "aspectFit" }) : /* @__PURE__ */ React__default.createElement(
-                Image$1,
+              "(",
+              /* @__PURE__ */ React__default.createElement(
+                Image$2,
                 {
                   src: item.src,
-                  mode: "aspectFit",
-                  showMenuByLongpress: !!showMenuByLongpress
+                  mode: "widthFix",
+                  onClick: closeOnImg,
+                  style: { width: "100%" },
+                  ...Taro.getEnv() !== "WEB" && {
+                    showMenuByLongpress
+                  }
                 }
-              )
+              ),
+              ")"
             );
           }) : []
         )
       )
     ),
-    /* @__PURE__ */ React__default.createElement("div", { className: `${classPrefix2}-index` }, active, "/", (images ? images.length : 0) + (videos ? videos.length : 0)),
+    pagination ? /* @__PURE__ */ React__default.createElement("div", { className: `${classPrefix2}-index` }, active, "/", (images ? images.length : 0) + (videos ? videos.length : 0)) : null,
     closeIcon !== false ? /* @__PURE__ */ React__default.createElement(
       "div",
       {
@@ -18861,6 +18898,7 @@ const AvatarCropper = (props) => {
     if ((canvasDom == null ? void 0 : canvasDom.tagName) !== "CANVAS") {
       canvas = canvasDom == null ? void 0 : canvasDom.getElementsByTagName("canvas")[0];
     }
+    if (!canvas) return;
     canvas.width = state.displayWidth;
     canvas.height = state.displayHeight;
     const ctx = canvas.getContext("2d");

package/dist/nutui.react.umd.js

@@ -2,7 +2,7 @@
   typeof exports === "object" && typeof module !== "undefined" ? factory(exports, require("react"), require("@tarojs/taro"), require("@tarojs/components"), require("react-dom")) : typeof define === "function" && define.amd ? define(["exports", "react", "@tarojs/taro", "@tarojs/components", "react-dom"], factory) : (global2 = typeof globalThis !== "undefined" ? globalThis : global2 || self, factory((global2.nutui = global2.nutui || {}, global2.nutui.react = {}), global2.React, global2.Taro, global2.components, global2.ReactDOM));
 })(this, function(exports2, React, Taro, components, ReactDOM) {
   "use strict";/*!
-* @nutui/nutui-react-taro v2.6.11 Fri Jun 28 2024 14:38:04 GMT+0800 (China Standard Time)
+* @nutui/nutui-react-taro v2.6.13 Fri Jul 12 2024 13:57:50 GMT+0800 (China Standard Time)
 * (c) 2023 @jdf2e.
 * Released under the MIT License.
 */
@@ -3401,6 +3401,19 @@
     }
     return root2;
   }
+  let passiveSupported = false;
+  if (canUseDom) {
+    try {
+      const opts = Object.defineProperty({}, "passive", {
+        get() {
+          passiveSupported = true;
+        }
+      });
+      window.addEventListener("test-passive-supported", null, opts);
+    } catch (e2) {
+      console.log(e2);
+    }
+  }
   let totalLockCount = 0;
   const BODY_LOCK_CLASS = "nut-overflow-hidden";
   function getScrollableElement(el) {
@@ -3448,7 +3461,7 @@
       document.addEventListener(
         "touchmove",
         onTouchMove,
-        false
+        passiveSupported ? { passive: false } : false
       );
       if (!totalLockCount) {
         document.body.classList.add(BODY_LOCK_CLASS);
@@ -6778,6 +6791,7 @@
       const scrollTop2 = e2.target.scrollTop;
       Taro.getEnv() === "WEB" && setScrollTop(scrollTop2);
       let current = Math.floor(scrollTop2 / avgHeight);
+      if (current < 0) return;
       if (!monthsData[current + 1]) return;
       const nextTop = monthsData[current + 1].scrollTop;
       const nextHeight = monthsData[current + 1].cssHeight;
@@ -7979,7 +7993,7 @@
       moving: moving.current
     }));
     React.useEffect(() => {
-      const eventOptions = false;
+      const eventOptions = passiveSupported ? { passive: false, once: true } : false;
       const element = pickerPanelRef.current;
       element.addEventListener("touchstart", touchStart, eventOptions);
       element.addEventListener("touchmove", touchMove, eventOptions);
@@ -12890,8 +12904,7 @@
         setUploadQueue(uploadQueue);
       } else {
         setUploadQueue([]);
-        fileList.splice(0, fileList.length);
-        setFileList([...fileList]);
+        setFileList([]);
       }
     };
     const _chooseImage = () => {
@@ -12914,7 +12927,7 @@
           document.body.appendChild(obj);
         }
       }
-      if (Taro.getEnv() === "WEAPP" && Taro.chooseMedia) {
+      if ((Taro.getEnv() === "WEAPP" || Taro.getEnv() === "JD") && Taro.chooseMedia) {
         Taro.chooseMedia({
           /** 最多可以选择的文件个数 */
           count: multiple ? maxCount * 1 - fileList.length : 1,
@@ -13066,8 +13079,7 @@
         if (preview) {
           fileItem.url = fileType === "video" ? file.thumbTempFilePath : filepath;
         }
-        fileList.push(fileItem);
-        setFileList(fileList);
+        setFileList([...fileList, fileItem]);
         executeUpload(fileItem, index);
       });
     };
@@ -13514,7 +13526,18 @@
     className: "myDrag"
   };
   const Drag = (props) => {
-    const { attract, direction, boundary, children, className, style, ...reset } = {
+    const {
+      attract,
+      direction,
+      boundary,
+      onDrag,
+      onDragStart,
+      onDragEnd,
+      children,
+      className,
+      style,
+      ...reset
+    } = {
       ...defaultProps$F,
       ...props
     };
@@ -13549,7 +13572,7 @@
       }
     };
     const touchStart = (e2) => {
-      e2.currentTarget;
+      onDragStart == null ? void 0 : onDragStart();
       const touches = e2.touches[0];
       axisCache.current = { x: touches.clientX, y: touches.clientY };
       transformCache.current = { x: translateX.current, y: translateY.current };
@@ -13561,6 +13584,9 @@
         const y = touch.clientY - axisCache.current.y;
         translateX.current = x + transformCache.current.x;
         translateY.current = y + transformCache.current.y;
+        onDrag == null ? void 0 : onDrag({
+          offset: [translateX.current, translateY.current]
+        });
         if (translateX.current < boundaryState.left) {
           translateX.current = boundaryState.left;
         } else if (translateX.current > boundaryState.right) {
@@ -13576,6 +13602,9 @@
       }
     };
     const touchEnd = (e2) => {
+      onDragEnd == null ? void 0 : onDragEnd({
+        offset: [translateX.current, translateY.current]
+      });
       if (direction !== "y" && attract && dragRef.current) {
         if (translateX.current < middleLine.current) {
           translateX.current = boundaryState.left;
@@ -16810,6 +16839,7 @@
     autoPlay: false,
     defaultValue: 1,
     closeOnContentClick: false,
+    pagination: true,
     indicator: false,
     indicatorColor: "#fff",
     closeIcon: false,
@@ -16830,6 +16860,7 @@
       visible,
       defaultValue,
       indicatorColor,
+      pagination,
       indicator,
       autoPlay,
       closeOnContentClick,
@@ -16991,7 +17022,6 @@
           className: classNames(classPrefix2, className),
           style,
           ref,
-          onClick: closeOnImg,
           onTouchStart
         },
         /* @__PURE__ */ React.createElement(
@@ -17023,6 +17053,7 @@
                 components.Video,
                 {
                   src: item.source.src,
+                  onClick: closeOnImg,
                   controls: item.options.controls,
                   autoplay: false,
                   loop: false,
@@ -17038,20 +17069,26 @@
                   key: index,
                   className: "nut-imagepreview-swiper-item"
                 },
-                Taro.getEnv() === "WEB" ? /* @__PURE__ */ React.createElement(Image$1, { src: item.src, mode: "aspectFit" }) : /* @__PURE__ */ React.createElement(
-                  Image$1,
+                "(",
+                /* @__PURE__ */ React.createElement(
+                  components.Image,
                   {
                     src: item.src,
-                    mode: "aspectFit",
-                    showMenuByLongpress: !!showMenuByLongpress
+                    mode: "widthFix",
+                    onClick: closeOnImg,
+                    style: { width: "100%" },
+                    ...Taro.getEnv() !== "WEB" && {
+                      showMenuByLongpress
+                    }
                   }
-                )
+                ),
+                ")"
               );
             }) : []
           )
         )
       ),
-      /* @__PURE__ */ React.createElement("div", { className: `${classPrefix2}-index` }, active, "/", (images ? images.length : 0) + (videos ? videos.length : 0)),
+      pagination ? /* @__PURE__ */ React.createElement("div", { className: `${classPrefix2}-index` }, active, "/", (images ? images.length : 0) + (videos ? videos.length : 0)) : null,
       closeIcon !== false ? /* @__PURE__ */ React.createElement(
         "div",
         {
@@ -18877,6 +18914,7 @@
       if ((canvasDom == null ? void 0 : canvasDom.tagName) !== "CANVAS") {
         canvas = canvasDom == null ? void 0 : canvasDom.getElementsByTagName("canvas")[0];
       }
+      if (!canvas) return;
       canvas.width = state.displayWidth;
       canvas.height = state.displayHeight;
       const ctx = canvas.getContext("2d");

package/dist/packages/tabs/tabs.scss

@@ -11,6 +11,7 @@
   user-select: none;
   overflow: hidden;
   background: $tabs-titles-background-color;
+  scrollbar-width: none;
 
   &::-webkit-scrollbar {
     display: none;