Skip to content

Commit cc206d1

Browse files
authored
Merge pull request #819 from fcollonval/fix/click-propagation
Stop action click propagation on GitStage header
2 parents 120b04e + 4692474 commit cc206d1

File tree

1 file changed

+12
-5
lines changed

1 file changed

+12
-5
lines changed

src/components/FileList.tsx

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,8 @@ export class FileList extends React.Component<IFileListProps, IFileListState> {
155155
};
156156

157157
/** Reset all staged files */
158-
resetAllStagedFiles = async () => {
158+
resetAllStagedFiles = async (event: React.MouseEvent) => {
159+
event.stopPropagation();
159160
await this.props.model.reset();
160161
};
161162

@@ -165,12 +166,16 @@ export class FileList extends React.Component<IFileListProps, IFileListState> {
165166
};
166167

167168
/** Add all unstaged files */
168-
addAllUnstagedFiles = async () => {
169+
addAllUnstagedFiles = async (event: React.MouseEvent) => {
170+
event.stopPropagation();
171+
169172
await this.props.model.addAllUnstaged();
170173
};
171174

172175
/** Discard changes in all unstaged files */
173-
discardAllUnstagedFiles = async () => {
176+
discardAllUnstagedFiles = async (event: React.MouseEvent) => {
177+
event.stopPropagation();
178+
174179
const result = await showDialog({
175180
title: 'Discard all changes',
176181
body:
@@ -187,7 +192,8 @@ export class FileList extends React.Component<IFileListProps, IFileListState> {
187192
};
188193

189194
/** Discard changes in all unstaged and staged files */
190-
discardAllChanges = async () => {
195+
discardAllChanges = async (event: React.MouseEvent) => {
196+
event.stopPropagation();
191197
const result = await showDialog({
192198
title: 'Discard all changes',
193199
body:
@@ -214,7 +220,8 @@ export class FileList extends React.Component<IFileListProps, IFileListState> {
214220
};
215221

216222
/** Add all untracked files */
217-
addAllUntrackedFiles = async () => {
223+
addAllUntrackedFiles = async (event: React.MouseEvent) => {
224+
event.stopPropagation();
218225
await this.props.model.addAllUntracked();
219226
};
220227

0 commit comments

Comments
 (0)