PluginProbe
Elementor Website Builder – more than just a page builder / 3.11.2
Elementor Website Builder – more than just a page builder v3.11.2
4.3.0-beta2 4.3.0-beta1 4.2.4 4.2.3 4.2.2 4.2.1 4.2.0 4.1.5 4.2.0-beta2 4.2.0-dev2 4.2.0-beta1 4.1.4 4.1.3 4.1.2 4.1.1 4.1.0 4.1.0-beta3 4.1.0-dev3 4.0.9 4.1.0-beta2 4.1.0-dev2 4.0.8 4.1.0-beta1 4.1.0-dev1 4.0.7 All 451 releases
← All changes | core/experiments/manager.php +170 -382 4.1.43.11.2 View file →
@@ -1,9 +1,8 @@
1 1 <?php
2 2 namespace Elementor\Core\Experiments;
3 3
4 4 use Elementor\Core\Base\Base_Object;
5 -use Elementor\Core\Experiments\Exceptions\Dependency_Exception;
6 5 use Elementor\Core\Upgrade\Manager as Upgrade_Manager;
7 6 use Elementor\Core\Utils\Collection;
8 7 use Elementor\Modules\System_Info\Module as System_Info;
9 8 use Elementor\Plugin;
@@ -11,9 +10,9 @@
11 10 use Elementor\Tracker;
12 11 use Elementor\Utils;
13 12
14 13 if ( ! defined( 'ABSPATH' ) ) {
15 - exit; // Exit if accessed directly.
14 + exit; // Exit if accessed directly
16 15 }
17 16
18 17 class Manager extends Base_Object {
19 18
@@ -22,8 +21,10 @@
22 21 const RELEASE_STATUS_ALPHA = 'alpha';
23 22
24 23 const RELEASE_STATUS_BETA = 'beta';
25 24
25 + const RELEASE_STATUS_RC = 'rc';
26 +
26 27 const RELEASE_STATUS_STABLE = 'stable';
27 28
28 29 const STATE_DEFAULT = 'default';
29 30
@@ -32,10 +33,8 @@
32 33 const STATE_INACTIVE = 'inactive';
33 34
34 35 const TYPE_HIDDEN = 'hidden';
35 36
36 - const OPTION_PREFIX = 'elementor_experiment-';
37 -
38 37 private $states;
39 38
40 39 private $release_statuses;
41 40
@@ -43,26 +42,23 @@
43 42
44 43 /**
45 44 * Add Feature
46 45 *
47 - * Each feature has to provide the following information:
48 - * [
49 - * 'name' => string,
50 - * 'title' => string,
51 - * 'description' => string,
52 - * 'tag' => string,
53 - * 'release_status' => string,
54 - * 'default' => string,
55 - * 'new_site' => array,
56 - * ]
57 - *
58 46 * @since 3.1.0
59 47 * @access public
60 48 *
61 - * @param array $options Feature options.
49 + * @param array $options {
50 + * @type string $name
51 + * @type string $title
52 + * @type string $tag
53 + * @type string $description
54 + * @type string $release_status
55 + * @type string $default
56 + * @type callable $on_state_change
57 + * }
58 + *
62 59 * @return array|null
63 - *
64 - * @throws Dependency_Exception If can't change feature state.
60 + * @throws \Exception
65 61 */
66 62 public function add_feature( array $options ) {
67 63 if ( isset( $this->features[ $options['name'] ] ) ) {
68 64 return null;
@@ -67,14 +63,42 @@
67 63 if ( isset( $this->features[ $options['name'] ] ) ) {
68 64 return null;
69 65 }
70 66
71 - $experimental_data = $this->set_feature_initial_options( $options );
67 + $default_experimental_data = [
68 + 'tag' => '',
69 + 'description' => '',
70 + 'release_status' => self::RELEASE_STATUS_ALPHA,
71 + 'default' => self::STATE_INACTIVE,
72 + 'mutable' => true,
73 + static::TYPE_HIDDEN => false,
74 + 'new_site' => [
75 + 'default_active' => false,
76 + 'always_active' => false,
77 + 'minimum_installation_version' => null,
78 + ],
79 + 'on_state_change' => null,
80 + 'generator_tag' => false,
81 + ];
72 82
83 + $allowed_options = [ 'name', 'title', 'tag', 'description', 'release_status', 'default', 'mutable', static::TYPE_HIDDEN, 'new_site', 'on_state_change', 'dependencies', 'generator_tag' ];
84 +
85 + $experimental_data = $this->merge_properties( $default_experimental_data, $options, $allowed_options );
86 +
73 87 $new_site = $experimental_data['new_site'];
74 88
75 - if ( $new_site['default_active'] || $new_site['always_active'] || $new_site['default_inactive'] ) {
76 - $experimental_data = $this->set_new_site_default_state( $new_site, $experimental_data );
89 + if ( $new_site['default_active'] || $new_site['always_active'] ) {
90 + $is_new_installation = Upgrade_Manager::install_compare( $new_site['minimum_installation_version'], '>=' );
91 +
92 + if ( $is_new_installation ) {
93 + if ( $new_site['always_active'] ) {
94 + $experimental_data['state'] = self::STATE_ACTIVE;
95 +
96 + $experimental_data['mutable'] = false;
97 + } elseif ( $new_site['default_active'] ) {
98 + $experimental_data['default'] = self::STATE_ACTIVE;
99 + }
100 + }
77 101 }
78 102
79 103 if ( $experimental_data['mutable'] ) {
80 104 $experimental_data['state'] = $this->get_saved_feature_state( $options['name'] );
@@ -84,9 +108,17 @@
84 108 $experimental_data['state'] = self::STATE_DEFAULT;
85 109 }
86 110
87 111 if ( ! empty( $experimental_data['dependencies'] ) ) {
88 - $experimental_data = $this->initialize_feature_dependencies( $experimental_data );
112 + foreach ( $experimental_data['dependencies'] as $key => $dependency ) {
113 + $feature = $this->get_features( $dependency );
114 +
115 + if ( ! empty( $feature[ static::TYPE_HIDDEN ] ) ) {
116 + throw new Exceptions\Dependency_Exception( 'Depending on a hidden experiment is not allowed.' );
117 + }
118 +
119 + $experimental_data['dependencies'][ $key ] = $this->create_dependency_class( $dependency, $feature );
120 + }
89 121 }
90 122
91 123 $this->features[ $options['name'] ] = $experimental_data;
92 124
@@ -99,9 +131,9 @@
99 131 } catch ( Exceptions\Dependency_Exception $e ) {
100 132 $message = sprintf(
101 133 '<p>%s</p><p><a href="#" onclick="location.href=\'%s\'">%s</a></p>',
102 134 esc_html( $e->getMessage() ),
103 - Settings::get_settings_tab_url( 'experiments' ),
135 + site_url( 'wp-admin/admin.php?page=elementor#tab-experiments' ),
104 136 esc_html__( 'Back', 'elementor' )
105 137 );
106 138
107 139 wp_die( $message ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
@@ -116,98 +148,9 @@
116 148
117 149 return $experimental_data;
118 150 }
119 151
120 - private function install_compare( $version ) {
121 - $installs_history = Upgrade_Manager::get_installs_history();
122 -
123 - if ( empty( $installs_history ) ) {
124 - // Fresh installation: upgrade manager hasn't written history yet on this first request.
125 - // Use the current plugin version as the effective first-install version.
126 - return version_compare( ELEMENTOR_VERSION, $version, '>=' );
127 - }
128 -
129 - $cleaned_version = preg_replace( '/-(beta|cloud|dev)\d*$/', '', key( $installs_history ) );
130 -
131 - return version_compare(
132 - $cleaned_version,
133 - $version,
134 - '>='
135 - );
136 - }
137 -
138 152 /**
139 - * Combine 'tag' and 'tags' into one property.
140 - *
141 - * @param array $experimental_data
142 - *
143 - * @return array
144 - */
145 - private function unify_feature_tags( array $experimental_data ): array {
146 - foreach ( [ 'tag', 'tags' ] as $key ) {
147 - if ( empty( $experimental_data[ $key ] ) ) {
148 - continue;
149 - }
150 -
151 - $experimental_data[ $key ] = $this->format_feature_tags( $experimental_data[ $key ] );
152 - }
153 -
154 - if ( is_array( $experimental_data['tag'] ) ) {
155 - $experimental_data['tags'] = array_merge( $experimental_data['tag'], $experimental_data['tags'] );
156 - }
157 -
158 - return $experimental_data;
159 - }
160 -
161 - /**
162 - * Format feature tags into the right format.
163 - *
164 - * If an array of tags provided, each tag has to provide the following information:
165 - * [
166 - * [
167 - * 'type' => string,
168 - * 'label' => string,
169 - * ]
170 - * ]
171 - *
172 - * @param string|array $tags A string of comma separated tags, or an array of tags.
173 - *
174 - * @return array
175 - */
176 - private function format_feature_tags( $tags ): array {
177 - if ( ! is_string( $tags ) && ! is_array( $tags ) ) {
178 - return [];
179 - }
180 -
181 - $default_tag = [
182 - 'type' => 'default',
183 - 'label' => '',
184 - ];
185 -
186 - $allowed_tag_properties = [ 'type', 'label' ];
187 -
188 - // If $tags is string, explode by commas and convert to array.
189 - if ( is_string( $tags ) ) {
190 - $tags = array_filter( explode( ',', $tags ) );
191 -
192 - foreach ( $tags as $i => $tag ) {
193 - $tags[ $i ] = [ 'label' => trim( $tag ) ];
194 - }
195 - }
196 -
197 - foreach ( $tags as $i => $tag ) {
198 - if ( empty( $tag['label'] ) ) {
199 - unset( $tags[ $i ] );
200 - continue;
201 - }
202 -
203 - $tags[ $i ] = $this->merge_properties( $default_tag, $tag, $allowed_tag_properties );
204 - }
205 -
206 - return $tags;
207 - }
208 -
209 - /**
210 153 * Remove Feature
211 154 *
212 155 * @since 3.1.0
213 156 * @access public
@@ -223,9 +166,9 @@
223 166 *
224 167 * @since 3.1.0
225 168 * @access public
226 169 *
227 - * @param string $feature_name Optional. Default is null.
170 + * @param string $feature_name Optional. Default is null
228 171 *
229 172 * @return array|null
230 173 */
231 174 public function get_features( $feature_name = null ) {
@@ -253,27 +196,16 @@
253 196 * @param string $feature_name
254 197 *
255 198 * @return bool
256 199 */
257 - public function is_feature_active( $feature_name, $check_dependencies = false ) {
200 + public function is_feature_active( $feature_name ) {
258 201 $feature = $this->get_features( $feature_name );
259 202
260 - if ( ! $feature || self::STATE_ACTIVE !== $this->get_feature_actual_state( $feature ) ) {
203 + if ( ! $feature ) {
261 204 return false;
262 205 }
263 206
264 - if ( $check_dependencies && isset( $feature['dependencies'] ) && is_array( $feature['dependencies'] ) ) {
265 - foreach ( $feature['dependencies'] as $dependency ) {
266 - $dependent_feature = $this->get_features( $dependency->get_name() );
267 - $feature_state = self::STATE_ACTIVE === $this->get_feature_actual_state( $dependent_feature );
268 -
269 - if ( ! $feature_state ) {
270 - return false;
271 - }
272 - }
273 - }
274 -
275 - return true;
207 + return self::STATE_ACTIVE === $this->get_feature_actual_state( $feature );
276 208 }
277 209
278 210 /**
279 211 * Set Feature Default State
@@ -304,91 +236,129 @@
304 236 *
305 237 * @return string
306 238 */
307 239 public function get_feature_option_key( $feature_name ) {
308 - return static::OPTION_PREFIX . $feature_name;
240 + return 'elementor_experiment-' . $feature_name;
309 241 }
310 242
311 243 private function add_default_features() {
312 244 $this->add_feature( [
313 - 'name' => 'e_font_icon_svg',
314 - 'title' => esc_html__( 'Inline Font Icons', 'elementor' ),
245 + 'name' => 'e_dom_optimization',
246 + 'title' => esc_html__( 'Optimized DOM Output', 'elementor' ),
315 247 'tag' => esc_html__( 'Performance', 'elementor' ),
316 - 'description' => sprintf(
317 - '%1$s <a href="https://go.elementor.com/wp-dash-inline-font-awesome/" target="_blank">%2$s</a>',
318 - esc_html__( 'The “Inline Font Icons” will render the icons as inline SVG without loading the Font-Awesome and the eicons libraries and its related CSS files and fonts.', 'elementor' ),
319 - esc_html__( 'Learn more', 'elementor' )
320 - ),
248 + 'description' => esc_html__( 'Developers, Please Note! This experiment includes some markup changes. If you\'ve used custom code in Elementor, you might have experienced a snippet of code not running. Turning this experiment off allows you to keep prior Elementor markup output settings, and have that lovely code running again.', 'elementor' )
249 + . ' <a href="https://go.elementor.com/wp-dash-legacy-optimized-dom/" target="_blank">'
250 + . esc_html__( 'Learn More', 'elementor' ) . '</a>',
321 251 'release_status' => self::RELEASE_STATUS_STABLE,
322 252 'new_site' => [
323 253 'default_active' => true,
324 - 'minimum_installation_version' => '3.17.0',
254 + 'minimum_installation_version' => '3.1.0-beta',
325 255 ],
326 256 'generator_tag' => true,
327 257 ] );
328 258
329 259 $this->add_feature( [
330 - 'name' => 'additional_custom_breakpoints',
331 - 'title' => esc_html__( 'Additional Custom Breakpoints', 'elementor' ),
332 - 'description' => sprintf(
333 - '%1$s <a href="https://go.elementor.com/wp-dash-additional-custom-breakpoints/" target="_blank">%2$s</a>',
334 - esc_html__( 'Get pixel-perfect design for every screen size. You can now add up to 6 customizable breakpoints beyond the default desktop setting: mobile, mobile extra, tablet, tablet extra, laptop, and widescreen.', 'elementor' ),
335 - esc_html__( 'Learn more', 'elementor' )
336 - ),
260 + 'name' => 'e_optimized_assets_loading',
261 + 'title' => esc_html__( 'Improved Asset Loading', 'elementor' ),
262 + 'tag' => esc_html__( 'Performance', 'elementor' ),
263 + 'description' => esc_html__( 'Please Note! The "Improved Asset Loading" mode reduces the amount of code that is loaded on the page by default. When activated, parts of the infrastructure code will be loaded dynamically, only when needed. Keep in mind that activating this experiment may cause conflicts with incompatible plugins.', 'elementor' )
264 + . ' <a href="https://go.elementor.com/wp-dash-improved-asset-loading/" target="_blank">'
265 + . esc_html__( 'Learn More', 'elementor' ) . '</a>',
337 266 'release_status' => self::RELEASE_STATUS_STABLE,
338 - 'default' => self::STATE_ACTIVE,
267 + 'new_site' => [
268 + 'default_active' => true,
269 + 'minimum_installation_version' => '3.2.0-beta',
270 + ],
339 271 'generator_tag' => true,
340 272 ] );
341 273
342 274 $this->add_feature( [
343 - 'name' => 'container',
344 - 'title' => esc_html__( 'Container', 'elementor' ),
345 - 'description' => sprintf(
346 - /* translators: 1: Link opening tag, 2: Link closing tag, 3: Link opening tag, 4: Link closing tag, 5: Link opening tag, 6: Link closing tag */
347 - esc_html__( 'Create advanced layouts and responsive designs with %1$sFlexbox%2$s and %3$sGrid%4$s container elements. Give it a try using the %5$sContainer playground%6$s.', 'elementor' ),
348 - '<a target="_blank" href="https://go.elementor.com/wp-dash-flex-container/">',
349 - '</a>',
350 - '<a target="_blank" href="https://go.elementor.com/wp-dash-grid-container/">',
351 - '</a>',
352 - '<a target="_blank" href="https://go.elementor.com/wp-dash-flex-container-playground/">',
353 - '</a>'
354 - ),
275 + 'name' => 'e_optimized_css_loading',
276 + 'title' => esc_html__( 'Improved CSS Loading', 'elementor' ),
277 + 'tag' => esc_html__( 'Performance', 'elementor' ),
278 + 'description' => esc_html__( 'Please Note! The “Improved CSS Loading” mode reduces the amount of CSS code that is loaded on the page by default. When activated, the CSS code will be loaded, rather inline or in a dedicated file, only when needed. Activating this experiment may cause conflicts with incompatible plugins.', 'elementor' )
279 + . ' <a href="https://go.elementor.com/wp-dash-improved-css-loading/" target="_blank">'
280 + . esc_html__( 'Learn More', 'elementor' ) . '</a>',
355 281 'release_status' => self::RELEASE_STATUS_STABLE,
356 - 'default' => self::STATE_INACTIVE,
357 282 'new_site' => [
358 283 'default_active' => true,
359 - 'minimum_installation_version' => '3.16.0',
284 + 'minimum_installation_version' => '3.3.0-beta',
360 285 ],
361 - 'messages' => [
362 - 'on_deactivate' => sprintf(
363 - '%1$s <a target="_blank" href="https://go.elementor.com/wp-dash-deactivate-container/">%2$s</a>',
364 - esc_html__( 'Container-based content will be hidden from your site and may not be recoverable in all cases.', 'elementor' ),
365 - esc_html__( 'Learn more', 'elementor' ),
366 - ),
286 + 'generator_tag' => true,
287 + ] );
288 +
289 + $this->add_feature( [
290 + 'name' => 'e_font_icon_svg',
291 + 'title' => esc_html__( 'Inline Font Icons', 'elementor' ),
292 + 'tag' => esc_html__( 'Performance', 'elementor' ),
293 + 'description' => esc_html__( 'The “Inline Font Icons” will render the icons as inline SVG without loading the Font-Awesome and the eicons libraries and its related CSS files and fonts.', 'elementor' )
294 + . ' <a href="https://go.elementor.com/wp-dash-inline-font-awesome/" target="_blank">'
295 + . esc_html__( 'Learn More', 'elementor' ) . '</a>',
296 + 'release_status' => self::RELEASE_STATUS_BETA,
297 + 'generator_tag' => true,
298 + ] );
299 +
300 + $this->add_feature( [
301 + 'name' => 'a11y_improvements',
302 + 'title' => esc_html__( 'Accessibility Improvements', 'elementor' ),
303 + 'tag' => esc_html__( 'Performance', 'elementor' ),
304 + 'description' => esc_html__( 'An array of accessibility enhancements in Elementor pages.', 'elementor' )
305 + . '<br><strong>' . esc_html__( 'Please note!', 'elementor' ) . '</strong> ' . esc_html__( 'These enhancements may include some markup changes to existing elementor widgets', 'elementor' )
306 + . ' <a href="https://go.elementor.com/wp-dash-a11y-improvements/" target="_blank">'
307 + . esc_html__( 'Learn More', 'elementor' ) . '</a>',
308 + 'release_status' => self::RELEASE_STATUS_STABLE,
309 + 'new_site' => [
310 + 'default_active' => true,
311 + 'minimum_installation_version' => '3.1.0-beta',
367 312 ],
313 + 'generator_tag' => true,
368 314 ] );
369 315
370 316 $this->add_feature( [
371 - 'name' => 'e_optimized_markup',
372 - 'title' => esc_html__( 'Optimized Markup', 'elementor' ),
317 + 'name' => 'additional_custom_breakpoints',
318 + 'title' => esc_html__( 'Additional Custom Breakpoints', 'elementor' ),
373 319 'tag' => esc_html__( 'Performance', 'elementor' ),
374 - 'description' => esc_html__( 'Reduce the DOM size by eliminating HTML tags in various elements and widgets. This experiment includes markup changes so it might require updating custom CSS/JS code and cause compatibility issues with third party plugins.', 'elementor' ),
320 + 'description' => esc_html__( 'Get pixel-perfect design for every screen size. You can now add up to 6 customizable breakpoints beyond the default desktop setting: mobile, mobile extra, tablet, tablet extra, laptop, and widescreen.', 'elementor' )
321 + . ' <a href="https://go.elementor.com/wp-dash-additional-custom-breakpoints/" target="_blank">'
322 + . esc_html__( 'Learn More', 'elementor' ) . '</a>',
375 323 'release_status' => self::RELEASE_STATUS_STABLE,
376 - 'default' => self::STATE_INACTIVE,
377 324 'new_site' => [
378 325 'default_active' => true,
379 - 'minimum_installation_version' => '3.30.0',
326 + 'minimum_installation_version' => '3.4.0-beta',
380 327 ],
328 + 'generator_tag' => true,
381 329 ] );
382 330
383 331 $this->add_feature( [
384 - 'name' => 'e_panel_promotions',
385 - 'title' => esc_html__( 'Panel Promotions', 'elementor' ),
386 - 'description' => esc_html__( 'Enable experimental rendering for targeted promotions within the elements panels.', 'elementor' ),
387 - 'release_status' => self::RELEASE_STATUS_DEV,
388 - 'default' => self::STATE_ACTIVE,
389 - 'type' => self::TYPE_HIDDEN,
332 + 'name' => 'admin_menu_rearrangement',
333 + 'mutable' => false,
390 334 ] );
335 +
336 + $this->add_feature( [
337 + 'name' => 'container',
338 + 'title' => esc_html__( 'Flexbox Container', 'elementor' ),
339 + 'tag' => esc_html__( 'Feature', 'elementor' ),
340 + 'description' => sprintf( esc_html__(
341 + 'Create advanced layouts and responsive designs with the new %1$sFlexbox Container element%2$s.
342 + This experiment replaces the current section/column structure, but you\'ll still keep your existing
343 + Sections, Inner Sections and Columns and be able to edit them. Ready to give it a try? Check out the %3$sFlexbox playground%4$s.',
344 + 'elementor'
345 + ), '<a target="_blank" href="https://go.elementor.com/wp-dash-flex-container/">', '</a>', '<a target="_blank" href="https://go.elementor.com/wp-dash-flex-container-playground/">', '</a>'),
346 + 'release_status' => self::RELEASE_STATUS_RC,
347 + 'default' => self::STATE_INACTIVE,
348 + ] );
349 +
350 + $this->add_feature( [
351 + 'name' => 'e_swiper_latest',
352 + 'title' => esc_html__( 'Upgrade Swiper Library', 'elementor' ),
353 + 'description' => esc_html__( 'Prepare your website for future improvements to carousel features by upgrading the Swiper library integrated into your site from v5.36 to v8.45. This experiment includes markup changes so it might require updating custom code and cause compatibility issues with third party plugins.', 'elementor' ),
354 + 'release_status' => self::RELEASE_STATUS_BETA,
355 + 'new_site' => [
356 + 'default_active' => true,
357 + 'minimum_installation_version' => '3.11.0',
358 + ],
359 + 'default' => self::STATE_INACTIVE,
360 + ] );
391 361 }
392 362
393 363 /**
394 364 * Init States
@@ -414,8 +384,9 @@
414 384 $this->release_statuses = [
415 385 self::RELEASE_STATUS_DEV => esc_html__( 'Development', 'elementor' ),
416 386 self::RELEASE_STATUS_ALPHA => esc_html__( 'Alpha', 'elementor' ),
417 387 self::RELEASE_STATUS_BETA => esc_html__( 'Beta', 'elementor' ),
388 + self::RELEASE_STATUS_RC => esc_html__( 'Release Candidate', 'elementor' ),
418 389 self::RELEASE_STATUS_STABLE => esc_html__( 'Stable', 'elementor' ),
419 390 ];
420 391 }
421 392
@@ -439,8 +410,9 @@
439 410 * @param Settings $settings
440 411 *
441 412 * @since 3.1.0
442 413 * @access private
414 + *
443 415 */
444 416 private function register_settings_fields( Settings $settings ) {
445 417 $features = $this->get_features();
446 418
@@ -529,9 +501,9 @@
529 501 </h2>
530 502 <p class="e-experiment__description">
531 503 <?php
532 504 printf(
533 - /* translators: %1$s Link open tag, %2$s: Link close tag. */
505 + /* translators: %1$s Link open tag, %2$s: Link close tag. */
534 506 esc_html__( 'Personalize your Elementor experience by controlling which features and experiments are active on your site. Help make Elementor better by %1$ssharing your experience and feedback with us%2$s.', 'elementor' ),
535 507 '<a href="https://go.elementor.com/wp-dash-experiments-report-an-issue/" target="_blank">',
536 508 '</a>'
537 509 );
@@ -538,20 +510,20 @@
538 510 ?>
539 511 </p>
540 512 <p class="e-experiment__description">
541 513 <?php
542 - printf(
543 - '%1$s <a href="https://go.elementor.com/wp-dash-experiments/" target="_blank">%2$s</a>',
544 - esc_html__( 'To use an experiment or feature on your site, simply click on the dropdown next to it and switch to Active. You can always deactivate them at any time.', 'elementor' ),
545 - esc_html__( 'Learn more', 'elementor' ),
546 - );
514 + printf(
515 + /* translators: %1$s Link open tag, %2$s: Link close tag. */
516 + esc_html__( 'To use an experiment or feature on your site, simply click on the dropdown next to it and switch to Active. You can always deactivate them at any time. %1$sLearn More.%2$s', 'elementor' ),
517 + '<a href="https://go.elementor.com/wp-dash-experiments/" target="_blank">',
518 + '</a>'
519 + );
547 520 ?>
548 521 </p>
549 522
550 523 <?php if ( $this->get_features() ) { ?>
551 - <button type="button" class="button e-experiment__button" value="active"><?php echo esc_html__( 'Activate All', 'elementor' ); ?></button>
552 - <button type="button" class="button e-experiment__button" value="inactive"><?php echo esc_html__( 'Deactivate All', 'elementor' ); ?></button>
553 - <button type="button" class="button e-experiment__button" value="default"><?php echo esc_html__( 'Back to default', 'elementor' ); ?></button>
524 + <button type="button" class="button e-experiment__button" value="active"><?php echo esc_html__( 'Activate All', 'elementor' ); ?></button>
525 + <button type="button" class="button e-experiment__button" value="inactive"><?php echo esc_html__( 'Deactivate All', 'elementor' ); ?></button>
554 526 <?php } ?>
555 527 <hr>
556 528 <h2 class="e-experiment__table-title">
557 529 <?php echo esc_html__( 'Ongoing Experiments', 'elementor' ); ?>
@@ -571,9 +543,8 @@
571 543 $control_id = 'e-experiment-' . $feature['name'];
572 544 $control_name = $this->get_feature_option_key( $feature['name'] );
573 545
574 546 $status = sprintf(
575 - /* translators: %s Release status. */
576 547 esc_html__( 'Status: %s', 'elementor' ),
577 548 $this->release_statuses[ $feature['release_status'] ]
578 549 );
579 550
@@ -632,13 +603,13 @@
632 603 ->find( function ( $dependency ) {
633 604 return $dependency instanceof Non_Existing_Dependency;
634 605 } );
635 606
636 - return (bool) $non_existing_dep;
607 + return ! ! $non_existing_dep;
637 608 }
638 609
639 610 /**
640 - * Get Feature Settings Label HTML.
611 + * Get Feature Settings Label HTML
641 612 *
642 613 * @since 3.1.0
643 614 * @access private
644 615 *
@@ -662,17 +633,11 @@
662 633 ?>
663 634 <div class="e-experiment__title">
664 635 <div class="<?php echo $indicator_classes; ?>" data-tooltip="<?php echo $indicator_tooltip; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped ?>"></div>
665 636 <label class="e-experiment__title__label" for="e-experiment-<?php echo $feature['name']; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped ?>"><?php echo $feature['title']; ?></label>
666 - <?php foreach ( $feature['tags'] as $tag ) { ?>
667 - <?php
668 - $tag_classes = 'e-experiment__title__tag e-experiment__title__tag__' . $tag['type'] . ' e-editor-one';
669 - ?>
670 - <span class="<?php echo esc_attr( $tag_classes ); ?>"><?php echo $tag['label']; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped ?></span>
671 - <?php } ?>
672 - <?php if ( $feature['deprecated'] ) { ?>
673 - <span class="e-experiment__title__tag e-experiment__title__tag__deprecated"><?php echo esc_html__( 'Deprecated', 'elementor' ); ?></span>
674 - <?php } ?>
637 + <?php if ( ! empty( $feature['tag'] ) ) : ?>
638 + <span class="e-experiment__title__tag"><?php echo $feature['tag']; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped ?></span>
639 + <?php endif; ?>
675 640 </div>
676 641 <?php
677 642
678 643 return ob_get_clean();
@@ -723,9 +688,9 @@
723 688 *
724 689 * @return string
725 690 */
726 691 private function get_feature_actual_state( array $feature ) {
727 - if ( ! empty( $feature['state'] ) && self::STATE_DEFAULT !== $feature['state'] ) {
692 + if ( self::STATE_DEFAULT !== $feature['state'] ) {
728 693 return $feature['state'];
729 694 }
730 695
731 696 return $feature['default'];
@@ -736,11 +701,12 @@
736 701 *
737 702 * @since 3.1.0
738 703 * @access private
739 704 *
740 - * @param array $old_feature_data
705 + * @param array $old_feature_data
741 706 * @param string $new_state
742 - * @param string $old_state
707 + *
708 + * @throws \Elementor\Core\Experiments\Exceptions\Dependency_Exception
743 709 */
744 710 private function on_feature_state_change( array $old_feature_data, $new_state, $old_state ) {
745 711 $new_feature_data = $this->get_features( $old_feature_data['name'] );
746 712 $this->validate_dependency( $new_feature_data, $new_state );
@@ -757,9 +723,9 @@
757 723 do_action( 'elementor/experiments/feature-state-change/' . $old_feature_data['name'], $old_state, $new_state );
758 724 }
759 725
760 726 /**
761 - * @throws Exceptions\Dependency_Exception If the feature dependency is not available or not active.
727 + * @throws \Elementor\Core\Experiments\Exceptions\Dependency_Exception
762 728 */
763 729 private function validate_dependency( array $feature, $new_state ) {
764 730 $rollback = function ( $feature_option_key, $state ) {
765 731 remove_all_actions( 'add_option_' . $feature_option_key );
@@ -788,10 +754,10 @@
788 754
789 755 throw new Exceptions\Dependency_Exception(
790 756 sprintf(
791 757 'The feature `%s` has a dependency `%s` that is not available.',
792 - esc_html( $feature['name'] ),
793 - esc_html( $dependency->get_name() )
758 + $feature['name'],
759 + $dependency->get_name()
794 760 )
795 761 );
796 762 }
797 763
@@ -803,10 +769,10 @@
803 769
804 770 throw new Exceptions\Dependency_Exception(
805 771 sprintf(
806 772 'To turn on `%1$s`, Experiment: `%2$s` activity is required!',
807 - esc_html( $feature['name'] ),
808 - esc_html( $dependency_feature['name'] )
773 + $feature['name'],
774 + $dependency_feature['name']
809 775 )
810 776 );
811 777 }
812 778 }
@@ -843,74 +809,8 @@
843 809
844 810 return new Non_Existing_Dependency( $dependency_name );
845 811 }
846 812
847 - /**
848 - * The experiments page is a WordPress options page, which means all the experiments are registered via WordPress' register_settings(),
849 - * and their states are being sent in the POST request when saving.
850 - * The options are being updated in a chronological order based on the POST data.
851 - * This behavior interferes with the experiments dependency mechanism because the data that's being sent can be in any order,
852 - * while the dependencies mechanism expects it to be in a specific order (dependencies should be activated before their dependents can).
853 - * In order to solve this issue, we sort the experiments in the POST data based on their dependencies tree.
854 - *
855 - * @param array $allowed_options
856 - */
857 - private function sort_allowed_options_by_dependencies( $allowed_options ) {
858 - if ( ! isset( $allowed_options['elementor'] ) ) {
859 - return $allowed_options;
860 - }
861 -
862 - $sorted = Collection::make();
863 - $visited = Collection::make();
864 -
865 - $sort = function ( $item ) use ( &$sort, $sorted, $visited ) {
866 - if ( $visited->contains( $item ) ) {
867 - return;
868 - }
869 -
870 - $visited->push( $item );
871 -
872 - $feature = $this->get_features( $item );
873 -
874 - if ( ! $feature ) {
875 - return;
876 - }
877 -
878 - foreach ( $feature['dependencies'] ?? [] as $dep ) {
879 - $name = is_string( $dep ) ? $dep : $dep->get_name();
880 -
881 - $sort( $name );
882 - }
883 -
884 - $sorted->push( $item );
885 - };
886 -
887 - foreach ( $allowed_options['elementor'] as $option ) {
888 - $is_experiment_option = strpos( $option, static::OPTION_PREFIX ) === 0;
889 -
890 - if ( ! $is_experiment_option ) {
891 - continue;
892 - }
893 -
894 - $sort(
895 - str_replace( static::OPTION_PREFIX, '', $option )
896 - );
897 - }
898 -
899 - $allowed_options['elementor'] = Collection::make( $allowed_options['elementor'] )
900 - ->filter( function ( $option ) {
901 - return 0 !== strpos( $option, static::OPTION_PREFIX );
902 - } )
903 - ->merge(
904 - $sorted->map( function ( $item ) {
905 - return static::OPTION_PREFIX . $item;
906 - } )
907 - )
908 - ->values();
909 -
910 - return $allowed_options;
911 - }
912 -
913 813 public function __construct() {
914 814 $this->init_states();
915 815
916 816 $this->init_release_statuses();
@@ -931,12 +831,8 @@
931 831
932 832 add_action( "elementor/admin/after_create_settings/{$page_id}", function( Settings $settings ) {
933 833 $this->register_settings_fields( $settings );
934 834 }, 11 );
935 -
936 - add_filter( 'allowed_options', function ( $allowed_options ) {
937 - return $this->sort_allowed_options_by_dependencies( $allowed_options );
938 - }, 11 );
939 835 }
940 836
941 837 // Register CLI commands.
942 838 if ( Utils::is_wp_cli() ) {
@@ -941,114 +837,6 @@
941 837 // Register CLI commands.
942 838 if ( Utils::is_wp_cli() ) {
943 839 \WP_CLI::add_command( 'elementor experiments', WP_CLI::class );
944 840 }
945 - }
946 -
947 - /**
948 - * @param array $experimental_data
949 - * @return array
950 - *
951 - * @throws Exceptions\Dependency_Exception If the feature dependency is not initialized or depends on a hidden experiment.
952 - */
953 - private function initialize_feature_dependencies( array $experimental_data ): array {
954 - foreach ( $experimental_data['dependencies'] as $key => $dependency ) {
955 - $feature = $this->get_features( $dependency );
956 -
957 - if ( ! isset( $feature ) ) {
958 - // since we must validate the state of each dependency, we have to make sure that dependencies are initialized in the correct order, otherwise, error.
959 - throw new Exceptions\Dependency_Exception(
960 - sprintf(
961 - 'Feature %s cannot be initialized before dependency feature: %s.',
962 - esc_html( $experimental_data['name'] ),
963 - esc_html( $dependency )
964 - )
965 - );
966 - }
967 -
968 - if ( ! empty( $feature[ static::TYPE_HIDDEN ] ) ) {
969 - throw new Exceptions\Dependency_Exception( 'Depending on a hidden experiment is not allowed.' );
970 - }
971 -
972 - $experimental_data['dependencies'][ $key ] = $this->create_dependency_class( $dependency, $feature );
973 - $experimental_data = $this->set_feature_default_state_to_match_dependencies( $feature, $experimental_data );
974 - }
975 -
976 - return $experimental_data;
977 - }
978 -
979 - /**
980 - * @param array $feature
981 - * @param array $experimental_data
982 - * @return array
983 - *
984 - * we must validate the state:
985 - * * A user can set a dependant feature to inactive and in upgrade we don't change users settings.
986 - * * A developer can set the default state to be invalid (e.g. dependant feature is inactive).
987 - * if one of the dependencies is inactive, the main feature should be inactive as well.
988 - */
989 - private function set_feature_default_state_to_match_dependencies( array $feature, array $experimental_data ): array {
990 - if ( self::STATE_INACTIVE !== $this->get_feature_actual_state( $feature ) ) {
991 - return $experimental_data;
992 - }
993 -
994 - if ( self::STATE_ACTIVE === $experimental_data['state'] ) {
995 - $experimental_data['state'] = self::STATE_INACTIVE;
996 - } elseif ( self::STATE_DEFAULT === $experimental_data['state'] ) {
997 - $experimental_data['default'] = self::STATE_INACTIVE;
998 - }
999 -
1000 - return $experimental_data;
1001 - }
1002 -
1003 - /**
1004 - * @param array $new_site
1005 - * @param array $experimental_data
1006 - * @return array
1007 - */
1008 - private function set_new_site_default_state( $new_site, array $experimental_data ): array {
1009 - if ( ! $this->install_compare( $new_site['minimum_installation_version'] ) ) {
1010 - return $experimental_data;
1011 - }
1012 -
1013 - if ( $new_site['always_active'] ) {
1014 - $experimental_data['state'] = self::STATE_ACTIVE;
1015 - $experimental_data['mutable'] = false;
1016 - } elseif ( $new_site['default_active'] ) {
1017 - $experimental_data['default'] = self::STATE_ACTIVE;
1018 - } elseif ( $new_site['default_inactive'] ) {
1019 - $experimental_data['default'] = self::STATE_INACTIVE;
1020 - }
1021 -
1022 - return $experimental_data;
1023 - }
1024 -
1025 - /**
1026 - * @param array $options
1027 - * @return array
1028 - */
1029 - private function set_feature_initial_options( array $options ): array {
1030 - $default_experimental_data = [
1031 - 'tag' => '', // Deprecated, use 'tags' instead.
1032 - 'tags' => [],
1033 - 'description' => '',
1034 - 'release_status' => self::RELEASE_STATUS_ALPHA,
1035 - 'default' => self::STATE_INACTIVE,
1036 - 'mutable' => true,
1037 - static::TYPE_HIDDEN => false,
1038 - 'new_site' => [
1039 - 'always_active' => false,
1040 - 'default_active' => false,
1041 - 'default_inactive' => false,
1042 - 'minimum_installation_version' => null,
1043 - ],
1044 - 'on_state_change' => null,
1045 - 'generator_tag' => false,
1046 - 'deprecated' => false,
1047 - ];
1048 -
1049 - $allowed_options = [ 'name', 'title', 'tag', 'tags', 'description', 'release_status', 'default', 'mutable', static::TYPE_HIDDEN, 'new_site', 'on_state_change', 'dependencies', 'generator_tag', 'messages', 'deprecated' ];
1050 - $experimental_data = $this->merge_properties( $default_experimental_data, $options, $allowed_options );
1051 -
1052 - return $this->unify_feature_tags( $experimental_data );
1053 841 }
1054 842 }