Added auto-focus of content warning input box when CW button clicked

Removed spoilerActive prop and used existing spoiler prop

Fixed linter issue and removed commented code
stable/1.0.x
crockwave 2020-05-26 19:19:52 -05:00 zatwierdzone przez Alex Gleason
rodzic 6f76e1796b
commit 84ba6a0cc3
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 7211D1F99744FBB7
2 zmienionych plików z 10 dodań i 1 usunięć

Wyświetl plik

@ -153,6 +153,12 @@ export default class AutosuggestInput extends ImmutablePureComponent {
this.input.focus();
}
componentDidUpdate() {
if (this.props.autoFocus) {
this.input.focus();
}
}
componentWillReceiveProps(nextProps) {
if (nextProps.suggestions !== this.props.suggestions && nextProps.suggestions.size > 0 && this.state.suggestionsHidden && this.state.focused) {
this.setState({ suggestionsHidden: false });

Wyświetl plik

@ -32,6 +32,7 @@ const messages = defineMessages({
});
export default @injectIntl
class ComposeForm extends ImmutablePureComponent {
state = {
@ -197,12 +198,13 @@ class ComposeForm extends ImmutablePureComponent {
}
render() {
const { intl, onPaste, showSearch, anyMedia, shouldCondense, autoFocus, isModalOpen, maxTootChars } = this.props;
const { intl, onPaste, showSearch, anyMedia, shouldCondense, autoFocus, spoiler, isModalOpen, maxTootChars } = this.props;
const condensed = shouldCondense && !this.props.text && !this.state.composeFocused;
const disabled = this.props.isSubmitting;
const text = [this.props.spoilerText, countableText(this.props.text)].join('');
const disabledButton = disabled || this.props.isUploading || this.props.isChangingUpload || length(text) > maxTootChars || (text.length !== 0 && text.trim().length === 0 && !anyMedia);
const shouldAutoFocus = autoFocus && !showSearch && !isMobile(window.innerWidth);
const shouldSpoilerAutoFocus = spoiler && !showSearch && !isMobile(window.innerWidth);
let publishText = '';
@ -235,6 +237,7 @@ class ComposeForm extends ImmutablePureComponent {
onSuggestionsFetchRequested={this.onSuggestionsFetchRequested}
onSuggestionsClearRequested={this.onSuggestionsClearRequested}
onSuggestionSelected={this.onSpoilerSuggestionSelected}
autoFocus={shouldSpoilerAutoFocus}
searchTokens={[':']}
id='cw-spoiler-input'
className='spoiler-input__input'