Merge branch 'main' into feature/vertical_bar_chart

CodeForAfrica · Aug 6, 2024 · 4147a7c · 4147a7c
2 parents 6fdcb3d + 07435b0
commit 4147a7c
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 272 deletions.
diff --git a/apps/climatemappedafrica/src/components/HURUmap/Chart/TreemapChartScope.js b/apps/climatemappedafrica/src/components/HURUmap/Chart/TreemapChartScope.js
diff --git a/apps/climatemappedafrica/src/components/HURUmap/Chart/configureScope.js b/apps/climatemappedafrica/src/components/HURUmap/Chart/configureScope.js
@@ -2,7 +2,6 @@ import { Scope } from "@hurumap/core";
 
 import MultiLineChartScope from "./MultiLineChartScope";
 import StackedChartScope from "./StackedChartScope";
-import TreemapChartScope from "./TreemapChartScope";
 import VerticalStackedChartScope from "./VerticalStackedChartScope";
 
 import { hurumapArgs } from "@/climatemappedafrica/config";
@@ -12,6 +11,7 @@ const {
   BarChartScope,
   LineChartScope,
   DonutChartScope,
+  TreemapChartScope,
   VerticalBarChartScope,
 } = Scope;
 
@@ -78,7 +78,7 @@ export default function configureScope(
       vegaSpec = DonutChartScope(scopeOptions);
       break;
     case "treemap":
-      vegaSpec = TreemapChartScope(..._scopeOptions);
+      vegaSpec = TreemapChartScope(scopeOptions);
       break;
     case "stacked":
       if (isMobile) {

diff --git a/apps/pesayetu/src/components/HURUmap/Chart/configureScope.js b/apps/pesayetu/src/components/HURUmap/Chart/configureScope.js
@@ -2,7 +2,6 @@ import { Scope } from "@hurumap/core";
 
 import MultiLineChartScope from "./MultiLineChartScope";
 import StackedChartScope from "./StackedChartScope";
-import TreemapChartScope from "./TreemapChartScope";
 import VerticalStackedChartScope from "./VerticalStackedChartScope";
 
 import { hurumapArgs } from "@/pesayetu/config";
@@ -12,6 +11,7 @@ const {
   BarChartScope,
   LineChartScope,
   DonutChartScope,
+  TreemapChartScope,
   VerticalBarChartScope,
 } = Scope;
 
@@ -78,7 +78,7 @@ export default function configureScope(
       vegaSpec = DonutChartScope(scopeOptions);
       break;
     case "treemap":
-      vegaSpec = TreemapChartScope(..._scopeOptions);
+      vegaSpec = TreemapChartScope(scopeOptions);
       break;
     case "stacked":
       if (isMobile) {

diff --git a/...onents/HURUmap/Chart/TreemapChartScope.js → ...rumap-core/src/Scope/TreemapChartScope.js b/...onents/HURUmap/Chart/TreemapChartScope.js → ...rumap-core/src/Scope/TreemapChartScope.js
@@ -2,9 +2,7 @@ import merge from "deepmerge";
 
 import Scope from "./Scope";
 
-import theme from "@/pesayetu/theme";
-
-export default function TreemapChartScope(
+export default function TreemapChartScope({
   primaryData,
   metadata,
   config,
@@ -14,39 +12,44 @@ export default function TreemapChartScope(
   profileNames,
   isCompare,
   isMobile,
-) {
+  theme,
+  args,
+}) {
   const { primary_group: primaryGroup } = metadata;
   const nestedFields = config?.nest_fields ?? [primaryGroup]; // if nest fields are undefined, make use primaryGroup
+  const transform = [
+    {
+      type: "nest",
+      keys: nestedFields,
+    },
+    {
+      type: "treemap",
+      field: { signal: "datatype[Units]" },
+      method: { signal: "layout" },
+      ratio: { signal: "aspectRatio" },
+      size: [
+        {
+          signal:
+            "isCompare && data('secondary').length > 1 && !isMobile ? width/2 -30: width",
+        },
+        { signal: "isCompare && isMobile ? height/2 : height" },
+      ],
+    },
+  ];
 
   return merge(
-    Scope(
+    Scope({
       primaryData,
       metadata,
       config,
       secondaryData,
       primaryParentData,
       secondaryParentData,
-      "treemap",
-      [
-        {
-          type: "nest",
-          keys: nestedFields,
-        },
-        {
-          type: "treemap",
-          field: { signal: "datatype[Units]" },
-          method: { signal: "layout" },
-          ratio: { signal: "aspectRatio" },
-          size: [
-            {
-              signal:
-                "isCompare && data('secondary').length > 1 && !isMobile ? width/2 -30: width",
-            },
-            { signal: "isCompare && isMobile ? height/2 : height" },
-          ],
-        },
-      ],
-    ),
+      chartType: "treemap",
+      transform,
+      theme,
+      args,
+    }),
     {
       height: isMobile && isCompare && secondaryData?.length > 1 ? 760 : 380,
       signals: [

diff --git a/packages/hurumap-core/src/Scope/index.js b/packages/hurumap-core/src/Scope/index.js
@@ -2,6 +2,7 @@ import BarChartScope from "./BarChartScope";
 import DonutChartScope from "./DonutChartScope";
 import LineChartScope from "./LineChartScope";
 import Scope from "./Scope";
+import TreemapChartScope from "./TreemapChartScope";
 import VerticalBarChartScope from "./VerticalBarChartScope";
 
 export default {
@@ -10,4 +11,5 @@ export default {
   LineChartScope,
   DonutChartScope,
   VerticalBarChartScope,
+  TreemapChartScope,
 };