From 9096fdc9fbf705b9352a6ebf2498540ebef9dbfd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?marcin=20miko=C5=82ajczak?= Date: Fri, 20 Sep 2024 23:58:04 +0200 Subject: [PATCH] pl-fe: do not specify 'accept' when set to 'application/octet-stream' MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: marcin mikołajczak --- .../src/features/compose/components/upload-button.tsx | 5 ++++- .../modals/compose-event-modal/upload-button.tsx | 7 ++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/packages/pl-fe/src/features/compose/components/upload-button.tsx b/packages/pl-fe/src/features/compose/components/upload-button.tsx index dfd301a869..9895ced112 100644 --- a/packages/pl-fe/src/features/compose/components/upload-button.tsx +++ b/packages/pl-fe/src/features/compose/components/upload-button.tsx @@ -37,6 +37,9 @@ const UploadButton: React.FC = ({ const fileElement = useRef(null); const attachmentTypes = configuration.media_attachments.supported_mime_types; + let accept = attachmentTypes?.join(','); + if (accept === 'application/octet-stream') accept = undefined; + const handleChange: React.ChangeEventHandler = (e) => { if (e.target.files?.length) { onSelectFile(e.target.files, intl); @@ -75,7 +78,7 @@ const UploadButton: React.FC = ({ ref={fileElement} type='file' multiple - accept={attachmentTypes?.join(',')} + accept={accept} onChange={handleChange} disabled={disabled} className='hidden' diff --git a/packages/pl-fe/src/features/ui/components/modals/compose-event-modal/upload-button.tsx b/packages/pl-fe/src/features/ui/components/modals/compose-event-modal/upload-button.tsx index 724d8d44b9..45f660e197 100644 --- a/packages/pl-fe/src/features/ui/components/modals/compose-event-modal/upload-button.tsx +++ b/packages/pl-fe/src/features/ui/components/modals/compose-event-modal/upload-button.tsx @@ -12,9 +12,13 @@ interface IUploadButton { const UploadButton: React.FC = ({ disabled, onSelectFile }) => { const fileElement = useRef(null); + const attachmentTypes = useAppSelector(state => state.instance.configuration.media_attachments.supported_mime_types) ?.filter((type) => type.startsWith('image/')); + let accept = attachmentTypes?.join(','); + if (accept === 'application/octet-stream') accept = undefined; + const handleChange: React.ChangeEventHandler = (e) => { if (e.target.files?.length) { onSelectFile(e.target.files); @@ -25,6 +29,7 @@ const UploadButton: React.FC = ({ disabled, onSelectFile }) => { fileElement.current?.click(); }; + return ( = ({ disabled, onSelectFile }) => {