← All changes
|
modules/global-classes/global-classes-cleanup.php
+7
-16
4.0.9
→
4.1.0-beta1
View file →
| @@ -17,16 +17,16 @@ | ||
| 17 | 17 | |
| 18 | 18 | public function register_hooks() { |
| 19 | 19 | add_action( |
| 20 | 20 | 'elementor/global_classes/update', |
| 21 | - fn( $context, $new_value, $prev_value ) => $this->on_classes_update( $new_value, $prev_value ), | |
| 21 | + fn( $context, $changes ) => $this->on_classes_update( $changes ), | |
| 22 | 22 | 10, |
| 23 | - 3 | |
| 23 | + 2 | |
| 24 | 24 | ); |
| 25 | 25 | } |
| 26 | 26 | |
| 27 | - private function on_classes_update( $new_value, $prev_value ) { | |
| 28 | - $deleted_classes_ids = $this->get_deleted_classes_ids( $new_value, $prev_value ); | |
| 27 | + private function on_classes_update( array $changes ) { | |
| 28 | + $deleted_classes_ids = $changes['deleted'] ?? []; | |
| 29 | 29 | $additional_post_types = apply_filters( 'elementor/global_classes/additional_post_types', [] ); |
| 30 | 30 | |
| 31 | 31 | if ( ! empty( $deleted_classes_ids ) ) { |
| 32 | 32 | Plugin::$instance->db->iterate_elementor_documents( |
| @@ -36,17 +36,8 @@ | ||
| 36 | 36 | ); |
| 37 | 37 | } |
| 38 | 38 | } |
| 39 | 39 | |
| 40 | - private function get_deleted_classes_ids( $new_value, $prev_value ) { | |
| 41 | - $prev_ids = array_keys( $prev_value['items'] ); | |
| 42 | - $new_ids = array_keys( $new_value['items'] ); | |
| 43 | - | |
| 44 | - return array_values( | |
| 45 | - array_diff( $prev_ids, $new_ids ) | |
| 46 | - ); | |
| 47 | - } | |
| 48 | - | |
| 49 | 40 | private function unapply_deleted_classes( $document, $elements_data, $deleted_classes_ids ) { |
| 50 | 41 | $elements_data = Plugin::$instance->db->iterate_data( $elements_data, function( $element_data ) use ( $deleted_classes_ids ) { |
| 51 | 42 | $element_type = Atomic_Elements_Utils::get_element_type( $element_data ); |
| 52 | 43 | $element_instance = Atomic_Elements_Utils::get_element_instance( $element_type ); |
| @@ -62,20 +53,20 @@ | ||
| 62 | 53 | $document->update_json_meta( Document::ELEMENTOR_DATA_META_KEY, $elements_data ); |
| 63 | 54 | } |
| 64 | 55 | |
| 65 | 56 | private function unapply_classes_from_element( $props_schema, $element_data, $deleted_classes_ids ) { |
| 66 | - foreach ( $props_schema as $prop ) { | |
| 57 | + foreach ( $props_schema as $settings_key => $prop ) { | |
| 67 | 58 | if ( ! Atomic_Elements_Utils::is_classes_prop( $prop ) ) { |
| 68 | 59 | continue; |
| 69 | 60 | } |
| 70 | 61 | |
| 71 | - $current_classes = $element_data['settings'][ $prop->get_key() ] ?? null; | |
| 62 | + $current_classes = $element_data['settings'][ $settings_key ] ?? null; | |
| 72 | 63 | |
| 73 | 64 | if ( ! $current_classes ) { |
| 74 | 65 | continue; |
| 75 | 66 | } |
| 76 | 67 | |
| 77 | - $element_data['settings'][ $prop->get_key() ]['value'] = Collection::make( $current_classes['value'] ) | |
| 68 | + $element_data['settings'][ $settings_key ]['value'] = Collection::make( $current_classes['value'] ) | |
| 78 | 69 | ->filter( fn( $class_name ) => ! in_array( $class_name, $deleted_classes_ids, true ) ) |
| 79 | 70 | ->values(); |
| 80 | 71 | } |
| 81 | 72 | |