x-ui-design 0.4.76 → 0.4.78

package/dist/esm/types/types/form.d.ts

@@ -18,7 +18,7 @@ export interface FieldData {
     value?: RuleTypes;
     errors?: string[];
 }
-export type FieldInstancesInputRef = HTMLInputElement | null;
+export type FieldInstancesInputRef = HTMLInputElement | HTMLDivElement | null;
 export type FieldInstancesRef = {
     input?: FieldInstancesInputRef;
 };
@@ -87,7 +87,7 @@ export interface FormInstance {
     setFields: (fields: FieldData[]) => void;
     resetFields: (nameList?: string[], showError?: boolean | null) => void;
     getFieldError: (name: string) => string[];
-    registerField: (name: string, rules?: RuleObject[], remove?: boolean, fieldRef?: FieldInstancesRef) => void;
+    registerField: (name: string, rules?: RuleObject[], remove?: boolean, fieldRef?: FieldInstancesRef | null) => void;
     setFieldValue: (name: string, value: RuleTypes, errors?: string[], reset?: boolean | null | undefined, touch?: boolean) => void;
     getFieldValue: (name: string) => RuleTypes;
     validateFields: (nameList?: string[]) => Promise<boolean>;

package/dist/index.esm.js

@@ -714,6 +714,9 @@ const useForm = (initialValues = {}, onFieldsChange, onValuesChange, scrollToFir
     if (remove) {
       delete formRef.current[stepRef.current]?.[name];
       delete rulesRef.current[name];
+      if (fieldInstancesRef.current[name]) {
+        delete fieldInstancesRef.current[name];
+      }
     } else {
       if (!(name in formRef.current[stepRef.current])) {
         formRef.current[stepRef.current][name] = initialValues?.[name];
@@ -1006,7 +1009,7 @@ const FormItem$1 = ({
   const childrenList = useMemo(() => flattenChildren(children), [children]);
   useEffect(() => {
     if (name && !getFieldInstance(name)) {
-      registerField(name, rules, false, fieldRef.current ?? undefined);
+      registerField(name, rules, false, fieldRef.current);
     }
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [name, rules, fieldRef.current]);
@@ -1031,19 +1034,9 @@ const FormItem$1 = ({
   }, [dependencies, name]);
   const isRequired = useMemo(() => rules.some(rule => rule.required), [rules]);
   const errorMessage = getFieldError(name)?.[0];
-  const mergeRefs = elementRef => {
-    return el => {
-      fieldRef.current = el;
-      if (typeof elementRef === 'function') {
-        elementRef(el);
-      } else if (elementRef && typeof elementRef === 'object') {
-        // @ts-ignore
-        elementRef.current = el;
-      }
-    };
-  };
   return /*#__PURE__*/React.createElement("div", {
     style: style,
+    ref: fieldRef,
     className: clsx([`${prefixCls}`, {
       [layout]: layout,
       [className]: className,
@@ -1064,11 +1057,7 @@ const FormItem$1 = ({
         ...childProps
       } = child.props;
       const fieldValue = value ?? getFieldValue(name) ?? initialValue;
-      return /*#__PURE__*/React.createElement("div", {
-        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-        // @ts-expect-error
-        ref: mergeRefs(child.ref)
-      }, /*#__PURE__*/React.createElement(FormItemChildComponent, _extends({}, props, {
+      return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(FormItemChildComponent, _extends({}, props, {
         key: `${key}_${isReseting}`,
         name: name,
         child: child,