From 3acceff7c35587cd5921c607f5b27277e261533a Mon Sep 17 00:00:00 2001
From: Vadim <korobeinikovv@mail.ru>
Date: Sun, 24 Jan 2021 22:15:19 +0300
Subject: [PATCH] Fix shared store

---
 src/components/Carousel/Carousel.svelte     | 17 ++++++-------
 src/components/Carousel/CarouselView.svelte | 27 +++++++++++++++++++++
 src/store.js                                |  2 +-
 3 files changed, 35 insertions(+), 11 deletions(-)

diff --git a/src/components/Carousel/Carousel.svelte b/src/components/Carousel/Carousel.svelte
index 026f255..d99220f 100644
--- a/src/components/Carousel/Carousel.svelte
+++ b/src/components/Carousel/Carousel.svelte
@@ -1,6 +1,6 @@
 <script>
-  import { onDestroy, onMount, tick } from 'svelte'
-  import { store } from '../../store'
+  import { onMount, tick } from 'svelte'
+  import { createStore } from '../../store'
   import Dots from '../Dots/Dots.svelte'
   import Arrow from '../Arrow/Arrow.svelte'
   import { NEXT, PREV } from '../../direction'
@@ -56,6 +56,7 @@
    */
   export let dots = true
 
+  let store = createStore()
   let currentPageIndex = 0
   $: originalCurrentPageIndex = currentPageIndex - Number(infinite);
   let pagesCount = 0
@@ -65,10 +66,6 @@
   let pageWindowElement
   let pagesElement
 
-  const unsubscribe = store.subscribe(value => {
-    currentPageIndex = value.currentPageIndex
-  })
-
   function applyPageSizes() {
     const children = pagesElement.children
     pageWidth = pageWindowElement.clientWidth
@@ -107,6 +104,9 @@
 
   onMount(async () => {
     await tick()
+    const unsubscribe = store.subscribe(value => {
+      currentPageIndex = value.currentPageIndex
+    })
     if (pagesElement && pageWindowElement) {
       infinite && addClones()
       applyPageSizes()
@@ -118,13 +118,10 @@
     return () => {
       removeResizeEventListener(applyPageSizes)
       teardownAutoplay()
+      unsubscribe()
     }
   })
 
-  onDestroy(() => {
-    unsubscribe()
-  })
-
   function handlePageChange(event) {
     showPage(event.detail + Number(infinite), { offsetDelay: 0, animated: true })
   }
diff --git a/src/components/Carousel/CarouselView.svelte b/src/components/Carousel/CarouselView.svelte
index f97995d..aef4239 100644
--- a/src/components/Carousel/CarouselView.svelte
+++ b/src/components/Carousel/CarouselView.svelte
@@ -54,6 +54,12 @@
     { color: '#19c97d', text: '8' },
     { color: '#00c36f', text: '9' }
   ]
+
+  const colors2 = [
+    { color: '#e5f9f0', text: '0' },
+    { color: '#ccf3e2', text: '1' },
+    { color: '#b2edd3', text: '2' }
+  ]
 </script>
 
 <div class="main-container">
@@ -76,11 +82,32 @@
       </div>
     {/each}
   </Carousel>
+
+  <Carousel
+    {arrows}
+    {infinite}
+    {initialPageIndex}
+    {speed}
+    {autoplay}
+    {autoplaySpeed}
+    {autoplayDirection}
+    {dots}
+  >
+    {#each colors2 as { color, text } (color)}
+      <div
+        class="color-container"
+        style="background-color: {color};"
+      >
+        <p>{text}</p>
+      </div>
+    {/each}
+  </Carousel>
 </div>
 
 <style>
   .main-container {
     display: flex;
+    flex-direction: column;
     width: 100%;
   }
   .color-container {
diff --git a/src/store.js b/src/store.js
index 92106a9..b6982c1 100644
--- a/src/store.js
+++ b/src/store.js
@@ -61,4 +61,4 @@ function createStore() {
   };
 }
 
-export const store = createStore();
+export { createStore };