Commit Graph

39 Commits (2d2c0d54c07782245fc751cfabf859f00760d0d0)

Author SHA1 Message Date
Jaiwanth 240753a84f Check for a pending edit only once per render and clear any pending events while switching between edits 2021-05-11 18:37:57 +05:30
Jaiwanth 87d95d0cb1 Merge branch 'save-edited-state-messages' of github.com:jaiwanth-v/matrix-react-sdk into save-edited-state-messages 2021-05-11 11:12:32 +05:30
Jaiwanth 4ea3fbc5ba Add comments and newlines back and resolve merge conflicts 2021-05-11 11:07:34 +05:30
Jaiwanth 376befd38e
Update src/components/views/rooms/EditMessageComposer.js
Co-authored-by: Travis Ralston <travpc@gmail.com>
2021-05-11 10:37:53 +05:30
Travis Ralston 122565b3ac
Update src/components/views/rooms/EditMessageComposer.js 2021-05-10 20:03:20 -06:00
Jaiwanth 1f77048750 Minor refactor 2021-05-09 16:12:04 +05:30
Jaiwanth 6f98aa06c4 Save edited state when switching rooms
Signed-off-by: Jaiwanth <jaiwanth2011@gmail.com>
2021-05-09 13:42:01 +05:30
Jaiwanth f32eee9475 Added slashcommands support to edit message composer
Signed-off-by: Jaiwanth <jaiwanth2011@gmail.com>
2021-04-14 16:43:21 +05:30
J. Ryan Stinnett 33e8edb3d5
Merge pull request #5720 from czeidler/key-bindings
Decouple key bindings from event handling
2021-03-26 15:14:38 +00:00
Travis Ralston 1d9d0cd7be Convert a bunch more js-sdk imports to absolute paths
Turns out a lot of the typescript warnings about improper warnings were correct. TypeScript appears to be pulling in two copies of the js-sdk when we do this, which can lead to type conflicts (or worse: the wrong code entirely). We fix this at the webpack level by explicitly importing from `src`, but some alternative build structures have broken tests because of this - jest ends up pulling in the "wrong" js-sdk, breaking things.
2021-03-18 20:50:34 -06:00
Clemens Zeidler 2a21d45ac0 Merge branch 'develop' into key-bindings 2021-03-12 16:44:12 +13:00
Travis Ralston c5935dbc61 Batch of views getting replaceableComponent decorators 2021-03-08 20:23:46 -07:00
Clemens Zeidler 601be50b71 Split KeyAction into multiple enums
This gives some additional type safety and makes enum member usage more
clear.
2021-03-01 21:43:00 +13:00
Clemens Zeidler 12387b4978 Use the KeyBindingsManager in EditMessageComposer 2021-02-16 19:05:39 +13:00
Clemens Zeidler 1346416d20 Merge branch 'develop' into ctrl-enter-send 2020-11-19 19:40:38 +13:00
Michael Telatynski c3a355097d Initial Countly work 2020-10-29 15:57:16 +00:00
Clemens Zeidler db61d343f5 Add option to send/edit a message with Ctrl + Enter / Command + Enter
When editing multi-line text this option helps to prevent accidentally
sending a message too early. With this option, Enter just inserts a new
line.

For example, composing programming code in a dev chat becomes much
easier when Enter just inserts a new line instead of sending the
message.

Signed-off-by: Clemens Zeidler <clemens.zeidler@gmail.com>
2020-09-09 19:27:11 +12:00
Travis Ralston 1f1f613777 Add a focus_composer dispatcher action
and use it
2020-06-02 19:07:46 -06:00
Michael Telatynski 5e00481639 Fix sentMessageAndIsAlone by dispatching `message_sent` more consistently
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-05-24 13:08:29 +01:00
Travis Ralston 90a898d03f Move dispatcher into a subdirectory
We're expecting to have a whole bunch of types for the dispatched payloads, so pull the thing into a directory we can throw them in.
2020-05-13 21:07:50 -06:00
David Baker 74186740ee Fix the edit messager composer
Broken in https://github.com/matrix-org/matrix-react-sdk/pull/4313
Fixes https://github.com/vector-im/riot-web/issues/13001
2020-04-02 11:30:43 +01:00
Travis Ralston 3f99332f4b Use componentDidMount in place of componentWillMount where possible
This fixes a common React warning we see. Most of these components should be using constructors instead, however componentDidMount is just as good (and doesn't require converting most of these).

Conversion to classes will be done in a later stage of React warning fixes.

For https://github.com/vector-im/riot-web/issues/12877
2020-03-31 14:14:17 -06:00
Travis Ralston fde32f13a5 [CONFLICT CHUNKS] Merge branch 'develop' into travis/sourcemaps-develop 2020-01-09 14:15:09 -07:00
Travis Ralston d56f0f2a25 Convert many imports to handle ES6 exports
Reliant upon https://github.com/matrix-org/matrix-react-sdk/pull/3761
2019-12-22 21:04:42 -07:00
Michael Telatynski da4d72b3c4 delint 2019-12-17 17:34:03 +00:00
Michael Telatynski 937b32663c Migrate away from Legacy React Contexts 2019-12-17 17:26:12 +00:00
Tulir Asokan 2555fcb38f Fix reply fallback being included in edit m.new_content
Signed-off-by: Tulir Asokan <tulir@maunium.net>
2019-10-13 13:32:09 +03:00
Bruno Windels f8a610687f don't persist caret when selection is missing
so caret will be put back at end of editor when remounting
2019-10-10 16:40:03 +02:00
Michael Telatynski 58317b1608 Use Keyboard Key variables instead of hardcoded strings
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-10-09 19:59:11 +01:00
Bruno Windels ffe34ee8a1 try to see if this fixes safari back
on of the 2 changes (updating dom async from compositionend,
or ignoring keydown while composing) here has, while fixing chrome,
broken safari.

Don't do the async dom updating for safari if that was it.
2019-09-25 14:47:35 +02:00
Bruno Windels 7bda1c58eb better naming 2019-09-25 14:45:39 +02:00
Bruno Windels 9f47fad305 ignore keydown events while doing IME composition 2019-09-24 15:32:30 +02:00
Michael Telatynski 792b70913c invert and rename changed to saveDisabled for clarity
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-09-11 17:37:11 +01:00
Michael Telatynski 2ff98b7c1f clear up ambiguity by poor naming
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-09-11 17:37:11 +01:00
Michael Telatynski e3643bf17a EditMessageComposer: disable Save button until a change has been made
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-09-11 17:37:11 +01:00
Bruno Windels 88cc1c428d add support for emotes and running /commands
this does not yet include autocomplete for commands
2019-08-22 13:33:20 +01:00
Bruno Windels df8488e194 pass label through props 2019-08-22 13:33:20 +01:00
Bruno Windels 505846ce53 split up css, update class names 2019-08-22 13:33:20 +01:00
Bruno Windels 299cf8542c Split MessageEditor in edit-specifics & reusable part for main composer 2019-08-05 15:31:18 +02:00