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

Sidebar Tabs: Stabilize the block inspector tabs experiment #47045

Merged
merged 14 commits into from
Jan 11, 2023
Merged

Sidebar Tabs: Stabilize the block inspector tabs experiment #47045

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
3d4c3db
Sidebar Tabs: Stabilize block inspector tabs experiment
aaronrobertshaw Jan 11, 2023
25bd202
Stabilize block inspector tabs editor setting
aaronrobertshaw Jan 11, 2023
afdc1f0
Rely on allow list to determine list tab should show
aaronrobertshaw Jan 11, 2023
983d6f6
Make linter happy
aaronrobertshaw Jan 11, 2023
f8d7d08
Make Nav list view tab dependent on off canvas experiment
aaronrobertshaw Jan 11, 2023
ccd0489
Fix block hierarchy navigation e2es
aaronrobertshaw Jan 11, 2023
dc5bfb4
Add playwright util to switch tabs
aaronrobertshaw Jan 11, 2023
aa0bdc3
Fix table e2es
aaronrobertshaw Jan 11, 2023
3759b22
Fix buttons e2es
aaronrobertshaw Jan 11, 2023
1eb8599
Fix push to global styles e2e
aaronrobertshaw Jan 11, 2023
80231a1
Try and fix avatar e2e
aaronrobertshaw Jan 11, 2023
e2db856
Fix hooks-api e2e
aaronrobertshaw Jan 11, 2023
9b2dffb
Fix avatar e2e (maybe...)
aaronrobertshaw Jan 11, 2023
175a868
Remove unwarranted check in playwright util
aaronrobertshaw Jan 11, 2023
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
12 changes: 6 additions & 6 deletions lib/experimental/class-wp-rest-block-editor-settings-controller.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,12 +168,6 @@ public function get_item_schema() {
'context' => array( 'mobile' ),
),

'__experimentalBlockInspectorTabs' => array(
'description' => __( 'Block inspector tab display overrides.', 'gutenberg' ),
'type' => 'object',
'context' => array( 'post-editor', 'site-editor', 'widgets-editor' ),
),

