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

Fix arrows navigation in the block more options menu #7480

Merged
merged 2 commits into from
Jul 5, 2018
Merged

Fix arrows navigation in the block more options menu #7480

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
57c5ee2
Fix arrows navigation in the block more options menu.
afercia Jun 22, 2018
c8f558f
Components: Remove deep prop from NavigableContainer
aduth Jun 26, 2018
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
9 changes: 0 additions & 9 deletions components/navigable-container/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,6 @@ A callback invoked when the menu navigates to one of its children passing the in
- Type: `Function`
- Required: No

### deep

A boolean to look for navigable children in the direct children or any descendant. True means that any descendant can be considered navigable, and false means only direct children are considered.

- Type: `Boolean`
- Required: No
- default: false


### cycle

A boolean which tells the component whether or not to cycle from the end back to the beginning and vice versa.
Expand Down
7 changes: 2 additions & 5 deletions components/navigable-container/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,9 @@ class NavigableContainer extends Component {
}

getFocusableContext( target ) {
const { deep = false, onlyBrowserTabstops } = this.props;
const { onlyBrowserTabstops } = this.props;
const finder = onlyBrowserTabstops ? focus.tabbable : focus.focusable;
const focusables = finder
.find( this.container )
.filter( ( node ) => deep || node.parentElement === this.container );
const focusables = finder.find( this.container );

const index = this.getFocusableIndex( focusables, target );
if ( index > -1 && target ) {
Expand Down Expand Up @@ -114,7 +112,6 @@ class NavigableContainer extends Component {
'eventToOffset',
'onNavigate',
'cycle',
'deep',
'onlyBrowserTabstops',
] ) }
onKeyDown={ this.onKeyDown }
Expand Down
218 changes: 7 additions & 211 deletions components/navigable-container/test/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,39 +45,6 @@ function fireKeyDown( container, keyCode, shiftKey ) {

describe( 'NavigableMenu', () => {
it( 'vertical: should navigate by up and down', () => {
let currentIndex = 0;
const wrapper = mount( (
<NavigableMenu onNavigate={ ( index ) => currentIndex = index }>
<button id="btn1">One</button>
<button id="btn2">Two</button>
<button id="btn3">Three</button>
</NavigableMenu >
) );

simulateVisible( wrapper, '*' );

const container = wrapper.find( 'div' );
wrapper.getDOMNode().querySelector( '#btn1' ).focus();

// Navigate options
function assertKeyDown( keyCode, expectedActiveIndex, expectedStop ) {
const interaction = fireKeyDown( container, keyCode );
expect( currentIndex ).toBe( expectedActiveIndex );
expect( interaction.stopped ).toBe( expectedStop );
}

assertKeyDown( DOWN, 1, true );
assertKeyDown( DOWN, 2, true );
assertKeyDown( DOWN, 0, true );
assertKeyDown( UP, 2, true );
assertKeyDown( UP, 1, true );
assertKeyDown( UP, 0, true );
assertKeyDown( LEFT, 0, false );
assertKeyDown( RIGHT, 0, false );
assertKeyDown( SPACE, 0, false );
} );

it( 'vertical: should navigate by up and down, and skip deep candidates', () => {
let currentIndex = 0;
const wrapper = mount( (
<NavigableMenu orientation="vertical" onNavigate={ ( index ) => currentIndex = index }>
Expand All @@ -87,43 +54,7 @@ describe( 'NavigableMenu', () => {
<span id="btn-deep" tabIndex="-1">Deep</span>
</span>
<span tabIndex="-1" id="btn3">Three</span>
</NavigableMenu >
) );

simulateVisible( wrapper, '*' );

const container = wrapper.find( 'div' );
wrapper.getDOMNode().querySelector( '#btn1' ).focus();

// Navigate options
function assertKeyDown( keyCode, expectedActiveIndex, expectedStop ) {
const interaction = fireKeyDown( container, keyCode, false );
expect( currentIndex ).toBe( expectedActiveIndex );
expect( interaction.stopped ).toBe( expectedStop );
}

assertKeyDown( DOWN, 1, true );
assertKeyDown( DOWN, 2, true );
assertKeyDown( DOWN, 0, true );
assertKeyDown( UP, 2, true );
assertKeyDown( UP, 1, true );
assertKeyDown( UP, 0, true );
assertKeyDown( LEFT, 0, false );
assertKeyDown( RIGHT, 0, false );
assertKeyDown( SPACE, 0, false );
} );

it( 'vertical: should navigate by up and down, and explore deep candidates', () => {
let currentIndex = 0;
const wrapper = mount( (
<NavigableMenu deep={ true } orientation="vertical" onNavigate={ ( index ) => currentIndex = index }>
<span tabIndex="-1" id="btn1">One</span>
<span tabIndex="-1" id="btn2">Two</span>
<span id="btn-deep-wrapper">
<span id="btn-deep" tabIndex="-1">Deep</span>
</span>
<span tabIndex="-1" id="btn3">Three</span>
</NavigableMenu >
</NavigableMenu>
) );

simulateVisible( wrapper, '*' );
Expand Down Expand Up @@ -158,7 +89,7 @@ describe( 'NavigableMenu', () => {
<span tabIndex="-1" id="btn1">One</span>
<span tabIndex="-1" id="btn2">Two</span>
<span tabIndex="-1" id="btn3">Three</span>
</NavigableMenu >
</NavigableMenu>
) );

simulateVisible( wrapper, '*' );
Expand Down Expand Up @@ -188,82 +119,13 @@ describe( 'NavigableMenu', () => {
let currentIndex = 0;
const wrapper = mount( (
<NavigableMenu orientation="horizontal" onNavigate={ ( index ) => currentIndex = index }>
<button id="btn1">One</button>
<button id="btn2">Two</button>
<button id="btn3">Three</button>
</NavigableMenu >
) );

simulateVisible( wrapper, '*' );

const container = wrapper.find( 'div' );
wrapper.getDOMNode().querySelector( '#btn1' ).focus();

// Navigate options
function assertKeyDown( keyCode, expectedActiveIndex, expectedStop ) {
const interaction = fireKeyDown( container, keyCode, false );
expect( currentIndex ).toBe( expectedActiveIndex );
expect( interaction.stopped ).toBe( expectedStop );
}

assertKeyDown( RIGHT, 1, true );
assertKeyDown( RIGHT, 2, true );
assertKeyDown( RIGHT, 0, true );
assertKeyDown( LEFT, 2, true );
assertKeyDown( LEFT, 1, true );
assertKeyDown( LEFT, 0, true );
assertKeyDown( UP, 0, false );
assertKeyDown( DOWN, 0, false );
assertKeyDown( SPACE, 0, false );
} );

it( 'horizontal: should navigate by left and right, and skip deep candidates', () => {
let currentIndex = 0;
const wrapper = mount( (
<NavigableMenu orientation="horizontal" onNavigate={ ( index ) => currentIndex = index }>
<span tabIndex="-1" id="btn1">One</span>
<span tabIndex="-1" id="btn2">Two</span>
<span id="btn-deep-wrapper">
<span id="btn-deep" tabIndex="-1">Deep</span>
</span>
<span tabIndex="-1" id="btn3">Three</span>
</NavigableMenu >
) );

simulateVisible( wrapper, '*' );

const container = wrapper.find( 'div' );
wrapper.getDOMNode().querySelector( '#btn1' ).focus();

// Navigate options
function assertKeyDown( keyCode, expectedActiveIndex, expectedStop ) {
const interaction = fireKeyDown( container, keyCode, false );
expect( currentIndex ).toBe( expectedActiveIndex );
expect( interaction.stopped ).toBe( expectedStop );
}

assertKeyDown( RIGHT, 1, true );
assertKeyDown( RIGHT, 2, true );
assertKeyDown( RIGHT, 0, true );
assertKeyDown( LEFT, 2, true );
assertKeyDown( LEFT, 1, true );
assertKeyDown( LEFT, 0, true );
assertKeyDown( UP, 0, false );
assertKeyDown( DOWN, 0, false );
assertKeyDown( SPACE, 0, false );
} );

it( 'horizontal: should navigate by left and right, and explore deep candidates', () => {
let currentIndex = 0;
const wrapper = mount( (
<NavigableMenu deep={ true } orientation="horizontal" onNavigate={ ( index ) => currentIndex = index }>
<span tabIndex="-1" id="btn1">One</span>
<span tabIndex="-1" id="btn2">Two</span>
<span id="btn-deep-wrapper">
<span id="btn-deep" tabIndex="-1">Deep</span>
</span>
<span tabIndex="-1" id="btn3">Three</span>
</NavigableMenu >
</NavigableMenu>
) );

simulateVisible( wrapper, '*' );
Expand Down Expand Up @@ -298,7 +160,7 @@ describe( 'NavigableMenu', () => {
<span tabIndex="-1" id="btn1">One</span>
<span tabIndex="-1" id="btn2">Two</span>
<span tabIndex="-1" id="btn3">Three</span>
</NavigableMenu >
</NavigableMenu>
) );

simulateVisible( wrapper, '*' );
Expand Down Expand Up @@ -331,7 +193,7 @@ describe( 'NavigableMenu', () => {
<button id="btn1">One</button>
<button id="btn2">Two</button>
<button id="btn3">Three</button>
</NavigableMenu >
</NavigableMenu>
) );

simulateVisible( wrapper, '*' );
Expand Down Expand Up @@ -367,79 +229,13 @@ describe( 'TabbableContainer', () => {
let currentIndex = 0;
const wrapper = mount( (
<TabbableContainer className="wrapper" onNavigate={ ( index ) => currentIndex = index }>
<div className="section" id="section1" tabIndex="0">Section One</div>
<div className="section" id="section2a" tabIndex="0">Section Two</div>
<div className="section" id="section2b" tabIndex="-1">Section to Skip</div>
<div className="section" id="section3" tabIndex="0">Section Three</div>
</TabbableContainer >
) );

simulateVisible( wrapper, '*' );

const container = wrapper.find( 'div.wrapper' );
wrapper.getDOMNode().querySelector( '#section1' ).focus();

// Navigate options
function assertKeyDown( keyCode, shiftKey, expectedActiveIndex, expectedStop ) {
const interaction = fireKeyDown( container, keyCode, shiftKey );
expect( currentIndex ).toBe( expectedActiveIndex );
expect( interaction.stopped ).toBe( expectedStop );
}

assertKeyDown( TAB, false, 1, true );
assertKeyDown( TAB, false, 2, true );
assertKeyDown( TAB, false, 0, true );
assertKeyDown( TAB, true, 2, true );
assertKeyDown( TAB, true, 1, true );
assertKeyDown( TAB, true, 0, true );
assertKeyDown( SPACE, false, 0, false );
} );

it( 'should navigate by keypresses and overlook deep candidates', () => {
let currentIndex = 0;
const wrapper = mount( (
<TabbableContainer className="wrapper" onNavigate={ ( index ) => currentIndex = index }>
<div className="section" id="section1" tabIndex="0">Section One</div>
<div className="section" id="section2" tabIndex="0">Section Two</div>
<div className="deep-section">
<div className="section" id="section-deep" tabIndex="0">Section to Skip</div>
</div>
<div className="section" id="section3" tabIndex="0">Section Three</div>
</TabbableContainer >
) );

simulateVisible( wrapper, '*' );

const container = wrapper.find( 'div.wrapper' );
wrapper.getDOMNode().querySelector( '#section1' ).focus();

// Navigate options
function assertKeyDown( keyCode, shiftKey, expectedActiveIndex, expectedStop ) {
const interaction = fireKeyDown( container, keyCode, shiftKey );
expect( currentIndex ).toBe( expectedActiveIndex );
expect( interaction.stopped ).toBe( expectedStop );
}

assertKeyDown( TAB, false, 1, true );
assertKeyDown( TAB, false, 2, true );
assertKeyDown( TAB, false, 0, true );
assertKeyDown( TAB, true, 2, true );
assertKeyDown( TAB, true, 1, true );
assertKeyDown( TAB, true, 0, true );
assertKeyDown( SPACE, false, 0, false );
} );

it( 'should navigate by keypresses and explore deep candidates', () => {
let currentIndex = 0;
const wrapper = mount( (
<TabbableContainer deep={ true } className="wrapper" onNavigate={ ( index ) => currentIndex = index }>
<div className="section" id="section1" tabIndex="0">Section One</div>
<div className="section" id="section2" tabIndex="0">Section Two</div>
<div className="deep-section-wrapper">
<div className="section" id="section-deep" tabIndex="0">Section to <strong>not</strong> skip</div>
</div>
<div className="section" id="section3" tabIndex="0">Section Three</div>
</TabbableContainer >
</TabbableContainer>
) );

simulateVisible( wrapper, '*' );
Expand Down Expand Up @@ -472,7 +268,7 @@ describe( 'TabbableContainer', () => {
<div className="section" id="section1" tabIndex="0">Section One</div>
<div className="section" id="section2" tabIndex="0">Section Two</div>
<div className="section" id="section3" tabIndex="0">Section Three</div>
</TabbableContainer >
</TabbableContainer>
) );

simulateVisible( wrapper, '*' );
Expand Down
2 changes: 1 addition & 1 deletion components/slot-fill/slot.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ class Slot extends Component {
} );

return (
<div ref={ this.bindNode }>
<div ref={ this.bindNode } role="presentation">
{ isFunction( children ) ? children( fills.filter( Boolean ) ) : fills }
</div>
);
Expand Down
Loading