Revert "Merge branch 'compose_caret_to_end' into 'master'"

This reverts commit 886e877996, reversing
changes made to b6a7404031.
stable/1.0.x
Alex Gleason 2020-05-26 15:21:40 -05:00
rodzic 438d8009d4
commit d9e6efbe79
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 7211D1F99744FBB7
3 zmienionych plików z 10 dodań i 18 usunięć

1
.gitignore vendored
Wyświetl plik

@ -6,4 +6,3 @@
/.eslintcache /.eslintcache
/.env /.env
/deploy.sh /deploy.sh
/.vs/

Wyświetl plik

@ -44,7 +44,6 @@ class ComposeForm extends ImmutablePureComponent {
state = { state = {
composeFocused: false, composeFocused: false,
caretPosition: 0,
} }
static contextTypes = { static contextTypes = {
@ -87,9 +86,6 @@ class ComposeForm extends ImmutablePureComponent {
handleChange = (e) => { handleChange = (e) => {
this.props.onChange(e.target.value); this.props.onChange(e.target.value);
this.setState({
caretPosition: e.target.selectionStart,
});
} }
handleComposeFocus = () => { handleComposeFocus = () => {
@ -184,24 +180,22 @@ class ComposeForm extends ImmutablePureComponent {
// - Replying to zero or one users, places the cursor at the end of the textbox. // - Replying to zero or one users, places the cursor at the end of the textbox.
// - Replying to more than one user, selects any usernames past the first; // - Replying to more than one user, selects any usernames past the first;
// this provides a convenient shortcut to drop everyone else from the conversation. // this provides a convenient shortcut to drop everyone else from the conversation.
let selectionEnd, selectionStart;
if (this.props.focusDate !== prevProps.focusDate) { if (this.props.focusDate !== prevProps.focusDate) {
let selectionEnd, selectionStart;
if (this.props.preselectDate !== prevProps.preselectDate) { if (this.props.preselectDate !== prevProps.preselectDate) {
selectionEnd = this.props.text.length; selectionEnd = this.props.text.length;
selectionStart = this.props.text.search(/\s/) + 1; selectionStart = this.props.text.search(/\s/) + 1;
} else if (typeof this.state.caretPosition === 'number') { } else if (typeof this.props.caretPosition === 'number') {
selectionStart = this.state.caretPosition; selectionStart = this.props.caretPosition;
selectionEnd = this.state.caretPosition; selectionEnd = this.props.caretPosition;
} else {
selectionEnd = this.props.text.length;
selectionStart = selectionEnd;
} }
this.autosuggestTextarea.textarea.setSelectionRange(selectionStart, selectionEnd); this.autosuggestTextarea.textarea.setSelectionRange(selectionStart, selectionEnd);
this.autosuggestTextarea.textarea.focus(); this.autosuggestTextarea.textarea.focus();
} else {
if (this.props.preselectDate !== this.props.focusDate) {
selectionStart = selectionEnd = this.props.text.length + 1;
this.autosuggestTextarea.textarea.setSelectionRange(selectionStart, selectionEnd);
this.autosuggestTextarea.textarea.focus();
}
} }
} }

Wyświetl plik

@ -237,8 +237,7 @@ export default function compose(state = initialState, action) {
case COMPOSE_CHANGE: case COMPOSE_CHANGE:
return state return state
.set('text', action.text) .set('text', action.text)
.set('idempotencyKey', uuid()) .set('idempotencyKey', uuid());
.set('focusDate', new Date());
case COMPOSE_COMPOSING_CHANGE: case COMPOSE_COMPOSING_CHANGE:
return state.set('is_composing', action.value); return state.set('is_composing', action.value);
case COMPOSE_REPLY: case COMPOSE_REPLY: