@conform-to/react 0.6.0-pre.0 → 0.6.1

package/helpers.js

@@ -2,6 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
+var _rollupPluginBabelHelpers = require('./_virtual/_rollupPluginBabelHelpers.js');
 var dom = require('@conform-to/dom');
 
 /**
@@ -19,90 +20,75 @@ var hiddenStyle = {
   whiteSpace: 'nowrap',
   border: 0
 };
-function input(config) {
-  var _config$initialError;
-  var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-  var attributes = {
+function getFormControlProps(config, options) {
+  var _config$error;
+  var props = {
     id: config.id,
-    type: options.type,
     name: config.name,
     form: config.form,
-    required: config.required,
+    required: config.required
+  };
+  if (config.id) {
+    props.id = config.id;
+  }
+  if (config.descriptionId && options !== null && options !== void 0 && options.description) {
+    props['aria-describedby'] = config.descriptionId;
+  }
+  if (config.errorId && (_config$error = config.error) !== null && _config$error !== void 0 && _config$error.length) {
+    props['aria-invalid'] = true;
+    props['aria-describedby'] = config.descriptionId && options !== null && options !== void 0 && options.description ? "".concat(config.errorId, " ").concat(config.descriptionId) : config.errorId;
+  }
+  if (config.initialError && Object.entries(config.initialError).length > 0) {
+    props.autoFocus = true;
+  }
+  if (options !== null && options !== void 0 && options.hidden) {
+    props.style = hiddenStyle;
+    props.tabIndex = -1;
+    props['aria-hidden'] = true;
+  }
+  return props;
+}
+function input(config) {
+  var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+  var props = _rollupPluginBabelHelpers.objectSpread2(_rollupPluginBabelHelpers.objectSpread2({}, getFormControlProps(config, options)), {}, {
+    type: options.type,
     minLength: config.minLength,
     maxLength: config.maxLength,
     min: config.min,
     max: config.max,
     step: config.step,
     pattern: config.pattern,
-    multiple: config.multiple,
-    'aria-invalid': Boolean((_config$initialError = config.initialError) === null || _config$initialError === void 0 ? void 0 : _config$initialError.length),
-    'aria-describedby': config.errorId
-  };
-  if (options !== null && options !== void 0 && options.hidden) {
-    attributes.style = hiddenStyle;
-    attributes.tabIndex = -1;
-    attributes['aria-hidden'] = true;
-  }
-  if (config.initialError && Object.entries(config.initialError).length > 0) {
-    attributes.autoFocus = true;
-  }
+    multiple: config.multiple
+  });
   if (options.type === 'checkbox' || options.type === 'radio') {
     var _options$value;
-    attributes.value = (_options$value = options.value) !== null && _options$value !== void 0 ? _options$value : 'on';
-    attributes.defaultChecked = config.defaultValue === attributes.value;
+    props.value = (_options$value = options.value) !== null && _options$value !== void 0 ? _options$value : 'on';
+    props.defaultChecked = config.defaultValue === props.value;
   } else if (options.type !== 'file') {
-    attributes.defaultValue = config.defaultValue;
+    props.defaultValue = config.defaultValue;
   }
-  return attributes;
+  return props;
 }
 function select(config, options) {
-  var _config$defaultValue, _config$initialError2;
-  var attributes = {
-    id: config.id,
-    name: config.name,
-    form: config.form,
-    defaultValue: config.multiple ? Array.isArray(config.defaultValue) ? config.defaultValue : [] : "".concat((_config$defaultValue = config.defaultValue) !== null && _config$defaultValue !== void 0 ? _config$defaultValue : ''),
-    required: config.required,
-    multiple: config.multiple,
-    'aria-invalid': Boolean((_config$initialError2 = config.initialError) === null || _config$initialError2 === void 0 ? void 0 : _config$initialError2.length),
-    'aria-describedby': config.errorId
-  };
-  if (options !== null && options !== void 0 && options.hidden) {
-    attributes.style = hiddenStyle;
-    attributes.tabIndex = -1;
-    attributes['aria-hidden'] = true;
-  }
-  if (config.initialError && Object.entries(config.initialError).length > 0) {
-    attributes.autoFocus = true;
-  }
-  return attributes;
+  var props = _rollupPluginBabelHelpers.objectSpread2(_rollupPluginBabelHelpers.objectSpread2({}, getFormControlProps(config, options)), {}, {
+    defaultValue: config.defaultValue,
+    multiple: config.multiple
+  });
+  return props;
 }
 function textarea(config, options) {
-  var _config$defaultValue2, _config$initialError3;
-  var attributes = {
-    id: config.id,
-    name: config.name,
-    form: config.form,
-    defaultValue: "".concat((_config$defaultValue2 = config.defaultValue) !== null && _config$defaultValue2 !== void 0 ? _config$defaultValue2 : ''),
-    required: config.required,
+  var props = _rollupPluginBabelHelpers.objectSpread2(_rollupPluginBabelHelpers.objectSpread2({}, getFormControlProps(config, options)), {}, {
+    defaultValue: config.defaultValue,
     minLength: config.minLength,
-    maxLength: config.maxLength,
-    autoFocus: Boolean(config.initialError),
-    'aria-invalid': Boolean((_config$initialError3 = config.initialError) === null || _config$initialError3 === void 0 ? void 0 : _config$initialError3.length),
-    'aria-describedby': config.errorId
-  };
-  if (options !== null && options !== void 0 && options.hidden) {
-    attributes.style = hiddenStyle;
-    attributes.tabIndex = -1;
-    attributes['aria-hidden'] = true;
-  }
-  if (config.initialError && Object.entries(config.initialError).length > 0) {
-    attributes.autoFocus = true;
-  }
-  return attributes;
+    maxLength: config.maxLength
+  });
+  return props;
 }
-var intent = '__intent__';
 
+Object.defineProperty(exports, 'INTENT', {
+	enumerable: true,
+	get: function () { return dom.INTENT; }
+});
 Object.defineProperty(exports, 'VALIDATION_SKIPPED', {
 	enumerable: true,
 	get: function () { return dom.VALIDATION_SKIPPED; }
@@ -112,6 +98,5 @@ Object.defineProperty(exports, 'VALIDATION_UNDEFINED', {
 	get: function () { return dom.VALIDATION_UNDEFINED; }
 });
 exports.input = input;
-exports.intent = intent;
 exports.select = select;
 exports.textarea = textarea;

package/hooks.d.ts

@@ -7,20 +7,35 @@ export interface FormConfig<Schema extends Record<string, any>, ClientSubmission
      */
     id?: string;
     /**
-     * Define when the error should be reported initially.
+     * A form ref object. Conform will fallback to its own ref object if it is not provided.
+     */
+    ref?: RefObject<HTMLFormElement>;
+    /**
+     * @deprecated Use `shouldValidate` and `shouldRevalidate` instead.
+     */
+    initialReport?: 'onSubmit' | 'onChange' | 'onBlur';
+    /**
+     * Define when conform should start validation.
      * Support "onSubmit", "onChange", "onBlur".
      *
      * Default to `onSubmit`.
      */
