@conform-to/react 1.16.0 → 1.17.0

package/dist/future/intent.mjs

@@ -1,5 +1,5 @@
 import { objectSpread2 as _objectSpread2 } from '../_virtual/_rollupPluginBabelHelpers.mjs';
-import { getPathSegments, getRelativePath, isPlainObject, appendPathSegment } from '@conform-to/dom/future';
+import { getPathSegments, getRelativePath, isPlainObject, appendPathSegment, getValueAtPath } from '@conform-to/dom/future';
 import { isOptional, isUndefined, isNullable, appendUniqueItem, merge, updateValueAtPath, isString, getArrayAtPath, createPathIndexUpdater, compactMap, generateUniqueKey, isNumber, transformKeys } from './util.mjs';
 import { getDefaultListKey } from './state.mjs';
 
@@ -42,19 +42,35 @@ function deserializeIntent(value) {
  * Applies intent transformation to submission payload.
  * Returns modified payload or null for reset intent.
  */
-function applyIntent(submission, options) {
-  var _options$handlers, _handler$validatePayl, _handler$validatePayl2;
+function resolveIntent(submission, options) {
+  var _options$handlers, _handler$validate, _handler$validate2;
   if (!submission.intent) {
     return submission.payload;
   }
   var intent = deserializeIntent(submission.intent);
-  var handlers = (_options$handlers = options === null || options === void 0 ? void 0 : options.handlers) !== null && _options$handlers !== void 0 ? _options$handlers : actionHandlers;
+  var handlers = (_options$handlers = options === null || options === void 0 ? void 0 : options.handlers) !== null && _options$handlers !== void 0 ? _options$handlers : intentHandlers;
   var handler = handlers[intent.type];
-  if (handler && handler.onApply && ((_handler$validatePayl = (_handler$validatePayl2 = handler.validatePayload) === null || _handler$validatePayl2 === void 0 ? void 0 : _handler$validatePayl2.call(handler, intent.payload)) !== null && _handler$validatePayl !== void 0 ? _handler$validatePayl : true)) {
-    return handler.onApply(submission.payload, intent.payload);
+  if (handler !== null && handler !== void 0 && handler.resolve && ((_handler$validate = (_handler$validate2 = handler.validate) === null || _handler$validate2 === void 0 ? void 0 : _handler$validate2.call(handler, intent.payload)) !== null && _handler$validate !== void 0 ? _handler$validate : true)) {
+    return handler.resolve(submission.payload, intent.payload);
   }
   return submission.payload;
 }
+
+/**
+ * Resolves an intent after validation by calling the handler's onResolve.
+ * Mutates the result with updated value/error and returns whether the intent was cancelled.
+ */
+function applyIntent(result, intent, options) {
+  if (intent) {
+    var _options$handlers2, _handler$validate3, _handler$validate4;
+    var handlers = (_options$handlers2 = options === null || options === void 0 ? void 0 : options.handlers) !== null && _options$handlers2 !== void 0 ? _options$handlers2 : intentHandlers;
+    var handler = handlers[intent.type];
+    if (handler !== null && handler !== void 0 && handler.apply && ((_handler$validate3 = (_handler$validate4 = handler.validate) === null || _handler$validate4 === void 0 ? void 0 : _handler$validate4.call(handler, intent.payload)) !== null && _handler$validate3 !== void 0 ? _handler$validate3 : true)) {
+      return handler.apply(result, intent.payload);
+    }
+  }
+  return result;
+}
 function insertItem(list, item, index) {
   list.splice(index, 0, item);
 }
@@ -86,36 +102,34 @@ function updateListKeys() {
  * - update: updates specific field values
  * - insert/remove/reorder: manages array field operations
  */
-var actionHandlers = {
+var intentHandlers = {
   reset: {
-    validatePayload(options) {
+    validate(options) {
       return isOptional(options, isPlainObject) && (isUndefined(options === null || options === void 0 ? void 0 : options.defaultValue) || isNullable(options === null || options === void 0 ? void 0 : options.defaultValue, isPlainObject));
     },
-    onApply(_, options) {
+    resolve(_, options) {
       if ((options === null || options === void 0 ? void 0 : options.defaultValue) === null) {
         return {};
       }
       return options === null || options === void 0 ? void 0 : options.defaultValue;
     },
-    onUpdate(_, _ref) {
-      var {
-        targetValue,
-        ctx
-      } = _ref;
-      return ctx.reset(targetValue);
+    apply(result) {
+      return _objectSpread2(_objectSpread2({}, result), {}, {
+        reset: true
+      });
     }
   },
   validate: {
-    validatePayload(name) {
+    validate(name) {
       return isOptional(name, isString);
     },
-    onUpdate(state, _ref2) {
+    update(state, _ref) {
       var _intent$payload;
       var {
         submission,
         intent,
         error
-      } = _ref2;
+      } = _ref;
       var name = (_intent$payload = intent.payload) !== null && _intent$payload !== void 0 ? _intent$payload : '';
       var basePath = getPathSegments(name);
       var allFields = error ?
@@ -134,20 +148,20 @@ var actionHandlers = {
     }
   },
   update: {
-    validatePayload(options) {
+    validate(options) {
       return isPlainObject(options) && isOptional(options.name, isString) && isOptional(options.index, isNumber) && !isUndefined(options.value);
     },
-    onApply(value, options) {
+    resolve(value, options) {
       var _options$value;
       var name = appendPathSegment(options.name, options.index);
       return updateValueAtPath(value, name, (_options$value = options.value) !== null && _options$value !== void 0 ? _options$value : name === '' ? {} : null);
     },
-    onUpdate(state, _ref3) {
+    update(state, _ref2) {
       var {
         type,
         submission,
         intent
-      } = _ref3;
+      } = _ref2;
       if (type === 'server') {
         return state;
       }
@@ -174,63 +188,141 @@ var actionHandlers = {
     }
   },
   insert: {
-    validatePayload(options) {
-      return isPlainObject(options) && isString(options.name) && isOptional(options.index, isNumber);
+    validate(options) {
+      return isPlainObject(options) && isString(options.name) && isOptional(options.index, isNumber) && isOptional(options.from, isString) && isOptional(options.onInvalid, mode => mode === 'revert');
     },
-    onApply(value, options) {
+    resolve(value, options) {
       var _options$index;
-      var list = Array.from(getArrayAtPath(value, options.name));
-      insertItem(list, options.defaultValue, (_options$index = options.index) !== null && _options$index !== void 0 ? _options$index : list.length);
-      return updateValueAtPath(value, options.name, list);
+      var result = value;
+      var itemValue = options.defaultValue;
+      if (options.from !== undefined) {
+        itemValue = getValueAtPath(result, options.from);
+        result = updateValueAtPath(result, options.from, '');
+      }
+      var list = Array.from(getArrayAtPath(result, options.name));
+      insertItem(list, itemValue, (_options$index = options.index) !== null && _options$index !== void 0 ? _options$index : list.length);
+      return updateValueAtPath(result, options.name, list);
     },
-    onUpdate(state, _ref4) {
+    apply(result, options) {
+      var _result$error;
+      // Warn if validation result is not yet available
+      if (typeof result.error === 'undefined' && (options.onInvalid || options.from)) {
+        // eslint-disable-next-line no-console
+        console.warn('intent.insert() with `onInvalid` or `from` requires the validation result to be available synchronously. ' + 'These options are ignored because the error is not yet known.');
+        return result;
+      }
+      var arrayErrors = (_result$error = result.error) === null || _result$error === void 0 ? void 0 : _result$error.fieldErrors[options.name];
+      if (options.onInvalid === 'revert' && arrayErrors !== null && arrayErrors !== void 0 && arrayErrors.length) {
+        return _objectSpread2(_objectSpread2({}, result), {}, {
+          targetValue: undefined
+        });
+      }
+      if (options.from !== undefined) {
+        var _options$index2, _result$error2;
+        var index = (_options$index2 = options.index) !== null && _options$index2 !== void 0 ? _options$index2 : getArrayAtPath(result.submission.payload, options.name).length;
+        var insertedItemPath = appendPathSegment(options.name, index);
+        var insertedItemErrors = (_result$error2 = result.error) === null || _result$error2 === void 0 ? void 0 : _result$error2.fieldErrors[insertedItemPath];
+        if (insertedItemErrors !== null && insertedItemErrors !== void 0 && insertedItemErrors.length) {
+          var _result$error$fieldEr, _result$error3, _result$error$formErr, _result$error4, _result$error5;
+          var fromErrors = (_result$error$fieldEr = (_result$error3 = result.error) === null || _result$error3 === void 0 ? void 0 : _result$error3.fieldErrors[options.from]) !== null && _result$error$fieldEr !== void 0 ? _result$error$fieldEr : [];
+          return _objectSpread2(_objectSpread2({}, result), {}, {
+            targetValue: undefined,
+            error: {
+              formErrors: (_result$error$formErr = (_result$error4 = result.error) === null || _result$error4 === void 0 ? void 0 : _result$error4.formErrors) !== null && _result$error$formErr !== void 0 ? _result$error$formErr : [],
+              fieldErrors: _objectSpread2(_objectSpread2({}, (_result$error5 = result.error) === null || _result$error5 === void 0 ? void 0 : _result$error5.fieldErrors), {}, {
+                [options.from]: [...fromErrors, ...insertedItemErrors],
+                [insertedItemPath]: []
+              })
+            }
+          });
+        }
+      }
+      return result;
+    },
+    update(state, _ref3) {
       var _intent$payload$index;
       var {
         type,
         submission,
-        intent
-      } = _ref4;
+        intent,
+        ctx
+      } = _ref3;
       if (type === 'server') {
         return state;
       }
-      var currentValue = submission.payload;
-      var list = getArrayAtPath(currentValue, intent.payload.name);
-      var index = (_intent$payload$index = intent.payload.index) !== null && _intent$payload$index !== void 0 ? _intent$payload$index : list.length;
+      var from = intent.payload.from;
+      var index = (_intent$payload$index = intent.payload.index) !== null && _intent$payload$index !== void 0 ? _intent$payload$index : getArrayAtPath(submission.payload, intent.payload.name).length;
       var updateListIndex = createPathIndexUpdater(intent.payload.name, currentIndex => index <= currentIndex ? currentIndex + 1 : currentIndex);
-      var touchedFields = appendUniqueItem(compactMap(state.touchedFields, updateListIndex), intent.payload.name);
-      var keys = state.listKeys;
+      var touchedFields = state.touchedFields;
+      var listKeys = state.listKeys;
+      if (!ctx.cancelled) {
+        touchedFields = compactMap(state.touchedFields, updateListIndex);
 
-      // Update the keys only for client updates to avoid double updates if there is no client validation
-      if (type === 'client') {
-        var _state$listKeys$inten;
-        var listKeys = Array.from((_state$listKeys$inten = state.listKeys[intent.payload.name]) !== null && _state$listKeys$inten !== void 0 ? _state$listKeys$inten : getDefaultListKey(state.resetKey, currentValue, intent.payload.name));
-        insertItem(listKeys, generateUniqueKey(), index);
-        keys = _objectSpread2(_objectSpread2({}, updateListKeys(state.listKeys, appendPathSegment(intent.payload.name, index), updateListIndex)), {}, {
-          // Update existing list keys
-          [intent.payload.name]: listKeys
-        });
+        // Update the keys only for client updates to avoid double updates if there is no client validation
+        if (type === 'client') {
+          var _state$listKeys$inten;
+          var selectedListKeys = Array.from((_state$listKeys$inten = state.listKeys[intent.payload.name]) !== null && _state$listKeys$inten !== void 0 ? _state$listKeys$inten : getDefaultListKey(state.resetKey, submission.payload, intent.payload.name));
+          insertItem(selectedListKeys, generateUniqueKey(), index);
+          listKeys = _objectSpread2(_objectSpread2({}, updateListKeys(state.listKeys, appendPathSegment(intent.payload.name, index), updateListIndex)), {}, {
+            // Update existing list keys
+            [intent.payload.name]: selectedListKeys
+          });
+        }
+      }
+      touchedFields = appendUniqueItem(touchedFields, intent.payload.name);
+      if (from !== undefined) {
+        touchedFields = appendUniqueItem(touchedFields, from);
       }
       return _objectSpread2(_objectSpread2({}, state), {}, {
-        listKeys: keys,
+        listKeys,
         touchedFields
       });
     }
   },
   remove: {
-    validatePayload(options) {
-      return isPlainObject(options) && isString(options.name) && isNumber(options.index);
+    validate(options) {
+      return isPlainObject(options) && isString(options.name) && isNumber(options.index) && isOptional(options.onInvalid, v => v === 'revert' || v === 'insert');
     },
-    onApply(value, options) {
+    resolve(value, options) {
       var list = Array.from(getArrayAtPath(value, options.name));
       removeItem(list, options.index);
       return updateValueAtPath(value, options.name, list);
     },
-    onUpdate(state, _ref5) {
+    apply(result, options) {
+      var _result$error6;
+      // Warn if validation result is not yet available
+      if (typeof result.error === 'undefined' && options.onInvalid) {
+        if (process.env.NODE_ENV !== 'production') {
+          // eslint-disable-next-line no-console
+          console.warn('intent.remove() with `onInvalid` requires the validation result to be available synchronously. ' + 'This option is ignored because the error is not yet known.');
+        }
+        return result;
+      }
+      if (result.targetValue && (_result$error6 = result.error) !== null && _result$error6 !== void 0 && _result$error6.fieldErrors[options.name]) {
+        switch (options.onInvalid) {
+          case 'revert':
+            return _objectSpread2(_objectSpread2({}, result), {}, {
+              targetValue: undefined
+            });
+          case 'insert':
+            {
+              var list = Array.from(getArrayAtPath(result.targetValue, options.name));
+              insertItem(list, options.defaultValue, list.length);
+              return _objectSpread2(_objectSpread2({}, result), {}, {
+                targetValue: updateValueAtPath(result.targetValue, options.name, list)
+              });
+            }
+        }
+      }
+      return result;
+    },
+    update(state, _ref4) {
       var {
         type,
         submission,
-        intent
-      } = _ref5;
+        intent,
+        ctx
+      } = _ref4;
       if (type === 'server') {
         return state;
       }
@@ -241,40 +333,54 @@ var actionHandlers = {
         }
         return intent.payload.index < currentIndex ? currentIndex - 1 : currentIndex;
       });
-      var touchedFields = appendUniqueItem(compactMap(state.touchedFields, updateListIndex), intent.payload.name);
-      var keys = state.listKeys;
+      var touchedFields = state.touchedFields;
+      var listKeys = state.listKeys;
 
-      // Update the keys only for client updates to avoid double updates if there is no client validation
-      if (type === 'client') {
-        var _state$listKeys$inten2;
-        var listKeys = Array.from((_state$listKeys$inten2 = state.listKeys[intent.payload.name]) !== null && _state$listKeys$inten2 !== void 0 ? _state$listKeys$inten2 : getDefaultListKey(state.resetKey, currentValue, intent.payload.name));
-        removeItem(listKeys, intent.payload.index);
-        keys = _objectSpread2(_objectSpread2({}, updateListKeys(state.listKeys, appendPathSegment(intent.payload.name, intent.payload.index), updateListIndex)), {}, {
-          // Update existing list keys
-          [intent.payload.name]: listKeys
-        });
+      // If onInvalid is 'insert', we still remove the item and then insert a new item at the end
+      if (!ctx.cancelled || intent.payload.onInvalid === 'insert') {
+        touchedFields = compactMap(touchedFields, updateListIndex);
+
+        // Update the keys only for client updates to avoid double updates if there is no client validation
+        if (type === 'client') {
+          var _state$listKeys$inten2;
+          var selectedListKeys = Array.from((_state$listKeys$inten2 = state.listKeys[intent.payload.name]) !== null && _state$listKeys$inten2 !== void 0 ? _state$listKeys$inten2 : getDefaultListKey(state.resetKey, currentValue, intent.payload.name));
+          removeItem(selectedListKeys, intent.payload.index);
+          listKeys = _objectSpread2(_objectSpread2({}, updateListKeys(state.listKeys, appendPathSegment(intent.payload.name, intent.payload.index), updateListIndex)), {}, {
+            // Update existing list keys
+            [intent.payload.name]: selectedListKeys
+          });
+          if (ctx.cancelled) {
+            var index = selectedListKeys.length;
+            insertItem(selectedListKeys, generateUniqueKey(), index);
+            listKeys = _objectSpread2(_objectSpread2({}, updateListKeys(state.listKeys, appendPathSegment(intent.payload.name, index), updateListIndex)), {}, {
+              // Update existing list keys
+              [intent.payload.name]: selectedListKeys
+            });
+          }
+        }
       }
+      touchedFields = appendUniqueItem(touchedFields, intent.payload.name);
       return _objectSpread2(_objectSpread2({}, state), {}, {
-        listKeys: keys,
+        listKeys: listKeys,
         touchedFields
       });
     }
   },
   reorder: {
-    validatePayload(options) {
+    validate(options) {
       return isPlainObject(options) && isString(options.name) && isNumber(options.from) && isNumber(options.to);
     },
-    onApply(value, options) {
+    resolve(value, options) {
       var list = Array.from(getArrayAtPath(value, options.name));
       reorderItems(list, options.from, options.to);
       return updateValueAtPath(value, options.name, list);
     },
-    onUpdate(state, _ref6) {
+    update(state, _ref5) {
       var {
         type,
         submission,
         intent
-      } = _ref6;
+      } = _ref5;
       if (type === 'server') {
         return state;
       }
@@ -312,4 +418,4 @@ var actionHandlers = {
   }
 };
 
-export { actionHandlers, applyIntent, deserializeIntent, insertItem, removeItem, reorderItems, serializeIntent, updateListKeys };
+export { applyIntent, deserializeIntent, insertItem, intentHandlers, removeItem, reorderItems, resolveIntent, serializeIntent, updateListKeys };

package/dist/future/state.d.ts

@@ -1,5 +1,5 @@
 import { type FieldName, type ValidationAttributes, type Serialize } from '@conform-to/dom/future';
-import type { FieldMetadata, Fieldset, FormContext, FormMetadata, FormState, FormAction, UnknownIntent, ActionHandler, BaseFieldMetadata, BaseFormMetadata, DefineConditionalField } from './types';
+import type { FieldMetadata, Fieldset, FormContext, FormMetadata, FormState, FormAction, UnknownIntent, IntentHandler, BaseFieldMetadata, BaseFormMetadata, DefineConditionalField } from './types';
 export declare function initializeState<ErrorShape>(options?: {
     defaultValue?: Record<string, unknown> | null | undefined;
     resetKey?: string | undefined;
@@ -11,7 +11,8 @@ export declare function initializeState<ErrorShape>(options?: {
  * - Initialize: set initial server value
  */
 export declare function updateState<ErrorShape>(state: FormState<ErrorShape>, action: FormAction<ErrorShape, UnknownIntent | null, {
-    handlers: Record<string, ActionHandler>;
+    handlers: Record<string, IntentHandler>;
+    cancelled: boolean;
     reset: (defaultValue?: Record<string, unknown> | null | undefined) => FormState<ErrorShape>;
 }>): FormState<ErrorShape>;
 /**

package/dist/future/state.js

@@ -57,12 +57,13 @@ function updateState(state, action) {
     type: 'validate'
   };
   var handler = (_action$ctx$handlers = action.ctx.handlers) === null || _action$ctx$handlers === void 0 ? void 0 : _action$ctx$handlers[intent.type];
-  if (typeof (handler === null || handler === void 0 ? void 0 : handler.onUpdate) === 'function') {
-    var _handler$validatePayl, _handler$validatePayl2;
-    if ((_handler$validatePayl = (_handler$validatePayl2 = handler.validatePayload) === null || _handler$validatePayl2 === void 0 ? void 0 : _handler$validatePayl2.call(handler, intent.payload)) !== null && _handler$validatePayl !== void 0 ? _handler$validatePayl : true) {
-      return handler.onUpdate(state, _rollupPluginBabelHelpers.objectSpread2(_rollupPluginBabelHelpers.objectSpread2({}, action), {}, {
+  if (typeof (handler === null || handler === void 0 ? void 0 : handler.update) === 'function') {
+    var _handler$validate, _handler$validate2;
+    if ((_handler$validate = (_handler$validate2 = handler.validate) === null || _handler$validate2 === void 0 ? void 0 : _handler$validate2.call(handler, intent.payload)) !== null && _handler$validate !== void 0 ? _handler$validate : true) {
+      return handler.update(state, _rollupPluginBabelHelpers.objectSpread2(_rollupPluginBabelHelpers.objectSpread2({}, action), {}, {
         ctx: {
-          reset: action.ctx.reset
+          reset: action.ctx.reset,
+          cancelled: action.ctx.cancelled
         },
         intent: {
           type: intent.type,
@@ -328,6 +329,7 @@ function getField(context, options) {
     max: constraint === null || constraint === void 0 ? void 0 : constraint.max,
     step: constraint === null || constraint === void 0 ? void 0 : constraint.step,
     multiple: constraint === null || constraint === void 0 ? void 0 : constraint.multiple,
+    accept: constraint === null || constraint === void 0 ? void 0 : constraint.accept,
     get defaultValue() {
       return getDefaultValue(context, name, serialize);
     },

package/dist/future/state.mjs

@@ -53,12 +53,13 @@ function updateState(state, action) {
     type: 'validate'
   };
   var handler = (_action$ctx$handlers = action.ctx.handlers) === null || _action$ctx$handlers === void 0 ? void 0 : _action$ctx$handlers[intent.type];
-  if (typeof (handler === null || handler === void 0 ? void 0 : handler.onUpdate) === 'function') {
-    var _handler$validatePayl, _handler$validatePayl2;
-    if ((_handler$validatePayl = (_handler$validatePayl2 = handler.validatePayload) === null || _handler$validatePayl2 === void 0 ? void 0 : _handler$validatePayl2.call(handler, intent.payload)) !== null && _handler$validatePayl !== void 0 ? _handler$validatePayl : true) {
-      return handler.onUpdate(state, _objectSpread2(_objectSpread2({}, action), {}, {
+  if (typeof (handler === null || handler === void 0 ? void 0 : handler.update) === 'function') {
+    var _handler$validate, _handler$validate2;
+    if ((_handler$validate = (_handler$validate2 = handler.validate) === null || _handler$validate2 === void 0 ? void 0 : _handler$validate2.call(handler, intent.payload)) !== null && _handler$validate !== void 0 ? _handler$validate : true) {
+      return handler.update(state, _objectSpread2(_objectSpread2({}, action), {}, {
         ctx: {
-          reset: action.ctx.reset
+          reset: action.ctx.reset,
+          cancelled: action.ctx.cancelled
         },
         intent: {
           type: intent.type,
@@ -324,6 +325,7 @@ function getField(context, options) {
     max: constraint === null || constraint === void 0 ? void 0 : constraint.max,
     step: constraint === null || constraint === void 0 ? void 0 : constraint.step,
     multiple: constraint === null || constraint === void 0 ? void 0 : constraint.multiple,
+    accept: constraint === null || constraint === void 0 ? void 0 : constraint.accept,
     get defaultValue() {
       return getDefaultValue(context, name, serialize$1);
     },

package/dist/future/types.d.ts

@@ -422,7 +422,7 @@ export interface IntentDispatcher<FormShape extends Record<string, any> = Record
     /**
      * Insert a new item into an array field.
      */
-    insert<FieldShape extends Array<any>>(options: {
+    insert<FieldShape extends Array<any> | null | undefined>(options: {
         /**
          * The name of the array field to insert into.
          */
@@ -435,20 +435,45 @@ export interface IntentDispatcher<FormShape extends Record<string, any> = Record
         /**
          * The default value for the new item.
          */
-        defaultValue?: FieldShape extends Array<infer ItemShape> ? DefaultValue<ItemShape> : never;
+        defaultValue?: NonNullable<FieldShape> extends Array<infer ItemShape> ? DefaultValue<ItemShape> : never;
+        /**
+         * The name of a field to read the value from.
+         * When specified, the value is read from this field, validated,
+         * and if valid, inserted into the array and the source field is cleared.
+         * If validation fails, the error is shown on the source field instead.
+         * Requires the validation error to be available synchronously.
+         */
+        from?: string;
+        /**
+         * What to do when the insert causes a validation error on the array.
+         * - 'revert': Don't insert, keep original array state.
+         * Requires the validation error to be available synchronously.
+         */
+        onInvalid?: 'revert';
     }): void;
     /**
      * Remove an item from an array field.
      */
-    remove(options: {
+    remove<FieldShape extends Array<any> | null | undefined>(options: {
         /**
          * The name of the array field to remove from.
          */
-        name: FieldName<Array<any>>;
+        name: FieldName<FieldShape>;
         /**
          * The index of the item to remove.
          */
         index: number;
+        /**
+         * What to do when the remove causes a validation error on the array.
+         * - 'revert': Don't remove, keep original item as-is.
+         * - 'insert': Remove the item but insert a new blank item at the end.
+         * Requires the validation error to be available synchronously.
+         */
+        onInvalid?: 'revert' | 'insert';
+        /**
+         * The default value for the new item when onInvalid is 'insert'.
+         */
+        defaultValue?: NonNullable<FieldShape> extends Array<infer ItemShape> ? DefaultValue<ItemShape> : never;
     }): void;
     /**
      * Reorder items in an array field.
@@ -465,14 +490,16 @@ export type FormIntent<Dispatcher extends IntentDispatcher = IntentDispatcher> =
         payload: Args extends [infer Payload] ? Payload : undefined;
     } : never;
 }[keyof Dispatcher];
-export type ActionHandler<Signature extends (payload: any) => void = (payload: any) => void> = {
-    validatePayload?(...args: UnknownArgs<Parameters<Signature>>): boolean;
-    onApply?(value: Record<string, FormValue>, ...args: Parameters<Signature>): Record<string, FormValue> | undefined;
-    onUpdate?<ErrorShape extends BaseErrorShape>(state: FormState<ErrorShape>, action: FormAction<ErrorShape, {
+export type IntentHandler<Signature extends (payload: any) => void = (payload: any) => void> = {
+    validate?(...args: UnknownArgs<Parameters<Signature>>): boolean;
+    resolve?(value: Record<string, FormValue>, ...args: Parameters<Signature>): Record<string, FormValue> | undefined;
+    apply?<ErrorShape extends BaseErrorShape>(result: SubmissionResult<ErrorShape>, ...args: Parameters<Signature>): SubmissionResult<ErrorShape>;
+    update?<ErrorShape extends BaseErrorShape>(state: FormState<ErrorShape>, action: FormAction<ErrorShape, {
         type: string;
         payload: Signature extends (payload: infer Payload) => void ? Payload : undefined;
     }, {
         reset: (defaultValue?: Record<string, unknown> | null) => FormState<ErrorShape>;
+        cancelled?: boolean;
     }>): FormState<ErrorShape>;
 };
 type BaseCombine<T, K extends PropertyKey = T extends unknown ? keyof T : never> = T extends unknown ? T & Partial<Record<Exclude<K, keyof T>, never>> : never;

package/dist/helpers.d.ts

@@ -34,6 +34,7 @@ type InputProps = Pretty<FormControlProps & {
     step?: string | number;
     pattern?: string;
     multiple?: boolean;
+    accept?: string;
     value?: string;
     defaultChecked?: boolean;
     defaultValue?: string;

package/dist/helpers.js

@@ -109,7 +109,8 @@ function getInputProps(metadata, options) {
     max: metadata.max,
     step: metadata.step,
     pattern: metadata.pattern,
-    multiple: metadata.multiple
+    multiple: metadata.multiple,
+    accept: metadata.accept
   });
   if (typeof options.value === 'undefined' || options.value) {
     if (options.type === 'checkbox' || options.type === 'radio') {

package/dist/helpers.mjs

@@ -105,7 +105,8 @@ function getInputProps(metadata, options) {
     max: metadata.max,
     step: metadata.step,
     pattern: metadata.pattern,
-    multiple: metadata.multiple
+    multiple: metadata.multiple,
+    accept: metadata.accept
   });
   if (typeof options.value === 'undefined' || options.value) {
     if (options.type === 'checkbox' || options.type === 'radio') {

package/package.json

@@ -3,7 +3,7 @@
   "description": "Conform view adapter for react",
   "homepage": "https://conform.guide",
   "license": "MIT",
-  "version": "1.16.0",
+  "version": "1.17.0",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",
   "types": "./dist/index.d.ts",
@@ -41,7 +41,7 @@
     "url": "https://github.com/edmundhung/conform/issues"
   },
   "dependencies": {
-    "@conform-to/dom": "1.16.0"
+    "@conform-to/dom": "1.17.0"
   },
   "devDependencies": {
     "@babel/core": "^7.17.8",