Skip to content

Editor: Add global styles data to editor settings #59929

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
michalczaplinski wants to merge 10 commits into from
Closed

Editor: Add global styles data to editor settings #59929

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
3c2185d
Add global styles to editor settings
michalczaplinski Mar 15, 2024
ecb7b7e
Add comment
michalczaplinski Mar 15, 2024
97aafab
Add __globalStyles to BLOCK_EDITOR_SETTINGS
michalczaplinski Mar 18, 2024
172cc9a
Fix typo in editor.js
michalczaplinski Mar 18, 2024
1094261
Remove unused code and update global styles
michalczaplinski Mar 19, 2024
e126a77
Update global styles key in useBlockEditorSettings
michalczaplinski Mar 19, 2024
61bf5b1
Remove TODO comment
michalczaplinski Mar 19, 2024
2183ab6
Fix default styles value in useStyles function
michalczaplinski Mar 19, 2024
4a5b69a
Editor: Address feedback on addition of global styles to editor setti…
aaronrobertshaw May 9, 2024
2e70b96
Only return merged global styles data
aaronrobertshaw May 10, 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
Prev Previous commit
Next Next commit
Remove unused code and update global styles
  • Loading branch information
@michalczaplinski @aaronrobertshaw
michalczaplinski authored and aaronrobertshaw committed May 10, 2024
commit 109426184b9c04f7ec83961239ae415f6c4b3932
13 changes: 1 addition & 12 deletions packages/edit-post/src/editor.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import {
PostLockedModal,
store as editorStore,
privateApis as editorPrivateApis,
useStyles,
} from '@wordpress/editor';
import { useMemo } from '@wordpress/element';
import { SlotFillProvider } from '@wordpress/components';
Expand Down Expand Up @@ -74,24 +73,14 @@ function Editor( {
[ currentPost.postType, currentPost.postId ]
);

// get the styles from the global styles
const { styles } = useStyles();

const editorSettings = useMemo(
() => ( {
...settings,
// TODO: This key should have a better name
__globalStyles: styles,
onNavigateToEntityRecord,
onNavigateToPreviousEntityRecord,
defaultRenderingMode: 'post-only',
} ),
[
settings,
styles,
onNavigateToEntityRecord,
onNavigateToPreviousEntityRecord,
]
[ settings, onNavigateToEntityRecord, onNavigateToPreviousEntityRecord ]
);

const initialPost = useMemo( () => {
Expand Down
7 changes: 6 additions & 1 deletion packages/editor/src/components/provider/use-block-editor-settings.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import inserterMediaCategories from '../media-categories';
import { mediaUpload } from '../../utils';
import { store as editorStore } from '../../store';
import { lock, unlock } from '../../lock-unlock';
import { useStyles } from '../use-styles';

const EMPTY_BLOCKS_LIST = [];

Expand All @@ -41,7 +42,6 @@ const BLOCK_EDITOR_SETTINGS = [
'__experimentalFeatures',
'__experimentalGlobalStylesBaseStyles',
'__unstableGalleryWithImageBlocks',
'__globalStyles',
'alignWide',
'blockInspectorTabs',
'allowedMimeTypes',
Expand Down Expand Up @@ -174,6 +174,9 @@ function useBlockEditorSettings( settings, postType, postId, renderingMode ) {
[ postType, postId, isLargeViewport, renderingMode ]
);

// get the styles from the global styles
const { styles } = useStyles();

const settingsBlockPatterns =
settings.__experimentalAdditionalBlockPatterns ?? // WP 6.0
settings.__experimentalBlockPatterns; // WP 5.9
Expand Down Expand Up @@ -260,6 +263,8 @@ function useBlockEditorSettings( settings, postType, postId, renderingMode ) {
BLOCK_EDITOR_SETTINGS.includes( key )
)
),
// TODO: This key should have a better name
__globalStyles: styles,
allowedBlockTypes,
allowRightClickOverrides,
focusMode: focusMode && ! forceDisableFocusMode,
Expand Down