Skip to content

Preserve the current docs page in translation links #8738

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
yuncic wants to merge 1 commit into from
Closed

Preserve the current docs page in translation links #8738

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion src/components/Layout/TopNav/TopNav.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,12 @@ export default function TopNav({
const [isScrolled, setIsScrolled] = useState(false);
const scrollParentRef = useRef<HTMLDivElement>(null);
const {asPath} = useRouter();
const translationsHref =
section === 'learn' || section === 'reference'
? `/community/translations?from=${encodeURIComponent(
asPath.split(/[?#]/)[0]
)}`
: '/community/translations';

// HACK. Fix up the data structures instead.
if ((routeTree as any).routes.length === 1) {
Expand Down Expand Up @@ -378,7 +384,7 @@ export default function TopNav({
</div>
<div className="flex">
<Link
href="/community/translations"
href={translationsHref}
aria-label="Translations"
className="active:scale-95 transition-transform flex w-12 h-12 rounded-full items-center justify-center hover:bg-primary/5 hover:dark:bg-primary-dark/5 outline-link">
{languageIcon}
Expand Down
9 changes: 8 additions & 1 deletion src/components/MDX/MDXComponents.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
import {Children, useContext, useMemo} from 'react';
import * as React from 'react';
import cn from 'classnames';
import {useRouter} from 'next/router';
import type {HTMLAttributes} from 'react';

import CodeBlock from './CodeBlock';
Expand Down Expand Up @@ -469,6 +470,9 @@ function InlineTocItem({items}: {items: Array<NestedTocNode>}) {
type TranslationProgress = 'complete' | 'in-progress';

function LanguageList({progress}: {progress: TranslationProgress}) {
const from = useRouter().query.from;
const pathname =
typeof from === 'string' && /^\/(?!\/)[^\\?#]*$/.test(from) ? from : '';
const allLanguages = React.useContext(LanguagesContext) ?? [];
const languages = allLanguages
.filter(
Expand All @@ -484,7 +488,10 @@ function LanguageList({progress}: {progress: TranslationProgress}) {
{languages.map(({code, name, enName}) => {
return (
<LI key={code}>
<Link href={`https://${code}.react.dev/`}>
<Link
href={`https://${code}.react.dev${
progress === 'complete' ? pathname || '/' : '/'
}`}>
{enName} ({name})
</Link>{' '}
&mdash;{' '}
Expand Down
Loading