fix: allow relativePath as alternative to webkitRelativePath

cheminfo · Sep 28, 2024 · e5fd102 · e5fd102
1 parent 6b601b8
commit e5fd102
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/src/fileCollectionFromFileList.ts b/src/fileCollectionFromFileList.ts
@@ -24,8 +24,9 @@ export async function fileCollectionFromFileList(
     const item = {
       name: file.name,
       size: file.size,
-      //@ts-expect-error We allow file.path as alternative to webkitRelativePath
-      relativePath: file.webkitRelativePath || file.path || file.name,
+      relativePath:
+        //@ts-expect-error We allow file.relativePath or file.path as alternative to webkitRelativePath
+        file.webkitRelativePath || file.relativePath || file.path || file.name,
       lastModified: file.lastModified,
       text: () => file.text(),
       arrayBuffer: () => file.arrayBuffer(),

diff --git a/src/fileCollectionFromFiles.ts b/src/fileCollectionFromFiles.ts
@@ -22,8 +22,9 @@ export async function fileCollectionFromFiles(
     const item = {
       name: file.name,
       size: file.size,
-      //@ts-expect-error We allow file.path as alternative to webkitRelativePath
-      relativePath: file.webkitRelativePath || file.path || file.name,
+      relativePath:
+        //@ts-expect-error We allow file.relativePath or file.path as alternative to webkitRelativePath
+        file.webkitRelativePath || file.relativePath || file.path || file.name,
       lastModified: file.lastModified,
       text: () => file.text(),
       arrayBuffer: () => file.arrayBuffer(),