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

Transform the accept prop into a string everywhere #5380

Merged
merged 3 commits into from
Aug 1, 2024
Merged

Transform the accept prop into a string everywhere #5380

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f87a8d2
`/dev/Dashboard.js` - add all restrictions for the development enviro…
lakesare Aug 1, 2024
d954825
`AddFiles.tsx` - turn `accept` into a string
lakesare Aug 1, 2024
ec0081b
everywhere - make `accept` a string across uppy
lakesare Aug 1, 2024
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
2 changes: 1 addition & 1 deletion packages/@uppy/dashboard/src/components/AddFiles.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ class AddFiles extends Component {
name="files[]"
multiple={this.props.maxNumberOfFiles !== 1}
onChange={this.onFileInputChange}
accept={this.props.allowedFileTypes}
accept={this.props.allowedFileTypes?.join(', ')}
ref={refCallback}
/>
)
Expand Down
3 changes: 1 addition & 2 deletions packages/@uppy/drag-drop/src/DragDrop.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,8 +165,7 @@ export default class DragDrop<M extends Meta, B extends Body> extends UIPlugin<
}}
name={this.opts.inputName}
multiple={restrictions.maxNumberOfFiles !== 1}
// @ts-expect-error We actually want to coerce the array to a string (or keep it as null/undefined)
accept={restrictions.allowedFileTypes}
accept={restrictions.allowedFileTypes?.join(', ')}
onChange={this.onInputChange}
/>
)
Expand Down
6 changes: 1 addition & 5 deletions packages/@uppy/file-input/src/FileInput.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,10 +96,6 @@ export default class FileInput<M extends Meta, B extends Body> extends UIPlugin<
} satisfies h.JSX.IntrinsicElements['input']['style']

const { restrictions } = this.uppy.opts
const accept =
restrictions.allowedFileTypes ?
restrictions.allowedFileTypes.join(',')
: undefined

return (
<div className="uppy-FileInput-container">
Expand All @@ -110,7 +106,7 @@ export default class FileInput<M extends Meta, B extends Body> extends UIPlugin<
name={this.opts.inputName}
onChange={this.handleInputChange}
multiple={restrictions.maxNumberOfFiles !== 1}
accept={accept}
accept={restrictions.allowedFileTypes?.join(', ')}
ref={(input) => {
this.input = input as HTMLFileInputElement
}}
Expand Down
10 changes: 9 additions & 1 deletion private/dev/Dashboard.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,15 @@ function getCompanionKeysParams (name) {

export default () => {
const restrictions = undefined
// const restrictions = { requiredMetaFields: ['caption'], maxNumberOfFiles: 3 }
// const restrictions = {
// maxFileSize: 1 * 1000000, // 1mb
// minFileSize: 1 * 1000000, // 1mb
// maxTotalFileSize: 1 * 1000000, // 1mb
// maxNumberOfFiles: 3,
// minNumberOfFiles: 1,
// allowedFileTypes: ['image/*', '.jpg', '.jpeg', '.png', '.gif'],
// requiredMetaFields: ['caption'],
// }
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This adds all existing restrictions to our dev file - I frequently need those, and I assume others do too


const uppyDashboard = new Uppy({
logger: debugLogger,
Expand Down
Loading