v1.0.0: Fix children behaviour

Author: andreamalin

src/main.js

@@ -34,7 +34,6 @@ const init = () => {
         if (window.isInGridCarousel) {
           carouselGridMovement('left');
         } else if (window.childrenBetweenLeft) {
-          window.actualVertical -= 1;
           focusNextCarousel('left');
           window.childrenBetweenLeft = false;
         } else if (window.isInNormalCarousel) {
@@ -45,7 +44,6 @@ const init = () => {
         if (window.isInGridCarousel) {
           carouselGridMovement('right');
         } else if (window.childrenBetweenRight) {
-          window.actualVertical += 1;
           focusNextCarousel('right');
           window.childrenBetweenRight = false;
         } else if (window.isInNormalCarousel) {
@@ -56,7 +54,6 @@ const init = () => {
         if (window.isInGridCarousel) {
           carouselGridMovement('up');
         } else if (window.childrenBetweenUp) {
-          window.actualVertical -= 1;
           focusNextCarousel('up');
           window.childrenBetweenUp = false;
         } else if (window.isInNormalCarousel) {
@@ -67,7 +64,6 @@ const init = () => {
         if (window.isInGridCarousel) {
           carouselGridMovement('down');
         } else if (window.childrenBetweenDown) {
-          window.actualVertical += 1;
           focusNextCarousel('down');
           window.childrenBetweenDown = false;
         } else if (window.isInNormalCarousel) {

src/navigation.js

@@ -59,10 +59,6 @@ const carouselGridMovement = (movement = 'down | up | left | right') => {
       carouselVerticalCenterGrid();
     } catch (e) {
       // There is not a next row, check if there is another carousel
-      if (window.childrenBetweenUp) {
-        window.actualVertical -= 1;
-        window.childrenBetweenUp = false;
-      }
       focusNextCarousel(movement);
       // Check if there are any open dialogs
       closeCarousel();
@@ -87,10 +83,6 @@ const carouselGridMovement = (movement = 'down | up | left | right') => {
         // Try getting previous or next row
         // Getting quanity of childs on previous or next row
         if (movement === 'right') {
-          if (window.childrenBetweenRight) {
-            window.actualVertical += 1;
-            window.childrenBetweenRight = false;
-          }
           if (focusNextCarousel(movement)) {
             // Check if there are any open dialogs
             closeDialogs();

usage-examples/angular-example/package.json

@@ -1,6 +1,6 @@
 {
   "name": "navigation-example",
-  "version": "0.0.0",
+  "version": "1.0.0",
   "scripts": {
     "ng": "ng",
     "start": "ng serve",

usage-examples/angular-example/src/app/multiple-carousels/multiple-carousels.component.ts

@@ -22,7 +22,7 @@ export class MultipleCarouselsComponent implements OnInit {
   keyDown(e: any) {
     // Left arrow
     if (e.keyCode === 37) {
-      window.actualVertical = 3;
+      window.actualVertical = 2; // The actual position is 2
       window.childrenBetweenLeft = true;
     }
   }

usage-examples/angular-example/src/assets/src/main.js

@@ -34,7 +34,6 @@ const init = () => {
         if (window.isInGridCarousel) {
           carouselGridMovement('left');
         } else if (window.childrenBetweenLeft) {
-          window.actualVertical -= 1;
           focusNextCarousel('left');
           window.childrenBetweenLeft = false;
         } else if (window.isInNormalCarousel) {
@@ -45,7 +44,6 @@ const init = () => {
         if (window.isInGridCarousel) {
           carouselGridMovement('right');
         } else if (window.childrenBetweenRight) {
-          window.actualVertical += 1;
           focusNextCarousel('right');
           window.childrenBetweenRight = false;
         } else if (window.isInNormalCarousel) {
@@ -56,7 +54,6 @@ const init = () => {
         if (window.isInGridCarousel) {
           carouselGridMovement('up');
         } else if (window.childrenBetweenUp) {
-          window.actualVertical -= 1;
           focusNextCarousel('up');
           window.childrenBetweenUp = false;
         } else if (window.isInNormalCarousel) {
@@ -67,7 +64,6 @@ const init = () => {
         if (window.isInGridCarousel) {
           carouselGridMovement('down');
         } else if (window.childrenBetweenDown) {
-          window.actualVertical += 1;
           focusNextCarousel('down');
           window.childrenBetweenDown = false;
         } else if (window.isInNormalCarousel) {

usage-examples/angular-example/src/assets/src/navigation.js

@@ -59,10 +59,6 @@ const carouselGridMovement = (movement = 'down | up | left | right') => {
       carouselVerticalCenterGrid();
     } catch (e) {
       // There is not a next row, check if there is another carousel
-      if (window.childrenBetweenUp) {
-        window.actualVertical -= 1;
-        window.childrenBetweenUp = false;
-      }
       focusNextCarousel(movement);
       // Check if there are any open dialogs
       closeCarousel();
@@ -87,10 +83,6 @@ const carouselGridMovement = (movement = 'down | up | left | right') => {
         // Try getting previous or next row
         // Getting quanity of childs on previous or next row
         if (movement === 'right') {
-          if (window.childrenBetweenRight) {
-            window.actualVertical += 1;
-            window.childrenBetweenRight = false;
-          }
           if (focusNextCarousel(movement)) {
             // Check if there are any open dialogs
             closeDialogs();