Changeset 61430 for trunk/src/wp-includes/block-supports/typography.php
- Timestamp:
- 01/05/2026 04:50:51 AM (6 months ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/wp-includes/block-supports/typography.php
r61246 r61430 21 21 } 22 22 23 $typography_supports = isset( $block_type->supports['typography'] ) ? $block_type->supports['typography'] :false;23 $typography_supports = $block_type->supports['typography'] ?? false; 24 24 if ( ! $typography_supports ) { 25 25 return; 26 26 } 27 27 28 $has_font_family_support = isset( $typography_supports['__experimentalFontFamily'] ) ? $typography_supports['__experimentalFontFamily'] :false;29 $has_font_size_support = isset( $typography_supports['fontSize'] ) ? $typography_supports['fontSize'] :false;30 $has_font_style_support = isset( $typography_supports['__experimentalFontStyle'] ) ? $typography_supports['__experimentalFontStyle'] :false;31 $has_font_weight_support = isset( $typography_supports['__experimentalFontWeight'] ) ? $typography_supports['__experimentalFontWeight'] :false;32 $has_letter_spacing_support = isset( $typography_supports['__experimentalLetterSpacing'] ) ? $typography_supports['__experimentalLetterSpacing'] :false;33 $has_line_height_support = isset( $typography_supports['lineHeight'] ) ? $typography_supports['lineHeight'] :false;34 $has_text_align_support = isset( $typography_supports['textAlign'] ) ? $typography_supports['textAlign'] :false;35 $has_text_columns_support = isset( $typography_supports['textColumns'] ) ? $typography_supports['textColumns'] :false;36 $has_text_decoration_support = isset( $typography_supports['__experimentalTextDecoration'] ) ? $typography_supports['__experimentalTextDecoration'] :false;37 $has_text_transform_support = isset( $typography_supports['__experimentalTextTransform'] ) ? $typography_supports['__experimentalTextTransform'] :false;38 $has_writing_mode_support = isset( $typography_supports['__experimentalWritingMode'] ) ? $typography_supports['__experimentalWritingMode'] :false;28 $has_font_family_support = $typography_supports['__experimentalFontFamily'] ?? false; 29 $has_font_size_support = $typography_supports['fontSize'] ?? false; 30 $has_font_style_support = $typography_supports['__experimentalFontStyle'] ?? false; 31 $has_font_weight_support = $typography_supports['__experimentalFontWeight'] ?? false; 32 $has_letter_spacing_support = $typography_supports['__experimentalLetterSpacing'] ?? false; 33 $has_line_height_support = $typography_supports['lineHeight'] ?? false; 34 $has_text_align_support = $typography_supports['textAlign'] ?? false; 35 $has_text_columns_support = $typography_supports['textColumns'] ?? false; 36 $has_text_decoration_support = $typography_supports['__experimentalTextDecoration'] ?? false; 37 $has_text_transform_support = $typography_supports['__experimentalTextTransform'] ?? false; 38 $has_writing_mode_support = $typography_supports['__experimentalWritingMode'] ?? false; 39 39 40 40 $has_typography_support = $has_font_family_support … … 92 92 } 93 93 94 $typography_supports = isset( $block_type->supports['typography'] ) 95 ? $block_type->supports['typography'] 96 : false; 94 $typography_supports = $block_type->supports['typography'] ?? false; 97 95 if ( ! $typography_supports ) { 98 96 return array(); … … 103 101 } 104 102 105 $has_font_family_support = isset( $typography_supports['__experimentalFontFamily'] ) ? $typography_supports['__experimentalFontFamily'] :false;106 $has_font_size_support = isset( $typography_supports['fontSize'] ) ? $typography_supports['fontSize'] :false;107 $has_font_style_support = isset( $typography_supports['__experimentalFontStyle'] ) ? $typography_supports['__experimentalFontStyle'] :false;108 $has_font_weight_support = isset( $typography_supports['__experimentalFontWeight'] ) ? $typography_supports['__experimentalFontWeight'] :false;109 $has_letter_spacing_support = isset( $typography_supports['__experimentalLetterSpacing'] ) ? $typography_supports['__experimentalLetterSpacing'] :false;110 $has_line_height_support = isset( $typography_supports['lineHeight'] ) ? $typography_supports['lineHeight'] :false;111 $has_text_align_support = isset( $typography_supports['textAlign'] ) ? $typography_supports['textAlign'] :false;112 $has_text_columns_support = isset( $typography_supports['textColumns'] ) ? $typography_supports['textColumns'] :false;113 $has_text_decoration_support = isset( $typography_supports['__experimentalTextDecoration'] ) ? $typography_supports['__experimentalTextDecoration'] :false;114 $has_text_transform_support = isset( $typography_supports['__experimentalTextTransform'] ) ? $typography_supports['__experimentalTextTransform'] :false;115 $has_writing_mode_support = isset( $typography_supports['__experimentalWritingMode'] ) ? $typography_supports['__experimentalWritingMode'] :false;103 $has_font_family_support = $typography_supports['__experimentalFontFamily'] ?? false; 104 $has_font_size_support = $typography_supports['fontSize'] ?? false; 105 $has_font_style_support = $typography_supports['__experimentalFontStyle'] ?? false; 106 $has_font_weight_support = $typography_supports['__experimentalFontWeight'] ?? false; 107 $has_letter_spacing_support = $typography_supports['__experimentalLetterSpacing'] ?? false; 108 $has_line_height_support = $typography_supports['lineHeight'] ?? false; 109 $has_text_align_support = $typography_supports['textAlign'] ?? false; 110 $has_text_columns_support = $typography_supports['textColumns'] ?? false; 111 $has_text_decoration_support = $typography_supports['__experimentalTextDecoration'] ?? false; 112 $has_text_transform_support = $typography_supports['__experimentalTextTransform'] ?? false; 113 $has_writing_mode_support = $typography_supports['__experimentalWritingMode'] ?? false; 116 114 117 115 // Whether to skip individual block support features. … … 133 131 ? "var:preset|font-size|{$block_attributes['fontSize']}" 134 132 : null; 135 $custom_font_size = isset( $block_attributes['style']['typography']['fontSize'] ) 136 ? $block_attributes['style']['typography']['fontSize'] 137 : null; 133 $custom_font_size = $block_attributes['style']['typography']['fontSize'] ?? null; 138 134 $typography_block_styles['fontSize'] = $preset_font_size ? $preset_font_size : wp_get_typography_font_size_value( 139 135 array( … … 176 172 177 173 if ( $has_line_height_support && ! $should_skip_line_height ) { 178 $typography_block_styles['lineHeight'] = isset( $block_attributes['style']['typography']['lineHeight'] ) 179 ? $block_attributes['style']['typography']['lineHeight'] 180 : null; 174 $typography_block_styles['lineHeight'] = $block_attributes['style']['typography']['lineHeight'] ?? null; 181 175 } 182 176 183 177 if ( $has_text_align_support && ! $should_skip_text_align ) { 184 $typography_block_styles['textAlign'] = isset( $block_attributes['style']['typography']['textAlign'] ) 185 ? $block_attributes['style']['typography']['textAlign'] 186 : null; 178 $typography_block_styles['textAlign'] = $block_attributes['style']['typography']['textAlign'] ?? null; 187 179 } 188 180 189 181 if ( $has_text_columns_support && ! $should_skip_text_columns && isset( $block_attributes['style']['typography']['textColumns'] ) ) { 190 $typography_block_styles['textColumns'] = isset( $block_attributes['style']['typography']['textColumns'] ) 191 ? $block_attributes['style']['typography']['textColumns'] 192 : null; 182 $typography_block_styles['textColumns'] = $block_attributes['style']['typography']['textColumns'] ?? null; 193 183 } 194 184 … … 230 220 isset( $block_attributes['style']['typography']['writingMode'] ) 231 221 ) { 232 $typography_block_styles['writingMode'] = isset( $block_attributes['style']['typography']['writingMode'] ) 233 ? $block_attributes['style']['typography']['writingMode'] 234 : null; 222 $typography_block_styles['writingMode'] = $block_attributes['style']['typography']['writingMode'] ?? null; 235 223 } 236 224 … … 453 441 */ 454 442 function wp_get_computed_fluid_typography_value( $args = array() ) { 455 $maximum_viewport_width_raw = isset( $args['maximum_viewport_width'] ) ? $args['maximum_viewport_width'] :null;456 $minimum_viewport_width_raw = isset( $args['minimum_viewport_width'] ) ? $args['minimum_viewport_width'] :null;457 $maximum_font_size_raw = isset( $args['maximum_font_size'] ) ? $args['maximum_font_size'] :null;458 $minimum_font_size_raw = isset( $args['minimum_font_size'] ) ? $args['minimum_font_size'] :null;459 $scale_factor = isset( $args['scale_factor'] ) ? $args['scale_factor'] :null;443 $maximum_viewport_width_raw = $args['maximum_viewport_width'] ?? null; 444 $minimum_viewport_width_raw = $args['minimum_viewport_width'] ?? null; 445 $maximum_font_size_raw = $args['maximum_font_size'] ?? null; 446 $minimum_font_size_raw = $args['minimum_font_size'] ?? null; 447 $scale_factor = $args['scale_factor'] ?? null; 460 448 461 449 // Normalizes the minimum font size in order to use the value for calculations. … … 466 454 * otherwise the result will not be accurate. 467 455 */ 468 $font_size_unit = isset( $minimum_font_size['unit'] ) ? $minimum_font_size['unit'] :'rem';456 $font_size_unit = $minimum_font_size['unit'] ?? 'rem'; 469 457 470 458 // Normalizes the maximum font size in order to use the value for calculations. … … 599 587 } 600 588 601 $fluid_settings = isset( $typography_settings['fluid'] ) ? $typography_settings['fluid'] :array();602 $layout_settings = isset( $settings['layout'] ) ? $settings['layout'] :array();589 $fluid_settings = $typography_settings['fluid'] ?? array(); 590 $layout_settings = $settings['layout'] ?? array(); 603 591 604 592 // Defaults. … … 611 599 612 600 // Defaults overrides. 613 $minimum_viewport_width = isset( $fluid_settings['minViewportWidth'] ) ? $fluid_settings['minViewportWidth'] :$default_minimum_viewport_width;601 $minimum_viewport_width = $fluid_settings['minViewportWidth'] ?? $default_minimum_viewport_width; 614 602 $maximum_viewport_width = isset( $layout_settings['wideSize'] ) && ! empty( wp_get_typography_value_and_unit( $layout_settings['wideSize'] ) ) ? $layout_settings['wideSize'] : $default_maximum_viewport_width; 615 603 if ( isset( $fluid_settings['maxViewportWidth'] ) ) { … … 620 608 621 609 // Try to grab explicit min and max fluid font sizes. 622 $minimum_font_size_raw = isset( $fluid_font_size_settings['min'] ) ? $fluid_font_size_settings['min'] :null;623 $maximum_font_size_raw = isset( $fluid_font_size_settings['max'] ) ? $fluid_font_size_settings['max'] :null;610 $minimum_font_size_raw = $fluid_font_size_settings['min'] ?? null; 611 $maximum_font_size_raw = $fluid_font_size_settings['max'] ?? null; 624 612 625 613 // Font sizes.
Note:
See TracChangeset
for help on using the changeset viewer.
![(please configure the [header_logo] section in trac.ini)](/chrome/site/your_project_logo.png)