@nutui/nutui-react-taro 2.7.6 → 2.7.7

package/dist/nutui.react.es.js

@@ -1,5 +1,5 @@
 /*!
-* @nutui/nutui-react-taro v2.7.6 Fri Jan 10 2025 10:43:35 GMT+0800 (China Standard Time)
+* @nutui/nutui-react v2.7.7 Fri Jan 24 2025 13:57:13 GMT+0800 (China Standard Time)
 * (c) 2023 @jdf2e.
 * Released under the MIT License.
 */
@@ -3922,7 +3922,7 @@ const Space = (props) => {
   }));
 };
 Space.displayName = "NutSpace";
-function useWatch(dep, callback, config2 = { immediate: false }) {
+function useWatch$1(dep, callback, config2 = { immediate: false }) {
   const { immediate } = config2;
   const prev = useRef();
   const inited = useRef(false);
@@ -4058,7 +4058,7 @@ const Sticky = (props) => {
   const [rootRect, setRootRect] = useState({});
   const [fixed, setFixed] = useState(false);
   const [transform, setTransform] = useState(0);
-  useWatch(fixed, () => {
+  useWatch$1(fixed, () => {
     onChange && onChange(fixed);
   });
   const rootStyle = useMemo$1(() => {
@@ -5253,7 +5253,7 @@ const TabPane = (props) => {
     autoHeightClassName,
     className
   );
-  return children ? /* @__PURE__ */ React__default.createElement("div", { className: classes }, !disabled && children) : null;
+  return children && /* @__PURE__ */ React__default.createElement(View, { className: classes }, !disabled && children);
 };
 const inBrowser = typeof window !== "undefined";
 function requestAniFrame() {
@@ -5297,24 +5297,19 @@ const Tabs = (props) => {
     value: outerValue,
     defaultValue: outerDefaultValue,
     ...rest
-  } = {
-    ...defaultProps$18,
-    ...props
-  };
+  } = { ...defaultProps$18, ...props };
   const uuid = useUuid();
   const [value, setValue] = usePropsValue({
     value: outerValue,
     defaultValue: outerDefaultValue,
-    finalValue: 0,
     onChange
   });
   const titleItemsRef = useRef([]);
-  const navRef = useRef(null);
   const getTitles = () => {
     const titles2 = [];
     React__default.Children.forEach(children, (child, idx) => {
       if (React__default.isValidElement(child)) {
-        const props2 = child == null ? void 0 : child.props;
+        const { props: props2 } = child;
         if ((props2 == null ? void 0 : props2.title) || (props2 == null ? void 0 : props2.value)) {
           titles2.push({
             title: props2.title,
@@ -5349,13 +5344,8 @@ const Tabs = (props) => {
   );
   const classesTitle = classNames(`${classPrefix$k}-titles`, {
     [`${classPrefix$k}-titles-${activeType}`]: activeType,
-    [`${classPrefix$k}-titles-scrollable`]: true,
     [`${classPrefix$k}-titles-${align}`]: align
   });
-  const tabsActiveStyle = {
-    color: activeType === "smile" ? activeColor : "",
-    background: activeType === "line" ? activeColor : ""
-  };
   const getRect2 = (selector) => {
     return new Promise((resolve) => {
       createSelectorQuery().select(selector).boundingClientRect().exec((rect = []) => {
@@ -5371,22 +5361,15 @@ const Tabs = (props) => {
     });
   };
   const scrollWithAnimation = useRef(false);
-  const navRectRef = useRef();
-  const titleRectRef = useRef([]);
   const [scrollLeft, setScrollLeft] = useState(0);
   const [scrollTop, setScrollTop] = useState(0);
   const scrollDirection = (to, direction2) => {
     let count = 0;
     const frames = 1;
     function animate() {
-      if (direction2 === "horizontal") {
-        setScrollLeft(to);
-      } else {
-        setScrollTop(to);
-      }
-      if (++count < frames) {
-        requestAniFrame$1(animate);
-      }
+      if (direction2 === "horizontal") setScrollLeft(to);
+      else setScrollTop(to);
+      if (++count < frames) requestAniFrame$1(animate);
     }
     animate();
   };
@@ -5396,17 +5379,17 @@ const Tabs = (props) => {
         getRect2(`#nut-tabs-titles-${name || uuid} .nut-tabs-list`),
         getAllRect(`#nut-tabs-titles-${name || uuid} .nut-tabs-titles-item`)
       ]).then(([navRect, titleRects]) => {
-        navRectRef.current = navRect;
-        titleRectRef.current = titleRects;
-        const titleRect = titleRectRef.current[index];
+        const titleRect = titleRects[index];
         if (!titleRect) return;
         let to = 0;
         if (direction === "vertical") {
           const top = titleRects.slice(0, index).reduce((prev, curr) => prev + curr.height, 0);
-          to = top - (navRectRef.current.height - titleRect.height) / 2;
+          to = top - (navRect.height - titleRect.height) / 2;
         } else {
           const left2 = titleRects.slice(0, index).reduce((prev, curr) => prev + curr.width, 0);
-          to = rtl ? -left2 : left2;
+          to = left2 - (navRect.width - titleRect.width) / 2;
+          if (to < 0) return;
+          to = rtl ? -to : to;
         }
         nextTick(() => {
           scrollWithAnimation.current = true;
@@ -5421,7 +5404,7 @@ const Tabs = (props) => {
     );
     index = index < 0 ? 0 : index;
     return {
-      transform: direction === "horizontal" ? `translate3d(${rtl ? "" : "-"}${index * 100}%, 0, 0)` : `translate3d( 0,-${index * 100}%, 0)`,
+      transform: direction === "horizontal" ? `translate3d(${rtl ? "" : "-"}${index * 100}%, 0, 0)` : `translate3d( 0, -${index * 100}%, 0)`,
       transitionDuration: `${duration}ms`
     };
   };
@@ -5432,12 +5415,11 @@ const Tabs = (props) => {
     index = index < 0 ? 0 : index;
     scrollIntoView(index);
   }, [value]);
-  const tabChange = (item, index) => {
+  const tabChange = (item) => {
     onClick && onClick(item.value);
-    if (item.disabled) {
-      return;
+    if (!item.disabled) {
+      setValue(item.value);
     }
-    setValue(item.value);
   };
   return /* @__PURE__ */ React__default.createElement(View, { className: classes, ...rest }, /* @__PURE__ */ React__default.createElement(
     ScrollView,
@@ -5452,71 +5434,55 @@ const Tabs = (props) => {
       scrollWithAnimation: rtl && Taro.getEnv() !== "WEB" ? false : scrollWithAnimation.current,
       id: `nut-tabs-titles-${name || uuid}`,
       className: classesTitle,
-      style: { ...tabStyle }
+      style: tabStyle
     },
-    /* @__PURE__ */ React__default.createElement(View, { className: "nut-tabs-list", ref: navRef }, !!title && typeof title === "function" ? title() : titles.current.map((item, index) => {
+    /* @__PURE__ */ React__default.createElement(View, { className: "nut-tabs-list" }, !!title && typeof title === "function" ? title() : titles.current.map((item, index) => {
       return /* @__PURE__ */ React__default.createElement(
         View,
         {
+          key: item.value,
           ref: (ref) => titleItemsRef.current.push(ref),
           id: `scrollIntoView${index}`,
-          onClick: (e2) => {
-            tabChange(item);
-          },
+          onClick: () => tabChange(item),
           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
-          }),
-          key: item.value
+          })
         },
         activeType === "line" && /* @__PURE__ */ React__default.createElement(
           View,
           {
             className: classNames(
               `${classPrefix$k}-titles-item-line`,
-              {
-                [`${classPrefix$k}-titles-item-line-${direction}`]: true
-              }
+              `${classPrefix$k}-titles-item-line-${direction}`
             ),
-            style: tabsActiveStyle
+            style: { background: activeColor }
           }
         ),
-        activeType === "smile" && /* @__PURE__ */ React__default.createElement(
-          View,
-          {
-            className: `${classPrefix$k}-titles-item-smile`,
-            style: tabsActiveStyle
-          },
-          /* @__PURE__ */ React__default.createElement(L$1, { color: activeColor })
-        ),
+        activeType === "smile" && /* @__PURE__ */ React__default.createElement(View, { className: `${classPrefix$k}-titles-item-smile` }, /* @__PURE__ */ React__default.createElement(L$1, { color: activeColor })),
         /* @__PURE__ */ React__default.createElement(
           View,
           {
             className: classNames(
-              `${classPrefix$k}-ellipsis`,
+              {
+                [`${classPrefix$k}-ellipsis`]: direction === "vertical"
+              },
               `${classPrefix$k}-titles-item-text`
-            )
+            ),
+            style: { color: activeColor }
           },
           item.title
         )
       );
     }))
   ), /* @__PURE__ */ React__default.createElement(View, { className: `${classPrefix$k}-content-wrap` }, /* @__PURE__ */ React__default.createElement(View, { className: `${classPrefix$k}-content`, style: getContentStyle() }, React__default.Children.map(children, (child, idx) => {
-    if (!React__default.isValidElement(child)) {
-      return null;
-    }
-    let childProps = {
+    if (!React__default.isValidElement(child)) return null;
+    return React__default.cloneElement(child, {
       ...child.props,
-      active: value === child.props.value
-    };
-    if (String(value) !== String(child.props.value || idx) && autoHeight) {
-      childProps = {
-        ...childProps,
-        autoHeightClassName: "inactive"
-      };
-    }
-    return React__default.cloneElement(child, childProps);
+      active: value === child.props.value,
+      autoHeightClassName: autoHeight && String(value) !== String(child.props.value || idx) ? "inactive" : void 0
+    });
   }))));
 };
 Tabs.displayName = "NutTabs";
@@ -8701,6 +8667,14 @@ const DatePicker = (props) => {
         Number(formatDate[2]),
         getMonthEndDay(Number(formatDate[0]), Number(formatDate[1]))
       );
+      if (selectedOptions.length >= 2 && ["date", "datehour", "datetime", "month-day"].includes(rangeType)) {
+        const dayOption = formatOption("day", day);
+        if (rangeType === "month-day") {
+          selectedOptions[1] = dayOption;
+        } else {
+          selectedOptions[2] = dayOption;
+        }
+      }
       let date4 = null;
       if (rangeType === "date" || rangeType === "month-day" || rangeType === "year-month") {
         date4 = new Date(year, month, day);
@@ -9614,7 +9588,7 @@ function newMessages() {
     pattern: {
       mismatch: "%s value %s does not match pattern %s"
     },
-    clone: function clone() {
+    clone: function clone2() {
       var cloned = JSON.parse(JSON.stringify(this));
       cloned.clone = this.clone;
       return cloned;
@@ -9878,23 +9852,55 @@ Schema.register = function register(type4, validator) {
 Schema.warning = warning;
 Schema.messages = messages;
 Schema.validators = validators;
-function merge(...objects) {
-  const result = Array.isArray(objects[0]) ? [] : {};
-  function mergeHelper(obj, path = []) {
-    for (const [key, value] of Object.entries(obj)) {
-      const newPath = [...path, key];
-      if (Array.isArray(value)) {
-        result[key] = [...value];
-      } else if (typeof value === "object" && value !== null) {
-        if (path.some((p) => p === value)) continue;
-        if (!result[key]) result[key] = {};
-        mergeHelper(value, newPath);
-      } else {
-        result[key] = value;
-      }
+function merge(...items) {
+  return _merge(items[0] === true, false, items);
+}
+function recursive(...items) {
+  return _merge(items[0] === true, true, items);
+}
+function clone(input) {
+  if (Array.isArray(input)) {
+    const output = [];
+    for (let index = 0; index < input.length; ++index)
+      output.push(clone(input[index]));
+    return output;
+  }
+  if (isPlainObject(input)) {
+    const output = {};
+    for (const index in input) output[index] = clone(input[index]);
+    return output;
+  }
+  return input;
+}
+function isPlainObject(input) {
+  if (input === null || typeof input !== "object") return false;
+  if (Object.getPrototypeOf(input) === null) return true;
+  let ref = input;
+  while (Object.getPrototypeOf(ref) !== null) ref = Object.getPrototypeOf(ref);
+  return Object.getPrototypeOf(input) === ref;
+}
+function _recursiveMerge(base, extend) {
+  if (!isPlainObject(base) || !isPlainObject(extend)) return extend;
+  for (const key in extend) {
+    if (key === "__proto__" || key === "constructor" || key === "prototype")
+      continue;
+    base[key] = isPlainObject(base[key]) && isPlainObject(extend[key]) ? _recursiveMerge(base[key], extend[key]) : extend[key];
+  }
+  return base;
+}
+function _merge(isClone, isRecursive, items) {
+  let result;
+  if (isClone || !isPlainObject(result = items.shift())) result = {};
+  for (let index = 0; index < items.length; ++index) {
+    const item = items[index];
+    if (!isPlainObject(item)) continue;
+    for (const key in item) {
+      if (key === "__proto__" || key === "constructor" || key === "prototype")
+        continue;
+      const value = isClone ? clone(item[key]) : item[key];
+      result[key] = isRecursive ? _recursiveMerge(result[key], value) : value;
     }
   }
-  objects.filter((obj) => !!obj).forEach((obj) => mergeHelper(obj));
   return result;
 }
 const SECRET = "NUT_FORM_INTERNAL";
@@ -9910,9 +9916,6 @@ class FormStore {
       this.fieldEntities.push(field);
       return () => {
         this.fieldEntities = this.fieldEntities.filter((item) => item !== field);
-        if (this.store) {
-          delete this.store[field.props.name];
-        }
       };
     };
     this.getFieldValue = (name) => {
@@ -9934,10 +9937,11 @@ class FormStore {
       if (init) {
         const nextStore = merge(initialValues, this.store);
         this.updateStore(nextStore);
+        this.notifyWatch();
       }
     };
     this.setFieldsValue = (newStore) => {
-      const nextStore = merge(this.store, newStore);
+      const nextStore = recursive(true, this.store, newStore);
       this.updateStore(nextStore);
       this.fieldEntities.forEach((entity) => {
         const { name } = entity.props;
@@ -9956,12 +9960,14 @@ class FormStore {
           item.entity.onStoreChange("update");
         }
       });
+      this.notifyWatch();
     };
     this.setFieldValue = (name, value) => {
       const store = {
         [name]: value
       };
       this.setFieldsValue(store);
+      this.notifyWatch([name]);
     };
     this.setCallback = (callback) => {
       this.callbacks = {
@@ -10004,7 +10010,6 @@ class FormStore {
     };
     this.validateFields = async (nameList) => {
       let filterEntities = [];
-      this.errors.length = 0;
       if (!nameList || nameList.length === 0) {
         filterEntities = this.fieldEntities;
       } else {
@@ -10029,13 +10034,29 @@ class FormStore {
         (_d = (_c = this.callbacks).onFinishFailed) == null ? void 0 : _d.call(_c, this.store, errors);
       }
     };
-    this.resetFields = () => {
-      this.errors.length = 0;
-      const nextStore = merge({}, this.initialValues);
-      this.updateStore(nextStore);
-      this.fieldEntities.forEach((entity) => {
-        entity.onStoreChange("reset");
-      });
+    this.resetFields = (namePaths) => {
+      if (namePaths && namePaths.length) {
+        namePaths.forEach((path) => {
+          this.errors[path] = null;
+          this.fieldEntities.forEach((entity) => {
+            const name = entity.props.name;
+            if (name === path) {
+              if (path in this.initialValues) {
+                this.updateStore({ [path]: this.initialValues[path] });
+              } else {
+                delete this.store[path];
+              }
+              entity.onStoreChange("reset");
+            }
+          });
+        });
+      } else {
+        const nextStore = merge({}, this.initialValues);
+        this.updateStore(nextStore);
+        this.fieldEntities.forEach((entity) => {
+          entity.onStoreChange("reset");
+        });
+      }
     };
     this.registerUpdate = (field, shouldUpdate) => {
       this.updateList.push({
@@ -10058,7 +10079,8 @@ class FormStore {
           dispatch: this.dispatch,
           store: this.store,
           fieldEntities: this.fieldEntities,
-          registerUpdate: this.registerUpdate
+          registerUpdate: this.registerUpdate,
+          registerWatch: this.registerWatch
         };
       }
     };
@@ -10075,6 +10097,26 @@ class FormStore {
         getInternal: this.getInternal
       };
     };
+    this.watchList = [];
+    this.registerWatch = (callback) => {
+      this.watchList.push(callback);
+      return () => {
+        this.watchList = this.watchList.filter((fn) => fn !== callback);
+      };
+    };
+    this.notifyWatch = (namePath = []) => {
+      if (this.watchList.length) {
+        let allValues;
+        if (!namePath || namePath.length === 0) {
+          allValues = this.getFieldsValue(true);
+        } else {
+          allValues = this.getFieldsValue(namePath);
+        }
+        this.watchList.forEach((callback) => {
+          callback(allValues, namePath);
+        });
+      }
+    };
     this.callbacks = {
       onFinish: () => {
       },
@@ -10098,6 +10140,24 @@ const useForm = (form) => {
   }
   return [formRef.current];
 };
+const useWatch = (path, form) => {
+  const formInstance = form.getInternal(SECRET);
+  const [value, setValue] = useState();
+  useEffect(() => {
+    const unsubscribe = formInstance.registerWatch(
+      (data, namePath) => {
+        const value2 = data[path];
+        setValue(value2);
+      }
+    );
+    const initialValue = form.getFieldsValue(true);
+    if (value !== initialValue[path]) {
+      setValue(initialValue[path]);
+    }
+    return () => unsubscribe();
+  }, [form]);
+  return value;
+};
 const defaultProps$Y = {
   ...ComponentDefaults,
   labelPosition: "right",
@@ -10403,6 +10463,7 @@ let FormItem = _FormItem;
 const InnerForm = Form;
 InnerForm.Item = FormItem;
 InnerForm.useForm = useForm;
+InnerForm.useWatch = useWatch;
 function trimExtraChar(value, char, regExp) {
   const index = value.indexOf(char);
   if (index === -1) {
@@ -13953,7 +14014,7 @@ const Empty = (props) => {
   const imageNode = typeof imageUrl === "string" ? /* @__PURE__ */ React__default.createElement("img", { className: "img", src: imageUrl, alt: "empty" }) : imageUrl;
   useEffect(() => {
     setImgStyle(() => {
-      if (!imageSize) {
+      if (typeof imageSize !== "number" && typeof imageSize !== "string") {
         return {};
       }
       if (typeof imageSize === "number") {