Fix the fixedToolbar preference

The defaultPreference wasn't being used
Automattic · Sep 30, 2021 · 83a49b6 · 83a49b6
1 parent 9b3e70c
commit 83a49b6
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/components/editor-setup/index.js b/src/components/editor-setup/index.js
@@ -87,7 +87,8 @@ export default compose( [
 							settings.editor,
 							settings.iso,
 							blockTypes,
-							hasFixedToolbar || settings.editor?.hasFixedToolbar || false
+							// Use the default preference, if set, otherwise use the feature
+							settings.iso?.defaultPreferences?.fixedToolbar !== undefined ? settings.iso?.defaultPreferences?.fixedToolbar : hasFixedToolbar
 						),
 
 						// Reusable blocks