← All changes | includes/elements/container.php +117 -269 4.0.7 → 3.22.2 View file →

		@@ -38,9 +38,9 @@
38	38	* @param array|null $args
39	39	*
40	40	* @return void
41	41	*/
42		- public function __construct( array $data = [], ?array $args = null ) {
	42	+ public function __construct( array $data = [], array $args = null ) {
43	43	parent::__construct( $data, $args );
44	44
45	45	$this->active_kit = Plugin::$instance->kits_manager->get_active_kit();
46	46	}
		@@ -81,9 +81,15 @@
81	81	return 'eicon-container';
82	82	}
83	83
84	84	public function get_keywords() {
85		- return [ 'Container', 'Flex', 'Flexbox', 'Flexbox Container', 'Grid', 'Grid Container', 'CSS Grid', 'Layout' ];
	85	+ $keywords = [ 'Container', 'Flex', 'Flexbox', 'Flexbox Container', 'Layout' ];
	86	+
	87	+ if ( Plugin::$instance->experiments->is_feature_active( 'container_grid' ) ) {
	88	+ array_push( $keywords, 'Grid', 'Grid Container', 'CSS Grid' );
	89	+ }
	90	+
	91	+ return $keywords;
86	92	}
87	93
88	94	public function get_panel_presets() {
89	95	return [
		@@ -139,9 +145,8 @@
139	145	$config['controls'] = $this->get_controls();
140	146	$config['tabs_controls'] = $this->get_tabs_controls();
141	147	$config['show_in_panel'] = true;
142	148	$config['categories'] = [ 'layout' ];
143		- $config['include_in_widgets_config'] = true;
144	149
145	150	return $config;
146	151	}
147	152
		@@ -162,26 +167,21 @@
162	167	if ( ! settings.background_play_once ) {
163	168	videoAttributes += ' loop';
164	169	}
165	170
166		- view.addRenderAttribute(
167		- 'background-video-container',
168		- {
169		- 'class': 'elementor-background-video-container',
170		- }
171		- );
	171	+ view.addRenderAttribute( 'background-video-container', 'class', 'elementor-background-video-container' );
172	172
173	173	if ( ! settings.background_play_on_mobile ) {
174		- view.addRenderAttribute( 'background-video-container', 'class', 'elementor-hidden-mobile' );
	174	+ view.addRenderAttribute( 'background-video-container', 'class', 'elementor-hidden-phone' );
175	175	}
176	176	#>
177	177	<div {{{ view.getRenderAttributeString( 'background-video-container' ) }}}>
178		- <div class="elementor-background-video-embed" role="presentation"></div>
179		- <video class="elementor-background-video-hosted" role="presentation" {{ videoAttributes }}></video>
	178	+ <div class="elementor-background-video-embed"></div>
	179	+ <video class="elementor-background-video-hosted elementor-html5-video" {{ videoAttributes }}></video>
180	180	</div>
181	181	<# } #>
182		- <div class="elementor-shape elementor-shape-top" aria-hidden="true"></div>
183		- <div class="elementor-shape elementor-shape-bottom" aria-hidden="true"></div>
	182	+ <div class="elementor-shape elementor-shape-top"></div>
	183	+ <div class="elementor-shape elementor-shape-bottom"></div>
184	184	<# if ( 'boxed' === settings.content_width ) { #>
185	185	</div>
186	186	<# } #>
187	187	<?php
		@@ -204,22 +204,17 @@
204	204	}
205	205
206	206	$video_properties = Embed::get_video_properties( $settings['background_video_link'] );
207	207
208		- $this->add_render_attribute(
209		- 'background-video-container',
210		- [
211		- 'class' => 'elementor-background-video-container',
212		- ]
213		- );
	208	+ $this->add_render_attribute( 'background-video-container', 'class', 'elementor-background-video-container' );
