Commit Graph

333 Commits (33b334cdf746547c6f454f70d6113a7c4aad72cc)

Author SHA1 Message Date
Robin bfab09e977
Use a more correct test for emoji (#7685) 2022-02-01 09:45:22 +00:00
Michael Telatynski 056c7c8d65
Prevent infinite loops by dropping the input instead of crashing browser (#7632) 2022-01-26 10:16:01 +00:00
Michael Telatynski 2143845a3a
Fix issue with the new composer EmojiPart which caused infinite loops (#7629) 2022-01-25 20:22:41 +00:00
Robin 6806c2cdca
Enlarge emoji in composer (#7602) 2022-01-24 12:53:05 +00:00
Michael Telatynski 2ef36507fd
Support deserialising HR tags for editing (#7543) 2022-01-14 13:24:51 +00:00
Michael Telatynski b835588331
Allow using room pills in slash commands (#7513) 2022-01-12 09:40:18 +00:00
Renan Cleyson 9ac85bcaa3
Fix list formatting alternating on edit (#7422)
Co-authored-by: Andy Balaam <andyb@element.io>
2021-12-21 10:07:44 +00:00
Aaron Raimist 7b94e13a84 Merge branch 'develop' into sort-imports
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2021-12-09 08:34:20 +00:00
Renan Cleyson b4b81a455e
Fix wrong indentation with nested ordered list unnesting list on edit (#7300) 2021-12-07 09:46:04 +00:00
Aaron Raimist f3867ad0a9 Merge branch 'develop' into sort-imports 2021-10-27 21:50:56 -05:00
Šimon Brandner ceb4c7e368
Add insert link button to the format bar (#5879) 2021-10-25 10:56:55 +01:00
Aaron Raimist bdc56be863
Auto fix
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2021-10-22 17:23:37 -05:00
Michael Telatynski fd6d853bb1 Allow editing of /rainbow and /rainbowme 2021-10-12 14:02:05 +01:00
Michael Telatynski ddc408690c Fix EditorModel clone to actually be useful 2021-10-12 11:02:06 +01:00
Michael Telatynski fe70e64a40 Improve typing 2021-10-12 11:01:40 +01:00
Dariusz Niemczyk 8331d4c7b7
Happily handle empty text messages (#6825)
This commig refactors the message-deletion modal and reuses it for case of removing
the entire message and trying to send it, which should trigger removal flow instead.

Fix vector-im/element-web#18873
2021-09-28 15:04:25 +01:00
Šimon Brandner fd022310b3
Merge remote-tracking branch 'upstream/develop' into fix/end-of-line-emoji
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-09-11 10:21:56 +02:00
Michael Telatynski f9527c9d6b Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/a11y/composer-list-autocomplete
 Conflicts:
	src/components/views/rooms/BasicMessageComposer.tsx
	src/editor/autocomplete.ts
2021-08-12 11:21:20 +01:00
Šimon Brandner 422c27fcef
Reorder code
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-06 07:46:01 +02:00
Šimon Brandner 4f0c800cad
Merge remote-tracking branch 'upstream/develop' into feature/improved-composer
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-06 07:45:17 +02:00
Michael Telatynski fa550a65af Fix editing of <sub> & <sup> & <u> 2021-07-23 19:01:12 +01:00
Michael Telatynski ce78cdf4ad Conform to new react and typescript eslint rules 2021-07-19 22:43:11 +01:00
Michael Telatynski ebfe38dc4a Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/a11y/composer-list-autocomplete
 Conflicts:
	src/components/views/rooms/BasicMessageComposer.tsx
	src/editor/autocomplete.ts
2021-07-15 09:59:40 +01:00
Michael Telatynski 51f0f5718a improve types 2021-07-12 13:26:34 +01:00
Michael Telatynski 8139aeb073 skip loading room & finding member, use existing member field 2021-07-12 12:51:49 +01:00
Michael Telatynski 3515b2ca05 Fix edge case behaviour caused by our weird reuse of DOM nodes between owners 2021-07-12 12:51:27 +01:00
Šimon Brandner b79f2d0699
Fix the ugly solution
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-12 12:21:59 +02:00
Šimon Brandner 113b6319b1
This looks a bit nicer
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-12 09:52:01 +02:00
Šimon Brandner 667abca31f
Handle pill onclick
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-11 20:02:32 +02:00
Šimon Brandner 98808aabca
Set contentEditable for PillParts to false
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-11 18:53:29 +02:00
Michael Telatynski e768ecb3d0 Typescript conversion of Composer components and more 2021-06-30 13:01:26 +01:00
J. Ryan Stinnett ae0a8b8da4 Auto-fix lint errors 2021-06-29 13:11:58 +01:00
Michael Telatynski 1ffbaee560 update style of imports in all modified files 2021-05-26 14:14:55 +01:00
Michael Telatynski d8acc0612a Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/12740
 Conflicts:
	src/components/views/rooms/EditMessageComposer.js
	src/components/views/rooms/SendMessageComposer.js
2021-05-24 21:57:38 +01:00
Michael Telatynski 28eaac0ef8 remove dead code and fix some types 2021-05-20 22:25:19 +01:00
Michael Telatynski 60e7089c77 post-merge fixes, the new keybindings stuff made it messy 2021-05-11 11:14:21 +01:00
Michael Telatynski 60d3da2441 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/a11y/composer-list-autocomplete
 Conflicts:
	src/components/structures/LoggedInView.tsx
	src/components/views/rooms/BasicMessageComposer.tsx
	src/editor/autocomplete.ts
2021-05-11 10:59:22 +01:00
J. Ryan Stinnett 7821e00bc6 Revert to internal option 2021-05-10 17:36:33 +01:00
J. Ryan Stinnett 9c8e89ff79 Fix importing 2021-05-10 16:55:27 +01:00
J. Ryan Stinnett f41fc7e46c Upgrade `cheerio` and resolve type errors
This helps resolve some type errors with `domhandler`. In addition, we convert
to the new way of using `htmlparser2` with `cheerio`.
2021-05-10 16:10:39 +01:00
Michael Telatynski ed8b05b730
Merge pull request #5951 from SimonBrandner/fix/room-pill-history
Fix saving room pill part to history
2021-05-04 12:32:04 +01:00
Šimon Brandner 0c869364e9
Don't serialize resourceId in AtRoomPill
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-05-01 12:27:52 +02:00
Šimon Brandner c1549dfac5
Make optional params optional
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-05-01 11:32:35 +02:00
Šimon Brandner ee8d688de1
Fix saving room pill part to history
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-05-01 10:59:28 +02:00
Sven Mäder bbce1ac704 Disallow inline display maths 2021-04-28 19:39:38 +02:00
Travis Ralston 14f1388522
Merge pull request #5830 from SimonBrandner/fix-trailing-colon
Fix inserting trailing colon after mention/pill
2021-04-28 09:51:50 -06:00
Michael Telatynski 915f8b3c9c Scale all mxc thumbs using device pixel ratio for hidpi
as we are notoriously bad at doing it everywhere we ought to, like the TopLeftMenu avatar
2021-04-26 18:25:49 +01:00
Šimon Brandner d36f8ccb95
Rename moveStart to moveStartForwards
So it it's clear what it does

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-18 10:18:49 +02:00
Šimon Brandner 609196a240
Replace emoticon before a newline
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-18 10:13:51 +02:00
Michael Telatynski 5f59e39958 Apply the same to quoting & inserting of emoji then consolidate 2021-04-13 15:09:37 +01:00