hendrik/lens
1
0
Fork 0
mirror of https://github.com/lensapp/lens.git synced 2025-05-20 05:10:56 +00:00
Code Issues Projects Releases Wiki Activity

Fix: Unhandled exception for <DropFileInput disabled={true}/> (#1512)

Browse Source 
* fix: invalid handling disabled={false} causing app crash

Signed-off-by: Roman <ixrock@gmail.com>

* re-fix: put React.Children.only() validation inside try-catch to avoid crash as well

Signed-off-by: Roman <ixrock@gmail.com>
This commit is contained in:
Roman 2020-11-25 11:55:30 +02:00 committed by GitHub
parent 8753b2b17c
commit 4474d87ed2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/renderer/components/input/drop-file-input.tsx
View File

@ -51,12 +51,15 @@ export class DropFileInput<T extends HTMLElement = any> extends React.Component<
} }
render() { render() {
const { disabled, className } = this.props;
const { onDragEnter, onDragLeave, onDragOver, onDrop } = this; const { onDragEnter, onDragLeave, onDragOver, onDrop } = this;
const { disabled, className } = this.props;
try { try {
const contentElem = React.Children.only(this.props.children) as React.ReactElement<React.HTMLProps<HTMLElement>>; const contentElem = React.Children.only(this.props.children) as React.ReactElement<React.HTMLProps<HTMLElement>>;
if (disabled) {
return contentElem;
}
const isValidContentElem = React.isValidElement(contentElem); const isValidContentElem = React.isValidElement(contentElem);
if (!disabled && isValidContentElem) { if (isValidContentElem) {
const contentElemProps: React.HTMLProps<HTMLElement> = { const contentElemProps: React.HTMLProps<HTMLElement> = {
className: cssNames("DropFileInput", className, { className: cssNames("DropFileInput", className, {
droppable: this.dropAreaActive, droppable: this.dropAreaActive,
@ -69,7 +72,7 @@ export class DropFileInput<T extends HTMLElement = any> extends React.Component<
return React.cloneElement(contentElem, contentElemProps); return React.cloneElement(contentElem, contentElemProps);
} }
} catch (err) { } catch (err) {
logger.error("Invalid root content-element for DropFileInput", { err: String(err) }); logger.error(`Error: <DropFileInput/> must contain only single child element`);
return this.props.children; return this.props.children;
} }
} }