Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 0 additions & 3 deletions lib/experimental/editor-settings.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,6 @@ function gutenberg_enable_experiments() {
if ( gutenberg_is_experiment_enabled( 'gutenberg-dataviews-media-modal' ) ) {
wp_add_inline_script( 'wp-block-editor', 'window.__experimentalDataViewsMediaModal = true', 'before' );
}
if ( gutenberg_is_experiment_enabled( 'gutenberg-content-only-inspector-fields' ) ) {
wp_add_inline_script( 'wp-block-editor', 'window.__experimentalContentOnlyInspectorFields = true', 'before' );
}
if ( gutenberg_is_experiment_enabled( 'gutenberg-extensible-site-editor' ) ) {
wp_add_inline_script( 'wp-block-editor', 'window.__experimentalExtensibleSiteEditor = true', 'before' );
}
Expand Down
5 changes: 0 additions & 5 deletions lib/experimental/experiments/load.php
Original file line number Diff line number Diff line change
Expand Up @@ -56,11 +56,6 @@ function gutenberg_initialize_experiments_settings() {
'slug' => 'data-views',
'label' => _x( 'Data Views', 'experiments group name', 'gutenberg' ),
'items' => array(
array(
'id' => 'gutenberg-content-only-inspector-fields',
'label' => __( 'Block fields: Show dataform driven inspector fields on blocks that support them', 'gutenberg' ),
'description' => __( 'Enables editable block inspector fields that are generated using a dataform.', 'gutenberg' ),
),
array(
'id' => 'gutenberg-dataform-inspector',
'label' => __( 'Editor Inspector: Use DataForm', 'gutenberg' ),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,21 +11,14 @@ const ContentTab = ( {
return null;
}

const shouldShowBlockFields =
window?.__experimentalContentOnlyInspectorFields;

return (
<>
{ ! shouldShowBlockFields && (
<PanelBody title={ __( 'Content' ) }>
<BlockQuickNavigation
clientIds={ contentClientIds }
onSwitchToListView={ onSwitchToListView }
hasListViewTab={ hasListViewTab }
/>
</PanelBody>
) }
</>
<PanelBody title={ __( 'Content' ) }>
<BlockQuickNavigation
clientIds={ contentClientIds }
onSwitchToListView={ onSwitchToListView }
hasListViewTab={ hasListViewTab }
/>
</PanelBody>
);
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -79,14 +79,7 @@ export default function useInspectorControlsTabs(
...( hasListFills && hasStyleFills > 1 ? advancedFills : [] ),
];

// When the block fields experiment is active, only rely on `hasContentFills`
// to determine whether the content tab to be shown. The tab purely uses slot
// fills in this situation.
const shouldShowBlockFields =
window?.__experimentalContentOnlyInspectorFields;
const hasContentTab =
hasContentFills ||
( ! shouldShowBlockFields && contentClientIds?.length );
const hasContentTab = hasContentFills || contentClientIds?.length;

if ( hasContentTab ) {
tabs.push( TAB_CONTENT );
Expand Down

This file was deleted.

Loading
Loading