refactor: move display condition out of ViewOnlyCanvas

the-answerbook-project · Jul 19, 2024 · ee212d2 · ee212d2
1 parent a531ff3
commit ee212d2
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/src/components/questionStructure/Task/variants/HandwritingTask/ViewOnlyCanvas.tsx b/src/components/questionStructure/Task/variants/HandwritingTask/ViewOnlyCanvas.tsx
@@ -24,7 +24,7 @@ export const ViewOnlyCanvas: React.FC<ViewOnlyCanvasProps> = ({ initialData }) =
     })
   }, [excalidrawAPI, initialData])
 
-  return initialData && initialData?.length ? (
+  return (
     <Card>
       <Box
         className="excalidraw-view-container excalidraw-box"
@@ -38,5 +38,5 @@ export const ViewOnlyCanvas: React.FC<ViewOnlyCanvasProps> = ({ initialData }) =
         />
       </Box>
     </Card>
-  ) : null
+  )
 }
diff --git a/src/components/questionStructure/Task/variants/HandwritingTask/index.tsx b/src/components/questionStructure/Task/variants/HandwritingTask/index.tsx
@@ -1,6 +1,7 @@
 import { Pencil2Icon } from '@radix-ui/react-icons'
 import { Button, Card, Dialog, Flex } from '@radix-ui/themes'
 import { MathJax } from 'better-react-mathjax'
+import { isEmpty } from 'lodash'
 import { FC } from 'react'
 import { useParams } from 'react-router-dom'
 
@@ -26,7 +27,9 @@ export const HandwritingTask: FC<HandwritingTaskProps> = ({
   return (
     <Dialog.Root>
       <Dialog.Trigger>
-        <ViewOnlyCanvas initialData={answer?.excalidraw?.elements ?? []} />
+        {!isEmpty(answer?.excalidraw?.elements) && (
+          <ViewOnlyCanvas initialData={answer!.excalidraw.elements} />
+        )}
       </Dialog.Trigger>
       <Flex gap="3" align="center">
         <Card className="latex-preview">