From 0ebf7d9a0373dac9f4db2adf2437a1959e74750d Mon Sep 17 00:00:00 2001
From: cadiyak <cadiyak@hotmail.fr>
Date: Sat, 27 Aug 2022 15:41:36 +0200
Subject: [PATCH 1/6] feat: start to implement carousel.

---
 .../CarouselAutomaticSlideExample.vue         |  8 ++
 .../examples/CarouselDefaultExample.vue       |  8 ++
 .../examples/CarouselNoControlsExample.vue    |  8 ++
 .../examples/CarouselNoIndicatorsExample.vue  |  8 ++
 .../examples/CarouselPicturesExample.vue      | 30 ++++++
 .../examples/CarouselSlideExample.vue         |  8 ++
 .../examples/CarouselSlideIntervalExample.vue |  8 ++
 src/components/Carousel/Carousel.vue          | 94 ++++++++++++++-----
 8 files changed, 149 insertions(+), 23 deletions(-)
 create mode 100644 docs/components/carousel/examples/CarouselAutomaticSlideExample.vue
 create mode 100644 docs/components/carousel/examples/CarouselDefaultExample.vue
 create mode 100644 docs/components/carousel/examples/CarouselNoControlsExample.vue
 create mode 100644 docs/components/carousel/examples/CarouselNoIndicatorsExample.vue
 create mode 100644 docs/components/carousel/examples/CarouselPicturesExample.vue
 create mode 100644 docs/components/carousel/examples/CarouselSlideExample.vue
 create mode 100644 docs/components/carousel/examples/CarouselSlideIntervalExample.vue

diff --git a/docs/components/carousel/examples/CarouselAutomaticSlideExample.vue b/docs/components/carousel/examples/CarouselAutomaticSlideExample.vue
new file mode 100644
index 0000000..408e9ad
--- /dev/null
+++ b/docs/components/carousel/examples/CarouselAutomaticSlideExample.vue
@@ -0,0 +1,8 @@
+<template>
+  <div class="vp-raw flex flex-col">
+    <Carousel :slide="true"></Carousel>
+  </div>
+</template>
+<script setup>
+import { Carousel } from '../../../../src/index'
+</script>
diff --git a/docs/components/carousel/examples/CarouselDefaultExample.vue b/docs/components/carousel/examples/CarouselDefaultExample.vue
new file mode 100644
index 0000000..8cab2e4
--- /dev/null
+++ b/docs/components/carousel/examples/CarouselDefaultExample.vue
@@ -0,0 +1,8 @@
+<template>
+  <div class="vp-raw flex flex-col">
+    <Carousel></Carousel>
+  </div>
+</template>
+<script setup>
+import { Carousel } from '../../../../src/index'
+</script>
diff --git a/docs/components/carousel/examples/CarouselNoControlsExample.vue b/docs/components/carousel/examples/CarouselNoControlsExample.vue
new file mode 100644
index 0000000..b3c747d
--- /dev/null
+++ b/docs/components/carousel/examples/CarouselNoControlsExample.vue
@@ -0,0 +1,8 @@
+<template>
+  <div class="vp-raw flex flex-col">
+    <Carousel :controls="false"></Carousel>
+  </div>
+</template>
+<script setup>
+import { Carousel } from '../../../../src/index'
+</script>
diff --git a/docs/components/carousel/examples/CarouselNoIndicatorsExample.vue b/docs/components/carousel/examples/CarouselNoIndicatorsExample.vue
new file mode 100644
index 0000000..b5b62f8
--- /dev/null
+++ b/docs/components/carousel/examples/CarouselNoIndicatorsExample.vue
@@ -0,0 +1,8 @@
+<template>
+  <div class="vp-raw flex flex-col">
+    <Carousel :indicators="false"></Carousel>
+  </div>
+</template>
+<script setup>
+import { Carousel } from '../../../../src/index'
+</script>
diff --git a/docs/components/carousel/examples/CarouselPicturesExample.vue b/docs/components/carousel/examples/CarouselPicturesExample.vue
new file mode 100644
index 0000000..cf2dfac
--- /dev/null
+++ b/docs/components/carousel/examples/CarouselPicturesExample.vue
@@ -0,0 +1,30 @@
+<template>
+  <div class="vp-raw flex flex-col">
+    <Carousel :pictures="pictures"></Carousel>
+  </div>
+</template>
+<script setup>
+import { Carousel } from '../../../../src/index'
+const pictures = [
+  {
+    'src': 'https://i.picsum.photos/id/221/1920/1080.jpg?grayscale&hmac=GWPBzHGEhEh-BrPn1i-PuximCxLtUpKHcNwyACiTRHk',
+    'alt': 'Picture 1',
+  },
+  {
+    'src': 'https://i.picsum.photos/id/608/1920/1080.jpg?grayscale&hmac=kkVc8-M3ovbO-sFr02WmRbrHx5YcfWmOtkP8rNF9fO4',
+    'alt': 'Picture 2',
+  },
+  {
+    'src': 'https://i.picsum.photos/id/1012/1920/1080.jpg?grayscale&hmac=Zy9JmZ_sl88DXTF502k_0QqaeCyqjhkn60DjyE5F8Eo',
+    'alt': 'Picture 3',
+  },
+  {
+    'src': 'https://i.picsum.photos/id/1004/1920/1080.jpg?grayscale&hmac=48C-T9K-36l8jpzJntPTu40OiDuXflIlG_YB-lQWYZI',
+    'alt': 'Picture 4',
+  },
+  {
+    'src': 'https://i.picsum.photos/id/244/1920/1080.jpg?grayscale&hmac=lLcfHciI-EqaOIHGB_Gab7OpUjVSmDLw6GOq6B5THak',
+    'alt': 'Picture 5',
+ },
+]
+</script>
diff --git a/docs/components/carousel/examples/CarouselSlideExample.vue b/docs/components/carousel/examples/CarouselSlideExample.vue
new file mode 100644
index 0000000..408e9ad
--- /dev/null
+++ b/docs/components/carousel/examples/CarouselSlideExample.vue
@@ -0,0 +1,8 @@
+<template>
+  <div class="vp-raw flex flex-col">
+    <Carousel :slide="true"></Carousel>
+  </div>
+</template>
+<script setup>
+import { Carousel } from '../../../../src/index'
+</script>
diff --git a/docs/components/carousel/examples/CarouselSlideIntervalExample.vue b/docs/components/carousel/examples/CarouselSlideIntervalExample.vue
new file mode 100644
index 0000000..7988190
--- /dev/null
+++ b/docs/components/carousel/examples/CarouselSlideIntervalExample.vue
@@ -0,0 +1,8 @@
+<template>
+  <div class="vp-raw flex flex-col">
+    <Carousel :slide="true" :slide-interval="1000"></Carousel>
+  </div>
+</template>
+<script setup>
+import { Carousel } from '../../../../src/index'
+</script>
diff --git a/src/components/Carousel/Carousel.vue b/src/components/Carousel/Carousel.vue
index 52e4588..7045730 100644
--- a/src/components/Carousel/Carousel.vue
+++ b/src/components/Carousel/Carousel.vue
@@ -1,35 +1,26 @@
 <template>
