← All changes | modules/atomic-widgets/elements/atomic-svg/atomic-svg.php +92 -49 4.3.2 → 3.29.0-beta4 View file →

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