Refactor Accordion and AccordionItem

packages/fuselage/src/components/Accordion/Accordion.spec.tsx

@@ -4,17 +4,25 @@ import { axe } from 'jest-axe';
 import { render } from '../../testing';
 import * as stories from './Accordion.stories';
 
-const { Default } = composeStories(stories);
+const testCases = Object.values(composeStories(stories)).map((Story) => [
+  Story.storyName || 'Story',
+  Story,
+]);
 
-describe('[Accordion Component]', () => {
-  it('renders without crashing', () => {
-    render(<Default />);
-  });
+test.each(testCases)(
+  `renders %s without crashing`,
+  async (_storyname, Story) => {
+    const tree = render(<Story />);
+    expect(tree.baseElement).toMatchSnapshot();
+  }
+);
 
-  it('should have no a11y violations', async () => {
-    const { container } = render(<Default />);
+test.each(testCases)(
+  '%s should have no a11y violations',
+  async (_storyname, Story) => {
+    const { container } = render(<Story />);
 
     const results = await axe(container);
     expect(results).toHaveNoViolations();
-  });
-});
+  }
+);

packages/fuselage/src/components/Accordion/Accordion.stories.tsx

@@ -2,36 +2,66 @@ import type { StoryFn, Meta } from '@storybook/react';
 import type { ComponentType } from 'react';
 
 import Box from '../Box';
-import { Accordion } from './Accordion';
-import { AccordionItem } from './AccordionItem';
+import Accordion from './Accordion';
+import AccordionItem from './AccordionItem';
 
 export default {
   title: 'Containers/Accordion',
   component: Accordion,
   subcomponents: {
-    'Accordion.Item': Accordion.Item as ComponentType<any>,
-    'AccordionItem': AccordionItem as ComponentType<any>,
+    AccordionItem: AccordionItem as ComponentType<any>,
   },
 } satisfies Meta<typeof Accordion>;
 
-const Template: StoryFn<typeof Accordion> = () => (
+export const Default: StoryFn<typeof Accordion> = () => (
   <Accordion>
-    <Accordion.Item title='Item #1' defaultExpanded>
+    <AccordionItem title='Item #1'>
       <Box color='default' fontScale='p2' marginBlockEnd={16}>
         Content #1
       </Box>
-    </Accordion.Item>
-    <Accordion.Item title='Item #2'>
+    </AccordionItem>
+    <AccordionItem title='Item #2'>
       <Box color='default' fontScale='p2' marginBlockEnd={16}>
         Content #2
       </Box>
-    </Accordion.Item>
-    <Accordion.Item title='Item #3'>
+    </AccordionItem>
+    <AccordionItem title='Item #3'>
       <Box color='default' fontScale='p2' marginBlockEnd={16}>
         Content #3
       </Box>
-    </Accordion.Item>
+    </AccordionItem>
   </Accordion>
 );
 
-export const Default: StoryFn<typeof Accordion> = Template.bind({});
+const ItemTemplate: StoryFn<typeof AccordionItem> = ({
+  title = 'Item #2',
+  ...args
+}) => (
+  <Accordion>
+    <AccordionItem title='Item #1'>
+      <Box color='default' fontScale='p2' marginBlockEnd={16}>
+        Content #1
+      </Box>
+    </AccordionItem>
+    <AccordionItem title={title} {...args}>
+      <Box color='default' fontScale='p2' marginBlockEnd={16}>
+        Content #2
+      </Box>
+    </AccordionItem>
+    <AccordionItem title='Item #3'>
+      <Box color='default' fontScale='p2' marginBlockEnd={16}>
+        Content #3
+      </Box>
+    </AccordionItem>
+  </Accordion>
+);
+
+export const ExpandedItemByDefault = ItemTemplate.bind({});
+ExpandedItemByDefault.args = {
+  defaultExpanded: true,
+};
+
+export const DisabledItem = ItemTemplate.bind({});
+DisabledItem.args = {
+  disabled: true,
+};

packages/fuselage/src/components/Accordion/Accordion.styles.scss

@@ -6,7 +6,6 @@
   display: flex;
   flex-flow: column nowrap;
   border-block-end-color: colors.stroke(extra-light);
-
   border-block-end-width: lengths.border-width(default);
 }
 
@@ -64,14 +63,6 @@
   @include typography.use-font-scale(h4);
 }
 
