Skip to content

Fix UI order for theme.json spacing sizes #62199

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
ajlende merged 6 commits into from
Jun 4, 2024
Merged

Fix UI order for theme.json spacing sizes #62199

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f6c44e0
Sort merged spacingScale on the backend
ajlende May 31, 2024
f158aa2
Only sort if multiple origins are defined in the frontend
ajlende May 31, 2024
e99fc11
Preserve order when there are no spacingScale values
ajlende May 31, 2024
2b0c3e3
Add 62199 to backport changelog
ajlende May 31, 2024
099aaf7
Remove renaming on slider presets
ajlende Jun 4, 2024
764f490
Merge branch 'trunk' into fix/spacing-sizes-v2-ordering
ajlende Jun 4, 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
Only sort if multiple origins are defined in the frontend
  • Loading branch information
@ajlende
ajlende committed May 31, 2024
commit f158aa2c500dec0478a2c9f4feca14b43d78e10a
14 changes: 13 additions & 1 deletion packages/block-editor/src/components/spacing-sizes-control/hooks/use-spacing-sizes.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,19 @@ export default function useSpacingSizes() {
...customSizes,
...themeSizes,
...defaultSizes,
].sort( ( a, b ) => compare( a.slug, b.slug ) );
];

// Only sort if more than one origin has presets defined in order to
// preserve order for themes that don't include default presets and
// want a custom order.
if (
( customSizes.length && 1 ) +
( themeSizes.length && 1 ) +
( defaultSizes.length && 1 ) >
1
) {
sizes.sort( ( a, b ) => compare( a.slug, b.slug ) );
}

return sizes.length > RANGE_CONTROL_MAX_SIZE
? [
Expand Down