Merge remote-tracking branch 'origin/AC-8441' into Hammer_247_beta1_scope_17042023

Author: glo71317

app/code/Magento/Catalog/Test/Mftf/Test/StorefrontProductImageSlideTest.xml

@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="StorefrontProductImageSlideTest">
+        <annotations>
+            <features value="Catalog"/>
+            <stories value="Product Image"/>
+            <title value="Product image should be visible and slide left or right on frontend in mobile"/>
+            <description value="Product image should be visible and slide left or right on frontend in mobile"/>
+            <group value="Catalog"/>
+            <severity value="AVERAGE"/>
+            <testCaseId value="AC-8441"/>
+        </annotations>
+        <before>
+            <resizeWindow width="800" height="700" stepKey="resizeWindowToMobileView"/>
+            <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+        </before>
+        <after>
+            <resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
+            <actionGroup ref="DeleteProductBySkuActionGroup" stepKey="deleteProduct">
+                <argument name="sku" value="{{SimpleProduct.sku}}"/>
+            </actionGroup>
+            <actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clearFilter"/>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutAsAdmin"/>
+        </after>
+
+        <!--Create product-->
+        <actionGroup ref="AdminOpenNewProductFormPageActionGroup" stepKey="openNewProductPage"/>
+        <actionGroup ref="FillMainProductFormActionGroup" stepKey="fillSimpleProductMain">
+            <argument name="product" value="SimpleProduct"/>
+        </actionGroup>
+
+        <!-- Add image to product -->
+        <actionGroup ref="AddProductImageActionGroup" stepKey="addImageForSimpleProduct">
+            <argument name="image" value="TestImageWithDotInFilename"/>
+        </actionGroup>
+        <actionGroup ref="AddProductImageActionGroup" stepKey="addImageForSimpleProduct2">
+            <argument name="image" value="TestImageWithDotInFilename"/>
+        </actionGroup>
+        <actionGroup ref="SaveProductFormActionGroup" stepKey="saveSimpleProduct"/>
+
+        <!-- Assert product in storefront product page -->
+        <actionGroup ref="AssertProductNameAndSkuInStorefrontProductPageActionGroup" stepKey="assertProductInStorefrontProductPage">
+            <argument name="product" value="SimpleProduct"/>
+        </actionGroup>
+
+        <click selector="{{StorefrontProductMediaSection.fotoramaImageThumbnail('2')}}" stepKey="clickForFullScreenImage1"/>
+        <wait stepKey="waitForImageScroll" time="2"/>
+        <waitForElementVisible selector="{{StorefrontProductMediaSection.imagePrevButton}}" stepKey="waitPrevButton"/>
+        <seeElement selector="{{StorefrontProductMediaSection.imagePrevButton}}" stepKey="seePrevButton"/>
+    </test>
+</tests>

app/code/Magento/ProductVideo/view/frontend/web/js/fotorama-add-video-events.js

@@ -558,7 +558,7 @@ define([
             }
 
             if (this.isFullscreen && this.fotoramaItem.data('fotorama').activeFrame.i === number) {
-                this.fotoramaItem.data('fotorama').activeFrame.$stageFrame[0].trigger('click');
+                this.fotoramaItem.data('fotorama').activeFrame.$stageFrame.trigger('click');
             }
         },
 
@@ -700,7 +700,7 @@ define([
             if (activeIndexIsBase && number === 1 && $(window).width() > this.MobileMaxWidth) {
                 setTimeout($.proxy(function () {
                     fotorama.requestFullScreen();
-                    this.fotoramaItem.data('fotorama').activeFrame.$stageFrame[0].trigger('click');
+                    this.fotoramaItem.data('fotorama').activeFrame.$stageFrame.trigger('click');
                     this.Base = false;
                 }, this), 50);
             }

lib/web/fotorama/fotorama.js

@@ -1140,7 +1140,7 @@ fotoramaVersion = '4.6.4';
 
     function addEvent(el, e, fn, bool) {
         if (!e) return;
-        el.addEventListener ? el.addEventListener(e, fn, !!bool) : el.attachEvent('on' + e, fn);
+        el.addEventListener ? el.addEventListener(e, fn, {passive: !!bool}) : el.attachEvent('on' + e, fn);
     }
 
     /**

lib/web/magnifier/magnify.js

@@ -505,7 +505,7 @@ define([
             if (!$fotoramaStage.hasClass('magnify-wheel-loaded')) {
                 if (fotoramaStage && fotoramaStage.addEventListener) {
                     if ('onwheel' in document) {
-                        fotoramaStage.addEventListener('wheel', onWheel, { passive: true });
+                        fotoramaStage.addEventListener('wheel', onWheel, { passive: false });
                     } else if ('onmousewheel' in document) {
                         fotoramaStage.addEventListener('mousewheel', onWheel);
                     } else {