Merge branch 'schedule-form-order' into 'develop'

Move ScheduleForm below SpoilerInput in ComposeForm

See merge request soapbox-pub/soapbox!2452
This commit is contained in:
marcin mikołajczak
2023-04-19 21:13:19 +00:00
2 changed files with 4 additions and 3 deletions

View File

@ -319,7 +319,6 @@ const ComposeForm = <ID extends string>({ id, shouldCondense, autoFocus, clickab
<Stack space={4} className='compose-form__modifiers'>
<UploadForm composeId={id} />
<PollForm composeId={id} />
<ScheduleFormContainer composeId={id} />
<SpoilerInput
composeId={id}
@ -328,6 +327,8 @@ const ComposeForm = <ID extends string>({ id, shouldCondense, autoFocus, clickab
onSuggestionSelected={onSpoilerSuggestionSelected}
ref={spoilerTextRef}
/>
<ScheduleFormContainer composeId={id} />
</Stack>
}
</AutosuggestTextarea>

View File

@ -52,8 +52,8 @@ const ScheduleForm: React.FC<IScheduleForm> = ({ composeId }) => {
}
return (
<Stack className='mb-2' space={1}>
<Text theme='muted'>
<Stack space={2}>
<Text weight='medium'>
<FormattedMessage id='datepicker.hint' defaultMessage='Scheduled to post at…' />
</Text>
<HStack space={2} alignItems='center'>