From 780be4296ab9fc6418b2d3df43be658c2d477c07 Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Sat, 28 Aug 2021 01:24:13 +0000 Subject: [PATCH] Customize: Prevent collapsing expanded panel/section/control when `Esc` is pressed on a block editor instance. This ensures that the current panel is not collapsed when hitting `Esc` with the focus on the widget block editor. Follow-up to [37347], [39120]. Props gwwar, dlh. Fixes #54030. git-svn-id: https://develop.svn.wordpress.org/trunk@51682 602fd350-edb4-49c9-b593-d223f7449a82 --- src/js/_enqueues/wp/customize/controls.js | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/js/_enqueues/wp/customize/controls.js b/src/js/_enqueues/wp/customize/controls.js index 0496435e42..5656b41687 100644 --- a/src/js/_enqueues/wp/customize/controls.js +++ b/src/js/_enqueues/wp/customize/controls.js @@ -8461,6 +8461,13 @@ return; } + // Abort if we're inside of a block editor instance. + if ( event.target.closest( '.block-editor-writing-flow' ) !== null + || event.target.closest( '.block-editor-block-list__block-popover' ) !== null + ) { + return; + } + // Check for expanded expandable controls (e.g. widgets and nav menus items), sections, and panels. api.control.each( function( control ) { if ( control.expanded && control.expanded() && _.isFunction( control.collapse ) ) {