Skip to content

Search block: use font size for search icon #59159

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
ramonjd merged 11 commits into from
Feb 22, 2024
Merged

Search block: use font size for search icon #59159

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
37c3dc6
Update filename
ramonjd Feb 19, 2024
137c6d9
Linting, refactor
ramonjd Feb 19, 2024
4be2655
Moving useFontSizeFromPreset into block editor private APIs
ramonjd Feb 20, 2024
46b3d1b
Made it clear where the origin prioritization comes from in the comme…
ramonjd Feb 20, 2024
b0bbbfd
No null coalescing operator in Core yet.
ramonjd Feb 20, 2024
3ead67f
Revert getting font size from preset in the edit.js file. Use compute…
ramonjd Feb 21, 2024
87756ce
wp
ramonjd Feb 21, 2024
223e32f
lint
ramonjd Feb 21, 2024
0826553
esc_attr
ramonjd Feb 21, 2024
e7c0ff0
strict me
ramonjd Feb 21, 2024
3f49b04
Revert other stuff.
ramonjd Feb 22, 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
Linting, refactor
  • Loading branch information
@ramonjd
ramonjd committed Feb 22, 2024
commit 137c6d94140a195c92d3f5e8225b8db4318d1f5d
11 changes: 5 additions & 6 deletions packages/block-library/src/search/index.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,14 +135,13 @@ function render_block_core_search( $attributes ) {
$icon_dimensions = '24';
if ( ! empty( $attributes['style']['typography']['fontSize'] ) ) {
$icon_dimensions = $attributes['style']['typography']['fontSize'];
} else if ( ! empty( $attributes['fontSize'] ) ) {
} elseif ( ! empty( $attributes['fontSize'] ) ) {
$font_size_presets = wp_get_global_settings( array( 'typography', 'fontSizes' ) );
if ( isset( $font_size_presets['default'] ) || isset( $font_size_presets['theme'] ) ) {
if ( isset( $font_size_presets['theme'] ) || isset( $font_size_presets['default'] ) ) {
$font_size_presets = $font_size_presets['theme'] ?? $font_size_presets['default'];
$font_size_from_preset = array_filter( $font_size_presets, fn( $font_size ) => $font_size['slug'] === $attributes['fontSize'] );
if ( ! empty( $font_size_from_preset ) ) {
$font_size_from_preset = array_shift($font_size_from_preset );
$font_size_from_preset = $font_size_from_preset['size'] || '24';
$font_size_from_preset = array_column( $font_size_presets, null, 'slug' )[ $attributes['fontSize'] ] ?? false;
if ( isset( $font_size_from_preset['size'] ) ) {
$icon_dimensions = $font_size_from_preset['size'];
}
}
}
Expand Down