Commit Graph

357 Commits (5b2bafacc9213addcfb24cea2b8201adb8be50b6)

Author SHA1 Message Date
Š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
Sven Mäder 31e85ec580 Use cheerio api for code replacements 2021-04-08 11:38:05 +02:00
Sven Mäder 7205995dea Remove unused function arguments 2021-04-07 17:22:30 +02:00
Šimon Brandner 715fff6f0c
Redo and fix trailing characters in user pills
This removes the handling of trailing chars from createMentionParts as we need to determine whether or not to insert the trailing char differently in different situations

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-07 11:52:07 +02:00
Sven Mäder 1d70045065 Refactor maths config options to nested structure 2021-04-06 14:52:55 +02:00
Sven Mäder 3c1169c7a2 Merge remote-tracking branch 'upstream/develop' into maths-parsing-latex 2021-04-06 12:34:51 +02:00
Sven Mäder 73130cad02 Refactor latex replace code 2021-04-01 12:09:51 +02:00
Clemens Zeidler 57cd8afbc4 Split ApplySelection into CompleteOrPrevSelection and CompleteOrNextSelection
When moving through the autocomplete selection list distinguish between
the following cases:
1) When there is no autocomplete window open, only open one and select
the first item when the CompleteOrPrevSelection /
CompleteOrNextSelection actions are emitted (e.g. by pressing SHIFT +
TAB, TAB)
2) Otherwise navigate through the selection list (e.g. SHIFT + TAB, TAB,
UP, DOWN)

- Remove references to raw keyboard events in autocomplete.ts
- Clarify the purpose of startSelection (previously onTab)

Signed-off-by: Clemens Zeidler <clemens.zeidler@gmail.com>
2021-03-29 13:38:03 +13:00
Travis Ralston 7c8c85161d
Merge pull request #5748 from SimonBrandner/compat-for-non-rich-text-clients
Show room alias in plain/formatted body
2021-03-11 11:29:26 -07:00
Šimon Brandner d4f67d94a4
Use resourceId in plain body
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-03-11 18:53:06 +01:00
Šimon Brandner 62fa60f109
Use resourceId in formatted body
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-03-11 18:50:54 +01:00
Panagiotis a1eabde3a3 fix: create a PillCandidatePart on the beginning of a part string 2021-03-11 19:14:04 +02:00
J. Ryan Stinnett b12cf7912a
Merge pull request #5624 from SimonBrandner/show-room-name
Display room name in pills instead of address
2021-03-08 16:27:43 +00:00
Jaiwanth d731e82fba Fixed edit for markdown images
Signed-off-by: Jaiwanth <jaiwanth2011@gmail.com>
2021-03-01 22:44:48 +05:30
Michael Telatynski c05eceef7f Rework composer autocomplete to be smarter and not trap tab 2021-02-17 15:39:07 +00:00
Šimon Brandner cb5237a18b
Display room name instead of alias
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-12 14:21:07 +01:00
Sven Mäder ac1f9b4247 Add config keys for alternative patterns 2021-01-29 15:49:20 +01:00
Sven Mäder bcc0697710 Remove /tex command 2021-01-29 13:05:49 +01:00
Sven Mäder c4f0987487 Use TeX and LaTeX delimiters by default for serialize 2021-01-29 00:11:06 +01:00
Sven Mäder d5c72b9d70 Fix linting error
Signed-off-by: Sven Mäder <maeder@phys.ethz.ch>
2020-12-22 13:31:58 +01:00
Sven Mäder fb57123e25 Improve inline latex regex matching
Signed-off-by: Sven Mäder <maeder@phys.ethz.ch>
2020-12-22 12:18:38 +01:00
Sven Mäder 78b3f50bfd Use LaTeX delimiters by default, add /tex command
Since parsing for $'s as maths delimiters is tricky, switch the default
to \(...\) for inline and \[...\] for display maths as it is used in
LaTeX. Add /tex command to explicitly parse in TeX mode, which uses
$...$ for inline and $$...$$ for display maths.

