← All changes | includes/widgets/text-editor.php +61 -267 4.2.4 → 3.2.3 View file →

		@@ -42,9 +42,9 @@
42	42	*
43	43	* @return string Widget title.
44	44	*/
45	45	public function get_title() {
46		- return esc_html__( 'Text Editor', 'elementor' );
	46	+ return __( 'Text Editor', 'elementor' );
47	47	}
48	48
49	49	/**
50	50	* Get widget icon.
		@@ -90,36 +90,8 @@
90	90	return [ 'text', 'editor' ];
91	91	}
92	92
93	93	/**
94		- * Get style dependencies.
95		- *
96		- * Retrieve the list of style dependencies the widget requires.
97		- *
98		- * The 'widget-text-editor' style is required only when the drop cap is used.
99		- * Therefor, style should not be loaded on the widget level, rather only on
100		- * control level when the drop cap is active.
101		- *
102		- * Only in the Editor, these style should be loaded on the widget level.
103		- *
104		- * @since 3.24.0
105		- * @access public
106		- *
107		- * @return array Widget style dependencies.
108		- */
109		- public function get_style_depends(): array {
110		- $style_dependencies = Plugin::$instance->editor->is_edit_mode() || Plugin::$instance->preview->is_preview_mode()
111		- ? [ 'widget-text-editor' ]
112		- : [];
113		-
114		- return $style_dependencies;
115		- }
116		-
117		- public function has_widget_inner_wrapper(): bool {
118		- return ! Plugin::$instance->experiments->is_feature_active( 'e_optimized_markup' );
119		- }
120		-
121		- /**
122	94	* Register text editor widget controls.
123	95	*
124	96	* Adds different input fields to allow the user to change and customize the widget settings.
125	97	*
		@@ -129,9 +101,9 @@
129	101	protected function register_controls() {
130	102	$this->start_controls_section(
131	103	'section_editor',
132	104	[
133		- 'label' => esc_html__( 'Text Editor', 'elementor' ),
	105	+ 'label' => __( 'Text Editor', 'elementor' ),
134	106	]
135	107	);
136	108
137	109	$this->add_control(
		@@ -138,59 +110,34 @@
138	110	'editor',
139	111	[
140	112	'label' => '',
141	113	'type' => Controls_Manager::WYSIWYG,
142		- 'default' => '<p>' . esc_html__( 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut elit tellus, luctus nec ullamcorper mattis, pulvinar dapibus leo.', 'elementor' ) . '</p>',
	114	+ 'default' => '<p>' . __( 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut elit tellus, luctus nec ullamcorper mattis, pulvinar dapibus leo.', 'elementor' ) . '</p>',
143	115	]
144	116	);
145	117
146	118	$this->add_control(
147	119	'drop_cap', [
148		- 'label' => esc_html__( 'Drop Cap', 'elementor' ),
	120	+ 'label' => __( 'Drop Cap', 'elementor' ),
149	121	'type' => Controls_Manager::SWITCHER,
150		- 'label_off' => esc_html__( 'Off', 'elementor' ),
151		- 'label_on' => esc_html__( 'On', 'elementor' ),
	122	+ 'label_off' => __( 'Off', 'elementor' ),
	123	+ 'label_on' => __( 'On', 'elementor' ),
152	124	'prefix_class' => 'elementor-drop-cap-',
153	125	'frontend_available' => true,
154		- 'assets' => [
155		- 'styles' => [
156		- [
157		- 'name' => 'widget-text-editor',
158		- 'conditions' => [
159		- 'terms' => [
160		- [
161		- 'name' => 'drop_cap',
162		- 'operator' => '===',
163		- 'value' => 'yes',
164		- ],
165		- ],
166		- ],
167		- ],
168		- ],
169		-
170		- ],
171	126	]
172	127	);
173	128
	129	+ $text_columns = range( 1, 10 );
	130	+ $text_columns = array_combine( $text_columns, $text_columns );
	131	+ $text_columns[''] = __( 'Default', 'elementor' );
	132	+
174	133	$this->add_responsive_control(
175	134	'text_columns',
176	135	[
177		- 'label' => esc_html__( 'Columns', 'elementor' ),
	136	+ 'label' => __( 'Columns', 'elementor' ),
178	137	'type' => Controls_Manager::SELECT,
179	138	'separator' => 'before',
180		- 'options' => [
181		- '' => esc_html__( 'Default', 'elementor' ),
182		- '1' => esc_html__( '1', 'elementor' ),
183		- '2' => esc_html__( '2', 'elementor' ),
184		- '3' => esc_html__( '3', 'elementor' ),
185		- '4' => esc_html__( '4', 'elementor' ),
186		- '5' => esc_html__( '5', 'elementor' ),
187		- '6' => esc_html__( '6', 'elementor' ),
188		- '7' => esc_html__( '7', 'elementor' ),
189		- '8' => esc_html__( '8', 'elementor' ),
190		- '9' => esc_html__( '9', 'elementor' ),
191		- '10' => esc_html__( '10', 'elementor' ),
192		- ],
	139	+ 'options' => $text_columns,
193	140	'selectors' => [
194	141	'{{WRAPPER}}' => 'columns: {{VALUE}};',
195	142	],
196	143	]
		@@ -198,11 +145,11 @@
198	145
199	146	$this->add_responsive_control(
200	147	'column_gap',
201	148	[
202		- 'label' => esc_html__( 'Columns Gap', 'elementor' ),
	149	+ 'label' => __( 'Columns Gap', 'elementor' ),
203	150	'type' => Controls_Manager::SLIDER,
204		- 'size_units' => [ 'px', '%', 'em', 'rem', 'vw', 'custom' ],
	151	+ 'size_units' => [ 'px', '%', 'em', 'vw' ],
205	152	'range' => [
206	153	'px' => [
207	154	'max' => 100,
208	155	],
		@@ -215,31 +162,14 @@
215	162	'step' => 0.1,
216	163	],
217	164	'em' => [
218	165	'max' => 10,
	166	+ 'step' => 0.1,
219	167	],
220		- 'rem' => [
221		- 'max' => 10,
222		- ],
223	168	],
224	169	'selectors' => [
225	170	'{{WRAPPER}}' => 'column-gap: {{SIZE}}{{UNIT}};',
226	171	],
227		- 'conditions' => [
228		- 'relation' => 'or',
229		- 'terms' => [
230		- [
231		- 'name' => 'text_columns',
232		- 'operator' => '>',
233		- 'value' => 1,
234		- ],
235		- [
236		- 'name' => 'text_columns',
237		- 'operator' => '===',
238		- 'value' => '',
239		- ],
240		- ],
241		- ],
242	172	]
243	173	);
244	174
245	175	$this->end_controls_section();
		@@ -246,9 +176,9 @@
246	176
247	177	$this->start_controls_section(
248	178	'section_style',
249	179	[
250		- 'label' => esc_html__( 'Text Editor', 'elementor' ),
	180	+ 'label' => __( 'Text Editor', 'elementor' ),
251	181	'tab' => Controls_Manager::TAB_STYLE,
252	182	]
253	183	);
254	184
		@@ -254,99 +184,38 @@
254	184
255	185	$this->add_responsive_control(
256	186	'align',
257	187	[
258		- 'label' => esc_html__( 'Alignment', 'elementor' ),
	188	+ 'label' => __( 'Alignment', 'elementor' ),
259	189	'type' => Controls_Manager::CHOOSE,
260	190	'options' => [
261		- 'start' => [
262		- 'title' => esc_html__( 'Start', 'elementor' ),
	191	+ 'left' => [
	192	+ 'title' => __( 'Left', 'elementor' ),
263	193	'icon' => 'eicon-text-align-left',
264	194	],
265	195	'center' => [
266		- 'title' => esc_html__( 'Center', 'elementor' ),
	196	+ 'title' => __( 'Center', 'elementor' ),
267	197	'icon' => 'eicon-text-align-center',
268	198	],
269		- 'end' => [
270		- 'title' => esc_html__( 'End', 'elementor' ),
	199	+ 'right' => [
	200	+ 'title' => __( 'Right', 'elementor' ),
271	201	'icon' => 'eicon-text-align-right',
272	202	],
273	203	'justify' => [
274		- 'title' => esc_html__( 'Justified', 'elementor' ),
	204	+ 'title' => __( 'Justified', 'elementor' ),
275	205	'icon' => 'eicon-text-align-justify',
276	206	],
277	207	],
278		- 'classes' => 'elementor-control-start-end',
279		- 'selectors_dictionary' => [
280		- 'left' => is_rtl() ? 'end' : 'start',
281		- 'right' => is_rtl() ? 'start' : 'end',
282		- ],
283	208	'selectors' => [
284	209	'{{WRAPPER}}' => 'text-align: {{VALUE}};',
285	210	],
286		- 'separator' => 'after',
287	211	]
288	212	);
289	213
290		- $this->add_group_control(
291		- Group_Control_Typography::get_type(),
292		- [
293		- 'name' => 'typography',
294		- 'global' => [
295		- 'default' => Global_Typography::TYPOGRAPHY_TEXT,
296		- ],
297		- ]
298		- );
299		-
300		- $this->add_group_control(
301		- Group_Control_Text_Shadow::get_type(),
302		- [
303		- 'name' => 'text_shadow',
304		- 'selector' => '{{WRAPPER}}',
305		- ]
306		- );
307		-
308		- $this->add_responsive_control(
309		- 'paragraph_spacing',
310		- [
311		- 'label' => esc_html__( 'Paragraph Spacing', 'elementor' ),
312		- 'type' => Controls_Manager::SLIDER,
313		- 'size_units' => [ 'px', 'em', 'rem', 'vh', 'custom' ],
314		- 'range' => [
315		- 'px' => [
316		- 'max' => 100,
317		- ],
318		- 'em' => [
319		- 'min' => 0.1,
320		- 'max' => 20,
321		- ],
322		- ],
323		- 'selectors' => [
324		- '{{WRAPPER}} p' => 'margin-block-end: {{SIZE}}{{UNIT}}',
325		- ],
326		- ]
327		- );
328		-
329	214	$this->add_control(
330		- 'separator',
331		- [
332		- 'type' => Controls_Manager::DIVIDER,
333		- ]
334		- );
335		-
336		- $this->start_controls_tabs( 'link_colors' );
337		-
338		- $this->start_controls_tab(
339		- 'colors_normal',
340		- [
341		- 'label' => esc_html__( 'Normal', 'elementor' ),
342		- ]
343		- );
344		-
345		- $this->add_control(
346	215	'text_color',
347	216	[
348		- 'label' => esc_html__( 'Text Color', 'elementor' ),
	217	+ 'label' => __( 'Text Color', 'elementor' ),
349	218	'type' => Controls_Manager::COLOR,
350	219	'default' => '',
351	220	'selectors' => [
352	221	'{{WRAPPER}}' => 'color: {{VALUE}};',
		@@ -356,64 +225,32 @@
356	225	],
357	226	]
358	227	);
359	228
360		- $this->add_control(
361		- 'link_color',
	229	+ $this->add_group_control(
	230	+ Group_Control_Typography::get_type(),
362	231	[
363		- 'label' => esc_html__( 'Link Color', 'elementor' ),
364		- 'type' => Controls_Manager::COLOR,
365		- 'selectors' => [
366		- '{{WRAPPER}} a' => 'color: {{VALUE}};',
	232	+ 'name' => 'typography',
	233	+ 'global' => [
	234	+ 'default' => Global_Typography::TYPOGRAPHY_TEXT,
367	235	],
368	236	]
369	237	);
370	238
371		- $this->end_controls_tab();
372		-
373		- $this->start_controls_tab(
374		- 'colors_hover',
	239	+ $this->add_group_control(
	240	+ Group_Control_Text_Shadow::get_type(),
375	241	[
376		- 'label' => esc_html__( 'Hover', 'elementor' ),
	242	+ 'name' => 'text_shadow',
	243	+ 'selector' => '{{WRAPPER}}',
377	244	]
378	245	);
379	246
380		- $this->add_control(
381		- 'link_hover_color',
382		- [
383		- 'label' => esc_html__( 'Link Color', 'elementor' ),
384		- 'type' => Controls_Manager::COLOR,
385		- 'selectors' => [
386		- '{{WRAPPER}} a:hover, {{WRAPPER}} a:focus' => 'color: {{VALUE}};',
387		- ],
388		- ]
389		- );
390		-
391		- $this->add_control(
392		- 'link_hover_color_transition_duration',
393		- [
394		- 'label' => esc_html__( 'Transition Duration', 'elementor' ),
395		- 'type' => Controls_Manager::SLIDER,
396		- 'size_units' => [ 's', 'ms', 'custom' ],
397		- 'default' => [
398		- 'unit' => 's',
399		- ],
400		- 'selectors' => [
401		- '{{WRAPPER}} a' => 'transition-duration: {{SIZE}}{{UNIT}};',
402		- ],
403		- ]
404		- );
405		-
406		- $this->end_controls_tab();
407		-
408		- $this->end_controls_tabs();
409		-
410	247	$this->end_controls_section();
411	248
412	249	$this->start_controls_section(
413	250	'section_drop_cap',
414	251	[
415		- 'label' => esc_html__( 'Drop Cap', 'elementor' ),
	252	+ 'label' => __( 'Drop Cap', 'elementor' ),
416	253	'tab' => Controls_Manager::TAB_STYLE,
417	254	'condition' => [
418	255	'drop_cap' => 'yes',
419	256	],
		@@ -422,14 +259,14 @@
422	259
423	260	$this->add_control(
424	261	'drop_cap_view',
425	262	[
426		- 'label' => esc_html__( 'View', 'elementor' ),
	263	+ 'label' => __( 'View', 'elementor' ),
427	264	'type' => Controls_Manager::SELECT,
428	265	'options' => [
429		- 'default' => esc_html__( 'Default', 'elementor' ),
430		- 'stacked' => esc_html__( 'Stacked', 'elementor' ),
431		- 'framed' => esc_html__( 'Framed', 'elementor' ),
	266	+ 'default' => __( 'Default', 'elementor' ),
	267	+ 'stacked' => __( 'Stacked', 'elementor' ),
	268	+ 'framed' => __( 'Framed', 'elementor' ),
432	269	],
433	270	'default' => 'default',
434	271	'prefix_class' => 'elementor-drop-cap-view-',
435	272	]
		@@ -437,9 +274,9 @@
437	274
438	275	$this->add_control(
439	276	'drop_cap_primary_color',
440	277	[
441		- 'label' => esc_html__( 'Primary Color', 'elementor' ),
	278	+ 'label' => __( 'Primary Color', 'elementor' ),
442	279	'type' => Controls_Manager::COLOR,
443	280	'selectors' => [
444	281	'{{WRAPPER}}.elementor-drop-cap-view-stacked .elementor-drop-cap' => 'background-color: {{VALUE}};',
445	282	'{{WRAPPER}}.elementor-drop-cap-view-framed .elementor-drop-cap, {{WRAPPER}}.elementor-drop-cap-view-default .elementor-drop-cap' => 'color: {{VALUE}}; border-color: {{VALUE}};',
		@@ -452,9 +289,9 @@
452	289
453	290	$this->add_control(
454	291	'drop_cap_secondary_color',
455	292	[
456		- 'label' => esc_html__( 'Secondary Color', 'elementor' ),
	293	+ 'label' => __( 'Secondary Color', 'elementor' ),
457	294	'type' => Controls_Manager::COLOR,
458	295	'selectors' => [
459	296	'{{WRAPPER}}.elementor-drop-cap-view-framed .elementor-drop-cap' => 'background-color: {{VALUE}};',
460	297	'{{WRAPPER}}.elementor-drop-cap-view-stacked .elementor-drop-cap' => 'color: {{VALUE}};',
		@@ -475,11 +312,10 @@
475	312
476	313	$this->add_control(
477	314	'drop_cap_size',
478	315	[
479		- 'label' => esc_html__( 'Size', 'elementor' ),
	316	+ 'label' => __( 'Size', 'elementor' ),
480	317	'type' => Controls_Manager::SLIDER,
481		- 'size_units' => [ 'px', 'em', 'rem', 'custom' ],
482	318	'default' => [
483	319	'size' => 5,
484	320	],
485	321	'range' => [
		@@ -485,14 +321,8 @@
485	321	'range' => [
486	322	'px' => [
487	323	'max' => 30,
488	324	],
489		- 'em' => [
490		- 'max' => 3,
491		- ],
492		- 'rem' => [
493		- 'max' => 3,
494		- ],
495	325	],
496	326	'selectors' => [
497	327	'{{WRAPPER}} .elementor-drop-cap' => 'padding: {{SIZE}}{{UNIT}};',
498	328	],
		@@ -504,11 +334,10 @@
504	334
505	335	$this->add_control(
506	336	'drop_cap_space',
507	337	[
508		- 'label' => esc_html__( 'Space', 'elementor' ),
	338	+ 'label' => __( 'Space', 'elementor' ),
509	339	'type' => Controls_Manager::SLIDER,
510		- 'size_units' => [ 'px', 'em', 'rem', 'custom' ],
511	340	'default' => [
512	341	'size' => 10,
513	342	],
514	343	'range' => [
		@@ -514,17 +343,12 @@
514	343	'range' => [
515	344	'px' => [
516	345	'max' => 50,
517	346	],
518		- 'em' => [
519		- 'max' => 5,
520		- ],
521		- 'rem' => [
522		- 'max' => 5,
523		- ],
524	347	],
525	348	'selectors' => [
526		- '{{WRAPPER}} .elementor-drop-cap' => 'margin-inline-end: {{SIZE}}{{UNIT}};',
	349	+ 'body:not(.rtl) {{WRAPPER}} .elementor-drop-cap' => 'margin-right: {{SIZE}}{{UNIT}};',
	350	+ 'body.rtl {{WRAPPER}} .elementor-drop-cap' => 'margin-left: {{SIZE}}{{UNIT}};',
527	351	],
528	352	]
529	353	);
530	354
		@@ -530,11 +354,11 @@
530	354
531	355	$this->add_control(
532	356	'drop_cap_border_radius',
533	357	[
534		- 'label' => esc_html__( 'Border Radius', 'elementor' ),
	358	+ 'label' => __( 'Border Radius', 'elementor' ),
535	359	'type' => Controls_Manager::SLIDER,
536		- 'size_units' => [ 'px', '%', 'em', 'rem', 'custom' ],
	360	+ 'size_units' => [ '%', 'px' ],
537	361	'default' => [
538	362	'unit' => '%',
539	363	],
540	364	'range' => [
		@@ -544,19 +368,15 @@
544	368	],
545	369	'selectors' => [
546	370	'{{WRAPPER}} .elementor-drop-cap' => 'border-radius: {{SIZE}}{{UNIT}};',
547	371	],
548		- 'condition' => [
549		- 'drop_cap_view!' => 'default',
550		- ],
551	372	]
552	373	);
553	374
554	375	$this->add_control(
555	376	'drop_cap_border_width', [
556		- 'label' => esc_html__( 'Border Width', 'elementor' ),
	377	+ 'label' => __( 'Border Width', 'elementor' ),
557	378	'type' => Controls_Manager::DIMENSIONS,
558		- 'size_units' => [ 'px', '%', 'em', 'rem', 'vw', 'custom' ],
559	379	'selectors' => [
560	380	'{{WRAPPER}} .elementor-drop-cap' => 'border-width: {{TOP}}{{UNIT}} {{RIGHT}}{{UNIT}} {{BOTTOM}}{{UNIT}} {{LEFT}}{{UNIT}};',
561	381	],
562	382	'condition' => [
		@@ -587,30 +407,23 @@
587	407	* @since 1.0.0
588	408	* @access protected
589	409	*/
590	410	protected function render() {
591		- $should_render_inline_editing = Plugin::$instance->editor->is_edit_mode();
	411	+ $editor_content = $this->get_settings_for_display( 'editor' );
592	412
593		- $editor_content = $this->get_settings_for_display( 'editor' );
594	413	$editor_content = $this->parse_text_editor( $editor_content );
595	414
596		- if ( empty( $editor_content ) ) {
597		- return;
598		- }
599		-
600		- if ( $should_render_inline_editing ) {
	415	+ if ( ! Plugin::$instance->experiments->is_feature_active( 'e_dom_optimization' ) ) {
601	416	$this->add_render_attribute( 'editor', 'class', [ 'elementor-text-editor', 'elementor-clearfix' ] );
602	417	}
603	418
604	419	$this->add_inline_editing_attributes( 'editor', 'advanced' );
605	420	?>
606		- <?php if ( $should_render_inline_editing ) { ?>
607		- <div <?php $this->print_render_attribute_string( 'editor' ); ?>>
	421	+ <?php if ( ! Plugin::$instance->experiments->is_feature_active( 'e_dom_optimization' ) ) { ?>
	422	+ <div <?php echo $this->get_render_attribute_string( 'editor' ); ?>>
608	423	<?php } ?>
609		- <?php // PHPCS - DO NOT REMOVE THIS ECHO - THE MAIN TEXT OF A WIDGET SHOULD NOT BE ESCAPED!
610		- echo $editor_content; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
611		- ?>
612		- <?php if ( $should_render_inline_editing ) { ?>
	424	+ <?php echo $editor_content; ?>
	425	+ <?php if ( ! Plugin::$instance->experiments->is_feature_active( 'e_dom_optimization' ) ) { ?>
613	426	</div>
614	427	<?php } ?>
615	428	<?php
616	429	}
		@@ -624,9 +437,9 @@
624	437	* @access public
625	438	*/
626	439	public function render_plain_content() {
627	440	// In plain mode, render without shortcode
628		- $this->print_unescaped_setting( 'editor' );
	441	+ echo $this->get_settings( 'editor' );
629	442	}
630	443
631	444	/**
632	445	* Render text editor widget output in the editor.
		@@ -635,42 +448,23 @@
635	448	*
636	449	* @since 2.9.0
637	450	* @access protected
638	451	*/
639		- public function render_markdown(): string {
640		- $editor_content = $this->get_settings_for_display( 'editor' );
641		- $editor_content = $this->parse_text_editor( $editor_content );
642		-
643		- if ( empty( $editor_content ) ) {
644		- return '';
645		- }
646		-
647		- return \Elementor\Modules\MarkdownRender\Html_To_Markdown::convert( $editor_content );
648		- }
649		-
650	452	protected function content_template() {
651	453	?>
652	454	<#
653		- if ( '' === settings.editor ) {
654		- return;
655		- }
656		-
657		- const shouldRenderInlineEditing = elementorFrontend.isEditMode();
658		-
659		- if ( shouldRenderInlineEditing ) {
	455	+ <?php if ( ! Plugin::$instance->experiments->is_feature_active( 'e_dom_optimization' ) ) { ?>
660	456	view.addRenderAttribute( 'editor', 'class', [ 'elementor-text-editor', 'elementor-clearfix' ] );
661		- }
	457	+ <?php } ?>
662	458
663	459	view.addInlineEditingAttributes( 'editor', 'advanced' );
664		-
665		- if ( shouldRenderInlineEditing ) { #>
	460	+ #>
	461	+ <?php if ( ! Plugin::$instance->experiments->is_feature_active( 'e_dom_optimization' ) ) { ?>
666	462	<div {{{ view.getRenderAttributeString( 'editor' ) }}}>
667		- <# } #>
668		-
	463	+ <?php } ?>
669	464	{{{ settings.editor }}}
670		-
671		- <# if ( shouldRenderInlineEditing ) { #>
	465	+ <?php if ( ! Plugin::$instance->experiments->is_feature_active( 'e_dom_optimization' ) ) { ?>
672	466	</div>
673		- <# } #>
	467	+ <?php } ?>
674	468	<?php
675	469	}
676	470	}