@nutui/nutui-react-taro 2.6.14 → 2.6.15-beta.0

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.14 Fri Jul 19 2024 16:23:26 GMT+0800 (China Standard Time)
+* @nutui/nutui-react-taro v2.6.14 Wed Jul 24 2024 13:29:51 GMT+0800 (China Standard Time)
 * (c) 2023 @jdf2e.
 * Released under the MIT License.
 */
@@ -3977,13 +3977,10 @@
           width: ""
         };
       }
-      const style2 = {};
-      if (rootRect.height) {
-        style2.height = rootRect.height;
-      }
-      if (rootRect.width) {
-        style2.width = rootRect.width;
-      }
+      const style2 = {
+        height: rootRect.height ?? "",
+        width: rootRect.width ?? ""
+      };
       return style2;
     }, [fixed, rootRect.height, rootRect.width]);
     const stickyStyle = React.useMemo(() => {
@@ -3994,36 +3991,37 @@
           [position]: ""
         };
       }
-      const style2 = {};
-      if (rootRect.height) style2.height = rootRect.height;
-      if (rootRect.width) style2.width = rootRect.width;
-      style2.transform = `translate3d(0, ${transform}px, 0)`;
-      style2[position] = threshold;
-      style2.zIndex = zIndex;
+      const style2 = {
+        height: rootRect.height ?? "",
+        width: rootRect.width ?? "",
+        transform: `translate3d(0, ${transform}px, 0)`,
+        [position]: threshold,
+        zIndex
+      };
       return style2;
     }, [fixed, rootRect.height, rootRect.width, transform, position]);
     const handleScroll = async (scrollTop) => {
       const curRootRect = await getRectByTaro(rootRef.current);
       const stickyRect = await getRectByTaro(stickyRef.current);
-      if (curRootRect && stickyRect) {
-        setRootRect(curRootRect);
-        if (position === "top") {
-          if (container) {
-            const containerRect = await getRectByTaro(container.current);
-            const difference = containerRect.bottom - threshold - curRootRect.height;
-            const curTransform = difference < 0 ? difference : 0;
-            setTransform(curTransform);
-            const curFixed = threshold > curRootRect.top && containerRect.bottom > 0;
-            setFixed(curFixed);
-          } else {
-            setFixed(threshold > curRootRect.top);
-          }
+      if (!curRootRect || !stickyRect) {
+        console.warn("getRectByTaro获取失败", { stickyRect, curRootRect });
+        return;
+      }
+      setRootRect(curRootRect);
+      if (position === "top") {
+        if (container) {
+          const containerRect = await getRectByTaro(container.current);
+          const difference = containerRect.bottom - threshold - curRootRect.height;
+          const curTransform = difference < 0 ? difference : 0;
+          setTransform(curTransform);
+          const curFixed = threshold > curRootRect.top && containerRect.bottom > 0;
+          setFixed(curFixed);
         } else {
-          const windowHeight = Taro.getSystemInfoSync().windowHeight;
-          setFixed(windowHeight - threshold < curRootRect.bottom);
+          setFixed(threshold > curRootRect.top);
         }
       } else {
-        console.warn("getRectByTaro获取失败", { stickyRect, curRootRect });
+        const windowHeight = Taro.getSystemInfoSync().windowHeight;
+        setFixed(windowHeight - threshold < curRootRect.bottom);
       }
     };
     const getElement = React.useCallback(() => {
@@ -6746,8 +6744,10 @@
     };
     React.useEffect(() => {
       setCurrentDate(resetDefaultValue() || []);
-      popup && resetRender();
     }, [defaultValue]);
+    React.useEffect(() => {
+      popup && resetRender();
+    }, [currentDate]);
     const scrollToDate = (date2) => {
       if (Utils.compareDate(date2, propStartDate)) {
         date2 = propStartDate;
@@ -12901,6 +12901,10 @@
         clearUploadQueue();
       }
     }));
+    const fileListRef = React.useRef([]);
+    React.useEffect(() => {
+      fileListRef.current = fileList;
+    }, [fileList]);
     const clearUploadQueue = (index = -1) => {
       if (index > -1) {
         uploadQueue.splice(index, 1);
@@ -12980,7 +12984,7 @@
       uploadOption.onStart = (option) => {
         clearUploadQueue(index);
         setFileList(
-          fileList.map((item) => {
+          fileListRef.current.map((item) => {
             if (item.uid === fileItem.uid) {
               item.status = "ready";
               item.message = locale.uploader.readyUpload;
@@ -12988,23 +12992,23 @@
             return item;
           })
         );
-        onStart && onStart(option);
+        onStart == null ? void 0 : onStart(option);
       };
       uploadOption.onProgress = (e2, option) => {
         setFileList(
-          fileList.map((item) => {
+          fileListRef.current.map((item) => {
             if (item.uid === fileItem.uid) {
               item.status = UPLOADING;
               item.message = locale.uploader.uploading;
               item.percentage = e2.progress;
-              onProgress && onProgress({ e: e2, option, percentage: item.percentage });
+              onProgress == null ? void 0 : onProgress({ e: e2, option, percentage: item.percentage });
             }
             return item;
           })
         );
       };
       uploadOption.onSuccess = (responseText, option) => {
-        const list = fileList.map((item) => {
+        const list = fileListRef.current.map((item) => {
           if (item.uid === fileItem.uid) {
             item.status = SUCCESS;
             item.message = locale.uploader.success;
@@ -13020,7 +13024,7 @@
         });
       };
       uploadOption.onFailure = (responseText, option) => {
-        const list = fileList.map((item) => {
+        const list = fileListRef.current.map((item) => {
           if (item.uid === fileItem.uid) {
             item.status = ERROR;
             item.message = locale.uploader.error;
@@ -13082,8 +13086,8 @@
         if (preview) {
           fileItem.url = fileType === "video" ? file.thumbTempFilePath : filepath;
         }
-        setFileList([...fileList, fileItem]);
         executeUpload(fileItem, index);
+        setFileList([...fileList, fileItem]);
       });
     };
     const filterFiles = (files) => {
@@ -13097,9 +13101,7 @@
         }
         return true;
       });
-      if (oversizes.length) {
-        onOversize && onOversize(files);
-      }
+      oversizes.length && (onOversize == null ? void 0 : onOversize(files));
       const currentFileLength = filterFile.length + fileList.length;
       if (currentFileLength > maximum) {
         filterFile.splice(filterFile.length - (currentFileLength - maximum));
@@ -13842,6 +13844,7 @@
     return /* @__PURE__ */ React.createElement(
       components.ScrollView,
       {
+        ...rest,
         className: classes,
         scrollY: true,
         id: "scroller",
@@ -13851,8 +13854,7 @@
         onScrollToLower: lower,
         onTouchStart: touchStart,
         onTouchMove: touchMove,
-        onTouchEnd: touchEnd,
-        ...rest
+        onTouchEnd: touchEnd
       },
       /* @__PURE__ */ React.createElement("div", { className: "nut-infinite-top", ref: refreshTop, style: getStyle() }, /* @__PURE__ */ React.createElement("div", { className: "nut-infinite-top-tips" }, pullingText || locale.infiniteloading.pullRefreshText)),
       /* @__PURE__ */ React.createElement("div", { className: "nut-infinite-container" }, children),
@@ -18612,6 +18614,8 @@
     gapY: 48,
     width: 120,
     height: 64,
+    startX: 0,
+    startY: 0,
     image: "",
     imageWidth: 120,
     imageHeight: 64,
@@ -18630,6 +18634,8 @@
       className,
       gapX,
       gapY,
+      startX,
+      startY,
       width,
       height,
       image,
@@ -18710,7 +18716,7 @@
             const markSize = Number(fontSize) * ratio;
             ctx.font = `${fontStyle} normal ${fontWeight} ${markSize}px/${markHeight}px ${fontFamily}`;
             ctx.fillStyle = color;
-            ctx.fillText(content, 0, 0);
+            ctx.fillText(content, startX, startY);
             ctx.restore();
             setBase64Url(canvas.toDataURL());
           }

package/dist/packages/uploader/uploader.scss

@@ -174,7 +174,9 @@
       }
 
       &-c {
-        width: 100%;
+        display: flex;
+        justify-content: center;
+        align-items: center;
         height: 100%;
         position: initial;
         border-radius: $uploader-image-border-radius;