Signed-off-by: Sven Mäder <maeder@phys.ethz.ch>
2020-12-21 00:05:22 +01:00
macekj 0c85cb587d Merge branch 'develop' into emoji_quick_shortcut 2020-12-04 11:05:50 -05:00
macekj ba8d02a808 add quick shortcut emoji feature and tests
Signed-off-by: macekj <macekj@umich.edu>
2020-11-17 17:36:58 -05:00
Aleks Kissinger 839bae21ae made single and double $ default delimiters 2020-11-10 18:18:53 +00:00
Aleks Kissinger 2204e6c64e generate valid block html for commonmark spec 2020-10-25 18:32:24 +00:00
Aleks Kissinger 06b20fad95 removed implicit "this" 2020-10-23 18:49:56 +01:00
Aleks Kissinger cc713aff72 add fallback output in code block AFTER markdown processing 2020-10-14 09:35:57 +01:00
Aleks Kissinger aafaf34233 Merge branch 'develop' into katex 2020-10-10 19:31:46 +01:00
Aleks Kissinger 96742fc309 latex math as labs setting 2020-10-10 16:32:49 +01:00
Michael Telatynski af4c95e267 apply to whitespace in general
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-09-29 14:17:44 +01:00
Michael Telatynski ffa7ceb70e Trim range when formatting so that it excludes leading/trailing spaces
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-09-29 14:15:20 +01:00
Aleks Kissinger aded3c9de2 cosmetic changes (lint) 2020-09-22 11:54:23 +01:00
Aleks Kissinger 4df8754aad allow custom latex delimiters in config.json 2020-09-21 11:00:39 +01:00
Aleks Kissinger 24a1834f9b support multi-line and escaped $ 2020-09-21 09:00:24 +01:00
Aleks Kissinger 7e6d7053e0 Revert "send fallback in pre tags, not code" (code looks better)
This reverts commit e4448ae1ad.
2020-09-20 17:02:27 +01:00
Aleks Kissinger e4448ae1ad send fallback in pre tags, not code 2020-09-20 16:52:29 +01:00
Aleks Kissinger 428a6b94ff math off by default, enable with latex_maths flag 2020-09-20 15:07:12 +01:00
Aleks Kissinger e78734bbf6 Deserialize back to math delimiters for editing 2020-09-20 14:20:35 +01:00
Aleks Kissinger becc79d67a send tex math as data-mx-maths attribute 2020-09-20 12:59:22 +01:00
J. Ryan Stinnett ce226ab534 Replace Riot with Element in docs and comments
This only covers the simple cases of references to issues and repos. More
complex areas, such as deployment scripts, will be handled separately.

Part of https://github.com/vector-im/element-web/issues/14864
2020-08-03 18:33:36 +01:00
Michael Telatynski c578026474 Merge branches 'develop' and 't3chguy/fix/13641' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/13641
 Conflicts:
	src/editor/parts.ts
