moved null return to after hooks

newrelic-experimental · Jun 19, 2024 · e424ba7 · e424ba7
1 parent d1c3abb
commit e424ba7
Showing 1 changed file with 10 additions and 7 deletions.
diff --git a/visualizations/store-map-viz/components/Region.tsx b/visualizations/store-map-viz/components/Region.tsx
@@ -16,11 +16,7 @@ const Region = ({
   const { regionColors } = useProps();
   const { customColors } = useCustomColors(regionColors, false);
 
-  if (!regionFeature) {
-    console.log("Region not found for data, will not render", location);
-    return null;
-  }
-
+
   const gradientColor = getGradientColor(location.value);
 
   const style = useMemo(() => {
@@ -53,18 +49,20 @@ const Region = ({
     location.status,
   ]);
 
+
+
   // determine the tooltip title, memoized to avoid unnecessary recalculations
   const getTooltipTitle = () => {
     if (location.tooltip_header === "NONE" || location.tooltip_header === "") {
       return null;
     }
     return location.tooltip_header
       ? location.tooltip_header
-      : regionFeature.name;
+      : regionFeature?.name;
   };
   const tooltipTitle = useMemo(getTooltipTitle, [
     location.tooltip_header,
-    regionFeature.name,
+    regionFeature?.name,
   ]);
 
   // extracted onClick handler
@@ -74,6 +72,11 @@ const Region = ({
     }
   };
 
+  if (!regionFeature) {
+    console.log("Region not found for data, will not render", location);
+    return null;
+  }
+
   return (
     <GeoJSON
       key={key + "-" + location.value + "-" + style.fillColor}