From 20662e428742b6c76b36acee5c6df9dd9a171785 Mon Sep 17 00:00:00 2001
From: Jean-Marc Millet <jean-marc.millet@scality.com>
Date: Thu, 31 Oct 2024 16:53:41 +0100
Subject: [PATCH 1/4] Add preventDefault to avoid error when Accordion is
 inside Form Add story for custom style and add it in guideline

---
 .../accordion/Accordion.component.tsx         |  14 +-
 stories/Accordion/accordion.guideline.mdx     |   7 +
 stories/Accordion/accordion.stories.tsx       |  30 ++-
 stories/form.stories.tsx                      | 179 ++++++++++++++++++
 4 files changed, 224 insertions(+), 6 deletions(-)

diff --git a/src/lib/components/accordion/Accordion.component.tsx b/src/lib/components/accordion/Accordion.component.tsx
index f3df820844..c647b14ef4 100644
--- a/src/lib/components/accordion/Accordion.component.tsx
+++ b/src/lib/components/accordion/Accordion.component.tsx
@@ -33,17 +33,25 @@ const AccordionContainer = styled.div<{
 }>`
   overflow: hidden;
   opacity: ${(props) => (props.isOpen ? 1 : 0)};
-  transition: height 0.3s ease-in, opacity 0.3s ease-in, visibility 0.3s;
+  transition:
+    height 0.3s ease-in,
+    opacity 0.3s ease-in,
+    visibility 0.3s;
   visibility: ${(props) => (props.isOpen ? 'visible' : 'hidden')};
 `;
 const Wrapper = styled.div`
-  padding-block: ${spacing.r8};
+  padding: ${spacing.r8} 0 ${spacing.r8} ${spacing.r16};
 `;
 
 export const Accordion = ({ title, id, style, children }: AccordionProps) => {
   const [isOpen, setIsOpen] = useState(false);
 
-  const handleToggleContent = () => {
+  const handleToggleContent = (
+    e:
+      | React.MouseEvent<HTMLButtonElement>
+      | React.KeyboardEvent<HTMLButtonElement>,
+  ) => {
+    e.preventDefault();
     setIsOpen((prev) => !prev);
   };
 
diff --git a/stories/Accordion/accordion.guideline.mdx b/stories/Accordion/accordion.guideline.mdx
index f19be488b6..5adae2612d 100644
--- a/stories/Accordion/accordion.guideline.mdx
+++ b/stories/Accordion/accordion.guideline.mdx
@@ -19,6 +19,13 @@ import * as Stories from './accordion.stories';
 Accordions are used to toggle the visibility of content.  
 It is used to hide non essential information or to reduce the amount of information displayed on the screen.
 
+## Style
+
+Accordion component comes with a style prop that can be used to customize the appearance of the accordion content.
+The default style of the accordion container only includes padding.
+
+<Canvas of={Stories.WithCustomStyle} />
+
 ## Playground
 
 <Canvas of={Stories.Playground} layout="fullscreen" />
diff --git a/stories/Accordion/accordion.stories.tsx b/stories/Accordion/accordion.stories.tsx
index 9a1612b624..cc33f0f1ce 100644
--- a/stories/Accordion/accordion.stories.tsx
+++ b/stories/Accordion/accordion.stories.tsx
@@ -1,12 +1,14 @@
 import { Meta, StoryObj } from '@storybook/react';
 import React from 'react';
-
+import { useTheme } from 'styled-components';
 import {
   Accordion,
   AccordionProps,
 } from '../../src/lib/components/accordion/Accordion.component';
-import { Stack } from '../../src/lib/spacing';
 import { Button } from '../../src/lib/components/buttonv2/Buttonv2.component';
+import { spacing, Stack } from '../../src/lib/spacing';
+import { margin } from 'styled-system';
+import { Text } from '../../src/lib';
 
 type AccordionStory = StoryObj<AccordionProps>;
 
@@ -59,7 +61,29 @@ export const Stacked: AccordionStory = {
     <Stack direction="vertical" gap="r8">
       <Accordion {...args} />
       <Accordion {...args} />
-      <Accordion {...args} style={{ backgroundColor: 'grey' }} />
+      <Accordion {...args} />
     </Stack>
   ),
 };
+
+export const WithCustomStyle: AccordionStory = {
+  render: (args) => {
+    const { title } = args;
+    const theme = useTheme();
+    console.log(theme);
+    const style = {
+      backgroundColor: theme.statusHealthy,
+      borderRadius: spacing.r4,
+      padding: spacing.r16,
+      margin: spacing.r8,
+    };
+    return (
+      <Accordion {...args} style={style} title={title}>
+        <Text>The container of this accordion has a custom style</Text>
+      </Accordion>
+    );
+  },
+  args: {
+    title: 'Accordion with custom style',
+  },
+};
diff --git a/stories/form.stories.tsx b/stories/form.stories.tsx
index c2b2689eb4..573f179b8f 100644
--- a/stories/form.stories.tsx
+++ b/stories/form.stories.tsx
@@ -13,6 +13,7 @@ import { Text } from '../src/lib/components/text/Text.component';
 import { Toggle } from '../src/lib/components/toggle/Toggle.component';
 import { Stack } from '../src/lib/spacing';
 import { iconArgType } from './controls';
+import { Accordion } from '../src/lib/next';
 
 export default {
   title: 'Templates/Form',
@@ -251,3 +252,181 @@ export const PageFormWithIcon = {
     },
   },
 };