-  <div id="default-carousel" class="relative" data-carousel="static">
+  <div id="default-carousel" class="relative">
     <!-- Carousel wrapper -->
     <div class="overflow-hidden relative h-56 rounded-lg sm:h-64 xl:h-80 2xl:h-96">
       <!-- Item 1 -->
-      <div class="hidden duration-700 ease-in-out" data-carousel-item>
-        <span class="absolute top-1/2 left-1/2 text-2xl font-semibold text-white -translate-x-1/2 -translate-y-1/2 sm:text-3xl dark:text-gray-800">First Slide</span>
-<!--        <img src="/docs/images/carousel/carousel-1.svg" class="block absolute top-1/2 left-1/2 w-full -translate-x-1/2 -translate-y-1/2" alt="...">-->
-      </div>
-      <!-- Item 2 -->
-      <div class="hidden duration-700 ease-in-out" data-carousel-item>
-<!--        <img src="/docs/images/carousel/carousel-2.svg" class="block absolute top-1/2 left-1/2 w-full -translate-x-1/2 -translate-y-1/2" alt="...">-->
-      </div>
-      <!-- Item 3 -->
-      <div class="hidden duration-700 ease-in-out" data-carousel-item>
-<!--        <img src="/docs/images/carousel/carousel-3.svg" class="block absolute top-1/2 left-1/2 w-full -translate-x-1/2 -translate-y-1/2" alt="...">-->
+<!--      duration-700 ease-in-out-->
+      <div :class="index === currentPicture ? 'z-30' : 'z-0'"
+           v-for="(picture, index) in pictures" :key="picture" class="absolute inset-0 -translate-y-0">
+        <img :src="picture.src" class="block absolute top-1/2 left-1/2 w-full -translate-x-1/2 -translate-y-1/2" :alt="picture.alt">
       </div>
     </div>
     <!-- Slider indicators -->
-    <div class="flex absolute bottom-5 left-1/2 z-30 space-x-3 -translate-x-1/2">
-      <button type="button" class="w-3 h-3 rounded-full" aria-current="false" aria-label="Slide 1" data-carousel-slide-to="0"></button>
-      <button type="button" class="w-3 h-3 rounded-full" aria-current="false" aria-label="Slide 2" data-carousel-slide-to="1"></button>
-      <button type="button" class="w-3 h-3 rounded-full" aria-current="false" aria-label="Slide 3" data-carousel-slide-to="2"></button>
+    <div v-if="indicators" class="flex absolute bottom-5 left-1/2 z-30 space-x-3 -translate-x-1/2">
+      <button v-for="(picture, index) in pictures" :key="picture" type="button" :class="index === currentPicture ? 'bg-white' : 'bg-white/50'" class="w-3 h-3 rounded-full bg-white" aria-current="false" :aria-label="'Slide ' + index" @click.prevent="slideTo(index)"></button>
     </div>
     <!-- Slider controls -->
