From fb66423d4b64d207872bdbf91ebebe11b3827f26 Mon Sep 17 00:00:00 2001 From: Roman Date: Wed, 25 Nov 2020 11:22:03 +0200 Subject: [PATCH] fix: invalid handling disabled={false} causing app crash Signed-off-by: Roman --- src/renderer/components/input/drop-file-input.tsx | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/renderer/components/input/drop-file-input.tsx b/src/renderer/components/input/drop-file-input.tsx index 32ace899d6..9a0641baf6 100644 --- a/src/renderer/components/input/drop-file-input.tsx +++ b/src/renderer/components/input/drop-file-input.tsx @@ -53,10 +53,13 @@ export class DropFileInput extends React.Component< render() { const { disabled, className } = this.props; const { onDragEnter, onDragLeave, onDragOver, onDrop } = this; + const contentElem = React.Children.only(this.props.children) as React.ReactElement>; + if (disabled) { + return contentElem; + } try { - const contentElem = React.Children.only(this.props.children) as React.ReactElement>; const isValidContentElem = React.isValidElement(contentElem); - if (!disabled && isValidContentElem) { + if (isValidContentElem) { const contentElemProps: React.HTMLProps = { className: cssNames("DropFileInput", className, { droppable: this.dropAreaActive, @@ -70,7 +73,7 @@ export class DropFileInput extends React.Component< } } catch (err) { logger.error("Invalid root content-element for DropFileInput", { err: String(err) }); - return this.props.children; + return contentElem; } } }