Skip to content
This repository was archived by the owner on Dec 15, 2022. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 3 additions & 1 deletion lib/views/file-patch-view.js
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ export default class FilePatchView {
const selectedLines = this.selection.getSelectedLines()
const headHunk = this.selection.getHeadHunk()
const headLine = this.selection.getHeadLine()
const hunkSelectionMode = this.selection.getMode() === 'hunk'
const stageButtonLabelPrefix = this.props.stagingStatus === 'unstaged' ? 'Stage' : 'Unstage'
return (
<div className='git-FilePatchView' tabIndex='-1'
Expand All @@ -62,12 +63,13 @@ export default class FilePatchView {
const isSelected = selectedHunks.has(hunk)
const stageButtonLabel =
stageButtonLabelPrefix +
((this.selection.getMode() === 'hunk' || !isSelected) ? ' Hunk' : ' Selection')
((hunkSelectionMode || !isSelected) ? ' Hunk' : ' Selection')

return (
<HunkView
hunk={hunk}
isSelected={selectedHunks.has(hunk)}
hunkSelectionMode={hunkSelectionMode}
stageButtonLabel={stageButtonLabel}
selectedLines={selectedLines}
headLine={headLine}
Expand Down
3 changes: 2 additions & 1 deletion lib/views/hunk-view.js
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,9 @@ export default class HunkView {

render () {
const hunkSelectedClass = this.props.isSelected ? 'is-selected' : ''
const hunkModeClass = this.props.hunkSelectionMode ? 'is-hunkMode' : ''
return (
<div className={`git-HunkView ${hunkSelectedClass}`}>
<div className={`git-HunkView ${hunkModeClass} ${hunkSelectedClass}`}>
<div className='git-HunkView-header'
onmousedown={() => this.props.mousedownOnHeader()}>
<span ref='header' className='git-HunkView-title'>{this.props.hunk.getHeader()}</span>
Expand Down
10 changes: 10 additions & 0 deletions styles/hunk-view.less
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,16 @@
// States
// -------------------------------

// Highlight hunk title
.git-HunkView {
&.is-selected.is-hunkMode &-title {
color: @text-color-selected;
}
&-title:hover {
color: @text-color-highlight;
}
}

.git-HunkView-line {

&.is-selected .git-HunkView-lineNumber {
Expand Down