fix: meaning/reading hints (closes #22)

Lemmmy · May 5, 2024 · 29ab85f · 29ab85f
1 parent 0018e99
commit 29ab85f
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/src/pages/subject/SubjectInfo.tsx b/src/pages/subject/SubjectInfo.tsx
@@ -175,7 +175,11 @@ export function SubjectInfo(props: SubjectInfoProps): JSX.Element {
       </SubjectMarkup>
 
       {/* Kanji meaning hint */}
-      {objectType === "kanji" && <SubjectInfoHint data={kanjiSubjectData} header="Meaning hint" />}
+      {objectType === "kanji" && <SubjectInfoHint header="Reading hint">
+        {kanjiSubjectData.meaning_hint && <SubjectMarkup>
+          {kanjiSubjectData.meaning_hint}
+        </SubjectMarkup>}
+      </SubjectInfoHint>}
 
       {/* Study material meaning notes */}
       <StudyMaterialNote
@@ -202,7 +206,11 @@ export function SubjectInfo(props: SubjectInfoProps): JSX.Element {
       </SubjectMarkup>
 
       {/* Kanji reading hint */}
-      {objectType === "kanji" && <SubjectInfoHint data={kanjiSubjectData} header="Reading hint" />}
+      {objectType === "kanji" && <SubjectInfoHint header="Reading hint">
+        {kanjiSubjectData.reading_hint && <SubjectMarkup>
+          {kanjiSubjectData.reading_hint}
+        </SubjectMarkup>}
+      </SubjectInfoHint>}
 
       {/* Study material reading notes */}
       <StudyMaterialNote

diff --git a/src/pages/subject/SubjectInfoHint.tsx b/src/pages/subject/SubjectInfoHint.tsx
@@ -5,32 +5,24 @@
 import { ReactNode } from "react";
 import classNames from "classnames";
 
-import { ApiSubjectKanjiInner } from "@api";
-import { SubjectMarkup } from "@comp/subjects/SubjectMarkup.tsx";
-
 interface Props {
   header: ReactNode;
-  data?: ApiSubjectKanjiInner;
   children?: ReactNode;
   className?: string;
 }
 
 export function SubjectInfoHint({
   header,
-  data,
   children,
   className
 }: Props): JSX.Element | null {
-  const hasData = data?.meaning_hint || children;
-  if (!hasData) return null;
+  if (!children) return null;
 
   return <div className={classNames("mt-lg p-md bg-container rounded", className)}>
     <h4 className="mt-0 mb-xs text-desc text-sm font-bold uppercase">
       {header}
     </h4>
 
-    {children || (data?.meaning_hint && <SubjectMarkup>
-      {data.meaning_hint}
-    </SubjectMarkup>)}
+    {children}
   </div>;
 }