@datawheel/data-explorer 1.3.1 → 1.3.2

package/dist/main.d.mts

@@ -220,6 +220,7 @@ interface TesseractLevel {
     properties: TesseractProperty[];
     type?: "geo" | "time" | string;
     count?: number;
+    time_scale?: string;
 }
 interface TesseractProperty {
     name: string;

package/dist/main.mjs

@@ -1987,12 +1987,8 @@ function pickDefaultDrilldowns(dimensions, cube) {
   for (const dimension of dimensions) {
     if (dimension.type === "time" || requiredDimensions.includes(dimension.name) || levels.length < 4) {
       const hierarchy = findDefaultHierarchy(dimension);
-      const hierarchyDepth = Math.max(...hierarchy.levels.map((l) => l.depth));
       const levelIndex = dimension.type === "geo" ? hierarchy.levels.length - 1 : 0;
       const defaultLevel = hierarchy.levels[levelIndex];
-      if (dimension.type === "time" && dimension.annotations.de_time_complete === "true" && defaultLevel.depth < hierarchyDepth) {
-        timeComplete = defaultLevel.name;
-      }
       levels.push({ ...defaultLevel, type: dimension.type });
     }
   }
@@ -2017,6 +2013,25 @@ function pickDefaultDrilldowns(dimensions, cube) {
       }
     }
   }
+  for (const dimension of dimensions) {
+    if (dimension.annotations.de_time_complete === "true") {
+      const hierarchy = findDefaultHierarchy(dimension);
+      const hierarchyLevels = hierarchy.levels;
+      const availableLevels = hierarchyLevels.filter((hl) => levels.some((l) => l.name === hl.name));
+      if (availableLevels.length > 0) {
+        const timeCompleteLevel = availableLevels.reduce(
+          (prev, curr) => curr.depth < prev.depth ? curr : prev
+        );
+        const deepestLevel = hierarchyLevels.reduce(
+          (prev, curr) => curr.depth > prev.depth ? curr : prev
+        );
+        const deepestLevelSelected = availableLevels.some((l) => l.depth === deepestLevel.depth);
+        if (timeCompleteLevel.depth < deepestLevel.depth && !deepestLevelSelected) {
+          timeComplete = timeCompleteLevel.name;
+        }
+      }
+    }
+  }
   let totalCount = calcMaxMemberCount(levels.map((l) => l.count));
   while (totalCount > 5e6) {
     const geoIndex = levels.findIndex((level) => level.type === "geo");
@@ -3271,7 +3286,8 @@ function useTable({
         range,
         isId
       } = keyCol;
-      const isNumeric = valueType === "number" && !/Year/i.test(columnKey);
+      const isYearDrilldown = entityType === "level" && entity.time_scale && /Year/i.test(columnKey);
+      const isNumeric = valueType === "number" && !isYearDrilldown;
       const formatterKey = getFormat(
         "aggregator" in entity ? entity : columnKey,
         isNumeric ? "Decimal" : "identity"
@@ -4324,7 +4340,9 @@ function FilterItem2({
       onChange: () => {
         if (!isLastSelected) {
           actions2.updateMeasure({ ...measure, active: !measure.active });
-          actions2.updateFilter({ ...filter, active: !checked });
+          if (checked) {
+            actions2.updateFilter({ ...filter, active: false });
+          }
         }
       },
       checked,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@datawheel/data-explorer",
-  "version": "1.3.1",
+  "version": "1.3.2",
   "main": "./dist/main.mjs",
   "types": "./dist/main.d.mts",
   "files": [