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.

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

V2 accordion #565

Merged
merged 7 commits into from
Feb 14, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion jest.config.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/** @type {import("jest").Config} */
module.exports = {
roots: ["./ui"],
roots: ["./ui", "./packages"],
preset: "ts-jest",
testEnvironment: "./custom-env.ts",
cacheDirectory: ".jest-cache",
Expand Down
7 changes: 7 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions packages/kit/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
"url": "https://github.com/washingtonpost/wpds-ui-kit/issues"
},
"dependencies": {
"@radix-ui/react-accordion": "^1.1.2",
"@stitches/react": "^1.2.8",
"@washingtonpost/wpds-assets": "^1.18.0"
},
Expand Down
10 changes: 10 additions & 0 deletions packages/kit/src/accordion/Accordion.test.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
import { render, screen } from "@testing-library/react";
import { AccordionRoot } from "./Accordion";

describe("AccordionRoot", () => {
test("renders visibly into the document", () => {
render(<AccordionRoot type="single">Test</AccordionRoot>);

expect(screen.getByText("Test")).toBeVisible();
});
});
65 changes: 65 additions & 0 deletions packages/kit/src/accordion/Accordion.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
import { forwardRef } from "react";
import { theme, styled } from "../theme";
import type * as WPDS from "../theme";
import * as AccordionPrimitive from "@radix-ui/react-accordion";
import { AccordionTrigger, AccordionHeader } from "./AccordionTrigger";
import { AccordionItem } from "./AccordionItem";
import { AccordionContent } from "./AccordionContent";
import {
AccordionSingleProps as RadixAccordionSingleProps,
AccordionMultipleProps as RadixAccordionMultipleProps,
} from "@radix-ui/react-accordion";

export enum ACCORDION_TYPE {
single = "single",
multiple = "multiple",
}

export enum ACCORDION_DENSITY {
compact = "compact",
loose = "loose",
default = "default",
}

const StyledAccordion = styled(AccordionPrimitive.Root, {
width: "100%",
variants: {
disabled: {
true: {
cursor: "not-allowed",
[`${AccordionHeader}`]: {
pointerEvents: "none",
color: theme.colors.accessible,
},
},
},
},
});

type AccordionRootVariants = WPDS.VariantProps<typeof StyledAccordion>;

export type AccordionRootCombined = (
| RadixAccordionSingleProps
| RadixAccordionMultipleProps
) &
AccordionRootVariants;

export const AccordionRoot = forwardRef<HTMLDivElement, AccordionRootCombined>(
({ ...props }: AccordionRootCombined, ref) => (
<StyledAccordion {...props} ref={ref} />
)
);

AccordionRoot.displayName = "AccordionRoot";

const Root = AccordionRoot;
const Item = AccordionItem;
const Content = AccordionContent;
const Trigger = AccordionTrigger;

export const Accordion = {
Root,
Item,
Content,
Trigger,
};
29 changes: 29 additions & 0 deletions packages/kit/src/accordion/AccordionContent.test.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
import { render, screen } from "@testing-library/react";
import { AccordionRoot } from "./Accordion";
import { AccordionItem } from "./AccordionItem";
import { AccordionContent } from "./AccordionContent";

const customRender = (ui, contextProps = {}) => {
return render(
<AccordionRoot type="single" defaultValue="test" {...contextProps}>
<AccordionItem value="test">{ui}</AccordionItem>
</AccordionRoot>
);
};

describe("AccordionContent", () => {
test("renders visibly into the document", () => {
customRender(<AccordionContent />);

expect(screen.getByRole("region")).toBeVisible();
});

test("applies padding to inner content", () => {
customRender(
<AccordionContent css={{ padding: "1rem" }}>Test</AccordionContent>
);

// eslint-disable-next-line jest-dom/prefer-to-have-class
expect(screen.getByText("Test").classList.length).toBe(2);
});
});
75 changes: 75 additions & 0 deletions packages/kit/src/accordion/AccordionContent.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
import { forwardRef } from "react";
import { theme, styled, keyframes } from "../theme";
import * as AccordionPrimitive from "@radix-ui/react-accordion";
import type * as WPDS from "../theme";
import { AccordionContentProps as RadixAccordionContentProps } from "@radix-ui/react-accordion";

