| @@ -2,9 +2,8 @@ | ||
| 2 | 2 | defined( 'ABSPATH' ) || exit; |
| 3 | 3 | |
| 4 | 4 | use YayMail\Elements\ElementsLoader; |
| 5 | 5 | use YayMail\Utils\TemplateHelpers; |
| 6 | -use YayMail\Utils\Helpers; | |
| 7 | 6 | |
| 8 | 7 | /** |
| 9 | 8 | * $args includes |
| 10 | 9 | * $element |
| @@ -20,40 +19,16 @@ | ||
| 20 | 19 | $list_elements = $args['template']->get_elements(); |
| 21 | 20 | $parent_element = TemplateHelpers::find_parent_element( $element['id'], $list_elements ); |
| 22 | 21 | $row_avg_padding = $parent_element['data']['column_spacing'] ?? 0; |
| 23 | 22 | $total_columns = $parent_element['data']['amount_of_columns'] ?? 1; |
| 24 | -$current_column_index = array_search( $element['id'], array_column( $parent_element['children'] ?? [], 'id' ), true ); | |
| 23 | +$current_column_index = array_search( $element['id'], array_column( $parent_element['children'] ?? [], 'id' ) ); | |
| 25 | 24 | |
| 26 | -if ( false === $current_column_index ) { | |
| 27 | - $current_column_index = 0; | |
| 28 | -} | |
| 29 | - | |
| 30 | -$is_responsive_on_mobile = Helpers::is_true( $parent_element['data']['responsive_on_mobile'] ?? false ); | |
| 31 | - | |
| 32 | -$nested_column_style = ''; | |
| 33 | -if ( isset( $parent_element['type'] ) && 'column_layout' === $parent_element['type'] ) { | |
| 34 | - $layout_data = $parent_element['data']; | |
| 35 | - $inner_radius = isset( $layout_data['inner_border_radius'] ) ? $layout_data['inner_border_radius'] : []; | |
| 36 | - $corners = TemplateHelpers::get_inner_column_border_radius( | |
| 37 | - $inner_radius, | |
| 38 | - (int) $total_columns, | |
| 39 | - (int) $current_column_index | |
| 40 | - ); | |
| 41 | - $nested_props = [ | |
| 42 | - 'border-radius' => TemplateHelpers::get_border_radius_value( $corners, 'px' ), | |
| 43 | - 'background-color' => $layout_data['inner_background_color'] ?? 'transparent', | |
| 44 | - ]; | |
| 45 | - $has_inner_radius = ( $corners['top_left'] || $corners['top_right'] || $corners['bottom_right'] || $corners['bottom_left'] ); | |
| 46 | - $nested_props['overflow'] = $has_inner_radius ? 'hidden' : 'visible'; | |
| 47 | - $nested_column_style = TemplateHelpers::get_style( $nested_props ); | |
| 48 | -} | |
| 49 | - | |
| 50 | 25 | $wrapper_style = TemplateHelpers::get_style( |
| 51 | 26 | array_merge( |
| 52 | 27 | [ |
| 53 | 28 | 'width' => "{$data['width']}%", |
| 54 | 29 | 'max-width' => "{$data['width']}%", |
| 55 | - 'vertical-align' => $parent_element['data']['vertical_align'] ?? 'top', | |
| 30 | + 'vertical-align' => 'top', | |
| 56 | 31 | ], |
| 57 | 32 | $current_column_index === 0 ? [ |
| 58 | 33 | 'padding-left' => '0', |
| 59 | 34 | 'padding-right' => TemplateHelpers::get_dimension_value( $row_avg_padding / 2 ), |
| @@ -67,31 +42,18 @@ | ||
| 67 | 42 | ] : [], |
| 68 | 43 | ) |
| 69 | 44 | ); |
| 70 | 45 | |
| 71 | -if ( isset( $data['border'] ) ) { | |
| 72 | - $wrapper_style .= TemplateHelpers::get_border_css_value( $data['border'] ); | |
| 73 | -} | |
| 46 | +$content_style = TemplateHelpers::get_style( | |
| 47 | + [ | |
| 48 | + 'min-height' => '50px', | |
| 49 | + ] | |
| 50 | +); | |
| 74 | 51 | |
| 75 | -if ( '' !== $nested_column_style ) { | |
| 76 | - $wrapper_style .= $nested_column_style; | |
| 77 | -} | |
| 78 | 52 | ?> |
| 79 | 53 | |
| 80 | -<style> | |
| 81 | - <?php if ( $is_responsive_on_mobile ) { ?> | |
| 82 | - @media only screen and (max-width: 400px) { | |
| 83 | - .yaymail-element-<?php echo esc_attr( $parent_element['id'] ); ?> .yaymail-customizer-element-column { | |
| 84 | - width: 100% !important; | |
| 85 | - display: block; | |
| 86 | - max-width: 100% !important; | |
| 87 | - } | |
| 88 | - } | |
| 89 | - <?php } ?> | |
| 90 | -</style> | |
| 91 | - | |
| 92 | 54 | <td class="yaymail-customizer-element-column" style="<?php echo esc_attr( $wrapper_style ); ?>"> |
| 93 | - <div class="yaymail-customizer-element-nested-column-content"> | |
| 55 | + <div class="yaymail-customizer-element-nested-column-content" style="<?php echo esc_attr( $content_style ); ?>"> | |
| 94 | 56 | <?php |
| 95 | 57 | if ( ! empty( $element['children'] ) ) { |
| 96 | 58 | $args['is_nested'] = true; |
| 97 | 59 | ElementsLoader::render_elements( |
