Interface: don't persist default complementary area on load

WordPress · Dec 3, 2024 · ba8f57f · ba8f57f
1 parent 9addc70
commit ba8f57f
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 16 deletions.
diff --git a/packages/interface/src/components/complementary-area/index.js b/packages/interface/src/components/complementary-area/index.js
@@ -243,10 +243,13 @@ function ComplementaryArea( {
 	useEffect( () => {
 		// Set initial visibility: For large screens, enable if it's active by
 		// default. For small screens, always initially disable.
-		if ( isActiveByDefault && activeArea === undefined && ! isSmall ) {
-			enableComplementaryArea( scope, identifier );
-		} else if ( activeArea === undefined && isSmall ) {
-			disableComplementaryArea( scope, identifier );
+		if ( activeArea === undefined ) {
+			const args = [ scope, identifier, { persist: false } ];
+			if ( isActiveByDefault && ! isSmall ) {
+				enableComplementaryArea( ...args );
+			} else if ( isSmall ) {
+				disableComplementaryArea( ...args );
+			}
 		}
 		setIsReady( true );
 	}, [

diff --git a/packages/interface/src/store/actions.js b/packages/interface/src/store/actions.js
@@ -33,11 +33,13 @@ export const setDefaultComplementaryArea = ( scope, area ) => {
 /**
  * Enable the complementary area.
  *
- * @param {string} scope Complementary area scope.
- * @param {string} area  Area identifier.
+ * @param {string}  scope           Complementary area scope.
+ * @param {string}  area            Area identifier.
+ * @param {Object}  options         Options.
+ * @param {boolean} options.persist Whether to persist.
  */
 export const enableComplementaryArea =
-	( scope, area ) =>
+	( scope, area, { persist = true } = {} ) =>
 	( { registry, dispatch } ) => {
 		// Return early if there's no area.
 		if ( ! area ) {
@@ -46,14 +48,16 @@ export const enableComplementaryArea =
 		scope = normalizeComplementaryAreaScope( scope );
 		area = normalizeComplementaryAreaName( scope, area );
 
-		const isComplementaryAreaVisible = registry
-			.select( preferencesStore )
-			.get( scope, 'isComplementaryAreaVisible' );
+		if ( persist ) {
+			const isComplementaryAreaVisible = registry
+				.select( preferencesStore )
+				.get( scope, 'isComplementaryAreaVisible' );
 
-		if ( ! isComplementaryAreaVisible ) {
-			registry
-				.dispatch( preferencesStore )
-				.set( scope, 'isComplementaryAreaVisible', true );
+			if ( ! isComplementaryAreaVisible ) {
+				registry
+					.dispatch( preferencesStore )
+					.set( scope, 'isComplementaryAreaVisible', true );
+			}
 		}
 
 		dispatch( {

diff --git a/test/e2e/specs/site-editor/preload.spec.js b/test/e2e/specs/site-editor/preload.spec.js
@@ -46,8 +46,6 @@ test.describe( 'Preload', () => {
 			// There are two separate settings OPTIONS requests. We should fix
 			// so the one for canUser and getEntityRecord are reused.
 			'/wp/v2/settings',
-			// Seems to be coming from `enableComplementaryArea`.
-			'/wp/v2/users/me',
 		] );
 	} );
 } );