rsuite 5.59.1 → 5.59.2

package/cjs/DateRangePicker/Header.js

@@ -0,0 +1,65 @@
+'use client';
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+exports.__esModule = true;
+exports.default = void 0;
+var _react = _interopRequireDefault(require("react"));
+var _utils = require("../utils");
+var _dateUtils = require("../utils/dateUtils");
+var _CustomProvider = require("../CustomProvider");
+var _Button = _interopRequireDefault(require("../Button"));
+function Header(props) {
+  var _prefix;
+  var _useClassNames = (0, _utils.useClassNames)('picker'),
+    prefix = _useClassNames.prefix;
+  var formatStr = props.formatStr,
+    character = props.character,
+    value = props.value,
+    _props$activeKey = props.activeKey,
+    activeKey = _props$activeKey === void 0 ? 'start' : _props$activeKey,
+    clickable = props.clickable,
+    onSelect = props.onSelect;
+  var _ref = value !== null && value !== void 0 ? value : [null, null],
+    startDate = _ref[0],
+    endDate = _ref[1];
+  var v = startDate && endDate ? [startDate, endDate].sort(_dateUtils.compareAsc) : [startDate, endDate];
+  var start = v[0] ? /*#__PURE__*/_react.default.createElement(_CustomProvider.FormattedDate, {
+    date: v[0],
+    formatStr: formatStr
+  }) : formatStr;
+  var end = v[1] ? /*#__PURE__*/_react.default.createElement(_CustomProvider.FormattedDate, {
+    date: v[1],
+    formatStr: formatStr
+  }) : formatStr;
+  return /*#__PURE__*/_react.default.createElement("div", {
+    className: prefix('daterange-header', (_prefix = {}, _prefix["tab-active-" + activeKey] = clickable, _prefix)),
+    "data-testid": "daterange-header"
+  }, clickable ? /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_Button.default, {
+    size: "xs",
+    appearance: "subtle",
+    className: prefix('header-date'),
+    onClick: function onClick() {
+      return onSelect === null || onSelect === void 0 ? void 0 : onSelect('start');
+    },
+    "aria-label": "Select start date"
+  }, start), /*#__PURE__*/_react.default.createElement("span", {
+    className: prefix('header-character')
+  }, character), /*#__PURE__*/_react.default.createElement(_Button.default, {
+    size: "xs",
+    appearance: "subtle",
+    className: prefix('header-date'),
+    onClick: function onClick() {
+      return onSelect === null || onSelect === void 0 ? void 0 : onSelect('end');
+    },
+    "aria-label": "Select end date"
+  }, end)) : /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("span", {
+    className: prefix('header-date')
+  }, start), /*#__PURE__*/_react.default.createElement("span", {
+    className: prefix('header-character')
+  }, character), /*#__PURE__*/_react.default.createElement("span", {
+    className: prefix('header-date')
+  }, end)));
+}
+var _default = Header;
+exports.default = _default;

package/cjs/DateRangePicker/disabledDateUtils.d.ts

