@haniffalab/cherita-react 1.0.0-dev.2025-03-13.274a553c → 1.0.0-dev.2025-03-24.4a3636c2

package/dist/cjs/components/obs-list/ObsList.js

@@ -150,7 +150,7 @@ function ObsColsList(_ref) {
     });
     dispatch({
       type: "set.colorEncoding",
-      value: "obs"
+      value: _constants.COLOR_ENCODINGS.OBS
     });
   };
   const toggleObs = (item, value) => {

package/dist/cjs/components/obsm-list/ObsmList.js

@@ -36,7 +36,7 @@ function ObsmKeysList() {
     refetchOnMount: false
   });
   (0, _react.useEffect)(() => {
-    if (!isPending && !serverError) {
+    if (!isPending && !serverError && fetchedData) {
       setObsmKeysList(fetchedData);
     }
   }, [fetchedData, isPending, serverError]);

package/dist/cjs/components/pseudospatial/Pseudospatial.js

@@ -133,7 +133,7 @@ function Pseudospatial(_ref) {
     serverError
   } = usePseudospatialData(plotType);
   (0, _react.useEffect)(() => {
-    if (!isPending && !serverError) {
+    if (!isPending && !serverError && fetchedData) {
       setData(fetchedData.data);
       setLayout(fetchedData.layout);
       updateColorscale(colorscale.current);

package/dist/cjs/components/var-list/VarItem.js

@@ -119,7 +119,7 @@ function SingleSelectionItem(_ref3) {
     refetchOnMount: false,
     enabled: !!dataset.diseaseDatasets.length
   });
-  const hasDiseaseInfo = !isPending && !serverError && !!fetchedData.length;
+  const hasDiseaseInfo = !isPending && !serverError && !!fetchedData?.length;
   return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("div", {
     className: `d-flex justify-content-between ${hasDiseaseInfo ? "cursor-pointer" : ""}`,
     onClick: () => {
@@ -202,13 +202,17 @@ function VarItem(_ref5) {
       });
       dispatch({
         type: "set.colorEncoding",
-        value: "var"
+        value: _constants.COLOR_ENCODINGS.VAR
       });
     } else if (mode === _constants.SELECTION_MODES.MULTIPLE) {
       dispatch({
         type: "select.multivar",
         var: item
       });
+      dispatch({
+        type: "set.colorEncoding",
+        value: _constants.COLOR_ENCODINGS.VAR
+      });
     }
   };
   const removeVar = () => {

package/dist/cjs/components/var-list/VarList.js

@@ -48,6 +48,11 @@ const useVarMean = function (varKeys) {
   });
 };
 
+// ensure nulls are lowest values
+const sortMeans = (i, means) => {
+  return means[i.name] || _lodash.default.min(_lodash.default.values(means)) - 1;
+};
+
 // @TODO: display where disease data comes from
 // add to disease dataset metadata
 function DiseaseVarList(_ref) {
@@ -82,12 +87,12 @@ function DiseaseVarList(_ref) {
       setDiseaseVars(diseaseData.fetchedData);
     }
   }, [diseaseData.fetchedData, diseaseData.isPending, diseaseData.serverError]);
-  const varMeans = useVarMean(diseaseVars, diseaseVars && dataset.varSort.disease.sort === _constants.VAR_SORT.MATRIX);
+  const varMeans = useVarMean(diseaseVars, !!diseaseVars?.length && dataset.varSort.disease.sort === _constants.VAR_SORT.MATRIX);
   (0, _react.useEffect)(() => {
     if (dataset.varSort.disease.sort === _constants.VAR_SORT.MATRIX) {
       if (!varMeans.isPending && !varMeans.serverError) {
         setSortedDiseaseVars(_lodash.default.orderBy(diseaseVars, o => {
-          return varMeans.fetchedData[o.name];
+          return sortMeans(o, varMeans.fetchedData);
         }, dataset.varSort.disease.sortOrder));
       }
     } else if (dataset.varSort.disease.sort === _constants.VAR_SORT.NAME) {
@@ -184,9 +189,9 @@ function VarNamesList(_ref2) {
   // @TODO: deferr sortedVarButtons ?
   (0, _react.useEffect)(() => {
     if (dataset.varSort.var.sort === _constants.VAR_SORT.MATRIX) {
-      if (!varMeans.isPending && !varMeans.serverError) {
+      if (!varMeans.isPending && !varMeans.serverError && varMeans.fetchedData) {
         setSortedVarButtons(_lodash.default.orderBy(varButtons, o => {
-          return varMeans.fetchedData[o.name];
+          return sortMeans(o, varMeans.fetchedData);
         }, dataset.varSort.var.sortOrder));
       }
     } else if (dataset.varSort.var.sort === _constants.VAR_SORT.NAME) {

package/dist/cjs/helpers/zarr-helper.js

@@ -50,22 +50,13 @@ const useZarr = function (_ref2) {
   let s = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null;
   let options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : GET_OPTIONS;
   let opts = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {};
-  const {
-    enabled = true
-  } = opts;
   const {
     data = null,
-    isPending = false,
+    isLoading: isPending = false,
     error: serverError = null
   } = (0, _reactQuery.useQuery)({
     queryKey: ["zarr", url, path, s],
-    queryFn: () => {
-      if (enabled) {
-        return fetchDataFromZarr(url, path, s, options);
-      } else {
-        return;
-      }
-    },
+    queryFn: () => fetchDataFromZarr(url, path, s, options),
     retry: (failureCount, _ref3) => {
       let {
         error
@@ -94,30 +85,21 @@ const useMultipleZarr = function (inputs) {
   let options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : GET_OPTIONS;
   let opts = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
   let agg = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : aggregateData;
-  const {
-    enabled = true
-  } = opts;
   const combine = (0, _react.useCallback)(results => {
     return {
       data: agg(inputs, results.map(result => result.data)),
-      isPending: results.some(result => result.isPending),
+      isLoading: results.some(result => result.isLoading),
       serverError: results.find(result => result.error)
     };
   }, [agg, inputs]);
   const {
     data = null,
-    isPending = false,
+    isLoading: isPending = false,
     serverError = null
   } = (0, _reactQuery.useQueries)({
     queries: inputs.map(input => ({
       queryKey: ["zarr", input.url, input.path, input.s],
-      queryFn: () => {
-        if (enabled) {
-          return fetchDataFromZarr(input.url, input.path, input.s, options);
-        } else {
-          return;
-        }
-      },
+      queryFn: () => fetchDataFromZarr(input.url, input.path, input.s, options),
       retry: (failureCount, _ref4) => {
         let {
           error

package/dist/cjs/utils/Filter.js

@@ -132,7 +132,7 @@ const useFilter = data => {
         filteredIndices: null,
         valueMin: _lodash.default.min(obsData.data),
         valueMax: _lodash.default.max(obsData.data),
-        slicedLength: obsData.data.length
+        slicedLength: obsData.data?.length
       };
     }
   }, [dataset.colorEncoding, isContinuous, isInSlice, isPending, obsData.data, obsmData.data, serverError, xData.data]);

package/dist/cjs/utils/requests.js

@@ -45,12 +45,9 @@ const useFetch = function (endpoint, params) {
     refetchOnWindowFocus: false
   };
   let apiUrl = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : null;
-  const {
-    enabled = true
-  } = opts;
   const {
     data: fetchedData = null,
-    isPending = false,
+    isLoading: isPending = false,
     error: serverError = null
   } = (0, _reactQuery.useQuery)({
     queryKey: [endpoint, params],
@@ -58,11 +55,7 @@ const useFetch = function (endpoint, params) {
       let {
         signal
       } = _ref;
-      if (enabled) {
-        return fetchData(endpoint, params, signal, apiUrl);
-      } else {
-        return;
-      }
+      return fetchData(endpoint, params, signal, apiUrl);
     },
     retry: (failureCount, _ref2) => {
       let {
@@ -87,13 +80,10 @@ const useDebouncedFetch = function (endpoint, params) {
     refetchOnWindowFocus: false
   };
   let apiUrl = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : null;
-  const {
-    enabled = true
-  } = opts;
   const debouncedParams = (0, _usehooks.useDebounce)(params, delay);
   const {
     data: fetchedData = null,
-    isPending = false,
+    isLoading: isPending = false,
     error: serverError = null
   } = (0, _reactQuery.useQuery)({
     queryKey: [endpoint, debouncedParams],
@@ -101,11 +91,7 @@ const useDebouncedFetch = function (endpoint, params) {
       let {
         signal
       } = _ref3;
-      if (enabled) {
-        return fetchData(endpoint, debouncedParams, signal, apiUrl);
-      } else {
-        return;
-      }
+      return fetchData(endpoint, debouncedParams, signal, apiUrl);
     },
     retry: (failureCount, _ref4) => {
       let {

package/dist/esm/components/obs-list/ObsList.js

@@ -141,7 +141,7 @@ export function ObsColsList(_ref) {
     });
     dispatch({
       type: "set.colorEncoding",
-      value: "obs"
+      value: COLOR_ENCODINGS.OBS
     });
   };
   const toggleObs = (item, value) => {

package/dist/esm/components/obsm-list/ObsmList.js

@@ -28,7 +28,7 @@ export function ObsmKeysList() {
     refetchOnMount: false
   });
   useEffect(() => {
-    if (!isPending && !serverError) {
+    if (!isPending && !serverError && fetchedData) {
       setObsmKeysList(fetchedData);
     }
   }, [fetchedData, isPending, serverError]);

package/dist/esm/components/pseudospatial/Pseudospatial.js

@@ -123,7 +123,7 @@ export function Pseudospatial(_ref) {
     serverError
   } = usePseudospatialData(plotType);
   useEffect(() => {
-    if (!isPending && !serverError) {
+    if (!isPending && !serverError && fetchedData) {
       setData(fetchedData.data);
       setLayout(fetchedData.layout);
       updateColorscale(colorscale.current);

package/dist/esm/components/var-list/VarItem.js

@@ -109,7 +109,7 @@ export function SingleSelectionItem(_ref3) {
     refetchOnMount: false,
     enabled: !!dataset.diseaseDatasets.length
   });
-  const hasDiseaseInfo = !isPending && !serverError && !!fetchedData.length;
+  const hasDiseaseInfo = !isPending && !serverError && !!fetchedData?.length;
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
     className: `d-flex justify-content-between ${hasDiseaseInfo ? "cursor-pointer" : ""}`,
     onClick: () => {
@@ -192,13 +192,17 @@ export function VarItem(_ref5) {
       });
       dispatch({
         type: "set.colorEncoding",
-        value: "var"
+        value: COLOR_ENCODINGS.VAR
       });
     } else if (mode === SELECTION_MODES.MULTIPLE) {
       dispatch({
         type: "select.multivar",
         var: item
       });
+      dispatch({
+        type: "set.colorEncoding",
+        value: COLOR_ENCODINGS.VAR
+      });
     }
   };
   const removeVar = () => {

package/dist/esm/components/var-list/VarList.js

@@ -39,6 +39,11 @@ const useVarMean = function (varKeys) {
   });
 };
 
+// ensure nulls are lowest values
+const sortMeans = (i, means) => {
+  return means[i.name] || _.min(_.values(means)) - 1;
+};
+
 // @TODO: display where disease data comes from
 // add to disease dataset metadata
 function DiseaseVarList(_ref) {
@@ -73,12 +78,12 @@ function DiseaseVarList(_ref) {
       setDiseaseVars(diseaseData.fetchedData);
     }
   }, [diseaseData.fetchedData, diseaseData.isPending, diseaseData.serverError]);
-  const varMeans = useVarMean(diseaseVars, diseaseVars && dataset.varSort.disease.sort === VAR_SORT.MATRIX);
+  const varMeans = useVarMean(diseaseVars, !!diseaseVars?.length && dataset.varSort.disease.sort === VAR_SORT.MATRIX);
   useEffect(() => {
     if (dataset.varSort.disease.sort === VAR_SORT.MATRIX) {
       if (!varMeans.isPending && !varMeans.serverError) {
         setSortedDiseaseVars(_.orderBy(diseaseVars, o => {
-          return varMeans.fetchedData[o.name];
+          return sortMeans(o, varMeans.fetchedData);
         }, dataset.varSort.disease.sortOrder));
       }
     } else if (dataset.varSort.disease.sort === VAR_SORT.NAME) {
@@ -175,9 +180,9 @@ export function VarNamesList(_ref2) {
   // @TODO: deferr sortedVarButtons ?
   useEffect(() => {
     if (dataset.varSort.var.sort === VAR_SORT.MATRIX) {
-      if (!varMeans.isPending && !varMeans.serverError) {
+      if (!varMeans.isPending && !varMeans.serverError && varMeans.fetchedData) {
         setSortedVarButtons(_.orderBy(varButtons, o => {
-          return varMeans.fetchedData[o.name];
+          return sortMeans(o, varMeans.fetchedData);
         }, dataset.varSort.var.sortOrder));
       }
     } else if (dataset.varSort.var.sort === VAR_SORT.NAME) {

package/dist/esm/helpers/zarr-helper.js

@@ -43,22 +43,13 @@ export const useZarr = function (_ref2) {
   let s = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null;
   let options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : GET_OPTIONS;
   let opts = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {};
-  const {
-    enabled = true
-  } = opts;
   const {
     data = null,
-    isPending = false,
+    isLoading: isPending = false,
     error: serverError = null
   } = useQuery({
     queryKey: ["zarr", url, path, s],
-    queryFn: () => {
-      if (enabled) {
-        return fetchDataFromZarr(url, path, s, options);
-      } else {
-        return;
-      }
-    },
+    queryFn: () => fetchDataFromZarr(url, path, s, options),
     retry: (failureCount, _ref3) => {
       let {
         error
@@ -86,30 +77,21 @@ export const useMultipleZarr = function (inputs) {
   let options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : GET_OPTIONS;
   let opts = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
   let agg = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : aggregateData;
-  const {
-    enabled = true
-  } = opts;
   const combine = useCallback(results => {
     return {
       data: agg(inputs, results.map(result => result.data)),
-      isPending: results.some(result => result.isPending),
+      isLoading: results.some(result => result.isLoading),
       serverError: results.find(result => result.error)
     };
   }, [agg, inputs]);
   const {
     data = null,
-    isPending = false,
+    isLoading: isPending = false,
     serverError = null
   } = useQueries({
     queries: inputs.map(input => ({
       queryKey: ["zarr", input.url, input.path, input.s],
-      queryFn: () => {
-        if (enabled) {
-          return fetchDataFromZarr(input.url, input.path, input.s, options);
-        } else {
-          return;
-        }
-      },
+      queryFn: () => fetchDataFromZarr(input.url, input.path, input.s, options),
       retry: (failureCount, _ref4) => {
         let {
           error

package/dist/esm/utils/Filter.js

@@ -125,7 +125,7 @@ export const useFilter = data => {
         filteredIndices: null,
         valueMin: _.min(obsData.data),
         valueMax: _.max(obsData.data),
-        slicedLength: obsData.data.length
+        slicedLength: obsData.data?.length
       };
     }
   }, [dataset.colorEncoding, isContinuous, isInSlice, isPending, obsData.data, obsmData.data, serverError, xData.data]);

package/dist/esm/utils/requests.js

@@ -38,12 +38,9 @@ export const useFetch = function (endpoint, params) {
     refetchOnWindowFocus: false
   };
   let apiUrl = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : null;
-  const {
-    enabled = true
-  } = opts;
   const {
     data: fetchedData = null,
-    isPending = false,
+    isLoading: isPending = false,
     error: serverError = null
   } = useQuery({
     queryKey: [endpoint, params],
@@ -51,11 +48,7 @@ export const useFetch = function (endpoint, params) {
       let {
         signal
       } = _ref;
-      if (enabled) {
-        return fetchData(endpoint, params, signal, apiUrl);
-      } else {
-        return;
-      }
+      return fetchData(endpoint, params, signal, apiUrl);
     },
     retry: (failureCount, _ref2) => {
       let {
@@ -79,13 +72,10 @@ export const useDebouncedFetch = function (endpoint, params) {
     refetchOnWindowFocus: false
   };
   let apiUrl = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : null;
-  const {
-    enabled = true
-  } = opts;
   const debouncedParams = useDebounce(params, delay);
   const {
     data: fetchedData = null,
-    isPending = false,
+    isLoading: isPending = false,
     error: serverError = null
   } = useQuery({
     queryKey: [endpoint, debouncedParams],
@@ -93,11 +83,7 @@ export const useDebouncedFetch = function (endpoint, params) {
       let {
         signal
       } = _ref3;
-      if (enabled) {
-        return fetchData(endpoint, debouncedParams, signal, apiUrl);
-      } else {
-        return;
-      }
+      return fetchData(endpoint, debouncedParams, signal, apiUrl);
     },
     retry: (failureCount, _ref4) => {
       let {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@haniffalab/cherita-react",
-  "version": "1.0.0-dev.2025-03-13.274a553c",
+  "version": "1.0.0-dev.2025-03-24.4a3636c2",
   "author": "Haniffa Lab",
   "license": "MIT",
   "keywords": [
@@ -124,5 +124,5 @@
     "url": "https://github.com/haniffalab/cherita-react/issues"
   },
   "homepage": "https://github.com/haniffalab/cherita-react#readme",
-  "prereleaseSha": "274a553cad08168d96337c2e89917876a601a108"
+  "prereleaseSha": "4a3636c254e52e5e84f1b75d398255b31c46099f"
 }