moon
/
soapbox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'compose-svg-icons-load' into 'develop' 

ComposeForm: load it differently so the SVG icons are already loaded when it expands

See merge request soapbox-pub/soapbox-fe!798
This commit is contained in:
Alex Gleason 2021-10-19 18:00:31 +00:00
parent 5d77f65535 cd3cf2379b
commit e01369f434
2 changed files with 24 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
app/soapbox/features/compose/components/compose_form.js
View File

@ -355,28 +355,25 @@ export default class ComposeForm extends ImmutablePureComponent {
} }
</AutosuggestTextarea> </AutosuggestTextarea>
{ <div className='compose-form__buttons-wrapper'>
!condensed && <div className='compose-form__buttons'>
<div className='compose-form__buttons-wrapper'> <UploadButtonContainer />
<div className='compose-form__buttons'> <PollButtonContainer />
<UploadButtonContainer /> <PrivacyDropdownContainer />
<PollButtonContainer /> <ScheduleButtonContainer />
<PrivacyDropdownContainer /> <SpoilerButtonContainer />
<ScheduleButtonContainer /> <MarkdownButtonContainer />
<SpoilerButtonContainer />
<MarkdownButtonContainer />
</div>
{maxTootChars && (
<div className='compose-form__counter'>
{/* <TextCharacterCounter max={maxTootChars} text={text} /> */}
<VisualCharacterCounter max={maxTootChars} text={text} />
</div>
)}
<div className='compose-form__publish'>
<div className='compose-form__publish-button-wrapper'><Button text={publishText} onClick={this.handleSubmit} disabled={disabledButton} block /></div>
</div>
</div> </div>
} {maxTootChars && (
<div className='compose-form__counter'>
{/* <TextCharacterCounter max={maxTootChars} text={text} /> */}
<VisualCharacterCounter max={maxTootChars} text={text} />
</div>
)}
<div className='compose-form__publish'>
<div className='compose-form__publish-button-wrapper'><Button text={publishText} onClick={this.handleSubmit} disabled={disabledButton} block /></div>
</div>
</div>
</div> </div>
); );
} }

6
app/styles/components/compose-form.scss
View File

@ -89,6 +89,12 @@
min-height: 46px; min-height: 46px;
border-radius: 5px; border-radius: 5px;
} }
.compose-form__buttons-wrapper {
height: 0;
padding: 0;
overflow: hidden;
}
} }
&__modifiers { &__modifiers {