const slideDown = keyframes({
from: { height: 0 },
to: { height: "var(--radix-accordion-content-height)" },
});

const slideUp = keyframes({
from: { height: "var(--radix-accordion-content-height)" },
to: { height: 0 },
});

const easeInOutExpo = `cubic-bezier(0.87, 0, 0.13, 1)`;

const AnimatedContent = styled(AccordionPrimitive.Content, {
overflow: "hidden",
color: theme.colors.primary,
'&[data-state="open"]': {
animation: `${slideDown} ${theme.transitions.normal} ${easeInOutExpo}`,
"@reducedMotion": {
animation: "none",
},
},
'&[data-state="closed"]': {
animation: `${slideUp} ${theme.transitions.normal} ${easeInOutExpo}`,
"@reducedMotion": {
animation: "none",
},
},
});

const ContentContainer = styled("div", {
paddingBottom: theme.space[150],
paddingRight: theme.space[150],
fontSize: theme.fontSizes[100],
});

type AccordionContentVariants = WPDS.VariantProps<typeof AnimatedContent>;
type CombinedProps = RadixAccordionContentProps & AccordionContentVariants;

export interface AccordionContentInterface extends CombinedProps {
css?: WPDS.CSS;
}

export const AccordionContent = forwardRef<
HTMLDivElement,
AccordionContentInterface
>(({ children, ...props }: AccordionContentInterface, ref) => {
const {
padding = "",
paddingTop = "",
paddingBottom = "",
paddingLeft = "",
paddingRight = "",
...restOfCss
} = props.css ? props.css : {};

const otherProps = { ...props, css: { ...restOfCss } };

return (
<AnimatedContent {...otherProps} ref={ref}>
<ContentContainer
css={{ padding, paddingTop, paddingBottom, paddingLeft, paddingRight }}
>
{children}
</ContentContainer>
</AnimatedContent>
);
});

AccordionContent.displayName = "AccordionContent";
19 changes: 19 additions & 0 deletions packages/kit/src/accordion/AccordionItem.test.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
import { render, screen } from "@testing-library/react";
import { AccordionRoot } from "./Accordion";
import { AccordionItem } from "./AccordionItem";

const customRender = (ui, contextProps = {}) => {
return render(
<AccordionRoot type="single" defaultValue="test" {...contextProps}>
{ui}
</AccordionRoot>
);
};

describe("AccordionItem", () => {
test("renders visibly into the document", () => {
customRender(<AccordionItem value="test" data-testid="test" />);

expect(screen.getByTestId("test")).toBeVisible();
});
});
26 changes: 26 additions & 0 deletions packages/kit/src/accordion/AccordionItem.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
import { forwardRef } from "react";
import { theme, styled } from "../theme";
import * as AccordionPrimitive from "@radix-ui/react-accordion";
import type * as WPDS from "../theme";
import { AccordionItemProps as RadixAccordionItemProps } from "@radix-ui/react-accordion";

const StyledAccordionItem = styled(AccordionPrimitive.Item, {
borderBottom: `1px solid ${theme.colors.subtle}`,
});

type AccordionItemProps = WPDS.VariantProps<typeof StyledAccordionItem> &
RadixAccordionItemProps;

export interface AccordionItemInterface extends AccordionItemProps {
css?: WPDS.CSS;
}

export const AccordionItem = forwardRef<HTMLDivElement, AccordionItemInterface>(
({ children, ...props }: AccordionItemInterface, ref) => (
<StyledAccordionItem {...props} ref={ref}>
{children}
</StyledAccordionItem>
)
);

AccordionItem.displayName = "AccordionItem";
20 changes: 20 additions & 0 deletions packages/kit/src/accordion/AccordionTrigger.test.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
import { render, screen } from "@testing-library/react";
import { AccordionRoot } from "./Accordion";
import { AccordionItem } from "./AccordionItem";
import { AccordionTrigger } from "./AccordionTrigger";

const customRender = (ui, contextProps = {}) => {
return render(
<AccordionRoot type="single" defaultValue="test" {...contextProps}>
<AccordionItem value="test">{ui}</AccordionItem>
</AccordionRoot>
);
};

describe("AccordionContent", () => {
test("renders visibly into the document", () => {
customRender(<AccordionTrigger>Test</AccordionTrigger>);

expect(screen.getByRole("button")).toBeVisible();
});
});
Loading
Loading