| @@ -1,11 +1,9 @@ | ||
| 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 | -use Elementor\Core\Utils\Collection; | |
| 8 | 6 | use Elementor\Modules\System_Info\Module as System_Info; |
| 9 | 7 | use Elementor\Plugin; |
| 10 | 8 | use Elementor\Settings; |
| 11 | 9 | use Elementor\Tracker; |
| @@ -11,9 +9,9 @@ | ||
| 11 | 9 | use Elementor\Tracker; |
| 12 | 10 | use Elementor\Utils; |
| 13 | 11 | |
| 14 | 12 | if ( ! defined( 'ABSPATH' ) ) { |
| 15 | - exit; // Exit if accessed directly. | |
| 13 | + exit; // Exit if accessed directly | |
| 16 | 14 | } |
| 17 | 15 | |
| 18 | 16 | class Manager extends Base_Object { |
| 19 | 17 | |
| @@ -22,8 +20,10 @@ | ||
| 22 | 20 | const RELEASE_STATUS_ALPHA = 'alpha'; |
| 23 | 21 | |
| 24 | 22 | const RELEASE_STATUS_BETA = 'beta'; |
| 25 | 23 | |
| 24 | + const RELEASE_STATUS_RC = 'rc'; | |
| 25 | + | |
| 26 | 26 | const RELEASE_STATUS_STABLE = 'stable'; |
| 27 | 27 | |
| 28 | 28 | const STATE_DEFAULT = 'default'; |
| 29 | 29 | |
| @@ -30,12 +30,8 @@ | ||
| 30 | 30 | const STATE_ACTIVE = 'active'; |
| 31 | 31 | |
| 32 | 32 | const STATE_INACTIVE = 'inactive'; |
| 33 | 33 | |
| 34 | - const TYPE_HIDDEN = 'hidden'; | |
| 35 | - | |
| 36 | - const OPTION_PREFIX = 'elementor_experiment-'; | |
| 37 | - | |
| 38 | 34 | private $states; |
| 39 | 35 | |
| 40 | 36 | private $release_statuses; |
| 41 | 37 | |
| @@ -43,26 +39,23 @@ | ||
| 43 | 39 | |
| 44 | 40 | /** |
| 45 | 41 | * Add Feature |
| 46 | 42 | * |
| 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 | 43 | * @since 3.1.0 |
| 59 | 44 | * @access public |
| 60 | 45 | * |
| 61 | - * @param array $options Feature options. | |
| 46 | + * @param array $options { | |
| 47 | + * @type string $name | |
| 48 | + * @type string $title | |
| 49 | + * @type string $tag | |
| 50 | + * @type string $description | |
| 51 | + * @type string $release_status | |
| 52 | + * @type string $default | |
| 53 | + * @type callable $on_state_change | |
| 54 | + * } | |
| 55 | + * | |
| 62 | 56 | * @return array|null |
| 63 | - * | |
| 64 | - * @throws Dependency_Exception If can't change feature state. | |
| 57 | + * @throws \Exception | |
| 65 | 58 | */ |
| 66 | 59 | public function add_feature( array $options ) { |
| 67 | 60 | if ( isset( $this->features[ $options['name'] ] ) ) { |
| 68 | 61 | return null; |
| @@ -67,14 +60,40 @@ | ||
| 67 | 60 | if ( isset( $this->features[ $options['name'] ] ) ) { |
| 68 | 61 | return null; |
| 69 | 62 | } |
| 70 | 63 | |
| 71 | - $experimental_data = $this->set_feature_initial_options( $options ); | |
| 64 | + $default_experimental_data = [ | |
| 65 | + 'tag' => '', | |
| 66 | + 'description' => '', | |
| 67 | + 'release_status' => self::RELEASE_STATUS_ALPHA, | |
| 68 | + 'default' => self::STATE_INACTIVE, | |
| 69 | + 'mutable' => true, | |
| 70 | + 'new_site' => [ | |
| 71 | + 'default_active' => false, | |
| 72 | + 'always_active' => false, | |
| 73 | + 'minimum_installation_version' => null, | |
| 74 | + ], | |
| 75 | + 'on_state_change' => null, | |
| 76 | + ]; | |
| 72 | 77 | |
| 78 | + $allowed_options = [ 'name', 'title', 'tag', 'description', 'release_status', 'default', 'mutable', 'new_site', 'on_state_change', 'dependencies' ]; | |
| 79 | + | |
| 80 | + $experimental_data = $this->merge_properties( $default_experimental_data, $options, $allowed_options ); | |
| 81 | + | |
| 73 | 82 | $new_site = $experimental_data['new_site']; |
| 74 | 83 | |
| 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 ); | |
| 84 | + if ( $new_site['default_active'] || $new_site['always_active'] ) { | |
| 85 | + $is_new_installation = Upgrade_Manager::install_compare( $new_site['minimum_installation_version'], '>=' ); | |
| 86 | + | |
| 87 | + if ( $is_new_installation ) { | |
| 88 | + if ( $new_site['always_active'] ) { | |
| 89 | + $experimental_data['state'] = self::STATE_ACTIVE; | |
| 90 | + | |
| 91 | + $experimental_data['mutable'] = false; | |
| 92 | + } elseif ( $new_site['default_active'] ) { | |
| 93 | + $experimental_data['default'] = self::STATE_ACTIVE; | |
| 94 | + } | |
| 95 | + } | |
| 77 | 96 | } |
| 78 | 97 | |
| 79 | 98 | if ( $experimental_data['mutable'] ) { |
| 80 | 99 | $experimental_data['state'] = $this->get_saved_feature_state( $options['name'] ); |
| @@ -84,9 +103,16 @@ | ||
| 84 | 103 | $experimental_data['state'] = self::STATE_DEFAULT; |
| 85 | 104 | } |
| 86 | 105 | |
| 87 | 106 | if ( ! empty( $experimental_data['dependencies'] ) ) { |
| 88 | - $experimental_data = $this->initialize_feature_dependencies( $experimental_data ); | |
| 107 | + foreach ( $experimental_data['dependencies'] as $key => $dependency ) { | |
| 108 | + $feature = $this->get_features( $dependency ); | |
| 109 | + if ( ! class_exists( $dependency ) && ! empty( $feature ) ) { | |
| 110 | + $experimental_data['dependencies'][ $key ] = new Wrap_Core_Dependency( $feature ); | |
| 111 | + } else { | |
| 112 | + $experimental_data['dependencies'][ $key ] = $dependency::instance(); | |
| 113 | + } | |
| 114 | + } | |
| 89 | 115 | } |
| 90 | 116 | |
| 91 | 117 | $this->features[ $options['name'] ] = $experimental_data; |
| 92 | 118 | |
| @@ -94,14 +120,14 @@ | ||
| 94 | 120 | $feature_option_key = $this->get_feature_option_key( $options['name'] ); |
| 95 | 121 | |
| 96 | 122 | $on_state_change_callback = function( $old_state, $new_state ) use ( $experimental_data, $feature_option_key ) { |
| 97 | 123 | try { |
| 98 | - $this->on_feature_state_change( $experimental_data, $new_state, $old_state ); | |
| 124 | + $this->on_feature_state_change( $experimental_data, $new_state, $feature_option_key ); | |
| 99 | 125 | } catch ( Exceptions\Dependency_Exception $e ) { |
| 100 | 126 | $message = sprintf( |
| 101 | 127 | '<p>%s</p><p><a href="#" onclick="location.href=\'%s\'">%s</a></p>', |
| 102 | 128 | esc_html( $e->getMessage() ), |
| 103 | - Settings::get_settings_tab_url( 'experiments' ), | |
| 129 | + site_url( 'wp-admin/admin.php?page=elementor#tab-experiments' ), | |
| 104 | 130 | esc_html__( 'Back', 'elementor' ) |
| 105 | 131 | ); |
| 106 | 132 | |
| 107 | 133 | wp_die( $message ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped |
| @@ -116,98 +142,9 @@ | ||
| 116 | 142 | |
| 117 | 143 | return $experimental_data; |
| 118 | 144 | } |
| 119 | 145 | |
| 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 | 146 | /** |
| 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 | 147 | * Remove Feature |
| 211 | 148 | * |
| 212 | 149 | * @since 3.1.0 |
| 213 | 150 | * @access public |
| @@ -223,9 +160,9 @@ | ||
| 223 | 160 | * |
| 224 | 161 | * @since 3.1.0 |
| 225 | 162 | * @access public |
| 226 | 163 | * |
| 227 | - * @param string $feature_name Optional. Default is null. | |
| 164 | + * @param string $feature_name Optional. Default is null | |
| 228 | 165 | * |
| 229 | 166 | * @return array|null |
| 230 | 167 | */ |
| 231 | 168 | public function get_features( $feature_name = null ) { |
| @@ -253,27 +190,16 @@ | ||
| 253 | 190 | * @param string $feature_name |
| 254 | 191 | * |
| 255 | 192 | * @return bool |
| 256 | 193 | */ |
| 257 | - public function is_feature_active( $feature_name, $check_dependencies = false ) { | |
| 194 | + public function is_feature_active( $feature_name ) { | |
| 258 | 195 | $feature = $this->get_features( $feature_name ); |
| 259 | 196 | |
| 260 | - if ( ! $feature || self::STATE_ACTIVE !== $this->get_feature_actual_state( $feature ) ) { | |
| 197 | + if ( ! $feature ) { | |
| 261 | 198 | return false; |
| 262 | 199 | } |
| 263 | 200 | |
| 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; | |
| 201 | + return self::STATE_ACTIVE === $this->get_feature_actual_state( $feature ); | |
| 276 | 202 | } |
| 277 | 203 | |
| 278 | 204 | /** |
| 279 | 205 | * Set Feature Default State |
| @@ -304,91 +230,135 @@ | ||
| 304 | 230 | * |
| 305 | 231 | * @return string |
| 306 | 232 | */ |
| 307 | 233 | public function get_feature_option_key( $feature_name ) { |
| 308 | - return static::OPTION_PREFIX . $feature_name; | |
| 234 | + return 'elementor_experiment-' . $feature_name; | |
| 309 | 235 | } |
| 310 | 236 | |
| 311 | 237 | private function add_default_features() { |
| 312 | 238 | $this->add_feature( [ |
| 313 | - 'name' => 'e_font_icon_svg', | |
| 314 | - 'title' => esc_html__( 'Inline Font Icons', 'elementor' ), | |
| 239 | + 'name' => 'e_dom_optimization', | |
| 240 | + 'title' => esc_html__( 'Optimized DOM Output', 'elementor' ), | |
| 315 | 241 | '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 | - ), | |
| 242 | + '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' ) | |
| 243 | + . ' <a href="https://go.elementor.com/wp-dash-legacy-optimized-dom/" target="_blank">' | |
| 244 | + . esc_html__( 'Learn More', 'elementor' ) . '</a>', | |
| 321 | 245 | 'release_status' => self::RELEASE_STATUS_STABLE, |
| 322 | 246 | 'new_site' => [ |
| 323 | 247 | 'default_active' => true, |
| 324 | - 'minimum_installation_version' => '3.17.0', | |
| 248 | + 'minimum_installation_version' => '3.1.0-beta', | |
| 325 | 249 | ], |
| 326 | - 'generator_tag' => true, | |
| 327 | 250 | ] ); |
| 328 | 251 | |
| 329 | 252 | $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 | - ), | |
| 253 | + 'name' => 'e_optimized_assets_loading', | |
| 254 | + 'title' => esc_html__( 'Improved Asset Loading', 'elementor' ), | |
| 255 | + 'tag' => esc_html__( 'Performance', 'elementor' ), | |
| 256 | + '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' ) | |
| 257 | + . ' <a href="https://go.elementor.com/wp-dash-improved-asset-loading/" target="_blank">' | |
| 258 | + . esc_html__( 'Learn More', 'elementor' ) . '</a>', | |
| 337 | 259 | 'release_status' => self::RELEASE_STATUS_STABLE, |
| 338 | - 'default' => self::STATE_ACTIVE, | |
| 339 | - 'generator_tag' => true, | |
| 260 | + 'new_site' => [ | |
| 261 | + 'default_active' => true, | |
| 262 | + 'minimum_installation_version' => '3.2.0-beta', | |
| 263 | + ], | |
| 340 | 264 | ] ); |
| 341 | 265 | |
| 342 | 266 | $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 | - ), | |
| 267 | + 'name' => 'e_optimized_css_loading', | |
| 268 | + 'title' => esc_html__( 'Improved CSS Loading', 'elementor' ), | |
| 269 | + 'tag' => esc_html__( 'Performance', 'elementor' ), | |
| 270 | + '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' ) | |
| 271 | + . ' <a href="https://go.elementor.com/wp-dash-improved-css-loading/" target="_blank">' | |
| 272 | + . esc_html__( 'Learn More', 'elementor' ) . '</a>', | |
| 273 | + 'release_status' => self::RELEASE_STATUS_RC, | |
| 274 | + 'new_site' => [ | |
| 275 | + 'default_active' => true, | |
| 276 | + 'minimum_installation_version' => '3.3.0-beta', | |
| 277 | + ], | |
| 278 | + ] ); | |
| 279 | + | |
| 280 | + $this->add_feature( [ | |
| 281 | + 'name' => 'e_font_icon_svg', | |
| 282 | + 'title' => esc_html__( 'Inline Font Icons', 'elementor' ), | |
| 283 | + 'tag' => esc_html__( 'Performance', 'elementor' ), | |
| 284 | + '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' ) | |
| 285 | + . ' <a href="https://go.elementor.com/wp-dash-inline-font-awesome/" target="_blank">' | |
| 286 | + . esc_html__( 'Learn More', 'elementor' ) . '</a>', | |
| 287 | + 'release_status' => self::RELEASE_STATUS_ALPHA, | |
| 288 | + ] ); | |
| 289 | + | |
| 290 | + $this->add_feature( [ | |
| 291 | + 'name' => 'a11y_improvements', | |
| 292 | + 'title' => esc_html__( 'Accessibility Improvements', 'elementor' ), | |
| 293 | + 'tag' => esc_html__( 'Performance', 'elementor' ), | |
| 294 | + 'description' => esc_html__( 'An array of accessibility enhancements in Elementor pages.', 'elementor' ) | |
| 295 | + . '<br><strong>' . esc_html__( 'Please note!', 'elementor' ) . '</strong> ' . esc_html__( 'These enhancements may include some markup changes to existing elementor widgets', 'elementor' ) | |
| 296 | + . ' <a href="https://go.elementor.com/wp-dash-a11y-improvements/" target="_blank">' | |
| 297 | + . esc_html__( 'Learn More', 'elementor' ) . '</a>', | |
| 355 | 298 | 'release_status' => self::RELEASE_STATUS_STABLE, |
| 356 | - 'default' => self::STATE_INACTIVE, | |
| 357 | 299 | 'new_site' => [ |
| 358 | 300 | 'default_active' => true, |
| 359 | - 'minimum_installation_version' => '3.16.0', | |
| 301 | + 'minimum_installation_version' => '3.1.0-beta', | |
| 360 | 302 | ], |
| 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 | - ), | |
| 303 | + ] ); | |
| 304 | + | |
| 305 | + $this->add_feature( [ | |
| 306 | + 'name' => 'additional_custom_breakpoints', | |
| 307 | + 'title' => esc_html__( 'Additional Custom Breakpoints', 'elementor' ), | |
| 308 | + 'tag' => esc_html__( 'Performance', 'elementor' ), | |
| 309 | + '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' ) | |
| 310 | + . ' <a href="https://go.elementor.com/wp-dash-additional-custom-breakpoints/" target="_blank">' | |
| 311 | + . esc_html__( 'Learn More', 'elementor' ) . '</a>', | |
| 312 | + 'release_status' => self::RELEASE_STATUS_STABLE, | |
| 313 | + 'new_site' => [ | |
| 314 | + 'default_active' => true, | |
| 315 | + 'minimum_installation_version' => '3.4.0-beta', | |
| 367 | 316 | ], |
| 368 | 317 | ] ); |
| 369 | 318 | |
| 370 | 319 | $this->add_feature( [ |
| 371 | - 'name' => 'e_optimized_markup', | |
| 372 | - 'title' => esc_html__( 'Optimized Markup', 'elementor' ), | |
| 373 | - '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 | + 'name' => 'e_import_export', | |
| 321 | + 'title' => esc_html__( 'Import Export Template Kit', 'elementor' ), | |
| 322 | + 'tag' => esc_html__( 'Feature', 'elementor' ), | |
| 323 | + 'description' => esc_html__( 'Design sites faster with a template kit that contains some or all components of a complete site, like templates, content & site settings.', 'elementor' ) | |
| 324 | + . '<br>' | |
| 325 | + . esc_html__( 'You can import a kit and apply it to your site, or export the elements from this site to be used anywhere else.', 'elementor' ), | |
| 375 | 326 | 'release_status' => self::RELEASE_STATUS_STABLE, |
| 376 | - 'default' => self::STATE_INACTIVE, | |
| 327 | + 'default' => self::STATE_ACTIVE, | |
| 377 | 328 | 'new_site' => [ |
| 378 | 329 | 'default_active' => true, |
| 379 | - 'minimum_installation_version' => '3.30.0', | |
| 330 | + 'minimum_installation_version' => '3.2.0-beta', | |
| 380 | 331 | ], |
| 381 | 332 | ] ); |
| 382 | 333 | |
| 383 | 334 | $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, | |
| 335 | + 'name' => 'e_hidden_wordpress_widgets', | |
| 336 | + 'title' => esc_html__( 'Hide native WordPress widgets from search results', 'elementor' ), | |
| 337 | + 'tag' => esc_html__( 'Improvement', 'elementor' ), | |
| 338 | + 'description' => esc_html__( 'WordPress widgets will not be shown when searching in the editor panel. Instead, these widgets can be found in the “WordPress” dropdown at the bottom of the panel.', 'elementor' ), | |
| 339 | + 'release_status' => self::RELEASE_STATUS_STABLE, | |
| 388 | 340 | 'default' => self::STATE_ACTIVE, |
| 389 | - 'type' => self::TYPE_HIDDEN, | |
| 390 | 341 | ] ); |
| 342 | + | |
| 343 | + $this->add_feature( [ | |
| 344 | + 'name' => 'admin_menu_rearrangement', | |
| 345 | + 'mutable' => false, | |
| 346 | + ] ); | |
| 347 | + | |
| 348 | + $this->add_feature( [ | |
| 349 | + 'name' => 'container', | |
| 350 | + 'title' => esc_html__( 'Flexbox Container', 'elementor' ), | |
| 351 | + 'tag' => esc_html__( 'Feature', 'elementor' ), | |
| 352 | + 'description' => sprintf( esc_html__( | |
| 353 | + 'Create advanced layouts and responsive designs with the new %1$sFlexbox Container element%2$s. | |
| 354 | + This experiment replaces the current section/column structure, but you\'ll still keep your existing | |
| 355 | + 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.', | |
| 356 | + 'elementor' | |
| 357 | + ), '<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>'), | |
| 358 | + 'release_status' => self::RELEASE_STATUS_ALPHA, | |
| 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 | |
| @@ -446,13 +418,9 @@ | ||
| 446 | 418 | |
| 447 | 419 | $fields = []; |
| 448 | 420 | |
| 449 | 421 | foreach ( $features as $feature_name => $feature ) { |
| 450 | - $is_hidden = $feature[ static::TYPE_HIDDEN ]; | |
| 451 | - $is_mutable = $feature['mutable']; | |
| 452 | - $should_hide_experiment = ! $is_mutable || ( $is_hidden && ! $this->should_show_hidden() ) || $this->has_non_existing_dependency( $feature ); | |
| 453 | - | |
| 454 | - if ( $should_hide_experiment ) { | |
| 422 | + if ( ! $feature['mutable'] ) { | |
| 455 | 423 | unset( $features[ $feature_name ] ); |
| 456 | 424 | |
| 457 | 425 | continue; |
| 458 | 426 | } |
| @@ -487,9 +455,9 @@ | ||
| 487 | 455 | } |
| 488 | 456 | |
| 489 | 457 | $settings->add_tab( |
| 490 | 458 | 'experiments', [ |
| 491 | - 'label' => esc_html__( 'Features', 'elementor' ), | |
| 459 | + 'label' => esc_html__( 'Experiments', 'elementor' ), | |
| 492 | 460 | 'sections' => [ |
| 493 | 461 | 'ongoing_experiments' => [ |
| 494 | 462 | 'callback' => function() { |
| 495 | 463 | $this->render_settings_intro(); |
| @@ -524,34 +492,36 @@ | ||
| 524 | 492 | */ |
| 525 | 493 | private function render_settings_intro() { |
| 526 | 494 | ?> |
| 527 | 495 | <h2> |
| 528 | - <?php echo esc_html__( 'Experiments and Features', 'elementor' ); ?> | |
| 496 | + <?php echo esc_html__( 'Elementor Experiments', 'elementor' ); ?> | |
| 529 | 497 | </h2> |
| 530 | 498 | <p class="e-experiment__description"> |
| 531 | 499 | <?php |
| 532 | - printf( | |
| 533 | - /* translators: %1$s Link open tag, %2$s: Link close tag. */ | |
| 534 | - 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 | - '<a href="https://go.elementor.com/wp-dash-experiments-report-an-issue/" target="_blank">', | |
| 536 | - '</a>' | |
| 537 | - ); | |
| 500 | + printf( | |
| 501 | + /* translators: %1$s Link open tag, %2$s: Link close tag. */ | |
| 502 | + esc_html__( 'Access new and experimental features from Elementor before they\'re officially released. As these features are still in development, they are likely to change, evolve or even be removed altogether. %1$sLearn More.%2$s', 'elementor' ), | |
| 503 | + '<a href="https://go.elementor.com/wp-dash-experiments/" target="_blank">', | |
| 504 | + '</a>' | |
| 505 | + ); | |
| 538 | 506 | ?> |
| 539 | 507 | </p> |
| 540 | 508 | <p class="e-experiment__description"> |
| 509 | + <?php echo esc_html__( 'To use an experiment on your site, simply click on the dropdown next to it and switch to Active. You can always deactivate them at any time.', 'elementor' ); ?> | |
| 510 | + </p> | |
| 511 | + <p class="e-experiment__description"> | |
| 541 | 512 | <?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 | - ); | |
| 513 | + printf( | |
| 514 | + /* translators: %1$s Link open tag, %2$s: Link close tag. */ | |
| 515 | + esc_html__( 'Your feedback is important - %1$shelp us%2$s improve these features by sharing your thoughts and inputs.', 'elementor' ), | |
| 516 | + '<a href="https://go.elementor.com/wp-dash-experiments-report-an-issue/" target="_blank">', | |
| 517 | + '</a>' | |
| 518 | + ); | |
| 547 | 519 | ?> |
| 548 | 520 | </p> |
| 549 | - | |
| 550 | 521 | <?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> | |
| 522 | + <button type="button" class="button e-experiment__button" value="active">Activate All Experiments</button> | |
| 523 | + <button type="button" class="button e-experiment__button" value="inactive">Deactivate All Experiments</button> | |
| 554 | 524 | <?php } ?> |
| 555 | 525 | <hr> |
| 556 | 526 | <h2 class="e-experiment__table-title"> |
| 557 | 527 | <?php echo esc_html__( 'Ongoing Experiments', 'elementor' ); ?> |
| @@ -567,78 +537,38 @@ | ||
| 567 | 537 | * |
| 568 | 538 | * @param array $feature |
| 569 | 539 | */ |
| 570 | 540 | private function render_feature_settings_field( array $feature ) { |
| 571 | - $control_id = 'e-experiment-' . $feature['name']; | |
| 572 | - $control_name = $this->get_feature_option_key( $feature['name'] ); | |
| 573 | - | |
| 574 | - $status = sprintf( | |
| 575 | - /* translators: %s Release status. */ | |
| 576 | - esc_html__( 'Status: %s', 'elementor' ), | |
| 577 | - $this->release_statuses[ $feature['release_status'] ] | |
| 578 | - ); | |
| 579 | - | |
| 580 | 541 | ?> |
| 581 | 542 | <div class="e-experiment__content"> |
| 582 | - <select class="e-experiment__select" | |
| 583 | - id="<?php echo esc_attr( $control_id ); ?>" | |
| 584 | - name="<?php echo esc_attr( $control_name ); ?>" | |
| 585 | - data-experiment-id="<?php echo esc_attr( $feature['name'] ); ?>" | |
| 586 | - > | |
| 543 | + <select id="e-experiment-<?php echo $feature['name']; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped ?>" class="e-experiment__select" name="<?php echo $this->get_feature_option_key( $feature['name'] ); ?>"> | |
| 587 | 544 | <?php foreach ( $this->states as $state_key => $state_title ) { ?> |
| 588 | - <option value="<?php echo esc_attr( $state_key ); ?>" | |
| 589 | - <?php selected( $state_key, $feature['state'] ); ?> | |
| 590 | - > | |
| 591 | - <?php echo esc_html( $state_title ); ?> | |
| 592 | - </option> | |
| 545 | + <option value="<?php echo $state_key; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped ?>" <?php selected( $state_key, $feature['state'] ); ?>><?php echo $state_title; ?></option> | |
| 593 | 546 | <?php } ?> |
| 594 | 547 | </select> |
| 595 | - | |
| 596 | - <p class="description"> | |
| 597 | - <?php Utils::print_unescaped_internal_string( $feature['description'] ); ?> | |
| 598 | - </p> | |
| 599 | - | |
| 600 | - <?php $this->render_feature_dependency( $feature ); ?> | |
| 601 | - | |
| 548 | + <p class="description"><?php echo $feature['description']; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped ?></p> | |
| 602 | 549 | <?php if ( 'stable' !== $feature['release_status'] ) { ?> |
| 603 | - <div class="e-experiment__status"> | |
| 604 | - <?php echo esc_html( $status ); ?> | |
| 605 | - </div> | |
| 550 | + <div class="e-experiment__status"><?php echo sprintf( esc_html__( 'Status: %s', 'elementor' ), $this->release_statuses[ $feature['release_status'] ] ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped ?></div> | |
| 606 | 551 | <?php } ?> |
| 607 | 552 | </div> |
| 608 | - <?php | |
| 553 | + <?php $this->render_feature_dependency( $feature ); | |
| 609 | 554 | } |
| 610 | 555 | |
| 611 | 556 | private function render_feature_dependency( $feature ) { |
| 612 | - $dependencies = ( new Collection( $feature['dependencies'] ?? [] ) ) | |
| 613 | - ->map( function ( $dependency ) { | |
| 614 | - return $dependency->get_title(); | |
| 615 | - } ) | |
| 616 | - ->implode( ', ' ); | |
| 617 | - | |
| 618 | - if ( empty( $dependencies ) ) { | |
| 619 | - return; | |
| 620 | - } | |
| 621 | - | |
| 622 | - ?> | |
| 557 | + if ( ! empty( $feature['dependencies'] ) ) { | |
| 558 | + ?> | |
| 623 | 559 | <div class="e-experiment__dependency"> |
| 624 | - <strong class="e-experiment__dependency__title"><?php echo esc_html__( 'Requires', 'elementor' ); ?>:</strong> | |
| 625 | - <span><?php echo esc_html( $dependencies ); ?></span> | |
| 560 | + <strong class="e-experiment__dependency__title"><?php echo esc_html__( 'Depends on', 'elementor' ); ?>:</strong> | |
| 561 | + <?php foreach ( $feature['dependencies'] as $dependency ) : ?> | |
| 562 | + <span class="e-experiment__dependency__item"><?php Utils::print_unescaped_internal_string( $dependency->get_name() ); ?></span> | |
| 563 | + <?php endforeach; ?> | |
| 626 | 564 | </div> |
| 627 | - <?php | |
| 565 | + <?php | |
| 566 | + } | |
| 628 | 567 | } |
| 629 | 568 | |
| 630 | - private function has_non_existing_dependency( $feature ) { | |
| 631 | - $non_existing_dep = ( new Collection( $feature['dependencies'] ?? [] ) ) | |
| 632 | - ->find( function ( $dependency ) { | |
| 633 | - return $dependency instanceof Non_Existing_Dependency; | |
| 634 | - } ); | |
| 635 | - | |
| 636 | - return (bool) $non_existing_dep; | |
| 637 | - } | |
| 638 | - | |
| 639 | 569 | /** |
| 640 | - * Get Feature Settings Label HTML. | |
| 570 | + * Get Feature Settings Label HTML | |
| 641 | 571 | * |
| 642 | 572 | * @since 3.1.0 |
| 643 | 573 | * @access private |
| 644 | 574 | * |
| @@ -662,17 +592,11 @@ | ||
| 662 | 592 | ?> |
| 663 | 593 | <div class="e-experiment__title"> |
| 664 | 594 | <div class="<?php echo $indicator_classes; ?>" data-tooltip="<?php echo $indicator_tooltip; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped ?>"></div> |
| 665 | 595 | <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 } ?> | |
| 596 | + <?php if ( ! empty( $feature['tag'] ) ) : ?> | |
| 597 | + <span class="e-experiment__title__tag"><?php echo $feature['tag']; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped ?></span> | |
| 598 | + <?php endif; ?> | |
| 675 | 599 | </div> |
| 676 | 600 | <?php |
| 677 | 601 | |
| 678 | 602 | return ob_get_clean(); |
| @@ -723,9 +647,9 @@ | ||
| 723 | 647 | * |
| 724 | 648 | * @return string |
| 725 | 649 | */ |
| 726 | 650 | private function get_feature_actual_state( array $feature ) { |
| 727 | - if ( ! empty( $feature['state'] ) && self::STATE_DEFAULT !== $feature['state'] ) { | |
| 651 | + if ( self::STATE_DEFAULT !== $feature['state'] ) { | |
| 728 | 652 | return $feature['state']; |
| 729 | 653 | } |
| 730 | 654 | |
| 731 | 655 | return $feature['default']; |
| @@ -736,30 +660,37 @@ | ||
| 736 | 660 | * |
| 737 | 661 | * @since 3.1.0 |
| 738 | 662 | * @access private |
| 739 | 663 | * |
| 740 | - * @param array $old_feature_data | |
| 664 | + * @param array $old_feature_data | |
| 741 | 665 | * @param string $new_state |
| 742 | - * @param string $old_state | |
| 666 | + * | |
| 667 | + * @throws \Elementor\Core\Experiments\Exceptions\Dependency_Exception | |
| 743 | 668 | */ |
| 744 | - private function on_feature_state_change( array $old_feature_data, $new_state, $old_state ) { | |
| 669 | + private function on_feature_state_change( array $old_feature_data, $new_state, $feature_option_key ) { | |
| 745 | 670 | $new_feature_data = $this->get_features( $old_feature_data['name'] ); |
| 671 | + | |
| 746 | 672 | $this->validate_dependency( $new_feature_data, $new_state ); |
| 673 | + | |
| 674 | + $actual_old_state = $this->get_feature_actual_state( $old_feature_data ); | |
| 675 | + | |
| 676 | + $actual_new_state = $this->get_feature_actual_state( $new_feature_data ); | |
| 677 | + | |
| 747 | 678 | $this->features[ $old_feature_data['name'] ]['state'] = $new_state; |
| 748 | - if ( $old_state === $new_state ) { | |
| 679 | + | |
| 680 | + if ( $actual_old_state === $actual_new_state ) { | |
| 749 | 681 | return; |
| 750 | 682 | } |
| 751 | 683 | |
| 752 | 684 | Plugin::$instance->files_manager->clear_cache(); |
| 685 | + | |
| 753 | 686 | if ( $new_feature_data['on_state_change'] ) { |
| 754 | - $new_feature_data['on_state_change']( $old_state, $new_state ); | |
| 687 | + $new_feature_data['on_state_change']( $actual_old_state, $actual_new_state ); | |
| 755 | 688 | } |
| 756 | - | |
| 757 | - do_action( 'elementor/experiments/feature-state-change/' . $old_feature_data['name'], $old_state, $new_state ); | |
| 758 | 689 | } |
| 759 | 690 | |
| 760 | 691 | /** |
| 761 | - * @throws Exceptions\Dependency_Exception If the feature dependency is not available or not active. | |
| 692 | + * @throws \Elementor\Core\Experiments\Exceptions\Dependency_Exception | |
| 762 | 693 | */ |
| 763 | 694 | private function validate_dependency( array $feature, $new_state ) { |
| 764 | 695 | $rollback = function ( $feature_option_key, $state ) { |
| 765 | 696 | remove_all_actions( 'add_option_' . $feature_option_key ); |
| @@ -786,12 +717,11 @@ | ||
| 786 | 717 | if ( ! $dependency_feature ) { |
| 787 | 718 | $rollback( $feature_option_key, self::STATE_INACTIVE ); |
| 788 | 719 | |
| 789 | 720 | throw new Exceptions\Dependency_Exception( |
| 790 | - sprintf( | |
| 791 | - 'The feature `%s` has a dependency `%s` that is not available.', | |
| 792 | - esc_html( $feature['name'] ), | |
| 793 | - esc_html( $dependency->get_name() ) | |
| 721 | + sprintf( 'The feature `%s` has a dependency `%s` that is not available.', | |
| 722 | + $feature['name'], | |
| 723 | + $dependency->get_name() | |
| 794 | 724 | ) |
| 795 | 725 | ); |
| 796 | 726 | } |
| 797 | 727 | |
| @@ -800,19 +730,20 @@ | ||
| 800 | 730 | // If dependency is not active. |
| 801 | 731 | if ( self::STATE_INACTIVE === $dependency_state ) { |
| 802 | 732 | $rollback( $feature_option_key, self::STATE_INACTIVE ); |
| 803 | 733 | |
| 734 | + /* translators: 1: feature_name_that_change_state, 2: dependency_feature_name. */ | |
| 804 | 735 | throw new Exceptions\Dependency_Exception( |
| 805 | 736 | sprintf( |
| 806 | - 'To turn on `%1$s`, Experiment: `%2$s` activity is required!', | |
| 807 | - esc_html( $feature['name'] ), | |
| 808 | - esc_html( $dependency_feature['name'] ) | |
| 737 | + esc_html__( 'To turn on `%1$s`, Experiment: `%2$s` activity is required!', 'elementor' ), | |
| 738 | + $feature['name'], | |
| 739 | + $dependency_feature['name'] | |
| 809 | 740 | ) |
| 810 | 741 | ); |
| 811 | 742 | } |
| 812 | 743 | } |
| 813 | 744 | } elseif ( self::STATE_INACTIVE === $new_state ) { |
| 814 | - // Make sure to deactivate a dependant experiment of the current feature when it's deactivated. | |
| 745 | + // Validate if current feature that goes 'inactive' is not a dependency of current active feature. | |
| 815 | 746 | foreach ( $this->get_features() as $current_feature ) { |
| 816 | 747 | if ( empty( $current_feature['dependencies'] ) ) { |
| 817 | 748 | continue; |
| 818 | 749 | } |
| @@ -820,9 +751,18 @@ | ||
| 820 | 751 | $current_feature_state = $this->get_feature_actual_state( $current_feature ); |
| 821 | 752 | |
| 822 | 753 | foreach ( $current_feature['dependencies'] as $dependency ) { |
| 823 | 754 | if ( self::STATE_ACTIVE === $current_feature_state && $feature['name'] === $dependency->get_name() ) { |
| 824 | - update_option( $this->get_feature_option_key( $current_feature['name'] ), static::STATE_INACTIVE ); | |
| 755 | + $rollback( $feature_option_key, self::STATE_ACTIVE ); | |
| 756 | + | |
| 757 | + /* translators: 1: feature_name_that_change_state, 2: dependency_feature_name. */ | |
| 758 | + throw new Exceptions\Dependency_Exception( | |
| 759 | + sprintf( | |
| 760 | + esc_html__( 'Cannot turn off `%1$s`, Experiment: `%2$s` is still active!', 'elementor' ), | |
| 761 | + $feature['name'], | |
| 762 | + $current_feature['name'] | |
| 763 | + ) | |
| 764 | + ); | |
| 825 | 765 | } |
| 826 | 766 | } |
| 827 | 767 | } |
| 828 | 768 | } |
| @@ -827,90 +767,8 @@ | ||
| 827 | 767 | } |
| 828 | 768 | } |
| 829 | 769 | } |
| 830 | 770 | |
| 831 | - private function should_show_hidden() { | |
| 832 | - return defined( 'ELEMENTOR_SHOW_HIDDEN_EXPERIMENTS' ) && ELEMENTOR_SHOW_HIDDEN_EXPERIMENTS; | |
| 833 | - } | |
| 834 | - | |
| 835 | - private function create_dependency_class( $dependency_name, $dependency_args ) { | |
| 836 | - if ( class_exists( $dependency_name ) ) { | |
| 837 | - return $dependency_name::instance(); | |
| 838 | - } | |
| 839 | - | |
| 840 | - if ( ! empty( $dependency_args ) ) { | |
| 841 | - return new Wrap_Core_Dependency( $dependency_args ); | |
| 842 | - } | |
| 843 | - | |
| 844 | - return new Non_Existing_Dependency( $dependency_name ); | |
| 845 | - } | |
| 846 | - | |
| 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 | 771 | public function __construct() { |
| 914 | 772 | $this->init_states(); |
| 915 | 773 | |
| 916 | 774 | $this->init_release_statuses(); |
| @@ -931,12 +789,8 @@ | ||
| 931 | 789 | |
| 932 | 790 | add_action( "elementor/admin/after_create_settings/{$page_id}", function( Settings $settings ) { |
| 933 | 791 | $this->register_settings_fields( $settings ); |
| 934 | 792 | }, 11 ); |
| 935 | - | |
| 936 | - add_filter( 'allowed_options', function ( $allowed_options ) { | |
| 937 | - return $this->sort_allowed_options_by_dependencies( $allowed_options ); | |
| 938 | - }, 11 ); | |
| 939 | 793 | } |
| 940 | 794 | |
| 941 | 795 | // Register CLI commands. |
| 942 | 796 | if ( Utils::is_wp_cli() ) { |
| @@ -941,114 +795,6 @@ | ||
| 941 | 795 | // Register CLI commands. |
| 942 | 796 | if ( Utils::is_wp_cli() ) { |
| 943 | 797 | \WP_CLI::add_command( 'elementor experiments', WP_CLI::class ); |
| 944 | 798 | } |
| 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 | 799 | } |
| 1054 | 800 | } |