214	209
215	210	if ( ! $settings['background_play_on_mobile'] ) {
216		- $this->add_render_attribute( 'background-video-container', 'class', 'elementor-hidden-mobile' );
	211	+ $this->add_render_attribute( 'background-video-container', 'class', 'elementor-hidden-phone' );
217	212	}
218	213
219	214	?><div <?php $this->print_render_attribute_string( 'background-video-container' ); ?>>
220	215	<?php if ( $video_properties ) : ?>
221		- <div class="elementor-background-video-embed" role="presentation"></div>
	216	+ <div class="elementor-background-video-embed"></div>
222	217	<?php
223	218	else :
224	219	$video_tag_attributes = 'autoplay muted playsinline';
225	220
		@@ -226,9 +221,9 @@
226	221	if ( 'yes' !== $settings['background_play_once'] ) {
227	222	$video_tag_attributes .= ' loop';
228	223	}
229	224	?>
230		- <video class="elementor-background-video-hosted" role="presentation" <?php echo esc_attr( $video_tag_attributes ); ?>></video>
	225	+ <video class="elementor-background-video-hosted elementor-html5-video" <?php echo esc_attr( $video_tag_attributes ); ?>></video>
231	226	<?php endif; ?>
232	227	</div><?php
233	228	}
234	229
		@@ -251,9 +246,9 @@
251	246	if ( ! is_file( $shape_path ) || ! is_readable( $shape_path ) ) {
252	247	return;
253	248	}
254	249	?>
255		- <div class="elementor-shape elementor-shape-<?php echo esc_attr( $side ); ?>" aria-hidden="true" data-negative="<?php
	250	+ <div class="elementor-shape elementor-shape-<?php echo esc_attr( $side ); ?>" data-negative="<?php
256	251	Utils::print_unescaped_internal_string( $negative ? 'true' : 'false' );
257	252	?>">
258	253	<?php
259	254	// PHPCS - The file content is being read from a strict file path structure.
		@@ -333,19 +328,72 @@
