Skip to content

Commit

Permalink
pass selectedTab?.mame instead of memoizing the full object
Browse files Browse the repository at this point in the history
  • Loading branch information
chad1008 committed Oct 20, 2022
1 parent f667804 commit d0a8bf4
Showing 1 changed file with 4 additions and 7 deletions.
11 changes: 4 additions & 7 deletions packages/components/src/tab-panel/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { find } from 'lodash';
/**
* WordPress dependencies
*/
import { useState, useEffect, useMemo } from '@wordpress/element';
import { useState, useEffect } from '@wordpress/element';
import { useInstanceId } from '@wordpress/compose';

/**
Expand Down Expand Up @@ -93,20 +93,17 @@ export function TabPanel( {
const onNavigate = ( _childIndex: number, child: HTMLButtonElement ) => {
child.click();
};
const selectedTab = useMemo(
() => find( tabs, { name: selected } ),
[ tabs, selected ]
);
const selectedTab = find( tabs, { name: selected } );
const selectedId = `${ instanceId }-${ selectedTab?.name ?? 'none' }`;

useEffect( () => {
if ( ! selectedTab ) {
if ( ! selectedTab?.name ) {
setSelected(
initialTabName ||
( tabs.length > 0 ? tabs[ 0 ].name : undefined )
);
}
}, [ tabs, selectedTab, initialTabName ] );
}, [ tabs, selectedTab?.name, initialTabName ] );

return (
<div className={ className }>
Expand Down

0 comments on commit d0a8bf4

Please sign in to comment.