Merge pull request #4194 from serlo/refactor/article-remove-next-import

refactor(article): replace frontend link comp
serlo · Oct 16, 2024 · 67b6921 · 67b6921
2 parents 9a0e055 + be4512f
commit 67b6921
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/packages/editor/src/plugin/helpers/editor-renderer.tsx b/packages/editor/src/plugin/helpers/editor-renderer.tsx
@@ -9,7 +9,7 @@ export interface PluginStaticRenderer {
 export type MathRenderer = ComponentType<MathElement>
 export type LinkRenderer = React.FunctionComponent<{
   href: string
-  children: JSX.Element | null
+  children: JSX.Element | string | null
 }>
 
 export interface InitRenderersArgs {

diff --git a/packages/editor/src/plugins/article/static.tsx b/packages/editor/src/plugins/article/static.tsx
@@ -1,8 +1,8 @@
+import { editorRenderers } from '@editor/plugin/helpers/editor-renderer'
 import {
   EditorArticleDocument,
   EditorMultimediaDocument,
 } from '@editor/types/editor-plugins'
-import { Link } from '@serlo/frontend/src/components/content/link'
 
 import { ArticleRenderer } from './renderer'
 import { StaticRenderer } from '../../static-renderer/static-renderer'
@@ -39,6 +39,8 @@ export function ArticleStaticRenderer({
     <StaticRenderer document={{ ...introduction, plugin: 'multimedia' }} />
   )
 
+  const LinkRenderer = editorRenderers.getLinkRenderer()
+
   return (
     <ArticleRenderer
       introduction={introductionOrNull}
@@ -73,9 +75,7 @@ export function ArticleStaticRenderer({
       <>
         {items.map(({ id, title }) => (
           <li key={id}>
-            <a className="serlo-link" href={`/${id}`}>
-              {title}
-            </a>
+            <LinkRenderer href={`/${id}`}>{title}</LinkRenderer>
           </li>
         ))}
       </>
@@ -100,7 +100,7 @@ export function ArticleStaticRenderer({
           {sources.map((source) => (
             <li key={source.href} className="!mb-0">
               {source.href ? (
-                <Link href={source.href}>{source.title}</Link>
+                <LinkRenderer href={source.href}>{source.title}</LinkRenderer>
               ) : (
                 source.title
               )}

diff --git a/packages/editor/src/plugins/solution/static.tsx b/packages/editor/src/plugins/solution/static.tsx
@@ -33,7 +33,7 @@ export function StaticSolutionRenderer({
 
   const prerequisiteElement = hasPrerequisite ? (
     <LinkRenderer href={prerequisite.alias ?? `/${prerequisite.id}`}>
-      <>{prerequisite.title}</>
+      {prerequisite.title}
     </LinkRenderer>
   ) : null