@nutui/nutui-react-taro 2.6.0 → 2.6.1

package/CHANGELOG.md

@@ -1,3 +1,13 @@
+# v2.6.1
+`2024-04-19`
+
+
+* :bug: fix(image): standardize demos (#2177) @Alex-huxiyang
+* :bug: fix(cellgroup): 去掉 cellgroup 未单独使用的 style 属性 (#2176) @kurisu994
+* :bug: fix(site): png url error & key duplicate (#2178) @Alex-huxiyang
+* :bug: fix(swiper): 异步加载 indicator 不显示 (#2167) @Alex-huxiyang
+
+
 # v2.6.0
 `2024-04-12`
 

package/dist/esm/Cell.js

@@ -1,4 +1,4 @@
-import { C as Cell } from "./cell.taro-CCnLF6RC.js";
+import { C as Cell } from "./cell.taro-CmI4m0SC.js";
 export {
   Cell as default
 };

package/dist/esm/CellGroup.js

@@ -1,4 +1,4 @@
-import { C as CellGroup } from "./cellgroup.taro-Dz69kT6e.js";
+import { C as CellGroup } from "./cellgroup.taro-CYsSk-Bt.js";
 export {
   CellGroup as default
 };

package/dist/esm/Form.js

@@ -1,8 +1,8 @@
 import React__default from "react";
 import classNames from "classnames";
-import { u as useForm, S as SECRET, C as Context, F as FormItem } from "./formitem.taro-Brz5dj_8.js";
+import { u as useForm, S as SECRET, C as Context, F as FormItem } from "./formitem.taro-DDNlpN_O.js";
 import { C as ComponentDefaults } from "./typings-DV9RBfhj.js";
-import { C as Cell } from "./cell.taro-CCnLF6RC.js";
+import { C as Cell } from "./cell.taro-CmI4m0SC.js";
 const defaultProps = Object.assign(Object.assign({}, ComponentDefaults), { labelPosition: "right", starPosition: "left", divider: false, onFinish: (values) => {
 }, onFinishFailed: (values, errorFields) => {
 } });

package/dist/esm/FormItem.js

@@ -1,4 +1,4 @@
-import { F as FormItem } from "./formitem.taro-Brz5dj_8.js";
+import { F as FormItem } from "./formitem.taro-DDNlpN_O.js";
 export {
   FormItem as default
 };

package/dist/esm/Swiper.js

@@ -1,5 +1,5 @@
 import { _ as __rest } from "./tslib.es6-BZ8i9Q6l.js";
-import React__default, { forwardRef, useState, useRef, Children, useEffect, useImperativeHandle } from "react";
+import React__default, { forwardRef, useState, useMemo, useEffect, useImperativeHandle, Children } from "react";
 import { View, Swiper as Swiper$1, SwiperItem } from "@tarojs/components";
 import classNames from "classnames";
 import { I as Indicator } from "./indicator.taro-CpHZtD9p.js";
@@ -17,21 +17,27 @@ const classPrefix = "nut-swiper";
 const Swiper = forwardRef((props, ref) => {
   const _a = Object.assign(Object.assign({}, defaultProps), props), { width, height, className, children, indicator, loop, autoPlay, duration, direction, defaultValue, onChange, style } = _a, rest = __rest(_a, ["width", "height", "className", "children", "indicator", "loop", "autoPlay", "duration", "direction", "defaultValue", "onChange", "style"]);
   const [current, setCurrent] = useState(defaultValue);
-  const childrenCount = useRef(Children.toArray(children).length);
+  const childrenCount = useMemo(() => {
+    let c = 0;
+    React__default.Children.map(children, (child, index) => {
+      c += 1;
+    });
+    return c;
+  }, [children]);
   useEffect(() => {
     setCurrent(defaultValue);
   }, [defaultValue]);
   const renderIndicator = () => {
     if (React__default.isValidElement(indicator))
       return indicator;
-    if (indicator === true) {
+    if (indicator) {
       return React__default.createElement(
         "div",
         { className: classNames({
           [`${classPrefix}-indicator`]: true,
           [`${classPrefix}-indicator-vertical`]: direction === "vertical"
         }) },
-        React__default.createElement(Indicator, { current, total: childrenCount.current, direction })
+        React__default.createElement(Indicator, { current, total: childrenCount, direction })
       );
     }
     return null;
@@ -45,16 +51,16 @@ const Swiper = forwardRef((props, ref) => {
     },
     next: () => {
       if (loop) {
-        setCurrent((current + 1) % childrenCount.current);
+        setCurrent((current + 1) % childrenCount);
       } else {
-        setCurrent(current + 1 >= childrenCount.current ? current : current + 1);
+        setCurrent(current + 1 >= childrenCount ? current : current + 1);
       }
     },
     prev: () => {
       if (loop) {
         let next = current - 1;
-        next = next < 0 ? childrenCount.current + next : next;
-        setCurrent(next % childrenCount.current);
+        next = next < 0 ? childrenCount + next : next;
+        setCurrent(next % childrenCount);
       } else {
         setCurrent(current - 1 <= 0 ? 0 : current - 1);
       }

package/dist/esm/{cell.taro-CCnLF6RC.js → cell.taro-CmI4m0SC.js}

@@ -2,7 +2,7 @@ import { _ as __rest } from "./tslib.es6-BZ8i9Q6l.js";
 import React__default, { useContext } from "react";
 import classNames from "classnames";
 import { C as ComponentDefaults } from "./typings-DV9RBfhj.js";
-import { a as CellGroupContext, C as CellGroup } from "./cellgroup.taro-Dz69kT6e.js";
+import { a as CellGroupContext, C as CellGroup } from "./cellgroup.taro-CYsSk-Bt.js";
 const defaultProps = Object.assign(Object.assign({}, ComponentDefaults), { title: null, description: null, extra: null, radius: "6px", align: "flex-start", onClick: (event) => {
 } });
 const classPrefix = "nut-cell";

package/dist/esm/{cellgroup.taro-Dz69kT6e.js → cellgroup.taro-CYsSk-Bt.js}

@@ -6,7 +6,7 @@ const CellGroupContext = createContext(null);
 const defaultProps = Object.assign(Object.assign({}, ComponentDefaults), { title: "", description: "", divider: true });
 const classPrefix = "nut-cell-group";
 const CellGroup = (props) => {
-  const _a = Object.assign(Object.assign({}, defaultProps), props), { children, className, style, title, description, divider } = _a, rest = __rest(_a, ["children", "className", "style", "title", "description", "divider"]);
+  const _a = Object.assign(Object.assign({}, defaultProps), props), { children, className, title, description, divider } = _a, rest = __rest(_a, ["children", "className", "title", "description", "divider"]);
   return React__default.createElement(
     "div",
     Object.assign({ className: classNames(classPrefix, className) }, rest),

package/dist/esm/{formitem.taro-Brz5dj_8.js → formitem.taro-DDNlpN_O.js}

@@ -1,5 +1,5 @@
 import React__default, { createContext, useRef } from "react";
-import { C as Cell } from "./cell.taro-CCnLF6RC.js";
+import { C as Cell } from "./cell.taro-CmI4m0SC.js";
 import { C as ComponentDefaults } from "./typings-DV9RBfhj.js";
 import { a as __awaiter } from "./tslib.es6-BZ8i9Q6l.js";
 import Schema from "async-validator";

package/dist/esm/nutui-react.es.js

@@ -1,6 +1,6 @@
 import { B } from "./button.taro-CjH840d8.js";
-import { C } from "./cell.taro-CCnLF6RC.js";
-import { C as C2 } from "./cellgroup.taro-Dz69kT6e.js";
+import { C } from "./cell.taro-CmI4m0SC.js";
+import { C as C2 } from "./cellgroup.taro-CYsSk-Bt.js";
 import { C as C3, g, s, u, a } from "./configprovider.taro-CyU_tvNJ.js";
 import { I } from "./image.taro-BLz2WCva.js";
 import { O } from "./overlay.taro--1Kf1D7C.js";
@@ -32,7 +32,7 @@ import { C as C8 } from "./cascader.taro-CFcAyFL-.js";
 import { C as C9, a as a2 } from "./checkbox.taro-CUpF7Afr.js";
 import { D as D2 } from "./datepicker.taro-Bgq3ZNDe.js";
 import { default as default2 } from "./Form.js";
-import { F as F2 } from "./formitem.taro-Brz5dj_8.js";
+import { F as F2 } from "./formitem.taro-DDNlpN_O.js";
 import { I as I2 } from "./input.taro-CAZ-rRMH.js";
 import { I as I3 } from "./inputnumber.taro-CQiAPZgS.js";
 import { M } from "./menu.taro-J7oZoaGM.js";

package/dist/locales/base.js

@@ -1,5 +1,5 @@
 /*!
-* @nutui/nutui-react-taro v2.6.0 Fri Apr 12 2024 16:18:36 GMT+0800 (China Standard Time)
+* @nutui/nutui-react-taro v2.6.1 Fri Apr 19 2024 14:47:41 GMT+0800 (China Standard Time)
 * (c) 2023 @jdf2e.
 * Released under the MIT License.
 */

package/dist/locales/en-US.js

@@ -1,5 +1,5 @@
 /*!
-* @nutui/nutui-react-taro v2.6.0 Fri Apr 12 2024 16:18:36 GMT+0800 (China Standard Time)
+* @nutui/nutui-react-taro v2.6.1 Fri Apr 19 2024 14:47:41 GMT+0800 (China Standard Time)
 * (c) 2023 @jdf2e.
 * Released under the MIT License.
 */

package/dist/locales/id-ID.js

@@ -1,5 +1,5 @@
 /*!
-* @nutui/nutui-react-taro v2.6.0 Fri Apr 12 2024 16:18:36 GMT+0800 (China Standard Time)
+* @nutui/nutui-react-taro v2.6.1 Fri Apr 19 2024 14:47:41 GMT+0800 (China Standard Time)
 * (c) 2023 @jdf2e.
 * Released under the MIT License.
 */

package/dist/locales/tr-TR.js

@@ -1,5 +1,5 @@
 /*!
-* @nutui/nutui-react-taro v2.6.0 Fri Apr 12 2024 16:18:36 GMT+0800 (China Standard Time)
+* @nutui/nutui-react-taro v2.6.1 Fri Apr 19 2024 14:47:41 GMT+0800 (China Standard Time)
 * (c) 2023 @jdf2e.
 * Released under the MIT License.
 */

package/dist/locales/zh-CN.js

@@ -1,5 +1,5 @@
 /*!
-* @nutui/nutui-react-taro v2.6.0 Fri Apr 12 2024 16:18:36 GMT+0800 (China Standard Time)
+* @nutui/nutui-react-taro v2.6.1 Fri Apr 19 2024 14:47:41 GMT+0800 (China Standard Time)
 * (c) 2023 @jdf2e.
 * Released under the MIT License.
 */

package/dist/locales/zh-TW.js

@@ -1,5 +1,5 @@
 /*!
-* @nutui/nutui-react-taro v2.6.0 Fri Apr 12 2024 16:18:36 GMT+0800 (China Standard Time)
+* @nutui/nutui-react-taro v2.6.1 Fri Apr 19 2024 14:47:41 GMT+0800 (China Standard Time)
 * (c) 2023 @jdf2e.
 * Released under the MIT License.
 */

package/dist/locales/zh-UG.js

@@ -1,5 +1,5 @@
 /*!
-* @nutui/nutui-react-taro v2.6.0 Fri Apr 12 2024 16:18:36 GMT+0800 (China Standard Time)
+* @nutui/nutui-react-taro v2.6.1 Fri Apr 19 2024 14:47:41 GMT+0800 (China Standard Time)
 * (c) 2023 @jdf2e.
 * Released under the MIT License.
 */

package/dist/nutui.react.es.js

@@ -1,5 +1,5 @@
 /*!
-* @nutui/nutui-react-taro v2.6.0 Fri Apr 12 2024 16:18:09 GMT+0800 (China Standard Time)
+* @nutui/nutui-react-taro v2.6.1 Fri Apr 19 2024 14:47:10 GMT+0800 (China Standard Time)
 * (c) 2023 @jdf2e.
 * Released under the MIT License.
 */
@@ -305,7 +305,7 @@ const defaultProps$1v = {
 };
 const classPrefix$r = "nut-cell-group";
 const CellGroup = (props) => {
-  const { children, className, style, title, description, divider, ...rest } = {
+  const { children, className, title, description, divider, ...rest } = {
     ...defaultProps$1v,
     ...props
   };
@@ -3424,6 +3424,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) {
@@ -3472,7 +3485,7 @@ function useLockScroll(rootRef, shouldLock) {
     document.addEventListener(
       "touchmove",
       onTouchMove,
-      false
+      passiveSupported ? { passive: false } : false
     );
     if (!totalLockCount) {
       document.body.classList.add(BODY_LOCK_CLASS);
@@ -8043,7 +8056,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);
@@ -16806,14 +16819,20 @@ const Swiper = forwardRef((props, ref) => {
     ...props
   };
   const [current, setCurrent] = useState(defaultValue);
-  const childrenCount = useRef(Children.toArray(children).length);
+  const childrenCount = useMemo$1(() => {
+    let c2 = 0;
+    React__default.Children.map(children, (child, index) => {
+      c2 += 1;
+    });
+    return c2;
+  }, [children]);
   useEffect(() => {
     setCurrent(defaultValue);
   }, [defaultValue]);
   const renderIndicator = () => {
     if (React__default.isValidElement(indicator))
       return indicator;
-    if (indicator === true) {
+    if (indicator) {
       return /* @__PURE__ */ React__default.createElement(
         "div",
         {
@@ -16826,7 +16845,7 @@ const Swiper = forwardRef((props, ref) => {
           Indicator,
           {
             current,
-            total: childrenCount.current,
+            total: childrenCount,
             direction
           }
         )
@@ -16843,16 +16862,16 @@ const Swiper = forwardRef((props, ref) => {
     },
     next: () => {
       if (loop) {
-        setCurrent((current + 1) % childrenCount.current);
+        setCurrent((current + 1) % childrenCount);
       } else {
-        setCurrent(current + 1 >= childrenCount.current ? current : current + 1);
+        setCurrent(current + 1 >= childrenCount ? current : current + 1);
       }
     },
     prev: () => {
       if (loop) {
         let next = current - 1;
-        next = next < 0 ? childrenCount.current + next : next;
-        setCurrent(next % childrenCount.current);
+        next = next < 0 ? childrenCount + next : next;
+        setCurrent(next % childrenCount);
       } else {
         setCurrent(current - 1 <= 0 ? 0 : current - 1);
       }

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.0 Fri Apr 12 2024 16:18:09 GMT+0800 (China Standard Time)
+* @nutui/nutui-react-taro v2.6.1 Fri Apr 19 2024 14:47:10 GMT+0800 (China Standard Time)
 * (c) 2023 @jdf2e.
 * Released under the MIT License.
 */
@@ -321,7 +321,7 @@
   };
   const classPrefix$r = "nut-cell-group";
   const CellGroup = (props) => {
-    const { children, className, style, title, description, divider, ...rest } = {
+    const { children, className, title, description, divider, ...rest } = {
       ...defaultProps$1v,
       ...props
     };
@@ -3440,6 +3440,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) {
@@ -3488,7 +3501,7 @@
       document.addEventListener(
         "touchmove",
         onTouchMove,
-        false
+        passiveSupported ? { passive: false } : false
       );
       if (!totalLockCount) {
         document.body.classList.add(BODY_LOCK_CLASS);
@@ -8059,7 +8072,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);
@@ -16822,14 +16835,20 @@
       ...props
     };
     const [current, setCurrent] = React.useState(defaultValue);
-    const childrenCount = React.useRef(React.Children.toArray(children).length);
+    const childrenCount = React.useMemo(() => {
+      let c2 = 0;
+      React.Children.map(children, (child, index) => {
+        c2 += 1;
+      });
+      return c2;
+    }, [children]);
     React.useEffect(() => {
       setCurrent(defaultValue);
     }, [defaultValue]);
     const renderIndicator = () => {
       if (React.isValidElement(indicator))
         return indicator;
-      if (indicator === true) {
+      if (indicator) {
         return /* @__PURE__ */ React.createElement(
           "div",
           {
@@ -16842,7 +16861,7 @@
             Indicator,
             {
               current,
-              total: childrenCount.current,
+              total: childrenCount,
               direction
             }
           )
@@ -16859,16 +16878,16 @@
       },
       next: () => {
         if (loop) {
-          setCurrent((current + 1) % childrenCount.current);
+          setCurrent((current + 1) % childrenCount);
         } else {
-          setCurrent(current + 1 >= childrenCount.current ? current : current + 1);
+          setCurrent(current + 1 >= childrenCount ? current : current + 1);
         }
       },
       prev: () => {
         if (loop) {
           let next = current - 1;
-          next = next < 0 ? childrenCount.current + next : next;
-          setCurrent(next % childrenCount.current);
+          next = next < 0 ? childrenCount + next : next;
+          setCurrent(next % childrenCount);
         } else {
           setCurrent(current - 1 <= 0 ? 0 : current - 1);
         }

package/dist/style.mjs

@@ -1,5 +1,5 @@
 /*!
-* @nutui/nutui-react-taro v2.6.0 Fri Apr 12 2024 16:18:27 GMT+0800 (China Standard Time)
+* @nutui/nutui-react-taro v2.6.1 Fri Apr 19 2024 14:47:30 GMT+0800 (China Standard Time)
 * (c) 2023 @jdf2e.
 * Released under the MIT License.
 */

package/dist/types/utils/use-lock-fn.d.ts

@@ -0,0 +1,2 @@
+declare function useLockFn<P extends any[] = any[], V = any>(fn: (...args: P) => Promise<V>): (...args: P) => Promise<V | undefined>;
+export default useLockFn;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nutui/nutui-react-taro",
-  "version": "2.6.0",
+  "version": "2.6.1",
   "style": "dist/style.css",
   "main": "dist/nutui.react.umd.js",
   "module": "dist/esm/nutui-react.es.js",