Skip to content
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

fix: apply file accept tokens #1

Merged
merged 2 commits into from
Feb 19, 2021
Merged

fix: apply file accept tokens #1

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
538b0d5
fix: apply file accept tokens
ph-fritsche Feb 19, 2021
cda583b
fix: variable name
ph-fritsche Feb 19, 2021
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
51 changes: 25 additions & 26 deletions src/upload.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,46 +3,27 @@ import {click} from './click'
import {blur} from './blur'
import {focus} from './focus'

const hasValidFileType = (acceptAttribute, type) => {
if (!acceptAttribute) {
return true
}

const acceptManyExtensions = /(video|audio|image)\/?\*/.test(acceptAttribute)

if (acceptManyExtensions) {
type = type.match(/\w+\/+/g)
}

const isValidType = acceptAttribute.includes(type)

return isValidType
}

function upload(element, fileOrFiles, init) {
const hasFileWithInvalidType =
!Array.isArray(fileOrFiles) &&
Boolean(element.accept) &&
!hasValidFileType(element.accept, fileOrFiles.type)

if (hasFileWithInvalidType || element.disabled) return
if (element.disabled) return

click(element, init)

const input = element.tagName === 'LABEL' ? element.control : element

const files = (Array.isArray(fileOrFiles) ? fileOrFiles : [fileOrFiles])
.filter(file => hasValidFileType(element.accept, file.type))
.filter(file => isAcceptableFile(file, element.accept))
.slice(0, input.multiple ? undefined : 1)

const hasFilesWithInvalidTypes = files.length === 0
if (hasFilesWithInvalidTypes) return

// blur fires when the file selector pops up
blur(element, init)
// focus fires when they make their selection
focus(element, init)

// treat empty array as if the user just closed the file upload dialog
if (files.length === 0) {
return
}

// the event fired in the browser isn't actually an "input" or "change" event
// but a new Event with a type set to "input" and "change"
// Kinda odd...
Expand All @@ -69,4 +50,22 @@ function upload(element, fileOrFiles, init) {
})
}

function isAcceptableFile(file, accept) {
if (!accept) {
return true
}

const wildcards = ['audio/*', 'image/*', 'video/*']

return accept.split(',').some(acceptToken => {
if (acceptToken[0] === '.') {
// tokens starting with a dot represent a file extension
return file.name.endsWith(accept)
} else if (wildcards.includes(acceptToken)) {
LauraBeatris marked this conversation as resolved.
Show resolved Hide resolved
return file.type.startsWith(acceptToken.substr(0, acceptToken.length - 1))
}
return file.type === acceptToken
})
}

export {upload}