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

Components: replace TabPanel with Tabs in the Block Inspector #56995

Merged
merged 4 commits into from Dec 19, 2023
Merged

Components: replace TabPanel with Tabs in the Block Inspector #56995

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fef65c8
implement `Tabs`
chad1008 Dec 12, 2023
92e0d6c
focusable false
chad1008 Dec 13, 2023
13d3bc8
add `show-icon-labels` support
chad1008 Dec 15, 2023
ac5468d
address feedback
chad1008 Dec 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
69 changes: 41 additions & 28 deletions packages/block-editor/src/components/inspector-controls-tabs/index.js
View file
Open in desktop
@@ -1,7 +1,10 @@
/**
* WordPress dependencies
*/
import { TabPanel } from '@wordpress/components';
import {
Button,
privateApis as componentsPrivateApis,
} from '@wordpress/components';

/**
* Internal dependencies
Expand All @@ -11,6 +14,9 @@ import SettingsTab from './settings-tab';
import StylesTab from './styles-tab';
import InspectorControls from '../inspector-controls';
import useIsListViewTabDisabled from './use-is-list-view-tab-disabled';
import { unlock } from '../../lock-unlock';

const { Tabs } = unlock( componentsPrivateApis );

export default function InspectorControlsTabs( {
blockName,
Expand All @@ -26,34 +32,41 @@ export default function InspectorControlsTabs( {
const initialTabName = ! useIsListViewTabDisabled( blockName )
? TAB_LIST_VIEW.name
: undefined;
return (
<TabPanel
className="block-editor-block-inspector__tabs"
tabs={ tabs }
initialTabName={ initialTabName }
key={ clientId }
>
{ ( tab ) => {
if ( tab.name === TAB_SETTINGS.name ) {
return (
<SettingsTab showAdvancedControls={ !! blockName } />
);
}

if ( tab.name === TAB_STYLES.name ) {
return (
<StylesTab
blockName={ blockName }
clientId={ clientId }
hasBlockStyles={ hasBlockStyles }
return (
<div className="block-editor-block-inspector__tabs">
<Tabs initialTabId={ initialTabName } key={ clientId }>
<Tabs.TabList>
{ tabs.map( ( tab ) => (
<Tabs.Tab
key={ tab.name }
tabId={ tab.name }
render={
<Button
aria-label={ tab.title }
chad1008 marked this conversation as resolved.
Show resolved Hide resolved
icon={ tab.icon }
label={ tab.title }
className={ tab.className }
showTooltip
chad1008 marked this conversation as resolved.
Show resolved Hide resolved
/>
}
/>
);
}

if ( tab.name === TAB_LIST_VIEW.name ) {
return <InspectorControls.Slot group="list" />;
}
} }
</TabPanel>
) ) }
</Tabs.TabList>
<Tabs.TabPanel tabId={ TAB_SETTINGS.name } focusable={ false }>
<SettingsTab showAdvancedControls={ !! blockName } />
</Tabs.TabPanel>
<Tabs.TabPanel tabId={ TAB_STYLES.name } focusable={ false }>
<StylesTab
blockName={ blockName }
clientId={ clientId }
hasBlockStyles={ hasBlockStyles }
/>
</Tabs.TabPanel>
<Tabs.TabPanel tabId={ TAB_LIST_VIEW.name } focusable={ false }>
<InspectorControls.Slot group="list" />
</Tabs.TabPanel>
</Tabs>
</div>
);
}
2 changes: 1 addition & 1 deletion packages/block-editor/src/components/inspector-controls-tabs/style.scss
View file
Open in desktop
@@ -1,5 +1,5 @@
.show-icon-labels {
.block-editor-block-inspector__tabs .components-tab-panel__tabs {
.block-editor-block-inspector__tabs [role="tablist"] {
.components-button.has-icon {
// Hide the button icons when labels are set to display...
svg {
Expand Down