Skip to content

Fix inserting button block when pressing enter in a block with bound text attribute #59361

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

Merged
SantosGuillamot merged 14 commits into from
Mar 1, 2024
Merged

Fix inserting button block when pressing enter in a block with bound text attribute #59361

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
f2ac84d
Add tabindex 0 to all disabled elements in rich text
SantosGuillamot Mar 1, 2024
1c730c4
Insert block when use enter in disabled rich text
SantosGuillamot Mar 1, 2024
83037ed
Take default block into account
SantosGuillamot Mar 1, 2024
11d471f
Add e2e tests when pressing enter in bound blocks
SantosGuillamot Mar 1, 2024
50b8be9
Revert initial implementation
SantosGuillamot Mar 1, 2024
68ddf58
Use `insertAfterBlock` instead of `insertDefaultBlock`.
SantosGuillamot Mar 1, 2024
7c0ad6f
Remove unnecessary `insertDefaultBlock`
SantosGuillamot Mar 1, 2024
feb7bb0
Destructure innerBlocks array in tests
SantosGuillamot Mar 1, 2024
5747b7f
Prettify tests
SantosGuillamot Mar 1, 2024
4b7d66a
Remove unnecessary select in tests
SantosGuillamot Mar 1, 2024
d93e586
Destructuring blocks in tests
SantosGuillamot Mar 1, 2024
09f67bf
Revert "Remove unnecessary select in tests"
SantosGuillamot Mar 1, 2024
290273c
Remove unnecessary select in tests
SantosGuillamot Mar 1, 2024
6bbe7a9
Adapt tests to latest changes
SantosGuillamot Mar 1, 2024
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
10 changes: 3 additions & 7 deletions ...ock-editor/src/components/block-list/use-block-props/use-selected-block-event-handlers.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import { store as blockEditorStore } from '../../../store';
export function useEventHandlers( { clientId, isSelected } ) {
const { getBlockRootClientId, getBlockIndex } =
useSelect( blockEditorStore );
const { insertDefaultBlock, removeBlock } = useDispatch( blockEditorStore );
const { insertAfterBlock, removeBlock } = useDispatch( blockEditorStore );

return useRefEffect(
( node ) => {
Expand Down Expand Up @@ -57,11 +57,7 @@ export function useEventHandlers( { clientId, isSelected } ) {
event.preventDefault();

if ( keyCode === ENTER ) {
insertDefaultBlock(
{},
getBlockRootClientId( clientId ),
getBlockIndex( clientId ) + 1
);
insertAfterBlock( clientId );
} else {
removeBlock( clientId );
}
Expand Down Expand Up @@ -90,7 +86,7 @@ export function useEventHandlers( { clientId, isSelected } ) {
isSelected,
getBlockRootClientId,
getBlockIndex,
insertDefaultBlock,
insertAfterBlock,
removeBlock,
]
);
Expand Down
Loading