← All changes | modules/atomic-widgets/elements/base/has-atomic-base.php +13 -108 4.3.0-beta3 → 4.1.4 View file →

		@@ -6,9 +6,8 @@
6	6	use Elementor\Modules\AtomicWidgets\Controls\Base\Atomic_Control_Base;
7	7	use Elementor\Modules\AtomicWidgets\Controls\Section;
8	8	use Elementor\Modules\AtomicWidgets\Elements\Atomic_Form\Atomic_Form;
9	9	use Elementor\Modules\AtomicWidgets\Elements\Loader\Frontend_Assets_Loader;
10		-use Elementor\Modules\AtomicWidgets\Logger\Logger;
11	10	use Elementor\Modules\AtomicWidgets\PropsResolver\Render_Props_Resolver;
12	11	use Elementor\Modules\AtomicWidgets\PropTypes\Contracts\Prop_Type;
13	12	use Elementor\Modules\AtomicWidgets\Styles\Style_Schema;
14	13	use Elementor\Modules\AtomicWidgets\Parsers\Props_Parser;
		@@ -16,9 +15,8 @@
16	15	use Elementor\Modules\AtomicWidgets\PropTypes\Attributes_Prop_Type;
17	16	use Elementor\Modules\AtomicWidgets\PropTypes\Key_Value_Prop_Type;
18	17	use Elementor\Modules\AtomicWidgets\PropTypes\Link_Prop_Type;
19	18	use Elementor\Modules\AtomicWidgets\PropTypes\Primitives\String_Prop_Type;
20		-use Elementor\Modules\AtomicWidgets\PropTypes\Prop_Duplication_Behavior;
21	19	use Elementor\Utils;
22	20	use Elementor\Modules\Components\PropTypes\Overridable_Prop_Type;
23	21	use Elementor\Modules\AtomicWidgets\Styles\Atomic_Widget_Styles;
24	22
		@@ -30,20 +28,9 @@
