From 22f5e534279b26cffbd390379630b6909152f852 Mon Sep 17 00:00:00 2001 From: Alex Stine Date: Thu, 7 May 2020 22:29:05 -0400 Subject: [PATCH 1/4] Test code --- packages/block-editor/src/components/writing-flow/index.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/block-editor/src/components/writing-flow/index.js b/packages/block-editor/src/components/writing-flow/index.js index 9d77ada45eba3..0285813b4a00d 100644 --- a/packages/block-editor/src/components/writing-flow/index.js +++ b/packages/block-editor/src/components/writing-flow/index.js @@ -478,6 +478,7 @@ export default function WritingFlow( { children } ) { if ( ! isNav ) { // Set immediately before the meta+a combination can be pressed. if ( isKeyboardEvent.primary( event ) ) { + console.log( 'the entirely selected just got executed.' ); entirelySelected.current = isEntirelySelected( target ); } @@ -547,11 +548,12 @@ export default function WritingFlow( { children } ) { ); if ( closestTabbable ) { - placeCaretAtVerticalEdge( + console.log( 'vertical edge selection' ); + /* placeCaretAtVerticalEdge( closestTabbable, isReverse, verticalRect.current - ); + );*/ event.preventDefault(); } } else if ( From c1283fe41bd7c4c65cf9e3ef2482d09c37c2f150 Mon Sep 17 00:00:00 2001 From: Alex Stine Date: Thu, 7 May 2020 23:12:47 -0400 Subject: [PATCH 2/4] Do not skip to another block on up/down arrow press. --- .../src/components/writing-flow/index.js | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/packages/block-editor/src/components/writing-flow/index.js b/packages/block-editor/src/components/writing-flow/index.js index 0285813b4a00d..f73de57435e8c 100644 --- a/packages/block-editor/src/components/writing-flow/index.js +++ b/packages/block-editor/src/components/writing-flow/index.js @@ -15,7 +15,6 @@ import { isTextField, isVerticalEdge, placeCaretAtHorizontalEdge, - placeCaretAtVerticalEdge, isEntirelySelected, } from '@wordpress/dom'; import { @@ -478,7 +477,6 @@ export default function WritingFlow( { children } ) { if ( ! isNav ) { // Set immediately before the meta+a combination can be pressed. if ( isKeyboardEvent.primary( event ) ) { - console.log( 'the entirely selected just got executed.' ); entirelySelected.current = isEntirelySelected( target ); } @@ -546,16 +544,6 @@ export default function WritingFlow( { children } ) { container.current, true ); - - if ( closestTabbable ) { - console.log( 'vertical edge selection' ); - /* placeCaretAtVerticalEdge( - closestTabbable, - isReverse, - verticalRect.current - );*/ - event.preventDefault(); - } } else if ( isHorizontal && getSelection().isCollapsed && From 7aef53734f6b15b58175007cc6c8fbd45ce1854c Mon Sep 17 00:00:00 2001 From: Alex Stine Date: Thu, 7 May 2020 23:21:09 -0400 Subject: [PATCH 3/4] Code cleanup. --- packages/block-editor/src/components/writing-flow/index.js | 7 ------- 1 file changed, 7 deletions(-) diff --git a/packages/block-editor/src/components/writing-flow/index.js b/packages/block-editor/src/components/writing-flow/index.js index f73de57435e8c..256ea14aef0cf 100644 --- a/packages/block-editor/src/components/writing-flow/index.js +++ b/packages/block-editor/src/components/writing-flow/index.js @@ -537,13 +537,6 @@ export default function WritingFlow( { children } ) { // Moving from block multi-selection to single block selection moveSelection( isReverse ); event.preventDefault(); - } else if ( isVertical && isVerticalEdge( target, isReverse ) ) { - const closestTabbable = getClosestTabbable( - target, - isReverse, - container.current, - true - ); } else if ( isHorizontal && getSelection().isCollapsed && From 9a1f0d34b9d2198b6537aba876ff082ead096e2b Mon Sep 17 00:00:00 2001 From: Alex Stine Date: Wed, 13 May 2020 15:20:49 -0400 Subject: [PATCH 4/4] Get rid of horizontal navigation. --- .../src/components/writing-flow/index.js | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/packages/block-editor/src/components/writing-flow/index.js b/packages/block-editor/src/components/writing-flow/index.js index 256ea14aef0cf..b358fa5331e27 100644 --- a/packages/block-editor/src/components/writing-flow/index.js +++ b/packages/block-editor/src/components/writing-flow/index.js @@ -537,18 +537,6 @@ export default function WritingFlow( { children } ) { // Moving from block multi-selection to single block selection moveSelection( isReverse ); event.preventDefault(); - } else if ( - isHorizontal && - getSelection().isCollapsed && - isHorizontalEdge( target, isReverseDir ) - ) { - const closestTabbable = getClosestTabbable( - target, - isReverseDir, - container.current - ); - placeCaretAtHorizontalEdge( closestTabbable, isReverseDir ); - event.preventDefault(); } }