Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-14 17:26:22 +01:00
Code Issues Packages Projects Releases Activity

fix source buttons not displaying for file renaming

Browse Source
This commit is contained in:
Konstantin Schaper
2020-08-11 10:09:28 +02:00
parent 94bac2ad37
commit c9ccaed61d
2 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
scm-ui/ui-components/src/repos/DiffFile.tsx
View File

@@ -415,25 +415,25 @@ class DiffFile extends React.Component<Props, State> {
}
const collapseIcon = this.hasContent(file) ? <Icon name={icon} color="inherit"/> : null;
const fileControls = fileControlFactory ? fileControlFactory(file, this.setCollapse) : null;
const sideBySideToggle =
file.hunks && file.hunks.length > 0 && (
const sideBySideToggle = file.hunks && file.hunks.length && <MenuContext.Consumer>
{({setCollapsed}) => (
<DiffButton
icon={sideBySide ? "align-left" : "columns"}
tooltip={t(sideBySide ? "diff.combined" : "diff.sideBySide")}
onClick={() =>
this.toggleSideBySide(() => {
if (this.state.sideBySide) {
setCollapsed(true);
}
})
}
/>
)}
</MenuContext.Consumer>;
const headerButtons = (
<ButtonWrapper className={classNames("level-right", "is-flex")}>
<ButtonGroup>
<MenuContext.Consumer>
{({setCollapsed}) => (
<DiffButton
icon={sideBySide ? "align-left" : "columns"}
tooltip={t(sideBySide ? "diff.combined" : "diff.sideBySide")}
onClick={() =>
this.toggleSideBySide(() => {
if (this.state.sideBySide) {
setCollapsed(true);
}
})
}
/>
)}
</MenuContext.Consumer>
{sideBySideToggle}
{fileControls}
</ButtonGroup>
</ButtonWrapper>
@@ -467,7 +467,7 @@ class DiffFile extends React.Component<Props, State> {
</TitleWrapper>
{this.renderChangeTag(file)}
</FullWidthTitleHeader>
{sideBySideToggle}
{headerButtons}
</FlexWrapLevel>
</div>
{body}