333	328	*
334	329	* @return \Elementor\Element_Base|\Elementor\Widget_Base|null
335	330	*/
336	331	protected function _get_default_child_type( array $element_data ) {
337		- $el_types = array_keys( Plugin::$instance->elements_manager->get_element_types() );
	332	+ if ( 'container' === $element_data['elType'] ) {
	333	+ return Plugin::$instance->elements_manager->get_element_types( 'container' );
	334	+ }
338	335
339		- if ( in_array( $element_data['elType'], $el_types, true ) ) {
340		- return Plugin::$instance->elements_manager->get_element_types( $element_data['elType'] );
	336	+ return Plugin::$instance->widgets_manager->get_widget_types( $element_data['widgetType'] );
	337	+ }
	338	+
	339	+ protected function get_flex_control_options( $is_container_grid_active ) {
	340	+ $flex_control_options = [
	341	+ 'name' => 'flex',
	342	+ 'selector' => '{{WRAPPER}}',
	343	+ 'fields_options' => [
	344	+ 'gap' => [
	345	+ 'label' => esc_html__( 'Gaps', 'elementor' ),
	346	+ 'device_args' => [
	347	+ Breakpoints_Manager::BREAKPOINT_KEY_DESKTOP => [
	348	+ // Use the default gap from the kit as a placeholder.
	349	+ 'placeholder' => $this->active_kit->get_settings_for_display( 'space_between_widgets' ),
	350	+ ],
	351	+ ],
	352	+ ],
	353	+ ],
	354	+ ];
	355	+
	356	+ if ( $is_container_grid_active ) {
	357	+ $flex_control_options['condition'] = [
	358	+ 'container_type' => 'flex',
	359	+ ];
341	360	}
342	361
343		- if ( ! isset( $element_data['widgetType'] ) ) {
344		- return null;
	362	+ return $flex_control_options;
	363	+ }
	364	+
	365	+ protected function get_container_type_control_options( $is_container_grid_active ) {
	366	+ if ( $is_container_grid_active ) {
	367	+ return [
	368	+ 'label' => esc_html__( 'Container Layout', 'elementor' ),
	369	+ 'type' => Controls_Manager::SELECT,
	370	+ 'default' => 'flex',
	371	+ 'prefix_class' => 'e-',
	372	+ 'options' => [
	373	+ 'flex' => esc_html__( 'Flexbox', 'elementor' ),
	374	+ 'grid' => esc_html__( 'Grid', 'elementor' ),
	375	+ ],
	376	+ 'selectors' => [
	377	+ '{{WRAPPER}}' => '--display: {{VALUE}}',
	378	+ ],
	379	+ 'separator' => 'after',
	380	+ 'editor_available' => true,
	381	+ ];
345	382	}
346	383
347		- return Plugin::$instance->widgets_manager->get_widget_types( $element_data['widgetType'] );
	384	+ // TODO: This can be removed when the 'Container Grid Experiment' is merged.
	385	+ return [
	386	+ 'label' => esc_html__( 'Container Layout', 'elementor' ),
	387	+ 'type' => Controls_Manager::HIDDEN,
	388	+ 'render_type' => 'none',
	389	+ 'default' => 'flex',
	390	+ 'prefix_class' => 'e-',
	391	+ 'selectors' => [
	392	+ '{{WRAPPER}}' => '--display: {{VALUE}}',
	393	+ ],
	394	+ 'separator' => 'after',
	395	+ ];
348	396	}
349	397
350	398	/**
351	399	* Register the Container's layout controls.
		@@ -368,25 +416,13 @@
368	416	} else {
369	417	$min_affected_device = Breakpoints_Manager::BREAKPOINT_KEY_TABLET;
370	418	}
371	419
	420	+ $is_container_grid_active = Plugin::$instance->experiments->is_feature_active( 'container_grid' );
	421	+
372	422	$this->add_control(
373	423	'container_type',
374		- [
375		- 'label' => esc_html__( 'Container Layout', 'elementor' ),
376		- 'type' => Controls_Manager::SELECT,
377		- 'default' => 'flex',
378		- 'prefix_class' => 'e-',
379		- 'options' => [
380		- 'flex' => esc_html__( 'Flexbox', 'elementor' ),
381		- 'grid' => esc_html__( 'Grid', 'elementor' ),
382		- ],
383		- 'selectors' => [
384		- '{{WRAPPER}}' => '--display: {{VALUE}}',
385		- ],
386		- 'separator' => 'after',
387		- 'editor_available' => true,
388		- ]
	424	+ $this->get_container_type_control_options( $is_container_grid_active )
389	425	);
390	426
391	427	$this->add_control(
392	428	'content_width',
		@@ -492,9 +528,8 @@
492	528	'max' => 1440,
493	529	],
494	530	],
495	531	'description' => sprintf(
496		- /* translators: %s: 100vh. */
497	532	esc_html__( 'To achieve full height Container use %s.', 'elementor' ),
498	533	'100vh'
499	534	),
500	535	'selectors' => [
		@@ -504,38 +539,23 @@
504	539	);
505	540
506	541	$this->add_group_control(
507	542	Group_Control_Flex_Container::get_type(),
508		- [
509		- 'name' => 'flex',
510		- 'selector' => '{{WRAPPER}}',
511		- 'fields_options' => [
512		- 'gap' => [
513		- 'label' => esc_html__( 'Gaps', 'elementor' ),
514		- 'device_args' => [
515		- Breakpoints_Manager::BREAKPOINT_KEY_DESKTOP => [
516		- // Use the default gap from the kit as a placeholder.
517		- 'placeholder' => $this->active_kit->get_settings_for_display( 'space_between_widgets' ),
518		- ],
519		- ],
520		- ],
521		- ],
522		- 'condition' => [
523		- 'container_type' => [ 'flex' ],
524		- ],
525		- ]
	543	+ $this->get_flex_control_options( $is_container_grid_active )
526	544	);
527	545
528		- $this->add_group_control(
529		- Group_Control_Grid_Container::get_type(),
530		- [
531		- 'name' => 'grid',
532		- 'selector' => '{{WRAPPER}}',
533		- 'condition' => [
534		- 'container_type' => [ 'grid' ],
535		- ],
536		- ]
537		- );
	546	+ if ( $is_container_grid_active ) {
	547	+ $this->add_group_control(
	548	+ Group_Control_Grid_Container::get_type(),
	549	+ [
	550	+ 'name' => 'grid',
	551	+ 'selector' => '{{WRAPPER}}',
	552	+ 'condition' => [
	553	+ 'container_type' => [ 'grid' ],
	554	+ ],
	555	+ ]
	556	+ );
	557	+ }
538	558
539	559	$this->end_controls_section();
540	560	}
541	561
		@@ -673,45 +693,8 @@
