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

Fix error triggered when a tab is removed from TabPanel component #23784

Merged
merged 2 commits into from
Jul 8, 2020
Merged

Fix error triggered when a tab is removed from TabPanel component #23784

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
3afd32f
Fix error triggered when a tab is removed from TabPanel component
youknowriad Jul 8, 2020
9cd5fe7
Fix unit tests
youknowriad Jul 8, 2020
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
18 changes: 12 additions & 6 deletions packages/components/src/tab-panel/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { partial, noop, find } from 'lodash';
/**
* WordPress dependencies
*/
import { useState } from '@wordpress/element';
import { useState, useEffect } from '@wordpress/element';
import { useInstanceId } from '@wordpress/compose';

/**
Expand Down Expand Up @@ -39,9 +39,7 @@ export default function TabPanel( {
onSelect = noop,
} ) {
const instanceId = useInstanceId( TabPanel, 'tab-panel' );
const [ selected, setSelected ] = useState(
initialTabName || ( tabs.length > 0 ? tabs[ 0 ].name : null )
);
const [ selected, setSelected ] = useState( null );

const handleClick = ( tabKey ) => {
setSelected( tabKey );
Expand All @@ -51,9 +49,17 @@ export default function TabPanel( {
const onNavigate = ( childIndex, child ) => {
child.click();
};

const selectedTab = find( tabs, { name: selected } );
const selectedId = `${ instanceId }-${ selectedTab.name }`;
const selectedId = `${ instanceId }-${ selectedTab?.name ?? 'none' }`;

useEffect( () => {
const newSelectedTab = find( tabs, { name: selected } );
if ( ! newSelectedTab ) {
setSelected(
initialTabName || ( tabs.length > 0 ? tabs[ 0 ].name : null )
);
}
}, [ tabs ] );

return (
<div className={ className }>
Expand Down
19 changes: 13 additions & 6 deletions packages/components/src/tab-panel/test/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,9 +74,12 @@ describe( 'TabPanel', () => {
},
};

const wrapper = TestUtils.renderIntoDocument(
getTestComponent( TabPanel, props )
);
let wrapper;
TestUtils.act( () => {
wrapper = TestUtils.renderIntoDocument(
getTestComponent( TabPanel, props )
);
} );

const alphaTab = getElementByClass( wrapper, 'alpha' );
const betaTab = getElementByClass( wrapper, 'beta' );
Expand Down Expand Up @@ -162,9 +165,13 @@ describe( 'TabPanel', () => {
);
},
};
const wrapper = TestUtils.renderIntoDocument(
getTestComponent( TabPanel, props )
);

let wrapper;
TestUtils.act( () => {
wrapper = TestUtils.renderIntoDocument(
getTestComponent( TabPanel, props )
);
} );

const getActiveTab = () => getElementByClass( wrapper, 'active-tab' );
expect( getActiveTab().innerHTML ).toBe( 'Beta' );
Expand Down