remix-validated-form 4.6.9 → 4.6.11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "remix-validated-form",
-  "version": "4.6.9",
+  "version": "4.6.11",
   "description": "Form component and utils for easy form validation in remix",
   "main": "./dist/index.cjs.js",
   "module": "./dist/index.esm.js",

package/src/ValidatedForm.tsx

@@ -321,7 +321,7 @@ export function ValidatedForm<DataType>({
     startSubmit();
     const submitter = nativeEvent.submitter as HTMLFormSubmitter | null;
     const formMethod = (submitter?.formMethod as FormMethod) || method;
-    const formDataToValidate = getDataFromForm(e.currentTarget);
+    const formDataToValidate = getDataFromForm(target);
     if (submitter?.name) {
       formDataToValidate.append(submitter.name, submitter.value);
     }
@@ -351,8 +351,7 @@ export function ValidatedForm<DataType>({
       // but we already have the form in `formRef.current` so we can just use that.
       // If we use `event.currentTarget` here, it will break because `currentTarget`
       // will have changed since the start of the submission.
-      if (fetcher)
-        fetcher.submit(submitter || e.currentTarget, { method: formMethod });
+      if (fetcher) fetcher.submit(submitter || target, { method: formMethod });
       else
         submit(submitter || target, {
           replace,

package/src/internal/hooks.ts

@@ -67,7 +67,10 @@ export const useDefaultValuesFromLoader = ({
     // we should use the data from the deepest route.
     const match = matches
       .reverse()
-      .find((match) => match.data && dataKey in match.data);
+      .find(
+        (match) =>
+          match.data && typeof match.data === "object" && dataKey in match.data
+      );
     return match?.data[dataKey];
   }