disables auto toggling to top toolbar in DFM and removes superfluous …

…slot fill provider
WordPress · Feb 2, 2023 · c22e102 · c22e102
1 parent 78aebb6
commit c22e102
Show file tree

Hide file tree

Showing 4 changed files with 54 additions and 70 deletions.
diff --git a/packages/edit-post/src/components/header/writing-menu/index.js b/packages/edit-post/src/components/header/writing-menu/index.js
@@ -6,10 +6,7 @@ import { MenuGroup } from '@wordpress/components';
 import { __, _x } from '@wordpress/i18n';
 import { useViewportMatch } from '@wordpress/compose';
 import { displayShortcut } from '@wordpress/keycodes';
-import {
-	PreferenceToggleMenuItem,
-	store as preferencesStore,
-} from '@wordpress/preferences';
+import { PreferenceToggleMenuItem } from '@wordpress/preferences';
 import { store as blockEditorStore } from '@wordpress/block-editor';
 
 /**
@@ -32,13 +29,11 @@ function WritingMenu() {
 
 	const { setIsInserterOpened, setIsListViewOpened, closeGeneralSidebar } =
 		useDispatch( postEditorStore );
-	const { set: setPreference } = useDispatch( preferencesStore );
 
 	const { selectBlock } = useDispatch( blockEditorStore );
 
 	const toggleDistractionFree = () => {
 		registry.batch( () => {
-			setPreference( 'core/edit-post', 'fixedToolbar', false );
 			setIsInserterOpened( false );
 			setIsListViewOpened( false );
 			closeGeneralSidebar();

diff --git a/packages/edit-post/src/components/keyboard-shortcuts/index.js b/packages/edit-post/src/components/keyboard-shortcuts/index.js
@@ -11,7 +11,6 @@ import { __ } from '@wordpress/i18n';
 import { store as editorStore } from '@wordpress/editor';
 import { store as blockEditorStore } from '@wordpress/block-editor';
 import { store as noticesStore } from '@wordpress/notices';
-import { store as preferencesStore } from '@wordpress/preferences';
 import { createBlock } from '@wordpress/blocks';
 
 /**
@@ -45,10 +44,7 @@ function KeyboardShortcuts() {
 	} = useDispatch( editPostStore );
 	const { registerShortcut } = useDispatch( keyboardShortcutsStore );
 
-	const { set: setPreference } = useDispatch( preferencesStore );
-
 	const toggleDistractionFree = () => {
-		setPreference( 'core/edit-post', 'fixedToolbar', false );
 		setIsInserterOpened( false );
 		setIsListViewOpened( false );
 		closeGeneralSidebar();

diff --git a/packages/edit-post/src/components/preferences-modal/index.js b/packages/edit-post/src/components/preferences-modal/index.js
@@ -24,7 +24,6 @@ import {
 	PreferencesModalTabs,
 	PreferencesModalSection,
 } from '@wordpress/interface';
-import { store as preferencesStore } from '@wordpress/preferences';
 
 /**
  * Internal dependencies
@@ -70,10 +69,7 @@ export default function EditPostPreferencesModal() {
 	const { closeGeneralSidebar, setIsListViewOpened, setIsInserterOpened } =
 		useDispatch( editPostStore );
 
-	const { set: setPreference } = useDispatch( preferencesStore );
-
 	const toggleDistractionFree = () => {
-		setPreference( 'core/edit-post', 'fixedToolbar', false );
 		setIsInserterOpened( false );
 		setIsListViewOpened( false );
 		closeGeneralSidebar();

diff --git a/packages/interface/src/components/interface-skeleton/index.js b/packages/interface/src/components/interface-skeleton/index.js
@@ -10,7 +10,6 @@ import { forwardRef, useEffect } from '@wordpress/element';
 import {
 	__unstableUseNavigateRegions as useNavigateRegions,
 	__unstableMotion as motion,
-	SlotFillProvider,
 } from '@wordpress/components';
 import { __ } from '@wordpress/i18n';
 import { useMergeRefs } from '@wordpress/compose';
@@ -97,73 +96,71 @@ function InterfaceSkeleton(
 				!! footer && 'has-footer'
 			) }
 		>
-			<SlotFillProvider>
-				<div className="interface-interface-skeleton__editor">
-					{ !! header && isDistractionFree && (
+			<div className="interface-interface-skeleton__editor">
+				{ !! header && isDistractionFree && (
+					<NavigableRegion
+						as={ motion.div }
+						className="interface-interface-skeleton__header"
+						aria-label={ mergedLabels.header }
+						initial={ isDistractionFree ? 'hidden' : 'hover' }
+						whileHover="hover"
+						variants={ headerVariants }
+						transition={ { type: 'tween', delay: 0.8 } }
+					>
+						{ header }
+					</NavigableRegion>
+				) }
+				{ !! header && ! isDistractionFree && (
+					<NavigableRegion
+						className="interface-interface-skeleton__header"
+						ariaLabel={ mergedLabels.header }
+					>
+						{ header }
+					</NavigableRegion>
+				) }
+				{ isDistractionFree && (
+					<div className="interface-interface-skeleton__header">
+						{ editorNotices }
+					</div>
+				) }
+				<div className="interface-interface-skeleton__body">
+					{ !! secondarySidebar && (
 						<NavigableRegion
-							as={ motion.div }
-							className="interface-interface-skeleton__header"
-							aria-label={ mergedLabels.header }
-							initial={ isDistractionFree ? 'hidden' : 'hover' }
-							whileHover="hover"
-							variants={ headerVariants }
-							transition={ { type: 'tween', delay: 0.8 } }
+							className="interface-interface-skeleton__secondary-sidebar"
+							ariaLabel={ mergedLabels.secondarySidebar }
 						>
-							{ header }
+							{ secondarySidebar }
 						</NavigableRegion>
 					) }
-					{ !! header && ! isDistractionFree && (
+					{ !! notices && (
+						<div className="interface-interface-skeleton__notices">
+							{ notices }
+						</div>
+					) }
+					<NavigableRegion
+						className="interface-interface-skeleton__content"
+						ariaLabel={ mergedLabels.body }
+					>
+						{ content }
+					</NavigableRegion>
+					{ !! sidebar && (
 						<NavigableRegion
-							className="interface-interface-skeleton__header"
-							ariaLabel={ mergedLabels.header }
+							className="interface-interface-skeleton__sidebar"
+							ariaLabel={ mergedLabels.sidebar }
 						>
-							{ header }
+							{ sidebar }
 						</NavigableRegion>
 					) }
-					{ isDistractionFree && (
-						<div className="interface-interface-skeleton__header">
-							{ editorNotices }
-						</div>
-					) }
-					<div className="interface-interface-skeleton__body">
-						{ !! secondarySidebar && (
-							<NavigableRegion
-								className="interface-interface-skeleton__secondary-sidebar"
-								ariaLabel={ mergedLabels.secondarySidebar }
-							>
-								{ secondarySidebar }
-							</NavigableRegion>
-						) }
-						{ !! notices && (
-							<div className="interface-interface-skeleton__notices">
-								{ notices }
-							</div>
-						) }
+					{ !! actions && (
 						<NavigableRegion
-							className="interface-interface-skeleton__content"
-							ariaLabel={ mergedLabels.body }
+							className="interface-interface-skeleton__actions"
+							ariaLabel={ mergedLabels.actions }
 						>
-							{ content }
+							{ actions }
 						</NavigableRegion>
-						{ !! sidebar && (
-							<NavigableRegion
-								className="interface-interface-skeleton__sidebar"
-								ariaLabel={ mergedLabels.sidebar }
-							>
-								{ sidebar }
-							</NavigableRegion>
-						) }
-						{ !! actions && (
-							<NavigableRegion
-								className="interface-interface-skeleton__actions"
-								ariaLabel={ mergedLabels.actions }
-							>
-								{ actions }
-							</NavigableRegion>
-						) }
-					</div>
+					) }
 				</div>
-			</SlotFillProvider>
+			</div>
 			{ !! footer && (
 				<NavigableRegion
 					className="interface-interface-skeleton__footer"