From dd3949b8175b81e9f495fa30900eaac1d39bed18 Mon Sep 17 00:00:00 2001 From: Rene Pfeuffer Date: Fri, 10 Jan 2020 13:54:04 +0100 Subject: [PATCH] Hide toggle when there are no hunks to display --- scm-ui/ui-components/src/repos/DiffFile.tsx | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/scm-ui/ui-components/src/repos/DiffFile.tsx b/scm-ui/ui-components/src/repos/DiffFile.tsx index 634376626d..7272febede 100644 --- a/scm-ui/ui-components/src/repos/DiffFile.tsx +++ b/scm-ui/ui-components/src/repos/DiffFile.tsx @@ -110,7 +110,7 @@ class DiffFile extends React.Component { toggleCollapse = () => { const { file } = this.props; - if (file && !file.isBinary) { + if (this.hasContent(file)) { this.setState(state => ({ collapsed: !state.collapsed })); @@ -249,6 +249,8 @@ class DiffFile extends React.Component { } }; + hasContent = (file: File) => file && !file.isBinary && file.hunks && file.hunks.length > 0; + render() { const { file, fileControlFactory, fileAnnotationFactory, t } = this.props; const { collapsed, sideBySide } = this.state; @@ -268,7 +270,7 @@ class DiffFile extends React.Component { ); } - const collapseIcon = file && !file.isBinary ? : null; + const collapseIcon = this.hasContent(file) ? : null; const fileControls = fileControlFactory ? fileControlFactory(file, this.setCollapse) : null; return (