From 510c531356d374b75c987168059054747d6179f0 Mon Sep 17 00:00:00 2001
From: Daniel Richards <daniel.richards@automattic.com>
Date: Thu, 3 Mar 2022 17:03:31 +0800
Subject: [PATCH] Fix selector bug - getPreference must be exported

---
 packages/edit-site/src/store/selectors.js | 33 ++++++++++++++---------
 1 file changed, 21 insertions(+), 12 deletions(-)

diff --git a/packages/edit-site/src/store/selectors.js b/packages/edit-site/src/store/selectors.js
index be5cca333c5b93..93d1822283f363 100644
--- a/packages/edit-site/src/store/selectors.js
+++ b/packages/edit-site/src/store/selectors.js
@@ -36,12 +36,16 @@ import {
 /**
  * Helper for getting a preference from the preferences store.
  *
- * This is only used so that `getSettings` doesn't need to be
- * made a registry selector. Do not export it.
+ * This is only present so that `getSettings` doesn't need to be made a
+ * registry selector.
+ *
+ * It's unstable because the selector needs to be exported and so part of the
+ * public API to work.
  */
-const getPreference = createRegistrySelector( ( select ) => ( state, name ) => {
-	return select( preferencesStore ).get( 'core/edit-site', name );
-} );
+export const __unstableGetPreference = createRegistrySelector(
+	( select ) => ( state, name ) =>
+		select( preferencesStore ).get( 'core/edit-site', name )
+);
 
 /**
  * Returns whether the given feature is enabled or not.
@@ -57,7 +61,7 @@ export function isFeatureActive( state, featureName ) {
 		alternative: `select( 'core/preferences' ).get`,
 	} );
 
-	return !! getPreference( state, featureName );
+	return !! __unstableGetPreference( state, featureName );
 }
 
 /**
@@ -111,8 +115,11 @@ export const getSettings = createSelector(
 		const settings = {
 			...state.settings,
 			outlineMode: true,
-			focusMode: !! getPreference( state, 'focusMode' ),
-			hasFixedToolbar: !! getPreference( state, 'fixedToolbar' ),
+			focusMode: !! __unstableGetPreference( state, 'focusMode' ),
+			hasFixedToolbar: !! __unstableGetPreference(
+				state,
+				'fixedToolbar'
+			),
 			__experimentalSetIsInserterOpened: setIsInserterOpen,
 			__experimentalReusableBlocks: getReusableBlocks( state ),
 			__experimentalPreferPatternsOnRoot:
@@ -136,8 +143,8 @@ export const getSettings = createSelector(
 	( state ) => [
 		getCanUserCreateMedia( state ),
 		state.settings,
-		getPreference( state, 'focusMode' ),
-		getPreference( state, 'fixedToolbar' ),
+		__unstableGetPreference( state, 'focusMode' ),
+		__unstableGetPreference( state, 'fixedToolbar' ),
 		getReusableBlocks( state ),
 		getEditedPostType( state ),
 	]
@@ -351,8 +358,10 @@ export const getCurrentTemplateTemplateParts = createRegistrySelector(
 /**
  * Returns the current editing mode.
  *
+ * @param {Object} state Global application state.
+ *
  * @return {string} Editing mode.
  */
-export function getEditorMode() {
-	return getPreference( 'editorMode' );
+export function getEditorMode( state ) {
+	return __unstableGetPreference( state, 'editorMode' );
 }