Skip to content

fix(upload): be robust against missing FileList implementation #1007

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ph-fritsche merged 2 commits into from
Aug 2, 2022
Merged

fix(upload): be robust against missing FileList implementation #1007

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
29d4fc7
fix(upload): be robust against missing FileList implementation
ph-fritsche Aug 1, 2022
7af8920
Merge branch 'main' into fix-filelist
ph-fritsche Aug 1, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion src/utils/dataTransfer/FileList.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,13 @@ export function createFileList(
},
}
list.constructor = window.FileList
Object.setPrototypeOf(list, window.FileList.prototype)

// guard for environments without FileList
/* istanbul ignore else */
if (window.FileList as Function | undefined) {
Object.setPrototypeOf(list, window.FileList.prototype)
}

Object.freeze(list)

return list
Expand Down
50 changes: 24 additions & 26 deletions src/utils/edit/setFiles.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,57 +12,55 @@ declare global {
}
}

function restoreProperty<T extends object>(
obj: T,
prop: keyof T,
descriptor?: PropertyDescriptor,
) {
if (descriptor) {
Object.defineProperty(obj, prop, descriptor)
} else {
// eslint-disable-next-line @typescript-eslint/no-dynamic-delete
delete obj[prop]
}
}

export function setFiles(
el: HTMLInputElement & {type: 'file'},
files: FileList,
) {
el[fakeFiles]?.restore()

const objectDescriptors = Object.getOwnPropertyDescriptors(el)
const prototypeDescriptors = Object.getOwnPropertyDescriptors(
Object.getPrototypeOf(el),
)
const typeDescr = Object.getOwnPropertyDescriptor(el, 'type')
const valueDescr = Object.getOwnPropertyDescriptor(el, 'value')
const filesDescr = Object.getOwnPropertyDescriptor(el, 'files')

function restore() {
Object.defineProperties(el, {
files: {
...prototypeDescriptors.files,
...objectDescriptors.files,
},
value: {
...prototypeDescriptors.value,
...objectDescriptors.value,
},
type: {
...prototypeDescriptors.type,
...objectDescriptors.type,
},
})
restoreProperty(el, 'type', typeDescr)
restoreProperty(el, 'value', valueDescr)
restoreProperty(el, 'files', filesDescr)
}
el[fakeFiles] = {restore}

Object.defineProperties(el, {
files: {
...prototypeDescriptors.files,
...objectDescriptors.files,
configurable: true,
get: () => files,
},
value: {
...prototypeDescriptors.value,
...objectDescriptors.value,
configurable: true,
get: () => (files.length ? `C:\\fakepath\\${files[0].name}` : ''),
set(v: string) {
if (v === '') {
restore()
} else {
objectDescriptors.value.set?.call(el, v)
valueDescr?.set?.call(el, v)
}
},
},
// eslint-disable-next-line accessor-pairs
type: {
...prototypeDescriptors.type,
...objectDescriptors.type,
configurable: true,
get: () => 'file',
set(v: string) {
if (v !== 'file') {
restore()
Expand Down