@@ -12,6 +12,7 @@ import { pullRequestEnvironment } from "~/state/pullRequests";
1212import { useAtomCommand } from "~/state/use-atom-command" ;
1313
1414import { Button } from "../ui/button" ;
15+ import { Select , SelectItem , SelectPopup , SelectTrigger } from "../ui/select" ;
1516import { Textarea } from "../ui/textarea" ;
1617import { toastManager } from "../ui/toast" ;
1718import {
@@ -62,6 +63,7 @@ export function PullRequestReviewForm({
6263 onSubmitted : ( ) => void ;
6364} ) {
6465 const [ pending , setPending ] = useState ( false ) ;
66+ const [ requestedVerdict , setRequestedVerdict ] = useState < PullRequestReviewVerdict > ( "comment" ) ;
6567 const comments = usePendingReviewComments ( reference ) ;
6668 const reviewKey = pullRequestReviewKey ( reference ) ;
6769 // The panel stays mounted while the selected pull request changes. Keeping summaries beside
@@ -76,6 +78,8 @@ export function PullRequestReviewForm({
7678 } ) ;
7779
7880 const offered = VERDICTS . filter ( ( verdict ) => verdicts . includes ( verdict . value ) ) ;
81+ const selectedVerdict =
82+ offered . find ( ( verdict ) => verdict . value === requestedVerdict ) ?? offered [ 0 ] ;
7983
8084 const submit = async ( verdict : ( typeof VERDICTS ) [ number ] ) => {
8185 if ( pending ) return ;
@@ -118,7 +122,7 @@ export function PullRequestReviewForm({
118122 < >
119123 < Textarea
120124 ref = { textareaRef }
121- size = "sm"
125+ rows = { 3 }
122126 className = "[&_textarea]:max-h-64"
123127 value = { body }
124128 placeholder = {
@@ -129,21 +133,40 @@ export function PullRequestReviewForm({
129133 aria-label = "Review summary"
130134 onChange = { ( event ) => setSummary ( reviewKey , event . target . value ) }
131135 />
132- < div className = "mt-2 flex flex-wrap justify-end gap-2" >
133- { offered . map ( ( verdict ) => (
134- < Button
135- key = { verdict . value }
136- size = "xs"
137- variant = { verdict . value === "comment" ? "outline" : "default" }
138- disabled = { pending || ! canSubmit ( verdict . value ) }
139- onClick = { ( ) => void submit ( verdict ) }
140- >
136+ < div className = "mt-2 flex justify-between gap-2" >
137+ < Select
138+ value = { selectedVerdict ?. value ?? null }
139+ disabled = { pending }
140+ onValueChange = { ( value ) => {
141+ if ( value !== null ) setRequestedVerdict ( value ) ;
142+ } }
143+ >
144+ < SelectTrigger size = "xs" className = "w-auto min-w-0" aria-label = "Review verdict" >
141145 < span className = "flex items-center gap-1.5" >
142- { verdict . icon }
143- { verdict . label }
146+ { selectedVerdict ? .icon }
147+ { selectedVerdict ? .label }
144148 </ span >
145- </ Button >
146- ) ) }
149+ </ SelectTrigger >
150+ < SelectPopup side = "top" alignItemWithTrigger = { false } >
151+ { offered . map ( ( verdict ) => (
152+ < SelectItem key = { verdict . value } value = { verdict . value } >
153+ < span className = "flex items-center gap-1.5" >
154+ { verdict . icon }
155+ { verdict . label }
156+ </ span >
157+ </ SelectItem >
158+ ) ) }
159+ </ SelectPopup >
160+ </ Select >
161+ < Button
162+ size = "xs"
163+ disabled = { pending || selectedVerdict === undefined || ! canSubmit ( selectedVerdict . value ) }
164+ onClick = { ( ) => {
165+ if ( selectedVerdict !== undefined ) void submit ( selectedVerdict ) ;
166+ } }
167+ >
168+ { pending ? "Submitting..." : "Submit review" }
169+ </ Button >
147170 </ div >
148171 </ >
149172 ) ;
0 commit comments