+
>
![<?php echo esc_attr( $plugin['name'] ); ?>](<?php echo esc_url( $plugin['image'] ); ?>)
diff --git a/modules/floating-buttons/assets/js/editor/module.js b/modules/floating-buttons/assets/js/editor/module.js
index 3d31ca406c58..833e64ac1909 100644
--- a/modules/floating-buttons/assets/js/editor/module.js
+++ b/modules/floating-buttons/assets/js/editor/module.js
@@ -48,6 +48,7 @@ class FloatingButtonsLibraryModule extends elementorModules.editor.utils.Module
return queryString;
}
}
+
return queryString;
}, 1000 );
}
diff --git a/modules/floating-buttons/assets/scss/widgets/contact-buttons-var-10.scss b/modules/floating-buttons/assets/scss/widgets/contact-buttons-var-10.scss
index 00e85a9dda48..b24891069aa0 100644
--- a/modules/floating-buttons/assets/scss/widgets/contact-buttons-var-10.scss
+++ b/modules/floating-buttons/assets/scss/widgets/contact-buttons-var-10.scss
@@ -111,6 +111,16 @@
&.has-size-small {
--e-contact-buttons-margin-offset: 2px;
}
+
+ [dir="rtl"] & {
+ --e-contact-buttons-margin-offset: 2px;
+
+ transform: translateX(calc(100% - calc(var(--e-contact-buttons-svg-size) * 2 - var(--e-contact-buttons-margin-offset))));
+
+ &.has-size-large {
+ --e-contact-buttons-margin-offset: 8px;
+ }
+ }
}
&__contact-links {
@@ -154,6 +164,20 @@
transform: translateX(calc(100% - calc(var(--e-contact-buttons-svg-size) * 2) + var(--e-contact-buttons-margin-offset)));
transition: var(--e-contact-buttons-transition);
+ &.has-size-small {
+ --e-contact-buttons-margin-offset: 2px;
+ }
+
+ [dir="rtl"] & {
+ --e-contact-buttons-margin-offset: 2px;
+
+ transform: translateX(calc(-100% + calc(var(--e-contact-buttons-svg-size) * 2 - var(--e-contact-buttons-margin-offset))));
+
+ &.has-size-large {
+ --e-contact-buttons-margin-offset: 8px;
+ }
+ }
+
&:hover,
&:focus {
@@ -167,10 +191,6 @@
transform: none;
transition: var(--e-contact-buttons-transition);
}
-
- &.has-size-small {
- --e-contact-buttons-margin-offset: 2px;
- }
}
&__contact-links {
diff --git a/modules/floating-buttons/classes/render/contact-buttons-render-base.php b/modules/floating-buttons/classes/render/contact-buttons-render-base.php
index f5bdcd32d286..ee8c95901947 100644
--- a/modules/floating-buttons/classes/render/contact-buttons-render-base.php
+++ b/modules/floating-buttons/classes/render/contact-buttons-render-base.php
@@ -374,7 +374,7 @@ protected function get_formatted_link( array $link, string $prefix ): string {
break;
case Social_Network_Provider::MESSENGER:
$formatted_link = ! empty( $link['username'] ) ?
- 'https://www.facebook.com/messages/t/' . $link['username'] :
+ Social_Network_Provider::build_messenger_link( $link['username'] ) :
'';
break;
case Social_Network_Provider::WHATSAPP:
diff --git a/modules/home/classes/transformations-manager.php b/modules/home/classes/transformations-manager.php
index 095f4b238fcf..cff273a4c614 100644
--- a/modules/home/classes/transformations-manager.php
+++ b/modules/home/classes/transformations-manager.php
@@ -3,6 +3,8 @@
use Elementor\Core\Isolation\Wordpress_Adapter;
use Elementor\Core\Isolation\Plugin_Status_Adapter;
+use Elementor\Core\Isolation\Wordpress_Adapter_Interface;
+use Elementor\Plugin;
if ( ! defined( 'ABSPATH' ) ) {
exit; // Exit if accessed directly
@@ -24,16 +26,23 @@ class Transformations_Manager {
protected array $home_screen_data;
- protected Wordpress_Adapter $wordpress_adapter;
+ protected Wordpress_Adapter_Interface $wordpress_adapter;
protected Plugin_Status_Adapter $plugin_status_adapter;
protected array $transformation_classes = [];
public function __construct( $home_screen_data ) {
+ $container = Plugin::$instance->elementor_container();
+
+ if ( $container->has( Wordpress_Adapter_Interface::class ) ) {
+ $this->wordpress_adapter = $container->get( Wordpress_Adapter_Interface::class );
+ } else {
+ $this->wordpress_adapter = new Wordpress_Adapter();
+ }
+
$this->home_screen_data = $home_screen_data;
- $this->wordpress_adapter = new Wordpress_Adapter();
- $this->plugin_status_adapter = new Plugin_Status_Adapter( $this->wordpress_adapter );
+ $this->plugin_status_adapter = new Plugin_Status_Adapter();
$this->transformation_classes = $this->get_transformation_classes();
}
diff --git a/modules/link-in-bio/classes/render/render-base.php b/modules/link-in-bio/classes/render/render-base.php
index 2e8479da4554..6bd03bc32ec4 100644
--- a/modules/link-in-bio/classes/render/render-base.php
+++ b/modules/link-in-bio/classes/render/render-base.php
@@ -469,7 +469,7 @@ protected function get_formatted_link_based_on_type_for_cta( array $cta ): strin
break;
case Social_Network_Provider::MESSENGER:
$formatted_link = ! empty( $cta['cta_link_username'] ) ?
- 'https://www.facebook.com/messages/t/' . $cta['cta_link_username'] :
+ Social_Network_Provider::build_messenger_link( $cta['cta_link_username'] ) :
'';
break;
case Social_Network_Provider::WAZE:
@@ -504,7 +504,7 @@ protected function get_formatted_link_for_icon( array $icon ): string {
break;
case Social_Network_Provider::MESSENGER:
$formatted_link = ! empty( $icon['icon_username'] ) ?
- 'https://www.facebook.com/messages/t/' . $icon['icon_username'] :
+ Social_Network_Provider::build_messenger_link( $icon['icon_username'] ) :
'';
break;
case Social_Network_Provider::WAZE:
diff --git a/php-scoper/dependency-injection.inc.php b/php-scoper/dependency-injection.inc.php
new file mode 100644
index 000000000000..e0f0c6721cec
--- /dev/null
+++ b/php-scoper/dependency-injection.inc.php
@@ -0,0 +1,17 @@
+ 'ElementorDeps',
+ 'finders' => [
+ Finder::create()->files()->in( 'vendor/psr/container' )->name( [ '*.php', 'LICENSE', 'composer.json' ] ),
+ Finder::create()->files()->in( 'vendor/laravel/serializable-closure' )->name( [ '*.php', 'LICENSE', 'composer.json' ] ),
+ Finder::create()->files()->in( 'vendor/php-di' )->name( [ '*.php', 'LICENSE', 'composer.json' ] ),
+ ],
+ 'exclude-files' => [
+ 'vendor/php-di/php-di/src/Compiler/Template.php',
+ ],
+];
diff --git a/phpcs.xml b/phpcs.xml
index 0b3bf5d09cc6..a9a708ae2589 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -7,6 +7,7 @@
vendor/
+ vendor_prefixed/
tmp/
build/
node_modules/
diff --git a/phpunit.xml b/phpunit.xml
index 2a618158f177..d8a4efe819a0 100755
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -30,6 +30,7 @@
tests
includes/libraries
vendor
+ vendor_prefixed
diff --git a/ruleset.xml b/ruleset.xml
index e0330db59101..6dc3b0e4061b 100644
--- a/ruleset.xml
+++ b/ruleset.xml
@@ -7,6 +7,7 @@
vendor/
+ vendor_prefixed/
tmp/
build/
node_modules/
diff --git a/tests/playwright/sanity/modules/nested-tabs/nested-tabs-4.test.ts b/tests/playwright/sanity/modules/nested-tabs/nested-tabs-4.test.ts
index 713530e9510d..c222edaf0655 100644
--- a/tests/playwright/sanity/modules/nested-tabs/nested-tabs-4.test.ts
+++ b/tests/playwright/sanity/modules/nested-tabs/nested-tabs-4.test.ts
@@ -47,7 +47,7 @@ test.describe( 'Nested Tabs tests @nested-tabs', () => {
} );
} );
- test.skip( 'Check that background video is loaded in multiple content containers', async ( { page, apiRequests }, testInfo ) => {
+ test( 'Check that background video is loaded in multiple content containers', async ( { page, apiRequests }, testInfo ) => {
// Arrange.
const wpAdmin = new WpAdminPage( page, testInfo, apiRequests );
const editor = await wpAdmin.openNewPage(),
@@ -71,24 +71,22 @@ test.describe( 'Nested Tabs tests @nested-tabs', () => {
await setBackgroundVideoUrl( editor, contentContainerThreeId, videoUrl );
await expect.soft( contentContainerOne ).toHaveAttribute( 'data-model-cid', firstTabContainerModelCId );
+ // Assert that the iframe loaded. It's impossible to check if the video is playing due to issue in Chromium.
await expect.soft( videoContainer ).toHaveCount( 1 );
await page.waitForTimeout( 3000 );
- await expect.soft( contentContainerThree.locator( '.elementor-background-video-container iframe' ) ).not.toHaveCSS( 'width', '0px' );
- await expect.soft( contentContainerThree.locator( '.elementor-background-video-container' ) ).toBeVisible();
- await expect.soft( contentContainerTwo.locator( '.elementor-background-video-container' ) ).not.toBeVisible();
+ // Assert that the iframe loaded. It's impossible to check if the video is playing due to issue in Chromium.
+ await expect.soft( contentContainerThree.locator( '.elementor-background-video-container iframe' ) ).toHaveCount( 1 );
await clickTab( editor.getPreviewFrame(), 1 );
await page.waitForTimeout( 3000 );
- await expect.soft( contentContainerTwo.locator( '.elementor-background-video-container iframe' ) ).not.toHaveCSS( 'width', '0px' );
- await expect.soft( contentContainerTwo.locator( '.elementor-background-video-container' ) ).toBeVisible();
- await expect.soft( contentContainerOne.locator( '.elementor-background-video-container' ) ).not.toBeVisible();
+ // Assert that the iframe loaded. It's impossible to check if the video is playing due to issue in Chromium.
+ await expect.soft( contentContainerTwo.locator( '.elementor-background-video-container iframe' ) ).toHaveCount( 1 );
await clickTab( editor.getPreviewFrame(), 0 );
await page.waitForTimeout( 3000 );
- await expect.soft( contentContainerOne.locator( '.elementor-background-video-container iframe' ) ).not.toHaveCSS( 'width', '0px' );
- await expect.soft( contentContainerOne.locator( '.elementor-background-video-container' ) ).toBeVisible();
- await expect.soft( contentContainerThree.locator( '.elementor-background-video-container' ) ).not.toBeVisible();
+ // Assert that the iframe loaded. It's impossible to check if the video is playing due to issue in Chromium.
+ await expect.soft( contentContainerOne.locator( '.elementor-background-video-container iframe' ) ).toHaveCount( 1 );
} );
test( 'Nested tabs horizontal scroll', async ( { page, apiRequests }, testInfo ) => {
diff --git a/tests/playwright/upgrade-test/index.ts b/tests/playwright/upgrade-test/index.ts
index be8f12f3f58b..1d54b39ec0a7 100644
--- a/tests/playwright/upgrade-test/index.ts
+++ b/tests/playwright/upgrade-test/index.ts
@@ -24,7 +24,8 @@ export class UpgradeElementor {
// Don't forget to npx grunt build in root folder for local testing
this.cmd( 'mkdir plugin' );
this.cmd( 'cd ../../../ && mkdir elementor' );
- this.cmd( 'cd ../../../ && cp -r ./build/* elementor && zip -r elementor elementor' );
+ this.cmd( 'cd ../../../ && cp -r ./build/* elementor' );
+ this.cmd( 'cd ../../../elementor && zip -r ../elementor.zip .' );
this.cmd( 'cd ../../../ && mv ./elementor.zip ./tests/playwright/upgrade-test/plugin' );
}