Merge branch 'main' into tweak/ED-9706

nuritsha · Aug 15, 2024 · eede367 · eede367
2 parents 9a756d0 + 95d1b1e
commit eede367
Show file tree

Hide file tree

Showing 119 changed files with 2,545 additions and 676 deletions.
diff --git a/.grunt-config/webpack.js b/.grunt-config/webpack.js
@@ -109,6 +109,7 @@ const entry = {
 	'editor-document': path.resolve( __dirname, '../assets/dev/js/editor/editor-document.js' ),
 	'qunit-tests': path.resolve( __dirname, '../tests/qunit/main.js' ),
 	'admin-top-bar': path.resolve( __dirname, '../modules/admin-top-bar/assets/js/admin.js' ),
+	'checklist': path.resolve( __dirname, '../modules/checklist/assets/js/editor.js' ),
 	'nested-elements': path.resolve( __dirname, '../modules/nested-elements/assets/js/editor/index.js' ),
 	'nested-tabs': path.resolve( __dirname, '../modules/nested-tabs/assets/js/editor/index.js' ),
 	'nested-accordion': path.resolve( __dirname, '../modules/nested-accordion/assets/js/editor/index.js' ),

diff --git a/assets/dev/js/editor/components/template-library/manager.js b/assets/dev/js/editor/components/template-library/manager.js
@@ -315,11 +315,11 @@ TemplateLibraryManager = function() {
 
 		$e.data.get( 'library/templates', query, options ).then( ( result ) => {
 			templatesCollection = new TemplateLibraryCollection(
-				this.filterOutInactiveExperiments( result.data.templates ),
+				result.data.templates,
 			);
 
 			if ( result.data.config ) {
-				config = this.filterOutExperimentsCategories( result.data.config );
+				config = result.data.config;
 			}
 
 			self.layout.hideLoadingView();
@@ -330,30 +330,6 @@ TemplateLibraryManager = function() {
 		} );
 	};
 
-	this.filterOutExperimentsCategories = function( configData ) {
-		if ( elementorCommon.config.experimentalFeatures[ 'link-in-bio' ] ) {
-			return configData;
-		}
-
-		const dataToReturn = { ...configData };
-
-		dataToReturn.block.categories = configData?.block?.categories.filter( function( category ) {
-			return category !== 'Link in Bio';
-		} );
-
-		return dataToReturn;
-	};
-
-	this.filterOutInactiveExperiments = function( templates ) {
-		if ( elementorCommon.config.experimentalFeatures[ 'link-in-bio' ] ) {
-			return templates;
-		}
-		return templates.filter( function( template ) {
-			const { subtype } = template;
-			return subtype !== 'Link in Bio';
-		} );
-	};
-
 	this.showTemplates = function() {
 		// The tabs should exist in DOM on loading.
 		self.layout.setHeaderDefaultParts();

diff --git a/assets/dev/js/editor/editor-base.js b/assets/dev/js/editor/editor-base.js
@@ -445,9 +445,7 @@ export default class EditorBase extends Marionette.Application {
 			this.modules.floatingButtonsLibraryModule = new FloatingButtonsLibraryModule();
 		}
 
-		if ( elementorCommon.config.experimentalFeatures[ 'link-in-bio' ] ) {
-			this.modules.linkInBioLibraryModule = new LinkInBioLibraryModule();
-		}
+		this.modules.linkInBioLibraryModule = new LinkInBioLibraryModule();
 
 		if ( elementorCommon.config.experimentalFeatures[ 'floating-bars' ] ) {
 			this.modules.floatingBarsLibraryModule = new FloatingBarsLibraryModule();

diff --git a/assets/dev/js/editor/regions/navigator/navigator.js b/assets/dev/js/editor/regions/navigator/navigator.js
@@ -17,7 +17,7 @@ export default class extends BaseRegion {
 			customPosition: {
 				title: __( 'Custom Positioning', 'elementor' ),
 				icon: 'cursor-move',
-				settingKeys: [ '_position', '_element_width' ],
+				settingKeys: [ '_position' ],
 				section: '_section_position',
 			},
 		};

diff --git a/assets/dev/scss/common/common.scss b/assets/dev/scss/common/common.scss
@@ -2,12 +2,15 @@
 @import "../../../../assets/dev/scss/helpers/variables";
 @import "../../../../assets/dev/scss/editor/breakpoints";
 @import "../global/global";
+@import "../global/dialog-base";
+@import "../global/dialog-lightbox";
+@import "../global/dialog-confirm";
 @import "dialog-common";
 @import "dialog-templates";
 @import "notifications";
 @import "app/modules/site-editor/assets/scss/admin/admin-bar";
 
-//Elementor icon logo wrapper
+// Elementor icon logo wrapper
 .e-logo-wrapper {
 	background: var(--e-a-bg-logo);
 	display: inline-block;

diff --git a/assets/dev/scss/editor/preview/preview.scss b/assets/dev/scss/editor/preview/preview.scss
@@ -18,7 +18,7 @@
 @import "inline-editor";
 
 @import "../../../../../modules/elements-color-picker/assets/scss/elements-color-picker";
-@import "../../../../../modules/floating-buttons/assets/scss/floating-buttons/preview/floating-buttons-preview";
+@import "../../../../../modules/floating-buttons/assets/scss/floating-buttons/preview/floating-elements-preview";
 
 @import "../flex-icons.scss";
 

diff --git a/assets/dev/scss/frontend/_swiper-customisations.scss b/assets/dev/scss/frontend/_swiper-customisations.scss