← All changes | modules/atomic-widgets/elements/atomic-svg/atomic-svg.php +114 -48 4.3.0 → 3.30.1 View file →

		@@ -2,25 +2,22 @@
2	2	namespace Elementor\Modules\AtomicWidgets\Elements\Atomic_Svg;
3	3
4	4	use Elementor\Modules\AtomicWidgets\Controls\Section;
5	5	use Elementor\Modules\AtomicWidgets\Controls\Types\Link_Control;
6		-use Elementor\Modules\AtomicWidgets\Controls\Types\Svg_Control;
7	6	use Elementor\Modules\AtomicWidgets\Controls\Types\Text_Control;
8		-use Elementor\Modules\AtomicWidgets\Elements\Base\Atomic_Widget_Base;
9		-use Elementor\Modules\AtomicWidgets\Elements\Base\Has_Template;
10		-use Elementor\Modules\AtomicWidgets\Module as Atomic_Widgets_Module;
11		-use Elementor\Modules\AtomicWidgets\Elements\Base\Html_Tag_Computer;
12		-use Elementor\Modules\AtomicWidgets\PropTypes\Attributes_Prop_Type;
	7	+use Elementor\Modules\AtomicWidgets\Module;
13	8	use Elementor\Modules\AtomicWidgets\PropTypes\Classes_Prop_Type;
14		-use Elementor\Modules\AtomicWidgets\PropTypes\Icon_Prop_Type;
	9	+use Elementor\Modules\AtomicWidgets\Elements\Atomic_Widget_Base;
	10	+use Elementor\Core\Utils\Svg\Svg_Sanitizer;
	11	+use Elementor\Modules\AtomicWidgets\Controls\Types\Svg_Control;
	12	+use Elementor\Modules\AtomicWidgets\PropTypes\Image_Src_Prop_Type;
15	13	use Elementor\Modules\AtomicWidgets\PropTypes\Link_Prop_Type;
16	14	use Elementor\Modules\AtomicWidgets\PropTypes\Primitives\String_Prop_Type;
17	15	use Elementor\Modules\AtomicWidgets\PropTypes\Size_Prop_Type;
18		-use Elementor\Modules\AtomicWidgets\PropTypes\Svg_Src_Prop_Type;
19		-use Elementor\Modules\AtomicWidgets\PropTypes\Union_Prop_Type;
20	16	use Elementor\Modules\AtomicWidgets\Styles\Style_Definition;
21	17	use Elementor\Modules\AtomicWidgets\Styles\Style_Variant;
22		-use Elementor\Modules\Components\PropTypes\Overridable_Prop_Type;
	18	+use Elementor\Plugin;
	19	+use Elementor\Utils;
23	20
24	21	if ( ! defined( 'ABSPATH' ) ) {
25	22	exit; // Exit if accessed directly.
26	23	}
		@@ -25,17 +22,13 @@
