From 56c3d2872f318ba4f36bf4a7991b8dedd430db03 Mon Sep 17 00:00:00 2001
From: Vadim <korobeinikovv@mail.ru>
Date: Sat, 23 Jan 2021 17:02:57 +0300
Subject: [PATCH] Remove slides

---
 src/Carousel/Carousel.svelte                 | 35 +++++---------------
 src/Carousel/CarouselView.svelte             |  8 +----
 src/Carousel/CarouselViewCustomArrows.svelte |  8 +----
 src/Carousel/CarouselViewCustomDots.svelte   |  8 +----
 src/store.js                                 |  2 +-
 src/utils/{page-index.js => page.js}         |  0
 src/utils/size.js                            | 33 ------------------
 7 files changed, 13 insertions(+), 81 deletions(-)
 rename src/utils/{page-index.js => page.js} (100%)
 delete mode 100644 src/utils/size.js

diff --git a/src/Carousel/Carousel.svelte b/src/Carousel/Carousel.svelte
index a3979c0..516f248 100644
--- a/src/Carousel/Carousel.svelte
+++ b/src/Carousel/Carousel.svelte
@@ -2,13 +2,6 @@
   // TODO: rename image carousel to just carousel
   import { onDestroy, onMount } from 'svelte'
   import { store } from '../store'
-  import {
-    getPageIndex,
-    getPagesCount,
-    getSlidesToShowTail,
-    getSlideSize,
-    getIsNotCompletePage
-  } from '../utils/size'
   import Dots from '../Dots/Dots.svelte'
   import Arrow from '../Arrow/Arrow.svelte'
   import { NEXT, PREV } from '../direction'
@@ -33,11 +26,6 @@
    */
   export let infinite = true
 
-  /**
-   * Number of slides to show at a time
-   */
-  export let slidesToShow = 1
-
   /**
    * Page to start on
    */
@@ -50,7 +38,7 @@
   let _speed = speed
 
   /**
-   * Enables auto play of slides
+   * Enables auto play of pages
    */
   export let autoplay = false
 
@@ -82,20 +70,15 @@
     currentPageIndex = value.currentPageIndex
   })
 
