← All changes | modules/global-classes/global-classes-repository.php +18 -19 4.3.0 → 4.1.4 View file →

		@@ -2,9 +2,9 @@
2	2	namespace Elementor\Modules\GlobalClasses;
3	3
4	4	use Elementor\Core\Kits\Documents\Kit;
5	5	use Elementor\Modules\DesignSystemSync\Classes\Global_Classes_Sync_Map;
6		-use Elementor\Core\Kits\Concerns\Has_Kit_Dependency;
	6	+use Elementor\Modules\GlobalClasses\Concerns\Has_Kit_Dependency;
7	7	use Elementor\Modules\GlobalClasses\Concerns\Has_Preview_Context;
8	8	use Elementor\Modules\GlobalClasses\Utils\Global_Class_Data_Normalizer;
9	9
10	10	if ( ! defined( 'ABSPATH' ) ) {
		@@ -28,8 +28,12 @@
28	28	'event' => [
29	29	'frontend' => self::CONTEXT_FRONTEND,
30	30	'preview' => self::CONTEXT_PREVIEW,
31	31	],
	32	+ 'meta_key' => [
	33	+ 'frontend' => self::META_KEY_FRONTEND,
	34	+ 'preview' => self::META_KEY_PREVIEW,
	35	+ ],
32	36	];
33	37
34	38	private ?Global_Classes $cache = null;
35	39
		@@ -83,8 +87,16 @@
83	87	}
84	88
85	89	$labels->set_labels( $existing_labels );
86	90
	91	+ if ( ! $this->is_preview() ) {
	92	+ Global_Classes_Order::make( $this->get_kit() )
	93	+ ->set_preview( true )
	94	+ ->set_order( $order );
	95	+
	96	+ $this->clear_preview_labels_for_ids( array_keys( $new_labels ) );
	97	+ }
	98	+
87	99	$this->cache = null;
88	100	}
89	101
90	102	private function labels(): Global_Classes_Labels {
		@@ -91,9 +103,9 @@
91	103	return Global_Classes_Labels::make( $this->get_kit() )->set_preview( $this->is_preview() );
92	104	}
93	105
94	106	public function get( string $class_id ): ?array {
95		- $post = Global_Class_Post::find_by_class_id( $class_id, $this->is_preview(), $this->get_kit() );
	107	+ $post = Global_Class_Post::find_by_class_id( $class_id, $this->is_preview() );
96	108
97	109	return $post ? $post->to_array() : null;
98	110	}
99	111
		@@ -143,9 +155,11 @@
143	155	$labels->set_labels( $final_label_map );
144	156
145	157	if ( ! $is_preview ) {
146	158	Global_Classes_Sync_Map::make( $this->get_kit() )->apply_changes( $touched_items, $to_delete );
147		- $this->propagate_order_to_preview( $order, $to_delete );
	159	+ Global_Classes_Order::make( $this->get_kit() )
	160	+ ->set_preview( true )
	161	+ ->set_order( $order );
148	162
149	163	$this->bulk_clear_preview_meta( array_values( $to_update ) );
150	164	$this->clear_preview_labels_for_ids( array_merge(
151	165	array_values( $to_create ),
		@@ -173,23 +187,8 @@
173	187	);
174	188	}
175	189	}
176	190
177		- private function propagate_order_to_preview( array $published_order, array $deleted_ids ): void {
178		- $preview_order = Global_Classes_Order::make( $this->get_kit() )->set_preview( true );
179		- $existing_order = $preview_order->get_order();
180		- $unpublished_ids = array_flip( array_diff( $existing_order, $published_order, $deleted_ids ) );
181		- $merged_order = $published_order;
182		-
183		- foreach ( $existing_order as $position => $id ) {
184		- if ( isset( $unpublished_ids[ $id ] ) ) {
185		- array_splice( $merged_order, min( $position, count( $merged_order ) ), 0, [ $id ] );
186		- }
187		- }
188		-
189		- $preview_order->set_order( $merged_order );
190		- }
191		-
192	191	public function each_item( callable $cb, bool $skip_migration = false, int $batch_size = self::READ_BATCH_SIZE ): void {
193	192	$order = Global_Classes_Order::make( $this->get_kit() )->get_order();
194	193
195	194	if ( empty( $order ) ) {
		@@ -443,9 +442,9 @@
443	442	public function delete_all(): void {
444	443	$order = $this->get_order();
445	444
446	445	$this->each_class_id_batch( $order, function ( string $class_id ) {
447		- $post = Global_Class_Post::find_by_class_id( $class_id, false, $this->get_kit() );
	446	+ $post = Global_Class_Post::find_by_class_id( $class_id );
448	447
449	448	if ( $post ) {
450	449	$post->delete();
451	450	}