Scheduling infrastructure for absolutely everyone.
fix: Remove all links legacyBehavior (#25585)
Volnei Munhoz19ac0139c16a
diff --git a/apps/web/components/apps/make/Setup.tsx b/apps/web/components/apps/make/Setup.tsxindex 105339b2d17..f51599ce3d5 100644--- a/apps/web/components/apps/make/Setup.tsx+++ b/apps/web/components/apps/make/Setup.tsx@@ -1,5 +1,4 @@import type { InferGetServerSidePropsType } from "next";-import Link from "next/link";import { useState } from "react";import { Toaster } from "sonner";@@ -71,9 +70,10 @@ export default function MakeSetup({ inviteLink }: InferGetServerSidePropsType<ty<div className="bg-default m-auto max-w-[43em] overflow-auto rounded pb-10 md:p-10"><div className="md:flex md:flex-row"><div className="invisible md:visible">+ {/* eslint-disable @next/next/no-img-element */}<img className="h-11" src="/api/app-store/make/icon.svg" alt="Make Logo" /></div>- <div className="ml-2 ltr:mr-2 rtl:ml-2 md:ml-5">+ <div className="ml-2 md:ml-5 ltr:mr-2 rtl:ml-2"><div className="text-default">{t("setting_up_make")}</div><>@@ -134,9 +134,9 @@ export default function MakeSetup({ inviteLink }: InferGetServerSidePropsType<ty<li>{t("make_setup_instructions_5")}</li><li>{t("make_setup_instructions_6")}</li></ol>- <Link href="/apps/installed/automation?hl=make" passHref={true} legacyBehavior>- <Button color="secondary">{t("done")}</Button>- </Link>+ <Button href="/apps/installed/automation?hl=make" color="secondary">+ {t("done")}+ </Button></div></div></div>diff --git a/apps/web/modules/auth/forgot-password/[id]/forgot-password-single-view.tsx b/apps/web/modules/auth/forgot-password/[id]/forgot-password-single-view.tsxindex acd1397da71..66056bf1f42 100644--- a/apps/web/modules/auth/forgot-password/[id]/forgot-password-single-view.tsx+++ b/apps/web/modules/auth/forgot-password/[id]/forgot-password-single-view.tsx@@ -45,12 +45,10 @@ function Expired() {<h2 className="text-emphasis text-center text-3xl font-extrabold">{t("request_is_expired")}</h2></div><p>{t("request_is_expired_instructions")}</p>- <Link href="/auth/forgot-password" passHref legacyBehavior>- <button- type="button"- className="flex w-full justify-center px-4 py-2 text-sm font-medium text-blue-600 focus:outline-none focus:ring-2 focus:ring-black focus:ring-offset-2">- {t("try_again")}- </button>+ <Link+ href="/auth/forgot-password"+ className="flex w-full justify-center px-4 py-2 text-sm font-medium text-blue-600 focus:outline-none focus:ring-2 focus:ring-black focus:ring-offset-2">+ {t("try_again")}</Link></div></>diff --git a/apps/web/modules/bookings/views/bookings-single-view.tsx b/apps/web/modules/bookings/views/bookings-single-view.tsxindex 4f45739c531..e7acd2d8319 100644--- a/apps/web/modules/bookings/views/bookings-single-view.tsx+++ b/apps/web/modules/bookings/views/bookings-single-view.tsx@@ -53,7 +53,6 @@ import { EmptyScreen } from "@calcom/ui/components/empty-screen";import { EmailInput, TextArea } from "@calcom/ui/components/form";import { Icon } from "@calcom/ui/components/icon";import { showToast } from "@calcom/ui/components/toast";-import { Tooltip } from "@calcom/ui/components/tooltip";import { useCalcomTheme } from "@calcom/ui/styles";import CancelBooking from "@calcom/web/components/booking/CancelBooking";import EventReservationSchema from "@calcom/web/components/schemas/EventReservationSchema";@@ -801,15 +800,14 @@ export default function Success(props: PageProps) {</span>{/* Login button but redirect to here */}<span className="text-default inline">- <span className="underline" data-testid="reschedule-link">- <Link- href={`/auth/login?callbackUrl=${encodeURIComponent(- `/booking/${bookingInfo?.uid}`- )}`}- legacyBehavior>- {t("login")}- </Link>- </span>+ <Link+ href={`/auth/login?callbackUrl=${encodeURIComponent(+ `/booking/${bookingInfo?.uid}`+ )}`}+ className="underline"+ data-testid="reschedule-link">+ {t("login")}+ </Link></span></div></>@@ -839,17 +837,16 @@ export default function Success(props: PageProps) {canReschedule &&!isRescheduleDisabled && (<span className="text-default inline">- <span className="underline" data-testid="reschedule-link">- <Link- href={`/reschedule/${seatReferenceUid || bookingInfo?.uid}${- currentUserEmail- ? `?rescheduledBy=${encodeURIComponent(currentUserEmail)}`- : ""- }`}- legacyBehavior>- {t("reschedule")}- </Link>- </span>+ <Link+ href={`/reschedule/${seatReferenceUid || bookingInfo?.uid}${+ currentUserEmail+ ? `?rescheduledBy=${encodeURIComponent(currentUserEmail)}`+ : ""+ }`}+ className="underline"+ data-testid="reschedule-link">+ {t("reschedule")}+ </Link>{!isBookingInPast && canCancel && (<span className="mx-2">{t("or_lowercase")}</span>)}diff --git a/packages/app-store/_components/AppNotInstalledMessage.tsx b/packages/app-store/_components/AppNotInstalledMessage.tsxindex 5a9ce94d3b1..b2d293c7f2f 100644--- a/packages/app-store/_components/AppNotInstalledMessage.tsx+++ b/packages/app-store/_components/AppNotInstalledMessage.tsx@@ -1,5 +1,3 @@-import Link from "next/link";-import { useLocale } from "@calcom/lib/hooks/useLocale";import { Button } from "@calcom/ui/components/button";import { Icon } from "@calcom/ui/components/icon";@@ -17,12 +15,10 @@ export default function AppNotInstalledMessage({ appName }: { appName: string })<p className="text-subtle px-1 leading-normal">{t("visit_our_app_store")}</p><div className="mt-5">- <Link href={`/apps/${appName}`} passHref={true} legacyBehavior>- <Button type="button" color="secondary">- {t("go_to_app_store")}- <Icon name="arrow-up-right" className="ml-1" size={20} />- </Button>- </Link>+ <Button href={`/apps/${appName}`} type="button" color="secondary">+ {t("go_to_app_store")}+ <Icon name="arrow-up-right" className="ml-1" size={20} />+ </Button></div></div></div>diff --git a/packages/ui/components/button/Button.tsx b/packages/ui/components/button/Button.tsxindex fcd87c1f9dc..f5810ce570c 100644--- a/packages/ui/components/button/Button.tsx+++ b/packages/ui/components/button/Button.tsx@@ -239,25 +239,17 @@ export const Button = forwardRef<HTMLAnchorElement | HTMLButtonElement, ButtonPr...passThroughProps} = props;// Buttons are **always** disabled if we're in a `loading` state- const disabled = props.disabled || loading;- // If pass an `href`-attr is passed it's `<a>`, otherwise it's a `<button />`+ const disabled = props.disabled || loading || false;+ // If pass an `href`-attr is passed it's Link, otherwise it's a `<button />`const isLink = typeof props.href !== "undefined";- const elementType = isLink ? "a" : "button";- const element = React.createElement(- elementType,- {- ...passThroughProps,- disabled,- type: !isLink ? type : undefined,- ref: forwardedRef,- className: classNames(buttonClasses({ color, size, loading, variant }), props.className),- // if we click a disabled button, we prevent going through the click handler- onClick: disabled- ? (e: React.MouseEvent<HTMLElement, MouseEvent>) => {- e.preventDefault();- }- : props.onClick,- },+ const buttonClassName = classNames(buttonClasses({ color, size, loading, variant }), props.className);+ const handleClick = disabled+ ? (e: React.MouseEvent<HTMLElement, MouseEvent>) => {+ e.preventDefault();+ }+ : props.onClick;++ const buttonContent = (<>{CustomStartIcon ||(StartIcon && (@@ -334,18 +326,36 @@ export const Button = forwardRef<HTMLAnchorElement | HTMLButtonElement, ButtonPr</>);- return props.href ? (- <Link data-testid="link-component" passHref href={props.href} shallow={shallow && shallow} legacyBehavior>- {element}- </Link>- ) : (+ // Render Link or button separately to avoid type conflicts+ // Link manages its own anchor element, so we don't pass ref to it+ if (isLink) {+ return (+ <Link+ {...(passThroughProps as Omit<JSX.IntrinsicElements["a"], "href" | "onClick" | "ref"> & LinkProps)}+ shallow={shallow && shallow}+ className={buttonClassName}+ onClick={handleClick}>+ {buttonContent}+ </Link>+ );+ }++ return (<Wrapperdata-testid="wrapper"tooltip={props.tooltip}tooltipSide={tooltipSide}tooltipOffset={tooltipOffset}tooltipClassName={tooltipClassName}>- {element}+ <button+ {...(passThroughProps as Omit<JSX.IntrinsicElements["button"], "onClick" | "ref">)}+ ref={forwardedRef as React.Ref<HTMLButtonElement>}+ disabled={disabled}+ type={type as "button" | "submit" | "reset"}+ className={buttonClassName}+ onClick={handleClick}>+ {buttonContent}+ </button></Wrapper>);});diff --git a/packages/ui/components/dropdown/Dropdown.tsx b/packages/ui/components/dropdown/Dropdown.tsxindex 3a8e168f53a..599505e2ea1 100644--- a/packages/ui/components/dropdown/Dropdown.tsx+++ b/packages/ui/components/dropdown/Dropdown.tsx@@ -143,19 +143,14 @@ type ButtonOrLinkProps = ComponentProps<"button"> & ComponentProps<"a">;export function ButtonOrLink({ href, ...props }: ButtonOrLinkProps) {const isLink = typeof href !== "undefined";- const ButtonOrLink = isLink ? "a" : "button";-- const content = <ButtonOrLink {...props} />;if (isLink) {- return (- <Link href={href} legacyBehavior>- {content}- </Link>- );+ // Strip ref from props when using Link (Link manages its own anchor element)+ const { ref: _ref, ...linkProps } = props;+ return <Link href={href} {...linkProps} />;}- return content;+ return <button {...props} />;}export const DropdownItem = (props: DropdownItemProps) => {diff --git a/packages/ui/components/form/step/Stepper.tsx b/packages/ui/components/form/step/Stepper.tsxindex 3bbaba5ce40..fa75f401126 100644--- a/packages/ui/components/form/step/Stepper.tsx+++ b/packages/ui/components/form/step/Stepper.tsx@@ -26,32 +26,39 @@ function Stepper<T extends DefaultStep>(props: {<ol role="list" className="ml-8 flex items-center space-x-5" ref={stepperRef}>{steps.map((mapStep, index) => (<li key={mapStep.title}>- <Link- href={props.disableSteps ? "#" : `${href}?step=${index + 1}`}- shallow- replace- legacyBehavior>- {index + 1 < props.step ? (- <a className="hover:bg-inverted block h-2.5 w-2.5 rounded-full bg-gray-600">- <span className="sr-only">{mapStep.title}</span>- </a>- ) : index + 1 === props.step ? (- <a className="relative flex items-center justify-center" aria-current="step">- <span className="absolute flex h-5 w-5 p-px" aria-hidden="true">- <span className="bg-emphasis h-full w-full rounded-full" />- </span>- <span- className="relative block h-2.5 w-2.5 rounded-full bg-gray-600"- aria-hidden="true"- />- <span className="sr-only">{mapStep.title}</span>- </a>- ) : (- <a className="bg-emphasis block h-2.5 w-2.5 rounded-full hover:bg-gray-400">- <span className="sr-only">{mapStep.title}</span>- </a>- )}- </Link>+ {index + 1 < props.step ? (+ <Link+ href={props.disableSteps ? "#" : `${href}?step=${index + 1}`}+ shallow+ replace+ className="hover:bg-inverted block h-2.5 w-2.5 rounded-full bg-gray-600">+ <span className="sr-only">{mapStep.title}</span>+ </Link>+ ) : index + 1 === props.step ? (+ <Link+ href={props.disableSteps ? "#" : `${href}?step=${index + 1}`}+ shallow+ replace+ className="relative flex items-center justify-center"+ aria-current="step">+ <span className="absolute flex h-5 w-5 p-px" aria-hidden="true">+ <span className="bg-emphasis h-full w-full rounded-full" />+ </span>+ <span+ className="relative block h-2.5 w-2.5 rounded-full bg-gray-600"+ aria-hidden="true"+ />+ <span className="sr-only">{mapStep.title}</span>+ </Link>+ ) : (+ <Link+ href={props.disableSteps ? "#" : `${href}?step=${index + 1}`}+ shallow+ replace+ className="bg-emphasis block h-2.5 w-2.5 rounded-full hover:bg-gray-400">+ <span className="sr-only">{mapStep.title}</span>+ </Link>+ )}</li>))}</ol>diff --git a/packages/ui/components/list/List.tsx b/packages/ui/components/list/List.tsxindex 31eb72a488f..1487bb970d1 100644--- a/packages/ui/components/list/List.tsx+++ b/packages/ui/components/list/List.tsx@@ -57,7 +57,7 @@ export function ListItem(props: ListItemProps) {);return href ? (- <Link passHref href={href} legacyBehavior>+ <Link href={href}>{element}</Link>) : (