abbb69dc36
fix fn call, fixes usage of SlashCommands
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-07-10 17:35:13 +01:00
100ecfe7ce
remove trailing spaces to make linter happy (no-trailing-spaces)
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-07-10 10:29:52 +01:00
58301e5dd4
navigateHistory only when at edges of document, to prevent Firefox bug
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-07-10 10:28:17 +01:00
0d0934add7
unbreak modifier+space (e.g. emoji insert on macOS)
...
(cherry picked from commit c490f87)
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-07-09 19:58:04 +01:00
021409aafe
apply review feedback from @lukebarnard1
...
(cherry picked from commit 37d4bce)
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-07-09 19:54:57 +01:00
5b74c615ae
add missing import
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
(cherry picked from commit 47b6099)
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-07-09 19:42:57 +01:00
43204ea177
fix Control-Backspace after select-all
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
(cherry picked from commit 0f32ec0)
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-07-09 19:42:10 +01:00
faf17f06c6
remove debugger statement
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
(cherry picked from commit b6f7940)
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-07-09 19:40:36 +01:00
483116fb03
add rule to slate-md-serializer: make underlined and removed work for CM
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
(cherry picked from commit b521efd)
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-07-09 19:40:29 +01:00
372fa29ad3
take edge into consideration when moving focus region on arrow keys
...
fixes: >Pressing right when the caret is immediately left of some entity (pill, emojione emoji, etc..) causes the caret to jump to the left of the next entity (or end of the message if there are no more entities)
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
(cherry picked from commit 0982617)
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-07-09 19:40:20 +01:00
c6837af398
import-type Change from slate
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
(cherry picked from commit 85ed499)
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-07-09 19:40:00 +01:00
efdc5430d7
merge develop
2018-07-09 17:50:07 +01:00
e1ba6949d0
expand composer input focus region and apply cursor:text to it
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-23 16:40:53 +01:00
a6d9c25b70
Merge pull request #1988 from matrix-org/t3chguy/refactor_slashcommands
...
refactor, consolidate and improve SlashCommands
2018-06-20 13:56:29 +01:00
e67dae704a
Take replies out of labs!
2018-06-20 09:57:11 +01:00
85ddc0651b
consolidate the two locations commands are defined, as it was a MESS
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-18 19:34:40 +01:00
bea52eccf8
Remove unused import, constant
2018-06-18 17:40:48 +01:00
666d469222
Revert "Fix exception when opening dev tools"
2018-06-14 10:52:39 +01:00
b81e12e4cc
Fix exception when opening dev tools
...
Apparently draft sometimes gets unhappy when you try to move to the
end of an empty state, so only move to the end if we actually
created a non-empty state.
This will be irrelevant once https://github.com/matrix-org/matrix-react-sdk/pull/1890
is merged, but I have the fix now, and this is probably otherwise
going to annoy me now I'm doing things where devtools is very useful.
Fixes https://github.com/vector-im/riot-web/issues/6436
2018-06-13 16:55:16 +01:00
6299e188a4
unbreak keyboard shortcuts & ctrl-backspace
2018-05-26 02:11:20 +01:00
ab41212258
fix double-nested code blocks & bump md-serializer
2018-05-26 00:37:21 +01:00
864a33f978
switch to using 'code' for both blocks & marks to match md-serializer
2018-05-23 20:12:13 +01:00
b0ff61f7ef
switch code schema to match slate-md-serializer
2018-05-23 14:12:08 +01:00
fc1c4996fc
slate-md-serializer 3.1.0 now escapes correctly
2018-05-23 02:15:34 +01:00
6fba8311f9
escape blockquotes correctly
...
and fix NPE
2018-05-23 02:09:37 +01:00
794a60b9f8
refocus editor immediately after executing commands
...
and persist selections correctly across blur/focus
2018-05-23 01:36:21 +01:00
e7a4ffaf45
fix emojioneifying autoconverted emoji
2018-05-23 00:52:00 +01:00
cace5e8bfc
fix bug where selection breaks after inserting emoji
2018-05-23 00:41:46 +01:00
11cea61661
refocus editor after clicking on autocompletes
2018-05-21 12:28:08 +01:00
7de45f8b7b
make quoting work
2018-05-21 03:48:59 +01:00
b616fd025e
comment out all the tests for now
2018-05-20 23:34:06 +01:00
e460cf35e0
hide formatting bar for MD editor
2018-05-20 22:48:40 +01:00
f981d7b729
unify buttons on the node type names, and make them work
2018-05-20 22:39:40 +01:00
d799b7e424
refactor roundtripping into a single place
...
and fix isRichTextEnabled to be correctly camelCased everywhere...
2018-05-20 16:30:39 +01:00
aac6866779
switch back to using commonmark for serialising MD when roundtripping
...
and escape MD correctly when serialising via slate-md-serializer
2018-05-20 14:33:14 +01:00
e9cabf0e85
add pill and emoji serialisation to Md
2018-05-20 03:17:51 +01:00
a0d88a829d
support sending inlines from the RTE.
...
includes a horrific hack for sending emoji until
https://github.com/ianstormtaylor/slate/pull/1854 is merged
or otherwise solved
2018-05-20 02:53:32 +01:00
d76a2aba9b
use <p/> as our root node everywhere and fix blank roundtrip bug
2018-05-20 01:07:25 +01:00
c3a6a41e5d
support links in RTE
2018-05-20 00:49:29 +01:00
f2116943c8
switch schema to match the MD serializer
2018-05-20 00:17:11 +01:00
65f0b05719
fix typo
2018-05-19 23:40:22 +01:00
572a31334f
add h4, h5 and h6
2018-05-19 23:34:30 +01:00
1f05aea884
make HTML pasting work
2018-05-19 23:33:07 +01:00
1536ab433a
make file pasting work again
2018-05-19 22:05:31 +01:00
d426c3474f
fix strikethough & code, improve shift-return & backspace
2018-05-19 21:36:22 +01:00
58670cc3e5
exit list more sanely on backspace
2018-05-19 21:14:39 +01:00
a4d9338cf0
let backspace delete list nodes in RTE
2018-05-19 20:38:07 +01:00
167742d900
make RTE sending work
2018-05-19 20:28:38 +01:00
089ac337f4
remove unused html serializer
2018-05-18 15:22:24 +01:00
e51554c626
actually hook up RTE
2018-05-17 02:13:17 +01:00
ae208da805
nudge towards supporting formatting buttons in MD
2018-05-17 00:01:23 +01:00
4eb6942211
let onChange set originalEditorState
2018-05-15 01:16:06 +01:00
12a56e8b8e
remove spurious comment
2018-05-15 00:59:55 +01:00
c1000a7cd5
emojioneify the composer
...
and also fix up the selectedness CSS for pills and emoji
2018-05-14 03:02:12 +01:00
7ecb4e3b18
remove dead removeMDLinks code
2018-05-13 23:35:39 +01:00
7405b49b44
unify setState() and onChange()
...
also make emoji autocomplete work again
also remove the onInputContentChanged prop
also slateify the onInputStateChanged prop
2018-05-13 23:34:00 +01:00
a247ea2f77
delete duplicate propTypes(!!!)
2018-05-13 22:43:20 +01:00
ddfe0691c4
fix insert_mention
2018-05-13 22:41:39 +01:00
dd0726f068
fix navigating history downwards on tall messages; remove obsolete code
2018-05-13 21:17:43 +01:00
79f7c5d6ab
remove // support, as it never worked
...
if you want to escape a /, do it with \/ or just precede with a space
2018-05-13 03:29:56 +01:00
4c3588d260
don't lose focus after a / command
2018-05-13 03:26:22 +01:00
5605439e76
autocomplete polishing
...
* suppress autocomplete when navigating through history
* only search for slashcommands if in the first block of the editor
* handle suffix returns from providers correctly
* fix bugs when pressing ctrl-a, typing and then tab to complete a replacement by collapsing selection to anchor when inserting a completion in the editor
2018-05-13 03:17:14 +01:00
877a6195ae
unbreak history scrolling for pills & emoji
2018-05-13 00:54:01 +01:00
33eaa84bdf
fix NPEs when deleting mentions
2018-05-13 00:48:52 +01:00
c91dcffe82
fix cursor behaviour around pills
2018-05-13 00:40:54 +01:00
9c0c806af4
correctly send pills in messages
2018-05-12 20:04:58 +01:00
d7c2c8ba7b
include the plaintext representation of a pill within it
2018-05-12 16:21:36 +01:00
410a1683fe
make autocomplete selection work
2018-05-12 01:10:38 +01:00
8b2eb2c400
make history work again
2018-05-08 01:54:06 +01:00
ff42ef4a58
make it work for MD mode (modulo history)
2018-05-06 22:08:36 +01:00
190f6d9483
make slate actually work as a textarea
2018-05-06 15:27:27 +01:00
a2233a48c2
stub out yet more
2018-05-06 01:18:26 +01:00
05eba3fa32
stub out more until it loads...
2018-05-06 00:18:11 +01:00
f4ed820b6f
fix stubbing
2018-05-05 23:38:14 +01:00
e62e43def6
comment out more draft stuff
2018-05-05 23:25:04 +01:00
02947063d3
Merge branch 'develop' into matthew/slate
2018-05-05 22:45:44 +01:00
db55f87699
avoid `.done` and `.then` anti-pattern
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-05-01 18:14:35 +01:00
68dd57f56e
rename two methods
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-04-27 11:47:18 +01:00
75a2be1a8d
WIP (doesn't build yet) replacing draft with slate
2018-04-23 01:13:18 +01:00
f765db7d16
only clear reply_to_event if there was one to begin with
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-04-07 12:18:53 +01:00
9c2e3e25f0
clear reply_to_event at queue not send time
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-04-04 10:34:39 +01:00
0ed3563748
clear quoting event even on send fail, as then we can click retry
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-03-16 00:03:50 +01:00
14f29e4740
fix the bugs Tulir found - THANKS
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-03-09 23:37:42 +00:00
df56a67fda
Add reply fallback and run gen-i18n
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-03-04 12:39:34 +00:00
665ddccb0d
restrict to m.text for now
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-02-20 15:45:25 +00:00
90f9badbf3
s/Reply/ReplyThread/
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-02-20 15:40:19 +00:00
34b427d15e
s/quote_event/reply_to_event/
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-02-19 23:41:07 +00:00
fbb950e064
mass s/Quote/Reply
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-02-10 12:38:25 +00:00
1c3d8cbe6e
initial refactor of Replies to use `B` explicit over-the-wire format
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-02-10 11:19:43 +00:00
5764280588
Persist contentState when sending SlashCommand via MessageComposerInput
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-01-29 09:09:22 +00:00
23bd612730
Focus composer when clicking `Reply` (quote event)
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-01-11 19:29:00 +00:00
1bc9d344ae
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/nvl/rich_quoting
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
# Conflicts:
# src/components/views/messages/TextualBody.js
2018-01-10 11:54:58 +00:00
5aed77c752
Merge pull request #1677 from aidalgol/PropTypes
...
Remove use of deprecated React.PropTypes
2018-01-05 11:53:55 +00:00
2189fe9256
removed console.log
2018-01-03 01:52:02 +01:00
e543f55572
refactored code
2018-01-03 01:50:03 +01:00
36df3acf4d
Merge remote-tracking branch 'origin/develop' into fix_riot_web_4821
2018-01-02 23:07:47 +01:00
03f88df66e
Make the scrolling compatible with our riot-web fix for https://github.com/vector-im/riot-web/issues/4821
2018-01-02 22:44:18 +01:00
35780f5ae0
Remove use of deprecated React.PropTypes
...
Replace all uses of React.PropTypes with PropTypes and importing PropTypes from
'prop-types'.
2017-12-26 14:03:18 +13:00
5c229b9ef8
DRY matrix.to link generation so it is all changeable in one class
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-12-12 23:33:40 +00:00
4666ac7c83
hide rich quoting behind flags, retaining original quoting for now
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-12-12 23:29:43 +00:00
0f85391587
Implement Rich Quoting/Replies
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-12-10 12:50:41 +00:00
0d38e7510d
Merge pull request #1600 from matrix-org/dbkr/udd_no_auto_show
...
Don't Auto-show UnknownDeviceDialog
2017-12-08 16:33:25 +00:00
363fe04a10
isCtrlOrCmdKeyEvent -> isOnlyCtrlOrCmdKeyEvent
2017-12-01 10:44:00 +00:00
fe81fcb8c6
Factor out isCtrlOrCmdKeyEvent, use that in TagPanel
...
as opposed to the incorrect ctrl || meta
2017-12-01 10:30:49 +00:00
196eafdc7f
Merge remote-tracking branch 'origin/develop' into dbkr/udd_no_auto_show
2017-11-16 15:59:16 +00:00
dad797d4a2
Run linting --fix
2017-11-16 13:19:36 +00:00
f8fc6dc83e
Merge remote-tracking branch 'origin/develop' into dbkr/udd_no_auto_show
2017-11-15 12:11:33 +00:00
b1ec430523
Remove now-unused dispatches
2017-11-09 16:09:12 +00:00
289b0c2b6a
Merge branch 'develop' into travis/granular-settings
2017-11-07 14:55:12 -07:00
df5c6470e8
get dict syntax right
2017-11-06 22:01:23 +00:00
08d006d112
PR feedback
2017-11-06 17:15:09 +00:00
adc4290451
Pillify room notif pills in composer
2017-11-06 15:11:42 +00:00
8282534f87
Add SettingsLevel enum; Move settings to own file.
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-03 23:19:45 -06:00
893c39bfbe
Merge branch 'develop' into travis/granular-settings
2017-11-03 22:00:07 -06:00
498b117d5a
copyrights
2017-11-02 18:01:28 +00:00
4953d4de4d
Give autocomplete providers the room they're in
...
Removes the gut-wrenching that RoomView does to jam the user list
into the user autocomplete provider.
2017-11-02 17:51:08 +00:00
ae10a11ac4
Convert synced settings to granular settings
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-10-29 01:43:52 -06:00
d3f9a3aeb5
Run eslint --fix
...
Fixing 1000s of lint issues. Some rules cannot be `--fix`ed but this goes some way to linting the entire codebase.
2017-10-11 17:56:17 +01:00
d4929b558e
Add dummy translation function to mark translatable strings
...
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
2017-09-22 21:43:27 +02:00
8ed5422a45
Fix click to insert completion
...
And remedy weird API in the process. Autocomplete now exposes `onSelectionChange` to indicate that the user has selected another completion, rather than returning the chosen completion via onUpArrow etc.
Fixes vector-im/riot-web#4835
2017-08-23 16:22:14 +01:00
6b1b643d41
Merge branch 'develop' into luke/store-history-as-raw-content
2017-08-14 16:42:22 +01:00
9742962d61
preventDefault when moving autocomplete selection with vertical arrow
...
Otherwise the composer selection updates, in turn hiding the autocomplete box - fixes vector-im/riot-web#4790
2017-08-14 15:16:13 +01:00
41843f021d
don't track two more potential risks
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-08-10 15:21:01 +01:00
b19c1010aa
Merge branches 'develop' and 't3chguy/i18n_analytics' of github.com:matrix-org/matrix-react-sdk into t3chguy/i18n_analytics
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
# Conflicts:
# src/Analytics.js
2017-08-10 13:54:55 +01:00
24599ace32
don't track error messages
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-08-10 13:49:11 +01:00
b2fd4be166
Merge pull request #1289 from matrix-org/luke/fix-quote-innerText
...
Quote by taking the innerText of eventTiles
2017-08-10 10:35:49 +01:00
678c472b75
Quote by taking the innerText of eventTiles
...
because using `body` gives inconsistent results - sometimes it will contain markdown and sometimes not, and this may not correspond with the `formatted_body`.
TODO: Do quoting proper - using `in_response_to`.
2017-08-10 10:14:14 +01:00
390e77ee22
Merge pull request #1288 from matrix-org/luke/track-richtext-mode
...
Track whether the user has richtext mode enabled
2017-08-10 09:31:09 +01:00
fc6977e68d
Track RT mode once we've retrieved the setting from account data
2017-08-09 19:00:38 +01:00
e121440d05
Track whether the user has richtext mode enabled
2017-08-09 18:39:06 +01:00
2d47d3d2c3
Hide autocomplete when RTE selection state (cursor) changes
2017-08-09 17:36:35 +01:00
610b2a3a42
For mentions, always use rawDisplayName and remove (IRC)
2017-08-09 10:40:06 +01:00
503fa6a7b3
Always use message `body` when quoting
...
(not formatted_body)
This is because draft-js has regressed with a bug that causes some entities to not exist within a given ContentState - see vector-im/riot-web#4756
2017-08-08 14:59:56 +01:00
ca2273519d
Merge pull request #1277 from matrix-org/luke/feature-pills-hide-avatar-setting
...
Add optional setting for hiding avatars in <Pill>s
2017-08-08 14:01:34 +01:00
91a1cc4431
Mandate ctrl/meta ONLY for a subset of key bindings
...
Because by default dratf-js doesn't check that other modifiers are _not_ pressed.
2017-08-08 13:36:43 +01:00
b08d32371d
Add optional setting for hiding avatars in <Pill>s
...
As part of https://github.com/vector-im/riot-web/issues/4640#issuecomment-316659445
2017-08-08 11:13:29 +01:00
7018deee44
Fix ctrl+a, backspace toggling block format
...
Now it will delete the selected range (and not toggle the block format). Fixes vector-im/riot-web#4753
2017-08-07 17:16:42 +01:00
641fda0162
Adjust comment
2017-08-07 16:29:22 +01:00
d9d8f2055f
Allow default for ctrl+shift+b, ctrl+shift+u in RTE
...
fixes vector-im/riot-web#4750
2017-08-07 16:23:37 +01:00
a27eefd893
Fix a couple of more errors due to API changes
2017-08-03 15:20:44 +01:00
901cbf495d
Update decorator strategy API in accordance with recent changes to 0.11.0
...
See 590cdc6c54https://draftjs.org/docs/v0-10-api-migration.html
2017-08-03 12:02:29 +01:00
1d1cd5f691
Reflect API change for decorator strategy
2017-08-03 11:36:07 +01:00
fb5dc295aa
Reflect API change for getting an Entity
2017-08-03 11:29:26 +01:00
124795006c
Reflect API change for creating an Entity
2017-08-03 11:18:56 +01:00
7fcb8c5ff0
Merge pull request #1261 from matrix-org/luke/fix-agressive-emoji-auto-replace
...
Only auto-replace emoji following ^ or \s
2017-08-01 15:56:42 +01:00
438b63bee2
Only auto-replace emoji following ^ or \s
...
So as not to cause issues when typing e.g. `This is what was tested: ` (the "d:" used to be transformed into an emoji)
2017-08-01 14:26:30 +01:00
4bdaa15c47
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/i18n_analytics
2017-07-28 21:01:59 +01:00
8a5f2bf2ca
Interpret a `split-block` as format toggle for an empty block
...
(`split-block` is emitted when "return" is pressed)
part of fixing https://github.com/vector-im/riot-web/issues/4580
2017-07-28 14:46:57 +01:00
6cb8b12cda
Instead of inserting MD for completion, convert the Entity later
...
This makes sure that the length of the range for a completed Entity = the length of the text in the decoration, which apparently draftjs assumes when calculating selection state offsets.
Fixes https://github.com/vector-im/riot-web/issues/4666
2017-07-27 18:17:41 +01:00
bf98c0da7c
un-i18n Modal Analytics
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-07-27 17:19:18 +01:00
Michael Telatynski