| @@ -3,8 +3,9 @@ | ||
| 3 | 3 | namespace Elementor\Modules\AtomicWidgets; |
| 4 | 4 | |
| 5 | 5 | use Elementor\Core\Base\Module as BaseModule; |
| 6 | 6 | use Elementor\Core\Experiments\Manager as Experiments_Manager; |
| 7 | +use Elementor\Core\Utils\Assets_Config_Provider; | |
| 7 | 8 | use Elementor\Elements_Manager; |
| 8 | 9 | use Elementor\Modules\AtomicWidgets\DynamicTags\Dynamic_Tags_Module; |
| 9 | 10 | use Elementor\Modules\AtomicWidgets\Elements\Atomic_Youtube\Atomic_Youtube; |
| 10 | 11 | use Elementor\Modules\AtomicWidgets\Elements\Div_Block\Div_Block; |
| @@ -14,28 +15,20 @@ | ||
| 14 | 15 | use Elementor\Modules\AtomicWidgets\Elements\Atomic_Paragraph\Atomic_Paragraph; |
| 15 | 16 | use Elementor\Modules\AtomicWidgets\Elements\Atomic_Button\Atomic_Button; |
| 16 | 17 | use Elementor\Modules\AtomicWidgets\Elements\Atomic_Divider\Atomic_Divider; |
| 17 | 18 | use Elementor\Modules\AtomicWidgets\Elements\Atomic_Svg\Atomic_Svg; |
| 18 | -use Elementor\Modules\AtomicWidgets\Elements\Atomic_Tabs\Atomic_Tabs\Atomic_Tabs; | |
| 19 | -use Elementor\Modules\AtomicWidgets\Elements\Atomic_Tabs\Atomic_Tabs_Menu\Atomic_Tabs_Menu; | |
| 20 | -use Elementor\Modules\AtomicWidgets\Elements\Atomic_Tabs\Atomic_Tab\Atomic_Tab; | |
| 21 | -use Elementor\Modules\AtomicWidgets\Elements\Atomic_Tabs\Atomic_Tabs_Content_Area\Atomic_Tabs_Content_Area; | |
| 19 | +use Elementor\Modules\AtomicWidgets\Elements\Atomic_Tabs\Atomic_Tabs; | |
| 20 | +use Elementor\Modules\AtomicWidgets\Elements\Atomic_Tabs\Atomic_Tabs_List; | |
| 21 | +use Elementor\Modules\AtomicWidgets\Elements\Atomic_Tabs\Atomic_Tab; | |
| 22 | +use Elementor\Modules\AtomicWidgets\Elements\Atomic_Tabs\Atomic_Tabs_Content; | |
| 22 | 23 | use Elementor\Modules\AtomicWidgets\ImportExport\Atomic_Import_Export; |
| 23 | -use Elementor\Modules\AtomicWidgets\Elements\Promotions\Pro_Promotion_Data_Preservation; | |
| 24 | -use Elementor\Modules\AtomicWidgets\Elements\Loader\Frontend_Assets_Loader; | |
| 25 | 24 | use Elementor\Modules\AtomicWidgets\PropsResolver\Transformers\Combine_Array_Transformer; |
| 26 | 25 | use Elementor\Modules\AtomicWidgets\PropsResolver\Transformers\Export\Image_Src_Export_Transformer; |
| 27 | -use Elementor\Modules\AtomicWidgets\PropsResolver\Transformers\Export\Svg_Src_Export_Transformer; | |
| 28 | 26 | use Elementor\Modules\AtomicWidgets\PropsResolver\Transformers\Image_Src_Transformer; |
| 29 | 27 | use Elementor\Modules\AtomicWidgets\PropsResolver\Transformers\Image_Transformer; |
| 30 | 28 | use Elementor\Modules\AtomicWidgets\PropsResolver\Transformers\Import\Image_Src_Import_Transformer; |
| 31 | -use Elementor\Modules\AtomicWidgets\PropsResolver\Transformers\Import\Svg_Src_Import_Transformer; | |
| 32 | -use Elementor\Modules\AtomicWidgets\PropsResolver\Transformers\Svg_Src_Transformer; | |
| 33 | 29 | use Elementor\Modules\AtomicWidgets\PropsResolver\Transformers\Import_Export_Plain_Transformer; |
| 34 | 30 | use Elementor\Modules\AtomicWidgets\PropsResolver\Transformers\Settings\Classes_Transformer; |
| 35 | -use Elementor\Modules\AtomicWidgets\PropsResolver\Transformers\Settings\Date_Time_Transformer; | |
| 36 | -use Elementor\Modules\AtomicWidgets\PropsResolver\Transformers\Settings\Html_V2_Transformer; | |
| 37 | -use Elementor\Modules\AtomicWidgets\PropsResolver\Transformers\Settings\Html_V3_Transformer; | |
| 38 | 31 | use Elementor\Modules\AtomicWidgets\PropsResolver\Transformers\Settings\Link_Transformer; |
| 39 | 32 | use Elementor\Modules\AtomicWidgets\PropsResolver\Transformers\Plain_Transformer; |
| 40 | 33 | use Elementor\Modules\AtomicWidgets\PropsResolver\Transformers\Styles\Background_Color_Overlay_Transformer; |
| 41 | 34 | use Elementor\Modules\AtomicWidgets\PropsResolver\Transformers\Styles\Background_Gradient_Overlay_Transformer; |
| @@ -71,16 +64,11 @@ | ||
| 71 | 64 | use Elementor\Modules\AtomicWidgets\PropTypes\Box_Shadow_Prop_Type; |
| 72 | 65 | use Elementor\Modules\AtomicWidgets\PropTypes\Border_Radius_Prop_Type; |
| 73 | 66 | use Elementor\Modules\AtomicWidgets\PropTypes\Border_Width_Prop_Type; |
| 74 | 67 | use Elementor\Modules\AtomicWidgets\PropTypes\Color_Stop_Prop_Type; |
| 75 | -use Elementor\Modules\AtomicWidgets\PropTypes\Date_Time_Prop_Type; | |
| 76 | -use Elementor\Modules\AtomicWidgets\PropTypes\Date_Range_Prop_Type; | |
| 77 | -use Elementor\Modules\AtomicWidgets\PropTypes\Time_Range_Prop_Type; | |
| 78 | 68 | use Elementor\Modules\AtomicWidgets\PropTypes\Filters\Backdrop_Filter_Prop_Type; |
| 79 | 69 | use Elementor\Modules\AtomicWidgets\PropTypes\Filters\Filter_Prop_Type; |
| 80 | 70 | use Elementor\Modules\AtomicWidgets\PropTypes\Gradient_Color_Stop_Prop_Type; |
| 81 | -use Elementor\Modules\AtomicWidgets\PropTypes\Html_V2_Prop_Type; | |
| 82 | -use Elementor\Modules\AtomicWidgets\PropTypes\Html_V3_Prop_Type; | |
| 83 | 71 | use Elementor\Modules\AtomicWidgets\PropTypes\Layout_Direction_Prop_Type; |
| 84 | 72 | use Elementor\Modules\AtomicWidgets\PropTypes\Flex_Prop_Type; |
| 85 | 73 | use Elementor\Modules\AtomicWidgets\PropTypes\Link_Prop_Type; |
| 86 | 74 | use Elementor\Modules\AtomicWidgets\PropTypes\Classes_Prop_Type; |
| @@ -85,9 +73,8 @@ | ||
| 85 | 73 | use Elementor\Modules\AtomicWidgets\PropTypes\Link_Prop_Type; |
| 86 | 74 | use Elementor\Modules\AtomicWidgets\PropTypes\Classes_Prop_Type; |
| 87 | 75 | use Elementor\Modules\AtomicWidgets\PropTypes\Image_Prop_Type; |
| 88 | 76 | use Elementor\Modules\AtomicWidgets\PropTypes\Image_Src_Prop_Type; |
| 89 | -use Elementor\Modules\AtomicWidgets\PropTypes\Svg_Src_Prop_Type; | |
| 90 | 77 | use Elementor\Modules\AtomicWidgets\PropTypes\Dimensions_Prop_Type; |
| 91 | 78 | use Elementor\Modules\AtomicWidgets\PropTypes\Position_Prop_Type; |
| 92 | 79 | use Elementor\Modules\AtomicWidgets\PropTypes\Shadow_Prop_Type; |
| 93 | 80 | use Elementor\Modules\AtomicWidgets\PropTypes\Size_Prop_Type; |
| @@ -105,29 +92,16 @@ | ||
| 105 | 92 | use Elementor\Modules\AtomicWidgets\Styles\Atomic_Widget_Styles; |
| 106 | 93 | use Elementor\Modules\AtomicWidgets\Styles\Size_Constants; |
| 107 | 94 | use Elementor\Modules\AtomicWidgets\Styles\Style_Schema; |
| 108 | 95 | use Elementor\Modules\AtomicWidgets\Database\Atomic_Widgets_Database_Updater; |
| 109 | -use Elementor\Modules\AtomicWidgets\Elements\Atomic_Tabs\Atomic_Tab_Content\Atomic_Tab_Content; | |
| 110 | -use Elementor\Modules\AtomicWidgets\Elements\Atomic_Form\Atomic_Form; | |
| 111 | -use Elementor\Modules\AtomicWidgets\Elements\Atomic_Form\Atomic_Form_Promotion; | |
| 112 | -use Elementor\Modules\AtomicWidgets\Elements\Atomic_Form\Form_Success_Message\Form_Success_Message; | |
| 113 | -use Elementor\Modules\AtomicWidgets\Elements\Atomic_Form\Form_Error_Message\Form_Error_Message; | |
| 114 | -use Elementor\Modules\AtomicWidgets\PropTypeMigrations\Migrations_Orchestrator; | |
| 96 | +use Elementor\Modules\AtomicWidgets\Elements\Atomic_Tabs\Atomic_Tab_Panel; | |
| 115 | 97 | use Elementor\Plugin; |
| 116 | 98 | use Elementor\Widgets_Manager; |
| 117 | 99 | use Elementor\Modules\AtomicWidgets\Library\Atomic_Widgets_Library; |
| 118 | 100 | use Elementor\Modules\AtomicWidgets\PropsResolver\Transformers\Settings\Query_Transformer; |
| 119 | -use Elementor\Modules\AtomicWidgets\PropsResolver\Transformers\Settings\Date_Range_Transformer; | |
| 120 | -use Elementor\Modules\AtomicWidgets\PropsResolver\Transformers\Settings\Time_Range_Transformer; | |
| 121 | 101 | use Elementor\Modules\AtomicWidgets\PropsResolver\Transformers\Styles\Perspective_Origin_Transformer; |
| 122 | 102 | use Elementor\Modules\AtomicWidgets\PropTypes\Query_Prop_Type; |
| 123 | 103 | use Elementor\Modules\AtomicWidgets\PropTypes\Transform\Perspective_Origin_Prop_Type; |
| 124 | -use Elementor\Modules\AtomicWidgets\Utils\Utils; | |
| 125 | -use Elementor\Modules\AtomicWidgets\Elements\Atomic_Self_Hosted_Video\Atomic_Self_Hosted_Video; | |
| 126 | -use Elementor\Modules\AtomicWidgets\PropsResolver\Transformers\Styles\Span_Transformer; | |
| 127 | -use Elementor\Modules\AtomicWidgets\PropsResolver\Transformers\Video_Src_Transformer; | |
| 128 | -use Elementor\Modules\AtomicWidgets\PropTypes\Span_Prop_Type; | |
| 129 | -use Elementor\Modules\AtomicWidgets\PropTypes\Video_Src_Prop_Type; | |
| 130 | 104 | |
| 131 | 105 | if ( ! defined( 'ABSPATH' ) ) { |
| 132 | 106 | exit; // Exit if accessed directly. |
| 133 | 107 | } |
| @@ -134,11 +108,10 @@ | ||
| 134 | 108 | |
| 135 | 109 | class Module extends BaseModule { |
| 136 | 110 | const EXPERIMENT_NAME = 'e_atomic_elements'; |
| 137 | 111 | const ENFORCE_CAPABILITIES_EXPERIMENT = 'atomic_widgets_should_enforce_capabilities'; |
| 112 | + const EXPERIMENT_NESTED = 'e_nested_elements'; | |
| 138 | 113 | const EXPERIMENT_EDITOR_MCP = 'editor_mcp'; |
| 139 | - const EXPERIMENT_CSS_GRID = 'e_css_grid'; | |
| 140 | - const EXPERIMENT_DESIGN_SYSTEM_PANEL = 'e_editor_design_system_panel'; | |
| 141 | 114 | |
| 142 | 115 | const PACKAGES = [ |
| 143 | 116 | 'editor-canvas', |
| 144 | 117 | 'editor-controls', // TODO: Need to be registered and not enqueued. |
| @@ -146,11 +119,8 @@ | ||
| 146 | 119 | 'editor-elements', // TODO: Need to be registered and not enqueued. |
| 147 | 120 | 'editor-props', // TODO: Need to be registered and not enqueued. |
| 148 | 121 | 'editor-styles', // TODO: Need to be registered and not enqueued. |
| 149 | 122 | 'editor-styles-repository', |
| 150 | - 'editor-interactions', | |
| 151 | - 'editor-templates', | |
| 152 | - 'editor-design-system', | |
| 153 | 123 | ]; |
| 154 | 124 | |
| 155 | 125 | public function get_name() { |
| 156 | 126 | return 'atomic-widgets'; |
| @@ -158,33 +128,40 @@ | ||
| 158 | 128 | |
| 159 | 129 | public function __construct() { |
| 160 | 130 | parent::__construct(); |
| 161 | 131 | |
| 162 | - if ( ! self::is_active() ) { | |
| 163 | - return; | |
| 132 | + if ( self::is_active() ) { | |
| 133 | + $this->register_experimental_features(); | |
| 164 | 134 | } |
| 165 | 135 | |
| 166 | - $this->register_experimental_features(); | |
| 167 | - $this->register_hooks(); | |
| 136 | + if ( Plugin::$instance->experiments->is_feature_active( self::EXPERIMENT_NAME ) ) { | |
| 137 | + Dynamic_Tags_Module::instance()->register_hooks(); | |
| 168 | 138 | |
| 169 | - add_filter( 'elementor/editor/v2/packages', fn ( $packages ) => $this->add_packages( $packages ) ); | |
| 170 | - add_filter( 'elementor/editor/localize_settings', fn ( $settings ) => $this->add_styles_schema( $settings ) ); | |
| 171 | - add_filter( 'elementor/editor/localize_settings', fn ( $settings ) => $this->add_supported_units( $settings ) ); | |
| 172 | - add_filter( 'elementor/widgets/register', fn ( Widgets_Manager $widgets_manager ) => $this->register_widgets( $widgets_manager ) ); | |
| 173 | - add_filter( 'elementor/usage/elements/element_title', fn ( $title, $type ) => $this->get_element_usage_name( $title, $type ), 10, 2 ); | |
| 139 | + ( new Atomic_Widget_Styles() )->register_hooks(); | |
| 140 | + ( new Atomic_Widget_Base_Styles() )->register_hooks(); | |
| 141 | + ( new Atomic_Widgets_Library() )->register_hooks(); | |
| 174 | 142 | |
| 175 | - add_action( 'elementor/elements/elements_registered', fn ( $elements_manager ) => $this->register_elements( $elements_manager ) ); | |
| 176 | - add_action( 'elementor/editor/after_enqueue_scripts', fn () => $this->enqueue_scripts() ); | |
| 177 | - add_action( 'elementor/editor/after_enqueue_styles', fn () => $this->enqueue_promotion_styles() ); | |
| 178 | - add_action( 'elementor/preview/enqueue_styles', fn () => $this->enqueue_promotion_styles() ); | |
| 179 | - add_action( 'elementor/frontend/before_register_scripts', fn () => $this->register_frontend_scripts() ); | |
| 180 | - add_action( 'elementor/frontend/after_enqueue_styles', fn () => $this->add_inline_styles() ); | |
| 143 | + Atomic_Styles_Manager::instance()->register_hooks(); | |
| 181 | 144 | |
| 182 | - add_action( 'elementor/atomic-widgets/settings/transformers/register', fn ( $transformers ) => $this->register_settings_transformers( $transformers ) ); | |
| 183 | - add_action( 'elementor/atomic-widgets/styles/transformers/register', fn ( $transformers ) => $this->register_styles_transformers( $transformers ) ); | |
| 184 | - add_action( 'elementor/atomic-widgets/import/transformers/register', fn ( $transformers ) => $this->register_import_transformers( $transformers ) ); | |
| 185 | - add_action( 'elementor/atomic-widgets/export/transformers/register', fn ( $transformers ) => $this->register_export_transformers( $transformers ) ); | |
| 186 | - add_action( 'elementor/editor/templates/panel/category', fn () => $this->render_panel_category_chip() ); | |
| 145 | + ( new Atomic_Import_Export() )->register_hooks(); | |
| 146 | + ( new Atomic_Widgets_Database_Updater() )->register(); | |
| 147 | + | |
| 148 | + add_filter( 'elementor/editor/v2/packages', fn ( $packages ) => $this->add_packages( $packages ) ); | |
| 149 | + add_filter( 'elementor/editor/localize_settings', fn ( $settings ) => $this->add_styles_schema( $settings ) ); | |
| 150 | + add_filter( 'elementor/editor/localize_settings', fn ( $settings ) => $this->add_supported_units( $settings ) ); | |
| 151 | + add_filter( 'elementor/widgets/register', fn ( Widgets_Manager $widgets_manager ) => $this->register_widgets( $widgets_manager ) ); | |
| 152 | + add_filter( 'elementor/usage/elements/element_title', fn ( $title, $type ) => $this->get_element_usage_name( $title, $type ), 10, 2 ); | |
| 153 | + | |
| 154 | + add_action( 'elementor/elements/elements_registered', fn ( $elements_manager ) => $this->register_elements( $elements_manager ) ); | |
| 155 | + add_action( 'elementor/editor/after_enqueue_scripts', fn () => $this->enqueue_scripts() ); | |
| 156 | + add_action( 'elementor/frontend/after_register_scripts', fn () => $this->register_frontend_scripts() ); | |
| 157 | + | |
| 158 | + add_action( 'elementor/atomic-widgets/settings/transformers/register', fn ( $transformers ) => $this->register_settings_transformers( $transformers ) ); | |
| 159 | + add_action( 'elementor/atomic-widgets/styles/transformers/register', fn ( $transformers ) => $this->register_styles_transformers( $transformers ) ); | |
| 160 | + add_action( 'elementor/atomic-widgets/import/transformers/register', fn ( $transformers ) => $this->register_import_transformers( $transformers ) ); | |
| 161 | + add_action( 'elementor/atomic-widgets/export/transformers/register', fn ( $transformers ) => $this->register_export_transformers( $transformers ) ); | |
| 162 | + add_action( 'elementor/editor/templates/panel/category', fn () => $this->render_panel_category_chip() ); | |
| 163 | + } | |
| 187 | 164 | } |
| 188 | 165 | |
| 189 | 166 | public static function get_experimental_data() { |
| 190 | 167 | return [ |
| @@ -192,13 +169,9 @@ | ||
| 192 | 169 | 'title' => esc_html__( 'Atomic Widgets', 'elementor' ), |
| 193 | 170 | 'description' => esc_html__( 'Enable atomic widgets.', 'elementor' ), |
| 194 | 171 | 'hidden' => true, |
| 195 | 172 | 'default' => Experiments_Manager::STATE_INACTIVE, |
| 196 | - 'release_status' => Experiments_Manager::RELEASE_STATUS_BETA, | |
| 197 | - 'new_site' => [ | |
| 198 | - 'default_active' => true, | |
| 199 | - 'minimum_installation_version' => '4.0.0', | |
| 200 | - ], | |
| 173 | + 'release_status' => Experiments_Manager::RELEASE_STATUS_ALPHA, | |
| 201 | 174 | ]; |
| 202 | 175 | } |
| 203 | 176 | |
| 204 | 177 | private function register_experimental_features() { |
| @@ -219,62 +192,26 @@ | ||
| 219 | 192 | 'release_status' => Experiments_Manager::RELEASE_STATUS_DEV, |
| 220 | 193 | ] ); |
| 221 | 194 | |
| 222 | 195 | Plugin::$instance->experiments->add_feature([ |
| 223 | - 'name' => self::EXPERIMENT_EDITOR_MCP, | |
| 224 | - 'title' => esc_html__( 'Editor MCP for atomic widgets', 'elementor' ), | |
| 225 | - 'description' => esc_html__( 'Editor MCP for atomic widgets.', 'elementor' ), | |
| 196 | + 'name' => self::EXPERIMENT_NESTED, | |
| 197 | + 'title' => esc_html__( 'Nested Elements', 'elementor' ), | |
| 198 | + 'description' => esc_html__( 'Enable nested elements.', 'elementor' ), | |
| 226 | 199 | 'hidden' => true, |
| 227 | - 'default' => Experiments_Manager::STATE_ACTIVE, | |
| 200 | + 'default' => Experiments_Manager::STATE_INACTIVE, | |
| 228 | 201 | 'release_status' => Experiments_Manager::RELEASE_STATUS_DEV, |
| 229 | 202 | ]); |
| 230 | 203 | |
| 231 | 204 | Plugin::$instance->experiments->add_feature([ |
| 232 | - 'name' => Migrations_Orchestrator::EXPERIMENT_BC_MIGRATIONS, | |
| 233 | - 'title' => esc_html__( 'Backward compatibility migrations', 'elementor' ), | |
| 234 | - 'description' => esc_html__( 'Enable automatic prop type migrations for atomic widgets', 'elementor' ), | |
| 205 | + 'name' => self::EXPERIMENT_EDITOR_MCP, | |
| 206 | + 'title' => esc_html__( 'Editor MCP for atomic widgets', 'elementor' ), | |
| 207 | + 'description' => esc_html__( 'Editor MCP for atomic widgets.', 'elementor' ), | |
| 235 | 208 | 'hidden' => true, |
| 236 | - 'default' => Experiments_Manager::STATE_ACTIVE, | |
| 237 | - 'release_status' => Experiments_Manager::RELEASE_STATUS_DEV, | |
| 238 | - ]); | |
| 239 | - | |
| 240 | - Plugin::$instance->experiments->add_feature( [ | |
| 241 | - 'name' => self::EXPERIMENT_CSS_GRID, | |
| 242 | - 'title' => esc_html__( 'CSS Grid', 'elementor' ), | |
| 243 | - 'description' => esc_html__( 'Enable CSS Grid layout for containers.', 'elementor' ), | |
| 244 | - 'hidden' => true, | |
| 245 | 209 | 'default' => Experiments_Manager::STATE_INACTIVE, |
| 246 | 210 | 'release_status' => Experiments_Manager::RELEASE_STATUS_DEV, |
| 247 | - ] ); | |
| 248 | - | |
| 249 | - Plugin::$instance->experiments->add_feature([ | |
| 250 | - 'name' => self::EXPERIMENT_DESIGN_SYSTEM_PANEL, | |
| 251 | - 'title' => esc_html__( 'Editor design system panel', 'elementor' ), | |
| 252 | - 'description' => esc_html__( 'Unified design system entry in the editor (toolbar + single panel for variables and global classes).', 'elementor' ), | |
| 253 | - 'hidden' => true, | |
| 254 | - 'default' => Experiments_Manager::STATE_ACTIVE, | |
| 255 | - 'release_status' => Experiments_Manager::RELEASE_STATUS_DEV, | |
| 256 | 211 | ]); |
| 257 | - | |
| 258 | - // When a new feature affects settings or style schema, global class, interactions, variable, etc | |
| 259 | - // anything in need of addressing migration for BC purposes, add it here. | |
| 260 | - $migrations_affecting_features = []; | |
| 261 | - | |
| 262 | - Migrations_Orchestrator::register_affecting_feature_flag_hooks( $migrations_affecting_features ); | |
| 263 | 212 | } |
| 264 | 213 | |
| 265 | - private function register_hooks() { | |
| 266 | - Dynamic_Tags_Module::instance()->register_hooks(); | |
| 267 | - Atomic_Styles_Manager::instance()->register_hooks(); | |
| 268 | - Migrations_Orchestrator::make()->register_hooks(); | |
| 269 | - ( new Atomic_Widget_Styles() )->register_hooks(); | |
| 270 | - ( new Atomic_Widget_Base_Styles() )->register_hooks(); | |
| 271 | - ( new Atomic_Widgets_Library() )->register_hooks(); | |
| 272 | - ( new Atomic_Import_Export() )->register_hooks(); | |
| 273 | - ( new Atomic_Widgets_Database_Updater() )->register(); | |
| 274 | - ( new Pro_Promotion_Data_Preservation() )->register_hooks(); | |
| 275 | - } | |
| 276 | - | |
| 277 | 214 | private function add_packages( $packages ) { |
| 278 | 215 | return array_merge( $packages, self::PACKAGES ); |
| 279 | 216 | } |
| 280 | 217 | |
| @@ -290,10 +227,8 @@ | ||
| 290 | 227 | |
| 291 | 228 | private function add_supported_units( $settings ) { |
| 292 | 229 | $settings['supported_size_units'] = Size_Constants::all_supported_units(); |
| 293 | 230 | |
| 294 | - $settings['size_units'] = Size_Constants::grouped_units(); | |
| 295 | - | |
| 296 | 231 | return $settings; |
| 297 | 232 | } |
| 298 | 233 | |
| 299 | 234 | private function register_widgets( Widgets_Manager $widgets_manager ) { |
| @@ -303,9 +238,8 @@ | ||
| 303 | 238 | $widgets_manager->register( new Atomic_Svg() ); |
| 304 | 239 | $widgets_manager->register( new Atomic_Button() ); |
| 305 | 240 | $widgets_manager->register( new Atomic_Youtube() ); |
| 306 | 241 | $widgets_manager->register( new Atomic_Divider() ); |
| 307 | - $widgets_manager->register( new Atomic_Self_Hosted_Video() ); | |
| 308 | 242 | } |
| 309 | 243 | |
| 310 | 244 | private function register_elements( Elements_Manager $elements_manager ) { |
| 311 | 245 | $elements_manager->register_element_type( new Div_Block() ); |
| @@ -310,51 +244,31 @@ | ||
| 310 | 244 | private function register_elements( Elements_Manager $elements_manager ) { |
| 311 | 245 | $elements_manager->register_element_type( new Div_Block() ); |
| 312 | 246 | $elements_manager->register_element_type( new Flexbox() ); |
| 313 | 247 | |
| 314 | - $elements_manager->register_element_type( new Atomic_Tabs() ); | |
| 315 | - $elements_manager->register_element_type( new Atomic_Tabs_Menu() ); | |
| 316 | - $elements_manager->register_element_type( new Atomic_Tab() ); | |
| 317 | - $elements_manager->register_element_type( new Atomic_Tabs_Content_Area() ); | |
| 318 | - $elements_manager->register_element_type( new Atomic_Tab_Content() ); | |
| 319 | - | |
| 320 | - if ( \Elementor\Utils::has_pro() && Plugin::$instance->experiments->is_feature_active( 'e_pro_atomic_form' ) ) { | |
| 321 | - $elements_manager->register_element_type( new Atomic_Form() ); | |
| 322 | - $elements_manager->register_element_type( new Form_Success_Message() ); | |
| 323 | - $elements_manager->register_element_type( new Form_Error_Message() ); | |
| 324 | - } elseif ( ! \Elementor\Utils::has_pro() ) { | |
| 325 | - $elements_manager->register_element_type( new Atomic_Form_Promotion() ); | |
| 248 | + if ( Plugin::$instance->experiments->is_feature_active( self::EXPERIMENT_NESTED ) ) { | |
| 249 | + $elements_manager->register_element_type( new Atomic_Tabs() ); | |
| 250 | + $elements_manager->register_element_type( new Atomic_Tabs_List() ); | |
| 251 | + $elements_manager->register_element_type( new Atomic_Tab() ); | |
| 252 | + $elements_manager->register_element_type( new Atomic_Tabs_Content() ); | |
| 253 | + $elements_manager->register_element_type( new Atomic_Tab_Panel() ); | |
| 326 | 254 | } |
| 327 | 255 | } |
| 328 | 256 | |
| 329 | 257 | private function register_settings_transformers( Transformers_Registry $transformers ) { |
| 330 | 258 | $transformers->register_fallback( new Plain_Transformer() ); |
| 259 | + | |
| 331 | 260 | $transformers->register( Classes_Prop_Type::get_key(), new Classes_Transformer() ); |
| 332 | 261 | $transformers->register( Image_Prop_Type::get_key(), new Image_Transformer() ); |
| 333 | 262 | $transformers->register( Image_Src_Prop_Type::get_key(), new Image_Src_Transformer() ); |
| 334 | - $transformers->register( Svg_Src_Prop_Type::get_key(), new Svg_Src_Transformer() ); | |
| 335 | - $transformers->register( Video_Src_Prop_Type::get_key(), new Video_Src_Transformer() ); | |
| 336 | 263 | $transformers->register( Link_Prop_Type::get_key(), new Link_Transformer() ); |
| 337 | 264 | $transformers->register( Query_Prop_Type::get_key(), new Query_Transformer() ); |
| 338 | 265 | $transformers->register( Attributes_Prop_Type::get_key(), new Attributes_Transformer() ); |
| 339 | - $transformers->register( Date_Time_Prop_Type::get_key(), new Date_Time_Transformer() ); | |
| 340 | - $transformers->register( Date_Range_Prop_Type::get_key(), new Date_Range_Transformer() ); | |
| 341 | - $transformers->register( Time_Range_Prop_Type::get_key(), new Time_Range_Transformer() ); | |
| 342 | - $transformers->register( Html_V2_Prop_Type::get_key(), new Html_V2_Transformer() ); | |
| 343 | - $transformers->register( Html_V3_Prop_Type::get_key(), new Html_V3_Transformer() ); | |
| 344 | 266 | } |
| 345 | 267 | |
| 346 | 268 | private function register_styles_transformers( Transformers_Registry $transformers ) { |
| 347 | 269 | $transformers->register_fallback( new Plain_Transformer() ); |
| 348 | 270 | |
| 349 | - $this->register_basic_styles_transformers( $transformers ); | |
| 350 | - $this->register_background_styles_transformers( $transformers ); | |
| 351 | - $this->register_filter_styles_transformers( $transformers ); | |
| 352 | - $this->register_transform_styles_transformers( $transformers ); | |
| 353 | - $this->register_layout_styles_transformers( $transformers ); | |
| 354 | - } | |
| 355 | - | |
| 356 | - private function register_basic_styles_transformers( Transformers_Registry $transformers ): void { | |
| 357 | 271 | $transformers->register( Size_Prop_Type::get_key(), new Size_Transformer() ); |
| 358 | 272 | $transformers->register( Box_Shadow_Prop_Type::get_key(), new Combine_Array_Transformer( ',' ) ); |
| 359 | 273 | $transformers->register( Shadow_Prop_Type::get_key(), new Shadow_Transformer() ); |
| 360 | 274 | $transformers->register( Flex_Prop_Type::get_key(), new Flex_Transformer() ); |
| @@ -360,12 +274,8 @@ | ||
| 360 | 274 | $transformers->register( Flex_Prop_Type::get_key(), new Flex_Transformer() ); |
| 361 | 275 | $transformers->register( Stroke_Prop_Type::get_key(), new Stroke_Transformer() ); |
| 362 | 276 | $transformers->register( Image_Prop_Type::get_key(), new Image_Transformer() ); |
| 363 | 277 | $transformers->register( Image_Src_Prop_Type::get_key(), new Image_Src_Transformer() ); |
| 364 | - $transformers->register( Span_Prop_Type::get_key(), new Span_Transformer() ); | |
| 365 | - } | |
| 366 | - | |
| 367 | - private function register_background_styles_transformers( Transformers_Registry $transformers ): void { | |
| 368 | 278 | $transformers->register( Background_Image_Overlay_Prop_Type::get_key(), new Background_Image_Overlay_Transformer() ); |
| 369 | 279 | $transformers->register( Background_Image_Overlay_Size_Scale_Prop_Type::get_key(), new Background_Image_Overlay_Size_Scale_Transformer() ); |
| 370 | 280 | $transformers->register( Background_Image_Position_Offset_Prop_Type::get_key(), new Position_Transformer() ); |
| 371 | 281 | $transformers->register( Background_Color_Overlay_Prop_Type::get_key(), new Background_Color_Overlay_Transformer() ); |
| @@ -371,11 +281,8 @@ | ||
| 371 | 281 | $transformers->register( Background_Color_Overlay_Prop_Type::get_key(), new Background_Color_Overlay_Transformer() ); |
| 372 | 282 | $transformers->register( Background_Overlay_Prop_Type::get_key(), new Background_Overlay_Transformer() ); |
| 373 | 283 | $transformers->register( Background_Prop_Type::get_key(), new Background_Transformer() ); |
| 374 | 284 | $transformers->register( Background_Gradient_Overlay_Prop_Type::get_key(), new Background_Gradient_Overlay_Transformer() ); |
| 375 | - } | |
| 376 | - | |
| 377 | - private function register_filter_styles_transformers( Transformers_Registry $transformers ): void { | |
| 378 | 285 | $transformers->register( Filter_Prop_Type::get_key(), new Filter_Transformer() ); |
| 379 | 286 | $transformers->register( Backdrop_Filter_Prop_Type::get_key(), new Filter_Transformer() ); |
| 380 | 287 | $transformers->register( Transition_Prop_Type::get_key(), new Transition_Transformer() ); |
| 381 | 288 | $transformers->register( Color_Stop_Prop_Type::get_key(), new Color_Stop_Transformer() ); |
| @@ -380,11 +287,8 @@ | ||
| 380 | 287 | $transformers->register( Transition_Prop_Type::get_key(), new Transition_Transformer() ); |
| 381 | 288 | $transformers->register( Color_Stop_Prop_Type::get_key(), new Color_Stop_Transformer() ); |
| 382 | 289 | $transformers->register( Gradient_Color_Stop_Prop_Type::get_key(), new Combine_Array_Transformer( ',' ) ); |
| 383 | 290 | $transformers->register( Position_Prop_Type::get_key(), new Position_Transformer() ); |
| 384 | - } | |
| 385 | - | |
| 386 | - private function register_transform_styles_transformers( Transformers_Registry $transformers ): void { | |
| 387 | 291 | $transformers->register( Transform_Move_Prop_Type::get_key(), new Transform_Move_Transformer() ); |
| 388 | 292 | $transformers->register( Transform_Scale_Prop_Type::get_key(), new Transform_Scale_Transformer() ); |
| 389 | 293 | $transformers->register( Transform_Rotate_Prop_Type::get_key(), new Transform_Rotate_Transformer() ); |
| 390 | 294 | $transformers->register( Transform_Skew_Prop_Type::get_key(), new Transform_Skew_Transformer() ); |
| @@ -397,11 +301,8 @@ | ||
| 397 | 301 | [ 'transform-functions', 'transform-origin', 'perspective', 'perspective-origin' ], |
| 398 | 302 | fn( $_, $key ) => 'transform-functions' === $key ? 'transform' : $key |
| 399 | 303 | ) |
| 400 | 304 | ); |
| 401 | - } | |
| 402 | - | |
| 403 | - private function register_layout_styles_transformers( Transformers_Registry $transformers ): void { | |
| 404 | 305 | $transformers->register( |
| 405 | 306 | Border_Radius_Prop_Type::get_key(), |
| 406 | 307 | new Multi_Props_Transformer( [ 'start-start', 'start-end', 'end-start', 'end-end' ], fn ( $_, $key ) => "border-{$key}-radius" ) |
| 407 | 308 | ); |
| @@ -422,9 +323,8 @@ | ||
| 422 | 323 | public function register_import_transformers( Transformers_Registry $transformers ) { |
| 423 | 324 | $transformers->register_fallback( new Import_Export_Plain_Transformer() ); |
| 424 | 325 | |
| 425 | 326 | $transformers->register( Image_Src_Prop_Type::get_key(), new Image_Src_Import_Transformer() ); |
| 426 | - $transformers->register( Svg_Src_Prop_Type::get_key(), new Svg_Src_Import_Transformer() ); | |
| 427 | 327 | } |
| 428 | 328 | |
| 429 | 329 | public function register_export_transformers( Transformers_Registry $transformers ) { |
| 430 | 330 | $transformers->register_fallback( new Import_Export_Plain_Transformer() ); |
| @@ -429,9 +329,8 @@ | ||
| 429 | 329 | public function register_export_transformers( Transformers_Registry $transformers ) { |
| 430 | 330 | $transformers->register_fallback( new Import_Export_Plain_Transformer() ); |
| 431 | 331 | |
| 432 | 332 | $transformers->register( Image_Src_Prop_Type::get_key(), new Image_Src_Export_Transformer() ); |
| 433 | - $transformers->register( Svg_Src_Prop_Type::get_key(), new Svg_Src_Export_Transformer() ); | |
| 434 | 333 | } |
| 435 | 334 | |
| 436 | 335 | public static function is_active(): bool { |
| 437 | 336 | return Plugin::$instance->experiments->is_feature_active( self::EXPERIMENT_NAME ); |
| @@ -460,16 +359,14 @@ | ||
| 460 | 359 | [ 'elementor-editor' ], |
| 461 | 360 | ELEMENTOR_VERSION, |
| 462 | 361 | true |
| 463 | 362 | ); |
| 464 | - | |
| 465 | - wp_set_script_translations( 'elementor-atomic-widgets-editor', 'elementor' ); | |
| 466 | 363 | } |
| 467 | 364 | |
| 468 | 365 | private function render_panel_category_chip() { |
| 469 | 366 | ?><# if ( 'v4-elements' === name ) { #> |
| 470 | 367 | <span class="elementor-panel-heading-category-chip"> |
| 471 | - <?php echo esc_html__( 'New', 'elementor' ); ?><i class="eicon-info"></i> | |
| 368 | + <?php echo esc_html__( 'Alpha', 'elementor' ); ?><i class="eicon-info"></i> | |
| 472 | 369 | <span class="e-promotion-react-wrapper" data-promotion="v4_chip"></span> |
| 473 | 370 | </span> |
| 474 | 371 | <# } #><?php |
| 475 | 372 | } |
| @@ -474,39 +371,42 @@ | ||
| 474 | 371 | <# } #><?php |
| 475 | 372 | } |
| 476 | 373 | |
| 477 | 374 | private function register_frontend_scripts() { |
| 478 | - $loader = new Frontend_Assets_Loader(); | |
| 479 | - $loader->register_scripts(); | |
| 480 | - } | |
| 375 | + $assets_config_provider = ( new Assets_Config_Provider() ) | |
| 376 | + ->set_path_resolver( function ( $name ) { | |
| 377 | + return ELEMENTOR_ASSETS_PATH . "js/packages/{$name}/{$name}.asset.php"; | |
| 378 | + } ); | |
| 481 | 379 | |
| 482 | - private function add_inline_styles() { | |
| 483 | - $inline_css = implode( '', [ | |
| 484 | - '.e-heading-base a, .e-paragraph-base a { all: unset; cursor: pointer; }', | |
| 485 | - 'form[data-element_type="e-form"].form-state-success [data-element_type="e-form-success-message"],', | |
| 486 | - 'form[data-element_type="e-form"].form-state-error [data-element_type="e-form-error-message"]', | |
| 487 | - '{ display: block; }', | |
| 488 | - ] ); | |
| 489 | - wp_add_inline_style( 'elementor-frontend', $inline_css ); | |
| 490 | - wp_add_inline_style( 'elementor-editor', $inline_css ); | |
| 491 | - } | |
| 380 | + $assets_config_provider->load( 'frontend-handlers' ); | |
| 492 | 381 | |
| 493 | - private function enqueue_promotion_styles() { | |
| 494 | - if ( \Elementor\Utils::has_pro() ) { | |
| 382 | + $frontend_handlers_package_config = $assets_config_provider->get( 'frontend-handlers' ); | |
| 383 | + | |
| 384 | + if ( ! $frontend_handlers_package_config ) { | |
| 495 | 385 | return; |
| 496 | 386 | } |
| 497 | 387 | |
| 498 | - wp_enqueue_style( | |
| 499 | - 'elementor-atomic-widgets-promotion-fonts', | |
| 500 | - 'https://fonts.googleapis.com/css2?family=Poppins:wght@400;600&display=swap', | |
| 501 | - [], | |
| 502 | - ELEMENTOR_VERSION | |
| 388 | + wp_register_script( | |
| 389 | + $frontend_handlers_package_config['handle'], | |
| 390 | + $this->get_js_assets_url( 'packages/frontend-handlers/frontend-handlers' ), | |
| 391 | + $frontend_handlers_package_config['deps'], | |
| 392 | + ELEMENTOR_VERSION, | |
| 393 | + true | |
| 503 | 394 | ); |
| 504 | 395 | |
| 505 | - wp_enqueue_style( | |
| 506 | - 'elementor-atomic-widgets-promotion', | |
| 507 | - $this->get_css_assets_url( 'modules/atomic-widgets/editor' ), | |
| 508 | - [ 'elementor-atomic-widgets-promotion-fonts' ], | |
| 509 | - ELEMENTOR_VERSION | |
| 396 | + wp_register_script( | |
| 397 | + 'elementor-youtube-handler', | |
| 398 | + $this->get_js_assets_url( 'youtube-handler' ), | |
| 399 | + [ $frontend_handlers_package_config['handle'] ], | |
| 400 | + ELEMENTOR_VERSION, | |
| 401 | + true | |
| 402 | + ); | |
| 403 | + | |
| 404 | + wp_register_script( | |
| 405 | + 'elementor-tabs-handler', | |
| 406 | + $this->get_js_assets_url( 'tabs-handler' ), | |
| 407 | + [ $frontend_handlers_package_config['handle'] ], | |
| 408 | + ELEMENTOR_VERSION, | |
| 409 | + true | |
| 510 | 410 | ); |
| 511 | 411 | } |
| 512 | 412 | } |
