about summary refs log tree commit diff
path: root/app/javascript/mastodon/features/compose/containers/compose_form_container.js
diff options
context:
space:
mode:
authorThibG <thib@sitedethib.com>2018-05-23 15:20:15 +0200
committerEugen Rochko <eugen@zeonfederated.com>2018-05-23 15:20:15 +0200
commitd8864b9e9d4fd56606a3b809bedeb1216b6620ae (patch)
treef5b3d1d296aaeb8ec22d9a472d0f980f3b6d109c /app/javascript/mastodon/features/compose/containers/compose_form_container.js
parent6d99a0b652d866d41a56140aa695864b20830411 (diff)
Fix caret position after selected suggestion and media upload (#7595)
* Fix media upload reseting caret position to last inserted emoji

* Fix caret position after inserting suggestions (fixes #6089)
Diffstat (limited to 'app/javascript/mastodon/features/compose/containers/compose_form_container.js')
-rw-r--r--app/javascript/mastodon/features/compose/containers/compose_form_container.js1
1 files changed, 1 insertions, 0 deletions
diff --git a/app/javascript/mastodon/features/compose/containers/compose_form_container.js b/app/javascript/mastodon/features/compose/containers/compose_form_container.js
index c3aa580ee..3822dd711 100644
--- a/app/javascript/mastodon/features/compose/containers/compose_form_container.js
+++ b/app/javascript/mastodon/features/compose/containers/compose_form_container.js
@@ -19,6 +19,7 @@ const mapStateToProps = state => ({
   spoiler_text: state.getIn(['compose', 'spoiler_text']),
   privacy: state.getIn(['compose', 'privacy']),
   focusDate: state.getIn(['compose', 'focusDate']),
+  caretPosition: state.getIn(['compose', 'caretPosition']),
   preselectDate: state.getIn(['compose', 'preselectDate']),
   is_submitting: state.getIn(['compose', 'is_submitting']),
   is_uploading: state.getIn(['compose', 'is_uploading']),