diff --git a/packages/next/src/elements/Nav/index.tsx b/packages/next/src/elements/Nav/index.tsx index 2cd4ec6ee..f71156e26 100644 --- a/packages/next/src/elements/Nav/index.tsx +++ b/packages/next/src/elements/Nav/index.tsx @@ -1,7 +1,7 @@ import type { EntityToGroup } from '@payloadcms/ui/shared' import type { ServerProps } from 'payload' -import { Link, Logout } from '@payloadcms/ui' +import { Logout } from '@payloadcms/ui' import { RenderServerComponent } from '@payloadcms/ui/elements/RenderServerComponent' import { EntityType, groupNavItems } from '@payloadcms/ui/shared' import React from 'react' @@ -73,7 +73,6 @@ export const DefaultNav: React.FC = async (props) => { const LogoutComponent = RenderServerComponent({ clientProps: { documentSubViewType, - Link, viewType, }, Component: logout?.Button, diff --git a/packages/next/src/views/Dashboard/Default/index.tsx b/packages/next/src/views/Dashboard/Default/index.tsx index 957763241..112d91594 100644 --- a/packages/next/src/views/Dashboard/Default/index.tsx +++ b/packages/next/src/views/Dashboard/Default/index.tsx @@ -17,7 +17,12 @@ export type DashboardProps = { lockDuration?: number slug: string }> - Link: React.ComponentType + /** + * @deprecated + * This prop is deprecated and will be removed in the next major version. + * Components now import their own `Link` directly from `next/link`. + */ + Link?: React.ComponentType navGroups?: ReturnType permissions: SanitizedPermissions visibleEntities: VisibleEntities @@ -28,7 +33,6 @@ export const DefaultDashboard: React.FC = (props) => { globalData, i18n, i18n: { t }, - Link, locale, navGroups, params, @@ -146,7 +150,6 @@ export const DefaultDashboard: React.FC = (props) => { el="link" icon="plus" iconStyle="with-border" - Link={Link} round to={createHREF} /> @@ -155,7 +158,6 @@ export const DefaultDashboard: React.FC = (props) => { buttonAriaLabel={buttonAriaLabel} href={href} id={`card-${slug}`} - Link={Link} title={getTranslation(label, i18n)} titleAs="h3" /> diff --git a/packages/next/src/views/Dashboard/index.tsx b/packages/next/src/views/Dashboard/index.tsx index 6a1b1b795..b59eaaab1 100644 --- a/packages/next/src/views/Dashboard/index.tsx +++ b/packages/next/src/views/Dashboard/index.tsx @@ -1,7 +1,7 @@ import type { EntityToGroup } from '@payloadcms/ui/shared' import type { AdminViewProps } from 'payload' -import { HydrateAuthProvider, Link, SetStepNav } from '@payloadcms/ui' +import { HydrateAuthProvider, SetStepNav } from '@payloadcms/ui' import { RenderServerComponent } from '@payloadcms/ui/elements/RenderServerComponent' import { EntityType, groupNavItems } from '@payloadcms/ui/shared' import React, { Fragment } from 'react' @@ -107,7 +107,6 @@ export const Dashboard: React.FC = async ({ {RenderServerComponent({ clientProps: { - Link, locale, }, Component: config.admin?.components?.views?.dashboard?.Component, diff --git a/packages/next/src/views/ForgotPassword/index.tsx b/packages/next/src/views/ForgotPassword/index.tsx index 5337ed089..3cdbebaf9 100644 --- a/packages/next/src/views/ForgotPassword/index.tsx +++ b/packages/next/src/views/ForgotPassword/index.tsx @@ -52,7 +52,7 @@ export const ForgotPasswordView: React.FC = ({ initPageResult }) } heading={i18n.t('authentication:alreadyLoggedIn')} /> - diff --git a/packages/next/src/views/Logout/LogoutClient.tsx b/packages/next/src/views/Logout/LogoutClient.tsx index 397ebec52..88fba7f02 100644 --- a/packages/next/src/views/Logout/LogoutClient.tsx +++ b/packages/next/src/views/Logout/LogoutClient.tsx @@ -1,7 +1,6 @@ 'use client' import { Button, - Link, LoadingOverlay, toast, useAuth, @@ -69,7 +68,7 @@ export const LogoutClient: React.FC<{ return (

{t('authentication:loggedOutInactivity')}

-
diff --git a/packages/next/src/views/NotFound/index.client.tsx b/packages/next/src/views/NotFound/index.client.tsx index 5a47b9938..872c01cc3 100644 --- a/packages/next/src/views/NotFound/index.client.tsx +++ b/packages/next/src/views/NotFound/index.client.tsx @@ -1,5 +1,5 @@ 'use client' -import { Button, Gutter, Link, useConfig, useStepNav, useTranslation } from '@payloadcms/ui' +import { Button, Gutter, useConfig, useStepNav, useTranslation } from '@payloadcms/ui' import React, { useEffect } from 'react' import './index.scss' @@ -39,13 +39,7 @@ export const NotFoundClient: React.FC<{

{t('general:nothingFound')}

{t('general:sorryNotFound')}

- diff --git a/packages/next/src/views/ResetPassword/index.tsx b/packages/next/src/views/ResetPassword/index.tsx index 1f1330b04..7c090bc88 100644 --- a/packages/next/src/views/ResetPassword/index.tsx +++ b/packages/next/src/views/ResetPassword/index.tsx @@ -5,8 +5,8 @@ import { formatAdminURL, Translation } from '@payloadcms/ui/shared' import React from 'react' import { FormHeader } from '../../elements/FormHeader/index.js' -import './index.scss' import { ResetPasswordForm } from './ResetPasswordForm/index.js' +import './index.scss' export const resetPasswordBaseClass = 'reset-password' @@ -57,7 +57,7 @@ export const ResetPassword: React.FC = ({ initPageResult, params } heading={i18n.t('authentication:alreadyLoggedIn')} /> - diff --git a/packages/next/src/views/Unauthorized/index.tsx b/packages/next/src/views/Unauthorized/index.tsx index e90b558e5..86fd9d370 100644 --- a/packages/next/src/views/Unauthorized/index.tsx +++ b/packages/next/src/views/Unauthorized/index.tsx @@ -1,6 +1,6 @@ import type { AdminViewComponent, PayloadServerReactComponent } from 'payload' -import { Button, Link } from '@payloadcms/ui' +import { Button } from '@payloadcms/ui' import { formatAdminURL } from '@payloadcms/ui/shared' import React from 'react' @@ -41,7 +41,6 @@ export const UnauthorizedView: PayloadServerReactComponent = ) : ( -