← All changes | modules/components/module.php +127 -14 4.1.0-beta2 → 4.3.0-beta3 View file →

		@@ -15,9 +15,13 @@
15	15	use Elementor\Modules\Components\Transformers\Overridable_Transformer;
16	16	use Elementor\Core\Base\Document;
17	17	use Elementor\Modules\Components\PropTypes\Override_Prop_Type;
18	18	use Elementor\Modules\Components\Transformers\Override_Transformer;
	19	+use Elementor\Modules\Components\Utils\Remap_Component_Instance_Ids;
	20	+use Elementor\Modules\Components\Utils\Strip_Component_Instances;
	21	+use Elementor\Modules\Components\Variants\Component_Variant_Class_Collector;
19	22	use Elementor\Modules\Components\Widgets\Component_Instance;
	23	+use Elementor\Modules\Components\Schema\Overridable_LLM_Filter;
20	24
21	25	if ( ! defined( 'ABSPATH' ) ) {
22	26	exit; // Exit if accessed directly.
23	27	}
		@@ -22,11 +26,34 @@
22	26	exit; // Exit if accessed directly.
23	27	}
24	28
25	29	class Module extends BaseModule {
26		- const EXPERIMENT_NAME = 'e_components';
	30	+ const EXPERIMENT_NAME = AtomicWidgetsModule::EXPERIMENT_NAME;
	31	+ const EXPERIMENT_VARIANTS_NAME = 'e_component_variants';
27	32	const PACKAGES = [ 'editor-components' ];
28	33
	34	+ /**
	35	+ * Local kill switch for components import/export. Off by default: on export the
	36	+ * `elementor_component` post type is excluded, on import any `e-component` widgets
	37	+ * that survived from a foreign zip are stripped. Flip to `true` in the source
	38	+ * to unblock the flag-on branch when working on the real feature (`Remap_Component_Instance_Ids`
	39	+ * and its test cover that path today).
	40	+ *
	41	+ * Not an experiment on purpose: experiments are serialized into exported kits by
	42	+ * `Site_Settings::export_experiments()` and rehydrated on import, so a hidden experiment
	43	+ * here would let a source-site override silently turn the guard off on every destination site.
	44	+ *
	45	+ * Remove this constant, `is_import_export_supported()` and every `! is_import_export_supported()`
	46	+ * branch once components are a first-class part of import/export.
	47	+ */
	48	+ const IS_IMPORT_EXPORT_SUPPORTED = false;
	49	+
	50	+ /**
	51	+ * Variants meta must be persisted before `Global_Classes_Relations::on_document_save()`
	52	+ * (default priority 10) reads it via the `extract_class_ids_from_post` filter.
	53	+ */
	54	+ const SAVE_VARIANTS_PRIORITY = 9;
	55	+
29	56	public function get_name() {
30	57	return 'components';
31	58	}
32	59
		@@ -32,12 +59,14 @@
32	59
33	60	public function __construct() {
34	61	parent::__construct();
35	62
36		- if ( ! $this->is_experiment_active() ) {
	63	+ if ( ! self::is_experiment_active() ) {
37	64	return;
38	65	}
39	66
	67	+ $this->register_variants_experiment();
	68	+
40	69	$this->register_component_post_type();
41	70
42	71	add_filter( 'elementor/editor/v2/packages', fn ( $packages ) => $this->add_packages( $packages ) );
43	72	add_filter( 'elementor/atomic-widgets/props-schema', fn ( $schema ) => $this->modify_props_schema( $schema ) );
		@@ -43,8 +72,19 @@
43	72	add_filter( 'elementor/atomic-widgets/props-schema', fn ( $schema ) => $this->modify_props_schema( $schema ) );
44	73	add_action( 'elementor/documents/register', fn ( $documents_manager ) => $this->register_document_type( $documents_manager ) );
45	74	add_action( 'elementor/document/before_save', fn( Document $document, array $data ) => $this->validate_circular_dependencies( $document, $data ), 10, 2 );
46	75	add_action( 'elementor/document/after_save', fn( Document $document, array $data ) => $this->set_component_overridable_props( $document, $data ), 10, 2 );
	76	+
	77	+ if ( self::is_variants_experiment_active() ) {
	78	+ add_action( 'elementor/document/after_save', fn( Document $document, array $data ) => $this->set_component_variants( $document, $data ), self::SAVE_VARIANTS_PRIORITY, 2 );
	79	+ add_filter(
	80	+ 'elementor/global_classes/extract_class_ids_from_post',
	81	+ fn( array $ids, $post_id ) => $this->add_variant_class_ids( $ids, $post_id ),
	82	+ 10,
	83	+ 2
	84	+ );
	85	+ }
	86	+
47	87	add_filter( 'elementor/global_classes/additional_post_types', fn( $post_types ) => array_merge( $post_types, [ Component_Document::TYPE ] ) );
48	88	add_filter( 'elementor/utils/find_element_recursive/inner_elements', fn( array $inner_elements, array $element_data ) => $this->get_inner_elements_for_search( $inner_elements, $element_data ), 10, 2 );
49	89
50	90	add_action( 'elementor/atomic-widgets/settings/transformers/register', fn ( $transformers ) => $this->register_settings_transformers( $transformers ) );
		@@ -49,29 +89,70 @@
49	89
50	90	add_action( 'elementor/atomic-widgets/settings/transformers/register', fn ( $transformers ) => $this->register_settings_transformers( $transformers ) );
51	91	add_action( 'elementor/document/after_migrate', fn( Document $document, array $data ) => $this->after_component_migrate( $document, $data ), 10, 2 );
52	92
	93	+ add_filter(
	94	+ 'elementor/atomic-widgets/llm-json-schema',
	95	+ fn( array $schema ) => ( new Overridable_LLM_Filter() )->apply( $schema )
	96	+ );
	97	+
53	98	( Component_Lock_Manager::get_instance()->register_hooks() );
54	99	( new Component_Styles() )->register_hooks();
55	100	( new Components_REST_API() )->register_hooks();
56	101	}
57	102
58		- public function is_experiment_active() {
59		- return Plugin::$instance->experiments->is_feature_active( self::EXPERIMENT_NAME )
60		- && Plugin::$instance->experiments->is_feature_active( AtomicWidgetsModule::EXPERIMENT_NAME );
	103	+ public static function is_experiment_active() {
	104	+ return Plugin::$instance->experiments->is_feature_active( AtomicWidgetsModule::EXPERIMENT_NAME );
61	105	}
62	106
63		- public static function get_experimental_data() {
64		- return [
65		- 'name' => self::EXPERIMENT_NAME,
66		- 'title' => esc_html__( 'Components', 'elementor' ),
67		- 'description' => esc_html__( 'Enable components.', 'elementor' ),
68		- 'hidden' => true,
69		- 'default' => Experiments_Manager::STATE_ACTIVE,
70		- 'release_status' => Experiments_Manager::RELEASE_STATUS_BETA,
71		- ];
	107	+ public static function is_variants_experiment_active(): bool {
	108	+ return Plugin::$instance->experiments->is_feature_active( self::EXPERIMENT_VARIANTS_NAME );
72	109	}
73	110
	111	+ public static function is_import_export_supported(): bool {
	112	+ return self::IS_IMPORT_EXPORT_SUPPORTED;
	113	+ }
	114	+
	115	+ /**
	116	+ * Single entry point for import runners to normalize the elements tree of an imported
	117	+ * document with respect to component instances. When components round-trip is enabled
	118	+ * (flag on) it rewrites source-site component ids to their destination-site equivalents;
	119	+ * when disabled (flag off) it strips any `e-component` widget that survived from a
	120	+ * legacy zip so the destination editor never opens a document with dangling instances.
	121	+ *
	122	+ * Kept as a static helper on the module so both `import-export-customization` and legacy
	123	+ * `import-export` import paths stay in sync when `IS_IMPORT_EXPORT_SUPPORTED` flips.
	124	+ */
	125	+ public static function prepare_imported_elements( array $elements, array $post_ids_map ): array {
	126	+ return self::is_import_export_supported()
	127	+ ? Remap_Component_Instance_Ids::apply( $elements, $post_ids_map )
	128	+ : Strip_Component_Instances::apply( $elements );
	129	+ }
	130	+
	131	+ /**
	132	+ * Post types that must be excluded from the import/export runners when components
	133	+ * round-trip is disabled. Same gating as `prepare_imported_elements()`.
	134	+ */
	135	+ public static function excluded_import_export_post_types(): array {
	136	+ return self::is_import_export_supported() ? [] : [ Component_Document::TYPE ];
	137	+ }
	138	+
	139	+ /**
	140	+ * Dev-only gate that keeps per-instance Component Variants off trunk while the feature ships
	141	+ * across several tickets. Hidden experiments cannot declare dependencies on other experiments,
	142	+ * so activation is checked manually in the constructor after the parent atomic-elements gate.
	143	+ */
	144	+ private function register_variants_experiment() {
	145	+ Plugin::$instance->experiments->add_feature( [
	146	+ 'name' => self::EXPERIMENT_VARIANTS_NAME,
	147	+ 'title' => esc_html__( 'Component Variants', 'elementor' ),
	148	+ 'description' => esc_html__( 'Enable per-instance class variants on components.', 'elementor' ),
	149	+ 'hidden' => true,
	150	+ 'default' => Experiments_Manager::STATE_INACTIVE,
	151	+ 'release_status' => Experiments_Manager::RELEASE_STATUS_DEV,
	152	+ ] );
	153	+ }
	154	+
74	155	public function get_widgets() {
75	156	return [
76	157	'Component_Instance',
77	158	];
		@@ -139,8 +220,40 @@
139	220
140	221	if ( ! $result->is_valid() ) {
141	222	throw new \Exception( esc_html( 'Settings validation failed for component overridable props: ' . $result->errors()->to_string() ) );
142	223	}
	224	+ }
	225	+
	226	+ private function set_component_variants( Document $document, array $data ) {
	227	+ if ( ! isset( $data['settings'] ) ) {
	228	+ return;
	229	+ }
	230	+ if ( ( ! $document instanceof Component_Document ) ||
	231	+ ( ! isset( $data['settings']['variants'] ) )
	232	+ ) {
	233	+ return;
	234	+ }
	235	+
	236	+ if ( ! Components_Access_Controller::can_edit() ) {
	237	+ throw new \Exception( esc_html__( 'You do not have permission to edit component source.', 'elementor' ) );
	238	+ }
	239	+
	240	+ /* @var Component_Document $document */
	241	+ $result = $document->update_variants( $data['settings']['variants'] );
	242	+
	243	+ if ( ! $result->is_valid() ) {
	244	+ throw new \Exception( esc_html( 'Settings validation failed for component variants: ' . $result->errors()->to_string() ) );
	245	+ }
	246	+ }
	247	+
	248	+ private function add_variant_class_ids( array $ids, $post_id ): array {
	249	+ $document = Plugin::$instance->documents->get( (int) $post_id );
	250	+
	251	+ if ( ! $document instanceof Component_Document ) {
	252	+ return $ids;
	253	+ }
	254	+
	255	+ return array_merge( $ids, Component_Variant_Class_Collector::collect( $document->get_variants() ) );
143	256	}
144	257
145	258	private function register_settings_transformers( Transformers_Registry $transformers ) {
146	259	$transformers->register( Component_Instance_Prop_Type::get_key(), new Component_Instance_Transformer() );