@@ -4,7 +4,7 @@ import { DisabledDateFunction } from './types';
  */
 export declare function allowedMaxDays(days: number): DisabledDateFunction;
 /**
- Only allowed days are specified, other dates are disabled.
+ * Only allowed days are specified, other dates are disabled.
  */
 export declare function allowedDays(days: number): DisabledDateFunction;
 /**

package/cjs/DateRangePicker/disabledDateUtils.js

@@ -46,7 +46,7 @@ function allowedMaxDays(days) {
 }
 
 /**
- Only allowed days are specified, other dates are disabled.
+ * Only allowed days are specified, other dates are disabled.
  */
 function allowedDays(days) {
   return function (date, selectValue, selectedDone, target) {

package/cjs/DateRangePicker/index.js

@@ -1,9 +1,14 @@
 'use client';
 "use strict";
 
+var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard");
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 exports.__esModule = true;
 exports.default = void 0;
 var _DateRangePicker = _interopRequireDefault(require("./DateRangePicker"));
+var utils = _interopRequireWildcard(require("./disabledDateUtils"));
+Object.keys(utils).forEach(function (key) {
+  _DateRangePicker.default[key] = utils[key];
+});
 var _default = _DateRangePicker.default;
 exports.default = _default;

package/cjs/Form/Form.d.ts

@@ -1,36 +1,64 @@
 import React from 'react';
 import { Schema } from 'schema-typed';
-import type { CheckResult } from 'schema-typed';
 import FormControl from '../FormControl';
 import FormControlLabel from '../FormControlLabel';
 import FormErrorMessage from '../FormErrorMessage';
 import FormGroup from '../FormGroup';
 import FormHelpText from '../FormHelpText';
 import { WithAsProps, TypeAttributes, RsRefForwardingComponent } from '../@types/common';
+import { FormInstance } from './hooks/useFormRef';
 export interface FormProps<T = Record<string, any>, errorMsgType = any, E = {
     [P in keyof T]?: errorMsgType;
 }> extends WithAsProps, Omit<React.FormHTMLAttributes<HTMLFormElement>, 'onChange' | 'onSubmit' | 'onError'> {
-    /** Set the left and right columns of the layout of the elements within the form */
+    /**
+     * Set the left and right columns of the layout of the elements within the form。
+     *
+     * @default 'vertical'
+     */
     layout?: 'horizontal' | 'vertical' | 'inline';
-    /** The fluid property allows the Input 100% of the form to fill the container, valid only in vertical layouts. */
+    /**
+     * The fluid property allows the Input 100% of the form to fill the container, valid only in vertical layouts.
+     */
     fluid?: boolean;
-    /** Current value of the input. Creates a controlled component */
-    formValue?: T;
-    /** Initial value */
-    formDefaultValue?: T;
-    /** Error message of form */
-    formError?: E;
-    /** Trigger the type of form validation */
+    /**
+     * Current value of the input. Creates a controlled component
+     */
+    formValue?: T | null;
+    /**
+     * Initial value
+     */
+    formDefaultValue?: T | null;
+    /**
+     * Error message of form
+     */
+    formError?: E | null;
+    /**
+     * Trigger the type of form validation.
+     *
+     * @default 'change'
+     */
     checkTrigger?: TypeAttributes.CheckTrigger;
-    /** SchemaModel object */
+    /**
+     * SchemaModel object
+     *
+     * @see https://github.com/rsuite/schema-typed
+     */
     model?: Schema;
-    /** Make the form readonly */
+    /**
+     * Make the form readonly
+     */
     readOnly?: boolean;
-    /** Render the form as plain text */
+    /**
+     * Render the form as plain text
+     */
     plaintext?: boolean;
-    /** Disable the form. */
+    /**
+     * Disable the form
+     */
     disabled?: boolean;
-    /** The error message comes from context */
+    /**
+     * The error message comes from context
+     */
     errorFromContext?: boolean;
     /**
      * The form data is nested.
@@ -46,33 +74,22 @@ export interface FormProps<T = Record<string, any>, errorMsgType = any, E = {
      * ```
      */
     nestedField?: boolean;
-    /** Callback fired when data changing */
+    /**
+     * Callback fired when data changing
+     */
     onChange?: (formValue: T, event?: React.SyntheticEvent) => void;
-    /** Callback fired when error checking */
+    /**
+     * Callback fired when error checking
+     */
     onError?: (formError: E) => void;
-    /** Callback fired when data cheking */
+    /**
+     * Callback fired when data cheking
+     */
     onCheck?: (formError: E) => void;
-    /** Callback fired when form submit */
-    onSubmit?: (checkStatus: boolean, event: React.FormEvent<HTMLFormElement>) => void;
-}
-export interface FormInstance<T = Record<string, any>, errorMsg = string, E = {
-    [P in keyof T]?: errorMsg;
-}> {
-    root: HTMLFormElement | null;
-    /** Verify form data */
-    check: (callback?: (formError: E) => void) => boolean;
-    /** Asynchronously check form data */
-    checkAsync: () => Promise<any>;
-    /** Check the data field */
-    checkForField: (fieldName: keyof T, callback?: (checkResult: CheckResult<errorMsg>) => void) => boolean;
-    /** Asynchronous verification as a data field */
-    checkForFieldAsync: (fieldName: keyof T) => Promise<CheckResult>;
-    /** Clear all error messages */
-    cleanErrors: (callback?: () => void) => void;
-    /** Clear the error message of the specified field */
-    cleanErrorForField: (fieldName: keyof E, callback?: () => void) => void;
-    /** All error messages are reset, and an initial value can be set */
-    resetErrors: (formError: E, callback?: () => void) => void;
+    /**
+     * Callback fired when form submit
+     */
+    onSubmit?: (checkPassed: boolean, event: React.FormEvent<HTMLFormElement>) => void;
 }
 export interface FormComponent extends RsRefForwardingComponent<'form', FormProps & {
     ref?: React.Ref<FormInstance>;

package/cjs/Form/Form.js

@@ -1,18 +1,15 @@
 'use client';
 "use strict";
 
-var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard");
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 exports.__esModule = true;
 exports.default = void 0;
-var _extends6 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _objectWithoutPropertiesLoose2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutPropertiesLoose"));
-var _react = _interopRequireWildcard(require("react"));
+var _react = _interopRequireDefault(require("react"));
 var _propTypes = _interopRequireDefault(require("prop-types"));
-var _omit = _interopRequireDefault(require("lodash/omit"));
-var _set = _interopRequireDefault(require("lodash/set"));
 var _schemaTyped = require("schema-typed");
-var _FormContext = _interopRequireWildcard(require("./FormContext"));
+var _FormContext = require("./FormContext");
 var _FormControl = _interopRequireDefault(require("../FormControl"));
 var _FormControlLabel = _interopRequireDefault(require("../FormControlLabel"));
 var _FormErrorMessage = _interopRequireDefault(require("../FormErrorMessage"));
@@ -21,9 +18,11 @@ var _FormHelpText = _interopRequireDefault(require("../FormHelpText"));
 var _utils = require("../utils");
 var _propTypes2 = require("../internals/propTypes");
 var _useSchemaModel2 = _interopRequireDefault(require("./hooks/useSchemaModel"));
-var _useFormError2 = _interopRequireDefault(require("./hooks/useFormError"));
+var _useFormValidate2 = _interopRequireDefault(require("./hooks/useFormValidate"));
 var _useFormValue2 = _interopRequireDefault(require("./hooks/useFormValue"));
 var _useFormClassNames = _interopRequireDefault(require("./hooks/useFormClassNames"));
+var defaultSchema = (0, _schemaTyped.SchemaModel)({});
+
 /**
  * The `Form` component is a form interface for collecting and validating user input.
  * @see https://rsuitejs.com/components/form
@@ -37,15 +36,15 @@ var Form = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
     errorFromContext = _props$errorFromConte === void 0 ? true : _props$errorFromConte,
     _props$formDefaultVal = props.formDefaultValue,
     formDefaultValue = _props$formDefaultVal === void 0 ? {} : _props$formDefaultVal,
-    formValueProp = props.formValue,
-    formErrorProp = props.formError,
+    controlledFormValue = props.formValue,
+    controlledFormError = props.formError,
     fluid = props.fluid,
     _props$nestedField = props.nestedField,
     nestedField = _props$nestedField === void 0 ? false : _props$nestedField,
     _props$layout = props.layout,
     layout = _props$layout === void 0 ? 'vertical' : _props$layout,
     _props$model = props.model,
-    formModel = _props$model === void 0 ? (0, _schemaTyped.SchemaModel)({}) : _props$model,
+    formModel = _props$model === void 0 ? defaultSchema : _props$model,
     readOnly = props.readOnly,
     plaintext = props.plaintext,
     className = props.className,
@@ -60,6 +59,27 @@ var Form = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
     getCombinedModel = _useSchemaModel.getCombinedModel,
     pushFieldRule = _useSchemaModel.pushFieldRule,
     removeFieldRule = _useSchemaModel.removeFieldRule;
+  var _useFormValue = (0, _useFormValue2.default)(controlledFormValue, {
+      formDefaultValue: formDefaultValue,
+      nestedField: nestedField
+    }),
+    formValue = _useFormValue.formValue,
+    onRemoveValue = _useFormValue.onRemoveValue,
+    setFieldValue = _useFormValue.setFieldValue;
+  var formValidateProps = {
+    ref: ref,
+    formValue: formValue,
+    getCombinedModel: getCombinedModel,
+    onCheck: onCheck,
+    onError: onError,
+    nestedField: nestedField
+  };
+  var _useFormValidate = (0, _useFormValidate2.default)(controlledFormError, formValidateProps),
+    formError = _useFormValidate.formError,
+    setFieldError = _useFormValidate.setFieldError,
+    onRemoveError = _useFormValidate.onRemoveError,
+    check = _useFormValidate.check,
+    formRef = _useFormValidate.formRef;
   var classes = (0, _useFormClassNames.default)({
     classPrefix: classPrefix,
     className: className,
@@ -69,199 +89,57 @@ var Form = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
     plaintext: plaintext,
     disabled: disabled
   });
-  var _useFormValue = (0, _useFormValue2.default)(formValueProp, formDefaultValue),
-    formValue = _useFormValue.formValue,
-    setFormValue = _useFormValue.setFormValue,
-    onRemoveValue = _useFormValue.onRemoveValue;
-  var _useFormError = (0, _useFormError2.default)(formErrorProp),
-    formError = _useFormError.formError,
-    setFormError = _useFormError.setFormError,
-    onRemoveError = _useFormError.onRemoveError;
-  /**
-   * Validate the form data and return a boolean.
-   * The error message after verification is returned in the callback.
-   * @param callback
-   */
-  var check = (0, _utils.useEventCallback)(function (callback) {
-    var formError = {};
-    var errorCount = 0;
-    var model = getCombinedModel();
-    Object.keys(model.getSchemaSpec()).forEach(function (key) {
-      var checkResult = model.checkForField(key, formValue || {});
-      if (checkResult.hasError === true) {
-        errorCount += 1;
-        formError[key] = (checkResult === null || checkResult === void 0 ? void 0 : checkResult.errorMessage) || checkResult;
-      }
-    });
-    setFormError(formError);
-    onCheck === null || onCheck === void 0 ? void 0 : onCheck(formError);
-    callback === null || callback === void 0 ? void 0 : callback(formError);
-    if (errorCount > 0) {
-      onError === null || onError === void 0 ? void 0 : onError(formError);
-      return false;
-    }
-    return true;
-  });
-
-  /**
-   * Check the data field
-   * @param fieldName
-   * @param callback
-   */
-  var checkForField = (0, _utils.useEventCallback)(function (fieldName, callback) {
-    var _extends2;
-    var model = getCombinedModel();
-    var checkResult = model.checkForField(fieldName, formValue || {});
-    var nextFormError = (0, _extends6.default)({}, formError, (_extends2 = {}, _extends2[fieldName] = (checkResult === null || checkResult === void 0 ? void 0 : checkResult.errorMessage) || checkResult, _extends2));
-    setFormError(nextFormError);
-    onCheck === null || onCheck === void 0 ? void 0 : onCheck(nextFormError);
-    callback === null || callback === void 0 ? void 0 : callback(checkResult);
-    if (checkResult.hasError) {
-      onError === null || onError === void 0 ? void 0 : onError(nextFormError);
-    }
-    return !checkResult.hasError;
-  });
-
-  /**
-   * Check form data asynchronously and return a Promise
-   */
-  var checkAsync = (0, _utils.useEventCallback)(function () {
-    var promises = [];
-    var keys = [];
-    var model = getCombinedModel();
-    Object.keys(model.getSchemaSpec()).forEach(function (key) {
-      keys.push(key);
-      promises.push(model.checkForFieldAsync(key, formValue || {}));
-    });
-    return Promise.all(promises).then(function (values) {
-      var formError = {};
-      var errorCount = 0;
-      for (var i = 0; i < values.length; i++) {
-        if (values[i].hasError) {
-          errorCount += 1;
-          formError[keys[i]] = values[i].errorMessage;
-        }
-      }
-      onCheck === null || onCheck === void 0 ? void 0 : onCheck(formError);
-      setFormError(formError);
-      if (errorCount > 0) {
-        onError === null || onError === void 0 ? void 0 : onError(formError);
-      }
-      return {
-        hasError: errorCount > 0,
-        formError: formError
-      };
-    });
-  });
-
-  /**
-   * Asynchronously check form fields and return Promise
-   * @param fieldName
-   */
-  var checkForFieldAsync = (0, _utils.useEventCallback)(function (fieldName) {
-    var model = getCombinedModel();
-    return model.checkForFieldAsync(fieldName, formValue || {}).then(function (checkResult) {
-      var _extends3;
-      var nextFormError = (0, _extends6.default)({}, formError, (_extends3 = {}, _extends3[fieldName] = checkResult.errorMessage, _extends3));
-      onCheck === null || onCheck === void 0 ? void 0 : onCheck(nextFormError);
-      setFormError(nextFormError);
-      if (checkResult.hasError) {
-        onError === null || onError === void 0 ? void 0 : onError(nextFormError);
-      }
-      return checkResult;
-    });
-  });
-  var cleanErrors = (0, _utils.useEventCallback)(function () {
-    setFormError({});
-  });
-  var cleanErrorForField = (0, _utils.useEventCallback)(function (fieldName) {
-    setFormError((0, _omit.default)(formError, [fieldName]));
-  });
-  var resetErrors = (0, _utils.useEventCallback)(function (formError) {
-    if (formError === void 0) {
-      formError = {};
-    }
-    setFormError(formError);
-  });
-  (0, _react.useImperativeHandle)(ref, function () {
-    return {
-      root: rootRef.current,
-      check: check,
-      checkForField: checkForField,
-      checkAsync: checkAsync,
-      checkForFieldAsync: checkForFieldAsync,
-      cleanErrors: cleanErrors,
-      cleanErrorForField: cleanErrorForField,
-      resetErrors: resetErrors
-    };
-  });
-  var removeFieldError = (0, _utils.useEventCallback)(function (name) {
-    var formError = onRemoveError(name);
-    setFormError(formError);
-    onCheck === null || onCheck === void 0 ? void 0 : onCheck(formError);
-  });
   var removeFieldValue = (0, _utils.useEventCallback)(function (name) {
     var formValue = onRemoveValue(name);
     onChange === null || onChange === void 0 ? void 0 : onChange(formValue);
   });
+  var removeFieldError = (0, _utils.useEventCallback)(function (name) {
+    onRemoveError(name);
+  });
   var handleSubmit = (0, _utils.useEventCallback)(function (event) {
+    var _event$preventDefault, _event$stopPropagatio;
+    event === null || event === void 0 ? void 0 : (_event$preventDefault = event.preventDefault) === null || _event$preventDefault === void 0 ? void 0 : _event$preventDefault.call(event);
+    event === null || event === void 0 ? void 0 : (_event$stopPropagatio = event.stopPropagation) === null || _event$stopPropagatio === void 0 ? void 0 : _event$stopPropagatio.call(event);
     if (disabled || readOnly || plaintext) {
       return;
     }
-    event.preventDefault();
-    event.stopPropagation();
-    var checkStatus = check();
-    onSubmit === null || onSubmit === void 0 ? void 0 : onSubmit(checkStatus, event);
+    var checkResult = check();
+    onSubmit === null || onSubmit === void 0 ? void 0 : onSubmit(checkResult, event);
   });
-  var handleFieldError = (0, _utils.useEventCallback)(function (name, errorMessage) {
-    var _extends4;
-    var nextFormError = (0, _extends6.default)({}, formError, (_extends4 = {}, _extends4[name] = errorMessage, _extends4));
-    setFormError(nextFormError);
-    onError === null || onError === void 0 ? void 0 : onError(nextFormError);
-    onCheck === null || onCheck === void 0 ? void 0 : onCheck(nextFormError);
+  var onFieldError = (0, _utils.useEventCallback)(function (name, checkResult) {
+    setFieldError(name, checkResult);
   });
-  var handleFieldSuccess = (0, _utils.useEventCallback)(function (name) {
+  var onFieldSuccess = (0, _utils.useEventCallback)(function (name) {
     removeFieldError(name);
   });
-  var setFieldValue = function setFieldValue(formValue, fieldName, fieldValue) {
-    var _extends5;
-    if (nestedField) {
-      return (0, _set.default)((0, _extends6.default)({}, formValue), fieldName, fieldValue);
-    }
-    return (0, _extends6.default)({}, formValue, (_extends5 = {}, _extends5[fieldName] = fieldValue, _extends5));
-  };
-  var handleFieldChange = (0, _utils.useEventCallback)(function (name, value, event) {
-    var nextFormValue = setFieldValue(formValue, name, value);
-    setFormValue(nextFormValue);
+  var onFieldChange = (0, _utils.useEventCallback)(function (name, value, event) {
+    var nextFormValue = setFieldValue(name, value);
     onChange === null || onChange === void 0 ? void 0 : onChange(nextFormValue, event);
   });
-  var rootRef = (0, _react.useRef)(null);
-  var formContextValue = (0, _react.useMemo)(function () {
-    return {
-      getCombinedModel: getCombinedModel,
-      checkTrigger: checkTrigger,
-      errorFromContext: errorFromContext,
-      readOnly: readOnly,
-      plaintext: plaintext,
-      disabled: disabled,
-      formError: formError,
-      nestedField: nestedField,
-      removeFieldValue: removeFieldValue,
-      removeFieldError: removeFieldError,
-      pushFieldRule: pushFieldRule,
-      removeFieldRule: removeFieldRule,
-      onFieldChange: handleFieldChange,
-      onFieldError: handleFieldError,
-      onFieldSuccess: handleFieldSuccess
-    };
-  }, [getCombinedModel, checkTrigger, errorFromContext, readOnly, plaintext, disabled, formError, nestedField, removeFieldValue, removeFieldError, pushFieldRule, removeFieldRule, handleFieldChange, handleFieldError, handleFieldSuccess]);
-  return /*#__PURE__*/_react.default.createElement("form", (0, _extends6.default)({}, rest, {
-    ref: rootRef,
+  var formContextValue = {
+    errorFromContext: errorFromContext,
+    checkTrigger: checkTrigger,
+    plaintext: plaintext,
+    readOnly: readOnly,
+    disabled: disabled,
+    formError: formError,
+    nestedField: nestedField,
+    pushFieldRule: pushFieldRule,
+    getCombinedModel: getCombinedModel,
+    removeFieldValue: removeFieldValue,
+    removeFieldError: removeFieldError,
+    removeFieldRule: removeFieldRule,
+    onFieldSuccess: onFieldSuccess,
+    onFieldChange: onFieldChange,
+    onFieldError: onFieldError
+  };
+  return /*#__PURE__*/_react.default.createElement("form", (0, _extends2.default)({}, rest, {
+    ref: formRef,
     onSubmit: handleSubmit,
     className: classes
-  }), /*#__PURE__*/_react.default.createElement(_FormContext.default.Provider, {
+  }), /*#__PURE__*/_react.default.createElement(_FormContext.FormProvider, {
     value: formContextValue
-  }, /*#__PURE__*/_react.default.createElement(_FormContext.FormValueContext.Provider, {
+  }, /*#__PURE__*/_react.default.createElement(_FormContext.FormValueProvider, {
     value: formValue
   }, children)));
 });

package/cjs/Form/FormContext.d.ts

@@ -1,19 +1,20 @@
 import React from 'react';
 import { TypeAttributes } from '../@types/common';
-import type { Schema } from 'schema-typed';
+import type { Schema, CheckResult } from 'schema-typed';
 import type { FieldRuleType } from './hooks/useSchemaModel';
-interface TrulyFormContextValue<T = Record<string, any>, errorMsgType = any, E = {
+declare type RecordAny = Record<string, any>;
+interface TrulyFormContextValue<T = RecordAny, errorMsgType = any, E = {
     [P in keyof T]?: errorMsgType;
 }> {
-    getCombinedModel: () => Schema;
     formError: E;
     nestedField: boolean;
+    getCombinedModel: () => Schema;
     removeFieldValue: (name: string) => void;
     removeFieldError: (name: string) => void;
-    pushFieldRule: (name: string, fieldRule: FieldRuleType) => void;
     removeFieldRule: (name: string) => void;
+    pushFieldRule: (name: string, fieldRule: FieldRuleType) => void;
+    onFieldError: (name: string, fieldError: string | CheckResult) => void;
     onFieldChange: (name: string, value: any, event: React.SyntheticEvent) => void;
-    onFieldError: (name: string, errorMessage: string) => void;
     onFieldSuccess: (name: string) => void;
 }
 declare type ExternalPropsContextValue = {
@@ -24,8 +25,10 @@ declare type ExternalPropsContextValue = {
     disabled?: boolean;
 };
 declare type InitialContextType = Partial<Record<keyof TrulyFormContextValue, undefined>>;
-export declare type FormContextValue<T = Record<string, any>, errorMsgType = any> = (TrulyFormContextValue<T, errorMsgType> | InitialContextType) & ExternalPropsContextValue;
-export declare const FormContext: React.Context<FormContextValue<Record<string, any>, any>>;
-export declare const FormValueContext: React.Context<Record<string, any> | undefined>;
-export declare const FormPlaintextContext: React.Context<boolean>;
+export declare type FormContextValue<T = RecordAny, errorMsgType = any> = (TrulyFormContextValue<T, errorMsgType> | InitialContextType) & ExternalPropsContextValue;
+export declare const FormContext: React.Context<FormContextValue<RecordAny, any>>;
+export declare const FormValueContext: React.Context<RecordAny | undefined>;
+export declare const FormProvider: React.Provider<FormContextValue<RecordAny, any>>;
+export declare const FormValueProvider: React.Provider<RecordAny | undefined>;
+export declare function useFormContext<T = RecordAny, E = any>(): FormContextValue<T, E>;
 export default FormContext;

package/cjs/Form/FormContext.js

@@ -1,15 +1,21 @@
 'use client';
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard");
 exports.__esModule = true;
-exports.default = exports.FormPlaintextContext = exports.FormValueContext = exports.FormContext = void 0;
-var _react = _interopRequireDefault(require("react"));
+exports.useFormContext = useFormContext;
+exports.default = exports.FormValueProvider = exports.FormProvider = exports.FormValueContext = exports.FormContext = void 0;
+var _react = _interopRequireWildcard(require("react"));
 var FormContext = /*#__PURE__*/_react.default.createContext({});
 exports.FormContext = FormContext;
 var FormValueContext = /*#__PURE__*/_react.default.createContext({});
 exports.FormValueContext = FormValueContext;
-var FormPlaintextContext = /*#__PURE__*/_react.default.createContext(false);
-exports.FormPlaintextContext = FormPlaintextContext;
+var FormProvider = FormContext.Provider;
+exports.FormProvider = FormProvider;
+var FormValueProvider = FormValueContext.Provider;
+exports.FormValueProvider = FormValueProvider;
+function useFormContext() {
+  return (0, _react.useContext)(FormContext);
+}
 var _default = FormContext;
 exports.default = _default;

package/cjs/Form/hooks/useFormRef.d.ts

@@ -0,0 +1,55 @@
+/// <reference types="react" />
+import type { CheckResult } from 'schema-typed';
+export interface FormImperativeMethods<T = Record<string, any>, M = string, E = {
+    [P in keyof T]?: M;
+}> {
+    /**
+     * Verify form data
+     */
+    check: (callback?: (formError: E) => void) => boolean;
+    /**
+     * Asynchronously check form data
+     */
+    checkAsync: () => Promise<any>;
+    /**
+     * Check the data field
+     */
+    checkForField: (fieldName: keyof T, callback?: (checkResult: CheckResult<M>) => void) => boolean;
+    /**
+     * Asynchronous verification as a data field
+     */
+    checkForFieldAsync: (fieldName: keyof T) => Promise<CheckResult>;
+    /**
+     * Clear all error messages
+     */
+    cleanErrors: (callback?: () => void) => void;
+    /**
+     * Clear the error message of the specified field
+     */
+    cleanErrorForField: (fieldName: keyof E, callback?: () => void) => void;
+    /**
+     * All error messages are reset, and an initial value can be set
+     */
+    resetErrors: (formError?: E) => void;
+}
+export interface FormInstance<T = Record<string, any>, M = string, E = {
+    [P in keyof T]?: M;
+}> extends FormImperativeMethods<T, M, E> {
+    /**
+     * Form root element
+     */
+    root: HTMLFormElement | null;
+}
+interface FormRefProps<T = Record<string, any>, M = string, E = {
+    [P in keyof T]?: M;
+}> {
+    formError: E;
+    nestedField?: boolean;
+    setFormError: (formError: E) => void;
+    check: (callback?: (formError: E) => void) => boolean;
+    checkForField: (fieldName: keyof T, callback?: (checkResult: CheckResult<M>) => void) => boolean;
+    checkAsync: () => Promise<any>;
+    checkForFieldAsync: (fieldName: keyof T) => Promise<CheckResult>;
+}
+export default function useFormRef(ref: React.Ref<FormInstance>, props: FormRefProps): import("react").RefObject<HTMLFormElement>;
+export {};