25	22	exit; // Exit if accessed directly.
26	23	}
27	24
28	25	class Atomic_Svg extends Atomic_Widget_Base {
29		- use Has_Template;
30		-
31	26	const BASE_STYLE_KEY = 'base';
32	27	const DEFAULT_SVG = 'images/default-svg.svg';
33	28	const DEFAULT_SVG_PATH = ELEMENTOR_ASSETS_PATH . self::DEFAULT_SVG;
34	29	const DEFAULT_SVG_URL = ELEMENTOR_ASSETS_URL . self::DEFAULT_SVG;
35	30
36		- public static $widget_description = 'Display an SVG image with customizable styles and link options.';
37		-
38	31	public static function get_element_type(): string {
39	32	return 'e-svg';
40	33	}
41	34
		@@ -43,9 +36,9 @@
43	36	return esc_html__( 'SVG', 'elementor' );
44	37	}
45	38
46	39	public function get_keywords() {
47		- return [ 'ato', 'atom', 'atoms', 'atomic', 'svg', 'icon', 'vector' ];
	40	+ return [ 'ato', 'atom', 'atoms', 'atomic' ];
48	41	}
49	42
50	43	public function get_icon() {
51	44	return 'eicon-svg';
		@@ -50,51 +43,45 @@
50	43	public function get_icon() {
51	44	return 'eicon-svg';
52	45	}
53	46
54		- public static function get_computed_html_tag( array $settings ): string {
55		- return Html_Tag_Computer::compute( $settings, 'div' );
56		- }
57		-
58	47	protected static function define_props_schema(): array {
59		- return [
	48	+ $props = [
60	49	'classes' => Classes_Prop_Type::make()->default( [] ),
61		- 'svg' => Union_Prop_Type::create_from(
62		- Svg_Src_Prop_Type::make()->default_url( static::DEFAULT_SVG_URL )
63		- )->add_prop_type( Icon_Prop_Type::make() ),
	50	+ 'svg' => Image_Src_Prop_Type::make()->default_url( static::DEFAULT_SVG_URL ),
64	51	'link' => Link_Prop_Type::make(),
65		- 'attributes' => Attributes_Prop_Type::make()->meta( Overridable_Prop_Type::ignore() ),
66	52	];
	53	+
	54	+ if ( Plugin::$instance->experiments->is_feature_active( Module::EXPERIMENT_VERSION_3_30 ) ) {
	55	+ $props['_cssid'] = String_Prop_Type::make();
	56	+ }
	57	+ return $props;
67	58	}
68	59
69	60	protected function define_atomic_controls(): array {
	61	+ $settings_section_items = [
	62	+ Link_Control::bind_to( 'link' ),
	63	+ ];
	64	+
	65	+ if ( Plugin::$instance->experiments->is_feature_active( Module::EXPERIMENT_VERSION_3_30 ) ) {
	66	+ $settings_section_items[] = Text_Control::bind_to( '_cssid' )->set_label( __( 'ID', 'elementor' ) )->set_meta( [
	67	+ 'layout' => 'two-columns',
	68	+ 'topDivider' => true,
	69	+ ] );
	70	+ }
	71	+
70	72	return [
71	73	Section::make()
72	74	->set_label( esc_html__( 'Content', 'elementor' ) )
73		- ->set_id( 'content' )
74	75	->set_items( [
75		- Svg_Control::bind_to( 'svg' )
76		- ->set_label( __( 'SVG', 'elementor' ) )
77		- ->set_show_icon_library( Atomic_Widgets_Module::is_svg_library_active() ),
	76	+ Svg_Control::bind_to( 'svg' ),
78	77	] ),
79	78	Section::make()
80		- ->set_label( __( 'Settings', 'elementor' ) )
81		- ->set_id( 'settings' )
82		- ->set_items( $this->get_settings_controls() ),
	79	+ ->set_label( esc_html__( 'Settings', 'elementor' ) )
	80	+ ->set_items( $settings_section_items ),
83	81	];
84	82	}
85	83
86		- protected function get_settings_controls(): array {
87		- return [
88		- Link_Control::bind_to( 'link' )
89		- ->set_placeholder( __( 'Type or paste your URL', 'elementor' ) )
90		- ->set_label( __( 'Link', 'elementor' ) ),
91		- Text_Control::bind_to( '_cssid' )
92		- ->set_label( __( 'ID', 'elementor' ) )
93		- ->set_meta( $this->get_css_id_control_meta() ),
94		- ];
95		- }
96		-
97	84	protected function define_base_styles(): array {
98	85	$display_value = String_Prop_Type::generate( 'inline-block' );
99	86
100	87	$size = Size_Prop_Type::generate( [
		@@ -112,14 +99,93 @@
112	99	),
113	100	];
114	101	}
115	102
116		- protected function get_templates(): array {
117		- return [
118		- 'elementor/elements/atomic-svg' => __DIR__ . '/atomic-svg.html.twig',
119		- ];
	103	+ protected function render() {
	104	+ $settings = $this->get_atomic_settings();
	105	+
	106	+ $svg = $this->get_svg_content( $settings );
	107	+
	108	+ if ( ! $svg ) {
	109	+ return;
	110	+ }
	111	+
	112	+ $svg = new \WP_HTML_Tag_Processor( $svg );
	113	+
	114	+ if ( ! $svg->next_tag( 'svg' ) ) {
	115	+ return;
	116	+ }
	117	+
	118	+ $svg->set_attribute( 'fill', 'currentColor' );
	119	+ $this->add_svg_style( $svg, 'width: 100%; height: 100%; overflow: unset;' );
	120	+
	121	+ $svg_html = ( new Svg_Sanitizer() )->sanitize( $svg->get_updated_html() );
	122	+
	123	+ $classes = array_filter( array_merge(
	124	+ [ self::BASE_STYLE_KEY => $this->get_base_styles_dictionary()[ self::BASE_STYLE_KEY ] ],
	125	+ $settings['classes']
	126	+ ) );
	127	+
	128	+ $classes_string = implode( ' ', $classes );
	129	+
	130	+ $cssid_attribute = ! empty( $settings['_cssid'] ) ? 'id="' . esc_attr( $settings['_cssid'] ) . '"' : '';
	131	+ if ( isset( $settings['link'] ) && ! empty( $settings['link']['href'] ) ) {
	132	+ $svg_html = sprintf(
	133	+ '<a href="%s" target="%s" class="%s" %s>%s</a>',
	134	+ $settings['link']['href'],
	135	+ esc_attr( $settings['link']['target'] ),
	136	+ esc_attr( $classes_string ),
	137	+ $cssid_attribute,
	138	+ $svg_html
	139	+ );
	140	+ } else {
	141	+ $svg_html = sprintf( '<div class="%s" %s>%s</div>', esc_attr( $classes_string ), $cssid_attribute, $svg_html );
	142	+ }
	143	+
	144	+ // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
	145	+ echo $svg_html;
120	146	}
121	147
122		- public function render_markdown(): string {
123		- return '';
	148	+ private function get_svg_content( $settings ) {
	149	+ if ( isset( $settings['svg']['id'] ) ) {
	150	+ $content = Utils::file_get_contents(
	151	+ get_attached_file( $settings['svg']['id'] )
	152	+ );
	153	+
	154	+ if ( $content ) {
	155	+ return $content;
	156	+ }
	157	+ }
	158	+
	159	+ if (
	160	+ isset( $settings['svg']['url'] ) &&
	161	+ static::DEFAULT_SVG_URL !== $settings['svg']['url']
	162	+ ) {
	163	+ $content = wp_safe_remote_get(
	164	+ $settings['svg']['url']
	165	+ );
	166	+
	167	+ if ( ! is_wp_error( $content ) ) {
	168	+ return $content['body'];
	169	+ }
	170	+ }
	171	+
	172	+ $content = Utils::file_get_contents(
	173	+ static::DEFAULT_SVG_PATH
	174	+ );
	175	+
	176	+ return $content ? $content : null;
	177	+ }
	178	+
	179	+ private function add_svg_style( &$svg, $new_style ) {
	180	+ $svg_style = $svg->get_attribute( 'style' );
	181	+ $svg_style = trim( (string) $svg_style );
	182	+
	183	+ if ( empty( $svg_style ) ) {
	184	+ $svg_style = $new_style;
	185	+ } else {
	186	+ $svg_style = rtrim( $svg_style, ';' ) . '; ' . $new_style;
	187	+ }
	188	+
	189	+ $svg->set_attribute( 'style', $svg_style );
124	190	}
125	191	}