| @@ -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 | } |
| @@ -226,26 +225,12 @@ | ||
| 226 | 225 | public function get_id_int() { |
| 227 | 226 | /** We ignore possible notices, in order to support elements created prior to v1.8.0 and might include |
| 228 | 227 | * non-base 16 characters as part of their ID. |
| 229 | 228 | */ |
| 230 | - return @hexdec( (string) $this->id ); | |
| 229 | + return @hexdec( $this->id ); | |
| 231 | 230 | } |
| 232 | 231 | |
| 233 | 232 | /** |
| 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 | 233 | * Get the type. |
| 249 | 234 | * |
| 250 | 235 | * Retrieve the type, e.g. 'stack', 'section', 'widget' etc. |
| 251 | 236 | * |
| @@ -311,26 +296,9 @@ | ||
| 311 | 296 | * |
| 312 | 297 | * @return mixed Controls list. |
| 313 | 298 | */ |
| 314 | 299 | 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 ); | |
| 300 | + return self::get_items( $this->get_stack()['controls'], $control_id ); | |
| 333 | 301 | } |
| 334 | 302 | |
| 335 | 303 | /** |
| 336 | 304 | * Get active controls. |
| @@ -349,9 +317,9 @@ | ||
| 349 | 317 | * @param array $settings Optional. Controls settings. Default is null. |
| 350 | 318 | * |
| 351 | 319 | * @return array Active controls. |
| 352 | 320 | */ |
| 353 | - public function get_active_controls( ?array $controls = null, ?array $settings = null ) { | |
| 321 | + public function get_active_controls( array $controls = null, array $settings = null ) { | |
| 354 | 322 | Plugin::$instance->modules_manager->get_modules( 'dev-tools' )->deprecation->deprecated_function( __METHOD__, '3.0.0' ); |
| 355 | 323 | |
| 356 | 324 | if ( ! $controls ) { |
| 357 | 325 | $controls = $this->get_controls(); |
| @@ -364,9 +332,9 @@ | ||
| 364 | 332 | $active_controls = array_reduce( |
| 365 | 333 | array_keys( $controls ), function( $active_controls, $control_key ) use ( $controls, $settings ) { |
| 366 | 334 | $control = $controls[ $control_key ]; |
| 367 | 335 | |
| 368 | - if ( $this->is_control_visible( $control, $settings, $controls ) ) { | |
| 336 | + if ( $this->is_control_visible( $control, $settings ) ) { | |
| 369 | 337 | $active_controls[ $control_key ] = $control; |
| 370 | 338 | } |
| 371 | 339 | |
| 372 | 340 | return $active_controls; |
| @@ -439,58 +407,14 @@ | ||
| 439 | 407 | } |
| 440 | 408 | |
| 441 | 409 | unset( $options['position'] ); |
| 442 | 410 | |
| 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, | |
| 411 | + if ( $this->current_popover && ! $this->current_popover['initialized'] ) { | |
| 412 | + $args['popover'] = [ | |
| 413 | + 'start' => true, | |
| 462 | 414 | ]; |
| 463 | 415 | |
| 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 | - ); | |
| 416 | + $this->current_popover['initialized'] = true; | |
| 493 | 417 | } |
| 494 | 418 | |
| 495 | 419 | return Plugin::$instance->controls_manager->add_control_to_stack( $this, $id, $args, $options ); |
| 496 | 420 | } |
| @@ -612,10 +536,10 @@ | ||
| 612 | 536 | |
| 613 | 537 | $position = array_merge( $default_position, $position ); |
| 614 | 538 | |
| 615 | 539 | if ( |
| 616 | - ( 'control' === $position['type'] && in_array( $position['at'], [ 'start', 'end' ], true ) ) || | |
| 617 | - ( 'section' === $position['type'] && in_array( $position['at'], [ 'before', 'after' ], true ) ) | |
| 540 | + 'control' === $position['type'] && in_array( $position['at'], [ 'start', 'end' ], true ) || | |
| 541 | + 'section' === $position['type'] && in_array( $position['at'], [ 'before', 'after' ], true ) | |
| 618 | 542 | ) { |
| 619 | 543 | _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 | 544 | |
| 621 | 545 | return false; |
| @@ -637,13 +561,13 @@ | ||
| 637 | 561 | |
| 638 | 562 | $controls_keys = array_keys( $registered_controls ); |
| 639 | 563 | |
| 640 | 564 | while ( Controls_Manager::SECTION !== $registered_controls[ $controls_keys[ $target_section_index ] ]['type'] ) { |
| 641 | - --$target_section_index; | |
| 565 | + $target_section_index--; | |
| 642 | 566 | } |
| 643 | 567 | |
| 644 | 568 | if ( 'section' === $position['type'] ) { |
| 645 | - ++$target_control_index; | |
| 569 | + $target_control_index++; | |
| 646 | 570 | |
| 647 | 571 | if ( 'end' === $position['at'] ) { |
| 648 | 572 | while ( Controls_Manager::SECTION !== $registered_controls[ $controls_keys[ $target_control_index ] ]['type'] ) { |
| 649 | 573 | if ( ++$target_control_index >= count( $registered_controls ) ) { |
| @@ -655,9 +579,9 @@ | ||
| 655 | 579 | |
| 656 | 580 | $target_control = $registered_controls[ $controls_keys[ $target_control_index ] ]; |
| 657 | 581 | |
| 658 | 582 | if ( 'after' === $position['at'] ) { |
| 659 | - ++$target_control_index; | |
| 583 | + $target_control_index++; | |
| 660 | 584 | } |
| 661 | 585 | |
| 662 | 586 | $section_id = $registered_controls[ $controls_keys[ $target_section_index ] ]['name']; |
| 663 | 587 | |
| @@ -737,9 +661,9 @@ | ||
| 737 | 661 | |
| 738 | 662 | $controls_keys = array_keys( $registered_controls ); |
| 739 | 663 | |
| 740 | 664 | while ( true ) { |
| 741 | - ++$section_index; | |
| 665 | + $section_index++; | |
| 742 | 666 | |
| 743 | 667 | if ( ! isset( $controls_keys[ $section_index ] ) ) { |
| 744 | 668 | break; |
| 745 | 669 | } |
| @@ -750,9 +674,9 @@ | ||
| 750 | 674 | break; |
| 751 | 675 | } |
| 752 | 676 | |
| 753 | 677 | $section_controls[ $control_key ] = $registered_controls[ $control_key ]; |
| 754 | - } | |
| 678 | + }; | |
| 755 | 679 | |
| 756 | 680 | return $section_controls; |
| 757 | 681 | } |
| 758 | 682 | |
| @@ -781,8 +705,32 @@ | ||
| 781 | 705 | $group->add_controls( $this, $args, $options ); |
| 782 | 706 | } |
| 783 | 707 | |
| 784 | 708 | /** |
| 709 | + * Get scheme controls. | |
| 710 | + * | |
| 711 | + * Retrieve all the controls that use schemes. | |
| 712 | + * | |
| 713 | + * @since 1.4.0 | |
| 714 | + * @access public | |
| 715 | + * @deprecated 3.0.0 | |
| 716 | + * | |
| 717 | + * @return array Scheme controls. | |
| 718 | + */ | |
| 719 | + final public function get_scheme_controls() { | |
| 720 | + | |
| 721 | + Plugin::$instance->modules_manager->get_modules( 'dev-tools' )->deprecation->deprecated_function( __METHOD__, '3.0.0' ); | |
| 722 | + | |
| 723 | + $enabled_schemes = Schemes_Manager::get_enabled_schemes(); | |
| 724 | + | |
| 725 | + return array_filter( | |
| 726 | + $this->get_controls(), function ( $control ) use ( $enabled_schemes ) { | |
| 727 | + return ( ! empty( $control['scheme'] ) && in_array( $control['scheme']['type'], $enabled_schemes ) ); | |
| 728 | + } | |
| 729 | + ); | |
| 730 | + } | |
| 731 | + | |
| 732 | + /** | |
| 785 | 733 | * Get style controls. |
| 786 | 734 | * |
| 787 | 735 | * Retrieve style controls for all active controls or, when requested, from |
| 788 | 736 | * a specific set of controls. |
| @@ -796,9 +744,9 @@ | ||
| 796 | 744 | * @param array $settings Optional. Controls settings. Default is null. |
| 797 | 745 | * |
| 798 | 746 | * @return array Style controls. |
| 799 | 747 | */ |
| 800 | - final public function get_style_controls( ?array $controls = null, ?array $settings = null ) { | |
| 748 | + final public function get_style_controls( array $controls = null, array $settings = null ) { | |
| 801 | 749 | Plugin::$instance->modules_manager->get_modules( 'dev-tools' )->deprecation->deprecated_function( __METHOD__, '3.0.0' ); |
| 802 | 750 | |
| 803 | 751 | $controls = $this->get_active_controls( $controls, $settings ); |
| 804 | 752 | |
| @@ -931,9 +879,9 @@ | ||
| 931 | 879 | $control_args = $args; |
| 932 | 880 | |
| 933 | 881 | // Set parent using the name from previous iteration. |
| 934 | 882 | if ( isset( $control_name ) ) { |
| 935 | - // If $control_name end with _widescreen use desktop name instead. | |
| 883 | + // If $control_name end with _widescreen use desktop name instead | |
| 936 | 884 | $control_args['parent'] = '_widescreen' === substr( $control_name, -strlen( '_widescreen' ) ) ? $id : $control_name; |
| 937 | 885 | } else { |
| 938 | 886 | $control_args['parent'] = null; |
| 939 | 887 | } |
| @@ -979,11 +927,9 @@ | ||
| 979 | 927 | $id_suffix = Breakpoints_Manager::BREAKPOINT_KEY_DESKTOP === $device_name ? '' : '_' . $device_name; |
| 980 | 928 | $control_name = $id . $id_suffix; |
| 981 | 929 | |
| 982 | 930 | // 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 | - } | |
| 931 | + $this->update_control( $control_args['parent'], [ 'inheritors' => [ $control_name ] ] ); | |
| 986 | 932 | |
| 987 | 933 | if ( ! empty( $options['overwrite'] ) ) { |
| 988 | 934 | $this->update_control( $control_name, $control_args, [ |
| 989 | 935 | 'recursive' => ! empty( $options['recursive'] ), |
| @@ -1060,10 +1006,10 @@ | ||
| 1060 | 1006 | * @return array|null The config. |
| 1061 | 1007 | */ |
| 1062 | 1008 | final public function get_config() { |
| 1063 | 1009 | 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. | |
| 1010 | + // TODO: This is for backwards compatibility starting from 2.9.0 | |
| 1011 | + // This if statement should be removed when the method is hard-deprecated | |
| 1066 | 1012 | if ( $this->has_own_method( '_get_initial_config', self::class ) ) { |
| 1067 | 1013 | Plugin::$instance->modules_manager->get_modules( 'dev-tools' )->deprecation->deprecated_function( '_get_initial_config', '2.9.0', __CLASS__ . '::get_initial_config()' ); |
| 1068 | 1014 | |
| 1069 | 1015 | $this->config = $this->_get_initial_config(); |
| @@ -1087,10 +1033,8 @@ | ||
| 1087 | 1033 | * Set a config property. |
| 1088 | 1034 | * |
| 1089 | 1035 | * Set a specific property of the config list for this controls-stack. |
| 1090 | 1036 | * |
| 1091 | - * @param string $key | |
| 1092 | - * @param string $value | |
| 1093 | 1037 | * @since 3.5.0 |
| 1094 | 1038 | * @access public |
| 1095 | 1039 | */ |
| 1096 | 1040 | public function set_config( $key, $value ) { |
| @@ -1166,11 +1110,8 @@ | ||
| 1166 | 1110 | return self::get_items( $this->data, $item ); |
| 1167 | 1111 | } |
| 1168 | 1112 | |
| 1169 | 1113 | /** |
| 1170 | - * @param null $setting | |
| 1171 | - * @param null $settings | |
| 1172 | - * @return array|mixed|null | |
| 1173 | 1114 | * @since 2.0.14 |
| 1174 | 1115 | * @access public |
| 1175 | 1116 | */ |
| 1176 | 1117 | public function get_parsed_dynamic_settings( $setting = null, $settings = null ) { |
| @@ -1189,16 +1130,16 @@ | ||
| 1189 | 1130 | * Get active settings. |
| 1190 | 1131 | * |
| 1191 | 1132 | * Retrieve the settings from all the active controls. |
| 1192 | 1133 | * |
| 1193 | - * @param array|null $settings Optional. Controls settings. Default is null. | |
| 1194 | - * @param array|null $controls Optional. An array of controls. Default is null. | |
| 1195 | - * | |
| 1196 | - * @return array Active settings. | |
| 1134 | + * @since 1.4.0 | |
| 1197 | 1135 | * @since 2.1.0 Added the `controls` and the `settings` parameters. |
| 1198 | 1136 | * @access public |
| 1199 | 1137 | * |
| 1200 | - * @since 1.4.0 | |
| 1138 | + * @param array $controls Optional. An array of controls. Default is null. | |
| 1139 | + * @param array $settings Optional. Controls settings. Default is null. | |
| 1140 | + * | |
| 1141 | + * @return array Active settings. | |
| 1201 | 1142 | */ |
| 1202 | 1143 | public function get_active_settings( $settings = null, $controls = null ) { |
| 1203 | 1144 | $is_first_request = ! $settings && ! $this->active_settings; |
| 1204 | 1145 | |
| @@ -1213,10 +1154,8 @@ | ||
| 1213 | 1154 | } |
| 1214 | 1155 | |
| 1215 | 1156 | $active_settings = []; |
| 1216 | 1157 | |
| 1217 | - $controls_objs = Plugin::$instance->controls_manager->get_controls(); | |
| 1218 | - | |
| 1219 | 1158 | foreach ( $settings as $setting_key => $setting ) { |
| 1220 | 1159 | if ( ! isset( $controls[ $setting_key ] ) ) { |
| 1221 | 1160 | $active_settings[ $setting_key ] = $setting; |
| 1222 | 1161 | |
| @@ -1224,10 +1163,10 @@ | ||
| 1224 | 1163 | } |
| 1225 | 1164 | |
| 1226 | 1165 | $control = $controls[ $setting_key ]; |
| 1227 | 1166 | |
| 1228 | - if ( $this->is_control_visible( $control, $settings, $controls ) ) { | |
| 1229 | - $control_obj = $controls_objs[ $control['type'] ] ?? null; | |
| 1167 | + if ( $this->is_control_visible( $control, $settings ) ) { | |
| 1168 | + $control_obj = Plugin::$instance->controls_manager->get_control( $control['type'] ); | |
| 1230 | 1169 | |
| 1231 | 1170 | if ( $control_obj instanceof Control_Repeater ) { |
| 1232 | 1171 | foreach ( $setting as & $item ) { |
| 1233 | 1172 | $item = $this->get_active_settings( $item, $control['fields'] ); |
| @@ -1294,13 +1233,11 @@ | ||
| 1294 | 1233 | if ( null === $controls ) { |
| 1295 | 1234 | $controls = $this->get_controls(); |
| 1296 | 1235 | } |
| 1297 | 1236 | |
| 1298 | - $controls_objs = Plugin::$instance->controls_manager->get_controls(); | |
| 1299 | - | |
| 1300 | 1237 | foreach ( $controls as $control ) { |
| 1301 | 1238 | $control_name = $control['name']; |
| 1302 | - $control_obj = $controls_objs[ $control['type'] ] ?? null; | |
| 1239 | + $control_obj = Plugin::$instance->controls_manager->get_control( $control['type'] ); | |
| 1303 | 1240 | |
| 1304 | 1241 | if ( ! $control_obj instanceof Base_Data_Control ) { |
| 1305 | 1242 | continue; |
| 1306 | 1243 | } |
| @@ -1410,33 +1347,21 @@ | ||
| 1410 | 1347 | ); |
| 1411 | 1348 | } |
| 1412 | 1349 | |
| 1413 | 1350 | /** |
| 1414 | - * Get Responsive Control Device Suffix | |
| 1415 | - * | |
| 1416 | - * @deprecated 3.7.6 Use `Elementor\Controls_Manager::get_responsive_control_device_suffix()` instead. | |
| 1417 | - * @param array $control | |
| 1418 | - * @return string $device suffix | |
| 1419 | - */ | |
| 1420 | - protected function get_responsive_control_device_suffix( $control ) { | |
| 1421 | - Plugin::$instance->modules_manager->get_modules( 'dev-tools' )->deprecation->deprecated_function( __METHOD__, '3.7.6', 'Elementor\Controls_Manager::get_responsive_control_device_suffix()' ); | |
| 1422 | - | |
| 1423 | - return Controls_Manager::get_responsive_control_device_suffix( $control ); | |
| 1424 | - } | |
| 1425 | - | |
| 1426 | - /** | |
| 1427 | 1351 | * Whether the control is visible or not. |
| 1428 | 1352 | * |
| 1429 | 1353 | * Used to determine whether the control is visible or not. |
| 1430 | 1354 | * |
| 1355 | + * @since 1.4.0 | |
| 1356 | + * @access public | |
| 1357 | + * | |
| 1431 | 1358 | * @param array $control The control. |
| 1432 | - * @param null $values Optional. Condition values. Default is null. | |
| 1433 | - * @param null $controls | |
| 1359 | + * @param array $values Optional. Condition values. Default is null. | |
| 1360 | + * | |
| 1434 | 1361 | * @return bool Whether the control is visible. |
| 1435 | - * @since 1.4.0 | |
| 1436 | - * @access public | |
| 1437 | 1362 | */ |
| 1438 | - public function is_control_visible( $control, $values = null, $controls = null ) { | |
| 1363 | + public function is_control_visible( $control, $values = null ) { | |
| 1439 | 1364 | if ( null === $values ) { |
| 1440 | 1365 | $values = $this->get_settings(); |
| 1441 | 1366 | } |
| 1442 | 1367 | |
| @@ -1447,35 +1372,33 @@ | ||
| 1447 | 1372 | if ( empty( $control['condition'] ) ) { |
| 1448 | 1373 | return true; |
| 1449 | 1374 | } |
| 1450 | 1375 | |
| 1451 | - if ( ! $controls ) { | |
| 1452 | - $controls = $this->get_controls(); | |
| 1453 | - } | |
| 1454 | - | |
| 1455 | 1376 | foreach ( $control['condition'] as $condition_key => $condition_value ) { |
| 1456 | 1377 | preg_match( '/([a-z_\-0-9]+)(?:\[([a-z_]+)])?(!?)$/i', $condition_key, $condition_key_parts ); |
| 1457 | 1378 | |
| 1458 | 1379 | $pure_condition_key = $condition_key_parts[1]; |
| 1459 | 1380 | $condition_sub_key = $condition_key_parts[2]; |
| 1460 | - $is_negative_condition = (bool) $condition_key_parts[3]; | |
| 1381 | + $is_negative_condition = ! ! $condition_key_parts[3]; | |
| 1461 | 1382 | |
| 1462 | 1383 | if ( ! isset( $values[ $pure_condition_key ] ) || null === $values[ $pure_condition_key ] ) { |
| 1463 | 1384 | return false; |
| 1464 | 1385 | } |
| 1465 | 1386 | |
| 1466 | - $are_control_and_condition_responsive = isset( $control['responsive'] ) && ! empty( $controls[ $pure_condition_key ]['responsive'] ); | |
| 1467 | - $condition_name_to_check = $pure_condition_key; | |
| 1387 | + $instance_value = $values[ $pure_condition_key ]; | |
| 1468 | 1388 | |
| 1469 | - if ( $are_control_and_condition_responsive ) { | |
| 1470 | - $device_suffix = Controls_Manager::get_responsive_control_device_suffix( $control ); | |
| 1389 | + if ( ! $instance_value ) { | |
| 1390 | + $controls = $this->get_controls(); | |
| 1391 | + $parent = isset( $controls[ $pure_condition_key ]['parent'] ) ? $controls[ $pure_condition_key ]['parent'] : false; | |
| 1471 | 1392 | |
| 1472 | - $condition_name_to_check = $pure_condition_key . $device_suffix; | |
| 1393 | + while ( $parent ) { | |
| 1394 | + $instance_value = $values[ $parent ]; | |
| 1473 | 1395 | |
| 1474 | - // If the control is not desktop, and a conditioning control for the corresponding device exists, use it. | |
| 1475 | - $instance_value = $values[ $pure_condition_key . $device_suffix ] ?? $values[ $pure_condition_key ]; | |
| 1476 | - } else { | |
| 1477 | - $instance_value = $values[ $pure_condition_key ]; | |
| 1396 | + if ( $instance_value ) { | |
| 1397 | + break; | |
| 1398 | + } | |
| 1399 | + $parent = isset( $controls[ $parent ]['parent'] ) ? $controls[ $parent ]['parent'] : false; | |
| 1400 | + } | |
| 1478 | 1401 | } |
| 1479 | 1402 | |
| 1480 | 1403 | if ( $condition_sub_key && is_array( $instance_value ) ) { |
| 1481 | 1404 | if ( ! isset( $instance_value[ $condition_sub_key ] ) ) { |
| @@ -1484,32 +1407,8 @@ | ||
| 1484 | 1407 | |
| 1485 | 1408 | $instance_value = $instance_value[ $condition_sub_key ]; |
| 1486 | 1409 | } |
| 1487 | 1410 | |
| 1488 | - if ( ! $instance_value ) { | |
| 1489 | - $parent = isset( $controls[ $condition_name_to_check ]['parent'] ) ? $controls[ $condition_name_to_check ]['parent'] : false; | |
| 1490 | - | |
| 1491 | - while ( $parent ) { | |
| 1492 | - $instance_value = $values[ $parent ]; | |
| 1493 | - | |
| 1494 | - if ( $instance_value ) { | |
| 1495 | - if ( ! is_array( $instance_value ) ) { | |
| 1496 | - break; | |
| 1497 | - } | |
| 1498 | - | |
| 1499 | - if ( $condition_sub_key && isset( $instance_value[ $condition_sub_key ] ) ) { | |
| 1500 | - $instance_value = $instance_value[ $condition_sub_key ]; | |
| 1501 | - | |
| 1502 | - if ( '' !== $instance_value ) { | |
| 1503 | - break; | |
| 1504 | - } | |
| 1505 | - } | |
| 1506 | - } | |
| 1507 | - | |
| 1508 | - $parent = isset( $controls[ $parent ]['parent'] ) ? $controls[ $parent ]['parent'] : false; | |
| 1509 | - } | |
| 1510 | - } | |
| 1511 | - | |
| 1512 | 1411 | /** |
| 1513 | 1412 | * If the $condition_value is a non empty array - check if the $condition_value contains the $instance_value, |
| 1514 | 1413 | * If the $instance_value is a non empty array - check if the $instance_value contains the $condition_value |
| 1515 | 1414 | * otherwise check if they are equal. ( and give the ability to check if the value is an empty array ) |
| @@ -1521,12 +1420,9 @@ | ||
| 1521 | 1420 | } else { |
| 1522 | 1421 | $is_contains = $instance_value === $condition_value; |
| 1523 | 1422 | } |
| 1524 | 1423 | |
| 1525 | - if ( | |
| 1526 | - ( $is_negative_condition && $is_contains ) || | |
| 1527 | - ( ! $is_negative_condition && ! $is_contains ) | |
| 1528 | - ) { | |
| 1424 | + if ( $is_negative_condition && $is_contains || ! $is_negative_condition && ! $is_contains ) { | |
| 1529 | 1425 | return false; |
| 1530 | 1426 | } |
| 1531 | 1427 | } |
| 1532 | 1428 | |
| @@ -1577,12 +1473,8 @@ | ||
| 1577 | 1473 | * @param array $args Section arguments. |
| 1578 | 1474 | */ |
| 1579 | 1475 | do_action( "elementor/element/{$stack_name}/{$section_id}/before_section_start", $this, $args ); |
| 1580 | 1476 | |
| 1581 | - if ( $this->should_manually_trigger_common_action( $stack_name ) ) { | |
| 1582 | - do_action( "elementor/element/common/{$section_id}/before_section_start", $this, $args ); | |
| 1583 | - } | |
| 1584 | - | |
| 1585 | 1477 | $args['type'] = Controls_Manager::SECTION; |
| 1586 | 1478 | |
| 1587 | 1479 | $this->add_control( $section_id, $args ); |
| 1588 | 1480 | |
| @@ -1621,12 +1513,8 @@ | ||
| 1621 | 1513 | * @param Controls_Stack $this The control. |
| 1622 | 1514 | * @param array $args Section arguments. |
| 1623 | 1515 | */ |
| 1624 | 1516 | do_action( "elementor/element/{$stack_name}/{$section_id}/after_section_start", $this, $args ); |
| 1625 | - | |
| 1626 | - if ( $this->should_manually_trigger_common_action( $stack_name ) ) { | |
| 1627 | - do_action( "elementor/element/common/{$section_id}/after_section_start", $this, $args ); | |
| 1628 | - } | |
| 1629 | 1517 | } |
| 1630 | 1518 | |
| 1631 | 1519 | /** |
| 1632 | 1520 | * End controls section. |
| @@ -1675,12 +1563,8 @@ | ||
| 1675 | 1563 | * @param array $args Section arguments. |
| 1676 | 1564 | */ |
| 1677 | 1565 | do_action( "elementor/element/{$stack_name}/{$section_id}/before_section_end", $this, $args ); |
| 1678 | 1566 | |
| 1679 | - if ( $this->should_manually_trigger_common_action( $stack_name ) ) { | |
| 1680 | - do_action( "elementor/element/common/{$section_id}/before_section_end", $this, $args ); | |
| 1681 | - } | |
| 1682 | - | |
| 1683 | 1567 | $this->current_section = null; |
| 1684 | 1568 | |
| 1685 | 1569 | /** |
| 1686 | 1570 | * After section end. |
| @@ -1707,40 +1591,11 @@ | ||
| 1707 | 1591 | * @param Controls_Stack $this The control. |
| 1708 | 1592 | * @param array $args Section arguments. |
| 1709 | 1593 | */ |
| 1710 | 1594 | do_action( "elementor/element/{$stack_name}/{$section_id}/after_section_end", $this, $args ); |
| 1711 | - | |
| 1712 | - if ( $this->should_manually_trigger_common_action( $stack_name ) ) { | |
| 1713 | - do_action( "elementor/element/common/{$section_id}/after_section_end", $this, $args ); | |
| 1714 | - } | |
| 1715 | 1595 | } |
| 1716 | 1596 | |
| 1717 | 1597 | /** |
| 1718 | - * Should manually trigger common action. | |
| 1719 | - * | |
| 1720 | - * With the Optimized Markup experiment, the Advanced Tab has been split to maintain backward compatibility: | |
| 1721 | - * - 'common' refers to the existing Advanced Tab. | |
| 1722 | - * - 'common-optimized' refers to the new Advanced Tab for optimized widgets. | |
| 1723 | - * | |
| 1724 | - * Third-party developers may have used hooks like 'elementor/element/common/_section_background/before_section_end' | |
| 1725 | - * to add controls to the Advanced Tab. However, this hook will now only work on widgets that are not optimized. | |
| 1726 | - * | |
| 1727 | - * This method checks whether the 'elementor/element/common/...' hooks should be manually executed | |
| 1728 | - * to prevent third parties from needing to add equivalent hooks for 'elementor/element/common-optimized/...'. | |
| 1729 | - * | |
| 1730 | - * @todo Remove this method and the manual execution of 'common' hooks when the feature is merged. | |
| 1731 | - * | |
| 1732 | - * @access private | |
| 1733 | - * | |
| 1734 | - * @param string $stack_name Stack name. | |
| 1735 | - * | |
| 1736 | - * @return bool | |
| 1737 | - */ | |
| 1738 | - private function should_manually_trigger_common_action( $stack_name ): bool { | |
| 1739 | - return 'common-optimized' === $stack_name && Plugin::$instance->experiments->is_feature_active( 'e_optimized_markup' ); | |
| 1740 | - } | |
| 1741 | - | |
| 1742 | - /** | |
| 1743 | 1598 | * Start controls tabs. |
| 1744 | 1599 | * |
| 1745 | 1600 | * Used to add a new set of tabs inside a section. You should use this |
| 1746 | 1601 | * method before adding new individual tabs using `start_controls_tab()`. |
| @@ -2013,10 +1868,10 @@ | ||
| 2013 | 1868 | * |
| 2014 | 1869 | * @since 2.7.0 |
| 2015 | 1870 | * @access public |
| 2016 | 1871 | * |
| 2017 | - * @param string $element The HTML element. | |
| 2018 | - * @param string $key Optional. Attribute key. Default is null. | |
| 1872 | + * @param string $element The HTML element. | |
| 1873 | + * @param string $key Optional. Attribute key. Default is null. | |
| 2019 | 1874 | * @param array|string $values Optional. Attribute value/s. Default is null. |
| 2020 | 1875 | */ |
| 2021 | 1876 | public function remove_render_attribute( $element, $key = null, $values = null ) { |
| 2022 | 1877 | if ( $key && ! isset( $this->render_attributes[ $element ][ $key ] ) ) { |
| @@ -2073,9 +1928,9 @@ | ||
| 2073 | 1928 | * |
| 2074 | 1929 | * @param array|string $element The element. |
| 2075 | 1930 | */ |
| 2076 | 1931 | public function print_render_attribute_string( $element ) { |
| 2077 | - Utils::print_unescaped_internal_string( $this->get_render_attribute_string( $element ) ); | |
| 1932 | + echo $this->get_render_attribute_string( $element ); // XSS ok. | |
| 2078 | 1933 | } |
| 2079 | 1934 | |
| 2080 | 1935 | /** |
| 2081 | 1936 | * Print element template. |
| @@ -2088,9 +1943,9 @@ | ||
| 2088 | 1943 | public function print_template() { |
| 2089 | 1944 | ob_start(); |
| 2090 | 1945 | |
| 2091 | 1946 | // TODO: This is for backwards compatibility starting from 2.9.0 |
| 2092 | - // This `if` statement should be removed when the method is removed. | |
| 1947 | + // This `if` statement should be removed when the method is removed | |
| 2093 | 1948 | if ( $this->has_own_method( '_content_template', self::class ) ) { |
| 2094 | 1949 | Plugin::$instance->modules_manager->get_modules( 'dev-tools' )->deprecation->deprecated_function( '_content_template', '2.9.0', __CLASS__ . '::content_template()' ); |
| 2095 | 1950 | |
| 2096 | 1951 | $this->_content_template(); |
| @@ -2126,19 +1981,13 @@ | ||
| 2126 | 1981 | <?php |
| 2127 | 1982 | } |
| 2128 | 1983 | |
| 2129 | 1984 | /** |
| 2130 | - * On import update dynamic content (e.g. post and term IDs). | |
| 2131 | 1985 | * |
| 2132 | - * @since 3.8.0 | |
| 2133 | - * | |
| 2134 | - * @param array $config The config of the passed element. | |
| 2135 | - * @param array $data The data that requires updating/replacement when imported. | |
| 2136 | - * @param array|null $controls The available controls. | |
| 2137 | - * | |
| 2138 | - * @return array Element data. | |
| 1986 | + * @since 3.6.0 | |
| 1987 | + * @access public | |
| 2139 | 1988 | */ |
| 2140 | - public static function on_import_update_dynamic_content( array $config, array $data, $controls = null ): array { | |
| 1989 | + public static function on_import_replace_dynamic_content( $config, $map_old_new_post_ids ) { | |
| 2141 | 1990 | return $config; |
| 2142 | 1991 | } |
| 2143 | 1992 | |
| 2144 | 1993 | /** |
| @@ -2217,12 +2066,12 @@ | ||
| 2217 | 2066 | * `start_controls_tab()`. |
| 2218 | 2067 | * |
| 2219 | 2068 | * @since 1.4.0 |
| 2220 | 2069 | * @access protected |
| 2221 | - * @deprecated 3.1.0 Use `register_controls()` method instead. | |
| 2070 | + * @deprecated 3.1.0 Use `Controls_Stack::register_controls()` instead | |
| 2222 | 2071 | */ |
| 2223 | 2072 | protected function _register_controls() { |
| 2224 | - Plugin::$instance->modules_manager->get_modules( 'dev-tools' )->deprecation->deprecated_function( __METHOD__, '3.1.0', 'register_controls()' ); | |
| 2073 | + Plugin::$instance->modules_manager->get_modules( 'dev-tools' )->deprecation->deprecated_function( __METHOD__, '3.1.0', __CLASS__ . '::register_controls()' ); | |
| 2225 | 2074 | |
| 2226 | 2075 | $this->register_controls(); |
| 2227 | 2076 | } |
| 2228 | 2077 | |
| @@ -2265,12 +2114,10 @@ | ||
| 2265 | 2114 | */ |
| 2266 | 2115 | protected function get_init_settings() { |
| 2267 | 2116 | $settings = $this->get_data( 'settings' ); |
| 2268 | 2117 | |
| 2269 | - $controls_objs = Plugin::$instance->controls_manager->get_controls(); | |
| 2270 | - | |
| 2271 | 2118 | foreach ( $this->get_controls() as $control ) { |
| 2272 | - $control_obj = $controls_objs[ $control['type'] ] ?? null; | |
| 2119 | + $control_obj = Plugin::$instance->controls_manager->get_control( $control['type'] ); | |
| 2273 | 2120 | |
| 2274 | 2121 | if ( ! $control_obj instanceof Base_Data_Control ) { |
| 2275 | 2122 | continue; |
| 2276 | 2123 | } |
| @@ -2306,15 +2153,15 @@ | ||
| 2306 | 2153 | * Retrieve the current element initial configuration - controls list and |
| 2307 | 2154 | * the tabs assigned to the control. |
| 2308 | 2155 | * |
| 2309 | 2156 | * @since 1.4.0 |
| 2310 | - * @deprecated 2.9.0 Use `get_initial_config()` method instead. | |
| 2157 | + * @deprecated 2.9.0 use `get_initial_config()` instead | |
| 2311 | 2158 | * @access protected |
| 2312 | 2159 | * |
| 2313 | 2160 | * @return array The initial config. |
| 2314 | 2161 | */ |
| 2315 | 2162 | protected function _get_initial_config() { |
| 2316 | - Plugin::$instance->modules_manager->get_modules( 'dev-tools' )->deprecation->deprecated_function( __METHOD__, '2.9.0', 'get_initial_config()' ); | |
| 2163 | + Plugin::$instance->modules_manager->get_modules( 'dev-tools' )->deprecation->deprecated_function( __METHOD__, '2.9.0', __CLASS__ . '::get_initial_config()' ); | |
| 2317 | 2164 | |
| 2318 | 2165 | return $this->get_initial_config(); |
| 2319 | 2166 | } |
| 2320 | 2167 | |
| @@ -2385,9 +2232,9 @@ | ||
| 2385 | 2232 | * |
| 2386 | 2233 | * @param string $template_content Template content. |
| 2387 | 2234 | */ |
| 2388 | 2235 | protected function print_template_content( $template_content ) { |
| 2389 | - Utils::print_unescaped_internal_string( $template_content ); | |
| 2236 | + echo $template_content; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped | |
| 2390 | 2237 | } |
| 2391 | 2238 | |
| 2392 | 2239 | /** |
| 2393 | 2240 | * Render element output in the editor. |
| @@ -2404,13 +2251,13 @@ | ||
| 2404 | 2251 | * |
| 2405 | 2252 | * Used to generate the live preview, using a Backbone JavaScript template. |
| 2406 | 2253 | * |
| 2407 | 2254 | * @since 2.0.0 |
| 2408 | - * @deprecated 2.9.0 Use `content_template()` method instead. | |
| 2255 | + * @deprecated 2.9.0 use `content_template()` instead | |
| 2409 | 2256 | * @access protected |
| 2410 | 2257 | */ |
| 2411 | 2258 | protected function _content_template() { |
| 2412 | - Plugin::$instance->modules_manager->get_modules( 'dev-tools' )->deprecation->deprecated_function( __METHOD__, '2.9.0', 'content_template()' ); | |
| 2259 | + Plugin::$instance->modules_manager->get_modules( 'dev-tools' )->deprecation->deprecated_function( __METHOD__, '2.9.0', __CLASS__ . '::content_template()' ); | |
| 2413 | 2260 | |
| 2414 | 2261 | $this->content_template(); |
| 2415 | 2262 | } |
| 2416 | 2263 | |
| @@ -2425,9 +2272,9 @@ | ||
| 2425 | 2272 | protected function init_controls() { |
| 2426 | 2273 | Plugin::$instance->controls_manager->open_stack( $this ); |
| 2427 | 2274 | |
| 2428 | 2275 | // TODO: This is for backwards compatibility starting from 2.9.0 |
| 2429 | - // This `if` statement should be removed when the method is removed. | |
| 2276 | + // This `if` statement should be removed when the method is removed | |
| 2430 | 2277 | if ( $this->has_own_method( '_register_controls', self::class ) ) { |
| 2431 | 2278 | Plugin::$instance->modules_manager->get_modules( 'dev-tools' )->deprecation->deprecated_function( '_register_controls', '3.1.0', __CLASS__ . '::register_controls()' ); |
| 2432 | 2279 | |
| 2433 | 2280 | $this->_register_controls(); |
| @@ -2463,11 +2310,9 @@ | ||
| 2463 | 2310 | if ( null !== $target_tab ) { |
| 2464 | 2311 | $args = array_replace_recursive( $target_tab, $args ); |
| 2465 | 2312 | } |
| 2466 | 2313 | } elseif ( empty( $args['section'] ) && ( ! $overwrite || is_wp_error( Plugin::$instance->controls_manager->get_control_from_stack( $this->get_unique_name(), $control_id ) ) ) ) { |
| 2467 | - if ( ! Performance::should_optimize_controls() ) { | |
| 2468 | - 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 | |
| 2469 | - } | |
| 2314 | + 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 | |
| 2470 | 2315 | } |
| 2471 | 2316 | |
| 2472 | 2317 | return $args; |
| 2473 | 2318 | } |
| @@ -2493,15 +2338,15 @@ | ||
| 2493 | 2338 | * |
| 2494 | 2339 | * Set the raw data, the ID and the parsed settings. |
| 2495 | 2340 | * |
| 2496 | 2341 | * @since 1.4.0 |
| 2497 | - * @deprecated 2.9.0 Use `init()` method instead. | |
| 2342 | + * @deprecated 2.9.0 use `init()` instead | |
| 2498 | 2343 | * @access protected |
| 2499 | 2344 | * |
| 2500 | 2345 | * @param array $data Initial data. |
| 2501 | 2346 | */ |
| 2502 | 2347 | protected function _init( $data ) { |
| 2503 | - Plugin::$instance->modules_manager->get_modules( 'dev-tools' )->deprecation->deprecated_function( __METHOD__, '2.9.0', 'init()' ); | |
| 2348 | + Plugin::$instance->modules_manager->get_modules( 'dev-tools' )->deprecation->deprecated_function( __METHOD__, '2.9.0', __CLASS__ . '::init()' ); | |
| 2504 | 2349 | |
| 2505 | 2350 | $this->init( $data ); |
| 2506 | 2351 | } |
| 2507 | 2352 | |
| @@ -2572,9 +2417,9 @@ | ||
| 2572 | 2417 | */ |
| 2573 | 2418 | public function __construct( array $data = [] ) { |
| 2574 | 2419 | if ( $data ) { |
| 2575 | 2420 | // TODO: This is for backwards compatibility starting from 2.9.0 |
| 2576 | - // This if statement should be removed when the method is hard-deprecated. | |
| 2421 | + // This if statement should be removed when the method is hard-deprecated | |
| 2577 | 2422 | if ( $this->has_own_method( '_init', self::class ) ) { |
| 2578 | 2423 | Plugin::$instance->modules_manager->get_modules( 'dev-tools' )->deprecation->deprecated_function( '_init', '2.9.0', __CLASS__ . '::init()' ); |
| 2579 | 2424 | |
| 2580 | 2425 | $this->_init( $data ); |
