@datawheel/data-explorer 1.1.16 → 1.1.17

package/dist/main.mjs

@@ -1990,11 +1990,11 @@ function QueryProvider({ children, defaultCube }) {
             if (currentDrilldown && currentDrilldown.members && currentDrilldown.members.length > 0 && !localeChanged && cube === queryItem.params.cube) {
               return Promise.resolve({
                 drilldown: currentDrilldown,
-                cut: buildCut({ ...currentDrilldown, active: false })
+                cut: buildCut({ ...currentDrilldown, active: false, members: [] })
               });
             } else {
               return fetchMembers(dd.level, newQuery == null ? void 0 : newQuery.params.locale, cube).then((levelMeta) => {
-                const cut = buildCut({ ...dd, active: false });
+                const cut = buildCut({ ...dd, active: false, members: [] });
                 return {
                   drilldown: {
                     ...dd,
@@ -3388,53 +3388,38 @@ function FullScreenSVG() {
 function isColumnSorted(column, key) {
   return column == key;
 }
-var propertiesUpdateHandler = (actions2, item, activeProps) => {
-  const properties = item.properties.map(
-    (prop) => buildProperty({
-      ...prop,
-      active: activeProps.includes(prop.key)
-    })
-  );
-  actions2.updateDrilldown({ ...item, properties });
-};
-var removeColumn = (actions2, entity, measures, drilldowns, type, queryItem, updateURL) => {
+var removeColumn = (queryItem, entity) => {
   const newQuery = buildQuery(cloneDeep(queryItem));
+  const params = newQuery.params;
   if ("aggregator" in entity) {
-    const measure = measures.find((d) => d.name === entity.name);
+    const measure = params.measures[entity.name];
     if (measure) {
-      const newMeasure = { ...measure, active: false };
-      actions2.updateMeasure(newMeasure);
-      newQuery.params.measures[newMeasure.name] = newMeasure;
-      updateURL({
-        ...newQuery,
-        params: {
-          ...newQuery.params
-        }
-      });
+      params.measures[entity.name] = { ...measure, active: false };
+      return newQuery;
     }
-  }
-  if ("depth" in entity) {
-    const drilldown = drilldowns.find((d) => d.level === entity.name);
+  } else if ("depth" in entity) {
+    const cut = params.cuts[entity.name];
+    if (cut) {
+      params.cuts[cut.key] = { ...cut, active: false };
+    }
+    const drilldown = params.drilldowns[entity.name];
     if (drilldown) {
-      const newDrilldown = { ...drilldown, active: false };
-      actions2.updateDrilldown(newDrilldown);
-      newQuery.params.drilldowns[newDrilldown.key] = newDrilldown;
-      updateURL({
-        ...newQuery,
-        params: {
-          ...newQuery.params
-        }
-      });
+      params.drilldowns[drilldown.key] = { ...drilldown, active: false };
+      return newQuery;
     }
-  }
-  if (isProperty(type)) {
-    const activeDrilldowns = drilldowns.filter((d) => d.active);
-    const drilldown = activeDrilldowns.find(
-      (dd) => dd.properties.some((property) => property.name === entity.name)
+  } else if ("level" in entity) {
+    const mapPropertyToDrilldown = Object.fromEntries(
+      Object.values(params.drilldowns).filter((drilldown2) => drilldown2.active).flatMap((drilldown2) => drilldown2.properties.map((prop) => [prop.name, drilldown2]))
     );
-    const activeProperties = drilldown == null ? void 0 : drilldown.properties.filter((p) => p.active).filter((p) => p.name !== entity.name).filter((p) => p.active).map((p) => p.name);
-    if (drilldown && activeProperties) {
-      propertiesUpdateHandler(actions2, drilldown, activeProperties);
+    const drilldown = mapPropertyToDrilldown[entity.name];
+    if (drilldown) {
+      params.drilldowns[drilldown.key] = {
+        ...drilldown,
+        properties: drilldown.properties.map(
+          (prop) => prop.name === entity.name ? { ...prop, active: false } : prop
+        )
+      };
+      return newQuery;
     }
   }
 };
@@ -3738,15 +3723,11 @@ function useTable({
                 key: `remove-${column2.columnDef.header}`,
                 disabled: !showTrashIcon(finalKeys, entityType) || isLoading || isFetching,
                 onClick: () => {
-                  removeColumn(
-                    actions2,
-                    entity,
-                    measures,
-                    drilldowns,
-                    entityType,
-                    queryItem,
-                    updateURL
-                  );
+                  const nextQueryItem = removeColumn(queryItem, entity);
+                  if (nextQueryItem) {
+                    actions2.resetAllParams(nextQueryItem.params);
+                    updateURL(nextQueryItem);
+                  }
                 },
                 showTooltip: !showTrashIcon(finalKeys, entityType),
                 size: 25,
@@ -4296,12 +4277,11 @@ function LevelItem({
   activeItems,
   depth = 0
 }) {
-  const [activeFilter, setActiveFilter] = useState(false);
   const [activePropertiesFilter, setActiveProperties] = useState(false);
   const { translate: t } = useTranslation();
   const actions2 = useActions();
   const cutItems = useSelector$1(selectCutItems);
-  let drilldowns = useSelector$1(selectDrilldownMap);
+  const drilldowns = useSelector$1(selectDrilldownMap);
   useSelector$1(selectDrilldownItems);
   const { idFormatters } = useidFormatters();
   const label = useMemo(() => {
@@ -4324,12 +4304,7 @@ function LevelItem({
   const isOtherHierarchySelected = activeItems.some(
     (activeItem) => activeItem.dimension === dimension.name && activeItem.hierarchy !== hierarchy.name
   );
-  const cut = cutItems.find((cut2) => {
-    return cut2.level === (currentDrilldown == null ? void 0 : currentDrilldown.level);
-  });
-  const updatecutHandler = (item, members) => {
-    actions2.updateCut({ ...item, members });
-  };
+  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;
@@ -4345,6 +4320,8 @@ function LevelItem({
           ...currentDrilldown,
           active: !currentDrilldown.active
         });
+        if (cut && cut.members.length > 0)
+          actions2.updateCut({ ...cut, active: !cut.active });
       },
       checked,
       label,
@@ -4356,22 +4333,28 @@ function LevelItem({
     {
       className: "dex-level-filter",
       size: "sm",
-      onClick: () => setActiveFilter((value) => !value),
+      onClick: () => {
+        const nextCut = buildCut(cut || level);
+        if (cut == null ? void 0 : cut.active) {
+          nextCut.active = false;
+          actions2.updateCut(nextCut);
+        } else {
+          actions2.updateDrilldown({ ...currentDrilldown, active: true });
+          nextCut.active = true;
+          actions2.updateCut(nextCut);
+        }
+      },
       disabled: isDisabled
     },
-    activeFilter ? /* @__PURE__ */ React21__default.createElement(IconFilterOff, null) : /* @__PURE__ */ React21__default.createElement(IconFilter, null)
-  ), properties && /* @__PURE__ */ React21__default.createElement(Tooltip, { label: t("params.add_metadata") }, /* @__PURE__ */ React21__default.createElement(ActionIcon, { onClick: () => setActiveProperties((value) => !value) }, /* @__PURE__ */ React21__default.createElement(IconAdjustments, null))), /* @__PURE__ */ React21__default.createElement(ThemeIcon, { size: "xs", color: "gray", variant: "light", bg: "transparent" }, /* @__PURE__ */ React21__default.createElement(StackSVG, null)))), activeFilter && /* @__PURE__ */ React21__default.createElement(Box, { pt: "md" }, /* @__PURE__ */ React21__default.createElement(
+    (cut == null ? void 0 : cut.active) ? /* @__PURE__ */ React21__default.createElement(IconFilterOff, null) : /* @__PURE__ */ React21__default.createElement(IconFilter, null)
+  ), properties && /* @__PURE__ */ React21__default.createElement(Tooltip, { label: t("params.add_metadata") }, /* @__PURE__ */ React21__default.createElement(ActionIcon, { onClick: () => setActiveProperties((value) => !value) }, /* @__PURE__ */ React21__default.createElement(IconAdjustments, null))), /* @__PURE__ */ React21__default.createElement(ThemeIcon, { size: "xs", color: "gray", variant: "light", bg: "transparent" }, /* @__PURE__ */ React21__default.createElement(StackSVG, null)))), (cut == null ? void 0 : cut.active) && /* @__PURE__ */ React21__default.createElement(Box, { pt: "md" }, /* @__PURE__ */ React21__default.createElement(
     MultiSelect,
     {
       sx: { flex: "1 1 100%" },
       searchable: true,
-      onChange: (value) => {
+      onChange: (members) => {
         if (cut) {
-          if (currentDrilldown.active && !cut.active) {
-            updatecutHandler({ ...cut, active: true }, value);
-          } else {
-            updatecutHandler(cut, value);
-          }
+          actions2.updateCut({ ...cut, active: currentDrilldown.active, members });
         }
       },
       placeholder: `Filter by ${label}`,
@@ -4396,7 +4379,7 @@ function PropertiesMultiSelect({ item }) {
   const locale = useSelector$1(selectLocale);
   const actions2 = useActions();
   const { translate: t } = useTranslation();
-  const propertiesUpdateHandler2 = useCallback(
+  const propertiesUpdateHandler = useCallback(
     (activeProps) => {
       const properties = item.properties.map(
         (prop) => buildProperty({
@@ -4428,7 +4411,7 @@ function PropertiesMultiSelect({ item }) {
     {
       sx: { flex: "1 1 100%" },
       searchable: true,
-      onChange: propertiesUpdateHandler2,
+      onChange: propertiesUpdateHandler,
       value: activeProperties || [],
       placeholder: `Filter by ${label}`,
       data: item.properties.map((property) => ({

package/package.json

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