Skip to content

Commit 7b897e0

Browse files
committed
Ensure minimum container height for displaying changed files
1 parent c9bdc28 commit 7b897e0

File tree

2 files changed

+19
-11
lines changed

2 files changed

+19
-11
lines changed

src/components/FileList.tsx

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import { Menu } from '@phosphor/widgets';
55
import * as React from 'react';
66
import { GitExtension } from '../model';
77
import {
8+
fileListWrapperClass,
89
moveFileDownButtonSelectedStyle,
910
moveFileDownButtonStyle,
1011
moveFileUpButtonSelectedStyle,
@@ -482,7 +483,7 @@ export class FileList extends React.Component<IFileListProps, IFileListState> {
482483

483484
if (this.props.settings.composite['simpleStaging']) {
484485
return (
485-
<div>
486+
<div className={fileListWrapperClass}>
486487
<div>
487488
<GitStageSimple
488489
heading={'Changed'}
@@ -495,16 +496,18 @@ export class FileList extends React.Component<IFileListProps, IFileListState> {
495496
</div>
496497
</div>
497498
);
498-
} else {
499-
return (
500-
<div onContextMenu={event => event.preventDefault()}>
501-
<div>
502-
<Staged />
503-
<Changed />
504-
<Untracked />
505-
</div>
506-
</div>
507-
);
508499
}
500+
return (
501+
<div
502+
className={fileListWrapperClass}
503+
onContextMenu={event => event.preventDefault()}
504+
>
505+
<div>
506+
<Staged />
507+
<Changed />
508+
<Untracked />
509+
</div>
510+
</div>
511+
);
509512
}
510513
}

src/style/FileListStyle.ts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
import { style } from 'typestyle';
22

3+
export const fileListWrapperClass = style({
4+
height: 'auto',
5+
paddingBottom: '40px'
6+
});
7+
38
export const moveFileUpButtonStyle = style({
49
backgroundImage: 'var(--jp-icon-move-file-up)'
510
});

0 commit comments

Comments
 (0)