-    initialReport?: 'onSubmit' | 'onChange' | 'onBlur';
+    shouldValidate?: 'onSubmit' | 'onBlur' | 'onInput';
+    /**
+     * Define when conform should revalidate again.
+     * Support "onSubmit", "onChange", "onBlur".
+     *
+     * Default to `onInput`.
+     */
+    shouldRevalidate?: 'onSubmit' | 'onBlur' | 'onInput';
     /**
      * An object representing the initial value of the form.
      */
     defaultValue?: FieldValue<Schema>;
     /**
-     * An object describing the state from the last submission
+     * An object describing the result of the last submission
      */
-    state?: Submission;
+    lastSubmission?: Submission;
     /**
      * An object describing the constraint of each field
      */
@@ -60,17 +75,20 @@ export interface FormConfig<Schema extends Record<string, any>, ClientSubmission
  * Properties to be applied to the form element
  */
 interface FormProps {
-    ref: RefObject<HTMLFormElement>;
     id?: string;
+    ref: RefObject<HTMLFormElement>;
     onSubmit: (event: FormEvent<HTMLFormElement>) => void;
     noValidate: boolean;
+    'aria-invalid'?: 'true';
+    'aria-describedby'?: string;
 }
-interface Form<Schema extends Record<string, any>> {
+interface Form {
     id?: string;
-    ref: RefObject<HTMLFormElement>;
+    errorId?: string;
     error: string;
+    errors: string[];
+    ref: RefObject<HTMLFormElement>;
     props: FormProps;
-    config: FieldsetConfig<Schema>;
 }
 /**
  * Returns properties required to hook into form events.
@@ -78,20 +96,12 @@ interface Form<Schema extends Record<string, any>> {
  *
  * @see https://conform.guide/api/react#useform
  */
-export declare function useForm<Schema extends Record<string, any>, ClientSubmission extends Submission | Submission<Schema> = Submission>(config?: FormConfig<Schema, ClientSubmission>): [Form<Schema>, Fieldset<Schema>];
-/**
- * All the information of the field, including state and config.
- */
-export type Field<Schema> = {
-    config: FieldConfig<Schema>;
-    error?: string;
-    errors?: string[];
-};
+export declare function useForm<Schema extends Record<string, any>, ClientSubmission extends Submission | Submission<Schema> = Submission>(config?: FormConfig<Schema, ClientSubmission>): [Form, Fieldset<Schema>];
 /**
- * A set of field information.
+ * A set of field configuration
  */
 export type Fieldset<Schema extends Record<string, any>> = {
-    [Key in keyof Schema]-?: Field<Schema[Key]>;
+    [Key in keyof Schema]-?: FieldConfig<Schema[Key]>;
 };
 export interface FieldsetConfig<Schema extends Record<string, any>> {
     /**
@@ -111,7 +121,7 @@ export interface FieldsetConfig<Schema extends Record<string, any>> {
      */
     constraint?: FieldsetConstraint<Schema>;
     /**
-     * The id of the form, connecting each field to a form remotely.
+     * The id of the form, connecting each field to a form remotely
      */
     form?: string;
 }
@@ -130,10 +140,7 @@ export declare function useFieldset<Schema extends Record<string, any>>(ref: Ref
  */
 export declare function useFieldList<Payload = any>(ref: RefObject<HTMLFormElement | HTMLFieldSetElement>, config: FieldConfig<Array<Payload>>): Array<{
     key: string;
-    error: string | undefined;
-    errors: string[] | undefined;
-    config: FieldConfig<Payload>;
-}>;
+} & FieldConfig<Payload>>;
 interface InputControl {
     change: (eventOrValue: {
         target: {