← All changes
|
modules/variables/transformers/global-variable-transformer.php
+12
-4
4.1.0-dev1
→
4.3.0-beta3
View file →
| @@ -1,10 +1,12 @@ | ||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | 3 | namespace Elementor\Modules\Variables\Transformers; |
| 4 | 4 | |
| 5 | +use Elementor\Modules\AtomicWidgets\PropsResolver\Props_Resolver_Context; | |
| 6 | +use Elementor\Modules\AtomicWidgets\PropsResolver\Transformer_Base; | |
| 7 | +use Elementor\Modules\AtomicWidgets\Styles\Grid_Track_Renderer; | |
| 5 | 8 | use Elementor\Modules\Variables\Classes\Variables; |
| 6 | -use Elementor\Modules\AtomicWidgets\PropsResolver\Transformer_Base; | |
| 7 | 9 | |
| 8 | 10 | if ( ! defined( 'ABSPATH' ) ) { |
| 9 | 11 | exit; // Exit if accessed directly. |
| 10 | 12 | } |
| @@ -9,9 +11,9 @@ | ||
| 9 | 11 | exit; // Exit if accessed directly. |
| 10 | 12 | } |
| 11 | 13 | |
| 12 | 14 | class Global_Variable_Transformer extends Transformer_Base { |
| 13 | - public function transform( $value, $key ) { | |
| 15 | + public function transform( $value, Props_Resolver_Context $context ) { | |
| 14 | 16 | $variable = Variables::by_id( $value ); |
| 15 | 17 | |
| 16 | 18 | if ( ! $variable ) { |
| 17 | 19 | return null; |
| @@ -16,15 +18,21 @@ | ||
| 16 | 18 | if ( ! $variable ) { |
| 17 | 19 | return null; |
| 18 | 20 | } |
| 19 | 21 | |
| 22 | + if ( Grid_Track_Renderer::is_grid_track_property( $context->get_key() ) ) { | |
| 23 | + $count = (int) trim( $variable['value'] ?? '' ); | |
| 24 | + | |
| 25 | + return Grid_Track_Renderer::format_repeat( $count ); | |
| 26 | + } | |
| 27 | + | |
| 20 | 28 | if ( array_key_exists( 'deleted', $variable ) && $variable['deleted'] ) { |
| 21 | 29 | return "var(--{$value})"; |
| 22 | 30 | } |
| 23 | 31 | |
| 24 | - $identifier = $variable['label']; | |
| 32 | + $identifier = trim( $variable['label'] ?? '' ); | |
| 25 | 33 | |
| 26 | - if ( ! trim( $identifier ) ) { | |
| 34 | + if ( '' === $identifier ) { | |
| 27 | 35 | return null; |
| 28 | 36 | } |
| 29 | 37 | |
| 30 | 38 | return "var(--{$identifier})"; |