hamptonmoore
/
mastodon
forked from treehouse/mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Glitch] Fix text being incorrectly pre-selected in composer textarea on /share 

Port 3a103cd317 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
signup-info-prompt
Claire 2022-01-23 18:24:34 +01:00
parent 61ef81c548
commit 4dd4fc2e5e
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -58,6 +58,7 @@ class ComposeForm extends ImmutablePureComponent {
onPickEmoji: PropTypes.func, onPickEmoji: PropTypes.func,
showSearch: PropTypes.bool, showSearch: PropTypes.bool,
anyMedia: PropTypes.bool, anyMedia: PropTypes.bool,
isInReply: PropTypes.bool,
singleColumn: PropTypes.bool, singleColumn: PropTypes.bool,
advancedOptions: ImmutablePropTypes.map, advancedOptions: ImmutablePropTypes.map,
@ -233,7 +234,7 @@ class ComposeForm extends ImmutablePureComponent {
// Caret/selection handling. // Caret/selection handling.
if (focusDate !== prevProps.focusDate) { if (focusDate !== prevProps.focusDate) {
switch (true) { switch (true) {
case preselectDate !== prevProps.preselectDate && preselectOnReply: case preselectDate !== prevProps.preselectDate && this.props.isInReply && preselectOnReply:
selectionStart = text.search(/\s/) + 1; selectionStart = text.search(/\s/) + 1;
selectionEnd = text.length; selectionEnd = text.length;
break; break;

1
app/javascript/flavours/glitch/features/compose/containers/compose_form_container.js
View File

@ -68,6 +68,7 @@ function mapStateToProps (state) {
spoilersAlwaysOn: spoilersAlwaysOn, spoilersAlwaysOn: spoilersAlwaysOn,
mediaDescriptionConfirmation: state.getIn(['local_settings', 'confirm_missing_media_description']), mediaDescriptionConfirmation: state.getIn(['local_settings', 'confirm_missing_media_description']),
preselectOnReply: state.getIn(['local_settings', 'preselect_on_reply']), preselectOnReply: state.getIn(['local_settings', 'preselect_on_reply']),
isInReply: state.getIn(['compose', 'in_reply_to']) !== null,
}; };
}; };