Merge remote-tracking branch 'origin/kb_development' into kb_migration

app/javascript/mastodon/features/compose/components/compose_form.jsx

@@ -11,6 +11,7 @@ import UploadButtonContainer from '../containers/upload_button_container';
 import { defineMessages, injectIntl } from 'react-intl';
 import SpoilerButtonContainer from '../containers/spoiler_button_container';
 import PrivacyDropdownContainer from '../containers/privacy_dropdown_container';
+import SearchabilityDropdownContainer from '../containers/searchability_dropdown_container';
 import ExpirationDropdownContainer from '../containers/expiration_dropdown_container';
 import EmojiPickerDropdown from '../containers/emoji_picker_dropdown_container';
 import PollFormContainer from '../containers/poll_form_container';
@@ -44,6 +45,7 @@ class ComposeForm extends ImmutablePureComponent {
     suggestions: ImmutablePropTypes.list,
     spoiler: PropTypes.bool,
     privacy: PropTypes.string,
+    searchability: PropTypes.string,
     spoilerText: PropTypes.string,
     focusDate: PropTypes.instanceOf(Date),
     caretPosition: PropTypes.number,
@@ -208,7 +210,6 @@ class ComposeForm extends ImmutablePureComponent {
   };
 
   handleExpirationPick = (data) => {
-    const { text }     = this.props;
     const position     = this.autosuggestTextarea.textarea.selectionStart;
 
     this.props.onPickExpiration(position, data);
@@ -271,6 +272,7 @@ class ComposeForm extends ImmutablePureComponent {
           lang={this.props.lang}
         >
           <EmojiPickerDropdown onPickEmoji={this.handleEmojiPick} />
+          <ExpirationDropdownContainer onPickExpiration={this.handleExpirationPick} />
 
           <div className='compose-form__modifiers'>
             <UploadFormContainer />
@@ -283,9 +285,9 @@ class ComposeForm extends ImmutablePureComponent {
             <UploadButtonContainer />
             <PollButtonContainer />
             <PrivacyDropdownContainer disabled={this.props.isEditing} />
+            <SearchabilityDropdownContainer disabled={this.props.isEditing} />
             <SpoilerButtonContainer />
             <LanguageDropdown />
-            <ExpirationDropdownContainer onPickExpiration={this.handleExpirationPick} />
           </div>
 
           <div className='character-counter__wrapper'>