refactor: make display and display value independent

zakodium-oss · Aug 23, 2023 · eae54c1 · eae54c1
1 parent dada7ee
commit eae54c1
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/src/components/roi/annotation/ConvexHullAnnotation.tsx b/src/components/roi/annotation/ConvexHullAnnotation.tsx
@@ -38,11 +38,11 @@ function ConvexHullAnnotation({ roi }: ConvexHullAnnotationProps) {
     [fontColor, fontSize],
   );
 
-  if (!enabled) return null;
+  if (!enabled && !displayValue) return null;
 
   return (
     <g>
-      <polygon points={svgPoints} style={polygonStyle} />
+      {enabled && <polygon points={svgPoints} style={polygonStyle} />}
       {displayValue && (
         <text x={roi.width / 2} y={roi.height + 1} style={textStyle}>
           {roi.convexHull.surface}

diff --git a/src/components/roi/annotation/FeretAnnotation.tsx b/src/components/roi/annotation/FeretAnnotation.tsx
@@ -53,7 +53,7 @@ function FeretAnnotation({ roi }: FeretAnnotationProps) {
     [fontColor, fontSize],
   );
 
-  if (!enabled) return null;
+  if (!enabled && !displayValue) return null;
 
   return (
     <>
@@ -66,7 +66,9 @@ function FeretAnnotation({ roi }: FeretAnnotationProps) {
             // eslint-disable-next-line react/no-array-index-key
             key={`${roi.id}-${index}`}
           >
-            <line x1={x1} y1={y1} x2={x2} y2={y2} style={lineStyle} />
+            {enabled && (
+              <line x1={x1} y1={y1} x2={x2} y2={y2} style={lineStyle} />
+            )}
             {displayValue && (
               <text
                 x={0}

diff --git a/src/components/roi/annotation/MBRAnnotation.tsx b/src/components/roi/annotation/MBRAnnotation.tsx
@@ -36,13 +36,12 @@ function MBRAnnotation({ roi }: MBRAnnotationProps) {
     }),
     [fontColor, fontSize],
   );
-  if (!enabled) {
-    return null;
-  }
+
+  if (!enabled && !displayValue) return null;
 
   return (
     <g>
-      <polygon points={svgPoints} style={polygonStyle} />
+      {enabled && <polygon points={svgPoints} style={polygonStyle} />}
       {displayValue && (
         <text x={roi.width / 2} y={-1} style={textStyle}>
           {roi.width} x {roi.height} ({roi.surface} pixels)