@datawheel/data-explorer 1.2.0-rc.3 → 1.2.0-rc.5

package/dist/main.mjs

@@ -1949,7 +1949,7 @@ function calcMaxMemberCount(lengths) {
 function pickDefaultDrilldowns(dimensions, cube) {
   var _a;
   const levels = [];
-  let timeComplete;
+  let timeComplete = void 0;
   let suggestedLevels = [];
   for (const key in cube.annotations) {
     if (key === "suggested_levels") {
@@ -1963,7 +1963,11 @@ function pickDefaultDrilldowns(dimensions, cube) {
       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) {
+      const suggestedLevelInHierarchy = hierarchy.levels.find(
+        (level) => suggestedLevels.includes(level.name)
+      );
+      const isSuggestedLevelDeepest = (suggestedLevelInHierarchy == null ? void 0 : suggestedLevelInHierarchy.depth) === hierarchyDepth;
+      if (dimension.type === "time" && dimension.annotations.de_time_complete === "true" && defaultLevel.depth < hierarchyDepth && !isSuggestedLevelDeepest) {
         timeComplete = defaultLevel.name;
       }
       levels.push({ ...defaultLevel, type: dimension.type });
@@ -3899,13 +3903,14 @@ function LevelItem({
     });
   }, [locale, dimension, hierarchy, level, isSubMenu, t]);
   const currentDrilldown = drilldowns[level.name];
-  const isOtherHierarchySelected = activeItems.some(
+  const otherHierarchyItems = activeItems.filter(
     (activeItem) => activeItem.dimension === dimension.name && activeItem.hierarchy !== hierarchy.name
   );
+  const isOtherHierarchySelected = otherHierarchyItems.length > 0;
   const cut = cutItems.find((cut2) => cut2.level === level.name);
   const checked = activeItems.map((i) => i.level).includes(level.name);
-  const disableUncheck = activeItems.length === 1 && checked;
-  const isDisabled = isOtherHierarchySelected && !checked;
+  const disableUncheck = activeItems.length === 1 && checked && !otherHierarchyItems.length;
+  const isDisabled = otherHierarchyItems.length || !checked;
   if (!currentDrilldown) return;
   const paddingLeft = `${5 * depth + 5}px`;
   const properties = currentDrilldown.properties.length ? currentDrilldown.properties : null;
@@ -3916,6 +3921,14 @@ function LevelItem({
       sx: { cursor: "pointer", paddingLeft },
       onChange: () => {
         var _a;
+        if (isOtherHierarchySelected) {
+          otherHierarchyItems.forEach((item) => {
+            actions2.updateDrilldown({
+              ...item,
+              active: false
+            });
+          });
+        }
         actions2.updateDrilldown({
           ...currentDrilldown,
           active: !currentDrilldown.active
@@ -3947,7 +3960,7 @@ function LevelItem({
       checked,
       label,
       size: "xs",
-      disabled: isDisabled || disableUncheck
+      disabled: disableUncheck
     }
   ), /* @__PURE__ */ React15__default.createElement(Group, { sx: { flexWrap: "nowrap" } }, /* @__PURE__ */ React15__default.createElement(
     ActionIcon,

package/package.json

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