Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: accordion trigger disabled style and custom icon #450

Merged
merged 3 commits into from
Sep 16, 2024
Merged

fix: accordion trigger disabled style and custom icon #450

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
972481d
feat: allow no trigger icon
gndz07 Sep 16, 2024
adf6664
feat: allow custom trigger icon
gndz07 Sep 16, 2024
e8c75db
fix: arg type
gndz07 Sep 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 29 additions & 6 deletions components/Accordion/Accordion.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { MagnifyingGlassIcon } from '@radix-ui/react-icons';
import { BookmarkIcon, MagnifyingGlassIcon } from '@radix-ui/react-icons';
import { Meta, StoryFn } from '@storybook/react';
import React, { useState } from 'react';

Expand Down Expand Up @@ -61,7 +61,7 @@ Large.args = {
export const Collapsible: StoryFn<typeof AccordionForStory> = Template.bind({});
Collapsible.args = {
type: 'single',
collapsible: true,
collapsible: 'true',
};
Collapsible.argTypes = {
size: {
Expand All @@ -73,8 +73,7 @@ Collapsible.argTypes = {
export const MultipleCollapsible: StoryFn<typeof AccordionForStory> = Template.bind({});
MultipleCollapsible.args = {
type: 'multiple',
// @FIXME console warning of this props not being a boolean attribute
collapsible: true,
collapsible: 'true',
};
MultipleCollapsible.argTypes = {
size: {
Expand All @@ -83,6 +82,30 @@ MultipleCollapsible.argTypes = {
},
};

export const DisabledAndCustomTrigger: StoryFn<typeof AccordionForStory> = (args) => (
<Box css={{ width: 300 }}>
<AccordionForStory {...args}>
<AccordionItem value="item-1">
<AccordionTrigger>Item1 Trigger</AccordionTrigger>
<AccordionContent>Item1 Content</AccordionContent>
</AccordionItem>
<AccordionItem value="item-2">
<AccordionTrigger disabled noIcon>
Disabled item
</AccordionTrigger>
</AccordionItem>
<AccordionItem value="item-3">
<AccordionTrigger customIcon={<BookmarkIcon />}>Custom Icon</AccordionTrigger>
<AccordionContent>Item3 Content</AccordionContent>
</AccordionItem>
</AccordionForStory>
</Box>
);
DisabledAndCustomTrigger.args = {
type: 'multiple',
collapsible: 'true',
};

export const Complex: StoryFn<typeof AccordionForStory> = (args) => (
<Box css={{ width: 300 }}>
<AccordionForStory {...args}>
Expand Down Expand Up @@ -112,7 +135,7 @@ export const Complex: StoryFn<typeof AccordionForStory> = (args) => (

Complex.args = {
type: 'multiple',
collapsible: true,
collapsible: 'true',
};
Complex.argTypes = {
size: {
Expand Down Expand Up @@ -178,7 +201,7 @@ export const InsideModal: StoryFn<typeof AccordionForStory> = (args) => {

InsideModal.args = {
type: 'multiple',
collapsible: true,
collapsible: 'true',
};
InsideModal.argTypes = {
size: {
Expand Down
27 changes: 20 additions & 7 deletions components/Accordion/Accordion.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import { ChevronRightIcon } from '@radix-ui/react-icons';
import React from 'react';

import { CSS, keyframes, styled, VariantProps } from '../../stitches.config';
import { Box } from '../Box';
import { elevationVariants } from '../Elevation';

const open = keyframes({
Expand Down Expand Up @@ -67,10 +68,12 @@ export const StyledAccordionTrigger = styled(AccordionPrimitive.Trigger, {
boxShadow: 'inset 0 0 0 1px $colors$accordionActiveShadow',
},
'@hover': {
'&:hover': {
cursor: 'pointer',
'&::before': {
backgroundColor: '$accordionHoverShadow',
'&:not([disabled])': {
'&:hover': {
cursor: 'pointer',
'&::before': {
backgroundColor: '$accordionHoverShadow',
},
},
},
},
Expand Down Expand Up @@ -139,15 +142,25 @@ export const AccordionItem = StyledAccordionItem as any;
export type AccordionTriggerProps = React.ComponentProps<typeof StyledAccordionTrigger> &
VariantProps<typeof StyledAccordionTrigger> & {
children: React.ReactNode;
customIcon?: React.ReactNode;
noIcon?: boolean;
};
export const AccordionTrigger = React.forwardRef<
React.ElementRef<typeof StyledAccordionTrigger>,
AccordionTriggerProps
>(({ children, ...props }, forwardedRef) => (
>(({ children, noIcon = false, customIcon, ...props }, forwardedRef) => (
<StyledAccordionHeader>
<StyledAccordionTrigger ref={forwardedRef} {...props}>
<StyledAccordionChevron aria-hidden />
{children}
{!noIcon ? (
customIcon ? (
<Box css={{ mr: '$2', c: '$accordionText' }} aria-hidden>
{customIcon}
</Box>
) : (
<StyledAccordionChevron aria-hidden />
)
) : null}
<Box css={{ ml: noIcon ? '$5' : 0, width: '100%' }}>{children}</Box>
</StyledAccordionTrigger>
</StyledAccordionHeader>
));
Expand Down