-    <button type="button" class="flex absolute top-0 left-0 z-30 justify-center items-center px-4 h-full cursor-pointer group focus:outline-none" data-carousel-prev>
+    <button v-if="controls" @click.prevent="previousPicture" type="button" class="flex absolute top-0 left-0 z-30 justify-center items-center px-4 h-full cursor-pointer group focus:outline-none" data-carousel-prev>
       <span class="inline-flex justify-center items-center w-8 h-8 rounded-full sm:w-10 sm:h-10 bg-white/30 dark:bg-gray-800/30 group-hover:bg-white/50 dark:group-hover:bg-gray-800/60 group-focus:ring-4 group-focus:ring-white dark:group-focus:ring-gray-800/70 group-focus:outline-none">
         <svg class="w-5 h-5 text-white sm:w-6 sm:h-6 dark:text-gray-800" fill="none" stroke="currentColor" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M15 19l-7-7 7-7"></path></svg>
         <span class="hidden">Previous</span>
       </span>
     </button>
-    <button type="button" class="flex absolute top-0 right-0 z-30 justify-center items-center px-4 h-full cursor-pointer group focus:outline-none" data-carousel-next>
+    <button v-if="controls" @click.prevent="nextPicture" type="button" class="flex absolute top-0 right-0 z-30 justify-center items-center px-4 h-full cursor-pointer group focus:outline-none" data-carousel-next>
       <span class="inline-flex justify-center items-center w-8 h-8 rounded-full sm:w-10 sm:h-10 bg-white/30 dark:bg-gray-800/30 group-hover:bg-white/50 dark:group-hover:bg-gray-800/60 group-focus:ring-4 group-focus:ring-white dark:group-focus:ring-gray-800/70 group-focus:outline-none">
         <svg class="w-5 h-5 text-white sm:w-6 sm:h-6 dark:text-gray-800" fill="none" stroke="currentColor" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M9 5l7 7-7 7"></path></svg>
         <span class="hidden">Next</span>
@@ -38,28 +29,85 @@
   </div>
 </template>
 <script lang="ts" setup>
