Rallly is an open-source scheduling and collaboration tool designed to make organizing events and meetings easier.
TypeScript i18nextnext-authnextjspostgresqlprismareact-emailt3-stacktailwindcsstrpcturborepotypescriptzod
✨ Expand results (#815)
Luke Vellaa9e41b2f0d18
diff --git a/apps/web/public/locales/en/app.json b/apps/web/public/locales/en/app.jsonindex ce9d058a3..f3a2c8e07 100644--- a/apps/web/public/locales/en/app.json+++ b/apps/web/public/locales/en/app.json@@ -223,5 +223,9 @@"notToday": "Not Today","supportProject": "Support this project","features": "Get access to all current and future Pro features!",- "continueAsGuest": "Continue as Guest"+ "continueAsGuest": "Continue as Guest",+ "scrollLeft": "Scroll Left",+ "scrollRight": "Scroll Right",+ "shrink": "Shrink",+ "expand": "Expand"}diff --git a/apps/web/src/components/poll/desktop-poll.tsx b/apps/web/src/components/poll/desktop-poll.tsxindex 441b5dac6..17d042d9b 100644--- a/apps/web/src/components/poll/desktop-poll.tsx+++ b/apps/web/src/components/poll/desktop-poll.tsx@@ -1,14 +1,17 @@import {ArrowLeftIcon,ArrowRightIcon,+ ExpandIcon,PlusIcon,+ ShrinkIcon,Users2Icon,} from "@rallly/icons";import { cn } from "@rallly/ui";import { Button } from "@rallly/ui/button";+import { Tooltip, TooltipContent, TooltipTrigger } from "@rallly/ui/tooltip";import { Trans, useTranslation } from "next-i18next";import * as React from "react";-import { useScroll } from "react-use";+import { useMeasure, useScroll } from "react-use";import { TimesShownIn } from "@/components/clock";import { useVotingForm, VotingForm } from "@/components/poll/voting-form";@@ -66,6 +69,8 @@ const DesktopPoll: React.FunctionComponent = () => {const mode = votingForm.watch("mode");+ const [measureRef, { height }] = useMeasure<HTMLDivElement>();+const { canAddNewParticipant } = usePermissions();const goToNextPage = () => {@@ -74,6 +79,16 @@ const DesktopPoll: React.FunctionComponent = () => {}};+ const [expanded, setExpanded] = React.useState(false);++ const expand = () => {+ setExpanded(true);+ };++ const collapse = () => {+ setExpanded(false);+ };+const goToPreviousPage = () => {if (scrollRef.current) {scrollRef.current.scrollLeft -= 240;@@ -89,150 +104,203 @@ const DesktopPoll: React.FunctionComponent = () => {const { x } = useScroll(scrollRef);return (- <div className="flex flex-col">- <div className="flex h-14 shrink-0 items-center justify-between rounded-t-md border-b bg-gradient-to-b from-gray-50 to-gray-100/50 px-4 py-3">- <div>- {mode !== "view" ? (- <div>- <Trans- t={t}- i18nKey="saveInstruction"- values={{- action: mode === "new" ? t("continue") : t("save"),- }}- components={{ b: <strong /> }}- />- </div>- ) : (- <div className="flex items-center gap-2">- <Users2Icon className="h-5 w-5 shrink-0" />- <div className="font-semibold">- {t("participants", { count: participants.length })} (- {participants.length})- </div>- {canAddNewParticipant ? (- <Button- className="ml-2"- size="sm"- data-testid="add-participant-button"- icon={PlusIcon}- onClick={() => {- votingForm.newParticipant();+ <div ref={measureRef} style={{ height: expanded ? height : undefined }}>+ <div+ className={cn(+ expanded+ ? "shadow-huge absolute left-1/2 max-w-[calc(100vw-64px)] -translate-x-1/2 -translate-y-1 rounded-md border bg-white"+ : "",+ )}+ >+ <div className="flex h-14 shrink-0 items-center justify-between rounded-t-md border-b bg-gradient-to-b from-gray-50 to-gray-100/50 px-4 py-3">+ <div>+ {mode !== "view" ? (+ <div>+ <Trans+ t={t}+ i18nKey="saveInstruction"+ values={{+ action: mode === "new" ? t("continue") : t("save"),}}+ components={{ b: <strong /> }}/>- ) : null}+ </div>+ ) : (+ <div className="flex items-center gap-2">+ <Users2Icon className="h-5 w-5 shrink-0" />+ <div className="font-semibold">+ {t("participants", { count: participants.length })} (+ {participants.length})+ </div>+ {canAddNewParticipant ? (+ <Button+ className="ml-2"+ size="sm"+ data-testid="add-participant-button"+ icon={PlusIcon}+ onClick={() => {+ votingForm.newParticipant();+ }}+ />+ ) : null}+ </div>+ )}+ </div>+ <div className="flex items-center gap-4">+ <div className="text-sm font-medium">+ {t("optionCount", { count: poll.options.length })}</div>- )}+ {isOverflowing || expanded ? (+ <div className="flex gap-2">+ <Tooltip>+ <TooltipTrigger asChild>+ <Button disabled={x === 0} onClick={goToPreviousPage}>+ <ArrowLeftIcon className="h-4 w-4" />+ </Button>+ </TooltipTrigger>+ <TooltipContent>+ <Trans i18nKey="scrollLeft" defaults="Scroll Left" />+ </TooltipContent>+ </Tooltip>+ <Tooltip>+ <TooltipTrigger asChild>+ <Button+ disabled={Boolean(+ scrollRef.current &&+ x + scrollRef.current.offsetWidth >=+ scrollRef.current.scrollWidth,+ )}+ onClick={() => {+ goToNextPage();+ }}+ >+ <ArrowRightIcon className="h-4 w-4" />+ </Button>+ </TooltipTrigger>+ <TooltipContent>+ <Trans i18nKey="scrollRight" defaults="Scroll Right" />+ </TooltipContent>+ </Tooltip>+ {expanded ? (+ <Tooltip>+ <TooltipTrigger asChild>+ <Button+ icon={ShrinkIcon}+ onClick={() => {+ collapse();+ }}+ />+ </TooltipTrigger>+ <TooltipContent>+ <Trans i18nKey="shrink" defaults="Shrink" />+ </TooltipContent>+ </Tooltip>+ ) : (+ <Tooltip>+ <TooltipTrigger asChild>+ <Button+ icon={ExpandIcon}+ onClick={() => {+ expand();+ }}+ />+ </TooltipTrigger>+ <TooltipContent>+ <Trans i18nKey="expand" defaults="Expand" />+ </TooltipContent>+ </Tooltip>+ )}+ </div>+ ) : null}+ </div></div>- <div className="flex items-center gap-3">- <div className="font-semibold">- {t("optionCount", { count: poll.options.length })}+ {poll.options[0].duration !== 0 ? (+ <div className="border-b bg-gray-50 p-3">+ <TimesShownIn /></div>- {isOverflowing ? (- <div className="flex gap-2">- <Button disabled={x === 0} onClick={goToPreviousPage}>- <ArrowLeftIcon className="h-4 w-4" />- </Button>+ ) : null}+ <div className="relative">+ <div+ aria-hidden="true"+ className={cn(+ "pointer-events-none absolute bottom-2 left-[240px] top-0 z-30 w-4 border-l bg-gradient-to-r from-gray-800/5 via-transparent to-transparent transition-opacity",+ x > 0 ? "opacity-100" : "opacity-0",+ )}+ />+ <div+ ref={scrollRef}+ className="scrollbar-thin hover:scrollbar-thumb-gray-400 scrollbar-thumb-gray-300 scrollbar-track-gray-100 relative z-10 flex-grow overflow-auto scroll-smooth pb-3 pr-3"+ >+ <table className="w-full table-auto border-separate border-spacing-0 ">+ <thead>+ <PollHeader />+ </thead>+ <tbody>+ {mode === "new" ? (+ <>+ <ParticipantRowForm />+ <tr aria-hidden="true">+ <td colSpan={poll.options.length + 1} className="py-2" />+ </tr>+ </>+ ) : null}+ {visibleParticipants.length > 0+ ? visibleParticipants.map((participant, i) => {+ return (+ <ParticipantRow+ key={i}+ participant={participant}+ editMode={+ votingForm.watch("participantId") === participant.id+ }+ onChangeEditMode={(isEditing) => {+ if (isEditing) {+ votingForm.setEditingParticipantId(+ participant.id,+ );+ }+ }}+ />+ );+ })+ : null}+ </tbody>+ </table>+ </div>+ </div>+ {mode !== "view" ? (+ <div className="flex shrink-0 items-center border-t bg-gray-50">+ <div className="flex w-full items-center justify-between gap-3 p-3"><Button- disabled={Boolean(- scrollRef.current &&- x + scrollRef.current.offsetWidth >=- scrollRef.current.scrollWidth,- )}onClick={() => {- goToNextPage();+ votingForm.cancel();}}>- <ArrowRightIcon className="h-4 w-4" />+ {t("cancel")}</Button>- </div>- ) : null}- </div>- </div>- {poll.options[0].duration !== 0 ? (- <div className="border-b bg-gray-50 p-3">- <TimesShownIn />- </div>- ) : null}- <div className="relative">- <div- aria-hidden="true"- className={cn(- "pointer-events-none absolute bottom-2 left-[240px] top-0 z-30 w-4 border-l bg-gradient-to-r from-gray-800/5 via-transparent to-transparent transition-opacity",- x > 0 ? "opacity-100" : "opacity-0",- )}- />- <div- ref={scrollRef}- className="scrollbar-thin hover:scrollbar-thumb-gray-400 scrollbar-thumb-gray-300 scrollbar-track-gray-100 relative z-10 flex-grow overflow-auto scroll-smooth pb-3 pr-3"- >- <table className="w-full table-auto border-separate border-spacing-0 ">- <thead>- <PollHeader />- </thead>- <tbody>{mode === "new" ? (- <>- <ParticipantRowForm />- <tr aria-hidden="true">- <td colSpan={poll.options.length + 1} className="py-2" />- </tr>- </>- ) : null}- {visibleParticipants.length > 0- ? visibleParticipants.map((participant, i) => {- return (- <ParticipantRow- key={i}- participant={participant}- editMode={- votingForm.watch("participantId") === participant.id- }- onChangeEditMode={(isEditing) => {- if (isEditing) {- votingForm.setEditingParticipantId(participant.id);- }- }}- />- );- })- : null}- </tbody>- </table>- </div>- </div>- {mode !== "view" ? (- <div className="flex shrink-0 items-center border-t bg-gray-50">- <div className="flex w-full items-center justify-between gap-3 p-3">- <Button- onClick={() => {- votingForm.cancel();- }}- >- {t("cancel")}- </Button>- {mode === "new" ? (- <Button- form="voting-form"- type="submit"- variant="primary"- loading={votingForm.formState.isSubmitting}- >- {t("continue")}- </Button>- ) : (- <Button- form="voting-form"- type="submit"- variant="primary"- loading={votingForm.formState.isSubmitting}- >- {t("save")}- </Button>- )}+ <Button+ form="voting-form"+ type="submit"+ variant="primary"+ loading={votingForm.formState.isSubmitting}+ >+ {t("continue")}+ </Button>+ ) : (+ <Button+ form="voting-form"+ type="submit"+ variant="primary"+ loading={votingForm.formState.isSubmitting}+ >+ {t("save")}+ </Button>+ )}+ </div></div>- </div>- ) : null}+ ) : null}+ </div></div>);};diff --git a/packages/ui/button.tsx b/packages/ui/button.tsxindex f3a4fdce7..60e0ab518 100644--- a/packages/ui/button.tsx+++ b/packages/ui/button.tsx@@ -6,7 +6,7 @@ import * as React from "react";import { cn } from "./lib/utils";const buttonVariants = cva(- "inline-flex border font-medium disabled:text-muted-foreground disabled:bg-gray-200 disabled:pointer-events-none select-none items-center justify-center gap-x-2 whitespace-nowrap rounded-md border",+ "inline-flex border font-medium disabled:text-muted-foreground focus:ring-1 focus:ring-gray-200 disabled:bg-muted disabled:pointer-events-none select-none items-center justify-center gap-x-2 whitespace-nowrap rounded-md border",{variants: {variant: {diff --git a/packages/ui/tooltip.tsx b/packages/ui/tooltip.tsxindex 09de0fbf5..139e55cb3 100644--- a/packages/ui/tooltip.tsx+++ b/packages/ui/tooltip.tsx@@ -14,12 +14,13 @@ const TooltipTrigger = TooltipPrimitive.Trigger;const TooltipContent = React.forwardRef<React.ElementRef<typeof TooltipPrimitive.Content>,React.ComponentPropsWithoutRef<typeof TooltipPrimitive.Content>->(({ className, sideOffset = 4, ...props }, ref) => (+>(({ className, sideOffset = 4, side = "bottom", ...props }, ref) => (<TooltipPrimitive.Contentref={ref}sideOffset={sideOffset}+ side={side}className={cn(- "bg-foreground text-background z-50 overflow-hidden rounded-md px-3 py-1.5 text-sm shadow-md",+ "z-50 overflow-hidden rounded-md bg-gray-700 px-2 py-1.5 text-sm text-gray-50 shadow-md",className,)}{...props}