Fix duplicate style entries, and keep custom css in menu at all times

WordPress · Jan 25, 2023 · 37b5b3f · 37b5b3f
1 parent ea23a82
commit 37b5b3f
Showing 1 changed file with 5 additions and 16 deletions.
diff --git a/packages/edit-site/src/components/global-styles/ui.js b/packages/edit-site/src/components/global-styles/ui.js
@@ -44,11 +44,8 @@ const { Slot: GlobalStylesMenuSlot, Fill: GlobalStylesMenuFill } =
 
 function GlobalStylesMenu() {
 	const { toggle } = useDispatch( preferencesStore );
-	const { useGlobalStylesReset, useGlobalStyle } = unlock(
-		blockEditorExperiments
-	);
+	const { useGlobalStylesReset } = unlock( blockEditorExperiments );
 	const [ canReset, onReset ] = useGlobalStylesReset();
-	const [ customCSS ] = useGlobalStyle( 'css' );
 	const { goTo } = useNavigator();
 	const loadCustomCSS = () => goTo( '/css' );
 	return (
@@ -62,14 +59,10 @@ function GlobalStylesMenu() {
 						onClick: onReset,
 						isDisabled: ! canReset,
 					},
-					...( ! customCSS
-						? [
-								{
-									title: __( 'Additional CSS' ),
-									onClick: loadCustomCSS,
-								},
-						  ]
-						: [] ),
+					{
+						title: __( 'Additional CSS' ),
+						onClick: loadCustomCSS,
+					},
 					{
 						title: __( 'Welcome Guide' ),
 						onClick: () =>
@@ -339,10 +332,6 @@ function GlobalStylesUI( { isStyleBookOpened, onCloseStyleBook } ) {
 				<GlobalStylesStyleBook onClose={ onCloseStyleBook } />
 			) }
 
-			<GlobalStylesNavigationScreen path="/css">
-				<ScreenCSS />
-			</GlobalStylesNavigationScreen>
-
 			<GlobalStylesMenu />
 		</NavigatorProvider>
 	);