'__experimentalBlockInspectorAnimation' => array(
'description' => __( 'Whether to enable animation when showing and hiding the block inspector.', 'gutenberg' ),
'type' => 'object',
Expand Down Expand Up @@ -204,6 +198,12 @@ public function get_item_schema() {
'context' => array( 'post-editor', 'site-editor', 'widgets-editor' ),
),

'blockInspectorTabs' => array(
'description' => __( 'Block inspector tab display overrides.', 'gutenberg' ),
'type' => 'object',
'context' => array( 'post-editor', 'site-editor', 'widgets-editor' ),
),

'disableCustomColors' => array(
'description' => __( 'Disables custom colors.', 'gutenberg' ),
'type' => 'boolean',
Expand Down
3 changes: 0 additions & 3 deletions lib/experimental/editor-settings.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,9 +86,6 @@ function gutenberg_enable_experiments() {
if ( $gutenberg_experiments && array_key_exists( 'gutenberg-off-canvas-navigation-editor', $gutenberg_experiments ) ) {
wp_add_inline_script( 'wp-block-editor', 'window.__experimentalEnableOffCanvasNavigationEditor = true', 'before' );
}
if ( $gutenberg_experiments && array_key_exists( 'gutenberg-block-inspector-tabs', $gutenberg_experiments ) ) {
wp_add_inline_script( 'wp-block-editor', 'window.__experimentalEnableBlockInspectorTabs = true', 'before' );
}
if ( $gutenberg_experiments && array_key_exists( 'gutenberg-global-styles-custom-css', $gutenberg_experiments ) ) {
wp_add_inline_script( 'wp-block-editor', 'window.__experimentalEnableGlobalStylesCustomCSS = true', 'before' );
}
Expand Down
12 changes: 0 additions & 12 deletions lib/experiments-page.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,18 +77,6 @@ function gutenberg_initialize_experiments_settings() {
)
);

add_settings_field(
'gutenberg-block-inspector-tabs',
__( 'Block inspector tabs ', 'gutenberg' ),
'gutenberg_display_experiment_field',
'gutenberg-experiments',
'gutenberg_experiments_section',
array(
'label' => __( 'Test a new block inspector view splitting settings and appearance controls into tabs', 'gutenberg' ),
'id' => 'gutenberg-block-inspector-tabs',
)
);

add_settings_field(
'gutenberg-global-styles-custom-css',
__( 'Global styles custom css ', 'gutenberg' ),
Expand Down
13 changes: 2 additions & 11 deletions packages/block-editor/src/components/inspector-controls-tabs/use-inspector-controls-tabs.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,6 @@ import { store as blockEditorStore } from '../../store';
const EMPTY_ARRAY = [];

function getShowTabs( blockName, tabSettings = {} ) {
// Don't allow settings to force the display of tabs if the block inspector
// tabs experiment hasn't been opted into.
if ( ! window?.__experimentalEnableBlockInspectorTabs ) {
return false;
}

// Block specific setting takes precedence over generic default.
if ( tabSettings[ blockName ] !== undefined ) {
return tabSettings[ blockName ];
Expand All @@ -42,16 +36,14 @@ export default function useInspectorControlsTabs( blockName ) {
color: colorGroup,
default: defaultGroup,
dimensions: dimensionsGroup,
list: listGroup,
position: positionGroup,
typography: typographyGroup,
} = InspectorControlsGroups;

// List View Tab: If there are any fills for the list group add that tab.
const listViewDisabled = useIsListViewTabDisabled( blockName );
const listFills = useSlotFills( listGroup.Slot.__unstableName );

if ( ! listViewDisabled && !! listFills && listFills.length ) {
if ( ! listViewDisabled ) {
aaronrobertshaw marked this conversation as resolved.
Show resolved Hide resolved
tabs.push( TAB_LIST_VIEW );
}

Expand Down Expand Up @@ -81,8 +73,7 @@ export default function useInspectorControlsTabs( blockName ) {
}

const tabSettings = useSelect( ( select ) => {
return select( blockEditorStore ).getSettings()
.__experimentalBlockInspectorTabs;
return select( blockEditorStore ).getSettings().blockInspectorTabs;
}, [] );

const showTabs = getShowTabs( blockName, tabSettings );
Expand Down
4 changes: 2 additions & 2 deletions packages/block-library/src/navigation-link/index.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -390,11 +390,11 @@ function register_block_core_navigation_link() {
function gutenberg_disable_tabs_for_navigation_link_block( $settings ) {
$current_tab_settings = _wp_array_get(
$settings,
array( '__experimentalBlockInspectorTabs' ),
array( 'blockInspectorTabs' ),
array()
);

$settings['__experimentalBlockInspectorTabs'] = array_merge(
$settings['blockInspectorTabs'] = array_merge(
$current_tab_settings,
array( 'core/navigation-link' => false )
);
Expand Down
4 changes: 2 additions & 2 deletions packages/block-library/src/navigation-submenu/index.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -308,11 +308,11 @@ function register_block_core_navigation_submenu() {
function gutenberg_disable_tabs_for_navigation_submenu_block( $settings ) {
$current_tab_settings = _wp_array_get(
$settings,
array( '__experimentalBlockInspectorTabs' ),
array( 'blockInspectorTabs' ),
array()
);

$settings['__experimentalBlockInspectorTabs'] = array_merge(
$settings['blockInspectorTabs'] = array_merge(
$current_tab_settings,
array( 'core/navigation-submenu' => false )
);
Expand Down
5 changes: 1 addition & 4 deletions packages/block-library/src/navigation/edit/menu-inspector-controls.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,12 +125,9 @@ const DefaultControls = ( props ) => {
const MenuInspectorControls = ( props ) => {
const isOffCanvasNavigationEditorEnabled =
window?.__experimentalEnableOffCanvasNavigationEditor === true;
const menuControlsSlot = window?.__experimentalEnableBlockInspectorTabs
? 'list'
: undefined;

return (
<InspectorControls __experimentalGroup={ menuControlsSlot }>
<InspectorControls __experimentalGroup="list">
aaronrobertshaw marked this conversation as resolved.
Show resolved Hide resolved
<PanelBody
title={
isOffCanvasNavigationEditorEnabled ? null : __( 'Menu' )
Expand Down
2 changes: 1 addition & 1 deletion packages/editor/src/components/provider/use-block-editor-settings.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,14 +135,14 @@ function useBlockEditorSettings( settings, hasTemplate ) {
Object.entries( settings ).filter( ( [ key ] ) =>
[
'__experimentalBlockDirectory',
'__experimentalBlockInspectorTabs',
'__experimentalDiscussionSettings',
'__experimentalFeatures',
'__experimentalPreferredStyleVariations',
'__experimentalSetIsInserterOpened',
'__unstableGalleryWithImageBlocks',
'alignWide',
'allowedBlockTypes',
'blockInspectorTabs',
'bodyPlaceholder',
'canLockBlocks',
'codeEditingEnabled',
Expand Down