Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Record selection changes in history (undo) #17824

Merged
merged 4 commits into from
Nov 20, 2019
Merged

Record selection changes in history (undo) #17824

merged 4 commits into from
Nov 20, 2019

Conversation

ellatrix
Copy link
Member

@ellatrix ellatrix commented Oct 7, 2019 •
edited
Loading

Description

Same as #16428, but adjusted after #16932.

Stores selection in the undo reducer. The following gif shows the result after two times undo:

undo-selection

How has this been tested?

Screenshots

Types of changes

Checklist:

  • My code is tested.
  • My code follows the WordPress code style.
  • My code follows the accessibility standards.
  • My code has proper inline documentation.
  • I've included developer documentation if appropriate.

@ellatrix ellatrix mentioned this pull request Oct 7, 2019
Closed
5 tasks
@ellatrix ellatrix force-pushed the try/blocks-selection-history-2 branch from 36c3145 to 1057917 Compare October 8, 2019 09:50
@ellatrix ellatrix marked this pull request as ready for review October 8, 2019 12:14
@ellatrix ellatrix added [Package] Block editor /packages/block-editor [Package] Editor /packages/editor [Package] Rich text /packages/rich-text [Feature] History History, undo, redo, revisions, autosave. labels Oct 8, 2019
@ellatrix ellatrix added this to the Gutenberg 6.7 milestone Oct 8, 2019
@ellatrix ellatrix requested review from epiqueras and mcsf October 8, 2019 13:19
epiqueras
epiqueras reviewed Oct 8, 2019
View reviewed changes
Copy link
Contributor

@epiqueras epiqueras left a comment

Choose a reason for hiding this comment

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

Great work! I just have one question, otherwise it looks perfect.

packages/block-editor/src/components/provider/index.js Show resolved Hide resolved
epiqueras
epiqueras reviewed Oct 8, 2019
View reviewed changes
packages/e2e-tests/specs/undo.test.js Outdated
@@ -84,54 +141,121 @@ describe( 'undo', () => {
await pressKeyWithModifier( 'primary', 'z' ); // Undo 3rd paragraph text.

expect( await getEditedPostContent() ).toBe( thirdBlock );
Copy link
Contributor

Choose a reason for hiding this comment

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

We should add a check before the first undo here.

Copy link
Member Author

Choose a reason for hiding this comment

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

It should be enough to only test selection after undo right? After typing, we already know for sure where the selection is.

Copy link
Contributor

Choose a reason for hiding this comment

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

After typing, we already know for sure where the selection is.

It wouldn't hurt to verify that it synced correctly.

@ellatrix ellatrix mentioned this pull request Oct 14, 2019
Closed
@ellatrix ellatrix force-pushed the try/blocks-selection-history-2 branch from ffebda8 to 63de0ad Compare October 14, 2019 13:54
@ellatrix
Copy link
Member Author

Unsure why one of the selection tests is failing. Need to have another look into it.

@ellatrix ellatrix modified the milestones: Gutenberg 6.7, Gutenberg 6.8 Oct 23, 2019
@ellatrix ellatrix added this to the Gutenberg 6.9 milestone Oct 28, 2019
@epiqueras epiqueras mentioned this pull request Nov 7, 2019
Closed
4 tasks
@aduth aduth modified the milestones: Gutenberg 6.9, Gutenberg 7.0 Nov 11, 2019
@ellatrix ellatrix mentioned this pull request Nov 15, 2019
Merged
6 tasks
@ellatrix ellatrix force-pushed the try/blocks-selection-history-2 branch from 63de0ad to 6e47e7a Compare November 18, 2019 15:01
@ellatrix
Copy link
Member Author

Rebased the PR and fixed the e2e test failure (caused by a miscalculation). @epiqueras would you be up for having another look?

@ellatrix ellatrix requested a review from epiqueras November 18, 2019 22:14
epiqueras
epiqueras approved these changes Nov 19, 2019
View reviewed changes
Copy link
Contributor

@epiqueras epiqueras left a comment

Choose a reason for hiding this comment

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

This is looking great.

Not a blocker, but I think we could do with some "multi-selection" test cases.

@ellatrix
Copy link
Member Author

Multi selection + undo/redo tests don't seem trivial to add since it doesn't seem to be fully working. It resets to a collapsed range. I think I'd prefer to merge this as is now, and polish the behaviour with follow up PRs. The PR in its current form is already many times better than the current behaviour in master.

@epiqueras
Copy link
Contributor

Sounds good.

@epiqueras epiqueras merged commit 6c4b5e5 into master Nov 20, 2019
@epiqueras epiqueras deleted the try/blocks-selection-history-2 branch November 20, 2019 17:09
@ellatrix
Copy link
Member Author

Thanks for the review @epiqueras!

@youknowriad
Copy link
Contributor

Did we check what issues can be closed with this. I think we might have a few of these.

@ellatrix ellatrix mentioned this pull request Nov 25, 2019
Closed
@ellatrix
Copy link
Member Author

@youknowriad I only found #12327.

@youknowriad
Copy link
Contributor

Interesting, I'm pretty sure I saw issues about the caret not restored to the right position on undo. We'll find them in triage sessions anyway.

@romainmenke romainmenke mentioned this pull request Sep 21, 2020
Closed
5 tasks
@dependabot dependabot bot mentioned this pull request Mar 8, 2021
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@epiqueras epiqueras epiqueras approved these changes

@ajitbohra ajitbohra Awaiting requested review from ajitbohra

@chrisvanpatten chrisvanpatten Awaiting requested review from chrisvanpatten

@daniloercoli daniloercoli Awaiting requested review from daniloercoli

@etoledom etoledom Awaiting requested review from etoledom

@gziolo gziolo Awaiting requested review from gziolo

@jorgefilipecosta jorgefilipecosta Awaiting requested review from jorgefilipecosta

@mkaz mkaz Awaiting requested review from mkaz

@nerrad nerrad Awaiting requested review from nerrad

@ntwb ntwb Awaiting requested review from ntwb

@SergioEstevao SergioEstevao Awaiting requested review from SergioEstevao

@talldan talldan Awaiting requested review from talldan

@youknowriad youknowriad Awaiting requested review from youknowriad

@mcsf mcsf Awaiting requested review from mcsf

Assignees
No one assigned
Labels
[Feature] History History, undo, redo, revisions, autosave. [Package] Block editor /packages/block-editor [Package] Editor /packages/editor [Package] Rich text /packages/rich-text
Projects
None yet
Milestone
Gutenberg 7.0
Development

Successfully merging this pull request may close these issues.
4 participants
@ellatrix @epiqueras @youknowriad @aduth