From ee212d287193da9bff24af34d1bcb98dd9823c15 Mon Sep 17 00:00:00 2001
From: Kishan Sambhi <kss22@ic.ac.uk>
Date: Fri, 19 Jul 2024 15:38:17 +0100
Subject: [PATCH] refactor: move display condition out of ViewOnlyCanvas

---
 .../Task/variants/HandwritingTask/ViewOnlyCanvas.tsx         | 4 ++--
 .../Task/variants/HandwritingTask/index.tsx                  | 5 ++++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/components/questionStructure/Task/variants/HandwritingTask/ViewOnlyCanvas.tsx b/src/components/questionStructure/Task/variants/HandwritingTask/ViewOnlyCanvas.tsx
index 7430610..0b84a6f 100644
--- 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
index de17ea9..2b02e80 100644
--- 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">