@nutui/nutui-react-taro 2.3.9 → 2.3.11-patch.0

package/dist/nutui.react.es.js

@@ -5,7 +5,7 @@ var __publicField = (obj, key, value) => {
   return value;
 };
 /*!
-* @nutui/nutui-react-taro v2.3.9 Fri Feb 02 2024 16:15:32 GMT+0800 (China Standard Time)
+* @nutui/nutui-react-taro v2.3.11-patch.0 Wed Mar 26 2025 14:30:13 GMT+0800 (China Standard Time)
 * (c) 2023 @jdf2e.
 * Released under the MIT License.
 */
@@ -28,34 +28,44 @@ var classnames = { exports: {} };
   (function() {
     var hasOwn = {}.hasOwnProperty;
     function classNames2() {
-      var classes = [];
+      var classes = "";
       for (var i2 = 0; i2 < arguments.length; i2++) {
         var arg = arguments[i2];
-        if (!arg)
-          continue;
-        var argType = typeof arg;
-        if (argType === "string" || argType === "number") {
-          classes.push(arg);
-        } else if (Array.isArray(arg)) {
-          if (arg.length) {
-            var inner = classNames2.apply(null, arg);
-            if (inner) {
-              classes.push(inner);
-            }
-          }
-        } else if (argType === "object") {
-          if (arg.toString !== Object.prototype.toString && !arg.toString.toString().includes("[native code]")) {
-            classes.push(arg.toString());
-            continue;
-          }
-          for (var key in arg) {
-            if (hasOwn.call(arg, key) && arg[key]) {
-              classes.push(key);
-            }
-          }
+        if (arg) {
+          classes = appendClass(classes, parseValue(arg));
         }
       }
-      return classes.join(" ");
+      return classes;
+    }
+    function parseValue(arg) {
+      if (typeof arg === "string" || typeof arg === "number") {
+        return arg;
+      }
+      if (typeof arg !== "object") {
+        return "";
+      }
+      if (Array.isArray(arg)) {
+        return classNames2.apply(null, arg);
+      }
+      if (arg.toString !== Object.prototype.toString && !arg.toString.toString().includes("[native code]")) {
+        return arg.toString();
+      }
+      var classes = "";
+      for (var key in arg) {
+        if (hasOwn.call(arg, key) && arg[key]) {
+          classes = appendClass(classes, key);
+        }
+      }
+      return classes;
+    }
+    function appendClass(value, newClass) {
+      if (!newClass) {
+        return value;
+      }
+      if (value) {
+        return value + " " + newClass;
+      }
+      return value + newClass;
     }
     if (module.exports) {
       classNames2.default = classNames2;
@@ -1615,72 +1625,111 @@ function _inheritsLoose$1(subClass, superClass) {
   _setPrototypeOf$1(subClass, superClass);
 }
 var propTypes = { exports: {} };
-var ReactPropTypesSecret_1;
-var hasRequiredReactPropTypesSecret;
-function requireReactPropTypesSecret() {
-  if (hasRequiredReactPropTypesSecret)
-    return ReactPropTypesSecret_1;
-  hasRequiredReactPropTypesSecret = 1;
-  var ReactPropTypesSecret = "SECRET_DO_NOT_PASS_THIS_OR_YOU_WILL_BE_FIRED";
-  ReactPropTypesSecret_1 = ReactPropTypesSecret;
-  return ReactPropTypesSecret_1;
-}
-var factoryWithThrowingShims;
-var hasRequiredFactoryWithThrowingShims;
-function requireFactoryWithThrowingShims() {
-  if (hasRequiredFactoryWithThrowingShims)
-    return factoryWithThrowingShims;
-  hasRequiredFactoryWithThrowingShims = 1;
-  var ReactPropTypesSecret = requireReactPropTypesSecret();
-  function emptyFunction() {
-  }
-  function emptyFunctionWithReset() {
-  }
-  emptyFunctionWithReset.resetWarningCache = emptyFunction;
-  factoryWithThrowingShims = function() {
-    function shim(props, propName, componentName, location, propFullName, secret) {
-      if (secret === ReactPropTypesSecret) {
-        return;
+var reactIs = { exports: {} };
+var reactIs_production_min = {};
+/** @license React v16.13.1
+ * react-is.production.min.js
+ *
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+var hasRequiredReactIs_production_min;
+function requireReactIs_production_min() {
+  if (hasRequiredReactIs_production_min)
+    return reactIs_production_min;
+  hasRequiredReactIs_production_min = 1;
+  var b = "function" === typeof Symbol && Symbol.for, c2 = b ? Symbol.for("react.element") : 60103, d2 = b ? Symbol.for("react.portal") : 60106, e2 = b ? Symbol.for("react.fragment") : 60107, f = b ? Symbol.for("react.strict_mode") : 60108, g2 = b ? Symbol.for("react.profiler") : 60114, h2 = b ? Symbol.for("react.provider") : 60109, k = b ? Symbol.for("react.context") : 60110, l = b ? Symbol.for("react.async_mode") : 60111, m = b ? Symbol.for("react.concurrent_mode") : 60111, n = b ? Symbol.for("react.forward_ref") : 60112, p = b ? Symbol.for("react.suspense") : 60113, q = b ? Symbol.for("react.suspense_list") : 60120, r = b ? Symbol.for("react.memo") : 60115, t2 = b ? Symbol.for("react.lazy") : 60116, v = b ? Symbol.for("react.block") : 60121, w2 = b ? Symbol.for("react.fundamental") : 60117, x = b ? Symbol.for("react.responder") : 60118, y = b ? Symbol.for("react.scope") : 60119;
+  function z2(a2) {
+    if ("object" === typeof a2 && null !== a2) {
+      var u = a2.$$typeof;
+      switch (u) {
+        case c2:
+          switch (a2 = a2.type, a2) {
+            case l:
+            case m:
+            case e2:
+            case g2:
+            case f:
+            case p:
+              return a2;
+            default:
+              switch (a2 = a2 && a2.$$typeof, a2) {
+                case k:
+                case n:
+                case t2:
+                case r:
+                case h2:
+                  return a2;
+                default:
+                  return u;
+              }
+          }
+        case d2:
+          return u;
       }
-      var err = new Error(
-        "Calling PropTypes validators directly is not supported by the `prop-types` package. Use PropTypes.checkPropTypes() to call them. Read more at http://fb.me/use-check-prop-types"
-      );
-      err.name = "Invariant Violation";
-      throw err;
     }
-    shim.isRequired = shim;
-    function getShim() {
-      return shim;
-    }
-    var ReactPropTypes = {
-      array: shim,
-      bigint: shim,
-      bool: shim,
-      func: shim,
-      number: shim,
-      object: shim,
-      string: shim,
-      symbol: shim,
-      any: shim,
-      arrayOf: getShim,
-      element: shim,
-      elementType: shim,
-      instanceOf: getShim,
-      node: shim,
-      objectOf: getShim,
-      oneOf: getShim,
-      oneOfType: getShim,
-      shape: getShim,
-      exact: getShim,
-      checkPropTypes: emptyFunctionWithReset,
-      resetWarningCache: emptyFunction
-    };
-    ReactPropTypes.PropTypes = ReactPropTypes;
-    return ReactPropTypes;
+  }
+  function A2(a2) {
+    return z2(a2) === m;
+  }
+  reactIs_production_min.AsyncMode = l;
+  reactIs_production_min.ConcurrentMode = m;
+  reactIs_production_min.ContextConsumer = k;
+  reactIs_production_min.ContextProvider = h2;
+  reactIs_production_min.Element = c2;
+  reactIs_production_min.ForwardRef = n;
+  reactIs_production_min.Fragment = e2;
+  reactIs_production_min.Lazy = t2;
+  reactIs_production_min.Memo = r;
+  reactIs_production_min.Portal = d2;
+  reactIs_production_min.Profiler = g2;
+  reactIs_production_min.StrictMode = f;
+  reactIs_production_min.Suspense = p;
+  reactIs_production_min.isAsyncMode = function(a2) {
+    return A2(a2) || z2(a2) === l;
   };
-  return factoryWithThrowingShims;
+  reactIs_production_min.isConcurrentMode = A2;
+  reactIs_production_min.isContextConsumer = function(a2) {
+    return z2(a2) === k;
+  };
+  reactIs_production_min.isContextProvider = function(a2) {
+    return z2(a2) === h2;
+  };
+  reactIs_production_min.isElement = function(a2) {
+    return "object" === typeof a2 && null !== a2 && a2.$$typeof === c2;
+  };
+  reactIs_production_min.isForwardRef = function(a2) {
+    return z2(a2) === n;
+  };
+  reactIs_production_min.isFragment = function(a2) {
+    return z2(a2) === e2;
+  };
+  reactIs_production_min.isLazy = function(a2) {
+    return z2(a2) === t2;
+  };
+  reactIs_production_min.isMemo = function(a2) {
+    return z2(a2) === r;
+  };
+  reactIs_production_min.isPortal = function(a2) {
+    return z2(a2) === d2;
+  };
+  reactIs_production_min.isProfiler = function(a2) {
+    return z2(a2) === g2;
+  };
+  reactIs_production_min.isStrictMode = function(a2) {
+    return z2(a2) === f;
+  };
+  reactIs_production_min.isSuspense = function(a2) {
+    return z2(a2) === p;
+  };
+  reactIs_production_min.isValidElementType = function(a2) {
+    return "string" === typeof a2 || "function" === typeof a2 || a2 === e2 || a2 === m || a2 === g2 || a2 === f || a2 === p || a2 === q || "object" === typeof a2 && null !== a2 && (a2.$$typeof === t2 || a2.$$typeof === r || a2.$$typeof === h2 || a2.$$typeof === k || a2.$$typeof === n || a2.$$typeof === w2 || a2.$$typeof === x || a2.$$typeof === y || a2.$$typeof === v);
+  };
+  reactIs_production_min.typeOf = z2;
+  return reactIs_production_min;
 }
-var reactIs = { exports: {} };
 var reactIs_development = {};
 /** @license React v16.13.1
  * react-is.development.js
@@ -1833,120 +1882,16 @@ function requireReactIs_development() {
       reactIs_development.isForwardRef = isForwardRef;
       reactIs_development.isFragment = isFragment;
       reactIs_development.isLazy = isLazy;
-      reactIs_development.isMemo = isMemo;
-      reactIs_development.isPortal = isPortal;
-      reactIs_development.isProfiler = isProfiler;
-      reactIs_development.isStrictMode = isStrictMode;
-      reactIs_development.isSuspense = isSuspense;
-      reactIs_development.isValidElementType = isValidElementType;
-      reactIs_development.typeOf = typeOf;
-    })();
-  }
-  return reactIs_development;
-}
-var reactIs_production_min = {};
-/** @license React v16.13.1
- * react-is.production.min.js
- *
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-var hasRequiredReactIs_production_min;
-function requireReactIs_production_min() {
-  if (hasRequiredReactIs_production_min)
-    return reactIs_production_min;
-  hasRequiredReactIs_production_min = 1;
-  var b = "function" === typeof Symbol && Symbol.for, c2 = b ? Symbol.for("react.element") : 60103, d2 = b ? Symbol.for("react.portal") : 60106, e2 = b ? Symbol.for("react.fragment") : 60107, f = b ? Symbol.for("react.strict_mode") : 60108, g2 = b ? Symbol.for("react.profiler") : 60114, h2 = b ? Symbol.for("react.provider") : 60109, k = b ? Symbol.for("react.context") : 60110, l = b ? Symbol.for("react.async_mode") : 60111, m = b ? Symbol.for("react.concurrent_mode") : 60111, n = b ? Symbol.for("react.forward_ref") : 60112, p = b ? Symbol.for("react.suspense") : 60113, q = b ? Symbol.for("react.suspense_list") : 60120, r = b ? Symbol.for("react.memo") : 60115, t2 = b ? Symbol.for("react.lazy") : 60116, v = b ? Symbol.for("react.block") : 60121, w2 = b ? Symbol.for("react.fundamental") : 60117, x = b ? Symbol.for("react.responder") : 60118, y = b ? Symbol.for("react.scope") : 60119;
-  function z2(a2) {
-    if ("object" === typeof a2 && null !== a2) {
-      var u = a2.$$typeof;
-      switch (u) {
-        case c2:
-          switch (a2 = a2.type, a2) {
-            case l:
-            case m:
-            case e2:
-            case g2:
-            case f:
-            case p:
-              return a2;
-            default:
-              switch (a2 = a2 && a2.$$typeof, a2) {
-                case k:
-                case n:
-                case t2:
-                case r:
-                case h2:
-                  return a2;
-                default:
-                  return u;
-              }
-          }
-        case d2:
-          return u;
-      }
-    }
-  }
-  function A2(a2) {
-    return z2(a2) === m;
-  }
-  reactIs_production_min.AsyncMode = l;
-  reactIs_production_min.ConcurrentMode = m;
-  reactIs_production_min.ContextConsumer = k;
-  reactIs_production_min.ContextProvider = h2;
-  reactIs_production_min.Element = c2;
-  reactIs_production_min.ForwardRef = n;
-  reactIs_production_min.Fragment = e2;
-  reactIs_production_min.Lazy = t2;
-  reactIs_production_min.Memo = r;
-  reactIs_production_min.Portal = d2;
-  reactIs_production_min.Profiler = g2;
-  reactIs_production_min.StrictMode = f;
-  reactIs_production_min.Suspense = p;
-  reactIs_production_min.isAsyncMode = function(a2) {
-    return A2(a2) || z2(a2) === l;
-  };
-  reactIs_production_min.isConcurrentMode = A2;
-  reactIs_production_min.isContextConsumer = function(a2) {
-    return z2(a2) === k;
-  };
-  reactIs_production_min.isContextProvider = function(a2) {
-    return z2(a2) === h2;
-  };
-  reactIs_production_min.isElement = function(a2) {
-    return "object" === typeof a2 && null !== a2 && a2.$$typeof === c2;
-  };
-  reactIs_production_min.isForwardRef = function(a2) {
-    return z2(a2) === n;
-  };
-  reactIs_production_min.isFragment = function(a2) {
-    return z2(a2) === e2;
-  };
-  reactIs_production_min.isLazy = function(a2) {
-    return z2(a2) === t2;
-  };
-  reactIs_production_min.isMemo = function(a2) {
-    return z2(a2) === r;
-  };
-  reactIs_production_min.isPortal = function(a2) {
-    return z2(a2) === d2;
-  };
-  reactIs_production_min.isProfiler = function(a2) {
-    return z2(a2) === g2;
-  };
-  reactIs_production_min.isStrictMode = function(a2) {
-    return z2(a2) === f;
-  };
-  reactIs_production_min.isSuspense = function(a2) {
-    return z2(a2) === p;
-  };
-  reactIs_production_min.isValidElementType = function(a2) {
-    return "string" === typeof a2 || "function" === typeof a2 || a2 === e2 || a2 === m || a2 === g2 || a2 === f || a2 === p || a2 === q || "object" === typeof a2 && null !== a2 && (a2.$$typeof === t2 || a2.$$typeof === r || a2.$$typeof === h2 || a2.$$typeof === k || a2.$$typeof === n || a2.$$typeof === w2 || a2.$$typeof === x || a2.$$typeof === y || a2.$$typeof === v);
-  };
-  reactIs_production_min.typeOf = z2;
-  return reactIs_production_min;
+      reactIs_development.isMemo = isMemo;
+      reactIs_development.isPortal = isPortal;
+      reactIs_development.isProfiler = isProfiler;
+      reactIs_development.isStrictMode = isStrictMode;
+      reactIs_development.isSuspense = isSuspense;
+      reactIs_development.isValidElementType = isValidElementType;
+      reactIs_development.typeOf = typeOf;
+    })();
+  }
+  return reactIs_development;
 }
 var hasRequiredReactIs;
 function requireReactIs() {
@@ -2036,6 +1981,16 @@ function requireObjectAssign() {
   };
   return objectAssign;
 }
+var ReactPropTypesSecret_1;
+var hasRequiredReactPropTypesSecret;
+function requireReactPropTypesSecret() {
+  if (hasRequiredReactPropTypesSecret)
+    return ReactPropTypesSecret_1;
+  hasRequiredReactPropTypesSecret = 1;
+  var ReactPropTypesSecret = "SECRET_DO_NOT_PASS_THIS_OR_YOU_WILL_BE_FIRED";
+  ReactPropTypesSecret_1 = ReactPropTypesSecret;
+  return ReactPropTypesSecret_1;
+}
 var has;
 var hasRequiredHas;
 function requireHas() {
@@ -2553,6 +2508,61 @@ function requireFactoryWithTypeCheckers() {
   };
   return factoryWithTypeCheckers;
 }
+var factoryWithThrowingShims;
+var hasRequiredFactoryWithThrowingShims;
+function requireFactoryWithThrowingShims() {
+  if (hasRequiredFactoryWithThrowingShims)
+    return factoryWithThrowingShims;
+  hasRequiredFactoryWithThrowingShims = 1;
+  var ReactPropTypesSecret = requireReactPropTypesSecret();
+  function emptyFunction() {
+  }
+  function emptyFunctionWithReset() {
+  }
+  emptyFunctionWithReset.resetWarningCache = emptyFunction;
+  factoryWithThrowingShims = function() {
+    function shim(props, propName, componentName, location, propFullName, secret) {
+      if (secret === ReactPropTypesSecret) {
+        return;
+      }
+      var err = new Error(
+        "Calling PropTypes validators directly is not supported by the `prop-types` package. Use PropTypes.checkPropTypes() to call them. Read more at http://fb.me/use-check-prop-types"
+      );
+      err.name = "Invariant Violation";
+      throw err;
+    }
+    shim.isRequired = shim;
+    function getShim() {
+      return shim;
+    }
+    var ReactPropTypes = {
+      array: shim,
+      bigint: shim,
+      bool: shim,
+      func: shim,
+      number: shim,
+      object: shim,
+      string: shim,
+      symbol: shim,
+      any: shim,
+      arrayOf: getShim,
+      element: shim,
+      elementType: shim,
+      instanceOf: getShim,
+      node: shim,
+      objectOf: getShim,
+      oneOf: getShim,
+      oneOfType: getShim,
+      shape: getShim,
+      exact: getShim,
+      checkPropTypes: emptyFunctionWithReset,
+      resetWarningCache: emptyFunction
+    };
+    ReactPropTypes.PropTypes = ReactPropTypes;
+    return ReactPropTypes;
+  };
+  return factoryWithThrowingShims;
+}
 if (process.env.NODE_ENV !== "production") {
   var ReactIs = requireReactIs();
   var throwOnDirectAccess = true;
@@ -4034,7 +4044,7 @@ const Sticky = (props) => {
     }
   }, []);
   usePageScroll((res) => {
-    if (getEnv() === "WEAPP") {
+    if (getEnv() !== "WEB") {
       handleScroll(res.scrollTop);
     }
   });
@@ -4097,7 +4107,7 @@ const BackTop = (props) => {
       duration: duration > 0 ? duration : 0
     });
   };
-  const styles = style ? {
+  const styles = Object.keys(style || {}).length !== 0 ? {
     zIndex,
     ...style
   } : {
@@ -5342,7 +5352,7 @@ const Tabs = (props) => {
           onClick: (e2) => {
             tabChange(item);
           },
-          className: classNames(`${classPrefix$k}-titles-item taro`, {
+          className: classNames(`${classPrefix$k}-titles-item`, {
             [`nut-tabs-titles-item-active`]: !item.disabled && String(item.value) === String(value),
             [`nut-tabs-titles-item-disabled`]: item.disabled,
             [`nut-tabs-titles-item-${align}`]: align
@@ -5585,7 +5595,6 @@ class Tree {
     return pathNodes;
   }
 }
-const Tree$1 = Tree;
 const defaultProps$17 = {
   ...ComponentDefaults,
   activeColor: "",
@@ -5661,7 +5670,7 @@ const InternalCascader = (props, ref) => {
         paneKey: ""
       }
     ],
-    tree: new Tree$1([], {}),
+    tree: new Tree([], {}),
     tabsCursor: 0,
     // 选中的tab项
     initLoading: false,
@@ -5691,7 +5700,7 @@ const InternalCascader = (props, ref) => {
     } else {
       state.optionsData = options;
     }
-    state.tree = new Tree$1(state.optionsData, {
+    state.tree = new Tree(state.optionsData, {
       value: state.configs.optionKey.valueKey,
       text: state.configs.optionKey.textKey,
       children: state.configs.optionKey.childrenKey
@@ -9752,6 +9761,7 @@ class FormStore {
   constructor() {
     // 初始化数据
     __publicField(this, "initialValues", {});
+    __publicField(this, "updateList", []);
     // 存放表单中所有的数据 eg. {password: "ddd",username: "123"}
     __publicField(this, "store", {});
     // 所有的组件实例
@@ -9821,6 +9831,15 @@ class FormStore {
           }
         });
       });
+      this.updateList.forEach((item) => {
+        let shouldUpdate = item.condition;
+        if (typeof item.condition === "function") {
+          shouldUpdate = item.condition();
+        }
+        if (shouldUpdate) {
+          item.entity.onStoreChange("update");
+        }
+      });
     });
     __publicField(this, "setCallback", (callback) => {
       this.callbacks = {
@@ -9868,9 +9887,11 @@ class FormStore {
         );
       }
       const errs = [];
-      filterEntities.forEach((entity) => {
-        this.validateEntities(entity, errs);
-      });
+      await Promise.all(
+        filterEntities.map(async (entity) => {
+          await this.validateEntities(entity, errs);
+        })
+      );
       return errs;
     });
     __publicField(this, "submit", async () => {
@@ -9889,6 +9910,16 @@ class FormStore {
         entity.onStoreChange("reset");
       });
     });
+    // 监听事件
+    __publicField(this, "registerUpdate", (field, shouldUpdate) => {
+      this.updateList.push({
+        entity: field,
+        condition: shouldUpdate
+      });
+      return () => {
+        this.updateList = this.updateList.filter((i2) => i2.entity !== field);
+      };
+    });
     __publicField(this, "dispatch", ({ name }) => {
       this.validateFields([name]);
     });
@@ -9900,7 +9931,8 @@ class FormStore {
           setInitialValues: this.setInitialValues,
           dispatch: this.dispatch,
           store: this.store,
-          fieldEntities: this.fieldEntities
+          fieldEntities: this.fieldEntities,
+          registerUpdate: this.registerUpdate
         };
       }
     });
@@ -10031,13 +10063,16 @@ const defaultProps$Y = {
   label: "",
   rules: [{ required: false, message: "" }],
   errorMessageAlign: "left",
-  validateTrigger: "onChange"
+  validateTrigger: "onChange",
+  shouldUpdate: false,
+  noStyle: false
 };
 class FormItem extends React__default.Component {
   constructor(props) {
     super(props);
     __publicField(this, "cancelRegister");
     __publicField(this, "componentRef");
+    __publicField(this, "eventOff");
     // children添加value属性和onChange事件
     __publicField(this, "getControlled", (children) => {
       var _a;
@@ -10111,7 +10146,6 @@ class FormItem extends React__default.Component {
       }
     });
     __publicField(this, "renderLayout", (childNode) => {
-      var _a;
       const {
         label,
         name,
@@ -10137,16 +10171,13 @@ class FormItem extends React__default.Component {
           onClick: (e2) => this.props.onClick && this.props.onClick(e2, this.componentRef)
         },
         label ? /* @__PURE__ */ React__default.createElement("div", { className: "nut-cell-title nut-form-item-label" }, renderLabel) : null,
-        /* @__PURE__ */ React__default.createElement("div", { className: "nut-cell-value nut-form-item-body" }, /* @__PURE__ */ React__default.createElement("div", { className: "nut-form-item-body-slots" }, childNode), /* @__PURE__ */ React__default.createElement(
+        /* @__PURE__ */ React__default.createElement("div", { className: "nut-cell-value nut-form-item-body" }, /* @__PURE__ */ React__default.createElement("div", { className: "nut-form-item-body-slots" }, childNode), item && item.length > 0 && /* @__PURE__ */ React__default.createElement(
           "div",
           {
             className: "nut-form-item-body-tips",
-            style: {
-              textAlign: errorMessageAlign,
-              display: (item == null ? void 0 : item.length) ? "initial" : "none"
-            }
+            style: { textAlign: errorMessageAlign }
           },
-          (_a = item == null ? void 0 : item[0]) == null ? void 0 : _a.message
+          item[0].message
         ))
       );
     });
@@ -10156,22 +10187,31 @@ class FormItem extends React__default.Component {
     };
   }
   componentDidMount() {
-    const { registerField } = this.context.getInternal(SECRET);
+    const { registerField, registerUpdate } = this.context.getInternal(SECRET);
     this.cancelRegister = registerField(this);
+    this.eventOff = registerUpdate(this, this.props.shouldUpdate);
   }
   componentWillUnmount() {
     if (this.cancelRegister) {
       this.cancelRegister();
     }
+    if (this.eventOff) {
+      this.eventOff();
+    }
   }
   render() {
     const { children } = this.props;
     const child = Array.isArray(children) ? children[0] : children;
-    const returnChildNode = React__default.cloneElement(
-      child,
-      this.getControlled(child)
-    );
-    return /* @__PURE__ */ React__default.createElement(React__default.Fragment, { key: this.state.resetCount }, this.renderLayout(returnChildNode));
+    let returnChildNode;
+    if (!this.props.shouldUpdate) {
+      returnChildNode = React__default.cloneElement(
+        child,
+        this.getControlled(child)
+      );
+    } else {
+      returnChildNode = child(this.context);
+    }
+    return /* @__PURE__ */ React__default.createElement(React__default.Fragment, { key: this.state.resetCount }, this.props.noStyle ? returnChildNode : this.renderLayout(returnChildNode));
   }
 }
 __publicField(FormItem, "defaultProps", defaultProps$Y);
@@ -10355,7 +10395,10 @@ const Input = forwardRef(
           name,
           className: "nut-input-native",
           ref: inputRef,
-          style: { textAlign: align },
+          style: {
+            textAlign: `${// eslint-disable-next-line no-nested-ternary
+            align === "right" ? "end" : align === "left" ? "start" : "center"}`
+          },
           type: inputType(type4),
           password: type4 === "password",
           maxlength: maxLength,
@@ -10396,11 +10439,10 @@ Input.displayName = "NutInput";
 const defaultProps$W = {
   ...ComponentDefaults,
   disabled: false,
-  min: 1,
-  max: 9999,
   readOnly: false,
   allowEmpty: false,
-  defaultValue: 0,
+  min: 1,
+  max: 9999,
   step: 1,
   digits: 0,
   async: false
@@ -10433,197 +10475,161 @@ const InputNumber = (props) => {
     ...defaultProps$W,
     ...props
   };
-  const inputRef = useRef("");
-  const [_checked, setChecked] = usePropsValue({
-    value,
-    defaultValue
+  const classes = classNames(classPrefix$h, {
+    [`${classPrefix$h}-disabled`]: disabled
   });
+  const [focused, setFocused] = useState(false);
+  const inputRef = useRef(null);
   useEffect(() => {
-    if (formatter) {
-      if (_checked || _checked === 0) {
-        inputRef.current = formatter(_checked);
-        setChecked(formatter(_checked));
-      }
-    }
-  }, []);
-  const classes = classNames(
-    {
-      [`${classPrefix$h}`]: true,
-      [`${classPrefix$h}-disabled`]: disabled
-    },
-    className
-  );
-  const styles = {
-    ...style
-  };
-  const addAllow = (value2 = _checked) => {
-    if (formatter) {
-      const numValue = String(value2).replace(/[^0-9|.]/gi, "");
-      return Number(numValue) < Number(max) && !disabled;
+    var _a, _b;
+    if (focused) {
+      (_b = (_a = inputRef.current) == null ? void 0 : _a.select) == null ? void 0 : _b.call(_a);
     }
-    return Number(value2) < Number(max) && !disabled;
-  };
-  const reduceAllow = (value2 = _checked) => {
-    if (formatter) {
-      const numValue = String(value2).replace(/[^0-9|.]/gi, "");
-      return Number(numValue) > Number(min) && !disabled;
+  }, [focused]);
+  const [shadowValue, setShadowValue] = usePropsValue({
+    value: typeof value === "string" ? parseFloat(value) : value,
+    defaultValue: typeof defaultValue === "string" ? parseFloat(defaultValue) : defaultValue,
+    onChange: (value2) => {
     }
-    return Number(value2) > Number(min) && !disabled;
-  };
-  const iconMinusClasses = classNames("nut-inputnumber-icon icon-minus", {
-    "nut-inputnumber-icon-disabled": !reduceAllow()
-  });
-  const iconAddClasses = classNames("nut-inputnumber-icon icon-plus", {
-    "nut-inputnumber-icon-disabled": !addAllow()
   });
-  const fixedDecimalPlaces = (v) => {
-    return Number(v).toFixed(Number(digits));
-  };
-  const emitChange = (value2, e2) => {
-    const outputValue = fixedDecimalPlaces(value2);
-    onChange && onChange(outputValue, e2);
-    if (!async) {
-      if (Number(outputValue) < Number(min)) {
-        formatter ? setChecked(formatter(Number(min))) : setChecked(Number(min));
-      } else if (Number(outputValue) > Number(max)) {
-        formatter ? setChecked(formatter(Number(max))) : setChecked(Number(max));
-      } else {
-        formatter ? setChecked(formatter(outputValue)) : setChecked(outputValue);
-      }
+  const bound2 = (value2, min2, max2) => {
+    let res = value2;
+    if (min2 !== void 0) {
+      res = Math.max(Number(min2), res);
     }
-  };
-  const reduceNumber = (e2) => {
-    onMinus && onMinus(e2);
-    if (reduceAllow()) {
-      if (formatter) {
-        const numValue = String(_checked).replace(/[^0-9|.]/gi, "");
-        const outputValue = Number(numValue) - Number(step);
-        inputRef.current = formatter(outputValue);
-        emitChange(outputValue, e2);
-      } else {
-        const outputValue = Number(_checked) - Number(step);
-        emitChange(outputValue, e2);
-      }
-    } else {
-      onOverlimit && onOverlimit(e2);
+    if (max2 !== void 0) {
+      res = Math.min(Number(max2), res);
     }
+    return res;
   };
-  const addNumber = (e2) => {
-    onPlus && onPlus(e2);
-    if (addAllow()) {
-      if (formatter) {
-        const numValue = String(_checked).replace(/[^0-9|.]/gi, "");
-        const outputValue = Number(numValue) + Number(step);
-        inputRef.current = formatter(outputValue);
-        emitChange(outputValue, e2);
-      } else {
-        const outputValue = Number(_checked) + Number(step);
-        emitChange(outputValue, e2);
-      }
-    } else {
-      onOverlimit && onOverlimit(e2);
+  const format2 = (value2) => {
+    if (value2 === null)
+      return "";
+    if (typeof value2 === "string")
+      value2 = parseFloat(value2);
+    const fixedValue = bound2(value2, Number(min), Number(max));
+    if (formatter) {
+      return formatter(fixedValue);
     }
-  };
-  const changeValue = (e2) => {
-    const input = e2.target;
-    onChange && onChange(input.value, e2);
-    if (!async) {
-      setChecked(input.value);
+    if (digits) {
+      return fixedValue.toFixed(digits).toString();
     }
+    return fixedValue.toString();
   };
-  const changeFormatValue = (e2) => {
-    const input = e2.target.value;
-    const numReg = /^[0-9]*$/;
-    const numValue = input.replace(/[^0-9|.]/gi, "");
-    if (formatter) {
-      if (!numReg.test(input[0]) && numValue) {
-        setChecked(formatter(numValue));
-      } else if (!numReg.test(input[0]) && !numValue) {
-        setChecked(input);
-      } else if (numReg.test(input[0])) {
-        if (formatter(numValue) === inputRef.current) {
-          setChecked(numValue);
-        } else {
-          setChecked(formatter(numValue));
-          inputRef.current = formatter(numValue);
-        }
-      }
+  const [inputValue, setInputValue] = useState(format2(shadowValue));
+  useEffect(() => {
+    if (!focused && !async) {
+      setShadowValue(bound2(Number(shadowValue), Number(min), Number(max)));
+      setInputValue(format2(shadowValue));
     }
-  };
-  const burFormatValue = (e2) => {
-    const input = e2.target.value;
-    const numReg = /^[0-9]*$/;
-    const numValue = input.replace(/[^0-9|.]/gi, "");
-    if (formatter) {
-      if (formatter(numValue) === input) {
-        emitChange(numValue, e2);
-        return;
-      }
-      if (!numReg.test(input) || !input) {
-        setChecked(formatter(""));
+  }, [focused, shadowValue]);
+  useEffect(() => {
+    if (async) {
+      setShadowValue(bound2(Number(value), Number(min), Number(max)));
+      setInputValue(format2(value));
+    }
+  }, [value]);
+  const calcNextValue = (current, step2, symbol) => {
+    const dig = digits + 1;
+    return (parseFloat(current || "0") * dig + parseFloat(step2) * dig * symbol) / dig;
+  };
+  const update = (negative, e2) => {
+    if (step !== void 0) {
+      const shouldOverBoundary = calcNextValue(
+        shadowValue,
+        step,
+        negative ? -1 : 1
+      );
+      const nextValue = bound2(shouldOverBoundary, Number(min), Number(max));
+      setShadowValue(nextValue);
+      if (negative ? shouldOverBoundary < min : shouldOverBoundary > max) {
+        onOverlimit == null ? void 0 : onOverlimit(e2);
+      } else {
+        onChange == null ? void 0 : onChange(nextValue, e2);
       }
     }
   };
-  const focusValue = (e2) => {
+  const handleReduce = (e2) => {
     if (disabled)
       return;
-    if (readOnly)
-      return;
-    onFocus && onFocus(e2);
+    onMinus == null ? void 0 : onMinus(e2);
+    update(true, e2);
   };
-  const burValue = (e2) => {
+  const handlePlus = (e2) => {
     if (disabled)
       return;
-    if (readOnly)
-      return;
-    const input = e2.target;
-    let value2 = +input.value;
-    if (value2 === 0 && !allowEmpty) {
-      value2 = Number(defaultValue);
+    onPlus == null ? void 0 : onPlus(e2);
+    update(false, e2);
+  };
+  const parseValue = (text) => {
+    if (text === "")
+      return null;
+    if (text === "-")
+      return null;
+    return text;
+  };
+  const handleInputChange = (e2) => {
+    setInputValue(e2.target.value);
+    const valueStr = parseValue(e2.target.value);
+    if (valueStr === null) {
+      if (allowEmpty) {
+        setShadowValue(null);
+      } else {
+        setShadowValue(defaultValue);
+      }
+    } else {
+      setShadowValue(valueStr);
     }
-    if (value2 < Number(min)) {
-      value2 = Number(min);
-    } else if (value2 > Number(max)) {
-      value2 = Number(max);
+    if (!async) {
+      onChange == null ? void 0 : onChange(parseFloat(valueStr || "0").toFixed(digits), e2);
     }
-    emitChange(value2, e2);
+  };
+  const handleFocus = (e2) => {
+    setFocused(true);
+    setInputValue(
+      shadowValue !== void 0 && shadowValue !== null ? bound2(Number(shadowValue), Number(min), Number(max)).toString() : ""
+    );
+    onFocus && onFocus(e2);
+  };
+  const handleBlur = (e2) => {
+    setFocused(false);
     onBlur && onBlur(e2);
+    if (async) {
+      const valueStr = parseValue(e2.target.value);
+      onChange == null ? void 0 : onChange(parseFloat(valueStr || "0").toFixed(digits), e2);
+    }
   };
-  return /* @__PURE__ */ React__default.createElement("div", { className: classes, style: styles, ...restProps }, /* @__PURE__ */ React__default.createElement("div", { className: "nut-input-minus" }, /* @__PURE__ */ React__default.createElement(
+  return /* @__PURE__ */ React__default.createElement("div", { className: classes, style, ...restProps }, /* @__PURE__ */ React__default.createElement("div", { className: "nut-input-minus" }, /* @__PURE__ */ React__default.createElement(
     t,
     {
-      className: iconMinusClasses,
-      onClick: (e2) => reduceNumber(e2)
+      className: classNames("nut-inputnumber-icon icon-minus", {
+        [`${classPrefix$h}-icon-disabled`]: shadowValue === min || disabled
+      }),
+      onClick: handleReduce
     }
-  )), /* @__PURE__ */ React__default.createElement(React__default.Fragment, null, formatter ? /* @__PURE__ */ React__default.createElement(
+  )), /* @__PURE__ */ React__default.createElement(React__default.Fragment, null, /* @__PURE__ */ React__default.createElement(
     "input",
     {
       className: "nut-number-input",
-      type: "text",
-      min,
-      max,
+      type: "digit",
+      ref: inputRef,
+      inputMode: "decimal",
       disabled,
       readOnly,
-      value: _checked,
-      onInput: changeFormatValue,
-      onBlur: burFormatValue,
-      onFocus: focusValue
+      value: inputValue,
+      onInput: handleInputChange,
+      onBlur: handleBlur,
+      onFocus: handleFocus
     }
-  ) : /* @__PURE__ */ React__default.createElement(
-    "input",
+  )), /* @__PURE__ */ React__default.createElement("div", { className: "nut-input-add" }, /* @__PURE__ */ React__default.createElement(
+    i,
     {
-      className: "nut-number-input",
-      type: "digit",
-      min,
-      max,
-      disabled,
-      readOnly,
-      value: _checked,
-      onInput: changeValue,
-      onBlur: burValue,
-      onFocus: focusValue
+      className: classNames("nut-inputnumber-icon icon-plus", {
+        [`${classPrefix$h}-icon-disabled`]: shadowValue === max || disabled
+      }),
+      onClick: handlePlus
     }
-  )), /* @__PURE__ */ React__default.createElement("div", { className: "nut-input-add" }, /* @__PURE__ */ React__default.createElement(i, { className: iconAddClasses, onClick: (e2) => addNumber(e2) })));
+  )));
 };
 InputNumber.defaultProps = defaultProps$W;
 InputNumber.displayName = "NutInputNumber";
@@ -11870,8 +11876,9 @@ const SearchBar = (props) => {
   const classPrefix2 = "nut-searchbar";
   const { locale } = useConfig$1();
   const searchRef = useRef(null);
-  const [value, setValue] = useState(() => props.value);
   const {
+    value: outerValue,
+    style,
     placeholder,
     shape,
     className,
@@ -11895,47 +11902,52 @@ const SearchBar = (props) => {
     ...defaultProps$O,
     ...props
   };
+  const [value, setValue] = useState(() => outerValue);
   const forceFocus = () => {
     const searchSelf = searchRef.current;
     searchSelf && searchSelf.focus();
   };
   const change = (event) => {
-    if (value === event.target.value)
+    if (value === event.detail.value)
       return;
-    onChange && (onChange == null ? void 0 : onChange(event.target.value, event));
-    setValue(event.target.value);
-    event.target.value === "" && forceFocus();
+    onChange && (onChange == null ? void 0 : onChange(event.detail.value, event));
+    setValue(event.detail.value);
+    event.detail.value === "" && forceFocus();
   };
   const focus = (event) => {
-    const { value: value2 } = event.target;
+    const { value: value2 } = event.detail;
     onFocus && (onFocus == null ? void 0 : onFocus(value2, event));
   };
   const blur = (event) => {
     const searchSelf = searchRef.current;
     searchSelf && searchSelf.blur();
-    const { value: value2 } = event.target;
+    const { value: value2 } = event.detail;
     onBlur && (onBlur == null ? void 0 : onBlur(value2, event));
   };
   useEffect(() => {
-    setValue(props.value || "");
-  }, [props.value]);
+    setValue(outerValue || "");
+  }, [outerValue]);
   useEffect(() => {
-    autoFocus && forceFocus();
+    if (Taro.getEnv() === "WEB") {
+      autoFocus && forceFocus();
+    }
   }, [autoFocus]);
   const renderField = () => {
     return /* @__PURE__ */ React__default.createElement(
-      "input",
+      Input$1,
       {
         className: `${classPrefix2}-input ${clearable ? `${classPrefix2}-input-clear` : ""}`,
         ref: searchRef,
-        style: { ...props.style },
-        value: value || "",
+        style,
+        value: (value || "").toString(),
         placeholder: placeholder || locale.placeholder,
-        disabled,
-        readOnly,
-        maxLength,
-        onKeyPress: onKeypress,
-        onChange: (e2) => change(e2),
+        disabled: disabled || readOnly,
+        maxlength: maxLength,
+        nativeProps: {
+          onKeyPress: onKeypress
+        },
+        autoFocus,
+        onInput: (e2) => change(e2),
         onFocus: (e2) => focus(e2),
         onBlur: (e2) => blur(e2),
         onClick: (e2) => clickInput(e2)
@@ -11948,26 +11960,26 @@ const SearchBar = (props) => {
   const renderLeftIn = () => {
     if (!leftIn)
       return null;
-    return /* @__PURE__ */ React__default.createElement("div", { className: `${classPrefix2}-leftin ${classPrefix2}-icon` }, leftIn);
+    return /* @__PURE__ */ React__default.createElement(View, { className: `${classPrefix2}-leftin ${classPrefix2}-icon` }, leftIn);
   };
   const renderLeft = () => {
     if (!backable && !left2)
       return null;
-    return /* @__PURE__ */ React__default.createElement("div", { className: `${classPrefix2}-left` }, backable ? /* @__PURE__ */ React__default.createElement(g$5, { size: "16" }) : left2);
+    return /* @__PURE__ */ React__default.createElement(View, { className: `${classPrefix2}-left` }, backable ? /* @__PURE__ */ React__default.createElement(g$5, { size: "16" }) : left2);
   };
   const renderRightIn = () => {
     if (!rightIn)
       return null;
-    return /* @__PURE__ */ React__default.createElement("div", { className: `${classPrefix2}-rightin ${classPrefix2}-icon` }, rightIn);
+    return /* @__PURE__ */ React__default.createElement(View, { className: `${classPrefix2}-rightin ${classPrefix2}-icon` }, rightIn);
   };
   const renderRight = () => {
     if (!right2)
       return null;
-    return /* @__PURE__ */ React__default.createElement("div", { className: `${classPrefix2}-right` }, right2);
+    return /* @__PURE__ */ React__default.createElement(View, { className: `${classPrefix2}-right` }, right2);
   };
   const handleClear = () => {
     return /* @__PURE__ */ React__default.createElement(
-      "div",
+      View,
       {
         className: `${classPrefix2}-clear  ${classPrefix2}-icon`,
         onClick: (e2) => clearaVal(e2)
@@ -11981,6 +11993,7 @@ const SearchBar = (props) => {
     }
     setValue("");
     forceFocus();
+    onChange && (onChange == null ? void 0 : onChange(""));
     onClear && onClear(event);
   };
   const onKeypress = (e2) => {
@@ -11992,26 +12005,25 @@ const SearchBar = (props) => {
     }
   };
   return /* @__PURE__ */ React__default.createElement(
-    "div",
+    View,
     {
       className: `${classPrefix2} ${disabled ? `${classPrefix2}-disabled` : ""}  ${className || ""}`,
-      style: { ...props.style }
+      style
     },
     renderLeft(),
     /* @__PURE__ */ React__default.createElement(
-      "div",
+      View,
       {
         className: `${classPrefix2}-content ${shape === "round" ? `${classPrefix2}-round` : ""}`
       },
       renderLeftIn(),
-      /* @__PURE__ */ React__default.createElement("div", { className: "nut-searchbar-input-box" }, renderField()),
+      /* @__PURE__ */ React__default.createElement(View, { className: "nut-searchbar-input-box" }, renderField()),
       clearable && !value && renderRightIn(),
       clearable && value && handleClear()
     ),
     renderRight()
   );
 };
-SearchBar.defaultProps = defaultProps$O;
 SearchBar.displayName = "NutSearchBar";
 const defaultProps$N = {
   ...ComponentDefaults,
@@ -12023,13 +12035,13 @@ const defaultProps$N = {
   // 1~6
   autoFocus: false
 };
-const ShortPassword = (props) => {
+const InternalShortPassword = (props, ref) => {
   const { locale } = useConfig$1();
   const {
     title,
     description,
     tips,
-    visible,
+    visible: deleteVisible,
     value,
     error,
     hideFooter,
@@ -12060,6 +12072,20 @@ const ShortPassword = (props) => {
   const format2 = (val) => {
     return val.slice(0, comLen);
   };
+  const [visible, setVisible] = usePropsValue({
+    value: props.visible,
+    defaultValue: false,
+    finalValue: false
+  });
+  const actions = {
+    open: () => {
+      setVisible(true);
+    },
+    close: () => {
+      setVisible(false);
+    }
+  };
+  useImperativeHandle(ref, () => actions);
   const [inputValue, setInputValue] = usePropsValue({ value, onChange });
   useEffect(() => {
     if (visible && autoFocus) {
@@ -12092,11 +12118,10 @@ const ShortPassword = (props) => {
     },
     /* @__PURE__ */ React__default.createElement("div", { className: classNames(classPrefix2, className), style }, /* @__PURE__ */ React__default.createElement("div", { className: `${classPrefix2}-title` }, title || locale.shortpassword.title), /* @__PURE__ */ React__default.createElement("div", { className: `${classPrefix2}-description` }, description || locale.shortpassword.description), /* @__PURE__ */ React__default.createElement("div", { className: `${classPrefix2}-input`, onClick: onFocus }, /* @__PURE__ */ React__default.createElement("div", { className: `${classPrefix2}-input-site` }), /* @__PURE__ */ React__default.createElement("div", { className: `${classPrefix2}-input-fake` }, [...new Array(comLen).keys()].map((item, index) => {
       return /* @__PURE__ */ React__default.createElement("div", { className: `${classPrefix2}-input-fake-li`, key: index }, inputValue.length > index && /* @__PURE__ */ React__default.createElement(React__default.Fragment, null, plain ? inputValue[index] : /* @__PURE__ */ React__default.createElement("div", { className: `${classPrefix2}-input-fake-li-icon` })));
-    }))), /* @__PURE__ */ React__default.createElement("div", { className: `${classPrefix2}-message` }, /* @__PURE__ */ React__default.createElement("div", { className: `${classPrefix2}-message-error` }, error), /* @__PURE__ */ React__default.createElement("div", { className: `${classPrefix2}-message-forget`, onClick: onTips }, tips || /* @__PURE__ */ React__default.createElement(React__default.Fragment, null, /* @__PURE__ */ React__default.createElement(z, { size: 11, style: { marginRight: "3px" } }), locale.shortpassword.tips))), !hideFooter && /* @__PURE__ */ React__default.createElement("div", { className: `${classPrefix2}-footer` }, /* @__PURE__ */ React__default.createElement("div", { className: `${classPrefix2}-footer-cancel`, onClick: onCancel }, locale.cancel), /* @__PURE__ */ React__default.createElement("div", { className: `${classPrefix2}-footer-sure`, onClick: sure }, locale.confirm)))
+    }))), /* @__PURE__ */ React__default.createElement("div", { className: `${classPrefix2}-message` }, /* @__PURE__ */ React__default.createElement("div", { className: `${classPrefix2}-message-error` }, error), /* @__PURE__ */ React__default.createElement("div", { className: `${classPrefix2}-message-forget`, onClick: onTips }, tips || /* @__PURE__ */ React__default.createElement(React__default.Fragment, null, /* @__PURE__ */ React__default.createElement(z, { size: 11 }), locale.shortpassword.tips))), !hideFooter && /* @__PURE__ */ React__default.createElement("div", { className: `${classPrefix2}-footer` }, /* @__PURE__ */ React__default.createElement("div", { className: `${classPrefix2}-footer-cancel`, onClick: onCancel }, locale.cancel), /* @__PURE__ */ React__default.createElement("div", { className: `${classPrefix2}-footer-sure`, onClick: sure }, locale.confirm)))
   );
 };
-ShortPassword.defaultProps = defaultProps$N;
-ShortPassword.displayName = "NutShortPassword";
+const ShortPassword = React__default.forwardRef(InternalShortPassword);
 const defaultProps$M = {
   ...ComponentDefaults,
   canvasId: "spcanvas",
@@ -13144,6 +13169,7 @@ const ActionSheet = (props) => {
   return /* @__PURE__ */ React__default.createElement(
     Popup,
     {
+      ...rest,
       round: true,
       visible,
       position: "bottom",
@@ -14922,7 +14948,7 @@ const Skeleton = (props) => {
   const classPrefix2 = "nut-skeleton";
   const classes = classNames(classPrefix2, className);
   const avatarClass = classNames({
-    avatar: true,
+    [`nut-avatar`]: true,
     [`avatar-${avatarShape}`]: avatarShape
   });
   const repeatLines = (num) => {
@@ -14940,7 +14966,7 @@ const Skeleton = (props) => {
       height: "50px"
     };
   };
-  return /* @__PURE__ */ React__default.createElement(React__default.Fragment, null, visible ? /* @__PURE__ */ React__default.createElement("div", null, children) : /* @__PURE__ */ React__default.createElement("div", { className: classes, ...rest }, animated && /* @__PURE__ */ React__default.createElement("div", { className: `${classPrefix2}-animation` }), /* @__PURE__ */ React__default.createElement("div", { className: `${classPrefix2}-content` }, avatar && /* @__PURE__ */ React__default.createElement(
+  return /* @__PURE__ */ React__default.createElement(React__default.Fragment, null, visible ? /* @__PURE__ */ React__default.createElement(React__default.Fragment, null, children) : /* @__PURE__ */ React__default.createElement("div", { className: classes, ...rest }, animated && /* @__PURE__ */ React__default.createElement("div", { className: `${classPrefix2}-animation` }), /* @__PURE__ */ React__default.createElement("div", { className: `${classPrefix2}-content` }, avatar && /* @__PURE__ */ React__default.createElement(
     Avatar,
     {
       className: avatarClass,
@@ -18080,79 +18106,98 @@ const InternalBarrage = (props, ref) => {
     ...defaultProps$6,
     ...props
   };
-  const [styleList, setStyleList] = useState([]);
-  const [baItemList, setBaItemList] = useState(list);
-  const barrageListSet = useRef(list);
   const barrageBody = useRef(null);
   const barrageContainer = useRef(null);
-  const timeId = useRef((/* @__PURE__ */ new Date()).getTime());
+  const barrageCWidth = useRef(0);
   const timer = useRef(0);
-  const classes = classNames(
-    classPrefix$1,
-    {
-      [`${classPrefix$1}-body${timeId.current}`]: true
-    },
-    className
-  );
+  const index = useRef(0);
+  const times = useRef([]);
+  const historyIndex = useRef(-1);
+  const classes = classNames(classPrefix$1, className);
   useImperativeHandle(ref, () => ({
     add: (word) => {
-      barrageListSet.current = [...barrageListSet.current, word];
-      run();
+      const _index = index.current % list.length;
+      if (!loop && index.current === list.length) {
+        list.splice(list.length, 0, word);
+      } else {
+        list.splice(_index, 0, word);
+      }
     }
   }));
+  const getNodeWidth = async (node, type4 = "width") => {
+    if (node) {
+      const refe = await getRectByTaro(node);
+      return Math.ceil(type4 === "height" ? refe.height : refe.width);
+    }
+    return 0;
+  };
   useEffect(() => {
-    barrageListSet.current = [...list];
-    run();
+    const init = async () => {
+      if (barrageBody.current) {
+        barrageCWidth.current = await getNodeWidth(barrageBody.current);
+      }
+    };
+    init();
+    setTimeout(() => {
+      var _a;
+      (_a = barrageBody.current) == null ? void 0 : _a.style.setProperty(
+        "--move-distance",
+        `-${barrageCWidth.current}px`
+      );
+      index.current = 0;
+      run();
+    }, 300);
     return () => {
       clearInterval(timer.current);
     };
   }, [list]);
   const run = () => {
-    setBaItemList(barrageListSet.current);
-    barrageListSet.current.forEach((item, index) => {
-      getNode(index);
-    });
-  };
-  const getNode = (index) => {
-    const query = createSelectorQuery();
-    setTimeout(() => {
-      let width = 100;
-      query.select(`.${classPrefix$1}-body${timeId.current}`).boundingClientRect((rec) => {
-        width = rec.width || 300;
-      });
-      query.select(`.${classPrefix$1}-item${index}`).boundingClientRect((recs) => {
-        const height = recs.height;
-        const nodeTop = `${index % rows * (height + gapY) + 20}px`;
-        styleInfo(index, nodeTop, width);
-      }).exec();
-    }, 500);
+    clearInterval(timer.current);
+    let intervalCache = interval;
+    const _index = (loop ? index.current % list.length : index.current) % rows;
+    const result = times.current[_index] - rows * interval;
+    if (result > 0) {
+      intervalCache += result;
+    }
+    timer.current = window.setTimeout(() => {
+      play();
+    }, intervalCache);
   };
-  const styleInfo = (index, nodeTop, width) => {
-    const timeIndex = index - rows > 0 ? index - rows : 0;
-    const list2 = styleList;
-    const time = list2[timeIndex] ? Number(list2[timeIndex]["--time"]) : 0;
-    const obj = {
-      top: nodeTop,
-      "--time": `${interval * index + time}`,
-      animationDuration: `${duration}ms`,
-      animationIterationCount: `${loop ? "infinite" : 1}`,
-      animationDelay: `${interval * index + time}ms`,
-      "--move-distance": `-${width}px`
-    };
-    list2.push(obj);
-    setStyleList([...list2]);
+  const play = async () => {
+    if (!loop && index.current >= list.length) {
+      return;
+    }
+    const _index = loop ? index.current % list.length : index.current;
+    const el = document.createElement(`View`);
+    let currentIndex = _index % rows;
+    if (currentIndex <= historyIndex.current || historyIndex.current === 3 && currentIndex !== 0 || Math.abs(currentIndex - historyIndex.current) !== 1) {
+      currentIndex = historyIndex.current + 1 >= rows ? 0 : historyIndex.current + 1;
+    }
+    historyIndex.current = currentIndex;
+    el.innerHTML = list[_index];
+    el.classList.add("barrage-item");
+    barrageContainer.current.appendChild(el);
+    try {
+      const width = await getNodeWidth(el);
+      const height = await getNodeWidth(el, "height");
+      el.classList.add("move");
+      const elScrollDuration = width / barrageCWidth.current * duration;
+      times.current[currentIndex] = Math.ceil(elScrollDuration);
+      el.style.animationDuration = `${(duration + elScrollDuration).toFixed(
+        2
+      )}ms`;
+      el.style.top = `${currentIndex * (height + gapY) + 20}px`;
+      el.style.width = `${width}px`;
+    } catch (error) {
+      console.log("异常自动流转到下一个");
+    }
+    el.addEventListener("animationend", () => {
+      barrageContainer.current.removeChild(el);
+    });
+    index.current++;
+    run();
   };
-  return /* @__PURE__ */ React__default.createElement("div", { className: classes, ref: barrageBody, ...restProps }, /* @__PURE__ */ React__default.createElement("div", { ref: barrageContainer, className: "bContainer" }, baItemList.map((item, index) => {
-    return /* @__PURE__ */ React__default.createElement(
-      "div",
-      {
-        className: `barrage-item ${classPrefix$1}-item${index} move`,
-        style: styleList[index],
-        key: index
-      },
-      item.length > 8 ? `${item.substr(0, 8)}...` : item
-    );
-  })));
+  return /* @__PURE__ */ React__default.createElement(View, { className: classes, ref: barrageBody, ...restProps }, /* @__PURE__ */ React__default.createElement(View, { ref: barrageContainer, className: "bContainer" }));
 };
 const Barrage = React__default.forwardRef(
   InternalBarrage