x-ui-design 0.6.21 → 0.6.23

package/dist/index.esm.js

@@ -830,8 +830,7 @@ const useForm = (initialValues = {}, onFieldsChange, onValuesChange, scrollToFir
   }
   function subscribeToFields(names, callback) {
     const fieldCallbacks = names.map(name => subscribeToField(name, () => {
-      const updatedValues = getFieldsValue(names);
-      callback(updatedValues);
+      callback(getFieldsValue(names));
     }));
     return () => {
       fieldCallbacks.forEach(unsubscribe => unsubscribe());
@@ -1070,6 +1069,7 @@ const FormItemChildComponent = /*#__PURE__*/memo(({
     getFieldsValue,
     getFieldValue,
     setFieldValue,
+    subscribeToField,
     subscribeToFields,
     validateFields
   } = formContext || {};
@@ -1079,11 +1079,17 @@ const FormItemChildComponent = /*#__PURE__*/memo(({
     onChange,
     value
   } = child.props;
-  const fieldValue = value ?? getFieldValue?.(name) ?? initialValue;
+  const [fieldValue, _setFieldValue] = useState(value ?? getFieldValue?.(name) ?? initialValue);
   useEffect(() => {
     if (initialValue) {
       setFieldValue?.(name, initialValue);
     }
+    const unsubscribe = subscribeToField?.(name, value => {
+      _setFieldValue(value);
+    });
+    return () => {
+      unsubscribe?.();
+    };
   }, []);
   useEffect(() => {
     if (name && dependencies.length > 0) {
@@ -1172,8 +1178,8 @@ const Form$1 = ({
   ...rest
 }) => {
   const internalForm = useForm(initialValues, onFieldsChange, onValuesChange);
-  const formInstance = form || internalForm;
   const formRef = useRef(null);
+  const formInstance = useMemo(() => form || internalForm, [form, internalForm]);
   const handleSubmit = async e => {
     e.preventDefault();
     if (await formInstance.validateFields()) {
@@ -1187,6 +1193,7 @@ const Form$1 = ({
     }
   };
   const childrenList = useMemo(() => flattenChildren(children), [children]);
+  const formClassName = useMemo(() => `${prefixCls} ${className}`.trim(), [prefixCls, className]);
   useEffect(() => {
     if (onFieldsChange) {
       formInstance.setOnFieldsChange?.(onFieldsChange);
@@ -1218,15 +1225,25 @@ const Form$1 = ({
       size: childProps.size || rest.size,
       layout: childProps.layout || layout
     }));
-  }, [rest.size, layout, flattenChildren]);
-  console.info(1);
+  }, [rest.size, layout]);
+  console.info({
+    children,
+    form,
+    style,
+    prefixCls,
+    className,
+    initialValues,
+    layout,
+    scrollToFirstError,
+    ...rest
+  });
   return /*#__PURE__*/React.createElement(FormContext.Provider, {
     value: formInstance
   }, /*#__PURE__*/React.createElement("form", {
     style: style,
     ref: formRef,
     onSubmit: handleSubmit,
-    className: `${prefixCls} ${className}`
+    className: formClassName
   }, Children.map(childrenList, child => injectPropsIntoFinalLeaf(child))));
 };
 Form$1.Item = FormItem$1;