Remove unnecessary changes

packages/edit-site/src/components/app/index.js

@@ -1,6 +1,11 @@
 /**
  * WordPress dependencies
  */
+import { SlotFillProvider } from '@wordpress/components';
+import {
+	UnsavedChangesWarning,
+	privateApis as editorPrivateApis,
+} from '@wordpress/editor';
 import { store as noticesStore } from '@wordpress/notices';
 import { useDispatch } from '@wordpress/data';
 import { __, sprintf } from '@wordpress/i18n';
@@ -18,6 +23,7 @@ import useSetCommandContext from '../../hooks/commands/use-set-command-context';
 import { useRegisterSiteEditorRoutes } from '../site-editor-routes';
 
 const { RouterProvider } = unlock( routerPrivateApis );
+const { GlobalStylesProvider } = unlock( editorPrivateApis );
 
 function AppLayout() {
 	useCommonCommands();
@@ -44,9 +50,14 @@ export default function App() {
 	}
 
 	return (
-		<RouterProvider>
-			<AppLayout />
-			<PluginArea onError={ onPluginAreaError } />
-		</RouterProvider>
+		<SlotFillProvider>
+			<GlobalStylesProvider>
+				<UnsavedChangesWarning />
+				<RouterProvider>
+					<AppLayout />
+					<PluginArea onError={ onPluginAreaError } />
+				</RouterProvider>
+			</GlobalStylesProvider>
+		</SlotFillProvider>
 	);
 }

packages/edit-site/src/components/layout/index.js

@@ -10,7 +10,6 @@ import {
 	__unstableMotion as motion,
 	__unstableAnimatePresence as AnimatePresence,
 	__unstableUseNavigateRegions as useNavigateRegions,
-	SlotFillProvider,
 } from '@wordpress/components';
 import {
 	useReducedMotion,
@@ -24,7 +23,6 @@ import { CommandMenu } from '@wordpress/commands';
 import { privateApis as blockEditorPrivateApis } from '@wordpress/block-editor';
 import {
 	EditorSnackbars,
-	UnsavedChangesWarning,
 	privateApis as editorPrivateApis,
 } from '@wordpress/editor';
 import { privateApis as coreCommandsPrivateApis } from '@wordpress/core-commands';
@@ -46,12 +44,12 @@ import SavePanel from '../save-panel';
 
 const { useCommands } = unlock( coreCommandsPrivateApis );
 const { useGlobalStyle } = unlock( blockEditorPrivateApis );
-const { NavigableRegion, GlobalStylesProvider } = unlock( editorPrivateApis );
+const { NavigableRegion } = unlock( editorPrivateApis );
 const { useLocation } = unlock( routerPrivateApis );
 
 const ANIMATION_DURATION = 0.3;
 
-function Layout( { route } ) {
+export default function Layout( { route } ) {
 	const { params } = useLocation();
 	const { canvas = 'view' } = params;
 	useCommands();
@@ -80,7 +78,6 @@ function Layout( { route } ) {
 
 	return (
 		<>
-			<UnsavedChangesWarning />
 			<CommandMenu />
 			{ canvas === 'view' && <SaveKeyboardShortcut /> }
 			<div
@@ -234,13 +231,3 @@ function Layout( { route } ) {
 		</>
 	);
 }
-
-export default function LayoutWithGlobalStylesProvider( props ) {
-	return (
-		<SlotFillProvider>
-			<GlobalStylesProvider>
-				<Layout { ...props } />
-			</GlobalStylesProvider>
-		</SlotFillProvider>
-	);
-}

packages/edit-site/src/components/posts-app/index.js

@@ -1,6 +1,10 @@
 /**
  * WordPress dependencies
  */
+import {
+	UnsavedChangesWarning,
+	privateApis as editorPrivateApis,
+} from '@wordpress/editor';
 import { privateApis as routerPrivateApis } from '@wordpress/router';
 
 /**
@@ -12,6 +16,7 @@ import { unlock } from '../../lock-unlock';
 import useActiveRoute from '../layout/router';
 
 const { RouterProvider } = unlock( routerPrivateApis );
+const { GlobalStylesProvider } = unlock( editorPrivateApis );
 
 function PostsLayout() {
 	useRegisterPostsAppRoutes();
@@ -21,8 +26,11 @@ function PostsLayout() {
 
 export default function PostsApp() {
 	return (
-		<RouterProvider>
-			<PostsLayout />
-		</RouterProvider>
+		<GlobalStylesProvider>
+			<UnsavedChangesWarning />
+			<RouterProvider>
+				<PostsLayout />
+			</RouterProvider>
+		</GlobalStylesProvider>
 	);
 }