Merge branch 'v6.X' into PWA-1589-coupons-via-push

shopgate · Apr 1, 2019 · bc82527 · bc82527
2 parents 7ca4746 + 6f8128b
commit bc82527
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 1 deletion.
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -15,4 +15,4 @@ Please add an "x" into the option that is relevant:
 
 ## How to test it
 
-Please describe here any specialty that the tester should be aware of.
+Please describe here any specialty that the tester should be aware of.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,8 @@
 ## [v6.4.0](https://github.com/shopgate/theme-gmd/compare/v6.3.1...v6.4.0) (2019-04-05)
 
 #### :rocket: Enhancement
+* [#589](https://github.com/shopgate/pwa/pull/589) The cart now display correct and consistent data in the totals. ([@devbucket](https://github.com/devbucket))
+* [#588](https://github.com/shopgate/pwa/pull/588) Add portals wrapping the View Content ([@alexbridge](https://github.com/alexbridge))
 * [#577](https://github.com/shopgate/pwa/pull/577) Implementation of the Barcode Scanner UI ([@fkloes](https://github.com/fkloes))
 * [#573](https://github.com/shopgate/pwa/pull/573) Show QR Code Scan results ([@alexbridge](https://github.com/alexbridge))
 * [#574](https://github.com/shopgate/pwa/pull/574) Unused selectors for UI and toast messages have been removed. ([@devbucket](https://github.com/devbucket))
@@ -12,13 +14,18 @@
 * [#564](https://github.com/shopgate/pwa/pull/564) Restructured PaymentBar and added Portals around cart totals ([@fkloes](https://github.com/fkloes))
 
 #### :bug: Bug Fix
+* [#593](https://github.com/shopgate/pwa/pull/593) Fixed swiper open link actions ([@SG-Noxoreos](https://github.com/SG-Noxoreos))
+* [#590](https://github.com/shopgate/pwa/pull/590) Patch for e2e tests for new slider implementation ([@alexbridge](https://github.com/alexbridge))
 * [#571](https://github.com/shopgate/pwa/pull/571) Refactored the Sliders to use the new react-id-swiper version ([@devbucket](https://github.com/devbucket))
 * [#576](https://github.com/shopgate/pwa/pull/576) Sentry.io level / severity is not send correctly ([@alexbridge](https://github.com/alexbridge))
 * [#575](https://github.com/shopgate/pwa/pull/575) The routeDidChange$ stream is now an alias of routeDidEnter$ since it is already deprecated. ([@devbucket](https://github.com/devbucket))
 * [#569](https://github.com/shopgate/pwa/pull/569) Fix navigation with special characters in search query ([@alexbridge](https://github.com/alexbridge))
 * [#567](https://github.com/shopgate/pwa/pull/567) Add shop number back to localstorage key of redux store ([@alexbridge](https://github.com/alexbridge))
 * [#562](https://github.com/shopgate/pwa/pull/562) Liveshopping widget localization to german ([@alexbridge](https://github.com/alexbridge))
 
+#### :nail_care: Polish
+* [#586](https://github.com/shopgate/pwa/pull/586) Added changelog starting from PWA version 6.0.0 ([@SG-Noxoreos](https://github.com/SG-Noxoreos))
+
 
 ## [v6.3.1](https://github.com/shopgate/theme-gmd/compare/v6.3.0...v6.3.1) (2019-03-20)
 

diff --git a/libraries/common/components/Swiper/index.jsx b/libraries/common/components/Swiper/index.jsx
@@ -38,6 +38,22 @@ function Swiper(props) {
     if (swiper !== null) {
       swiper.update();
       swiper.on('slideChange', () => onSlideChange(swiper.realIndex));
+      swiper.on('transitionEnd', () => {
+        // In loop mode the Swiper duplicates elements, which are not in the virtual DOM
+        if (loop) {
+          // Skip duplicated elements
+          if (swiper.activeIndex < 1) {
+            swiper.slideToLoop(children.length - 1, 0);
+          } else if (swiper.activeIndex > children.length) {
+            swiper.slideToLoop(0, 0);
+          }
+        }
+      });
+      swiper.on('beforeDestroy', () => {
+        swiper.off('slideChange');
+        swiper.off('transitionEnd');
+        swiper.off('beforeDestroy');
+      });
     }
   }, [swiper]);