Skip to content
This repository has been archived by the owner on Sep 11, 2024. It is now read-only.

T3chguy/slate cont2 #2049

Merged
merged 24 commits into from
Jul 16, 2018
Merged

T3chguy/slate cont2 #2049

merged 24 commits into from
Jul 16, 2018

Conversation

t3chguy
Copy link
Member

@t3chguy t3chguy commented Jul 9, 2018 •
edited
Loading

delta PR on top of #1890

t3chguy and others added 16 commits July 9, 2018 19:40
@t3chguy
import-type Change from slate
c6837af 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

(cherry picked from commit 85ed499)
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
@t3chguy
take edge into consideration when moving focus region on arrow keys
372fa29 
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>
@t3chguy
add rule to slate-md-serializer: make underlined and removed work for CM
483116f 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

(cherry picked from commit b521efd)
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
@t3chguy
remove debugger statement
faf17f0 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

(cherry picked from commit b6f7940)
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
@t3chguy
fix Control-Backspace after select-all
43204ea 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

(cherry picked from commit 0f32ec0)
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
@t3chguy
add missing import
5b74c61 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

(cherry picked from commit 47b6099)
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
@t3chguy
modify ComposerHistoryManager
5bd4104 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

(cherry picked from commit d139dd6)
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
@ara4n @t3chguy
pin slate to 0.33.4 to avoid ianstormtaylor/slate#1958
8665f10 
(cherry picked from commit 445faca)
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
@ara4n @t3chguy
add guide to slate's data formats and how we convert
83f2614 
(cherry picked from commit e7e4ee8)
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
@ara4n @t3chguy
apply review feedback from @lukebarnard1
021409a 
(cherry picked from commit 37d4bce)
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
@ara4n @t3chguy
unbreak modifier+space (e.g. emoji insert on macOS)
0d0934a 
(cherry picked from commit c490f87)
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
@t3chguy
delint
8bcb987 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
@ara4n
fix lint
51591a4
@t3chguy
navigateHistory only when at edges of document, to prevent Firefox bug
58301e5 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
@t3chguy
remove trailing spaces to make linter happy (no-trailing-spaces)
100ecfe 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
@t3chguy
fix fn call, fixes usage of SlashCommands
abbb69d 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
@t3chguy t3chguy force-pushed the t3chguy/slate_cont2 branch 2 times, most recently from 641dd42 to d277099 Compare July 11, 2018 08:40
@t3chguy
convert md<->rt if the stored editorState was in a different state
fd4f967 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
@t3chguy
workaround for tommoor/slate-md-serializer#14
c3aef6e 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
@t3chguy
fix MessageComposer not marking translatable strings. run gen-i18n
95909de 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
@t3chguy
hide autocomplete when moving caret to match existing behaviour
3e05bf1 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
@t3chguy
null-guard savedState since now we're accessing its props
b4bc09c 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
@t3chguy
specify alternate history storage key to prevent conflicts with draft
7405c5e 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
@t3chguy t3chguy requested a review from a team July 12, 2018 15:39
@t3chguy
re-hydrate Values which have been serialized into LocalStorage
59a14f2 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
dbkr
dbkr reviewed Jul 16, 2018
View reviewed changes
docs/slate-formats.md Outdated
* In RT mode, insert it straight into the editor as a fragment
* In MD mode, serialise it to an MD string via slate-md-serializer and then insert the string into the editor as a fragment.

The various scenarios and transitions could be drawn into a pretty diagram if one felt the urge, but hopefully the enough
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the above?

@dbkr dbkr merged commit eb497d4 into matthew/slate Jul 16, 2018
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@dbkr dbkr dbkr left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@t3chguy @dbkr @ara4n