← All changes | modules/global-classes/global-classes-cleanup.php +20 -14 4.1.0-dev2 → 3.32.0-dev3 View file →

		@@ -3,10 +3,10 @@
3	3	namespace Elementor\Modules\GlobalClasses;
4	4
5	5	use Elementor\Core\Base\Document;
6	6	use Elementor\Core\Utils\Collection;
7		-use Elementor\Modules\AtomicWidgets\Elements\Base\Atomic_Element_Base;
8		-use Elementor\Modules\AtomicWidgets\Elements\Base\Atomic_Widget_Base;
	7	+use Elementor\Modules\AtomicWidgets\Elements\Atomic_Element_Base;
	8	+use Elementor\Modules\AtomicWidgets\Elements\Atomic_Widget_Base;
9	9	use Elementor\Modules\GlobalClasses\Utils\Atomic_Elements_Utils;
10	10	use Elementor\Plugin;
11	11
12	12	if ( ! defined( 'ABSPATH' ) ) {
		@@ -17,27 +17,33 @@
17	17
18	18	public function register_hooks() {
19	19	add_action(
20	20	'elementor/global_classes/update',
21		- fn( $context, $changes ) => $this->on_classes_update( $changes ),
	21	+ fn( $context, $new_value, $prev_value ) => $this->on_classes_update( $new_value, $prev_value ),
22	22	10,
23		- 2
	23	+ 3
24	24	);
25	25	}
26	26
27		- private function on_classes_update( array $changes ) {
28		- $deleted_classes_ids = $changes['deleted'] ?? [];
29		- $additional_post_types = apply_filters( 'elementor/global_classes/additional_post_types', [] );
	27	+ private function on_classes_update( $new_value, $prev_value ) {
	28	+ $deleted_classes_ids = $this->get_deleted_classes_ids( $new_value, $prev_value );
30	29
31	30	if ( ! empty( $deleted_classes_ids ) ) {
32	31	Plugin::$instance->db->iterate_elementor_documents(
33		- fn( $document, $elements_data ) => $this->unapply_deleted_classes( $document, $elements_data, $deleted_classes_ids ),
34		- 100,
35		- $additional_post_types
	32	+ fn( $document, $elements_data ) => $this->unapply_deleted_classes( $document, $elements_data, $deleted_classes_ids )
36	33	);
37	34	}
38	35	}
39	36
	37	+ private function get_deleted_classes_ids( $new_value, $prev_value ) {
	38	+ $prev_ids = array_keys( $prev_value['items'] );
	39	+ $new_ids = array_keys( $new_value['items'] );
	40	+
	41	+ return array_values(
	42	+ array_diff( $prev_ids, $new_ids )
	43	+ );
	44	+ }
	45	+
40	46	private function unapply_deleted_classes( $document, $elements_data, $deleted_classes_ids ) {
41	47	$elements_data = Plugin::$instance->db->iterate_data( $elements_data, function( $element_data ) use ( $deleted_classes_ids ) {
42	48	$element_type = Atomic_Elements_Utils::get_element_type( $element_data );
43	49	$element_instance = Atomic_Elements_Utils::get_element_instance( $element_type );
		@@ -53,21 +59,21 @@
53	59	$document->update_json_meta( Document::ELEMENTOR_DATA_META_KEY, $elements_data );
54	60	}
55	61
56	62	private function unapply_classes_from_element( $props_schema, $element_data, $deleted_classes_ids ) {
57		- foreach ( $props_schema as $settings_key => $prop ) {
	63	+ foreach ( $props_schema as $prop ) {
58	64	if ( ! Atomic_Elements_Utils::is_classes_prop( $prop ) ) {
59	65	continue;
60	66	}
61	67
62		- $current_classes = $element_data['settings'][ $settings_key ] ?? null;
	68	+ $current_classes = $element_data['settings'][ $prop->get_key() ] ?? null;
63	69
64	70	if ( ! $current_classes ) {
65	71	continue;
66	72	}
67	73
68		- $element_data['settings'][ $settings_key ]['value'] = Collection::make( $current_classes['value'] )
69		- ->filter( fn( $class_name ) => ! in_array( $class_name, $deleted_classes_ids, true ) )
	74	+ $element_data['settings'][ $prop->get_key() ]['value'] = Collection::make( $current_classes['value'] )
	75	+ ->filter( fn( $class ) => ! in_array( $class, $deleted_classes_ids, true ) )
70	76	->values();
71	77	}
72	78
73	79	return $element_data;