+
+export const FormWithAccordion = {
+  render: ({ kind, title, subTitle, icon, requireMode }) => {
+    const layout = {
+      kind,
+      title,
+      subTitle,
+      icon,
+    };
+    const [toggle, setToggle] = useState(true);
+    return (
+      <>
+        <Form
+          layout={layout}
+          requireMode={requireMode}
+          rightActions={
+            <Stack gap={'r16'}>
+              <Button variant="outline" label="Cancel" />
+              <Button
+                variant="primary"
+                label="Save"
+                icon={<Icon name="Save" />}
+              />
+            </Stack>
+          }
+          banner={
+            <Banner
+              variant="danger"
+              icon={<Icon name="Exclamation-circle" />}
+              title={'Error'}
+            >
+              There is an error
+            </Banner>
+          }
+        >
+          <FormSection
+            title={{
+              name: 'First part entity data',
+              helpTooltip: 'Tooltip of the first entity',
+              icon: 'Search',
+            }}
+          >
+            <FormGroup
+              direction="vertical"
+              label="Name"
+              id="name"
+              labelHelpTooltip="Name Tooltip"
+              content={<Input id="name" />}
+              help="Optional helper text"
+              required
+              disabled
+            ></FormGroup>
+            <FormGroup
+              direction="horizontal"
+              label="Email"
+              id="email"
+              labelHelpTooltip="Email Tooltip"
+              content={<Input id="email" />}
+              error="Invalid email format. Try with a better format."
+              helpErrorPosition="right"
+              required
+            ></FormGroup>
+          </FormSection>
+          <FormSection
+            title={{
+              name: 'Second part entity data',
+              helpTooltip: 'Tooltip of the Second entity',
+              icon: 'Search',
+            }}
+          >
+            <FormGroup
+              direction="horizontal"
+              label="Name"
+              id="name1"
+              labelHelpTooltip="Name Tooltip"
+              content={
+                <Toggle
+                  onChange={() => {
+                    setToggle(!toggle);
+                  }}
+                  toggle={toggle}
+                  name="toggle"
+                />
+              }
+              help="Optional helper text"
+              required={false}
+            ></FormGroup>
+            <FormGroup
+              direction="horizontal"
+              label="Email"
+              id="email1"
+              labelHelpTooltip="Email Tooltip"
+              content={<Input id="email1" />}
+              error="Invalid email format. Try with a better format."
+              helpErrorPosition="right"
+              required={false}
+            ></FormGroup>
+            <FormGroup
+              direction="horizontal"
+              label="Email long long long"
+              id="email-long1"
+              labelHelpTooltip="Email Tooltip"
+              content={<Input id="email-long1" />}
+              help="optional helper text"
+              helpErrorPosition="bottom"
+              required={false}
+            ></FormGroup>
+          </FormSection>
+          <FormSection>
+            <Accordion title="Advanced Settings" id="advanced-settings">
+              <FormGroup
+                direction="vertical"
+                label="Object Lock Mode"
+                id="object_lock_mode"
+                labelHelpTooltip="S3 Object Lock Retention"
+                content={
+                  <Stack direction="vertical">
+                    <Stack direction="vertical">
+                      <Stack>
+                        <input
+                          type="radio"
+                          name="locktype"
+                          id="locktype-governance"
+                          value="governance"
+                        />
+                        <label htmlFor="locktype-governance">Governance</label>
+                      </Stack>
+                      <Text isEmphazed color="textSecondary" variant="Smaller">
+                        An user with a specific IAM permissions can
+                        overwrite/delete protected object versions during the
+                        retention period.
+                      </Text>
+                    </Stack>
+                    <Stack>
+                      <input
+                        type="radio"
+                        name="locktype"
+                        id="locktype-compliance"
+                        value="compliance"
+                      />
+                      <label htmlFor="locktype-compliance">Compliance</label>
+                    </Stack>
+                    <Text isEmphazed color="textSecondary" variant="Smaller">
+                      No one can overwrite protected object versions during the
+                      retention period.
+                    </Text>
+                  </Stack>
+                }
+                required={true}
+              ></FormGroup>
+              <FormGroup
+                id="value-example"
+                label="Choose a value"
+                helpErrorPosition="bottom"
+                required
+                content={
+                  <Select
+                    id="value-example"
+                    placeholder="Select an option..."
+                    onChange={() => {}}
+                    value={'value-1'}
+                  >
+                    <Select.Option value={'value-1'}>Value 1</Select.Option>
+                    <Select.Option value={'value-2'}>Value 2</Select.Option>
+                    <Select.Option value={'value-3'}>Value 3</Select.Option>
+                  </Select>
+                }
+              />
+            </Accordion>
+          </FormSection>
+        </Form>
+      </>
+    );
+  },
+  args: {
+    requireMode: 'partial',
+  },
+};

