Layout focus orchestration

.changeset/quick-guests-join.md

@@ -0,0 +1,5 @@
+---
+"apostrophe": minor
+---
+
+Fix layout widget not regaining full focus on switching back to Edit content mode.

packages/apostrophe/modules/@apostrophecms/area/ui/apos/components/AposAreaWidget.vue

@@ -536,6 +536,7 @@ export default {
     apos.bus.$on('widget-focus-parent', this.focusParent);
     apos.bus.$on('context-menu-toggled', this.getFocusForMenu);
     apos.bus.$on('suppress-focused-widget-controls', this.doSuppressWidgetControls);
+    apos.bus.$on('clear-focused-widget-control-suppression', this.clearSuppressionFlags);
 
     this.breadcrumbs.$lastEl = this.$el;
 
@@ -573,6 +574,7 @@ export default {
     // Remove the focus parent listener when unmounted
     apos.bus.$off('widget-focus-parent', this.focusParent);
     apos.bus.$off('suppress-focused-widget-controls', this.doSuppressWidgetControls);
+    apos.bus.$off('clear-focused-widget-control-suppression', this.clearSuppressionFlags);
     window.removeEventListener('scroll', this.stickyControlsScroll);
     window.removeEventListener('resize', this.stickyControlsResize);
     this.unregisterFromGraph();

packages/apostrophe/modules/@apostrophecms/layout-widget/ui/apos/components/AposAreaLayoutEditor.vue

@@ -259,6 +259,12 @@ export default {
         this.emphasizeGrid();
       } else {
         this.deEmphasizeGrid();
+        // Leaving layout mode: clear the control-suppression flag that was
+        // set on the focused widget when we entered layout mode. Without
+        // this the layout widget keeps `isSuppressingWidgetControls=true`
+        // and its side operation bar stays hidden even though it is the
+        // focused widget.
+        apos.bus.$emit('clear-focused-widget-control-suppression');
       }
     }
   },