Skip to content

Commit bbabd45

Browse files
authored
Creation view has disabled checkboxes state (#4777)
Fixes #4758
1 parent fba47f7 commit bbabd45

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

webviews/common/createContext.ts

+5-1
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ export class CreatePRContext {
7979
updateValues.mergeMethodsAvailability = response.mergeMethodsAvailability;
8080
updateValues.autoMergeDefault = response.autoMergeDefault;
8181
if (!this.createParams.allowAutoMerge && updateValues.allowAutoMerge) {
82-
updateValues.autoMerge = updateValues.autoMergeDefault;
82+
updateValues.autoMerge = this.createParams.isDraft ? false : updateValues.autoMergeDefault;
8383
}
8484
}
8585

@@ -230,6 +230,7 @@ export class CreatePRContext {
230230
if (this.createParams.autoMerge === undefined) {
231231
message.params.autoMerge = message.params.autoMergeDefault;
232232
message.params.autoMergeMethod = message.params.defaultMergeMethod;
233+
message.params.isDraft = false;
233234
} else {
234235
message.params.autoMerge = this.createParams.autoMerge;
235236
message.params.autoMergeMethod = this.createParams.autoMergeMethod;
@@ -250,6 +251,9 @@ export class CreatePRContext {
250251
message.params.compareRemote = message.params.defaultCompareRemote;
251252
message.params.autoMerge = message.params.autoMergeDefault;
252253
message.params.autoMergeMethod = message.params.defaultMergeMethod;
254+
if (message.params.autoMergeDefault) {
255+
message.params.isDraft = false;
256+
}
253257
this.updateState(message.params);
254258
return;
255259

0 commit comments

Comments
 (0)