MAGETWO-96593: Image Position issue with Associated Products

Author: nikita-shcherbatykh

app/code/Magento/Swatches/Helper/Data.php

@@ -332,14 +332,14 @@ public function getProductMediaGallery(ModelProduct $product): array
                 $baseImage = $mediaEntry->getFile();
             }
 
-            $gallery[$mediaEntry->getId()] = $this->collectImageData($mediaEntry);
+            $gallery[$mediaEntry->getId()] = $this->collectImageData($product, $mediaEntry);
         }
 
         if (!$baseImage) {
             return [];
         }
 
-        $resultGallery = $this->collectImageData($baseImage);
+        $resultGallery = $this->collectImageData($product, $baseImage);
         $resultGallery['gallery'] = $gallery;
 
         return $resultGallery;
@@ -359,14 +359,17 @@ private function isMainImage(ProductAttributeMediaGalleryEntryInterface $mediaEn
     /**
      * Returns image data for swatches
      *
+     * @param ModelProduct $product
      * @param ProductAttributeMediaGalleryEntryInterface $mediaEntry
      * @return array
      */
-    private function collectImageData(ProductAttributeMediaGalleryEntryInterface $mediaEntry): array
-    {
-        $image = $this->getAllSizeImages($mediaEntry->getFile());
-        $image[ProductAttributeMediaGalleryEntryInterface::POSITION] =  $mediaEntry->getPosition();
-        $image['isMain'] =$this->isMainImage($mediaEntry);
+    private function collectImageData(
+        ModelProduct $product,
+        ProductAttributeMediaGalleryEntryInterface $mediaEntry
+    ): array {
+        $image = $this->getAllSizeImages($product, $mediaEntry->getFile());
+        $image[ProductAttributeMediaGalleryEntryInterface::POSITION] = $mediaEntry->getPosition();
+        $image['isMain'] = $this->isMainImage($mediaEntry);
         return $image;
     }
 

app/code/Magento/Swatches/view/frontend/web/js/swatch-renderer.js

@@ -667,10 +667,9 @@ define([
         /**
          * Load media gallery using ajax or json config.
          *
-         * @param {String|undefined} eventName
          * @private
          */
-        _loadMedia: function (eventName) {
+        _loadMedia: function () {
             var $main = this.inProductList ?
                     this.element.parents('.product-item-info') :
                     this.element.parents('.column.main'),