bigbuffet/bigbuffet-rw
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
Removed spoilerActive prop and used existing spoiler prop

Fixed linter issue and removed commented code
This commit is contained in:
crockwave 2020-05-26 19:19:52 -05:00 committed by Alex Gleason
parent 6f76e1796b
commit 84ba6a0cc3
No known key found for this signature in database
GPG key ID: 7211D1F99744FBB7
2 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/gabsocial/components/autosuggest_input.js
View file

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

5
app/gabsocial/features/compose/components/compose_form.js
View file

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