-.rcx-accordion-item__toggle-switch {
-  display: flex;
-  align-items: center;
-  flex: 0 0 auto;
-
-  margin: lengths.margin(none) lengths.margin(24);
-}
-
 .rcx-accordion-item__panel {
   visibility: hidden;
 

packages/fuselage/src/components/Accordion/Accordion.tsx

@@ -1,21 +1,22 @@
-import type { ComponentProps, ReactElement, ReactNode } from 'react';
+import type { ReactNode } from 'react';
 
-import Box from '../Box';
-import { AccordionItem } from './AccordionItem';
+import { cx, cxx } from '../../helpers/composeClassNames';
+import { StylingBox } from '../Box';
+import { StylingProps } from '../Box/stylingProps';
 
-type AccordionProps = ComponentProps<typeof Box> & {
-  animated?: boolean;
+export type AccordionProps = {
   children: ReactNode;
-};
+} & Partial<StylingProps>;
 
 /**
  * An `Accordion` allows users to toggle the display of sections of content.
  */
-export function Accordion(props: AccordionProps): ReactElement<AccordionProps> {
-  return <Box animated rcx-accordion {...props} />;
-}
+const Accordion = ({ children, ...props }: AccordionProps) => (
+  <StylingBox {...props}>
+    <div className={cx(cxx('rcx-box')('full', 'animated'), 'rcx-accordion')}>
+      {children}
+    </div>
+  </StylingBox>
+);
 
-/**
- * @deprecated use named import instead
- */
-Accordion.Item = AccordionItem;
+export default Accordion;

packages/fuselage/src/components/Accordion/AccordionItem.tsx

@@ -1,11 +1,11 @@
 import { useToggle, useUniqueId } from '@rocket.chat/fuselage-hooks';
-import type { FormEvent, KeyboardEvent, MouseEvent, ReactNode } from 'react';
+import type { KeyboardEvent, MouseEvent, ReactNode } from 'react';
 
-import Box from '../Box';
+import { cx, cxx } from '../../helpers/composeClassNames';
+import { StylingBox } from '../Box';
 import { Chevron } from '../Chevron';
-import { ToggleSwitch } from '../ToggleSwitch';
 
-type AccordionItemProps = {
+export type AccordionItemProps = {
   children?: ReactNode;
   className?: string;
   defaultExpanded?: boolean;
@@ -14,33 +14,20 @@ type AccordionItemProps = {
   tabIndex?: number;
   title: ReactNode;
   noncollapsible?: boolean;
-  onToggle?: (e: MouseEvent | KeyboardEvent) => void;
-  onToggleEnabled?: (e: FormEvent) => void;
 };
 
-export const AccordionItem = function Item({
+const AccordionItem = ({
   children,
-  className,
   defaultExpanded,
-  disabled,
+  disabled = false,
   expanded: propExpanded,
   tabIndex = 0,
   title,
   noncollapsible = !title,
-  onToggle,
-  onToggleEnabled,
   ...props
-}: AccordionItemProps) {
+}: AccordionItemProps) => {
   const [stateExpanded, toggleStateExpanded] = useToggle(defaultExpanded);
   const expanded = propExpanded || stateExpanded;
-  const toggleExpanded = (event: MouseEvent | KeyboardEvent) => {
-    if (onToggle) {
-      onToggle.call(event.currentTarget, event);
-      return;
-    }
-
-    toggleStateExpanded();
-  };
 
   const panelExpanded = noncollapsible || expanded;
 
@@ -52,27 +39,25 @@ export const AccordionItem = function Item({
       return;
     }
     e.currentTarget?.blur();
-    toggleExpanded(e);
+    toggleStateExpanded();
   };
 
   const handleKeyDown = (event: KeyboardEvent) => {
     if (disabled || event.currentTarget !== event.target) {
       return;
     }
 
-    if ([13, 32].includes(event.keyCode)) {
-      event.preventDefault();
+    if (![' ', 'Enter'].includes(event.key)) {
+      return;
+    }
 
-      if (event.repeat) {
-        return;
-      }
+    event.preventDefault();
 
-      toggleExpanded(event);
+    if (event.repeat) {
+      return;
     }
-  };
 
-  const handleToggleClick = (event: MouseEvent) => {
-    event.stopPropagation();
+    toggleStateExpanded();
   };
 
   const collapsibleProps = {
@@ -92,42 +77,41 @@ export const AccordionItem = function Item({
   const barProps = noncollapsible ? nonCollapsibleProps : collapsibleProps;
 
   return (
-    <Box is='section' rcx-accordion-item className={className} {...props}>
-      {title && (
-        <Box
-          role='button'
-          animated
-          rcx-accordion-item__bar
-          rcx-accordion-item__bar--disabled={disabled}
-          {...barProps}
-        >
-          <Box is='h2' rcx-accordion-item__title id={titleId}>
-            {title}
-          </Box>
-          {!noncollapsible && (
-            <>
-              {(disabled || onToggleEnabled) && (
-                <Box rcx-accordion-item__toggle-switch>
-                  <ToggleSwitch
-                    checked={!disabled}
-                    onClick={handleToggleClick}
-                    onChange={onToggleEnabled}
-                  />
-                </Box>
+    <StylingBox {...props}>
+      <section className={cx(cxx('rcx-box')('full'), 'rcx-accordion-item')}>
+        {title && (
+          <div
+            role='button'
+            className={cx(
+              cxx('rcx-box')('full', 'animated'),
+              cxx('rcx-accordion-item__bar')({ disabled })
+            )}
+            {...barProps}
+          >
+            <h2
+              className={cx(
+                cxx('rcx-box')('full'),
+                'rcx-accordion-item__title'
               )}
-              <Chevron size='x24' up={expanded} />
-            </>
+              id={titleId}
+            >
+              {title}
+            </h2>
+            {!noncollapsible && <Chevron size='x24' up={expanded} />}
+          </div>
+        )}
+        <div
+          className={cx(
+            cxx('rcx-box')('full', 'animated'),
+            cxx('rcx-accordion-item__panel')({ expanded: panelExpanded })
           )}
-        </Box>
-      )}
-      <Box
-        animated
-        rcx-accordion-item__panel
-        rcx-accordion-item__panel--expanded={panelExpanded}
-        id={panelId}
-      >
-        {children}
-      </Box>
-    </Box>
+          id={panelId}
+        >
+          {children}
+        </div>
+      </section>
+    </StylingBox>
   );
 };
+
+export default AccordionItem;