Skip to content

Command Palette: Change link destination of "Customize CSS" for non-block themes #65155

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
t-hamano wants to merge 1 commit into from
Closed

Command Palette: Change link destination of "Customize CSS" for non-block themes #65155

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 25 additions & 13 deletions packages/edit-site/src/hooks/commands/use-common-commands.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import { privateApis as blockEditorPrivateApis } from '@wordpress/block-editor';
import { privateApis as routerPrivateApis } from '@wordpress/router';
import { store as preferencesStore } from '@wordpress/preferences';
import { store as coreStore } from '@wordpress/core-data';
import { addQueryArgs } from '@wordpress/url';

/**
* Internal dependencies
Expand Down Expand Up @@ -171,17 +172,20 @@ function useGlobalStylesOpenCssCommands() {
unlock( useDispatch( editSiteStore ) );
const { params } = useLocation();
const history = useHistory();
const { canEditCSS } = useSelect( ( select ) => {
const { getEntityRecord, __experimentalGetCurrentGlobalStylesId } =
select( coreStore );

const { canEditCSS, isBlockBasedTheme } = useSelect( ( select ) => {
const {
getEntityRecord,
__experimentalGetCurrentGlobalStylesId,
getCurrentTheme,
} = select( coreStore );
const globalStylesId = __experimentalGetCurrentGlobalStylesId();
const globalStyles = globalStylesId
? getEntityRecord( 'root', 'globalStyles', globalStylesId )
: undefined;

return {
canEditCSS: !! globalStyles?._links?.[ 'wp:action-edit-css' ],
isBlockBasedTheme: getCurrentTheme().is_block_theme,
};
}, [] );
const { getCanvasMode } = unlock( useSelect( editSiteStore ) );
Expand All @@ -198,17 +202,24 @@ function useGlobalStylesOpenCssCommands() {
icon: brush,
callback: ( { close } ) => {
close();
if ( ! params.postId ) {
history.push( {
path: '/wp_global_styles',
canvas: 'edit',
if ( isBlockBasedTheme ) {
if ( ! params.postId ) {
history.push( {
path: '/wp_global_styles',
canvas: 'edit',
} );
}
if ( params.postId && getCanvasMode() !== 'edit' ) {
setCanvasMode( 'edit' );
}
openGeneralSidebar( 'edit-site/global-styles' );
setEditorCanvasContainerView( 'global-styles-css' );
} else {
const targetUrl = addQueryArgs( 'customize.php', {
'autofocus[section]': 'custom_css',
} );
document.location = targetUrl;
}
if ( params.postId && getCanvasMode() !== 'edit' ) {
setCanvasMode( 'edit' );
}
openGeneralSidebar( 'edit-site/global-styles' );
setEditorCanvasContainerView( 'global-styles-css' );
},
},
];
Expand All @@ -220,6 +231,7 @@ function useGlobalStylesOpenCssCommands() {
getCanvasMode,
setCanvasMode,
params.postId,
isBlockBasedTheme,
] );
return {
isLoading: false,
Expand Down