-import { computed, toRefs } from 'vue'
-import type { PropType } from 'vue'
+import { onMounted, ref } from 'vue'
 
 const props = defineProps({
-  children: {
+  pictures: {
     type: Array,
     default() {
-      return []
+      return [
+        {
+          'src': 'https://flowbite.com/docs/images/carousel/carousel-1.svg',
+          'alt': 'Picture 1',
+        },
+        {
+          'src': 'https://flowbite.com/docs/images/carousel/carousel-2.svg',
+          'alt': 'Picture 2',
+        },
+        {
+          'src': 'https://flowbite.com/docs/images/carousel/carousel-3.svg',
+          'alt': 'Picture 3',
+        },
+      ]
     },
   },
   indicators: {
     type: Boolean,
     default: true,
   },
-  slide: {
+  controls: {
     type: Boolean,
     default: true,
   },
+  slide: {
+    type: Boolean,
+    default: false,
+  },
   slideInterval: {
     type: Number,
     default: 3000,
   },
+  animation: {
+    type: Boolean,
+    default: false,
+  },
+})
+
+const currentPicture = ref(0)
+const direction = ref('')
+
+const automaticSlide = () => {
+    setInterval(function() {
+      nextPicture()
+    }, props.slideInterval)
+}
+
+const slideTo = (index: number) => {
+  currentPicture.value = index
+}
+
+const nextPicture = () => {
+  if (currentPicture.value !== props.pictures.length - 1) {
+    currentPicture.value ++
+  } else {
+    currentPicture.value = 0
+  }
+  direction.value = 'right'
+}
+
+const previousPicture = () => {
+  if (currentPicture.value !== 0) {
+    currentPicture.value --
+  } else {
+    currentPicture.value = props.pictures.length -1
+  }
+  direction.value = 'left'
+}
+
+onMounted(() => {
+  if (props.slide) {
+    automaticSlide()
+  }
 })
 
 </script>

From 62edbd74ff1a1f0ee7695b73fe1c21ba5310ac1f Mon Sep 17 00:00:00 2001
From: cadiyak <cadiyak@hotmail.fr>
Date: Sat, 27 Aug 2022 15:42:09 +0200
Subject: [PATCH 2/6] doc: update carousel's doc.

---
 docs/components/carousel/carousel.md | 158 ++++++++++++++++++++++++++-
 1 file changed, 156 insertions(+), 2 deletions(-)

diff --git a/docs/components/carousel/carousel.md b/docs/components/carousel/carousel.md
index 5e41553..75dcd56 100644
--- a/docs/components/carousel/carousel.md
+++ b/docs/components/carousel/carousel.md
@@ -1,8 +1,17 @@
 <script setup>
-import CarouselExample from './examples/CarouselExample.vue'
+import CarouselDefaultExample from './examples/CarouselDefaultExample.vue';
+import CarouselNoControlsExample from './examples/CarouselNoControlsExample.vue';
+import CarouselNoIndicatorsExample from './examples/CarouselNoIndicatorsExample.vue';
+import CarouselSlideExample from './examples/CarouselSlideExample.vue';
+import CarouselSlideIntervalExample from './examples/CarouselSlideIntervalExample.vue';
+import CarouselPicturesExample from './examples/CarouselPicturesExample.vue';
 </script>
 # Carousel
 
+Use the carousel component to slide through multiple elements and images using custom controls, indicators, intervals, and options
+
+## Default slider
+
 ```vue
 <script setup>
 import { Carousel } from 'flowbite-vue'
@@ -12,4 +21,149 @@ import { Carousel } from 'flowbite-vue'
 </template>
 ```
 
-<CarouselExample />
+<CarouselDefaultExample />
+
+## Prop - controls
+
+```typescript
+const props = defineProps({
+    controls: {
+    type: Boolean,
+    default: true,
+    },
+})
+```
+
+<CarouselNoControlsExample />
+
+```vue
+<script setup>
+import { Carousel } from 'flowbite-vue'
+</script>
+<template>
+  <Carousel :controls="false"></Carousel>
+</template>
+```
+## Prop - indicators
+
+```typescript
+const props = defineProps({
+    indicators: {
+        type: Boolean,
+        default: true,
+    },
+})
+```
+
+<CarouselNoIndicatorsExample />
+
+```vue
+<script setup>
+import { Carousel } from 'flowbite-vue'
+</script>
+<template>
+  <Carousel :indicators="false"></Carousel>
+</template>
+```
+
+## Prop - slide
+
+```typescript
+const props = defineProps({
+    slide: {
+        type: Boolean,
+        default: false,
+    },
+})
+```
+
+<CarouselSlideExample />
+
+```vue
+<script setup>
+import { Carousel } from 'flowbite-vue'
+</script>
+<template>
+  <Carousel :slide="true"></Carousel>
+</template>
+```
+
+## Prop - slide interval
+
+```typescript
+const props = defineProps({
+    slideInterval: {
+        type: Number,
+        default: 3000,
+    },
+})
+```
+
+<CarouselSlideIntervalExample />
+
+```vue
+<script setup>
+import { Carousel } from 'flowbite-vue'
+</script>
+<template>
+  <Carousel :slide="true" :slide-interval="1000"></Carousel>
+</template>
+```
+
+## Prop - pictures
+
+```typescript
+const props = defineProps({
+    pictures: {
+        type: Array,
+        default() {
+            return [
+                {
+                    'src': 'https://flowbite.com/docs/images/carousel/carousel-1.svg',
+                    'alt': 'Picture 1',
+                },
+                {
+                    'src': 'https://flowbite.com/docs/images/carousel/carousel-2.svg',
+                    'alt': 'Picture 2',
+                },
+                {
+                    'src': 'https://flowbite.com/docs/images/carousel/carousel-3.svg',
+                    'alt': 'Picture 3',
+                },
+            ]
+        },
+    },
+})
+```
+
+<CarouselPicturesExample />
+
+```vue
+<script setup>
+import { Carousel } from 'flowbite-vue'
+const pictures = [
+  {
+    'src': 'https://i.picsum.photos/id/221/1920/1080.jpg?grayscale&hmac=GWPBzHGEhEh-BrPn1i-PuximCxLtUpKHcNwyACiTRHk',
+    'alt': 'Picture 1',
+  },
+  {
+    'src': 'https://i.picsum.photos/id/608/1920/1080.jpg?grayscale&hmac=kkVc8-M3ovbO-sFr02WmRbrHx5YcfWmOtkP8rNF9fO4',
+    'alt': 'Picture 2',
+  },
+  {
+    'src': 'https://i.picsum.photos/id/1012/1920/1080.jpg?grayscale&hmac=Zy9JmZ_sl88DXTF502k_0QqaeCyqjhkn60DjyE5F8Eo',
+    'alt': 'Picture 3',
+  },
+  {
+    'src': 'https://i.picsum.photos/id/1004/1920/1080.jpg?grayscale&hmac=48C-T9K-36l8jpzJntPTu40OiDuXflIlG_YB-lQWYZI',
+    'alt': 'Picture 4',
+  },
+  {
+    'src': 'https://i.picsum.photos/id/244/1920/1080.jpg?grayscale&hmac=lLcfHciI-EqaOIHGB_Gab7OpUjVSmDLw6GOq6B5THak',
+    'alt': 'Picture 5',
+  },]
+</script>
+<template>
+  <Carousel :pictures="pictures"></Carousel>
+</template>
+```
\ No newline at end of file

From 568641fb43b8a4d2c17da4ceb7534e5a598f9b3d Mon Sep 17 00:00:00 2001
From: cadiyak <cadiyak@hotmail.fr>
Date: Sat, 27 Aug 2022 16:43:53 +0200
Subject: [PATCH 3/6] feat: reset carousel slide timeout when controls or
 indicators clicked

---
 src/components/Carousel/Carousel.vue | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/components/Carousel/Carousel.vue b/src/components/Carousel/Carousel.vue
index 7045730..1da32dd 100644
--- a/src/components/Carousel/Carousel.vue
+++ b/src/components/Carousel/Carousel.vue
@@ -75,15 +75,22 @@ const props = defineProps({
 
 const currentPicture = ref(0)
 const direction = ref('')
+const interval = ref()
 
 const automaticSlide = () => {
-    setInterval(function() {
+    interval.value = setInterval(function() {
       nextPicture()
     }, props.slideInterval)
 }
 
+const resetInterval = () => {
+  clearInterval(interval.value)
+  automaticSlide()
+}
+
 const slideTo = (index: number) => {
   currentPicture.value = index
+  resetInterval()
 }
 
 const nextPicture = () => {
@@ -93,6 +100,7 @@ const nextPicture = () => {
     currentPicture.value = 0
   }
   direction.value = 'right'
+  resetInterval()
 }
 
 const previousPicture = () => {
@@ -102,6 +110,7 @@ const previousPicture = () => {
     currentPicture.value = props.pictures.length -1
   }
   direction.value = 'left'
+  resetInterval()
 }
 
 onMounted(() => {

From d5baf27eda2df50d9fecf5ab7d905e1d228e9743 Mon Sep 17 00:00:00 2001
From: Ilya Artamonov <hire@ilya-artamonov.ru>
Date: Tue, 13 Dec 2022 14:38:35 +0300
Subject: [PATCH 4/6] chore: Moved carousel link in sidebar and updated
 README.md

---
 README.md                 | 4 ++--
 docs/.vitepress/config.ts | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 6e92341..bad0bc3 100644
--- a/README.md
+++ b/README.md
@@ -238,7 +238,7 @@ module.exports = {
   </tr>
   <tr>
     <td width="33.3333%">:construction: Footer</td>
-    <td width="33.3333%">:construction: Accordion</td>
+    <td width="33.3333%">Accordion</td>
     <td width="33.3333%">:construction: Sidebar</td>
   </tr>
   <tr>
@@ -259,7 +259,7 @@ module.exports = {
     </td>
   </tr>
   <tr>
-    <td width="33.3333%">:construction: Carousel</td>
+    <td width="33.3333%">Carousel</td>
     <td width="33.3333%">Avatar</td>
     <td width="33.3333%">:construction: Rating</td>
   </tr>
diff --git a/docs/.vitepress/config.ts b/docs/.vitepress/config.ts
index 0dbea64..1533c89 100644
--- a/docs/.vitepress/config.ts
+++ b/docs/.vitepress/config.ts
@@ -42,6 +42,7 @@ function getComponents() {
     { text: 'Badge', link: 'components/badge/badge.md' },
     { text: 'Button Group', link: '/components/buttonGroup/buttonGroup.md' },
     { text: 'Card', link: 'components/card/card.md' },
+    { text: 'Carousel', link: 'components/carousel/carousel.md' },
     { text: 'Dropdown', link: '/components/dropdown/dropdown.md' },
     { text: 'Progress', link: 'components/progress/progress.md' },
     { text: 'Spinner', link: '/components/spinner/spinner.md' },
@@ -52,7 +53,6 @@ function getComponents() {
     { text: 'Modal', link: 'components/modal/modal.md' },
     { text: 'Navbar', link: 'components/navbar/navbar.md' },
 
-    { text: '- Carousel', link: 'components/carousel/carousel.md' },
     { text: '- Footer', link: 'components/footer/footer.md' },
     { text: '- Pagination', link: 'components/pagination/pagination.md' },
     { text: '- Rating', link: 'components/rating/rating.md' },

From 552c460efaab929e3279fa2673a0f98236b277f3 Mon Sep 17 00:00:00 2001
From: victor <viktor.generalov@nlogic.ai>
Date: Tue, 13 Dec 2022 18:20:44 +0400
Subject: [PATCH 5/6] fix: fixed accordion

---
 src/components/Accordion/Accordion.vue        |  6 +-
 src/components/Accordion/AccordionContent.vue | 23 ++++++--
 src/components/Accordion/AccordionHeader.vue  | 55 +++++++++++--------
 src/components/Accordion/AccordionPanel.vue   | 24 ++++----
 .../composables/useAccordionContentClasses.ts | 34 +++++-------
 .../composables/useAccordionHeaderClasses.ts  | 43 +++++++--------
 6 files changed, 103 insertions(+), 82 deletions(-)

diff --git a/src/components/Accordion/Accordion.vue b/src/components/Accordion/Accordion.vue
index cdf0f17..9cbff4d 100644
--- a/src/components/Accordion/Accordion.vue
+++ b/src/components/Accordion/Accordion.vue
@@ -1,10 +1,9 @@
 <template>
-  <div class="vp-raw">
-    <slot :accordionId="accordionId"/>
+  <div class="vp-raw" :data-accordion-id="accordionId">
+    <slot />
   </div>
 </template>
 <script lang="ts" setup>
-import { provide } from 'vue'
 import { nanoid } from 'nanoid'
 import { useAccordionState } from '@/components/Accordion/composables/useAccordionState'
 
@@ -20,6 +19,5 @@ const props = defineProps({
 })
 
 const accordionId = nanoid()
-provide('accordionId', accordionId)
 useAccordionState(accordionId, { ...props })
 </script>
diff --git a/src/components/Accordion/AccordionContent.vue b/src/components/Accordion/AccordionContent.vue
index b55e754..25e9274 100644
--- a/src/components/Accordion/AccordionContent.vue
+++ b/src/components/Accordion/AccordionContent.vue
@@ -1,13 +1,26 @@
 <template>
-  <div
-    :class="contentClasses"
-  >
-    <slot />
+  <div ref="content">
+    <div
+        v-if="isLoaded"
+        :class="contentClasses"
+    >
+      <slot />
+    </div>
   </div>
 </template>
 
 <script lang="ts" setup>
 import { useAccordionContentClasses } from '@/components/Accordion/composables/useAccordionContentClasses'
+import { onMounted, ref } from 'vue'
 
-const { contentClasses } = useAccordionContentClasses()
+const isLoaded = ref(false)
+const content = ref()
+
+let contentClasses
+
+onMounted(() => {
+  const accordionHeaderClasses = useAccordionContentClasses(content)
+  contentClasses = accordionHeaderClasses.contentClasses
+  isLoaded.value = true
+})
 </script>
diff --git a/src/components/Accordion/AccordionHeader.vue b/src/components/Accordion/AccordionHeader.vue
index 60d4442..4b34fc6 100644
--- a/src/components/Accordion/AccordionHeader.vue
+++ b/src/components/Accordion/AccordionHeader.vue
@@ -1,40 +1,45 @@
 <template>
-  <button
-      type="button"
-      @click="toggleItem"
-      :class="headerClasses"
-  >
-    <span class="w-full"><slot /></span>
-    <svg
-        data-accordion-icon
-        :class="arrowClasses"
-        fill="currentColor"
-        viewBox="0 0 20 20"
-        xmlns="http://www.w3.org/2000/svg"
+  <div ref="header">
+    <button
+        v-if="isLoaded"
+        type="button"
+        @click="toggleItem"
+        :class="headerClasses"
     >
-      <path fill-rule="evenodd" d="M5.293 7.293a1 1 0 011.414 0L10 10.586l3.293-3.293a1 1 0 111.414 1.414l-4 4a1 1 0 01-1.414 0l-4-4a1 1 0 010-1.414z"></path>
-    </svg>
-  </button>
+      <span class="w-full"><slot /></span>
+      <svg
+          data-accordion-icon
+          :class="arrowClasses"
+          fill="currentColor"
+          viewBox="0 0 20 20"
+          xmlns="http://www.w3.org/2000/svg"
+      >
+        <path fill-rule="evenodd" d="M5.293 7.293a1 1 0 011.414 0L10 10.586l3.293-3.293a1 1 0 111.414 1.414l-4 4a1 1 0 01-1.414 0l-4-4a1 1 0 010-1.414z"></path>
+      </svg>
+    </button>
+  </div>
 </template>
 
 <script lang="ts" setup>
 import { useAccordionState } from '@/components/Accordion/composables/useAccordionState'
-import { computed, inject } from 'vue'
+import { computed, onMounted, ref } from 'vue'
 import { useAccordionHeaderClasses } from '@/components/Accordion/composables/useAccordionHeaderClasses'
 
-const accordionId: string = inject('accordionId') ?? ''
-const panelId: string = inject('panelId') ?? ''
+const isLoaded = ref(false)
+const header = ref()
+const accordionId = computed(() => header.value.parentElement.parentElement.dataset.accordionId)
+const panelId = computed(() => header.value.parentElement.dataset.panelId)
 
 const { accordionsStates } = useAccordionState()
-const accordionState = computed(() => accordionsStates[accordionId])
-const panelState = computed(() => accordionState.value.panels[panelId])
+const accordionState = computed(() => accordionsStates[accordionId.value])
+const panelState = computed(() => accordionState.value.panels[panelId.value])
 
-const { headerClasses, arrowClasses } = useAccordionHeaderClasses()
+let headerClasses, arrowClasses
 function commonToggleItem() {
   const isSelectedVisible = panelState.value.isVisible
   for (const panelIndex in accordionState.value.panels) {
     const panel = accordionState.value.panels[panelIndex]
-    if (panel.id !== panelId) panel.isVisible = false
+    if (panel.id !== panelId.value) panel.isVisible = false
     else panel.isVisible = !isSelectedVisible
   }
 }
@@ -46,4 +51,10 @@ function toggleItem() {
   commonToggleItem()
 }
 
+onMounted(() => {
+  const accordionHeaderClasses = useAccordionHeaderClasses(header)
+  headerClasses = accordionHeaderClasses.headerClasses
+  arrowClasses = accordionHeaderClasses.arrowClasses
+  isLoaded.value = true
+})
 </script>
diff --git a/src/components/Accordion/AccordionPanel.vue b/src/components/Accordion/AccordionPanel.vue
index 8687627..e478e95 100644
--- a/src/components/Accordion/AccordionPanel.vue
+++ b/src/components/Accordion/AccordionPanel.vue
@@ -1,26 +1,30 @@
 <template>
-  <div>
-    <slot></slot>
+  <div :data-panel-id="panelId" ref="panel">
+    <slot v-if="accordionId"></slot>
   </div>
 </template>
 
 <script lang="ts" setup>
-import { computed, inject, onBeforeMount, provide } from 'vue'
+import { computed, onMounted, ref } from 'vue'
 import { useAccordionState } from '@/components/Accordion/composables/useAccordionState'
 import { nanoid } from 'nanoid'
 
 const { accordionsStates } = useAccordionState()
 
-const panelId = nanoid()
-const accordionId: string = inject('accordionId') ?? ''
-provide('panelId', panelId)
 
-const accordionState = computed(() => {
-  return accordionsStates[accordionId]
+const panelId = nanoid()
+const panel = ref()
+const accordionId = computed(() => {
+  if (panel.value) return panel.value.parentElement.dataset.accordionId
+  return null
 })
 
-onBeforeMount(() => {
-  const panelsCount = Object.keys(accordionState.value.panels).length
+const accordionState = computed(() => {
+  return accordionsStates[accordionId.value]
+})
+
+onMounted(() => {
+  const panelsCount = Object.keys(accordionState?.value?.panels)?.length
   accordionState.value.panels[panelId] = {
     id: panelId,
     order: panelsCount,
diff --git a/src/components/Accordion/composables/useAccordionContentClasses.ts b/src/components/Accordion/composables/useAccordionContentClasses.ts
index 4ed7b56..b11a4d0 100644
--- a/src/components/Accordion/composables/useAccordionContentClasses.ts
+++ b/src/components/Accordion/composables/useAccordionContentClasses.ts
@@ -1,29 +1,25 @@
-import { computed, inject } from 'vue'
+import { computed } from 'vue'
 import { useAccordionState } from '@/components/Accordion/composables/useAccordionState'
 import classNames from 'classnames'
 
-
 const baseContentClasses = 'p-5 border border-gray-200 dark:border-gray-700 dark:bg-gray-900'
-export function useAccordionContentClasses() {
-  const accordionId: string = inject('accordionId') ?? ''
-  const panelId: string = inject('panelId') ?? ''
-
-
+export function useAccordionContentClasses(contentRef: any) {
+  const accordionId = computed(() => contentRef.value.parentElement.parentElement.dataset.accordionId)
+  const panelId = computed(() => contentRef.value.parentElement.dataset.panelId)
   const { accordionsStates } = useAccordionState()
+  const accordionState = computed(() => accordionsStates[accordionId.value])
+  const panelState = computed(() => accordionsStates[accordionId.value].panels[panelId.value])
+  const panelsCount = computed(() => Object.keys(accordionsStates[accordionId.value].panels[panelId.value]).length)
 
-  const accordionState = computed(() => accordionsStates[accordionId])
-  const panelState = computed(() => accordionsStates[accordionId].panels[panelId])
-  const panelsCount = computed(() => Object.keys(accordionsStates[accordionId].panels[panelId]).length)
-
-  const contentClasses = computed(() => classNames(baseContentClasses, {
-    hidden: !panelState.value.isVisible,
-    'border-b-0': panelState.value.order !== panelsCount.value - 1 || accordionState.value.flush,
-    'border-t-0': panelState.value.order === panelsCount.value - 1,
-    'border-x-0': accordionState.value.flush,
-  }))
+  const contentClasses = computed(() => {
+    return classNames(baseContentClasses, {
+      hidden: !panelState.value.isVisible,
+      'border-b-0': panelState.value.order !== panelsCount.value - 1 || accordionState.value.flush,
+      'border-t-0': panelState.value.order === panelsCount.value - 1,
+      'border-x-0': accordionState.value.flush,
+    })
+  })
   return {
     contentClasses,
   }
 }
-
-
diff --git a/src/components/Accordion/composables/useAccordionHeaderClasses.ts b/src/components/Accordion/composables/useAccordionHeaderClasses.ts
index 75e60f0..0fdd9dc 100644
--- a/src/components/Accordion/composables/useAccordionHeaderClasses.ts
+++ b/src/components/Accordion/composables/useAccordionHeaderClasses.ts
@@ -1,35 +1,34 @@
-import { computed, inject } from 'vue'
+import { computed } from 'vue'
 import { useAccordionState } from '@/components/Accordion/composables/useAccordionState'
 import classNames from 'classnames'
 
-
-const baseHeaderClasses = 'flex items-center p-5 w-full font-medium text-left text-gray-500 border border-gray-200 focus:ring-4 focus:ring-gray-200 dark:focus:ring-gray-800 dark:border-gray-700 dark:text-gray-400 hover:bg-gray-100 dark:hover:bg-gray-800'
+const baseHeaderClasses =
+  'flex items-center p-5 w-full font-medium text-left text-gray-500 border border-gray-200 focus:ring-4 focus:ring-gray-200 dark:focus:ring-gray-800 dark:border-gray-700 dark:text-gray-400 hover:bg-gray-100 dark:hover:bg-gray-800'
 const baseArrowClasses = 'w-6 h-6 shrink-0'
-export function useAccordionHeaderClasses() {
-  const accordionId: string = inject('accordionId') ?? ''
-  const panelId: string = inject('panelId') ?? ''
-
+export function useAccordionHeaderClasses(headerRef: any) {
+  const accordionId = computed(() => headerRef.value.parentElement.parentElement.dataset.accordionId)
+  const panelId = computed(() => headerRef.value.parentElement.dataset.panelId)
   const { accordionsStates } = useAccordionState()
-  const accordionState = computed(() => accordionsStates[accordionId])
-  const panelState = computed(() => accordionState.value.panels[panelId])
+  const accordionState = computed(() => accordionsStates[accordionId.value])
+  const panelState = computed(() => accordionState.value.panels[panelId.value])
   const panelsCount = computed(() => Object.keys(panelState.value).length)
   const isPanelLast = computed(() => panelState.value.order !== panelsCount.value - 1)
-  const isBottomBorderVisibleForFlush = computed(() =>
-    isPanelLast.value ||
-    (accordionState.value.flush && panelState.value.order === panelsCount.value - 1 && !panelState.value.isVisible))
+  const isBottomBorderVisibleForFlush = computed(() => isPanelLast.value || (accordionState.value.flush && panelState.value.order === panelsCount.value - 1 && !panelState.value.isVisible))
 
-  const headerClasses = computed(() => classNames(baseHeaderClasses, {
-    'bg-gray-100 dark:bg-gray-800': panelState.value.isVisible,
-    'rounded-t-xl': panelState.value.order === 0 && !accordionState.value.flush,
-    'border-t-0': panelState.value.order === 0 && accordionState.value.flush,
-    'border-b-0': isBottomBorderVisibleForFlush.value,
-    'border-x-0': accordionState.value.flush,
-  }))
-  const arrowClasses = computed(() => classNames(baseArrowClasses,{ 'rotate-180': panelState.value.isVisible }))
+  const headerClasses = computed(() => {
+    return classNames(baseHeaderClasses, {
+      'bg-gray-100 dark:bg-gray-800': panelState.value.isVisible,
+      'rounded-t-xl': panelState.value.order === 0 && !accordionState.value.flush,
+      'border-t-0': panelState.value.order === 0 && accordionState.value.flush,
+      'border-b-0': isBottomBorderVisibleForFlush.value,
+      'border-x-0': accordionState.value.flush,
+    })
+  })
+  const arrowClasses = computed(() => {
+    return classNames(baseArrowClasses, { 'rotate-180': panelState.value.isVisible })
+  })
   return {
     headerClasses,
     arrowClasses,
   }
 }
-
-

From cb30c50c59228f423b49658531ebe3f220a6679f Mon Sep 17 00:00:00 2001
From: Ilya Artamonov <hire@ilya-artamonov.ru>
Date: Tue, 13 Dec 2022 18:54:28 +0300
Subject: [PATCH 6/6] docs: Removed html endings

---
 docs/.vitepress/config.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/.vitepress/config.ts b/docs/.vitepress/config.ts
index 1533c89..f6777ba 100644
--- a/docs/.vitepress/config.ts
+++ b/docs/.vitepress/config.ts
@@ -82,6 +82,7 @@ function getUtils() {
  */
 export default defineConfig({
   title: 'Flowbite Vue 3',
+  cleanUrls: 'without-subfolders',
   head: [
     ['link', { rel: "icon", type: "image/svg", href: "/assets/logo.svg"}],
   ],