673	693	],
674	694	]
675	695	);
676	696
677		- $this->add_control(
678		- 'handle_slideshow_asset_loading',
679		- [
680		- 'type' => Controls_Manager::HIDDEN,
681		- 'assets' => [
682		- 'styles' => [
683		- [
684		- 'name' => 'e-swiper',
685		- 'conditions' => [
686		- 'terms' => [
687		- [
688		- 'name' => 'background_background',
689		- 'operator' => '===',
690		- 'value' => 'slideshow',
691		- ],
692		- ],
693		- ],
694		- ],
695		- ],
696		- 'scripts' => [
697		- [
698		- 'name' => 'swiper',
699		- 'conditions' => [
700		- 'terms' => [
701		- [
702		- 'name' => 'background_background',
703		- 'operator' => '===',
704		- 'value' => 'slideshow',
705		- ],
706		- ],
707		- ],
708		- ],
709		- ],
710		- ],
711		- ]
712		- );
713		-
714	697	$this->end_controls_tab();
715	698
716	699	/**
717	700	* Hover.
		@@ -747,11 +730,8 @@
747	730	],
748	731	],
749	732	'render_type' => 'ui',
750	733	'separator' => 'before',
751		- 'condition' => [
752		- 'background_hover_background' => [ 'classic', 'gradient' ],
753		- ],
754	734	'selectors' => [
755	735	'{{WRAPPER}}' => '--background-transition: {{SIZE}}s;',
756	736	],
757	737	]
		@@ -944,8 +924,16 @@
944	924	],
945	925	]
946	926	);
947	927
	928	+ $this->add_group_control(
	929	+ Group_Control_Css_Filter::get_type(),
	930	+ [
	931	+ 'name' => 'css_filters_hover',
	932	+ 'selector' => '{{WRAPPER}}:hover::before',
	933	+ ]
	934	+ );
	935	+
948	936	$this->add_control(
949	937	'background_overlay_hover_transition',
950	938	[
951	939	'label' => esc_html__( 'Transition Duration', 'elementor' ) . ' (s)',
		@@ -958,11 +946,8 @@
958	946	],
959	947	],
960	948	'render_type' => 'ui',
961	949	'separator' => 'before',
962		- 'condition' => [
963		- 'background_overlay_hover_background' => [ 'classic', 'gradient' ],
964		- ],
965	950	'selectors' => [
966	951	'{{WRAPPER}}, {{WRAPPER}}::before' => '--overlay-transition: {{SIZE}}s;',
967	952	],
968	953	]
		@@ -967,16 +952,8 @@
967	952	],
968	953	]
969	954	);
970	955
971		- $this->add_group_control(
972		- Group_Control_Css_Filter::get_type(),
973		- [
974		- 'name' => 'css_filters_hover',
975		- 'selector' => '{{WRAPPER}}:hover::before',
976		- ]
977		- );
978		-
979	956	$this->end_controls_tab();
980	957
981	958	$this->end_controls_tabs();
982	959
		@@ -1124,32 +1101,17 @@
1124	1101	'conditions' => [
1125	1102	'relation' => 'or',
1126	1103	'terms' => [
1127	1104	[
1128		- 'name' => 'border_hover_border',
	1105	+ 'name' => 'background_background',
1129	1106	'operator' => '!==',
1130	1107	'value' => '',
1131	1108	],
1132	1109	[
1133		- 'name' => 'border_radius_hover[top]',
	1110	+ 'name' => 'border_border',
1134	1111	'operator' => '!==',
1135	1112	'value' => '',
1136	1113	],
1137		- [
1138		- 'name' => 'border_radius_hover[right]',
1139		- 'operator' => '!==',
1140		- 'value' => '',
1141		- ],
1142		- [
1143		- 'name' => 'border_radius_hover[bottom]',
1144		- 'operator' => '!==',
1145		- 'value' => '',
1146		- ],
1147		- [
1148		- 'name' => 'border_radius_hover[left]',
1149		- 'operator' => '!==',
1150		- 'value' => '',
1151		- ],
1152	1114	],
1153	1115	],
1154	1116	'selectors' => [
1155	1117	'{{WRAPPER}}, {{WRAPPER}}::before' => '--border-transition: {{SIZE}}s;',
		@@ -1180,8 +1142,16 @@
1180	1142	);
1181	1143
1182	1144	$this->start_controls_tabs( 'tabs_shape_dividers' );
1183	1145
	1146	+ $shapes_options = [
	1147	+ '' => esc_html__( 'None', 'elementor' ),
	1148	+ ];
	1149	+
	1150	+ foreach ( Shapes::get_shapes() as $shape_name => $shape_props ) {
	1151	+ $shapes_options[ $shape_name ] = $shape_props['title'];
	1152	+ }
	1153	+
1184	1154	foreach ( [
1185	1155	'top' => esc_html__( 'Top', 'elementor' ),
1186	1156	'bottom' => esc_html__( 'Bottom', 'elementor' ),
1187	1157	] as $side => $side_label ) {
		@@ -1197,30 +1167,12 @@
1197	1167	$this->add_control(
1198	1168	$base_control_key,
1199	1169	[
1200	1170	'label' => esc_html__( 'Type', 'elementor' ),
1201		- 'type' => Controls_Manager::VISUAL_CHOICE,
1202		- 'label_block' => true,
1203		- 'columns' => 2,
1204		- 'options' => Shapes::get_shapes(),
	1171	+ 'type' => Controls_Manager::SELECT,
	1172	+ 'options' => $shapes_options,
1205	1173	'render_type' => 'none',
1206	1174	'frontend_available' => true,
1207		- 'assets' => [
1208		- 'styles' => [
1209		- [
1210		- 'name' => 'e-shapes',
1211		- 'conditions' => [
1212		- 'terms' => [
1213		- [
1214		- 'name' => $base_control_key,
1215		- 'operator' => '!==',
1216		- 'value' => '',
1217		- ],
1218		- ],
1219		- ],
1220		- ],
1221		- ],
1222		- ],
1223	1175	]
1224	1176	);
1225	1177
1226	1178	$this->add_control(
		@@ -1397,106 +1349,8 @@
1397	1349	],
1398	1350	]
1399	1351	);
1400	1352
1401		- $this->add_control(
1402		- 'heading_grid_item',
1403		- [
1404		- 'type' => Controls_Manager::HEADING,
1405		- 'label' => esc_html__( 'Grid Item', 'elementor' ),
1406		- 'separator' => 'before',
1407		- ]
1408		- );
1409		-
1410		- $this->add_responsive_control(
1411		- 'grid_column',
1412		- [
1413		- 'label' => esc_html__( 'Column Span', 'elementor' ),
1414		- 'type' => Controls_Manager::SELECT,
1415		- 'options' => [
1416		- '' => ' Default',
1417		- '1' => '1',
1418		- '2' => '2',
1419		- '3' => '3',
1420		- '4' => '4',
1421		- '5' => '5',
1422		- '6' => '6',
1423		- '7' => '7',
1424		- '8' => '8',
1425		- '9' => '9',
1426		- '10' => '10',
1427		- '11' => '11',
1428		- '12' => '12',
1429		- 'custom' => 'Custom',
1430		- ],
1431		- 'selectors' => [
1432		- '{{WRAPPER}}' => 'grid-column: span {{VALUE}};',
1433		- ],
1434		- ]
1435		- );
1436		-
1437		- $this->add_responsive_control(
1438		- 'grid_column_custom',
1439		- [
1440		- 'label' => esc_html__( 'Custom', 'elementor' ),
1441		- 'type' => Controls_Manager::TEXT,
1442		- 'ai' => [
1443		- 'active' => false,
1444		- ],
1445		- 'selectors' => [
1446		- '{{WRAPPER}}' => 'grid-column: {{VALUE}}',
1447		- ],
1448		- 'condition' => [
1449		- 'grid_column' => 'custom',
1450		- ],
1451		- ]
1452		- );
1453		-
1454		- $this->add_responsive_control(
1455		- 'grid_row',
1456		- [
1457		- 'label' => esc_html__( 'Row Span', 'elementor' ),
1458		- 'type' => Controls_Manager::SELECT,
1459		- 'options' => [
1460		- '' => ' Default',
1461		- '1' => '1',
1462		- '2' => '2',
1463		- '3' => '3',
1464		- '4' => '4',
1465		- '5' => '5',
1466		- '6' => '6',
1467		- '7' => '7',
1468		- '8' => '8',
1469		- '9' => '9',
1470		- '10' => '10',
1471		- '11' => '11',
1472		- '12' => '12',
1473		- 'custom' => 'Custom',
1474		- ],
1475		- 'selectors' => [
1476		- '{{WRAPPER}}' => 'grid-row: span {{VALUE}};',
1477		- ],
1478		- ]
1479		- );
1480		-
1481		- $this->add_responsive_control(
1482		- 'grid_row_custom',
1483		- [
1484		- 'label' => esc_html__( 'Custom', 'elementor' ),
1485		- 'type' => Controls_Manager::TEXT,
1486		- 'separator' => 'after',
1487		- 'ai' => [
1488		- 'active' => false,
1489		- ],
1490		- 'selectors' => [
1491		- '{{WRAPPER}}' => 'grid-row: {{VALUE}}',
1492		- ],
1493		- 'condition' => [
1494		- 'grid_row' => 'custom',
1495		- ],
1496		- ]
1497		- );
1498		-
1499	1353	$this->add_group_control(
1500	1354	Group_Control_Flex_Item::get_type(),
1501	1355	[
1502	1356	'name' => '_flex',
		@@ -1961,11 +1815,11 @@
1961	1815	return self::slider_to_gaps_converter( $element );
1962	1816	}
1963	1817
1964	1818	/**
1965		- * Convert slider to gaps control for the 3.16 upgrade script
	1819	+ * convert slider to gaps control for the 3.16 upgrade script
1966	1820	*
1967		- * @param array $element
	1821	+ * @param $element
1968	1822	* @return array
1969	1823	*/
1970	1824	public static function slider_to_gaps_converter( $element ) {
1971	1825	$breakpoints = array_keys( (array) Plugin::$instance->breakpoints->get_breakpoints() );
		@@ -1976,15 +1830,9 @@
1976	1830	$control = 'desktop' !== $breakpoint
1977	1831	? $control_name . '_' . $breakpoint
1978	1832	: $control_name;
1979	1833
1980		- if ( ! isset( $element['settings'][ $control ] ) ) {
1981		- continue;
1982		- }
1983		-
1984		- $already_using_gaps_control = isset( $element['settings'][ $control ]['isLinked'] ); // Slider control won't have the 'isLinked' property.
1985		-
1986		- if ( ! $already_using_gaps_control ) {
	1834	+ if ( isset( $element['settings'][ $control ] ) ) {
1987	1835	$old_size = strval( $element['settings'][ $control ]['size'] );
1988	1836
1989	1837	$element['settings'][ $control ]['column'] = $old_size;
1990	1838	$element['settings'][ $control ]['row'] = $old_size;