From 909fb789076213ca3a5c8d0f937ec003b3a21c2b Mon Sep 17 00:00:00 2001
From: Jean-Marc Millet <jean-marc.millet@scality.com>
Date: Thu, 31 Oct 2024 17:19:36 +0100
Subject: [PATCH 2/4] Remove prevent default and add button type : 'button'

---
 src/lib/components/accordion/Accordion.component.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lib/components/accordion/Accordion.component.tsx b/src/lib/components/accordion/Accordion.component.tsx
index c647b14ef4..638f2aea59 100644
--- a/src/lib/components/accordion/Accordion.component.tsx
+++ b/src/lib/components/accordion/Accordion.component.tsx
@@ -51,7 +51,6 @@ export const Accordion = ({ title, id, style, children }: AccordionProps) => {
       | React.MouseEvent<HTMLButtonElement>
       | React.KeyboardEvent<HTMLButtonElement>,
   ) => {
-    e.preventDefault();
     setIsOpen((prev) => !prev);
   };
 
@@ -59,6 +58,7 @@ export const Accordion = ({ title, id, style, children }: AccordionProps) => {
     <Box style={{ width: '100%', height: 'auto' }}>
       <h3 style={{ margin: 0 }}>
         <AccordionHeader
+          type="button"
           id={`Accordion-header-${id}`}
           onClick={handleToggleContent}
           aria-controls={id}

From 78fe5d495846c42e5358f3f9c928fe10cccdfba9 Mon Sep 17 00:00:00 2001
From: Jean-Marc Millet <jean-marc.millet@scality.com>
Date: Thu, 31 Oct 2024 17:36:06 +0100
Subject: [PATCH 3/4] change gap

---
 src/lib/components/accordion/Accordion.component.tsx | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/lib/components/accordion/Accordion.component.tsx b/src/lib/components/accordion/Accordion.component.tsx
index 638f2aea59..92652b23eb 100644
--- a/src/lib/components/accordion/Accordion.component.tsx
+++ b/src/lib/components/accordion/Accordion.component.tsx
@@ -20,13 +20,11 @@ const AccordionHeader = styled.button`
   -moz-appearance: none;
   appearance: none;
   border: none;
-  gap: ${spacing.r8};
   width: 100%;
   cursor: pointer;
   background-color: transparent;
   color: ${(props) => props.theme.textPrimary};
-  padding: ${spacing.r4};
-  width: 100%;
+  padding: 0;
 `;
 const AccordionContainer = styled.div<{
   isOpen: boolean;
@@ -40,7 +38,7 @@ const AccordionContainer = styled.div<{
   visibility: ${(props) => (props.isOpen ? 'visible' : 'hidden')};
 `;
 const Wrapper = styled.div`
-  padding: ${spacing.r8} 0 ${spacing.r8} ${spacing.r16};
+  padding: ${spacing.r8} 0 ${spacing.r8} ${spacing.r20};
 `;
 
 export const Accordion = ({ title, id, style, children }: AccordionProps) => {

From be5a3a8678fe10581bce93b9cc47769722461b02 Mon Sep 17 00:00:00 2001
From: Jean-Marc Millet <jean-marc.millet@scality.com>
Date: Mon, 4 Nov 2024 12:09:43 +0100
Subject: [PATCH 4/4] remove console.log

---
 stories/Accordion/accordion.stories.tsx | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/stories/Accordion/accordion.stories.tsx b/stories/Accordion/accordion.stories.tsx
index cc33f0f1ce..5d8046795f 100644
--- a/stories/Accordion/accordion.stories.tsx
+++ b/stories/Accordion/accordion.stories.tsx
@@ -7,7 +7,6 @@ import {
 } from '../../src/lib/components/accordion/Accordion.component';
 import { Button } from '../../src/lib/components/buttonv2/Buttonv2.component';
 import { spacing, Stack } from '../../src/lib/spacing';
-import { margin } from 'styled-system';
 import { Text } from '../../src/lib';
 
 type AccordionStory = StoryObj<AccordionProps>;
@@ -70,7 +69,7 @@ export const WithCustomStyle: AccordionStory = {
   render: (args) => {
     const { title } = args;
     const theme = useTheme();
-    console.log(theme);
+
     const style = {
       backgroundColor: theme.statusHealthy,
       borderRadius: spacing.r4,