bigbuffet/pleroma
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

pl-fe: do not specify 'accept' when set to 'application/octet-stream'

Browse source 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
This commit is contained in:
marcin mikołajczak 2024-09-20 23:58:04 +02:00
parent 6a31cd2c61
commit 9096fdc9fb
2 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
packages/pl-fe/src/features/compose/components/upload-button.tsx
View file

@ -37,6 +37,9 @@ const UploadButton: React.FC<IUploadButton> = ({
const fileElement = useRef<HTMLInputElement>(null); const fileElement = useRef<HTMLInputElement>(null);
const attachmentTypes = configuration.media_attachments.supported_mime_types; const attachmentTypes = configuration.media_attachments.supported_mime_types;
let accept = attachmentTypes?.join(',');
if (accept === 'application/octet-stream') accept = undefined;
const handleChange: React.ChangeEventHandler<HTMLInputElement> = (e) => { const handleChange: React.ChangeEventHandler<HTMLInputElement> = (e) => {
if (e.target.files?.length) { if (e.target.files?.length) {
onSelectFile(e.target.files, intl); onSelectFile(e.target.files, intl);
@ -75,7 +78,7 @@ const UploadButton: React.FC<IUploadButton> = ({
ref={fileElement} ref={fileElement}
type='file' type='file'
multiple multiple
accept={attachmentTypes?.join(',')} accept={accept}
onChange={handleChange} onChange={handleChange}
disabled={disabled} disabled={disabled}
className='hidden' className='hidden'

7
packages/pl-fe/src/features/ui/components/modals/compose-event-modal/upload-button.tsx
View file

@ -12,9 +12,13 @@ interface IUploadButton {
const UploadButton: React.FC<IUploadButton> = ({ disabled, onSelectFile }) => { const UploadButton: React.FC<IUploadButton> = ({ disabled, onSelectFile }) => {
const fileElement = useRef<HTMLInputElement>(null); const fileElement = useRef<HTMLInputElement>(null);
const attachmentTypes = useAppSelector(state => state.instance.configuration.media_attachments.supported_mime_types) const attachmentTypes = useAppSelector(state => state.instance.configuration.media_attachments.supported_mime_types)
?.filter((type) => type.startsWith('image/')); ?.filter((type) => type.startsWith('image/'));
let accept = attachmentTypes?.join(',');
if (accept === 'application/octet-stream') accept = undefined;
const handleChange: React.ChangeEventHandler<HTMLInputElement> = (e) => { const handleChange: React.ChangeEventHandler<HTMLInputElement> = (e) => {
if (e.target.files?.length) { if (e.target.files?.length) {
onSelectFile(e.target.files); onSelectFile(e.target.files);
@ -25,6 +29,7 @@ const UploadButton: React.FC<IUploadButton> = ({ disabled, onSelectFile }) => {
fileElement.current?.click(); fileElement.current?.click();
}; };
return ( return (
<HStack className='h-full w-full cursor-pointer text-primary-500 dark:text-accent-blue' space={3} alignItems='center' justifyContent='center' element='label'> <HStack className='h-full w-full cursor-pointer text-primary-500 dark:text-accent-blue' space={3} alignItems='center' justifyContent='center' element='label'>
<Icon <Icon
@ -39,7 +44,7 @@ const UploadButton: React.FC<IUploadButton> = ({ disabled, onSelectFile }) => {
<input <input
ref={fileElement} ref={fileElement}
type='file' type='file'
accept={attachmentTypes?.join(',')} accept={accept}
onChange={handleChange} onChange={handleChange}
disabled={disabled} disabled={disabled}
className='hidden' className='hidden'