x-ui-design 0.3.78 → 0.3.80

package/dist/index.esm.js

@@ -607,7 +607,6 @@ const useForm = (initialValues = {}, onFieldsChange, onValuesChange, scrollToFir
     ...initialValues
   });
   const fieldInstancesRef = useRef({});
-  const [isSubmit, setIsSubmit] = useState(false);
   const [isReseting, setIsReseting] = useState(false);
   const [errors, setErrors] = useState({});
   const fieldSubscribers = useRef({});
@@ -739,23 +738,28 @@ const useForm = (initialValues = {}, onFieldsChange, onValuesChange, scrollToFir
       [name]: fieldErrors
     }));
     warningsRef.current[name] = fieldWarnings;
-    console.log({
-      isSubmit,
-      _scrollToFirstError: _scrollToFirstError.current
-    });
-    if (isSubmit || _scrollToFirstError.current) {
-      const firstErrorContent = document.querySelectorAll('.xUi-form-item-error')?.[0];
-      if (firstErrorContent) {
-        firstErrorContent.closest('.xUi-form-item')?.closest('[data-item="first-content"]')?.scrollIntoView();
-        setIsSubmit(false);
-        setScrollToFirstError(false);
-      }
-    }
     return fieldErrors.length === 0;
   }
   async function validateFields(nameList) {
     const fieldsToValidate = nameList || Object.keys(formRef.current);
     const results = await Promise.all(fieldsToValidate.map(name => validateField(name)));
+    console.log(_scrollToFirstError.current);
+    if (_scrollToFirstError.current) {
+      const firstErrorContent = document.querySelectorAll('.xUi-form-item-error')?.[0];
+      console.log(firstErrorContent);
+      if (firstErrorContent) {
+        function findFormItem(item) {
+          console.log(item?.parentElement?.tagName);
+          if (item?.parentElement?.tagName !== 'FORM') {
+            findFormItem(item?.parentElement);
+          } else {
+            item.scrollIntoView();
+          }
+        }
+        findFormItem(firstErrorContent.closest('.xUi-form-item'));
+        setScrollToFirstError(false);
+      }
+    }
     return results.every(valid => valid);
   }
   function resetFields(nameList, showError = true) {
@@ -781,7 +785,7 @@ const useForm = (initialValues = {}, onFieldsChange, onValuesChange, scrollToFir
     setIsReseting(prev => !prev);
   }
   async function submit() {
-    setIsSubmit(true);
+    setScrollToFirstError(true);
     return (await validateFields()) ? formRef.current : undefined;
   }
   function subscribeToField(name, callback) {
@@ -1139,16 +1143,14 @@ const Form$1 = ({
       formInstance.onValuesChange = onValuesChange;
     }
   }, [formInstance, onFieldsChange, onValuesChange]);
-  const injectPropsIntoFinalLeaf = (child, key) => {
+  const injectPropsIntoFinalLeaf = child => {
     if (! /*#__PURE__*/isValidElement(child)) {
       return child;
     }
     const childProps = child.props;
     const isWrapper = typeof child.type === 'string' && !('dangerouslySetInnerHTML' in childProps) && ['div', 'span', 'label'].includes(child.type);
     if (isWrapper) {
-      return /*#__PURE__*/React$1.createElement(child.type, _extends({}, childProps, {
-        "data-item": key == 0 ? 'first-content' : ''
-      }), Children.map(flattenChildren(childProps.children), injectPropsIntoFinalLeaf));
+      return /*#__PURE__*/React$1.createElement(child.type, childProps, Children.map(flattenChildren(childProps.children), injectPropsIntoFinalLeaf));
     }
     if (childProps?.__injected) {
       return child;
@@ -1166,7 +1168,7 @@ const Form$1 = ({
     ref: formRef,
     onSubmit: handleSubmit,
     className: `${prefixCls} ${className}`
-  }, Children.map(childrenList, (child, key) => injectPropsIntoFinalLeaf(child, key))));
+  }, Children.map(childrenList, child => injectPropsIntoFinalLeaf(child))));
 };
 Form$1.Item = FormItem$1;