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

Editor: Limit spotlight mode to the editor. #58817

Merged
merged 6 commits into from
Feb 14, 2024
Merged

Editor: Limit spotlight mode to the editor. #58817

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b8d4754
Limit spotlight mode to the editor.
juanfra Feb 8, 2024
fbf7c30
Merge branch 'trunk' into try/42660-spotlight-mode
juanfra Feb 9, 2024
bd1d992
Merge branch 'trunk' into try/42660-spotlight-mode
juanfra Feb 13, 2024
e333ad9
Revert "Limit spotlight mode to the editor."
juanfra Feb 13, 2024
5de89ef
Disable "Spotlight mode" for block previews.
juanfra Feb 13, 2024
11fdd14
Revert non-required changes.
juanfra Feb 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
7 changes: 6 additions & 1 deletion packages/block-editor/src/components/block-preview/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,11 @@ export function BlockPreview( {
[]
);
const settings = useMemo(
() => ( { ...originalSettings, __unstableIsPreviewMode: true } ),
() => ( {
...originalSettings,
focusMode: false, // Disable "Spotlight mode".
__unstableIsPreviewMode: true,
} ),
[ originalSettings ]
);
const renderedBlocks = useMemo(
Expand Down Expand Up @@ -117,6 +121,7 @@ export function useBlockPreview( { blocks, props = {}, layout } ) {
() => ( {
...originalSettings,
styles: undefined, // Clear styles included by the parent settings, as they are already output by the parent's EditorStyles.
focusMode: false, // Disable "Spotlight mode".
__unstableIsPreviewMode: true,
} ),
[ originalSettings ]
Expand Down
12 changes: 10 additions & 2 deletions packages/edit-site/src/components/style-book/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,11 @@ function StyleBook( {
);

const settings = useMemo(
() => ( { ...originalSettings, __unstableIsPreviewMode: true } ),
() => ( {
...originalSettings,
focusMode: false, // Disable "Spotlight mode".
__unstableIsPreviewMode: true,
} ),
Copy link
Member

Choose a reason for hiding this comment

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

I think this change in the StyleBook component isn't required; these settings aren't passed into BlockEditorProvider.

Side note: The component doesn't really need the complete set of settings. They're passed to StyleBookBody, which only uses settings.styles. But this is unrelated to the fix here.

cc @andrewserong, @ramonjd

[ originalSettings ]
);

Expand Down Expand Up @@ -425,7 +429,11 @@ const Example = ( { id, title, blocks, isSelected, onClick } ) => {
[]
);
const settings = useMemo(
() => ( { ...originalSettings, __unstableIsPreviewMode: true } ),
() => ( {
...originalSettings,
focusMode: false, // Disable "Spotlight mode".
__unstableIsPreviewMode: true,
} ),
[ originalSettings ]
);

Expand Down
Loading