30	28	* @mixin Element_Base
31	29	*/
32	30	trait Has_Atomic_Base {
33	31	use Has_Base_Styles;
34		- use Has_Base_Settings;
35	32
36		- public static function html_tag_follows_link(): bool {
37		- return true;
38		- }
39		-
40		- public static function get_computed_html_tag( array $settings ): string {
41		- return Html_Tag_Computer::compute( $settings, 'div', [
42		- Html_Tag_Computer::FOLLOW_LINK_OPTION => static::html_tag_follows_link(),
43		- ] );
44		- }
45		-
46	33	public function has_widget_inner_wrapper(): bool {
47	34	return false;
48	35	}
49	36
		@@ -100,74 +87,23 @@
100	87
101	88	private function parse_atomic_styles( array $data ): array {
102	89	$styles = $data['styles'] ?? [];
103	90	$style_parser = Style_Parser::make( Style_Schema::get() );
104		- $validated_styles = [];
105	91
106	92	foreach ( $styles as $style_id => $style ) {
107	93	$result = $style_parser->parse( $style );
108	94
109	95	if ( ! $result->is_valid() ) {
110		- Logger::warning(
111		- $this->format_styles_validation_error_message(
112		- $style_id,
113		- $data,
114		- $style,
115		- $result->errors()->to_string()
116		- )
117		- );
118		- continue;
	96	+ $widget_id = $data['id'] ?? 'unknown';
	97	+ throw new \Exception( esc_html( "Styles validation failed for style `$style_id`. Widget ID: `$widget_id`. " . $result->errors()->to_string() ) );
119	98	}
120	99
121		- $validated_styles[ $style_id ] = $result->unwrap();
	100	+ $styles[ $style_id ] = $result->unwrap();
122	101	}
123	102
124		- return $validated_styles;
	103	+ return $styles;
125	104	}
126	105
127		- private function format_styles_validation_error_message(
128		- string $style_id,
129		- array $data,
130		- array $style,
131		- string $validation_errors
132		- ): string {
133		- $widget_id = $data['id'] ?? 'unknown';
134		- $structure_label = $this->get_editor_structure_label( $data );
135		- $style_label = isset( $style['label'] ) && is_string( $style['label'] ) ? $style['label'] : null;
136		-
137		- $message_parts = [
138		- "Styles validation failed for style `$style_id` (widget `$widget_id`)",
139		- ];
140		-
141		- if ( $structure_label ) {
142		- $message_parts[] = "Structure label: `$structure_label`";
143		- } else {
144		- $element_name = $this->get_title();
145		-
146		- if ( '' === $element_name ) {
147		- $element_name = $this->get_name();
148		- }
149		-
150		- $message_parts[] = "Element: `$element_name`";
151		- }
152		-
153		- if ( $style_label ) {
154		- $message_parts[] = "Style label: `$style_label`";
155		- }
156		-
157		- return implode( '. ', $message_parts ) . '. ' . $validation_errors;
158		- }
159		-
160		- private function get_editor_structure_label( array $data ): ?string {
161		- $title = $data['editor_settings']['title'] ?? $this->editor_settings['title'] ?? null;
162		-
163		- if ( ! is_string( $title ) || '' === $title ) {
164		- return null;
165		- }
166		-
167		- return $title;
168		- }
169		-
170	106	private function parse_atomic_settings( array $settings ): array {
171	107	$schema = static::get_props_schema();
172	108	$props_parser = Props_Parser::make( $schema );
173	109
		@@ -247,45 +183,20 @@
247	183	final public function get_data_for_save() {
248	184	$data = parent::get_data_for_save();
249	185
250	186	$data['version'] = $this->version;
	187	+ $data['settings'] = $this->parse_atomic_settings( $data['settings'] );
	188	+ $data['styles'] = $this->parse_atomic_styles( $data );
	189	+ $data['editor_settings'] = $this->parse_editor_settings( $data['editor_settings'] );
251	190
252		- $this->set_data_field_for_save(
253		- $data,
254		- 'settings',
255		- $this->parse_atomic_settings( $data['settings'] ?? [] )
256		- );
257		-
258		- $this->set_data_field_for_save(
259		- $data,
260		- 'styles',
261		- $this->parse_atomic_styles( $data )
262		- );
263		-
264		- $this->set_data_field_for_save(
265		- $data,
266		- 'editor_settings',
267		- $this->parse_editor_settings( $data['editor_settings'] ?? [] )
268		- );
269		-
270		- $this->set_data_field_for_save(
271		- $data,
272		- 'interactions',
273		- $this->transform_interactions_for_save( $data['interactions'] ?? [] )
274		- );
275		-
	191	+ if ( isset( $data['interactions'] ) && ! empty( $data['interactions'] ) ) {
	192	+ $data['interactions'] = $this->transform_interactions_for_save( $data['interactions'] );
	193	+ } else {
	194	+ $data['interactions'] = [];
	195	+ }
276	196	return $data;
277	197	}
278	198
279		- private function set_data_field_for_save( array &$data, string $key, $value ): void {
280		- if ( ! empty( $value ) ) {
281		- $data[ $key ] = $value;
282		- return;
283		- }
284		-
285		- unset( $data[ $key ] );
286		- }
287		-
288	199	private function transform_interactions_for_save( $interactions ) {
289	200	$decoded = $this->decode_interactions_data( $interactions );
290	201
291	202	if ( empty( $decoded['items'] ) ) {
		@@ -392,12 +303,8 @@
392	303	if ( isset( $data['title'] ) && is_string( $data['title'] ) ) {
393	304	$editor_data['title'] = sanitize_text_field( $data['title'] );
394	305	}
395	306
396		- if ( isset( $data['grid_outline'] ) && is_bool( $data['grid_outline'] ) ) {
397		- $editor_data['grid_outline'] = $data['grid_outline'];
398		- }
399		-
400	307	return $editor_data;
401	308	}
402	309
403	310	public static function get_props_schema(): array {
		@@ -403,11 +310,9 @@
403	310	public static function get_props_schema(): array {
404	311	$schema = static::define_props_schema();
405	312
406	313	if ( ! isset( $schema['_cssid'] ) ) {
407		- $schema['_cssid'] = String_Prop_Type::make()
408		- ->meta( Overridable_Prop_Type::ignore() )
409		- ->meta( Prop_Duplication_Behavior::clear() );
	314	+ $schema['_cssid'] = String_Prop_Type::make()->meta( Overridable_Prop_Type::ignore() );
410	315	}
411	316
412	317	return apply_filters(
413	318	'elementor/atomic-widgets/props-schema',