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

Jump to bottom

likhith/fix: 🐛 file dropzone migration fix #119

Merged
merged 2 commits into from
May 24, 2023
Merged

likhith/fix: 🐛 file dropzone migration fix #119

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fa81792
fix: :bug: file dropzone migration fix
likhith-deriv May 24, 2023
b5fc5b1
fix: :bug: ts lint issues
likhith-deriv May 24, 2023
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
28 changes: 17 additions & 11 deletions packages/components/src/components/file-dropzone/file-dropzone.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import classNames from 'classnames';
import React, { ReactElement, ReactNode, RefObject } from 'react';
import { CSSTransition } from 'react-transition-group';
import Dropzone, { DropzoneOptions } from 'react-dropzone';
import Dropzone, { DropzoneOptions, DropzoneRef } from 'react-dropzone';
import { truncateFileName } from '@deriv/shared';
import Text from '../text';

Expand Down Expand Up @@ -91,17 +91,23 @@ const PreviewSingle = (props: TPreviewSingle) => {
const FileDropzone = ({ className, noClick = false, ...props }: TFileDropzone) => {
const { validation_error_message, message } = props;

const RenderErrorMessage = React.useCallback(() => {
if (typeof message === 'function') return <>{message(open)}</>;
const RenderErrorMessage = React.useCallback(
({ open }: DropzoneRef) => {
if (noClick && typeof message === 'function') return <>{message(open)}</>;

return <>{message}</>;
}, [message]);
return <>{message}</>;
},
[message, noClick]
);

const RenderValidationErrorMessage = React.useCallback(() => {
if (typeof validation_error_message === 'function') return <>{validation_error_message(open)}</>;
const RenderValidationErrorMessage = React.useCallback(
({ open }: DropzoneRef) => {
if (typeof validation_error_message === 'function') return <>{validation_error_message(open)}</>;

return <>{validation_error_message}</>;
}, [validation_error_message]);
return <>{validation_error_message}</>;
},
[validation_error_message]
);

const dropzone_ref = React.useRef(null);

Expand Down Expand Up @@ -140,7 +146,7 @@ const FileDropzone = ({ className, noClick = false, ...props }: TFileDropzone) =
timeout={150}
no_text={noClick}
>
<RenderErrorMessage />
<RenderErrorMessage open={open} />
</FadeInMessage>
<FadeInMessage
// message shown on hover if files are accepted onDrag
Expand Down Expand Up @@ -180,7 +186,7 @@ const FileDropzone = ({ className, noClick = false, ...props }: TFileDropzone) =
timeout={150}
color='loss-danger'
>
<RenderValidationErrorMessage />
<RenderValidationErrorMessage open={open} />
</FadeInMessage>
</div>
</div>
Expand Down