Skip to content

Fix: Shadow/Font size preset panel crashes the editor #65765

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

Merged
t-hamano merged 3 commits into from
Oct 2, 2024
Merged

Fix: Shadow/Font size preset panel crashes the editor #65765

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d467684
Fix: Shadow/Font size preset panel crashes the editor
t-hamano Oct 1, 2024
aaf4003
Merge branch 'trunk' into fix/shadow-font-size-crash
t-hamano Oct 2, 2024
dd9380b
Refactor logic
t-hamano Oct 2, 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
Next Next commit
Fix: Shadow/Font size preset panel crashes the editor
  • Loading branch information
@t-hamano
t-hamano committed Oct 1, 2024
commit d467684ecedfd3ca01e6f0765f191e62a38fb5c5
4 changes: 4 additions & 0 deletions packages/edit-site/src/components/global-styles/font-sizes/font-size.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,10 @@ function FontSize() {

const [ globalFluid ] = useGlobalSetting( 'typography.fluid' );

if ( ! origin || ! slug ) {
Copy link
Member

@ramonjd ramonjd Oct 2, 2024

Choose a reason for hiding this comment

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

Oh nice! I promise I didn't steal this for #65811

😆

return null;
}

// Get the font sizes from the origin, default to empty array.
const sizes = fontSizes[ origin ] ?? [];

Expand Down
4 changes: 4 additions & 0 deletions packages/edit-site/src/components/global-styles/shadows-edit-panel.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,10 @@ export default function ShadowsEditPanel() {
const [ isRenameModalVisible, setIsRenameModalVisible ] = useState( false );
const [ shadowName, setShadowName ] = useState( selectedShadow.name );

if ( ! category || ! slug ) {
return null;
}

const onShadowChange = ( shadow ) => {
setSelectedShadow( { ...selectedShadow, shadow } );
const updatedShadows = shadows.map( ( s ) =>
Expand Down