✨ Improve customizability of Accordion component

Frontendland · Oct 18, 2024 · 4ddf4ff · 4ddf4ff
1 parent 91f0389
commit 4ddf4ff
Show file tree

Hide file tree

Showing 9 changed files with 160 additions and 32 deletions.
diff --git a/src/components/Accordion/Accordion.astro b/src/components/Accordion/Accordion.astro
@@ -2,44 +2,56 @@
 import type { AccordionProps } from './accordion'
 
 import ArrowDown from '../../icons/arrow-down.svg?raw'
+import Plus from '../../icons/plus.svg?raw'
 
 import styles from './accordion.module.scss'
 
 interface Props extends AccordionProps {}
 
 const {
-    items
+    items,
+    icon,
+    reverse,
+    className
 } = Astro.props
+
+const classes = [
+    styles.accordion,
+    reverse && styles.reverse,
+    icon === 'plus' && styles.plus,
+    className
+]
 ---
 
-<ul class={styles.accordion} data-id="w-accordion">
+<ul class:list={classes} data-id="w-accordion">
     {items.map((item: AccordionProps['items'][0]) => (
         <li>
-            <button class={styles.title} data-toggle="true">
+            <button
+                class:list={[styles.title, item.reverse && styles.reverse]}
+                data-toggle="true"
+            >
                 {item.title}
-                <Fragment set:html={ArrowDown} />
+                {icon !== 'none' && (
+                    <Fragment set:html={icon === 'plus' ? Plus : ArrowDown} />
+                )}
             </button>
             <div class={styles.wrapper}>
-                <div class={styles.content}>
-                    <Fragment set:html={item.content} />
-                </div>
+                <div class={styles.content} set:html={item.content} />
             </div>
         </li>
     ))}
 </ul>
 
 <script>
-    const accordions = document.querySelectorAll('[data-id="w-accordion"]')
-
-    Array.from(accordions).forEach(element => {
-        element.addEventListener('click', event => {
-            const target = event.target as HTMLDivElement
-
-            if (target.dataset.toggle) {
-                target.dataset.open = target.dataset.open === 'true'
-                    ? 'false'
-                    : 'true'
-            }
-        })
-    })
+    import { on } from '../../utils/DOMUtils'
+
+    on('[data-id="w-accordion"]', 'click', (event: Event) => {
+        const target = event.target as HTMLDivElement
+
+        if (target.dataset.toggle) {
+            target.dataset.open = target.dataset.open === 'true'
+                ? 'false'
+                : 'true'
+        }
+    }, true)
 </script>
diff --git a/src/components/Accordion/Accordion.svelte b/src/components/Accordion/Accordion.svelte
@@ -1,11 +1,17 @@
 <script lang="ts">
     import type { AccordionProps } from './accordion'
 
+    import { classNames } from '../../utils/classNames'
+
     import ArrowDown from '../../icons/arrow-down.svg?raw'
+    import Plus from '../../icons/plus.svg?raw'
 
     import styles from './accordion.module.scss'
 
-    export let items: AccordionProps['items']
+    export let items: AccordionProps['items'] = []
+    export let icon: AccordionProps['icon'] = null
+    export let reverse: AccordionProps['reverse'] = false
+    export let className: AccordionProps['className'] = ''
 
     let state = Array(items.length).fill(false)
 
@@ -15,18 +21,30 @@
             : state[i]
         )
     }
+
+    const classes = classNames([
+        styles.accordion,
+        reverse && styles.reverse,
+        icon === 'plus' && styles.plus,
+        className
+    ])
 </script>
 
