Skip to content

fix(elements): keep branch switching with consumer className #465

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

Open
ephraimduncan wants to merge 1 commit into
base: main
Choose a base branch
from
+33 −2
Open

fix(elements): keep branch switching with consumer className #465

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
29 changes: 29 additions & 0 deletions packages/elements/__tests__/message.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,6 +201,35 @@ describe("messageBranchContent", () => {

expect(screen.getByText("Branch 1")).toBeInTheDocument();
});

it("keeps exactly one branch visible when a consumer className is passed", async () => {
const user = userEvent.setup();

render(
<MessageBranch>
<MessageBranchContent className="rounded-md">
<div key="1">Branch 1</div>
<div key="2">Branch 2</div>
</MessageBranchContent>
<MessageBranchNext />
</MessageBranch>
);

const firstWrapper = screen.getByText("Branch 1").parentElement;
const secondWrapper = screen.getByText("Branch 2").parentElement;

expect(firstWrapper).toHaveClass("rounded-md", "grid");
expect(firstWrapper).not.toHaveClass("hidden");
expect(secondWrapper).toHaveClass("rounded-md", "hidden");
expect(secondWrapper).not.toHaveClass("grid");

await user.click(screen.getByRole("button", { name: NEXT_REGEX }));

expect(firstWrapper).toHaveClass("hidden");
expect(firstWrapper).not.toHaveClass("grid");
expect(secondWrapper).toHaveClass("rounded-md", "grid");
expect(secondWrapper).not.toHaveClass("hidden");
});
});

describe("messageBranchSelector", () => {
Expand Down
6 changes: 4 additions & 2 deletions packages/elements/src/message.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,6 +198,7 @@ export type MessageBranchContentProps = HTMLAttributes<HTMLDivElement>;

export const MessageBranchContent = ({
children,
className,
...props
}: MessageBranchContentProps) => {
const { currentBranch, setBranches, branches } = useMessageBranch();
Expand All @@ -216,8 +217,9 @@ export const MessageBranchContent = ({
return childrenArray.map((branch, index) => (
<div
className={cn(
"grid gap-2 overflow-hidden [&>div]:pb-0",
index === currentBranch ? "block" : "hidden"
"gap-2 overflow-hidden [&>div]:pb-0",
className,
index === currentBranch ? "grid" : "hidden"
)}
key={branch.key}
{...props}
Expand Down