diff --git a/app/javascript/mastodon/features/compose/components/compose_form.jsx b/app/javascript/mastodon/features/compose/components/compose_form.jsx
index 962310a28..ca78210ca 100644
--- a/app/javascript/mastodon/features/compose/components/compose_form.jsx
+++ b/app/javascript/mastodon/features/compose/components/compose_form.jsx
@@ -1,34 +1,36 @@
-import PropTypes from 'prop-types';
+import PropTypes from 'prop-types'
-import { defineMessages, injectIntl } from 'react-intl';
+import { defineMessages, injectIntl } from 'react-intl'
-import classNames from 'classnames';
+import classNames from 'classnames'
-import ImmutablePropTypes from 'react-immutable-proptypes';
-import ImmutablePureComponent from 'react-immutable-pure-component';
+import ImmutablePropTypes from 'react-immutable-proptypes'
+import ImmutablePureComponent from 'react-immutable-pure-component'
-import { length } from 'stringz';
+import { length } from 'stringz'
-import { Icon } from 'mastodon/components/icon';
+import { Icon } from 'mastodon/components/icon'
-import AutosuggestInput from '../../../components/autosuggest_input';
-import AutosuggestTextarea from '../../../components/autosuggest_textarea';
-import Button from '../../../components/button';
-import EmojiPickerDropdown from '../containers/emoji_picker_dropdown_container';
-import LanguageDropdown from '../containers/language_dropdown_container';
-import PollButtonContainer from '../containers/poll_button_container';
-import PollFormContainer from '../containers/poll_form_container';
-import PrivacyDropdownContainer from '../containers/privacy_dropdown_container';
-import ReplyIndicatorContainer from '../containers/reply_indicator_container';
-import SpoilerButtonContainer from '../containers/spoiler_button_container';
-import UploadButtonContainer from '../containers/upload_button_container';
-import UploadFormContainer from '../containers/upload_form_container';
-import WarningContainer from '../containers/warning_container';
-import { countableText } from '../util/counter';
+import AutosuggestInput from '../../../components/autosuggest_input'
+import AutosuggestTextarea from '../../../components/autosuggest_textarea'
+import Button from '../../../components/button'
+import EmojiPickerDropdown from '../containers/emoji_picker_dropdown_container'
+import LanguageDropdown from '../containers/language_dropdown_container'
+import PollButtonContainer from '../containers/poll_button_container'
+import PollFormContainer from '../containers/poll_form_container'
+import PrivacyDropdownContainer from '../containers/privacy_dropdown_container'
+import ReplyIndicatorContainer from '../containers/reply_indicator_container'
+import SpoilerButtonContainer from '../containers/spoiler_button_container'
+import UploadButtonContainer from '../containers/upload_button_container'
+import UploadFormContainer from '../containers/upload_form_container'
+import WarningContainer from '../containers/warning_container'
+import { countableText } from '../util/counter'
-import CharacterCounter from './character_counter';
+import CharacterCounter from './character_counter'
-const allowedAroundShortCode = '><\u0085\u0020\u00a0\u1680\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u202f\u205f\u3000\u2028\u2029\u0009\u000a\u000b\u000c\u000d';
+const contentMaxLength = 5000
+
+const allowedAroundShortCode = '><\u0085\u0020\u00a0\u1680\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u202f\u205f\u3000\u2028\u2029\u0009\u000a\u000b\u000c\u000d'
const messages = defineMessages({
placeholder: { id: 'compose_form.placeholder', defaultMessage: 'What is on your mind?' },
@@ -36,7 +38,7 @@ const messages = defineMessages({
publish: { id: 'compose_form.publish', defaultMessage: 'Publish' },
publishLoud: { id: 'compose_form.publish_loud', defaultMessage: '{publish}!' },
saveChanges: { id: 'compose_form.save_changes', defaultMessage: 'Save changes' },
-});
+})
class ComposeForm extends ImmutablePureComponent {
@@ -82,84 +84,84 @@ class ComposeForm extends ImmutablePureComponent {
};
handleChange = (e) => {
- this.props.onChange(e.target.value);
+ this.props.onChange(e.target.value)
};
handleKeyDown = (e) => {
if (e.keyCode === 13 && (e.ctrlKey || e.metaKey)) {
- this.handleSubmit();
+ this.handleSubmit()
}
};
getFulltextForCharacterCounting = () => {
- return [this.props.spoiler? this.props.spoilerText: '', countableText(this.props.text)].join('');
+ return [this.props.spoiler ? this.props.spoilerText : '', countableText(this.props.text)].join('')
};
canSubmit = () => {
- const { isSubmitting, isChangingUpload, isUploading, anyMedia } = this.props;
- const fulltext = this.getFulltextForCharacterCounting();
- const isOnlyWhitespace = fulltext.length !== 0 && fulltext.trim().length === 0;
+ const { isSubmitting, isChangingUpload, isUploading, anyMedia } = this.props
+ const fulltext = this.getFulltextForCharacterCounting()
+ const isOnlyWhitespace = fulltext.length !== 0 && fulltext.trim().length === 0
- return !(isSubmitting || isUploading || isChangingUpload || length(fulltext) > 5000 || (isOnlyWhitespace && !anyMedia));
+ return !(isSubmitting || isUploading || isChangingUpload || length(fulltext) > contentMaxLength || (isOnlyWhitespace && !anyMedia))
};
handleSubmit = (e) => {
if (this.props.text !== this.autosuggestTextarea.textarea.value) {
// Something changed the text inside the textarea (e.g. browser extensions like Grammarly)
// Update the state to match the current text
- this.props.onChange(this.autosuggestTextarea.textarea.value);
+ this.props.onChange(this.autosuggestTextarea.textarea.value)
}
if (!this.canSubmit()) {
- return;
+ return
}
- this.props.onSubmit(this.context.router ? this.context.router.history : null);
+ this.props.onSubmit(this.context.router ? this.context.router.history : null)
if (e) {
- e.preventDefault();
+ e.preventDefault()
}
};
onSuggestionsClearRequested = () => {
- this.props.onClearSuggestions();
+ this.props.onClearSuggestions()
};
onSuggestionsFetchRequested = (token) => {
- this.props.onFetchSuggestions(token);
+ this.props.onFetchSuggestions(token)
};
onSuggestionSelected = (tokenStart, token, value) => {
- this.props.onSuggestionSelected(tokenStart, token, value, ['text']);
+ this.props.onSuggestionSelected(tokenStart, token, value, ['text'])
};
onSpoilerSuggestionSelected = (tokenStart, token, value) => {
- this.props.onSuggestionSelected(tokenStart, token, value, ['spoiler_text']);
+ this.props.onSuggestionSelected(tokenStart, token, value, ['spoiler_text'])
};
handleChangeSpoilerText = (e) => {
- this.props.onChangeSpoilerText(e.target.value);
+ this.props.onChangeSpoilerText(e.target.value)
};
handleFocus = () => {
if (this.composeForm && !this.props.singleColumn) {
- const { left, right } = this.composeForm.getBoundingClientRect();
+ const { left, right } = this.composeForm.getBoundingClientRect()
if (left < 0 || right > (window.innerWidth || document.documentElement.clientWidth)) {
- this.composeForm.scrollIntoView();
+ this.composeForm.scrollIntoView()
}
}
};
- componentDidMount () {
- this._updateFocusAndSelection({ });
+ componentDidMount() {
+ this._updateFocusAndSelection({})
}
- componentWillUnmount () {
- if (this.timeout) clearTimeout(this.timeout);
+ componentWillUnmount() {
+ if (this.timeout) clearTimeout(this.timeout)
}
- componentDidUpdate (prevProps) {
- this._updateFocusAndSelection(prevProps);
+ componentDidUpdate(prevProps) {
+ this._updateFocusAndSelection(prevProps)
}
_updateFocusAndSelection = (prevProps) => {
@@ -169,72 +171,72 @@ class ComposeForm extends ImmutablePureComponent {
// - Replying to more than one user, selects any usernames past the first;
// this provides a convenient shortcut to drop everyone else from the conversation.
if (this.props.focusDate && this.props.focusDate !== prevProps.focusDate) {
- let selectionEnd, selectionStart;
+ let selectionEnd, selectionStart
if (this.props.preselectDate !== prevProps.preselectDate && this.props.isInReply) {
- selectionEnd = this.props.text.length;
- selectionStart = this.props.text.search(/\s/) + 1;
+ selectionEnd = this.props.text.length
+ selectionStart = this.props.text.search(/\s/) + 1
} else if (typeof this.props.caretPosition === 'number') {
- selectionStart = this.props.caretPosition;
- selectionEnd = this.props.caretPosition;
+ selectionStart = this.props.caretPosition
+ selectionEnd = this.props.caretPosition
} else {
- selectionEnd = this.props.text.length;
- selectionStart = selectionEnd;
+ selectionEnd = this.props.text.length
+ selectionStart = selectionEnd
}
// Because of the wicg-inert polyfill, the activeElement may not be
// immediately selectable, we have to wait for observers to run, as
// described in https://github.com/WICG/inert#performance-and-gotchas
Promise.resolve().then(() => {
- this.autosuggestTextarea.textarea.setSelectionRange(selectionStart, selectionEnd);
- this.autosuggestTextarea.textarea.focus();
- this.setState({ highlighted: true });
- this.timeout = setTimeout(() => this.setState({ highlighted: false }), 700);
- }).catch(console.error);
- } else if(prevProps.isSubmitting && !this.props.isSubmitting) {
- this.autosuggestTextarea.textarea.focus();
+ this.autosuggestTextarea.textarea.setSelectionRange(selectionStart, selectionEnd)
+ this.autosuggestTextarea.textarea.focus()
+ this.setState({ highlighted: true })
+ this.timeout = setTimeout(() => this.setState({ highlighted: false }), 700)
+ }).catch(console.error)
+ } else if (prevProps.isSubmitting && !this.props.isSubmitting) {
+ this.autosuggestTextarea.textarea.focus()
} else if (this.props.spoiler !== prevProps.spoiler) {
if (this.props.spoiler) {
- this.spoilerText.input.focus();
+ this.spoilerText.input.focus()
} else if (prevProps.spoiler) {
- this.autosuggestTextarea.textarea.focus();
+ this.autosuggestTextarea.textarea.focus()
}
}
};
setAutosuggestTextarea = (c) => {
- this.autosuggestTextarea = c;
+ this.autosuggestTextarea = c
};
setSpoilerText = (c) => {
- this.spoilerText = c;
+ this.spoilerText = c
};
setRef = c => {
- this.composeForm = c;
+ this.composeForm = c
};
handleEmojiPick = (data) => {
- const { text } = this.props;
- const position = this.autosuggestTextarea.textarea.selectionStart;
- const needsSpace = data.custom && position > 0 && !allowedAroundShortCode.includes(text[position - 1]);
+ const { text } = this.props
+ const position = this.autosuggestTextarea.textarea.selectionStart
+ const needsSpace = data.custom && position > 0 && !allowedAroundShortCode.includes(text[position - 1])
- this.props.onPickEmoji(position, data, needsSpace);
+ this.props.onPickEmoji(position, data, needsSpace)
};
- render () {
- const { intl, onPaste, autoFocus } = this.props;
- const { highlighted } = this.state;
- const disabled = this.props.isSubmitting;
+ render() {
+ const { intl, onPaste, autoFocus } = this.props
+ const { highlighted } = this.state
+ const disabled = this.props.isSubmitting
- let publishText = '';
+ let publishText = ''
if (this.props.isEditing) {
- publishText = intl.formatMessage(messages.saveChanges);
+ publishText = intl.formatMessage(messages.saveChanges)
} else if (this.props.privacy === 'private' || this.props.privacy === 'direct') {
- publishText = {intl.formatMessage(messages.publish)};
+ publishText = {intl.formatMessage(messages.publish)}
} else {
- publishText = this.props.privacy !== 'unlisted' ? intl.formatMessage(messages.publishLoud, { publish: intl.formatMessage(messages.publish) }) : intl.formatMessage(messages.publish);
+ publishText = this.props.privacy !== 'unlisted' ? intl.formatMessage(messages.publishLoud, { publish: intl.formatMessage(messages.publish) }) : intl.formatMessage(messages.publish)
}
return (
@@ -297,7 +299,7 @@ class ComposeForm extends ImmutablePureComponent {
-
+
@@ -313,9 +315,9 @@ class ComposeForm extends ImmutablePureComponent {
- );
+ )
}
}
-export default injectIntl(ComposeForm);
+export default injectIntl(ComposeForm)