Merge branch 'main' into glitch-soc/merge-upstream

2022-02-12 21:36:33 +01:00
parent 27803cd2b7 7396a254c1
commit c9669ee167
8 changed files with 84 additions and 49 deletions
--- a/app/javascript/mastodon/features/compose/components/compose_form.js
+++ b/app/javascript/mastodon/features/compose/components/compose_form.js
@ -260,7 +260,7 @@ class ComposeForm extends ImmutablePureComponent {
          <div className='compose-form__buttons'>
            <UploadButtonContainer />
            <PollButtonContainer />
-            <PrivacyDropdownContainer />
+            <PrivacyDropdownContainer disabled={this.props.isEditing} />
            <SpoilerButtonContainer />
          </div>
          <div className='character-counter__wrapper'><CharacterCounter max={maxChars} text={this.getFulltextForCharacterCounting()} /></div>