← All changes | modules/global-classes/global-classes-repository.php +19 -18 4.1.5 → 4.3.1 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\Modules\GlobalClasses\Concerns\Has_Kit_Dependency;
	6	+use Elementor\Core\Kits\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,12 +28,8 @@
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		- ],
36	32	];
37	33
38	34	private ?Global_Classes $cache = null;
39	35
		@@ -87,16 +83,8 @@
87	83	}
88	84
89	85	$labels->set_labels( $existing_labels );
90	86
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		-
99	87	$this->cache = null;
100	88	}
101	89
102	90	private function labels(): Global_Classes_Labels {
		@@ -103,9 +91,9 @@
103	91	return Global_Classes_Labels::make( $this->get_kit() )->set_preview( $this->is_preview() );
104	92	}
105	93
106	94	public function get( string $class_id ): ?array {
107		- $post = Global_Class_Post::find_by_class_id( $class_id, $this->is_preview() );
	95	+ $post = Global_Class_Post::find_by_class_id( $class_id, $this->is_preview(), $this->get_kit() );
108	96
109	97	return $post ? $post->to_array() : null;
110	98	}
111	99
		@@ -155,11 +143,9 @@
155	143	$labels->set_labels( $final_label_map );
156	144
157	145	if ( ! $is_preview ) {
158	146	Global_Classes_Sync_Map::make( $this->get_kit() )->apply_changes( $touched_items, $to_delete );
159		- Global_Classes_Order::make( $this->get_kit() )
160		- ->set_preview( true )
161		- ->set_order( $order );
	147	+ $this->propagate_order_to_preview( $order, $to_delete );
162	148
163	149	$this->bulk_clear_preview_meta( array_values( $to_update ) );
164	150	$this->clear_preview_labels_for_ids( array_merge(
165	151	array_values( $to_create ),
		@@ -187,8 +173,23 @@
187	173	);
188	174	}
189	175	}
190	176
	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	+
191	192	public function each_item( callable $cb, bool $skip_migration = false, int $batch_size = self::READ_BATCH_SIZE ): void {
192	193	$order = Global_Classes_Order::make( $this->get_kit() )->get_order();
193	194
194	195	if ( empty( $order ) ) {
		@@ -442,9 +443,9 @@
442	443	public function delete_all(): void {
443	444	$order = $this->get_order();
444	445
445	446	$this->each_class_id_batch( $order, function ( string $class_id ) {
446		- $post = Global_Class_Post::find_by_class_id( $class_id );
	447	+ $post = Global_Class_Post::find_by_class_id( $class_id, false, $this->get_kit() );
447	448
448	449	if ( $post ) {
449	450	$post->delete();
450	451	}