@haniffalab/cherita-react 1.4.0-dev.2025-06-13.6fe0c0de → 1.4.0-dev.2025-06-13.c02f71d0

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

@@ -5,11 +5,14 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.ObsmKeysList = ObsmKeysList;
 var _react = _interopRequireWildcard(require("react"));
+var _lodash = _interopRequireDefault(require("lodash"));
 var _reactBootstrap = require("react-bootstrap");
+var _constants = require("../../constants/constants");
 var _DatasetContext = require("../../context/DatasetContext");
 var _SettingsContext = require("../../context/SettingsContext");
 var _requests = require("../../utils/requests");
 var _Skeleton = require("../../utils/Skeleton");
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
@@ -43,13 +46,34 @@ function ObsmKeysList() {
   (0, _react.useEffect)(() => {
     if (!isPending && !serverError && fetchedData) {
       setObsmKeysList(fetchedData);
+
+      // Set default obsm if in keys list and not selected
+      if (!settings.selectedObsm && !!fetchedData.length) {
+        // Follow DEFAULT_OBSM_KEYS order
+        _lodash.default.each(_constants.DEFAULT_OBSM_KEYS, k => {
+          const defaultObsm = _lodash.default.find(fetchedData, item => item.toLowerCase() === k);
+          if (defaultObsm) {
+            dispatch({
+              type: "select.obsm",
+              obsm: defaultObsm
+            });
+            return false; // break
+          }
+        });
+      }
+      if (settings.selectedObsm) {
+        // If selected obsm is not in keys list, reset to null
+        if (!_lodash.default.includes(fetchedData, settings.selectedObsm)) {
+          dispatch({
+            type: "select.obsm",
+            obsm: null
+          });
+        } else {
+          setActive(settings.selectedObsm);
+        }
+      }
     }
-  }, [fetchedData, isPending, serverError]);
-  (0, _react.useEffect)(() => {
-    if (settings.selectedObsm) {
-      setActive(settings.selectedObsm);
-    }
-  }, [settings.selectedObsm]);
+  }, [dispatch, fetchedData, isPending, serverError, settings.selectedObsm]);
   const obsmList = obsmKeysList.map(item => {
     return /*#__PURE__*/_react.default.createElement(_reactBootstrap.Dropdown.Item, {
       key: item,

package/dist/cjs/constants/constants.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.VIOLIN_MODES = exports.VIOLINPLOT_SCALES = exports.VAR_SORT_ORDER = exports.VAR_SORT = exports.UNSELECTED_POLYGON_FILLCOLOR = exports.SELECTION_MODES = exports.SELECTED_POLYGON_FILLCOLOR = exports.PSEUDOSPATIAL_PLOT_TYPES = exports.PSEUDOSPATIAL_CATEGORICAL_MODES = exports.PLOT_TYPES = exports.PLOTLY_MODEBAR_BUTTONS = exports.OBS_TYPES = exports.MATRIXPLOT_SCALES = exports.LOCAL_STORAGE_KEY = exports.DOTPLOT_SCALES = exports.DEFAULT_OBS_GROUP = exports.COLOR_ENCODINGS = exports.BREAKPOINTS = void 0;
+exports.VIOLIN_MODES = exports.VIOLINPLOT_SCALES = exports.VAR_SORT_ORDER = exports.VAR_SORT = exports.UNSELECTED_POLYGON_FILLCOLOR = exports.SELECTION_MODES = exports.SELECTED_POLYGON_FILLCOLOR = exports.PSEUDOSPATIAL_PLOT_TYPES = exports.PSEUDOSPATIAL_CATEGORICAL_MODES = exports.PLOT_TYPES = exports.PLOTLY_MODEBAR_BUTTONS = exports.OBS_TYPES = exports.MATRIXPLOT_SCALES = exports.LOCAL_STORAGE_KEY = exports.DOTPLOT_SCALES = exports.DEFAULT_OBS_GROUP = exports.DEFAULT_OBSM_KEYS = exports.COLOR_ENCODINGS = exports.BREAKPOINTS = void 0;
 const LOCAL_STORAGE_KEY = exports.LOCAL_STORAGE_KEY = "CHERITA";
 const PLOT_TYPES = exports.PLOT_TYPES = {
   SCATTERPLOT: "scatterplot",
@@ -103,4 +103,7 @@ const PLOTLY_MODEBAR_BUTTONS = exports.PLOTLY_MODEBAR_BUTTONS = ["toImage", "zoo
 const BREAKPOINTS = exports.BREAKPOINTS = {
   LG: "(max-width: 991.98px)",
   XL: "(max-width: 1199.98px)"
-};
+};
+
+// In order of priority
+const DEFAULT_OBSM_KEYS = exports.DEFAULT_OBSM_KEYS = ["x_umap", "x_tsne", "x_scvi", "x_pca"];

package/dist/cjs/context/DatasetContext.js

@@ -60,7 +60,7 @@ const persistOptions = {
       return false;
     }
   },
-  buster: "1.4.0-dev.2025-06-13.6fe0c0de" || "0.0.0"
+  buster: "1.4.0-dev.2025-06-13.c02f71d0" || "0.0.0"
   // @TODO: add maxAge and api version numbers as buster
 };
 const initialDataset = {

package/dist/cjs/context/SettingsContext.js

@@ -140,7 +140,7 @@ function SettingsProvider(_ref2) {
 
   // If the buster is not set or does not match the current package version,
   // reset localSettings to avoid stale data
-  if (!buster || buster !== "1.4.0-dev.2025-06-13.6fe0c0de") {
+  if (!buster || buster !== "1.4.0-dev.2025-06-13.c02f71d0") {
     localSettings = {};
   }
   const [settings, dispatch] = (0, _react.useReducer)(settingsReducer, {
@@ -152,7 +152,7 @@ function SettingsProvider(_ref2) {
     if (canOverrideSettings) {
       try {
         localStorage.setItem(DATASET_STORAGE_KEY, JSON.stringify(_objectSpread({
-          buster: "1.4.0-dev.2025-06-13.6fe0c0de" || "0.0.0",
+          buster: "1.4.0-dev.2025-06-13.c02f71d0" || "0.0.0",
           timestamp: Date.now()
         }, settings)));
       } catch (err) {

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

@@ -4,7 +4,9 @@ function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
 function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 import React, { useEffect, useState } from "react";
+import _ from "lodash";
 import { Button, ButtonGroup, Dropdown, DropdownButton, OverlayTrigger, Tooltip } from "react-bootstrap";
+import { DEFAULT_OBSM_KEYS } from "../../constants/constants";
 import { useDataset } from "../../context/DatasetContext";
 import { useSettings, useSettingsDispatch } from "../../context/SettingsContext";
 import { useFetch } from "../../utils/requests";
@@ -36,13 +38,34 @@ export function ObsmKeysList() {
   useEffect(() => {
     if (!isPending && !serverError && fetchedData) {
       setObsmKeysList(fetchedData);
+
+      // Set default obsm if in keys list and not selected
+      if (!settings.selectedObsm && !!fetchedData.length) {
+        // Follow DEFAULT_OBSM_KEYS order
+        _.each(DEFAULT_OBSM_KEYS, k => {
+          const defaultObsm = _.find(fetchedData, item => item.toLowerCase() === k);
+          if (defaultObsm) {
+            dispatch({
+              type: "select.obsm",
+              obsm: defaultObsm
+            });
+            return false; // break
+          }
+        });
+      }
+      if (settings.selectedObsm) {
+        // If selected obsm is not in keys list, reset to null
+        if (!_.includes(fetchedData, settings.selectedObsm)) {
+          dispatch({
+            type: "select.obsm",
+            obsm: null
+          });
+        } else {
+          setActive(settings.selectedObsm);
+        }
+      }
     }
-  }, [fetchedData, isPending, serverError]);
-  useEffect(() => {
-    if (settings.selectedObsm) {
-      setActive(settings.selectedObsm);
-    }
-  }, [settings.selectedObsm]);
+  }, [dispatch, fetchedData, isPending, serverError, settings.selectedObsm]);
   const obsmList = obsmKeysList.map(item => {
     return /*#__PURE__*/React.createElement(Dropdown.Item, {
       key: item,

package/dist/esm/constants/constants.js

@@ -97,4 +97,7 @@ export const PLOTLY_MODEBAR_BUTTONS = ["toImage", "zoom2d", "pan2d", "zoomIn2d",
 export const BREAKPOINTS = {
   LG: "(max-width: 991.98px)",
   XL: "(max-width: 1199.98px)"
-};
+};
+
+// In order of priority
+export const DEFAULT_OBSM_KEYS = ["x_umap", "x_tsne", "x_scvi", "x_pca"];

package/dist/esm/context/DatasetContext.js

@@ -50,7 +50,7 @@ const persistOptions = {
       return false;
     }
   },
-  buster: "1.4.0-dev.2025-06-13.6fe0c0de" || "0.0.0"
+  buster: "1.4.0-dev.2025-06-13.c02f71d0" || "0.0.0"
   // @TODO: add maxAge and api version numbers as buster
 };
 const initialDataset = {

package/dist/esm/context/SettingsContext.js

@@ -129,7 +129,7 @@ export function SettingsProvider(_ref2) {
 
   // If the buster is not set or does not match the current package version,
   // reset localSettings to avoid stale data
-  if (!buster || buster !== "1.4.0-dev.2025-06-13.6fe0c0de") {
+  if (!buster || buster !== "1.4.0-dev.2025-06-13.c02f71d0") {
     localSettings = {};
   }
   const [settings, dispatch] = useReducer(settingsReducer, {
@@ -141,7 +141,7 @@ export function SettingsProvider(_ref2) {
     if (canOverrideSettings) {
       try {
         localStorage.setItem(DATASET_STORAGE_KEY, JSON.stringify(_objectSpread({
-          buster: "1.4.0-dev.2025-06-13.6fe0c0de" || "0.0.0",
+          buster: "1.4.0-dev.2025-06-13.c02f71d0" || "0.0.0",
           timestamp: Date.now()
         }, settings)));
       } catch (err) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@haniffalab/cherita-react",
-  "version": "1.4.0-dev.2025-06-13.6fe0c0de",
+  "version": "1.4.0-dev.2025-06-13.c02f71d0",
   "author": "Haniffa Lab",
   "license": "MIT",
   "keywords": [
@@ -128,5 +128,5 @@
     "url": "https://github.com/haniffalab/cherita-react/issues"
   },
   "homepage": "https://github.com/haniffalab/cherita-react#readme",
-  "prereleaseSha": "6fe0c0de28690a314a69e0e8c66f3af963e7cd94"
+  "prereleaseSha": "c02f71d04f2b512fe1f0f8ea3e4813ba5e3927e5"
 }