Skip to content

Rallly is an open-source scheduling and collaboration tool designed to make organizing events and meetings easier.

💄 Switch to breadcrumb component on new poll page

Luke Vella554c510a65dd
diff --git a/apps/web/src/app/[locale]/(app)/(optional-space)/new/page.tsx b/apps/web/src/app/[locale]/(app)/(optional-space)/new/page.tsx
index 1946224ba..029732447 100644
--- a/apps/web/src/app/[locale]/(app)/(optional-space)/new/page.tsx
+++ b/apps/web/src/app/[locale]/(app)/(optional-space)/new/page.tsx
@@ -1,6 +1,13 @@
+import {
+ Breadcrumb,
+ BreadcrumbItem,
+ BreadcrumbLink,
+ BreadcrumbList,
+ BreadcrumbPage,
+ BreadcrumbSeparator,
+} from "@rallly/ui/breadcrumb";
+import { BarChart2Icon } from "lucide-react";
import type { Metadata } from "next";
-
-import { PollPageIcon } from "@/app/components/page-icons";
import { CreatePoll } from "@/components/create-poll";
import { UserDropdown } from "@/components/user-dropdown";
import { isQuickCreateEnabled } from "@/features/quick-create";
@@ -10,7 +17,6 @@ import {
createPrivateSSRHelper,
createPublicSSRHelper,
} from "@/trpc/server/create-ssr-helper";
-import { BackButton } from "./back-button";
export default async function Page() {
const helpers = isQuickCreateEnabled
@@ -23,18 +29,26 @@ export default async function Page() {
<div className="absolute inset-0 h-dvh overflow-auto bg-gray-100 dark:bg-gray-900">
<div className="sticky top-0 z-20 border-b bg-gray-100/90 p-3 backdrop-blur-md sm:grid-cols-3 dark:bg-gray-900/90">
<div className="mx-auto flex items-center justify-between gap-x-2">
- <div className="flex items-center gap-x-4 sm:flex-1">
- <BackButton />
- </div>
- <div className="flex flex-1 sm:justify-center">
- <div className="flex items-center gap-x-2">
- <PollPageIcon size="xs" />
- <div className="flex items-baseline gap-x-8">
- <h1 className="font-semibold">
- <Trans i18nKey="poll" defaults="Poll" />
- </h1>
- </div>
- </div>
+ <div className="sm:flex-1">
+ <Breadcrumb>
+ <BreadcrumbList>
+ <BreadcrumbItem>
+ <BreadcrumbLink
+ href="/polls"
+ className="flex items-center gap-x-2"
+ >
+ <BarChart2Icon className="size-4" />
+ <Trans i18nKey="polls" defaults="Polls" />
+ </BreadcrumbLink>
+ </BreadcrumbItem>
+ <BreadcrumbSeparator />
+ <BreadcrumbItem>
+ <BreadcrumbPage>
+ <Trans i18nKey="newPoll" defaults="New Poll" />
+ </BreadcrumbPage>
+ </BreadcrumbItem>
+ </BreadcrumbList>
+ </Breadcrumb>
</div>
<div className="flex flex-1 justify-end">
<UserDropdown />
diff --git a/packages/ui/src/breadcrumb.tsx b/packages/ui/src/breadcrumb.tsx
index b760473f4..763852ce1 100644
--- a/packages/ui/src/breadcrumb.tsx
+++ b/packages/ui/src/breadcrumb.tsx
@@ -1,114 +1,121 @@
-import { Slot } from "@radix-ui/react-slot";
-import { ChevronRight, MoreHorizontal } from "lucide-react";
-import * as React from "react";
-
+import { mergeProps } from "@base-ui/react/merge-props";
+import { useRender } from "@base-ui/react/use-render";
+import { ChevronRightIcon, MoreHorizontalIcon } from "lucide-react";
+import type * as React from "react";
import { cn } from "./lib/utils";
-const Breadcrumb = React.forwardRef<
- HTMLElement,
- React.ComponentPropsWithoutRef<"nav"> & {
- separator?: React.ReactNode;
- }
->(({ ...props }, ref) => <nav ref={ref} aria-label="breadcrumb" {...props} />);
-Breadcrumb.displayName = "Breadcrumb";
+function Breadcrumb({ className, ...props }: React.ComponentProps<"nav">) {
+ return (
+ <nav
+ aria-label="breadcrumb"
+ data-slot="breadcrumb"
+ className={cn(className)}
+ {...props}
+ />
+ );
+}
-const BreadcrumbList = React.forwardRef<
- HTMLOListElement,
- React.ComponentPropsWithoutRef<"ol">
->(({ className, ...props }, ref) => (
- <ol
- ref={ref}
- className={cn(
- "wrap-break-word flex flex-wrap items-center gap-1.5 text-muted-foreground text-sm sm:gap-2.5",
- className,
- )}
- {...props}
- />
-));
-BreadcrumbList.displayName = "BreadcrumbList";
+function BreadcrumbList({ className, ...props }: React.ComponentProps<"ol">) {
+ return (
+ <ol
+ data-slot="breadcrumb-list"
+ className={cn(
+ "wrap-break-word flex flex-wrap items-center gap-1.5 text-muted-foreground text-sm",
+ className,
+ )}
+ {...props}
+ />
+ );
+}
-const BreadcrumbItem = React.forwardRef<
- HTMLLIElement,
- React.ComponentPropsWithoutRef<"li">
->(({ className, ...props }, ref) => (
- <li
- ref={ref}
- className={cn("inline-flex items-center gap-1.5", className)}
- {...props}
- />
-));
-BreadcrumbItem.displayName = "BreadcrumbItem";
+function BreadcrumbItem({ className, ...props }: React.ComponentProps<"li">) {
+ return (
+ <li
+ data-slot="breadcrumb-item"
+ className={cn("inline-flex items-center gap-1", className)}
+ {...props}
+ />
+ );
+}
-const BreadcrumbLink = React.forwardRef<
- HTMLAnchorElement,
- React.ComponentPropsWithoutRef<"a"> & {
- asChild?: boolean;
- }
->(({ asChild, className, ...props }, ref) => {
- const Comp = asChild ? Slot : "a";
+function BreadcrumbLink({
+ className,
+ render,
+ ...props
+}: useRender.ComponentProps<"a">) {
+ return useRender({
+ defaultTagName: "a",
+ props: mergeProps<"a">(
+ {
+ className: cn("transition-colors hover:text-foreground", className),
+ },
+ props,
+ ),
+ render,
+ state: {
+ slot: "breadcrumb-link",
+ },
+ });
+}
+function BreadcrumbPage({ className, ...props }: React.ComponentProps<"span">) {
return (
- <Comp
- ref={ref}
- className={cn("transition-colors hover:text-foreground", className)}
+ <span
+ data-slot="breadcrumb-page"
+ role="presentation"
+ aria-disabled="true"
+ aria-current="page"
+ className={cn("font-normal text-foreground", className)}
{...props}
/>
);
-});
-BreadcrumbLink.displayName = "BreadcrumbLink";
+}
-const BreadcrumbPage = React.forwardRef<
- HTMLSpanElement,
- React.ComponentPropsWithoutRef<"span">
->(({ className, ...props }, ref) => (
- <span
- ref={ref}
- aria-disabled="true"
- aria-current="page"
- className={cn("font-normal text-foreground", className)}
- {...props}
- />
-));
-BreadcrumbPage.displayName = "BreadcrumbPage";
-
-const BreadcrumbSeparator = ({
+function BreadcrumbSeparator({
children,
className,
...props
-}: React.ComponentProps<"li">) => (
- <li
- role="presentation"
- aria-hidden="true"
- className={cn("[&>svg]:h-3.5 [&>svg]:w-3.5", className)}
- {...props}
- >
- {children ?? <ChevronRight />}
- </li>
-);
-BreadcrumbSeparator.displayName = "BreadcrumbSeparator";
+}: React.ComponentProps<"li">) {
+ return (
+ <li
+ data-slot="breadcrumb-separator"
+ role="presentation"
+ aria-hidden="true"
+ className={cn("[&>svg]:size-3.5", className)}
+ {...props}
+ >
+ {children ?? <ChevronRightIcon className="cn-rtl-flip" />}
+ </li>
+ );
+}
-const BreadcrumbEllipsis = ({
+function BreadcrumbEllipsis({
className,
...props
-}: React.ComponentProps<"span">) => (
- <span
- role="presentation"
- aria-hidden="true"
- className={cn("flex h-9 w-9 items-center justify-center", className)}
- {...props}
- >
- <MoreHorizontal className="h-4 w-4" />
- <span className="sr-only">More</span>
- </span>
-);
-BreadcrumbEllipsis.displayName = "BreadcrumbEllipsis";
+}: React.ComponentProps<"span">) {
+ return (
+ <span
+ data-slot="breadcrumb-ellipsis"
+ role="presentation"
+ aria-hidden="true"
+ className={cn(
+ "flex size-5 items-center justify-center [&>svg]:size-4",
+ className,
+ )}
+ {...props}
+ >
+ <MoreHorizontalIcon />
+ <span className="sr-only">More</span>
+ </span>
+ );
+}
export {
Breadcrumb,
- BreadcrumbEllipsis,
+ BreadcrumbList,
BreadcrumbItem,
BreadcrumbLink,
- BreadcrumbList,
BreadcrumbPage,
BreadcrumbSeparator,
+ BreadcrumbEllipsis,
};