-<ul class={styles.accordion}>
+<ul class={classes}>
     {#each items as item, index}
         <li>
             <button
-                class={styles.title}
+                class={classNames([
+                    styles.title,
+                    item.reverse && styles.reverse
+                ])}
                 data-open={state[index]}
                 on:click={() => toggle(index)}
             >
                 {item.title}
-                {@html ArrowDown}
+                {#if icon !== 'none'}
+                    {@html icon === 'plus' ? Plus : ArrowDown}
+                {/if}
             </button>
             <div class={styles.wrapper}>
                 <div class={styles.content}>

diff --git a/src/components/Accordion/Accordion.tsx b/src/components/Accordion/Accordion.tsx
@@ -1,11 +1,19 @@
 import React, { useState } from 'react'
 import type { AccordionProps } from './accordion'
 
+import { classNames } from '../../utils/classNames'
+
 import ArrowDown from '../../icons/arrow-down.svg?raw'
+import Plus from '../../icons/plus.svg?raw'
 
 import styles from './accordion.module.scss'
 
-const Accordion = ({ items }: AccordionProps) => {
+const Accordion = ({
+    items,
+    icon,
+    reverse,
+    className
+}: AccordionProps) => {
     const [state, setState] = useState(Array(items.length).fill(false))
 
     const toggle = (index: number) => {
@@ -15,20 +23,34 @@ const Accordion = ({ items }: AccordionProps) => {
         ))
     }
 
+    const classes = classNames([
+        styles.accordion,
+        reverse && styles.reverse,
+        icon === 'plus' && styles.plus,
+        className
+    ])
+
     return (
-        <ul className={styles.accordion}>
+        <ul className={classes}>
             {items.map((item, index) => (
                 <li key={index}>
                     <button
-                        className={styles.title}
                         data-open={state[index]}
                         onClick={() => toggle(index)}
-                        dangerouslySetInnerHTML={{ __html: `${item.title} ${ArrowDown}` }}
+                        className={classNames([
+                            styles.title,
+                            item.reverse && styles.reverse
+                        ])}
+                        dangerouslySetInnerHTML={{ __html: icon === 'none'
+                            ? item.title
+                            : `${item.title} ${icon === 'plus' ? Plus : ArrowDown}`
+                        }}
                     />
                     <div className={styles.wrapper}>
-                        <div className={styles.content}>
-                            <div dangerouslySetInnerHTML={{ __html: item.content }} />
-                        </div>
+                        <div
+                            className={styles.content}
+                            dangerouslySetInnerHTML={{ __html: item.content }}
+                        />
                     </div>
                 </li>
             ))}

diff --git a/src/components/Accordion/accordion.module.scss b/src/components/Accordion/accordion.module.scss
@@ -4,6 +4,14 @@
     @include spacing(0);
     list-style-type: none;
 
+    &.reverse .title {
+        @include layout(row-reverse, h-end);
+    }
+
+    &.plus .title[data-open="true"] svg {
+        transform: rotate(135deg);
+    }
+
     li {
         @include border(primary-50, bottom);
         @include spacing(py-sm, px-none, m0);
@@ -27,6 +35,10 @@
             background: transparent;
             cursor: pointer;
 
+            &.reverse {
+                @include layout(row-reverse);
+            }
+
             svg {
                 @include transition(transform);
                 @include size(15px);

diff --git a/src/components/Accordion/accordion.ts b/src/components/Accordion/accordion.ts
@@ -2,5 +2,9 @@ export type AccordionProps = {
     items: {
         title: string
         content: string
+        reverse?: boolean
     }[]
+    icon?: 'plus' | 'none' | undefined | null
+    reverse?: boolean
+    className?: string
 }
diff --git a/src/components/Icon/map.ts b/src/components/Icon/map.ts
@@ -13,6 +13,7 @@ import Home from '../../icons/home.svg?raw'
 import Info from '../../icons/info.svg?raw'
 import Moon from '../../icons/moon.svg?raw'
 import Order from '../../icons/order.svg?raw'
+import Plus from '../../icons/plus.svg?raw'
 import Search from '../../icons/search.svg?raw'
 import Sun from '../../icons/sun.svg?raw'
 import Warning from '../../icons/warning.svg?raw'
@@ -33,6 +34,7 @@ const iconMap = {
     'info': Info,
     'moon': Moon,
     'order': Order,
+    'plus': Plus,
     'search': Search,
     'sun': Sun,
     'warning': Warning

diff --git a/src/icons/close.svg b/src/icons/close.svg
diff --git a/src/icons/plus.svg b/src/icons/plus.svg
diff --git a/src/pages/components/accordion.astro b/src/pages/components/accordion.astro
@@ -6,7 +6,23 @@ import AstroAccordion from '@components/Accordion/Accordion.astro'
 import SvelteAccordion from '@components/Accordion/Accordion.svelte'
 import ReactAccordion from '@components/Accordion/Accordion.tsx'
 
+import { getSections } from '@helpers'
 import { accordionItems } from '@data'
+
+const alternatingAccordionItems = [
+    accordionItems[0],
+    {
+        ...accordionItems[1],
+        reverse: true
+    },
+    accordionItems[2]
+]
+
+const sections = getSections({
+    title: 'accordions',
+    components: [AstroAccordion, SvelteAccordion, ReactAccordion],
+    showSubTitle: true
+})
 ---
 
 <Layout>
@@ -25,4 +41,43 @@ import { accordionItems } from '@data'
             <ReactAccordion items={accordionItems} client:load />
         </ComponentWrapper>
     </div>
+
+    {sections.map(section => (
+        <h1>{section.title}</h1>
+        <Fragment>
+            {section.subTitle && <h2 set:html={section.subTitle} />}
+        </Fragment>
+        <div class="grid md-2 lg-3">
+            <ComponentWrapper title="Default">
+                <section.component items={accordionItems} />
+            </ComponentWrapper>
+
+            <ComponentWrapper title="Plus icon">
+                <section.component
+                    items={accordionItems}
+                    icon="plus"
+                />
+            </ComponentWrapper>
+
+            <ComponentWrapper title="Without icon">
+                <section.component
+                    items={accordionItems}
+                    icon="none"
+                />
+            </ComponentWrapper>
+
+            <ComponentWrapper title="Reverse layout">
+                <section.component
+                    items={accordionItems}
+                    reverse={true}
+                />
+            </ComponentWrapper>
+
+            <ComponentWrapper title="Alternating layout">
+                <section.component
+                    items={alternatingAccordionItems}
+                />
+            </ComponentWrapper>
+        </div>
+    ))}
 </Layout>