null safe value access

api-platform · May 27, 2024 · 4dc1f9b · 4dc1f9b
1 parent 0cdf153
commit 4dc1f9b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/src/useOnSubmit.test.tsx b/src/useOnSubmit.test.tsx
@@ -84,6 +84,12 @@ test.each([
     name: 'Book name 2',
     authors: ['Author 1', 'Author 2'],
   },
+  {
+    id: '3',
+    name: 'Book name 3',
+    authors: ['Author 1', 'Author 2'],
+    cover: null,
+  },
 ])('Call update without file inputs ($name)', async (values: RaRecord) => {
   let save;
   const Dummy = () => {

diff --git a/src/useOnSubmit.ts b/src/useOnSubmit.ts
@@ -2,15 +2,17 @@ import { useCallback } from 'react';
 import { useCreate, useNotify, useRedirect, useUpdate } from 'react-admin';
 import type { HttpError, RaRecord } from 'react-admin';
 import { useParams } from 'react-router-dom';
+import lodashIsPlainObject from 'lodash.isplainobject';
 import getIdentifierValue from './getIdentifierValue.js';
 import type { SubmissionErrors, UseOnSubmitProps } from './types.js';
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-const findFile = (values: any[]): object | undefined =>
+const findFile = (values: any[]): Blob | undefined =>
   values.find((value) =>
     Array.isArray(value)
       ? findFile(value)
-      : typeof value === 'object' && value.rawFile instanceof File,
+      : lodashIsPlainObject(value) &&
+        Object.values(value).find((val) => val instanceof File),
   );
 
 const useOnSubmit = ({