Skip to content

Commit 9231d5e

Browse files
committed
refactor(Accordion): use generic OrientationContext
1 parent 73b43f1 commit 9231d5e

File tree

3 files changed

+5
-11
lines changed

3 files changed

+5
-11
lines changed

packages/react-ui/src/components/accordion/accordion-root.tsx

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ import { type KeyboardEvent, useState } from "react";
33
import { useControllableState } from "../../hooks";
44
import type { PrimitiveProps } from "../../primitives";
55
import { CompositeContext, type CompositeContextValue } from "../../primitives/composite/composite-context";
6+
import { OrientationContext } from "../../primitives/composite/orientation-context";
67
import type { MultipleValueProps, Orientation, SingleValueProps } from "../../shared/types";
78
import { tx } from "../../utils";
8-
import { CollapsibleOrientationContext } from "../collapsible/collapsible-orientation-context";
99
import { type AccordionBaseProps, AccordionContext, type AccordionContextValue } from "./accordion-context";
1010

1111
type AccordionSingleProps = {
@@ -105,9 +105,9 @@ export const AccordionRoot = (props: PrimitiveProps<"div", AccordionRootProps>)
105105
{...rest}
106106
>
107107
<AccordionContext value={context}>
108-
<CollapsibleOrientationContext value={orientation}>
108+
<OrientationContext value={orientation}>
109109
<CompositeContext value={compositeContext}>{children}</CompositeContext>
110-
</CollapsibleOrientationContext>
110+
</OrientationContext>
111111
</AccordionContext>
112112
</Composite>
113113
);

packages/react-ui/src/components/collapsible/collapsible-content.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
import { type CSSProperties, useEffect, useRef, useState } from "react";
22
import { useIsomorphicEffect, useMergeRefs } from "../../hooks";
33
import type { EmptyObject, PrimitiveProps } from "../../primitives";
4+
import { useOrientation } from "../../primitives/composite/orientation-context";
45
import { tx } from "../../utils";
56
import { useCollapsibleContent } from "./collapsible-context";
6-
import { useCollapsibleOrientation } from "./collapsible-orientation-context";
77

88
export const CollapsibleContent = (props: PrimitiveProps<"div", EmptyObject, "id">) => {
99
const { children, ref, ...rest } = props;
1010

1111
const { id, open, mounted, status, setElement } = useCollapsibleContent();
1212

13-
const orientation = useCollapsibleOrientation(true);
13+
const orientation = useOrientation(true);
1414

1515
const elemRef = useRef<HTMLDivElement>(null);
1616
const [size, setSize] = useState<{ width?: number; height?: number }>();

packages/react-ui/src/components/collapsible/collapsible-orientation-context.ts

-6
This file was deleted.

0 commit comments

Comments
 (0)