2020-07-24 08:18:20 +01:00
Michael Telatynski c8832f5582 Fix autocompletion of Community IDs
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-23 14:47:42 +01:00
Michael Telatynski adba9415b3 Fix Firefox composer regression exception
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-23 09:25:01 +01:00
Hubert Chathi cbe4f04cd7
Merge pull request #5029 from uhoreg/sanitize_language
don't syntax highlight languages that begin with "_"
2020-07-21 13:12:51 -04:00
Michael Telatynski 93884cb89b Update PlainBasePart to only split on space boundaries
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-21 17:50:24 +01:00
Hubert Chathi 2ce493307e don't syntax highlight languages that begin with "_" 2020-07-21 12:47:40 -04:00
Jorik Schellekens d86eb5eb9e Lint new new code 2020-07-20 20:48:27 +01:00
Jorik Schellekens c0ce6e8161 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into joriks/eslint-config 2020-07-20 20:44:52 +01:00
Michael Telatynski 7a05476c50 add missing types
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-20 17:10:08 +01:00
Michael Telatynski 06cc76f7d8 mark some things as public
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-20 16:34:52 +01:00
Michael Telatynski ed0d9973b7 Switch to a discriminated unions
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-20 16:33:53 +01:00
Michael Telatynski 2bf5e4b142 clean up
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-15 09:49:02 +01:00
Michael Telatynski 8812f98b35 Convert editor to TypeScript
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-15 09:45:45 +01:00
Jorik Schellekens 7699aafcaf Use new eslint package- fix lint issues in ts and js 2020-06-23 17:01:19 +01:00
Travis Ralston 803b7bb30f
Merge pull request #4694 from justin-sleep/remove-escape-backslashes
Remove escape backslashes in non-Markdown messages
2020-06-17 11:06:04 -06:00
Michael Telatynski ef80a0b0b4
avoid negatives 2020-06-16 14:06:42 +01:00
Michael Telatynski fcd3ebe051 Fix case-sensitivity of /me to match rest of slash commands
also better error handling for attempted runs of unimplemented commands
2020-06-16 00:41:21 +01:00
Justin Sleep bdc451d66b Remove escape backslashes in non-Markdown messages 2020-06-03 17:08:13 -05:00
Bruno Windels 0c5c2501e6 remove prefixes as we're using data urls now 2020-05-06 12:23:03 +02:00
Sergey Shpikin a97a3cea51 Make avatars in pills occupy the entire space using cropping
Signed-off-by: Sergey Shpikin <rkfg@rkfg.me>
2020-04-23 10:55:49 +03:00
Michael Telatynski 9c1939b756 match all, not just first instance of tokens to escape
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-15 02:31:30 +01:00
Michael Telatynski 4454db30d6 Escape opening square bracket too
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-15 01:02:08 +01:00
Michael Telatynski cb10640eaf detslint
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-15 00:53:35 +01:00
Michael Telatynski c72139fc3f Convert serialize and deserialize to TypeScript
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-15 00:49:08 +01:00
Michael Telatynski 95eaf94cd8 Fix pills being broken by unescaped characters
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-15 00:40:38 +01:00
J. Ryan Stinnett 7ad8eeb906 Fix composer touch bar flickering on keypress in Chrome
This changes our selection state handling to leave things alone if the browser's
state already matches what we want. This avoids strange side effects like the
touch bar flickering on each key press in Chrome.

Fixes https://github.com/vector-im/riot-web/issues/9299
2020-03-04 14:35:11 +00:00
Bruno Windels dc85346e5c
Merge pull request #4102 from matrix-org/bwindels/aliasautocomplete
Use alt_aliases for pills and autocomplete
2020-02-24 12:18:07 +00:00
Bruno Windels 13b08b5fcc
Revert "Fix escaped markdown passing backslashes through" 2020-02-24 11:27:22 +00:00
Michael Telatynski e799691573 Apply null-guard to room pills for when we can't fetch the room
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-02-21 14:14:24 +00:00
Bruno Windels 16815a752b use alt_aliases instead of aliases to match a pill to a room
when deserializing a pill
2020-02-21 13:02:41 +01:00
Bruno Windels 8870da6c24 Add alt_aliases to room completion candidates
but don't match on name otherwise you see multiple entries per room
when searching for a room name

Also pass the roomId to the composer autocomplete, so
it's easier to we don't need to loop through all the rooms and
it's also easier accept room with local aliases as well in the future
2020-02-21 13:02:41 +01:00
Bob 9cf53aa9d8 Only return formatted text when necessary (for escaped chars)
Signed-off-by: Bob Rao <bob+git@vulpin.com>
2020-02-02 16:34:19 +11:00
BobVul fde30577e4 Fix escaped markdown passing backslashes through
Fixes https://github.com/vector-im/riot-web/issues/11230

Signed-off-by: Bob Rao <bob+git@vulpin.com>
2020-01-31 12:33:57 +11:00
Michael Telatynski 7e45979e00 change order of if or conditions as micro-optimization
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-01-30 20:59:30 +00:00
Michael Telatynski b84fd245b1 Fix room completion for invited rooms and upgraded rooms
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-01-30 18:03:45 +00:00
Michael Telatynski d7a4698db8
Merge pull request #3891 from matrix-org/t3chguy/fix_multi_paragraph_formatting
Fix paragraph-awareness of the composer formatting features
2020-01-23 13:31:12 +00:00