-  function applySlideSizes() {
+  function applyPageSizes() {
     const children = pagesElement ? pagesElement.children : []
     pageWidth = pageWindowElement.clientWidth
 
-    const slidesCount = children.length
-    pagesCount = getPagesCount({ slidesCount, slidesToShow })
-    const slidesToShowTail = getSlidesToShowTail({ pagesCount, slidesToShow, slidesCount })
+    pagesCount = children.length
 
-    for (let slideIndex=0; slideIndex<slidesCount; slideIndex++) {
-      const pageIndex = getPageIndex({ slideIndex, slidesToShow })
-      const isNotCompletePage = getIsNotCompletePage({ pageIndex, pagesCount })
-      const slideSizePx = getSlideSize({ isNotCompletePage, pageWidth, slidesToShow, slidesToShowTail })
-      children[slideIndex].style.minWidth = `${slideSizePx}px`
-      children[slideIndex].style.maxWidth = `${slideSizePx}px`
+    for (let pageIndex=0; pageIndex<pagesCount; pageIndex++) {
+      children[pageIndex].style.minWidth = `${pageWidth}px`
+      children[pageIndex].style.maxWidth = `${pageWidth}px`
     }
   }
 
@@ -122,15 +105,15 @@
 
   onMount(() => {
     infinite && addClones()
-    applySlideSizes()
+    applyPageSizes()
     store.init(initialPageIndex + Number(infinite))
     offsetPage(false)
 
     const { teardownAutoplay } = applyAutoplay()
 
-    addResizeEventListener(applySlideSizes)
+    addResizeEventListener(applyPageSizes)
     return () => {
-      removeResizeEventListener(applySlideSizes)
+      removeResizeEventListener(applyPageSizes)
       teardownAutoplay()
     }
   })
diff --git a/src/Carousel/CarouselView.svelte b/src/Carousel/CarouselView.svelte
index 27ed58c..18262e2 100644
--- a/src/Carousel/CarouselView.svelte
+++ b/src/Carousel/CarouselView.svelte
@@ -12,11 +12,6 @@
    */
   export let infinite = true;
 
-  /**
-   * Number of slides to show at a time
-   */
-  export let slidesToShow = 1;
-
   /**
    * Page to start on
    */
@@ -28,7 +23,7 @@
   export let speed = 500
 
   /**
-   * Enables auto play of slides
+   * Enables auto play of pages
    */
   export let autoplay = false
 
@@ -65,7 +60,6 @@
   <Carousel
     {arrows}
     {infinite}
-    {slidesToShow}
     {initialPageIndex}
     {speed}
     {autoplay}
diff --git a/src/Carousel/CarouselViewCustomArrows.svelte b/src/Carousel/CarouselViewCustomArrows.svelte
index 715bc52..a447e6b 100644
--- a/src/Carousel/CarouselViewCustomArrows.svelte
+++ b/src/Carousel/CarouselViewCustomArrows.svelte
@@ -12,11 +12,6 @@
    */
   export let infinite = true;
 
-  /**
-   * Number of slides to show at a time
-   */
-  export let slidesToShow = 1;
-
   /**
    * Page to start on
    */
@@ -28,7 +23,7 @@
   export let speed = 500
 
   /**
-   * Enables auto play of slides
+   * Enables auto play of pages
    */
   export let autoplay = false
 
@@ -65,7 +60,6 @@
   <Carousel
     {arrows}
     {infinite}
-    {slidesToShow}
     {initialPageIndex}
     {speed}
     {autoplay}
diff --git a/src/Carousel/CarouselViewCustomDots.svelte b/src/Carousel/CarouselViewCustomDots.svelte
index 8a951a9..2bab168 100644
--- a/src/Carousel/CarouselViewCustomDots.svelte
+++ b/src/Carousel/CarouselViewCustomDots.svelte
@@ -12,11 +12,6 @@
    */
   export let infinite = true;
 
-  /**
-   * Number of slides to show at a time
-   */
-  export let slidesToShow = 1;
-
   /**
    * Page to start on
    */
@@ -28,7 +23,7 @@
   export let speed = 500
 
   /**
-   * Enables auto play of slides
+   * Enables auto play of pages
    */
   export let autoplay = false
 
@@ -69,7 +64,6 @@
   <Carousel
     {arrows}
     {infinite}
-    {slidesToShow}
     {initialPageIndex}
     {speed}
     {autoplay}
diff --git a/src/store.js b/src/store.js
index dc45f57..92106a9 100644
--- a/src/store.js
+++ b/src/store.js
@@ -1,5 +1,5 @@
 import { writable } from 'svelte/store';
-import { getNextPageIndexFn, getPrevPageIndexFn } from './utils/page-index'
+import { getNextPageIndexFn, getPrevPageIndexFn } from './utils/page'
 
 const initState = {
   currentPageIndex: 0,
diff --git a/src/utils/page-index.js b/src/utils/page.js
similarity index 100%
rename from src/utils/page-index.js
rename to src/utils/page.js
diff --git a/src/utils/size.js b/src/utils/size.js
deleted file mode 100644
index 3215e70..0000000
--- a/src/utils/size.js
+++ /dev/null
@@ -1,33 +0,0 @@
-export function getPagesCount({ slidesCount, slidesToShow }) {
-  return Math.ceil(slidesCount/slidesToShow)
-}
-
-export function getSlidesToShowTail({
-  slidesToShow,
-  slidesCount,
-  pagesCount
-}) {
-  return slidesCount - slidesToShow * (pagesCount - 1)
-}
-
-export function getIsNotCompletePage({
-  pageIndex,
-  pagesCount,
-}) {
-  return pageIndex === pagesCount - 1 && pagesCount !== 1
-}
-
-export function getSlideSize({
-  pageWidth,
-  slidesToShow,
-  slidesToShowTail,
-  isNotCompletePage
-}) {
-  return isNotCompletePage
-    ? Math.round(pageWidth/slidesToShowTail) 
-    : Math.round(pageWidth/slidesToShow)
-}
-
-export function getPageIndex({ slideIndex, slidesToShow }) {
-  return Math.floor(slideIndex/slidesToShow)
-}