PluginProbe
Elementor Website Builder – more than just a page builder / 3.5.3
Elementor Website Builder – more than just a page builder v3.5.3
4.3.0-beta2 4.3.0-beta1 4.2.4 4.2.3 4.2.2 4.2.1 4.2.0 4.1.5 4.2.0-beta2 4.2.0-dev2 4.2.0-beta1 4.1.4 4.1.3 4.1.2 4.1.1 4.1.0 4.1.0-beta3 4.1.0-dev3 4.0.9 4.1.0-beta2 4.1.0-dev2 4.0.8 4.1.0-beta1 4.1.0-dev1 4.0.7 All 451 releases
← All changes | includes/base/controls-stack.php +90 -301 4.2.33.5.3 View file →
@@ -2,11 +2,10 @@
2 2 namespace Elementor;
3 3
4 4 use Elementor\Core\Base\Base_Object;
5 5 use Elementor\Core\DynamicTags\Manager;
6 +use Elementor\Core\Schemes\Manager as Schemes_Manager;
6 7 use Elementor\Core\Breakpoints\Manager as Breakpoints_Manager;
7 -use Elementor\Core\Frontend\Performance;
8 -use Elementor\Utils;
9 8
10 9 if ( ! defined( 'ABSPATH' ) ) {
11 10 exit; // Exit if accessed directly.
12 11 }
@@ -91,22 +90,8 @@
91 90 */
92 91 private $config;
93 92
94 93 /**
95 - * The additional configuration.
96 - *
97 - * Holds additional configuration that has been set using `set_config` method.
98 - * The `config` property is not modified directly while using the method because
99 - * it's used to check whether the initial config already loaded (in `get_config`).
100 - * After the initial config loaded, the additional config is merged into it.
101 - *
102 - * @access private
103 - *
104 - * @var null|array
105 - */
106 - private $additional_config = [];
107 -
108 - /**
109 94 * Current section.
110 95 *
111 96 * Holds the current section while inserting a set of controls sections.
112 97 *
@@ -226,26 +211,12 @@
226 211 public function get_id_int() {
227 212 /** We ignore possible notices, in order to support elements created prior to v1.8.0 and might include
228 213 * non-base 16 characters as part of their ID.
229 214 */
230 - return @hexdec( (string) $this->id );
215 + return @hexdec( $this->id );
231 216 }
232 217
233 218 /**
234 - * Get widget number.
235 - *
236 - * Get the first three numbers of the element converted ID.
237 - *
238 - * @since 3.16
239 - * @access public
240 - *
241 - * @return string The widget number.
242 - */
243 - public function get_widget_number(): string {
244 - return substr( $this->get_id_int(), 0, 3 );
245 - }
246 -
247 - /**
248 219 * Get the type.
249 220 *
250 221 * Retrieve the type, e.g. 'stack', 'section', 'widget' etc.
251 222 *
@@ -311,26 +282,9 @@
311 282 *
312 283 * @return mixed Controls list.
313 284 */
314 285 public function get_controls( $control_id = null ) {
315 - $stack = $this->get_stack();
316 -
317 - if ( null !== $control_id ) {
318 - $control_data = self::get_items( $stack['controls'], $control_id );
319 - if ( null === $control_data && ! empty( $stack['style_controls'] ) ) {
320 - $control_data = self::get_items( $stack['style_controls'], $control_id );
321 - }
322 -
323 - return $control_data;
324 - }
325 -
326 - $controls = $stack['controls'];
327 -
328 - if ( Performance::is_use_style_controls() && ! empty( $stack['style_controls'] ) ) {
329 - $controls += $stack['style_controls'];
330 - }
331 -
332 - return self::get_items( $controls, $control_id );
286 + return self::get_items( $this->get_stack()['controls'], $control_id );
333 287 }
334 288
335 289 /**
336 290 * Get active controls.
@@ -349,10 +303,10 @@
349 303 * @param array $settings Optional. Controls settings. Default is null.
350 304 *
351 305 * @return array Active controls.
352 306 */
353 - public function get_active_controls( ?array $controls = null, ?array $settings = null ) {
354 - Plugin::$instance->modules_manager->get_modules( 'dev-tools' )->deprecation->deprecated_function( __METHOD__, '3.0.0' );
307 + public function get_active_controls( array $controls = null, array $settings = null ) {
308 + // _deprecated_function( __METHOD__, '3.0.0' );
355 309
356 310 if ( ! $controls ) {
357 311 $controls = $this->get_controls();
358 312 }
@@ -364,9 +318,9 @@
364 318 $active_controls = array_reduce(
365 319 array_keys( $controls ), function( $active_controls, $control_key ) use ( $controls, $settings ) {
366 320 $control = $controls[ $control_key ];
367 321
368 - if ( $this->is_control_visible( $control, $settings, $controls ) ) {
322 + if ( $this->is_control_visible( $control, $settings ) ) {
369 323 $active_controls[ $control_key ] = $control;
370 324 }
371 325
372 326 return $active_controls;
@@ -439,58 +393,14 @@
439 393 }
440 394
441 395 unset( $options['position'] );
442 396
443 - if ( $this->current_popover ) {
444 - $args['popover'] = [];
445 -
446 - if ( ! $this->current_popover['initialized'] ) {
447 - $args['popover']['start'] = true;
448 -
449 - $this->current_popover['initialized'] = true;
450 - }
451 - }
452 -
453 - if ( Performance::should_optimize_controls() ) {
454 - $ui_controls = [
455 - Controls_Manager::RAW_HTML,
456 - Controls_Manager::DIVIDER,
457 - Controls_Manager::HEADING,
458 - Controls_Manager::BUTTON,
459 - Controls_Manager::ALERT,
460 - Controls_Manager::NOTICE,
461 - Controls_Manager::DEPRECATED_NOTICE,
397 + if ( $this->current_popover && ! $this->current_popover['initialized'] ) {
398 + $args['popover'] = [
399 + 'start' => true,
462 400 ];
463 401
464 - if ( ! empty( $args['type'] ) && ! empty( $args['section'] ) && in_array( $args['type'], $ui_controls ) ) {
465 - $args = [
466 - 'type' => $args['type'],
467 - 'section' => $args['section'],
468 - ];
469 - }
470 -
471 - unset(
472 - $args['label_block'],
473 - $args['label'],
474 - $args['title'],
475 - $args['tab'],
476 - $args['options'],
477 - $args['placeholder'],
478 - $args['separator'],
479 - $args['size_units'],
480 - $args['range'],
481 - $args['toggle'],
482 - $args['ai'],
483 - $args['classes'],
484 - $args['style_transfer'],
485 - $args['show_label'],
486 - $args['description'],
487 - $args['label_on'],
488 - $args['label_off'],
489 - $args['labels'],
490 - $args['handles'],
491 - $args['editor_available'],
492 - );
402 + $this->current_popover['initialized'] = true;
493 403 }
494 404
495 405 return Plugin::$instance->controls_manager->add_control_to_stack( $this, $id, $args, $options );
496 406 }
@@ -612,10 +522,10 @@
612 522
613 523 $position = array_merge( $default_position, $position );
614 524
615 525 if (
616 - ( 'control' === $position['type'] && in_array( $position['at'], [ 'start', 'end' ], true ) ) ||
617 - ( 'section' === $position['type'] && in_array( $position['at'], [ 'before', 'after' ], true ) )
526 + 'control' === $position['type'] && in_array( $position['at'], [ 'start', 'end' ], true ) ||
527 + 'section' === $position['type'] && in_array( $position['at'], [ 'before', 'after' ], true )
618 528 ) {
619 529 _doing_it_wrong( sprintf( '%s::%s', get_called_class(), __FUNCTION__ ), 'Invalid position arguments. Use `before` / `after` for control or `start` / `end` for section.', '1.7.0' ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
620 530
621 531 return false;
@@ -637,13 +547,13 @@
637 547
638 548 $controls_keys = array_keys( $registered_controls );
639 549
640 550 while ( Controls_Manager::SECTION !== $registered_controls[ $controls_keys[ $target_section_index ] ]['type'] ) {
641 - --$target_section_index;
551 + $target_section_index--;
642 552 }
643 553
644 554 if ( 'section' === $position['type'] ) {
645 - ++$target_control_index;
555 + $target_control_index++;
646 556
647 557 if ( 'end' === $position['at'] ) {
648 558 while ( Controls_Manager::SECTION !== $registered_controls[ $controls_keys[ $target_control_index ] ]['type'] ) {
649 559 if ( ++$target_control_index >= count( $registered_controls ) ) {
@@ -655,9 +565,9 @@
655 565
656 566 $target_control = $registered_controls[ $controls_keys[ $target_control_index ] ];
657 567
658 568 if ( 'after' === $position['at'] ) {
659 - ++$target_control_index;
569 + $target_control_index++;
660 570 }
661 571
662 572 $section_id = $registered_controls[ $controls_keys[ $target_section_index ] ]['name'];
663 573
@@ -737,9 +647,9 @@
737 647
738 648 $controls_keys = array_keys( $registered_controls );
739 649
740 650 while ( true ) {
741 - ++$section_index;
651 + $section_index++;
742 652
743 653 if ( ! isset( $controls_keys[ $section_index ] ) ) {
744 654 break;
745 655 }
@@ -750,9 +660,9 @@
750 660 break;
751 661 }
752 662
753 663 $section_controls[ $control_key ] = $registered_controls[ $control_key ];
754 - }
664 + };
755 665
756 666 return $section_controls;
757 667 }
758 668
@@ -781,8 +691,30 @@
781 691 $group->add_controls( $this, $args, $options );
782 692 }
783 693
784 694 /**
695 + * Get scheme controls.
696 + *
697 + * Retrieve all the controls that use schemes.
698 + *
699 + * @since 1.4.0
700 + * @access public
701 + * @deprecated 3.0.0
702 + *
703 + * @return array Scheme controls.
704 + */
705 + final public function get_scheme_controls() {
706 + // _deprecated_function( __METHOD__, '3.0.0' );
707 + $enabled_schemes = Schemes_Manager::get_enabled_schemes();
708 +
709 + return array_filter(
710 + $this->get_controls(), function( $control ) use ( $enabled_schemes ) {
711 + return ( ! empty( $control['scheme'] ) && in_array( $control['scheme']['type'], $enabled_schemes ) );
712 + }
713 + );
714 + }
715 +
716 + /**
785 717 * Get style controls.
786 718 *
787 719 * Retrieve style controls for all active controls or, when requested, from
788 720 * a specific set of controls.
@@ -796,10 +728,10 @@
796 728 * @param array $settings Optional. Controls settings. Default is null.
797 729 *
798 730 * @return array Style controls.
799 731 */
800 - final public function get_style_controls( ?array $controls = null, ?array $settings = null ) {
801 - Plugin::$instance->modules_manager->get_modules( 'dev-tools' )->deprecation->deprecated_function( __METHOD__, '3.0.0' );
732 + final public function get_style_controls( array $controls = null, array $settings = null ) {
733 + // _deprecated_function( __METHOD__, '3.0.0' );
802 734
803 735 $controls = $this->get_active_controls( $controls, $settings );
804 736
805 737 $style_controls = [];
@@ -869,12 +801,9 @@
869 801 $args['responsive'] = [];
870 802
871 803 $active_breakpoints = Plugin::$instance->breakpoints->get_active_breakpoints();
872 804
873 - $devices = Plugin::$instance->breakpoints->get_active_devices_list( [
874 - 'reverse' => true,
875 - 'desktop_first' => true,
876 - ] );
805 + $devices = Plugin::$instance->breakpoints->get_active_devices_list( [ 'reverse' => true ] );
877 806
878 807 if ( isset( $args['devices'] ) ) {
879 808 $devices = array_intersect( $devices, $args['devices'] );
880 809
@@ -930,14 +859,9 @@
930 859 foreach ( $devices as $device_name ) {
931 860 $control_args = $args;
932 861
933 862 // Set parent using the name from previous iteration.
934 - if ( isset( $control_name ) ) {
935 - // If $control_name end with _widescreen use desktop name instead.
936 - $control_args['parent'] = '_widescreen' === substr( $control_name, -strlen( '_widescreen' ) ) ? $id : $control_name;
937 - } else {
938 - $control_args['parent'] = null;
939 - }
863 + $control_args['parent'] = isset( $control_name ) ? $control_name : null;
940 864
941 865 if ( isset( $control_args['device_args'] ) ) {
942 866 if ( ! empty( $control_args['device_args'][ $device_name ] ) ) {
943 867 $control_args = array_merge( $control_args, $control_args['device_args'][ $device_name ] );
@@ -979,11 +903,9 @@
979 903 $id_suffix = Breakpoints_Manager::BREAKPOINT_KEY_DESKTOP === $device_name ? '' : '_' . $device_name;
980 904 $control_name = $id . $id_suffix;
981 905
982 906 // Set this control as child of previous iteration control.
983 - if ( ! empty( $control_args['parent'] ) ) {
984 - $this->update_control( $control_args['parent'], [ 'inheritors' => [ $control_name ] ] );
985 - }
907 + $this->update_control( $control_args['parent'], [ 'inheritors' => [ $control_name ] ] );
986 908
987 909 if ( ! empty( $options['overwrite'] ) ) {
988 910 $this->update_control( $control_name, $control_args, [
989 911 'recursive' => ! empty( $options['recursive'] ),
@@ -1025,9 +947,13 @@
1025 947 *
1026 948 * @param string $id Responsive control ID.
1027 949 */
1028 950 final public function remove_responsive_control( $id ) {
1029 - $devices = Plugin::$instance->breakpoints->get_active_devices_list( [ 'reverse' => true ] );
951 + $devices = [
952 + Breakpoints_Manager::BREAKPOINT_KEY_DESKTOP,
953 + Breakpoints_Manager::BREAKPOINT_KEY_TABLET,
954 + Breakpoints_Manager::BREAKPOINT_KEY_MOBILE,
955 + ];
1030 956
1031 957 foreach ( $devices as $device_name ) {
1032 958 $id_suffix = Breakpoints_Manager::BREAKPOINT_KEY_DESKTOP === $device_name ? '' : '_' . $device_name;
1033 959
@@ -1060,10 +986,10 @@
1060 986 * @return array|null The config.
1061 987 */
1062 988 final public function get_config() {
1063 989 if ( null === $this->config ) {
1064 - // TODO: This is for backwards compatibility starting from 2.9.0.
1065 - // This if statement should be removed when the method is hard-deprecated.
990 + // TODO: This is for backwards compatibility starting from 2.9.0
991 + // This if statement should be removed when the method is hard-deprecated
1066 992 if ( $this->has_own_method( '_get_initial_config', self::class ) ) {
1067 993 Plugin::$instance->modules_manager->get_modules( 'dev-tools' )->deprecation->deprecated_function( '_get_initial_config', '2.9.0', __CLASS__ . '::get_initial_config()' );
1068 994
1069 995 $this->config = $this->_get_initial_config();
@@ -1069,16 +995,8 @@
1069 995 $this->config = $this->_get_initial_config();
1070 996 } else {
1071 997 $this->config = $this->get_initial_config();
1072 998 }
1073 -
1074 - foreach ( $this->additional_config as $key => $value ) {
1075 - if ( isset( $this->config[ $key ] ) ) {
1076 - $this->config[ $key ] = wp_parse_args( $value, $this->config[ $key ] );
1077 - } else {
1078 - $this->config[ $key ] = $value;
1079 - }
1080 - }
1081 999 }
1082 1000
1083 1001 return $this->config;
1084 1002 }
@@ -1087,18 +1005,18 @@
1087 1005 * Set a config property.
1088 1006 *
1089 1007 * Set a specific property of the config list for this controls-stack.
1090 1008 *
1091 - * @param string $key
1092 - * @param string $value
1093 1009 * @since 3.5.0
1094 1010 * @access public
1095 1011 */
1096 1012 public function set_config( $key, $value ) {
1097 - if ( isset( $this->additional_config[ $key ] ) ) {
1098 - $this->additional_config[ $key ] = wp_parse_args( $value, $this->additional_config[ $key ] );
1013 + $this->config = $this->get_config();
1014 +
1015 + if ( isset( $this->config[ $key ] ) && is_array( $this->config[ $key ] ) && is_array( $value ) ) {
1016 + $this->config[ $key ] = array_merge( $this->config[ $key ], $value );
1099 1017 } else {
1100 - $this->additional_config[ $key ] = $value;
1018 + $this->config[ $key ] = $value;
1101 1019 }
1102 1020 }
1103 1021
1104 1022 /**
@@ -1166,11 +1084,8 @@
1166 1084 return self::get_items( $this->data, $item );
1167 1085 }
1168 1086
1169 1087 /**
1170 - * @param null $setting
1171 - * @param null $settings
1172 - * @return array|mixed|null
1173 1088 * @since 2.0.14
1174 1089 * @access public
1175 1090 */
1176 1091 public function get_parsed_dynamic_settings( $setting = null, $settings = null ) {
@@ -1184,28 +1099,21 @@
1184 1099
1185 1100 return self::get_items( $this->parsed_dynamic_settings, $setting );
1186 1101 }
1187 1102
1188 - public function reset_render_state(): void {
1189 - $this->active_settings = null;
1190 - $this->parsed_active_settings = null;
1191 - $this->parsed_dynamic_settings = null;
1192 - $this->render_attributes = [];
1193 - }
1194 -
1195 1103 /**
1196 1104 * Get active settings.
1197 1105 *
1198 1106 * Retrieve the settings from all the active controls.
1199 1107 *
1200 - * @param array|null $settings Optional. Controls settings. Default is null.
1201 - * @param array|null $controls Optional. An array of controls. Default is null.
1202 - *
1203 - * @return array Active settings.
1108 + * @since 1.4.0
1204 1109 * @since 2.1.0 Added the `controls` and the `settings` parameters.
1205 1110 * @access public
1206 1111 *
1207 - * @since 1.4.0
1112 + * @param array $controls Optional. An array of controls. Default is null.
1113 + * @param array $settings Optional. Controls settings. Default is null.
1114 + *
1115 + * @return array Active settings.
1208 1116 */
1209 1117 public function get_active_settings( $settings = null, $controls = null ) {
1210 1118 $is_first_request = ! $settings && ! $this->active_settings;
1211 1119
@@ -1220,10 +1128,8 @@
1220 1128 }
1221 1129
1222 1130 $active_settings = [];
1223 1131
1224 - $controls_objs = Plugin::$instance->controls_manager->get_controls();
1225 -
1226 1132 foreach ( $settings as $setting_key => $setting ) {
1227 1133 if ( ! isset( $controls[ $setting_key ] ) ) {
1228 1134 $active_settings[ $setting_key ] = $setting;
1229 1135
@@ -1231,10 +1137,10 @@
1231 1137 }
1232 1138
1233 1139 $control = $controls[ $setting_key ];
1234 1140
1235 - if ( $this->is_control_visible( $control, $settings, $controls ) ) {
1236 - $control_obj = $controls_objs[ $control['type'] ] ?? null;
1141 + if ( $this->is_control_visible( $control, $settings ) ) {
1142 + $control_obj = Plugin::$instance->controls_manager->get_control( $control['type'] );
1237 1143
1238 1144 if ( $control_obj instanceof Control_Repeater ) {
1239 1145 foreach ( $setting as & $item ) {
1240 1146 $item = $this->get_active_settings( $item, $control['fields'] );
@@ -1301,13 +1207,11 @@
1301 1207 if ( null === $controls ) {
1302 1208 $controls = $this->get_controls();
1303 1209 }
1304 1210
1305 - $controls_objs = Plugin::$instance->controls_manager->get_controls();
1306 -
1307 1211 foreach ( $controls as $control ) {
1308 1212 $control_name = $control['name'];
1309 - $control_obj = $controls_objs[ $control['type'] ] ?? null;
1213 + $control_obj = Plugin::$instance->controls_manager->get_control( $control['type'] );
1310 1214
1311 1215 if ( ! $control_obj instanceof Base_Data_Control ) {
1312 1216 continue;
1313 1217 }
@@ -1417,33 +1321,21 @@
1417 1321 );
1418 1322 }
1419 1323
1420 1324 /**
1421 - * Get Responsive Control Device Suffix
1422 - *
1423 - * @deprecated 3.7.6 Use `Elementor\Controls_Manager::get_responsive_control_device_suffix()` instead.
1424 - * @param array $control
1425 - * @return string $device suffix
1426 - */
1427 - protected function get_responsive_control_device_suffix( $control ) {
1428 - Plugin::$instance->modules_manager->get_modules( 'dev-tools' )->deprecation->deprecated_function( __METHOD__, '3.7.6', 'Elementor\Controls_Manager::get_responsive_control_device_suffix()' );
1429 -
1430 - return Controls_Manager::get_responsive_control_device_suffix( $control );
1431 - }
1432 -
1433 - /**
1434 1325 * Whether the control is visible or not.
1435 1326 *
1436 1327 * Used to determine whether the control is visible or not.
1437 1328 *
1329 + * @since 1.4.0
1330 + * @access public
1331 + *
1438 1332 * @param array $control The control.
1439 - * @param null $values Optional. Condition values. Default is null.
1440 - * @param null $controls
1333 + * @param array $values Optional. Condition values. Default is null.
1334 + *
1441 1335 * @return bool Whether the control is visible.
1442 - * @since 1.4.0
1443 - * @access public
1444 1336 */
1445 - public function is_control_visible( $control, $values = null, $controls = null ) {
1337 + public function is_control_visible( $control, $values = null ) {
1446 1338 if ( null === $values ) {
1447 1339 $values = $this->get_settings();
1448 1340 }
1449 1341
@@ -1454,37 +1346,21 @@
1454 1346 if ( empty( $control['condition'] ) ) {
1455 1347 return true;
1456 1348 }
1457 1349
1458 - if ( ! $controls ) {
1459 - $controls = $this->get_controls();
1460 - }
1461 -
1462 1350 foreach ( $control['condition'] as $condition_key => $condition_value ) {
1463 1351 preg_match( '/([a-z_\-0-9]+)(?:\[([a-z_]+)])?(!?)$/i', $condition_key, $condition_key_parts );
1464 1352
1465 1353 $pure_condition_key = $condition_key_parts[1];
1466 1354 $condition_sub_key = $condition_key_parts[2];
1467 - $is_negative_condition = (bool) $condition_key_parts[3];
1355 + $is_negative_condition = ! ! $condition_key_parts[3];
1468 1356
1469 1357 if ( ! isset( $values[ $pure_condition_key ] ) || null === $values[ $pure_condition_key ] ) {
1470 1358 return false;
1471 1359 }
1472 1360
1473 - $are_control_and_condition_responsive = isset( $control['responsive'] ) && ! empty( $controls[ $pure_condition_key ]['responsive'] );
1474 - $condition_name_to_check = $pure_condition_key;
1361 + $instance_value = $values[ $pure_condition_key ];
1475 1362
1476 - if ( $are_control_and_condition_responsive ) {
1477 - $device_suffix = Controls_Manager::get_responsive_control_device_suffix( $control );
1478 -
1479 - $condition_name_to_check = $pure_condition_key . $device_suffix;
1480 -
1481 - // If the control is not desktop, and a conditioning control for the corresponding device exists, use it.
1482 - $instance_value = $values[ $pure_condition_key . $device_suffix ] ?? $values[ $pure_condition_key ];
1483 - } else {
1484 - $instance_value = $values[ $pure_condition_key ];
1485 - }
1486 -
1487 1363 if ( $condition_sub_key && is_array( $instance_value ) ) {
1488 1364 if ( ! isset( $instance_value[ $condition_sub_key ] ) ) {
1489 1365 return false;
1490 1366 }
@@ -1491,32 +1367,8 @@
1491 1367
1492 1368 $instance_value = $instance_value[ $condition_sub_key ];
1493 1369 }
1494 1370
1495 - if ( ! $instance_value ) {
1496 - $parent = isset( $controls[ $condition_name_to_check ]['parent'] ) ? $controls[ $condition_name_to_check ]['parent'] : false;
1497 -
1498 - while ( $parent ) {
1499 - $instance_value = $values[ $parent ];
1500 -
1501 - if ( $instance_value ) {
1502 - if ( ! is_array( $instance_value ) ) {
1503 - break;
1504 - }
1505 -
1506 - if ( $condition_sub_key && isset( $instance_value[ $condition_sub_key ] ) ) {
1507 - $instance_value = $instance_value[ $condition_sub_key ];
1508 -
1509 - if ( '' !== $instance_value ) {
1510 - break;
1511 - }
1512 - }
1513 - }
1514 -
1515 - $parent = isset( $controls[ $parent ]['parent'] ) ? $controls[ $parent ]['parent'] : false;
1516 - }
1517 - }
1518 -
1519 1371 /**
1520 1372 * If the $condition_value is a non empty array - check if the $condition_value contains the $instance_value,
1521 1373 * If the $instance_value is a non empty array - check if the $instance_value contains the $condition_value
1522 1374 * otherwise check if they are equal. ( and give the ability to check if the value is an empty array )
@@ -1528,12 +1380,9 @@
1528 1380 } else {
1529 1381 $is_contains = $instance_value === $condition_value;
1530 1382 }
1531 1383
1532 - if (
1533 - ( $is_negative_condition && $is_contains ) ||
1534 - ( ! $is_negative_condition && ! $is_contains )
1535 - ) {
1384 + if ( $is_negative_condition && $is_contains || ! $is_negative_condition && ! $is_contains ) {
1536 1385 return false;
1537 1386 }
1538 1387 }
1539 1388
@@ -1584,12 +1433,8 @@
1584 1433 * @param array $args Section arguments.
1585 1434 */
1586 1435 do_action( "elementor/element/{$stack_name}/{$section_id}/before_section_start", $this, $args );
1587 1436
1588 - if ( $this->should_manually_trigger_common_action( $stack_name ) ) {
1589 - do_action( "elementor/element/common/{$section_id}/before_section_start", $this, $args );
1590 - }
1591 -
1592 1437 $args['type'] = Controls_Manager::SECTION;
1593 1438
1594 1439 $this->add_control( $section_id, $args );
1595 1440
@@ -1628,12 +1473,8 @@
1628 1473 * @param Controls_Stack $this The control.
1629 1474 * @param array $args Section arguments.
1630 1475 */
1631 1476 do_action( "elementor/element/{$stack_name}/{$section_id}/after_section_start", $this, $args );
1632 -
1633 - if ( $this->should_manually_trigger_common_action( $stack_name ) ) {
1634 - do_action( "elementor/element/common/{$section_id}/after_section_start", $this, $args );
1635 - }
1636 1477 }
1637 1478
1638 1479 /**
1639 1480 * End controls section.
@@ -1682,12 +1523,8 @@
1682 1523 * @param array $args Section arguments.
1683 1524 */
1684 1525 do_action( "elementor/element/{$stack_name}/{$section_id}/before_section_end", $this, $args );
1685 1526
1686 - if ( $this->should_manually_trigger_common_action( $stack_name ) ) {
1687 - do_action( "elementor/element/common/{$section_id}/before_section_end", $this, $args );
1688 - }
1689 -
1690 1527 $this->current_section = null;
1691 1528
1692 1529 /**
1693 1530 * After section end.
@@ -1714,40 +1551,11 @@
1714 1551 * @param Controls_Stack $this The control.
1715 1552 * @param array $args Section arguments.
1716 1553 */
1717 1554 do_action( "elementor/element/{$stack_name}/{$section_id}/after_section_end", $this, $args );
1718 -
1719 - if ( $this->should_manually_trigger_common_action( $stack_name ) ) {
1720 - do_action( "elementor/element/common/{$section_id}/after_section_end", $this, $args );
1721 - }
1722 1555 }
1723 1556
1724 1557 /**
1725 - * Should manually trigger common action.
1726 - *
1727 - * With the Optimized Markup experiment, the Advanced Tab has been split to maintain backward compatibility:
1728 - * - 'common' refers to the existing Advanced Tab.
1729 - * - 'common-optimized' refers to the new Advanced Tab for optimized widgets.
1730 - *
1731 - * Third-party developers may have used hooks like 'elementor/element/common/_section_background/before_section_end'
1732 - * to add controls to the Advanced Tab. However, this hook will now only work on widgets that are not optimized.
1733 - *
1734 - * This method checks whether the 'elementor/element/common/...' hooks should be manually executed
1735 - * to prevent third parties from needing to add equivalent hooks for 'elementor/element/common-optimized/...'.
1736 - *
1737 - * @todo Remove this method and the manual execution of 'common' hooks when the feature is merged.
1738 - *
1739 - * @access private
1740 - *
1741 - * @param string $stack_name Stack name.
1742 - *
1743 - * @return bool
1744 - */
1745 - private function should_manually_trigger_common_action( $stack_name ): bool {
1746 - return 'common-optimized' === $stack_name && Plugin::$instance->experiments->is_feature_active( 'e_optimized_markup' );
1747 - }
1748 -
1749 - /**
1750 1558 * Start controls tabs.
1751 1559 *
1752 1560 * Used to add a new set of tabs inside a section. You should use this
1753 1561 * method before adding new individual tabs using `start_controls_tab()`.
@@ -2020,10 +1828,10 @@
2020 1828 *
2021 1829 * @since 2.7.0
2022 1830 * @access public
2023 1831 *
2024 - * @param string $element The HTML element.
2025 - * @param string $key Optional. Attribute key. Default is null.
1832 + * @param string $element The HTML element.
1833 + * @param string $key Optional. Attribute key. Default is null.
2026 1834 * @param array|string $values Optional. Attribute value/s. Default is null.
2027 1835 */
2028 1836 public function remove_render_attribute( $element, $key = null, $values = null ) {
2029 1837 if ( $key && ! isset( $this->render_attributes[ $element ][ $key ] ) ) {
@@ -2080,9 +1888,9 @@
2080 1888 *
2081 1889 * @param array|string $element The element.
2082 1890 */
2083 1891 public function print_render_attribute_string( $element ) {
2084 - Utils::print_unescaped_internal_string( $this->get_render_attribute_string( $element ) );
1892 + echo $this->get_render_attribute_string( $element ); // XSS ok.
2085 1893 }
2086 1894
2087 1895 /**
2088 1896 * Print element template.
@@ -2095,9 +1903,9 @@
2095 1903 public function print_template() {
2096 1904 ob_start();
2097 1905
2098 1906 // TODO: This is for backwards compatibility starting from 2.9.0
2099 - // This `if` statement should be removed when the method is removed.
1907 + // This `if` statement should be removed when the method is removed
2100 1908 if ( $this->has_own_method( '_content_template', self::class ) ) {
2101 1909 Plugin::$instance->modules_manager->get_modules( 'dev-tools' )->deprecation->deprecated_function( '_content_template', '2.9.0', __CLASS__ . '::content_template()' );
2102 1910
2103 1911 $this->_content_template();
@@ -2133,23 +1941,8 @@
2133 1941 <?php
2134 1942 }
2135 1943
2136 1944 /**
2137 - * On import update dynamic content (e.g. post and term IDs).
2138 - *
2139 - * @since 3.8.0
2140 - *
2141 - * @param array $config The config of the passed element.
2142 - * @param array $data The data that requires updating/replacement when imported.
2143 - * @param array|null $controls The available controls.
2144 - *
2145 - * @return array Element data.
2146 - */
2147 - public static function on_import_update_dynamic_content( array $config, array $data, $controls = null ): array {
2148 - return $config;
2149 - }
2150 -
2151 - /**
2152 1945 * Start injection.
2153 1946 *
2154 1947 * Used to inject controls and sections to a specific position in the stack.
2155 1948 *
@@ -2224,12 +2017,12 @@
2224 2017 * `start_controls_tab()`.
2225 2018 *
2226 2019 * @since 1.4.0
2227 2020 * @access protected
2228 - * @deprecated 3.1.0 Use `register_controls()` method instead.
2021 + * @deprecated 3.1.0 Use `Controls_Stack::register_controls()` instead
2229 2022 */
2230 2023 protected function _register_controls() {
2231 - Plugin::$instance->modules_manager->get_modules( 'dev-tools' )->deprecation->deprecated_function( __METHOD__, '3.1.0', 'register_controls()' );
2024 + Plugin::$instance->modules_manager->get_modules( 'dev-tools' )->deprecation->deprecated_function( __METHOD__, '3.1.0', __CLASS__ . '::register_controls()' );
2232 2025
2233 2026 $this->register_controls();
2234 2027 }
2235 2028
@@ -2272,12 +2065,10 @@
2272 2065 */
2273 2066 protected function get_init_settings() {
2274 2067 $settings = $this->get_data( 'settings' );
2275 2068
2276 - $controls_objs = Plugin::$instance->controls_manager->get_controls();
2277 -
2278 2069 foreach ( $this->get_controls() as $control ) {
2279 - $control_obj = $controls_objs[ $control['type'] ] ?? null;
2070 + $control_obj = Plugin::$instance->controls_manager->get_control( $control['type'] );
2280 2071
2281 2072 if ( ! $control_obj instanceof Base_Data_Control ) {
2282 2073 continue;
2283 2074 }
@@ -2313,15 +2104,15 @@
2313 2104 * Retrieve the current element initial configuration - controls list and
2314 2105 * the tabs assigned to the control.
2315 2106 *
2316 2107 * @since 1.4.0
2317 - * @deprecated 2.9.0 Use `get_initial_config()` method instead.
2108 + * @deprecated 2.9.0 use `get_initial_config()` instead
2318 2109 * @access protected
2319 2110 *
2320 2111 * @return array The initial config.
2321 2112 */
2322 2113 protected function _get_initial_config() {
2323 - Plugin::$instance->modules_manager->get_modules( 'dev-tools' )->deprecation->deprecated_function( __METHOD__, '2.9.0', 'get_initial_config()' );
2114 + Plugin::$instance->modules_manager->get_modules( 'dev-tools' )->deprecation->deprecated_function( __METHOD__, '2.9.0', __CLASS__ . '::get_initial_config()' );
2324 2115
2325 2116 return $this->get_initial_config();
2326 2117 }
2327 2118
@@ -2392,9 +2183,9 @@
2392 2183 *
2393 2184 * @param string $template_content Template content.
2394 2185 */
2395 2186 protected function print_template_content( $template_content ) {
2396 - Utils::print_unescaped_internal_string( $template_content );
2187 + echo $template_content; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
2397 2188 }
2398 2189
2399 2190 /**
2400 2191 * Render element output in the editor.
@@ -2411,13 +2202,13 @@
2411 2202 *
2412 2203 * Used to generate the live preview, using a Backbone JavaScript template.
2413 2204 *
2414 2205 * @since 2.0.0
2415 - * @deprecated 2.9.0 Use `content_template()` method instead.
2206 + * @deprecated 2.9.0 use `content_template()` instead
2416 2207 * @access protected
2417 2208 */
2418 2209 protected function _content_template() {
2419 - Plugin::$instance->modules_manager->get_modules( 'dev-tools' )->deprecation->deprecated_function( __METHOD__, '2.9.0', 'content_template()' );
2210 + Plugin::$instance->modules_manager->get_modules( 'dev-tools' )->deprecation->deprecated_function( __METHOD__, '2.9.0', __CLASS__ . '::content_template()' );
2420 2211
2421 2212 $this->content_template();
2422 2213 }
2423 2214
@@ -2432,9 +2223,9 @@
2432 2223 protected function init_controls() {
2433 2224 Plugin::$instance->controls_manager->open_stack( $this );
2434 2225
2435 2226 // TODO: This is for backwards compatibility starting from 2.9.0
2436 - // This `if` statement should be removed when the method is removed.
2227 + // This `if` statement should be removed when the method is removed
2437 2228 if ( $this->has_own_method( '_register_controls', self::class ) ) {
2438 2229 Plugin::$instance->modules_manager->get_modules( 'dev-tools' )->deprecation->deprecated_function( '_register_controls', '3.1.0', __CLASS__ . '::register_controls()' );
2439 2230
2440 2231 $this->_register_controls();
@@ -2470,11 +2261,9 @@
2470 2261 if ( null !== $target_tab ) {
2471 2262 $args = array_replace_recursive( $target_tab, $args );
2472 2263 }
2473 2264 } elseif ( empty( $args['section'] ) && ( ! $overwrite || is_wp_error( Plugin::$instance->controls_manager->get_control_from_stack( $this->get_unique_name(), $control_id ) ) ) ) {
2474 - if ( ! Performance::should_optimize_controls() ) {
2475 - wp_die( sprintf( '%s::%s: Cannot add a control outside of a section (use `start_controls_section`).', get_called_class(), __FUNCTION__ ) ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
2476 - }
2265 + wp_die( sprintf( '%s::%s: Cannot add a control outside of a section (use `start_controls_section`).', get_called_class(), __FUNCTION__ ) ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
2477 2266 }
2478 2267
2479 2268 return $args;
2480 2269 }
@@ -2500,15 +2289,15 @@
2500 2289 *
2501 2290 * Set the raw data, the ID and the parsed settings.
2502 2291 *
2503 2292 * @since 1.4.0
2504 - * @deprecated 2.9.0 Use `init()` method instead.
2293 + * @deprecated 2.9.0 use `init()` instead
2505 2294 * @access protected
2506 2295 *
2507 2296 * @param array $data Initial data.
2508 2297 */
2509 2298 protected function _init( $data ) {
2510 - Plugin::$instance->modules_manager->get_modules( 'dev-tools' )->deprecation->deprecated_function( __METHOD__, '2.9.0', 'init()' );
2299 + Plugin::$instance->modules_manager->get_modules( 'dev-tools' )->deprecation->deprecated_function( __METHOD__, '2.9.0', __CLASS__ . '::init()' );
2511 2300
2512 2301 $this->init( $data );
2513 2302 }
2514 2303
@@ -2579,9 +2368,9 @@
2579 2368 */
2580 2369 public function __construct( array $data = [] ) {
2581 2370 if ( $data ) {
2582 2371 // TODO: This is for backwards compatibility starting from 2.9.0
2583 - // This if statement should be removed when the method is hard-deprecated.
2372 + // This if statement should be removed when the method is hard-deprecated
2584 2373 if ( $this->has_own_method( '_init', self::class ) ) {
2585 2374 Plugin::$instance->modules_manager->get_modules( 'dev-tools' )->deprecation->deprecated_function( '_init', '2.9.0', __CLASS__ . '::init()' );
2586 2375
2587 2376 $this->_init( $data );