Skip to content
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

Site Editor > Styles: open styles inspector when clicking preview canvas #66996

Merged
merged 8 commits into from
Nov 14, 2024
Merged

Site Editor > Styles: open styles inspector when clicking preview canvas #66996

Changes from 6 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
26cd0eb
Site Editor > Styles: open styles inspector when clicking preview canvas
ellatrix Nov 14, 2024
44dc983
Remove logging
ellatrix Nov 14, 2024
caf7b18
Add editor option to disable opening the document sidebar by default
ellatrix Nov 14, 2024
c974253
polish
ellatrix Nov 14, 2024
7fb5854
rewrite
ellatrix Nov 14, 2024
e55d065
Remove unneeded changes
ellatrix Nov 14, 2024
75471fe
Restore prev state
ellatrix Nov 14, 2024
f5c358e
use ref
ellatrix Nov 14, 2024
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
14 changes: 11 additions & 3 deletions packages/edit-site/src/components/editor/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import {
import { __, sprintf } from '@wordpress/i18n';
import { store as coreDataStore } from '@wordpress/core-data';
import { privateApis as blockLibraryPrivateApis } from '@wordpress/block-library';
import { useCallback, useMemo } from '@wordpress/element';
import { useCallback, useMemo, useEffect } from '@wordpress/element';
import { store as noticesStore } from '@wordpress/notices';
import { privateApis as routerPrivateApis } from '@wordpress/router';
import { store as preferencesStore } from '@wordpress/preferences';
Expand Down Expand Up @@ -50,7 +50,7 @@ import useEditorTitle from './use-editor-title';
import { useIsSiteEditorLoading } from '../layout/hooks';
import { useAdaptEditorToCanvas } from './use-adapt-editor-to-canvas';

const { Editor, BackButton } = unlock( editorPrivateApis );
const { Editor, BackButton, interfaceStore } = unlock( editorPrivateApis );
const { useHistory, useLocation } = unlock( routerPrivateApis );
const { BlockKeyboardShortcuts } = unlock( blockLibraryPrivateApis );

Expand Down Expand Up @@ -81,7 +81,7 @@ const siteIconVariants = {
export default function EditSiteEditor( { isPostsList = false } ) {
const disableMotion = useReducedMotion();
const { params } = useLocation();
const { canvas = 'view' } = params;
const { canvas = 'view', path } = params;
const isLoading = useIsSiteEditorLoading();
useAdaptEditorToCanvas( canvas );
const {
Expand Down Expand Up @@ -212,6 +212,14 @@ export default function EditSiteEditor( { isPostsList = false } ) {
duration: disableMotion ? 0 : 0.2,
};

const { enableComplementaryArea } = useDispatch( interfaceStore );

useEffect( () => {
if ( path === '/wp_global_styles' && canvas === 'edit' ) {
enableComplementaryArea( 'core', 'edit-site/global-styles' );
}
}, [ path, enableComplementaryArea, canvas ] );
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do you think this effect should move to the "GlobalStylesSidebar" component instead?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We could. This component already seemed away of the path. Btw, maybe we should change it back to the document panel when moving away from '/wp_global_styles'? I'm not sure.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(not entirely sure)

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Right now it will stay open if you go to another editor, such as a page under "Pages".

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oh good catch :)

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we should just reset it to the previous state. I'll do that.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I moved the effect as you suggested and also restore the previous state now.


return (
<>
<GlobalStylesRenderer />
Expand Down
Loading