tykayn
/
mastodon
mirror of https://framagit.org/tykayn/mastodon.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

[Glitch] Fix some React warnings 

Port cc8f6b3cda to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
This commit is contained in:
Eugen Rochko 2019-06-07 17:15:18 +02:00 committed by ThibG
parent 3485acefed
commit 362f3973be
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/javascript/flavours/glitch/components/autosuggest_textarea.js
View File

@ -201,7 +201,7 @@ export default class AutosuggestTextarea extends ImmutablePureComponent {
}
return [
<div className='compose-form__autosuggest-wrapper'>
<div className='compose-form__autosuggest-wrapper' key='autosuggest-wrapper'>
<div className='autosuggest-textarea'>
<label>
<span style={{ display: 'none' }}>{placeholder}</span>
@ -226,7 +226,8 @@ export default class AutosuggestTextarea extends ImmutablePureComponent {
</div>
{children}
</div>,
<div className='autosuggest-textarea__suggestions-wrapper'>
<div className='autosuggest-textarea__suggestions-wrapper' key='suggestions-wrapper'>
<div className={`autosuggest-textarea__suggestions ${suggestionsHidden || suggestions.isEmpty() ? '' : 'autosuggest-textarea__suggestions--visible'}`}>
{suggestions.map(this.renderSuggestion)}
</div>

12
app/javascript/flavours/glitch/features/compose/components/compose_form.js
View File

@ -28,10 +28,6 @@ const messages = defineMessages({
export default @injectIntl
class ComposeForm extends ImmutablePureComponent {
setRef = c => {
this.composeForm = c;
};
static contextTypes = {
router: PropTypes.object,
};
@ -145,6 +141,10 @@ class ComposeForm extends ImmutablePureComponent {
}
}
setRef = c => {
this.composeForm = c;
};
// Inserts an emoji at the caret.
handleEmoji = (data) => {
const { textarea: { selectionStart } } = this;
@ -213,7 +213,9 @@ class ComposeForm extends ImmutablePureComponent {
}
handleFocus = () => {
this.composeForm.scrollIntoView();
if (this.composeForm) {
this.composeForm.scrollIntoView();
}
}
// This statement does several things: