Rallly is an open-source scheduling and collaboration tool designed to make organizing events and meetings easier.
TypeScript i18nextnext-authnextjspostgresqlprismareact-emailt3-stacktailwindcsstrpcturborepotypescriptzod
🧹 Remove legacy tooltip (#838)
Luke Vella7e3932d99fd9
diff --git a/apps/web/src/components/event-card.tsx b/apps/web/src/components/event-card.tsxindex ca99ed20d..f63f2f2d9 100644--- a/apps/web/src/components/event-card.tsx+++ b/apps/web/src/components/event-card.tsx@@ -7,7 +7,6 @@ import { DateIcon } from "@/components/date-icon";import { ParticipantAvatarBar } from "@/components/participant-avatar-bar";import { useParticipants } from "@/components/participants-provider";import { PollStatusBadge } from "@/components/poll-status";-import { TextSummary } from "@/components/text-summary";import { Trans } from "@/components/trans";import { IfParticipantsVisible } from "@/components/visibility";import { usePoll } from "@/contexts/poll";@@ -110,10 +109,8 @@ export const EventCard = () => {{poll.description ? (<div className="flex gap-4"><TextIcon className="h-4 w-4 shrink-0 translate-y-1" />- <div className="border-primary whitespace-pre-line leading-relaxed">- <TruncatedLinkify>- <TextSummary text={preventWidows(poll.description)} />- </TruncatedLinkify>+ <div className="whitespace-pre-line leading-relaxed">+ <TruncatedLinkify>{poll.description}</TruncatedLinkify></div></div>) : null}diff --git a/apps/web/src/components/featurebase.tsx b/apps/web/src/components/featurebase.tsxindex e4c20cfa2..b83d97c7d 100644--- a/apps/web/src/components/featurebase.tsx+++ b/apps/web/src/components/featurebase.tsx@@ -2,11 +2,10 @@ import { trpc } from "@rallly/backend";import { HelpCircleIcon } from "@rallly/icons";import { cn } from "@rallly/ui";import { Button } from "@rallly/ui/button";-import { TooltipContent, TooltipTrigger } from "@rallly/ui/tooltip";+import { Tooltip, TooltipContent, TooltipTrigger } from "@rallly/ui/tooltip";import Script from "next/script";import React from "react";-import Tooltip from "@/components/tooltip";import { Trans } from "@/components/trans";import { isFeedbackEnabled } from "@/utils/constants";diff --git a/apps/web/src/components/poll/truncated-linkify.tsx b/apps/web/src/components/poll/truncated-linkify.tsxindex 9f71f0d9e..7fba052ff 100644--- a/apps/web/src/components/poll/truncated-linkify.tsx+++ b/apps/web/src/components/poll/truncated-linkify.tsx@@ -1,9 +1,8 @@+import { Tooltip, TooltipContent, TooltipTrigger } from "@rallly/ui/tooltip";import Link from "next/link";import * as React from "react";import ReactLinkify from "react-linkify";-import LegacyTooltip from "../tooltip";-export const truncateLink = (href: string, text: string, key: number) => {const textWithoutProtocol = text.replace(/^https?:\/\//i, "");const beginningOfPath = textWithoutProtocol.indexOf("/");@@ -17,6 +16,7 @@ export const truncateLink = (href: string, text: string, key: number) => {<LinkclassName="text-link"key={key}+ target="_blank"href={href}rel="nofollow noreferrer">@@ -26,16 +26,21 @@ export const truncateLink = (href: string, text: string, key: number) => {} else {finalText += "…";return (- <LegacyTooltip- key={key}- content={- <div className="max-w-md break-all font-mono text-xs">{href}</div>- }- >- <Link className="text-link" href={href} rel="nofollow noreferrer">- {finalText}- </Link>- </LegacyTooltip>+ <Tooltip>+ <TooltipTrigger asChild>+ <Link+ className="text-link"+ target="_blank"+ href={href}+ rel="nofollow noreferrer"+ >+ {finalText}+ </Link>+ </TooltipTrigger>+ <TooltipContent className="max-w-md break-all font-mono text-xs">+ {href}+ </TooltipContent>+ </Tooltip>);}};diff --git a/apps/web/src/components/tooltip.tsx b/apps/web/src/components/tooltip.tsxdeleted file mode 100644index be0f66a7c..000000000--- a/apps/web/src/components/tooltip.tsx+++ /dev/null@@ -1,23 +0,0 @@-import { Tooltip, TooltipContent, TooltipTrigger } from "@rallly/ui/tooltip";-import * as React from "react";--export interface TooltipProps {- children?: React.ReactNode;- content?: React.ReactNode;- className?: string;-}--const LegacyTooltip: React.FunctionComponent<TooltipProps> = ({- className,- children,- content,-}) => {- return (- <Tooltip>- <TooltipTrigger className={className}>{children}</TooltipTrigger>- <TooltipContent>{content}</TooltipContent>- </Tooltip>- );-};--export default React.memo(LegacyTooltip);