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

Implement Tabs in widget editor settings #57886

Merged
merged 7 commits into from
Feb 2, 2024
Merged

Implement Tabs in widget editor settings #57886

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
228dc51
implement `Tabs`
chad1008 Jan 15, 2024
b8750c8
remove unnecessary styles
chad1008 Jan 15, 2024
f7730d0
fix the closed sidebar loop
chad1008 Jan 16, 2024
dd645ab
fix controlled mode props
chad1008 Jan 18, 2024
dbabce5
add comment
chad1008 Feb 1, 2024
6d62afc
implement feedback
chad1008 Feb 1, 2024
2d375e3
Remove unnecessary prop
ciampo Feb 2, 2024
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
239 changes: 138 additions & 101 deletions packages/edit-widgets/src/components/sidebar/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
/**
* External dependencies
*/
import classnames from 'classnames';

/**
* WordPress dependencies
*/
import { useEffect, Platform } from '@wordpress/element';
import { isRTL, __, sprintf } from '@wordpress/i18n';
import {
useEffect,
Platform,
useContext,
useCallback,
} from '@wordpress/element';
import { isRTL, __ } from '@wordpress/i18n';
import {
ComplementaryArea,
store as interfaceStore,
Expand All @@ -18,7 +18,7 @@ import {
} from '@wordpress/block-editor';

import { drawerLeft, drawerRight } from '@wordpress/icons';
import { Button } from '@wordpress/components';
import { privateApis as componentsPrivateApis } from '@wordpress/components';
import { useSelect, useDispatch } from '@wordpress/data';

const SIDEBAR_ACTIVE_BY_DEFAULT = Platform.select( {
Expand All @@ -37,32 +37,112 @@ const WIDGET_AREAS_IDENTIFIER = 'edit-widgets/block-areas';
*/
import WidgetAreas from './widget-areas';
import { store as editWidgetsStore } from '../../store';
import { unlock } from '../../lock-unlock';

const { Tabs } = unlock( componentsPrivateApis );

function ComplementaryAreaTab( { identifier, label, isActive } ) {
function SidebarHeader( { selectedWidgetAreaBlock } ) {
return (
<Tabs.TabList>
<Tabs.Tab tabId={ WIDGET_AREAS_IDENTIFIER }>
{ selectedWidgetAreaBlock
? selectedWidgetAreaBlock.attributes.name
: __( 'Widget Areas' ) }
</Tabs.Tab>
<Tabs.Tab tabId={ BLOCK_INSPECTOR_IDENTIFIER }>
{ __( 'Block' ) }
</Tabs.Tab>
</Tabs.TabList>
);
}

function SidebarContent( {
hasSelectedNonAreaBlock,
currentArea,
isGeneralSidebarOpen,
selectedWidgetAreaBlock,
} ) {
const { enableComplementaryArea } = useDispatch( interfaceStore );

useEffect( () => {
if (
hasSelectedNonAreaBlock &&
currentArea === WIDGET_AREAS_IDENTIFIER &&
isGeneralSidebarOpen
) {
enableComplementaryArea(
'core/edit-widgets',
BLOCK_INSPECTOR_IDENTIFIER
);
}
if (
! hasSelectedNonAreaBlock &&
currentArea === BLOCK_INSPECTOR_IDENTIFIER &&
isGeneralSidebarOpen
) {
enableComplementaryArea(
'core/edit-widgets',
WIDGET_AREAS_IDENTIFIER
);
}
// We're intentionally leaving `currentArea` and `isGeneralSidebarOpen`
// out of the dep array because we want this effect to run based on
// block selection changes, not sidebar state changes.
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [ hasSelectedNonAreaBlock, enableComplementaryArea ] );

const tabsContextValue = useContext( Tabs.Context );

return (
<Button
onClick={ () =>
enableComplementaryArea( editWidgetsStore.name, identifier )
}
className={ classnames( 'edit-widgets-sidebar__panel-tab', {
'is-active': isActive,
} ) }
aria-label={
isActive
? // translators: %s: sidebar label e.g: "Widget Areas".
sprintf( __( '%s (selected)' ), label )
: label
<ComplementaryArea
className="edit-widgets-sidebar"
header={
<Tabs.Context.Provider value={ tabsContextValue }>
<SidebarHeader
selectedWidgetAreaBlock={ selectedWidgetAreaBlock }
/>
</Tabs.Context.Provider>
}
data-label={ label }
headerClassName="edit-widgets-sidebar__panel-tabs"
/* translators: button label text should, if possible, be under 16 characters. */
title={ __( 'Settings' ) }
closeLabel={ __( 'Close Settings' ) }
scope="core/edit-widgets"
identifier={ currentArea }
icon={ isRTL() ? drawerLeft : drawerRight }
isActiveByDefault={ SIDEBAR_ACTIVE_BY_DEFAULT }
>
{ label }
</Button>
<Tabs.Context.Provider value={ tabsContextValue }>
<Tabs.TabPanel
tabId={ WIDGET_AREAS_IDENTIFIER }
focusable={ false }
>
<WidgetAreas
selectedWidgetAreaId={
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Noting that, compared to the previous code, the contents of the tab panels are now wrapped inside an additional div. At a quick glance, I didn't notice any side effects, though.

selectedWidgetAreaBlock?.attributes.id
}
/>
</Tabs.TabPanel>
<Tabs.TabPanel
tabId={ BLOCK_INSPECTOR_IDENTIFIER }
focusable={ false }
>
{ hasSelectedNonAreaBlock ? (
<BlockInspector />
) : (
// Pretend that Widget Areas are part of the UI by not
// showing the Block Inspector when one is selected.
<span className="block-editor-block-inspector__no-blocks">
{ __( 'No block selected.' ) }
</span>
) }
</Tabs.TabPanel>
</Tabs.Context.Provider>
</ComplementaryArea>
);
}

export default function Sidebar() {
const { enableComplementaryArea } = useDispatch( interfaceStore );
const {
currentArea,
hasSelectedNonAreaBlock,
Expand Down Expand Up @@ -110,84 +190,41 @@ export default function Sidebar() {
};
}, [] );

// currentArea, and isGeneralSidebarOpen are intentionally left out from the dependencies,
// because we want to run the effect when a block is selected/unselected and not when the sidebar state changes.
useEffect( () => {
if (
hasSelectedNonAreaBlock &&
currentArea === WIDGET_AREAS_IDENTIFIER &&
isGeneralSidebarOpen
) {
enableComplementaryArea(
'core/edit-widgets',
BLOCK_INSPECTOR_IDENTIFIER
);
}
if (
! hasSelectedNonAreaBlock &&
currentArea === BLOCK_INSPECTOR_IDENTIFIER &&
isGeneralSidebarOpen
) {
enableComplementaryArea(
'core/edit-widgets',
WIDGET_AREAS_IDENTIFIER
);
}
}, [ hasSelectedNonAreaBlock, enableComplementaryArea ] );
const { enableComplementaryArea } = useDispatch( interfaceStore );

return (
<ComplementaryArea
className="edit-widgets-sidebar"
header={
<ul>
<li>
<ComplementaryAreaTab
identifier={ WIDGET_AREAS_IDENTIFIER }
label={
selectedWidgetAreaBlock
? selectedWidgetAreaBlock.attributes.name
: __( 'Widget Areas' )
}
isActive={ currentArea === WIDGET_AREAS_IDENTIFIER }
/>
</li>
<li>
<ComplementaryAreaTab
identifier={ BLOCK_INSPECTOR_IDENTIFIER }
label={ __( 'Block' ) }
isActive={
currentArea === BLOCK_INSPECTOR_IDENTIFIER
}
/>
</li>
</ul>
// `newSelectedTabId` could technically be falsey if no tab is selected (i.e.
// the initial render) or when we don't want a tab displayed (i.e. the
// sidebar is closed). These cases should both be covered by the `!!` check
// below, so we shouldn't need any additional falsey handling.
const onTabSelect = useCallback(
( newSelectedTabId ) => {
if ( !! newSelectedTabId ) {
enableComplementaryArea(
chad1008 marked this conversation as resolved.
Show resolved Hide resolved
editWidgetsStore.name,
newSelectedTabId
);
}
headerClassName="edit-widgets-sidebar__panel-tabs"
/* translators: button label text should, if possible, be under 16 characters. */
title={ __( 'Settings' ) }
closeLabel={ __( 'Close Settings' ) }
scope="core/edit-widgets"
identifier={ currentArea }
icon={ isRTL() ? drawerLeft : drawerRight }
isActiveByDefault={ SIDEBAR_ACTIVE_BY_DEFAULT }
},
[ enableComplementaryArea ]
);

return (
<Tabs
// Due to how this component is controlled (via a value from the
// `interfaceStore`), when the sidebar closes the currently selected
// tab can't be found. This causes the component to continuously reset
// the selection to `null` in an infinite loop. Proactively setting
// the selected tab to `null` avoids that.
selectedTabId={ isGeneralSidebarOpen ? currentArea : null }
onSelect={ onTabSelect }
selectOnMove={ false }
>
{ currentArea === WIDGET_AREAS_IDENTIFIER && (
<WidgetAreas
selectedWidgetAreaId={
selectedWidgetAreaBlock?.attributes.id
}
/>
) }
{ currentArea === BLOCK_INSPECTOR_IDENTIFIER &&
( hasSelectedNonAreaBlock ? (
<BlockInspector />
) : (
// Pretend that Widget Areas are part of the UI by not
// showing the Block Inspector when one is selected.
<span className="block-editor-block-inspector__no-blocks">
{ __( 'No block selected.' ) }
</span>
) ) }
</ComplementaryArea>
<SidebarContent
hasSelectedNonAreaBlock={ hasSelectedNonAreaBlock }
currentArea={ currentArea }
isGeneralSidebarOpen={ isGeneralSidebarOpen }
selectedWidgetAreaBlock={ selectedWidgetAreaBlock }
/>
</Tabs>
);
}
94 changes: 0 additions & 94 deletions packages/edit-widgets/src/components/sidebar/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,99 +1,5 @@
.components-panel__header.edit-widgets-sidebar__panel-tabs {
justify-content: flex-start;
padding-left: 0;
padding-right: $grid-unit-05;
border-top: 0;
margin-top: 0;

ul {
display: flex;
}
li {
margin: 0;
}
.components-button.has-icon {
display: none;
margin-left: auto;

@include break-medium() {
display: flex;
}
}
}

// This tab style CSS is duplicated verbatim in
// /packages/components/src/tab-panel/style.scss
.components-button.edit-widgets-sidebar__panel-tab {
position: relative;
border-radius: 0;
height: $grid-unit-60;
background: transparent;
border: none;
box-shadow: none;
cursor: pointer;
padding: 3px $grid-unit-20; // Use padding to offset the is-active border, this benefits Windows High Contrast mode
margin-left: 0;
font-weight: 500;

&:focus:not(:disabled) {
position: relative;
box-shadow: none;
outline: none;
}

// Tab indicator
&::after {
content: "";
position: absolute;
right: 0;
bottom: 0;
left: 0;
pointer-events: none;

// Draw the indicator.
background: var(--wp-admin-theme-color);
height: calc(0 * var(--wp-admin-border-width-focus));
border-radius: 0;

// Animation
transition: all 0.1s linear;
@include reduce-motion("transition");
}

// Active.
&.is-active::after {
height: calc(1 * var(--wp-admin-border-width-focus));

// Windows high contrast mode.
outline: 2px solid transparent;
outline-offset: -1px;
}

// Focus.
&::before {
content: "";
position: absolute;
top: $grid-unit-15;
right: $grid-unit-15;
bottom: $grid-unit-15;
left: $grid-unit-15;
pointer-events: none;

// Draw the indicator.
box-shadow: 0 0 0 0 transparent;
border-radius: $radius-block-ui;

// Animation
transition: all 0.1s linear;
@include reduce-motion("transition");
}

&:focus-visible::before {
box-shadow: 0 0 0 var(--wp-admin-border-width-focus) var(--wp-admin-theme-color);

// Windows high contrast mode.
outline: 2px solid transparent;
}
}


Expand Down
Loading