Skip to content

Lightbox UI appearing with interactivity experiment disabled #51025

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

Merged
merged 2 commits into from
May 29, 2023
Merged

Lightbox UI appearing with interactivity experiment disabled #51025

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
775543c
Fix lightbox ui appearing with interactivity experiment disabled
cbravobernal May 26, 2023
db6c878
Update e2e tests to enable the experiment
cbravobernal May 26, 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
3 changes: 3 additions & 0 deletions lib/experimental/editor-settings.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,9 @@ function gutenberg_enable_experiments() {
if ( $gutenberg_experiments && array_key_exists( 'gutenberg-pattern-enhancements', $gutenberg_experiments ) ) {
wp_add_inline_script( 'wp-block-editor', 'window.__experimentalEnablePatternEnhancements = true', 'before' );
}
if ( $gutenberg_experiments && array_key_exists( 'gutenberg-interactivity-api-core-blocks', $gutenberg_experiments ) ) {
wp_add_inline_script( 'wp-block-editor', 'window.__experimentalInteractivityAPI = true', 'before' );
}

}

Expand Down
13 changes: 7 additions & 6 deletions packages/block-editor/src/hooks/behaviors.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ export const withBehaviors = createHigherOrderComponent( ( BlockEdit ) => {
const settings =
select( blockEditorStore ).getSettings()?.__experimentalFeatures
?.blocks?.[ props.name ]?.behaviors;

if (
! settings ||
// If every behavior is disabled, do not show the behaviors inspector control.
Expand Down Expand Up @@ -102,8 +101,10 @@ export const withBehaviors = createHigherOrderComponent( ( BlockEdit ) => {
};
}, 'withBehaviors' );

addFilter(
'editor.BlockEdit',
'core/behaviors/with-inspector-control',
withBehaviors
);
if ( window?.__experimentalInteractivityAPI ) {
addFilter(
'editor.BlockEdit',
'core/behaviors/with-inspector-control',
withBehaviors
);
}
25 changes: 24 additions & 1 deletion test/e2e/specs/editor/various/behaviors.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,32 @@ test.describe( 'Testing behaviors functionality', () => {
await requestUtils.activateTheme( 'twentytwentyone' );
await requestUtils.deleteAllPosts();
} );
test.beforeEach( async ( { admin, page, requestUtils } ) => {
await requestUtils.deleteAllMedia();
await admin.visitAdminPage(
'/admin.php',
'page=gutenberg-experiments'
);

await page
.locator( `#gutenberg-interactivity-api-core-blocks` )
.setChecked( true );
await page.locator( `input[name="submit"]` ).click();
await page.waitForLoadState();
} );

test.afterEach( async ( { requestUtils } ) => {
test.afterEach( async ( { admin, page, requestUtils } ) => {
await requestUtils.deleteAllMedia();
await admin.visitAdminPage(
'/admin.php',
'page=gutenberg-experiments'
);

await page
.locator( `#gutenberg-interactivity-api-core-blocks` )
.setChecked( false );
await page.locator( `input[name="submit"]` ).click();
await page.waitForLoadState();
} );

test( '`No Behaviors` should be the default as defined in the core theme.json', async ( {
Expand Down