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

List: use nested blocks #42711

Merged
merged 17 commits into from
Aug 24, 2022
Merged

List: use nested blocks #42711

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
24a232c
list: use nested blocks
ellatrix Aug 12, 2022
aa0dc92
Restore example
ellatrix Aug 12, 2022
b395901
Fix rebase
ellatrix Aug 13, 2022
87a0d51
Fix a few tests
ellatrix Aug 13, 2022
2901dcb
Fix list e2e tests
ellatrix Aug 13, 2022
a8bac56
Fix splitting merging e2e tests
ellatrix Aug 13, 2022
92f64bd
wip
ellatrix Aug 17, 2022
89619ef
Fix select all
ellatrix Aug 21, 2022
1b58454
Fix remaining list tests
ellatrix Aug 21, 2022
2efba02
Fix remaining tests
ellatrix Aug 21, 2022
a04be15
Remove obsolete snapshot
ellatrix Aug 21, 2022
e046d45
Fix rebase problem
ellatrix Aug 22, 2022
fea69e8
Restore type attribute
ellatrix Aug 22, 2022
8da58c0
Update integration tests for type attr
ellatrix Aug 23, 2022
f8963bc
Update lib/experimental/block-editor-settings-mobile.php
ellatrix Aug 23, 2022
64b8794
Restore anchor in raw transform
ellatrix Aug 23, 2022
30c6b5b
Work around e2e test issue
ellatrix Aug 24, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix select all
  • Loading branch information
@ellatrix @oandregal
ellatrix authored and oandregal committed Aug 24, 2022
commit 89619effa5c46bf8a7487bb646269b7eded57a1c
4 changes: 3 additions & 1 deletion packages/block-editor/src/components/block-list/use-block-props/use-focus-first-element.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,10 +85,12 @@ export function useFocusFirstElement( clientId ) {
const { ownerDocument } = ref.current;

// Do not focus the block if it already contains the active element.
if ( ref.current.contains( ownerDocument.activeElement ) ) {
if ( isInsideRootBlock( ref.current, ownerDocument.activeElement ) ) {
return;
}

ownerDocument.defaultView.getSelection().removeAllRanges();

// Find all tabbables within node.
const textInputs = focus.tabbable
.find( ref.current )
Expand Down
24 changes: 5 additions & 19 deletions packages/block-editor/src/components/writing-flow/use-select-all.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,34 +37,20 @@ export default function useSelectAll() {
return;
}

event.preventDefault();

const [ firstSelectedClientId ] = selectedClientIds;
const rootClientId = getBlockRootClientId( firstSelectedClientId );
let blockClientIds = getBlockOrder( rootClientId );
const blockClientIds = getBlockOrder( rootClientId );

// If we have selected all sibling nested blocks, try selecting up a
// level. See: https://github.com/WordPress/gutenberg/pull/31859/
if ( selectedClientIds.length === blockClientIds.length ) {
blockClientIds = getBlockOrder(
getBlockRootClientId( rootClientId )
);
}

const firstClientId = first( blockClientIds );
const lastClientId = last( blockClientIds );

event.preventDefault();

if ( firstClientId === lastClientId ) {
// If there's any selection remaining, the copy handler will
// only copy the native selection.
event.target.ownerDocument.defaultView
.getSelection()
.removeAllRanges();
selectBlock( firstClientId );
selectBlock( rootClientId );
return;
}

multiSelect( firstClientId, lastClientId );
multiSelect( first( blockClientIds ), last( blockClientIds ) );
}

node.addEventListener( 'keydown', onKeyDown );
Expand Down
20 changes: 16 additions & 4 deletions packages/e2e-tests/specs/editor/various/__snapshots__/rich-text.test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,12 +102,24 @@ exports[`RichText should only mutate text data on input 1`] = `

exports[`RichText should paste list contents into paragraph 1`] = `
"<!-- wp:list -->
<ul><li>1<ul><li>2</li></ul></li></ul>
<ul><!-- wp:list-item -->
<li>1<!-- wp:list -->
<ul><!-- wp:list-item -->
<li>2</li>
<!-- /wp:list-item --></ul>
<!-- /wp:list --></li>
<!-- /wp:list-item --></ul>
<!-- /wp:list -->

<!-- wp:paragraph -->
<p>1<br>2</p>
<!-- /wp:paragraph -->"
<!-- wp:list -->
<ul><!-- wp:list-item -->
<li>1<!-- wp:list -->
<ul><!-- wp:list-item -->
<li>2</li>
<!-- /wp:list-item --></ul>
<!-- /wp:list --></li>
<!-- /wp:list-item --></ul>
<!-- /wp:list -->"
`;

exports[`RichText should paste paragraph contents into list 1`] = `
Expand Down
5 changes: 3 additions & 2 deletions packages/e2e-tests/specs/editor/various/rich-text.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -479,12 +479,13 @@ describe( 'RichText', () => {
await pressKeyWithModifier( 'primary', 'a' );
// Select the parent list item.
await pressKeyWithModifier( 'primary', 'a' );
// Select all the parent list item text.
await pressKeyWithModifier( 'primary', 'a' );
// Select the entire list.
await pressKeyWithModifier( 'primary', 'a' );
await pressKeyWithModifier( 'primary', 'c' );

// Collapse the selection to the end.
await insertBlock( 'Paragraph' );
await page.keyboard.press( 'Enter' );

// Paste paragraph contents.
await pressKeyWithModifier( 'primary', 'v' );
Expand Down