@macrostrat/column-views 3.0.3 → 3.1.0

package/CHANGELOG.md

@@ -4,6 +4,14 @@ All notable changes to this project will be documented in this file. The format
 is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this
 project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [3.1.0] - 2026-01-31
+
+- Moved `MacrostratDataProvider` and data fetchers to
+  `@macrostrat/data-provider` for better modularity.
+- Standardize approach to clickable/linkable data items in `UnitDetailsPanel`,
+  using a new `MacrostratInteractionProvider` from
+  `@macrostrat/data-components`.
+
 ## [3.0.3] - 2026-01-29
 
 - Change layout of `package.json`

package/dist/data-provider/column-nav.js

@@ -1,6 +1,6 @@
 import h from "@macrostrat/hyper";
 import { getQueryString, setQueryString } from "@macrostrat/ui-components";
-import { useContext, useState, useEffect, createContext } from "react";
+import { createContext, useContext, useState, useEffect } from "react";
 const ColumnNavCtx = createContext(null);
 function useColumnNav(defaultArgs = { col_id: 495, unit_id: null }) {
   const ctx = useContext(ColumnNavCtx);

package/dist/data-provider/index.d.ts

@@ -1,5 +1,3 @@
-export * from './fetch';
-export * from './base';
 export * from './column-nav';
 export * from './store';
 export * from './unit-selection';

package/dist/data-provider/store.cjs

@@ -3,10 +3,23 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const React = require("react");
 const h = require("@macrostrat/hyper");
 const compositeScale = require("../prepare-units/composite-scale.cjs");
+const columnComponents = require("@macrostrat/column-components");
 const unitSelection = require("./unit-selection.cjs");
-const core = require("./core.cjs");
+const dataComponents = require("@macrostrat/data-components");
+const jotai = require("jotai");
 const _interopDefault = (e) => e && e.__esModule ? e : { default: e };
 const h__default = /* @__PURE__ */ _interopDefault(h);
+const scope = dataComponents.createScopedStore();
+const columnUnitsAtom = jotai.atom();
+const columnUnitsMapAtom = jotai.atom((get) => {
+  const units = get(columnUnitsAtom);
+  if (!units) return null;
+  const unitMap = /* @__PURE__ */ new Map();
+  units.forEach((unit) => {
+    unitMap.set(unit.unit_id, unit);
+  });
+  return unitMap;
+});
 function MacrostratColumnStateProvider({
   children,
   units,
@@ -21,7 +34,7 @@ function MacrostratColumnStateProvider({
     return selectedUnit != null || onUnitSelected != null;
   }, []);
   const atomMap = [
-    [core.columnUnitsAtom, units],
+    [columnUnitsAtom, units],
     [unitSelection.allowUnitSelectionAtom, _allowSelection],
     [unitSelection.selectedUnitIDAtom, selectedUnit]
   ];
@@ -30,9 +43,11 @@ function MacrostratColumnStateProvider({
     selectionHandlers = h__default.default(unitSelection.UnitSelectionCallbackManager, { onUnitSelected });
   }
   return h__default.default(
-    core.ScopedProvider,
+    scope.Provider,
     {
-      atoms: atomMap
+      atoms: atomMap,
+      keepUpdated: true,
+      inherit: true
     },
     [selectionHandlers, children]
   );
@@ -83,11 +98,11 @@ function useMacrostratColumnData() {
   return ctx;
 }
 function useMacrostratUnits() {
-  return core.scope.useAtomValue(core.columnUnitsAtom);
+  return scope.useAtomValue(columnUnitsAtom);
 }
 function useColumnUnitsMap() {
   try {
-    return core.scope.useAtomValue(core.columnUnitsMapAtom);
+    return scope.useAtomValue(columnUnitsMapAtom);
   } catch {
     return null;
   }
@@ -99,9 +114,37 @@ function useCompositeScale() {
     [ctx.sections]
   );
 }
+function MacrostratColumnProvider(props) {
+  const { axisType } = useMacrostratColumnData();
+  const { units, domain, pixelScale, scale, children } = props;
+  return h__default.default(
+    columnComponents.ColumnProvider,
+    {
+      axisType,
+      divisions: units,
+      range: domain,
+      pixelsPerMeter: pixelScale,
+      scale
+    },
+    children
+  );
+}
+function LithologiesProvider({ children }) {
+  useEffect(() => {
+    console.warn(
+      "LithologiesProvider is deprecated. Replace with MacrostratDataProvider"
+    );
+  }, []);
+  return children;
+}
+exports.LithologiesProvider = LithologiesProvider;
 exports.MacrostratColumnDataProvider = MacrostratColumnDataProvider;
+exports.MacrostratColumnProvider = MacrostratColumnProvider;
 exports.MacrostratColumnStateProvider = MacrostratColumnStateProvider;
 exports.UnitSelectionProvider = UnitSelectionProvider;
+exports.columnUnitsAtom = columnUnitsAtom;
+exports.columnUnitsMapAtom = columnUnitsMapAtom;
+exports.scope = scope;
 exports.useColumnUnitsMap = useColumnUnitsMap;
 exports.useCompositeScale = useCompositeScale;
 exports.useMacrostratColumnData = useMacrostratColumnData;

package/dist/data-provider/store.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"store.cjs","sources":["../../src/data-provider/store.ts"],"sourcesContent":["import { createContext, ReactNode, useContext, useMemo } from \"react\";\nimport h from \"@macrostrat/hyper\";\nimport {\n  CompositeColumnScale,\n  createCompositeScale,\n} from \"../prepare-units/composite-scale\";\nimport { ColumnAxisType } from \"@macrostrat/column-components\";\nimport type { ExtUnit, PackageLayoutData } from \"../prepare-units\";\nimport {\n  allowUnitSelectionAtom,\n  selectedUnitIDAtom,\n  UnitSelectionCallbacks,\n  UnitSelectionCallbackManager,\n} from \"./unit-selection\";\nimport { BaseUnit } from \"@macrostrat/api-types\";\nimport {\n  AtomMap,\n  columnUnitsAtom,\n  columnUnitsMapAtom,\n  scope,\n  ScopedProvider,\n} from \"./core\";\n\nexport interface ColumnStateProviderProps<\n  T extends BaseUnit,\n> extends Partial<UnitSelectionCallbacks> {\n  children: ReactNode;\n  units: T[];\n  selectedUnit: number | null;\n  allowUnitSelection?: boolean;\n}\n\nexport function MacrostratColumnStateProvider<T extends BaseUnit>({\n  children,\n  units,\n  allowUnitSelection = false,\n  onUnitSelected,\n  selectedUnit,\n}: ColumnStateProviderProps<T>) {\n  /** Top-level provider for Macrostrat column data.\n   * It is either provided by the Column component itself, or\n   * can be hoisted higher in the tree to provide a common data context\n   */\n\n  /* By default, unit selection is disabled. However, if any related props are passed,\n  we enable it.\n  */\n  const _allowSelection = useMemo(() => {\n    if (allowUnitSelection) {\n      return true;\n    }\n    return selectedUnit != null || onUnitSelected != null;\n  }, []);\n\n  const atomMap: AtomMap = [\n    [columnUnitsAtom, units],\n    [allowUnitSelectionAtom, _allowSelection],\n    [selectedUnitIDAtom, selectedUnit],\n  ];\n\n  let selectionHandlers: ReactNode = null;\n  if (_allowSelection) {\n    selectionHandlers = h(UnitSelectionCallbackManager, { onUnitSelected });\n  }\n\n  return h(\n    ScopedProvider,\n    {\n      atoms: atomMap,\n    },\n    [selectionHandlers, children],\n  );\n}\n\nexport interface MacrostratColumnDataContext<T extends BaseUnit> {\n  units: T[];\n  sections: PackageLayoutData[];\n  totalHeight?: number;\n  axisType?: ColumnAxisType;\n  allowUnitSelection?: boolean;\n}\n\nexport interface ColumnDataProviderProps<T extends BaseUnit>\n  extends MacrostratColumnDataContext<T>, ColumnStateProviderProps<T> {\n  children: ReactNode;\n}\n\nconst MacrostratColumnDataContext =\n  createContext<MacrostratColumnDataContext<any>>(null);\n\nexport function MacrostratColumnDataProvider<T extends BaseUnit>({\n  children,\n  units,\n  sections,\n  totalHeight,\n  axisType,\n  allowUnitSelection,\n  onUnitSelected,\n  selectedUnit,\n}: ColumnDataProviderProps<T>) {\n  /** Internal provider for Macrostrat column data.\n   * As a general rule, we want to provide data and column-axis\n   * height calculations through the context, since these need to\n   * be accessed by any component that lays out information on the\n   * column.\n   *\n   * Cross-axis layout and view configuration (e.g., showing and hiding\n   * of different components or labels) should be handled through passing\n   * props to the components themselves.\n   * */\n\n  const value = useMemo(() => {\n    // For now, change ordinal axis types to age axis types\n    return {\n      units,\n      sections,\n      totalHeight,\n      axisType,\n    };\n  }, [units, sections, totalHeight, axisType]);\n\n  return h(\n    MacrostratColumnStateProvider,\n    {\n      units,\n      allowUnitSelection,\n      onUnitSelected,\n      selectedUnit,\n    },\n    h(MacrostratColumnDataContext.Provider, { value }, children),\n  );\n}\n\nexport function UnitSelectionProvider(props: ColumnStateProviderProps<any>) {\n  /* A basic unit selection provider without column data context.\n  Mostly for use with the CorrelationChart component.\n   */\n  return h(MacrostratColumnStateProvider, {\n    ...props,\n    allowUnitSelection: true,\n  });\n}\n\nexport function useMacrostratColumnData() {\n  const ctx = useContext(MacrostratColumnDataContext);\n  if (!ctx) {\n    throw new Error(\n      \"useMacrostratColumnData must be used within a MacrostratColumnDataProvider\",\n    );\n  }\n  return ctx;\n}\n\nexport function useMacrostratUnits() {\n  return scope.useAtomValue(columnUnitsAtom);\n}\n\nexport function useColumnUnitsMap(): Map<number, ExtUnit> | null {\n  try {\n    return scope.useAtomValue(columnUnitsMapAtom) as Map<number, ExtUnit>;\n  } catch {\n    return null;\n  }\n}\n\nexport function useCompositeScale(): CompositeColumnScale {\n  const ctx = useMacrostratColumnData();\n  return useMemo(\n    () => createCompositeScale(ctx.sections, true),\n    [ctx.sections],\n  );\n}\n"],"names":["useMemo","columnUnitsAtom","allowUnitSelectionAtom","selectedUnitIDAtom","h","UnitSelectionCallbackManager","ScopedProvider","createContext","useContext","scope","columnUnitsMapAtom","createCompositeScale"],"mappings":";;;;;;;;;AAgCO,SAAS,8BAAkD;AAAA,EAChE;AAAA,EACA;AAAA,EACA,qBAAqB;AAAA,EACrB;AAAA,EACA;AACF,GAAgC;AAS9B,QAAM,kBAAkBA,MAAAA,QAAQ,MAAM;AACpC,QAAI,oBAAoB;AACtB,aAAO;AAAA,IACT;AACA,WAAO,gBAAgB,QAAQ,kBAAkB;AAAA,EACnD,GAAG,CAAA,CAAE;AAEL,QAAM,UAAmB;AAAA,IACvB,CAACC,KAAAA,iBAAiB,KAAK;AAAA,IACvB,CAACC,cAAAA,wBAAwB,eAAe;AAAA,IACxC,CAACC,cAAAA,oBAAoB,YAAY;AAAA,EAAA;AAGnC,MAAI,oBAA+B;AACnC,MAAI,iBAAiB;AACnB,wBAAoBC,WAAAA,QAAEC,4CAA8B,EAAE,eAAA,CAAgB;AAAA,EACxE;AAEA,SAAOD,WAAAA;AAAAA,IACLE,KAAAA;AAAAA,IACA;AAAA,MACE,OAAO;AAAA,IAAA;AAAA,IAET,CAAC,mBAAmB,QAAQ;AAAA,EAAA;AAEhC;AAeA,MAAM,8BACJC,MAAAA,cAAgD,IAAI;AAE/C,SAAS,6BAAiD;AAAA,EAC/D;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AACF,GAA+B;AAY7B,QAAM,QAAQP,MAAAA,QAAQ,MAAM;AAE1B,WAAO;AAAA,MACL;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,IAAA;AAAA,EAEJ,GAAG,CAAC,OAAO,UAAU,aAAa,QAAQ,CAAC;AAE3C,SAAOI,WAAAA;AAAAA,IACL;AAAA,IACA;AAAA,MACE;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,IAAA;AAAA,IAEFA,WAAAA,QAAE,4BAA4B,UAAU,EAAE,MAAA,GAAS,QAAQ;AAAA,EAAA;AAE/D;AAEO,SAAS,sBAAsB,OAAsC;AAI1E,SAAOA,WAAAA,QAAE,+BAA+B;AAAA,IACtC,GAAG;AAAA,IACH,oBAAoB;AAAA,EAAA,CACrB;AACH;AAEO,SAAS,0BAA0B;AACxC,QAAM,MAAMI,MAAAA,WAAW,2BAA2B;AAClD,MAAI,CAAC,KAAK;AACR,UAAM,IAAI;AAAA,MACR;AAAA,IAAA;AAAA,EAEJ;AACA,SAAO;AACT;AAEO,SAAS,qBAAqB;AACnC,SAAOC,KAAAA,MAAM,aAAaR,oBAAe;AAC3C;AAEO,SAAS,oBAAiD;AAC/D,MAAI;AACF,WAAOQ,KAAAA,MAAM,aAAaC,uBAAkB;AAAA,EAC9C,QAAQ;AACN,WAAO;AAAA,EACT;AACF;AAEO,SAAS,oBAA0C;AACxD,QAAM,MAAM,wBAAA;AACZ,SAAOV,MAAAA;AAAAA,IACL,MAAMW,oCAAqB,IAAI,UAAU,IAAI;AAAA,IAC7C,CAAC,IAAI,QAAQ;AAAA,EAAA;AAEjB;;;;;;;;"}
+{"version":3,"file":"store.cjs","sources":["../../src/data-provider/store.ts"],"sourcesContent":["import { createContext, ReactNode, useContext, useMemo } from \"react\";\nimport h from \"@macrostrat/hyper\";\nimport {\n  CompositeColumnScale,\n  createCompositeScale,\n} from \"../prepare-units/composite-scale\";\nimport { ColumnAxisType, ColumnProvider } from \"@macrostrat/column-components\";\nimport type { ExtUnit, PackageLayoutData } from \"../prepare-units\";\nimport {\n  allowUnitSelectionAtom,\n  selectedUnitIDAtom,\n  UnitSelectionCallbacks,\n  UnitSelectionCallbackManager,\n} from \"./unit-selection\";\nimport type { BaseUnit } from \"@macrostrat/api-types\";\nimport { type AtomMap, createScopedStore } from \"@macrostrat/data-components\";\nimport { atom } from \"jotai\";\n\nexport const scope = createScopedStore();\n\nexport const columnUnitsAtom = atom<BaseUnit[]>();\n\nexport const columnUnitsMapAtom = atom<Map<number, BaseUnit> | null>((get) => {\n  const units = get(columnUnitsAtom);\n  if (!units) return null;\n  const unitMap = new Map<number, BaseUnit>();\n  units.forEach((unit) => {\n    unitMap.set(unit.unit_id, unit);\n  });\n  return unitMap;\n});\n\nexport interface ColumnStateProviderProps<\n  T extends BaseUnit,\n> extends Partial<UnitSelectionCallbacks> {\n  children: ReactNode;\n  units: T[];\n  selectedUnit: number | null;\n  allowUnitSelection?: boolean;\n}\n\nexport function MacrostratColumnStateProvider<T extends BaseUnit>({\n  children,\n  units,\n  allowUnitSelection = false,\n  onUnitSelected,\n  selectedUnit,\n}: ColumnStateProviderProps<T>) {\n  /** Top-level provider for Macrostrat column data.\n   * It is either provided by the Column component itself, or\n   * can be hoisted higher in the tree to provide a common data context\n   */\n\n  /* By default, unit selection is disabled. However, if any related props are passed,\n  we enable it.\n  */\n  const _allowSelection = useMemo(() => {\n    if (allowUnitSelection) {\n      return true;\n    }\n    return selectedUnit != null || onUnitSelected != null;\n  }, []);\n\n  const atomMap: AtomMap = [\n    [columnUnitsAtom, units],\n    [allowUnitSelectionAtom, _allowSelection],\n    [selectedUnitIDAtom, selectedUnit],\n  ];\n\n  let selectionHandlers: ReactNode = null;\n  if (_allowSelection) {\n    selectionHandlers = h(UnitSelectionCallbackManager, { onUnitSelected });\n  }\n\n  return h(\n    scope.Provider,\n    {\n      atoms: atomMap,\n      keepUpdated: true,\n      inherit: true,\n    },\n    [selectionHandlers, children],\n  );\n}\n\nexport interface MacrostratColumnDataContext<T extends BaseUnit> {\n  units: T[];\n  sections: PackageLayoutData[];\n  totalHeight?: number;\n  axisType?: ColumnAxisType;\n  allowUnitSelection?: boolean;\n}\n\nexport interface ColumnDataProviderProps<T extends BaseUnit>\n  extends MacrostratColumnDataContext<T>, ColumnStateProviderProps<T> {\n  children: ReactNode;\n}\n\nconst MacrostratColumnDataContext =\n  createContext<MacrostratColumnDataContext<any>>(null);\n\nexport function MacrostratColumnDataProvider<T extends BaseUnit>({\n  children,\n  units,\n  sections,\n  totalHeight,\n  axisType,\n  allowUnitSelection,\n  onUnitSelected,\n  selectedUnit,\n}: ColumnDataProviderProps<T>) {\n  /** Internal provider for Macrostrat column data.\n   * As a general rule, we want to provide data and column-axis\n   * height calculations through the context, since these need to\n   * be accessed by any component that lays out information on the\n   * column.\n   *\n   * Cross-axis layout and view configuration (e.g., showing and hiding\n   * of different components or labels) should be handled through passing\n   * props to the components themselves.\n   * */\n\n  const value = useMemo(() => {\n    // For now, change ordinal axis types to age axis types\n    return {\n      units,\n      sections,\n      totalHeight,\n      axisType,\n    };\n  }, [units, sections, totalHeight, axisType]);\n\n  return h(\n    MacrostratColumnStateProvider,\n    {\n      units,\n      allowUnitSelection,\n      onUnitSelected,\n      selectedUnit,\n    },\n    h(MacrostratColumnDataContext.Provider, { value }, children),\n  );\n}\n\nexport function UnitSelectionProvider(props: ColumnStateProviderProps<any>) {\n  /* A basic unit selection provider without column data context.\n  Mostly for use with the CorrelationChart component.\n   */\n  return h(MacrostratColumnStateProvider, {\n    ...props,\n    allowUnitSelection: true,\n  });\n}\n\nexport function useMacrostratColumnData() {\n  const ctx = useContext(MacrostratColumnDataContext);\n  if (!ctx) {\n    throw new Error(\n      \"useMacrostratColumnData must be used within a MacrostratColumnDataProvider\",\n    );\n  }\n  return ctx;\n}\n\nexport function useMacrostratUnits() {\n  return scope.useAtomValue(columnUnitsAtom);\n}\n\nexport function useColumnUnitsMap(): Map<number, ExtUnit> | null {\n  try {\n    return scope.useAtomValue(columnUnitsMapAtom) as Map<number, ExtUnit>;\n  } catch {\n    return null;\n  }\n}\n\nexport function useCompositeScale(): CompositeColumnScale {\n  const ctx = useMacrostratColumnData();\n  return useMemo(\n    () => createCompositeScale(ctx.sections, true),\n    [ctx.sections],\n  );\n}\n\nexport function MacrostratColumnProvider(props) {\n  /** A column provider specialized the Macrostrat API. Maps more\n   * generic concepts to Macrostrat-specific ones.\n   */\n\n  const { axisType } = useMacrostratColumnData();\n  const { units, domain, pixelScale, scale, children } = props;\n  return h(\n    ColumnProvider,\n    {\n      axisType,\n      divisions: units,\n      range: domain,\n      pixelsPerMeter: pixelScale,\n      scale,\n    },\n    children,\n  );\n}\n\n/** This is now a legacy provider */\nexport function LithologiesProvider({ children }) {\n  useEffect(() => {\n    console.warn(\n      \"LithologiesProvider is deprecated. Replace with MacrostratDataProvider\",\n    );\n  }, []);\n  return children;\n}\n"],"names":["createScopedStore","atom","useMemo","allowUnitSelectionAtom","selectedUnitIDAtom","h","UnitSelectionCallbackManager","createContext","useContext","createCompositeScale","ColumnProvider"],"mappings":"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"}

package/dist/data-provider/store.js

@@ -1,8 +1,21 @@
 import { useMemo, useContext, createContext } from "react";
 import h from "@macrostrat/hyper";
 import { createCompositeScale } from "../prepare-units/composite-scale.js";
+import { ColumnProvider } from "@macrostrat/column-components";
 import { UnitSelectionCallbackManager, allowUnitSelectionAtom, selectedUnitIDAtom } from "./unit-selection.js";
-import { ScopedProvider, columnUnitsAtom, scope, columnUnitsMapAtom } from "./core.js";
+import { createScopedStore } from "@macrostrat/data-components";
+import { atom } from "jotai";
+const scope = createScopedStore();
+const columnUnitsAtom = atom();
+const columnUnitsMapAtom = atom((get) => {
+  const units = get(columnUnitsAtom);
+  if (!units) return null;
+  const unitMap = /* @__PURE__ */ new Map();
+  units.forEach((unit) => {
+    unitMap.set(unit.unit_id, unit);
+  });
+  return unitMap;
+});
 function MacrostratColumnStateProvider({
   children,
   units,
@@ -26,9 +39,11 @@ function MacrostratColumnStateProvider({
     selectionHandlers = h(UnitSelectionCallbackManager, { onUnitSelected });
   }
   return h(
-    ScopedProvider,
+    scope.Provider,
     {
-      atoms: atomMap
+      atoms: atomMap,
+      keepUpdated: true,
+      inherit: true
     },
     [selectionHandlers, children]
   );
@@ -95,10 +110,38 @@ function useCompositeScale() {
     [ctx.sections]
   );
 }
+function MacrostratColumnProvider(props) {
+  const { axisType } = useMacrostratColumnData();
+  const { units, domain, pixelScale, scale, children } = props;
+  return h(
+    ColumnProvider,
+    {
+      axisType,
+      divisions: units,
+      range: domain,
+      pixelsPerMeter: pixelScale,
+      scale
+    },
+    children
+  );
+}
+function LithologiesProvider({ children }) {
+  useEffect(() => {
+    console.warn(
+      "LithologiesProvider is deprecated. Replace with MacrostratDataProvider"
+    );
+  }, []);
+  return children;
+}
 export {
+  LithologiesProvider,
   MacrostratColumnDataProvider,
+  MacrostratColumnProvider,
   MacrostratColumnStateProvider,
   UnitSelectionProvider,
+  columnUnitsAtom,
+  columnUnitsMapAtom,
+  scope,
   useColumnUnitsMap,
   useCompositeScale,
   useMacrostratColumnData,

package/dist/data-provider/store.js.map

@@ -1 +1 @@
-{"version":3,"file":"store.js","sources":["../../src/data-provider/store.ts"],"sourcesContent":["import { createContext, ReactNode, useContext, useMemo } from \"react\";\nimport h from \"@macrostrat/hyper\";\nimport {\n  CompositeColumnScale,\n  createCompositeScale,\n} from \"../prepare-units/composite-scale\";\nimport { ColumnAxisType } from \"@macrostrat/column-components\";\nimport type { ExtUnit, PackageLayoutData } from \"../prepare-units\";\nimport {\n  allowUnitSelectionAtom,\n  selectedUnitIDAtom,\n  UnitSelectionCallbacks,\n  UnitSelectionCallbackManager,\n} from \"./unit-selection\";\nimport { BaseUnit } from \"@macrostrat/api-types\";\nimport {\n  AtomMap,\n  columnUnitsAtom,\n  columnUnitsMapAtom,\n  scope,\n  ScopedProvider,\n} from \"./core\";\n\nexport interface ColumnStateProviderProps<\n  T extends BaseUnit,\n> extends Partial<UnitSelectionCallbacks> {\n  children: ReactNode;\n  units: T[];\n  selectedUnit: number | null;\n  allowUnitSelection?: boolean;\n}\n\nexport function MacrostratColumnStateProvider<T extends BaseUnit>({\n  children,\n  units,\n  allowUnitSelection = false,\n  onUnitSelected,\n  selectedUnit,\n}: ColumnStateProviderProps<T>) {\n  /** Top-level provider for Macrostrat column data.\n   * It is either provided by the Column component itself, or\n   * can be hoisted higher in the tree to provide a common data context\n   */\n\n  /* By default, unit selection is disabled. However, if any related props are passed,\n  we enable it.\n  */\n  const _allowSelection = useMemo(() => {\n    if (allowUnitSelection) {\n      return true;\n    }\n    return selectedUnit != null || onUnitSelected != null;\n  }, []);\n\n  const atomMap: AtomMap = [\n    [columnUnitsAtom, units],\n    [allowUnitSelectionAtom, _allowSelection],\n    [selectedUnitIDAtom, selectedUnit],\n  ];\n\n  let selectionHandlers: ReactNode = null;\n  if (_allowSelection) {\n    selectionHandlers = h(UnitSelectionCallbackManager, { onUnitSelected });\n  }\n\n  return h(\n    ScopedProvider,\n    {\n      atoms: atomMap,\n    },\n    [selectionHandlers, children],\n  );\n}\n\nexport interface MacrostratColumnDataContext<T extends BaseUnit> {\n  units: T[];\n  sections: PackageLayoutData[];\n  totalHeight?: number;\n  axisType?: ColumnAxisType;\n  allowUnitSelection?: boolean;\n}\n\nexport interface ColumnDataProviderProps<T extends BaseUnit>\n  extends MacrostratColumnDataContext<T>, ColumnStateProviderProps<T> {\n  children: ReactNode;\n}\n\nconst MacrostratColumnDataContext =\n  createContext<MacrostratColumnDataContext<any>>(null);\n\nexport function MacrostratColumnDataProvider<T extends BaseUnit>({\n  children,\n  units,\n  sections,\n  totalHeight,\n  axisType,\n  allowUnitSelection,\n  onUnitSelected,\n  selectedUnit,\n}: ColumnDataProviderProps<T>) {\n  /** Internal provider for Macrostrat column data.\n   * As a general rule, we want to provide data and column-axis\n   * height calculations through the context, since these need to\n   * be accessed by any component that lays out information on the\n   * column.\n   *\n   * Cross-axis layout and view configuration (e.g., showing and hiding\n   * of different components or labels) should be handled through passing\n   * props to the components themselves.\n   * */\n\n  const value = useMemo(() => {\n    // For now, change ordinal axis types to age axis types\n    return {\n      units,\n      sections,\n      totalHeight,\n      axisType,\n    };\n  }, [units, sections, totalHeight, axisType]);\n\n  return h(\n    MacrostratColumnStateProvider,\n    {\n      units,\n      allowUnitSelection,\n      onUnitSelected,\n      selectedUnit,\n    },\n    h(MacrostratColumnDataContext.Provider, { value }, children),\n  );\n}\n\nexport function UnitSelectionProvider(props: ColumnStateProviderProps<any>) {\n  /* A basic unit selection provider without column data context.\n  Mostly for use with the CorrelationChart component.\n   */\n  return h(MacrostratColumnStateProvider, {\n    ...props,\n    allowUnitSelection: true,\n  });\n}\n\nexport function useMacrostratColumnData() {\n  const ctx = useContext(MacrostratColumnDataContext);\n  if (!ctx) {\n    throw new Error(\n      \"useMacrostratColumnData must be used within a MacrostratColumnDataProvider\",\n    );\n  }\n  return ctx;\n}\n\nexport function useMacrostratUnits() {\n  return scope.useAtomValue(columnUnitsAtom);\n}\n\nexport function useColumnUnitsMap(): Map<number, ExtUnit> | null {\n  try {\n    return scope.useAtomValue(columnUnitsMapAtom) as Map<number, ExtUnit>;\n  } catch {\n    return null;\n  }\n}\n\nexport function useCompositeScale(): CompositeColumnScale {\n  const ctx = useMacrostratColumnData();\n  return useMemo(\n    () => createCompositeScale(ctx.sections, true),\n    [ctx.sections],\n  );\n}\n"],"names":[],"mappings":";;;;;AAgCO,SAAS,8BAAkD;AAAA,EAChE;AAAA,EACA;AAAA,EACA,qBAAqB;AAAA,EACrB;AAAA,EACA;AACF,GAAgC;AAS9B,QAAM,kBAAkB,QAAQ,MAAM;AACpC,QAAI,oBAAoB;AACtB,aAAO;AAAA,IACT;AACA,WAAO,gBAAgB,QAAQ,kBAAkB;AAAA,EACnD,GAAG,CAAA,CAAE;AAEL,QAAM,UAAmB;AAAA,IACvB,CAAC,iBAAiB,KAAK;AAAA,IACvB,CAAC,wBAAwB,eAAe;AAAA,IACxC,CAAC,oBAAoB,YAAY;AAAA,EAAA;AAGnC,MAAI,oBAA+B;AACnC,MAAI,iBAAiB;AACnB,wBAAoB,EAAE,8BAA8B,EAAE,eAAA,CAAgB;AAAA,EACxE;AAEA,SAAO;AAAA,IACL;AAAA,IACA;AAAA,MACE,OAAO;AAAA,IAAA;AAAA,IAET,CAAC,mBAAmB,QAAQ;AAAA,EAAA;AAEhC;AAeA,MAAM,8BACJ,cAAgD,IAAI;AAE/C,SAAS,6BAAiD;AAAA,EAC/D;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AACF,GAA+B;AAY7B,QAAM,QAAQ,QAAQ,MAAM;AAE1B,WAAO;AAAA,MACL;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,IAAA;AAAA,EAEJ,GAAG,CAAC,OAAO,UAAU,aAAa,QAAQ,CAAC;AAE3C,SAAO;AAAA,IACL;AAAA,IACA;AAAA,MACE;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,IAAA;AAAA,IAEF,EAAE,4BAA4B,UAAU,EAAE,MAAA,GAAS,QAAQ;AAAA,EAAA;AAE/D;AAEO,SAAS,sBAAsB,OAAsC;AAI1E,SAAO,EAAE,+BAA+B;AAAA,IACtC,GAAG;AAAA,IACH,oBAAoB;AAAA,EAAA,CACrB;AACH;AAEO,SAAS,0BAA0B;AACxC,QAAM,MAAM,WAAW,2BAA2B;AAClD,MAAI,CAAC,KAAK;AACR,UAAM,IAAI;AAAA,MACR;AAAA,IAAA;AAAA,EAEJ;AACA,SAAO;AACT;AAEO,SAAS,qBAAqB;AACnC,SAAO,MAAM,aAAa,eAAe;AAC3C;AAEO,SAAS,oBAAiD;AAC/D,MAAI;AACF,WAAO,MAAM,aAAa,kBAAkB;AAAA,EAC9C,QAAQ;AACN,WAAO;AAAA,EACT;AACF;AAEO,SAAS,oBAA0C;AACxD,QAAM,MAAM,wBAAA;AACZ,SAAO;AAAA,IACL,MAAM,qBAAqB,IAAI,UAAU,IAAI;AAAA,IAC7C,CAAC,IAAI,QAAQ;AAAA,EAAA;AAEjB;"}
+{"version":3,"file":"store.js","sources":["../../src/data-provider/store.ts"],"sourcesContent":["import { createContext, ReactNode, useContext, useMemo } from \"react\";\nimport h from \"@macrostrat/hyper\";\nimport {\n  CompositeColumnScale,\n  createCompositeScale,\n} from \"../prepare-units/composite-scale\";\nimport { ColumnAxisType, ColumnProvider } from \"@macrostrat/column-components\";\nimport type { ExtUnit, PackageLayoutData } from \"../prepare-units\";\nimport {\n  allowUnitSelectionAtom,\n  selectedUnitIDAtom,\n  UnitSelectionCallbacks,\n  UnitSelectionCallbackManager,\n} from \"./unit-selection\";\nimport type { BaseUnit } from \"@macrostrat/api-types\";\nimport { type AtomMap, createScopedStore } from \"@macrostrat/data-components\";\nimport { atom } from \"jotai\";\n\nexport const scope = createScopedStore();\n\nexport const columnUnitsAtom = atom<BaseUnit[]>();\n\nexport const columnUnitsMapAtom = atom<Map<number, BaseUnit> | null>((get) => {\n  const units = get(columnUnitsAtom);\n  if (!units) return null;\n  const unitMap = new Map<number, BaseUnit>();\n  units.forEach((unit) => {\n    unitMap.set(unit.unit_id, unit);\n  });\n  return unitMap;\n});\n\nexport interface ColumnStateProviderProps<\n  T extends BaseUnit,\n> extends Partial<UnitSelectionCallbacks> {\n  children: ReactNode;\n  units: T[];\n  selectedUnit: number | null;\n  allowUnitSelection?: boolean;\n}\n\nexport function MacrostratColumnStateProvider<T extends BaseUnit>({\n  children,\n  units,\n  allowUnitSelection = false,\n  onUnitSelected,\n  selectedUnit,\n}: ColumnStateProviderProps<T>) {\n  /** Top-level provider for Macrostrat column data.\n   * It is either provided by the Column component itself, or\n   * can be hoisted higher in the tree to provide a common data context\n   */\n\n  /* By default, unit selection is disabled. However, if any related props are passed,\n  we enable it.\n  */\n  const _allowSelection = useMemo(() => {\n    if (allowUnitSelection) {\n      return true;\n    }\n    return selectedUnit != null || onUnitSelected != null;\n  }, []);\n\n  const atomMap: AtomMap = [\n    [columnUnitsAtom, units],\n    [allowUnitSelectionAtom, _allowSelection],\n    [selectedUnitIDAtom, selectedUnit],\n  ];\n\n  let selectionHandlers: ReactNode = null;\n  if (_allowSelection) {\n    selectionHandlers = h(UnitSelectionCallbackManager, { onUnitSelected });\n  }\n\n  return h(\n    scope.Provider,\n    {\n      atoms: atomMap,\n      keepUpdated: true,\n      inherit: true,\n    },\n    [selectionHandlers, children],\n  );\n}\n\nexport interface MacrostratColumnDataContext<T extends BaseUnit> {\n  units: T[];\n  sections: PackageLayoutData[];\n  totalHeight?: number;\n  axisType?: ColumnAxisType;\n  allowUnitSelection?: boolean;\n}\n\nexport interface ColumnDataProviderProps<T extends BaseUnit>\n  extends MacrostratColumnDataContext<T>, ColumnStateProviderProps<T> {\n  children: ReactNode;\n}\n\nconst MacrostratColumnDataContext =\n  createContext<MacrostratColumnDataContext<any>>(null);\n\nexport function MacrostratColumnDataProvider<T extends BaseUnit>({\n  children,\n  units,\n  sections,\n  totalHeight,\n  axisType,\n  allowUnitSelection,\n  onUnitSelected,\n  selectedUnit,\n}: ColumnDataProviderProps<T>) {\n  /** Internal provider for Macrostrat column data.\n   * As a general rule, we want to provide data and column-axis\n   * height calculations through the context, since these need to\n   * be accessed by any component that lays out information on the\n   * column.\n   *\n   * Cross-axis layout and view configuration (e.g., showing and hiding\n   * of different components or labels) should be handled through passing\n   * props to the components themselves.\n   * */\n\n  const value = useMemo(() => {\n    // For now, change ordinal axis types to age axis types\n    return {\n      units,\n      sections,\n      totalHeight,\n      axisType,\n    };\n  }, [units, sections, totalHeight, axisType]);\n\n  return h(\n    MacrostratColumnStateProvider,\n    {\n      units,\n      allowUnitSelection,\n      onUnitSelected,\n      selectedUnit,\n    },\n    h(MacrostratColumnDataContext.Provider, { value }, children),\n  );\n}\n\nexport function UnitSelectionProvider(props: ColumnStateProviderProps<any>) {\n  /* A basic unit selection provider without column data context.\n  Mostly for use with the CorrelationChart component.\n   */\n  return h(MacrostratColumnStateProvider, {\n    ...props,\n    allowUnitSelection: true,\n  });\n}\n\nexport function useMacrostratColumnData() {\n  const ctx = useContext(MacrostratColumnDataContext);\n  if (!ctx) {\n    throw new Error(\n      \"useMacrostratColumnData must be used within a MacrostratColumnDataProvider\",\n    );\n  }\n  return ctx;\n}\n\nexport function useMacrostratUnits() {\n  return scope.useAtomValue(columnUnitsAtom);\n}\n\nexport function useColumnUnitsMap(): Map<number, ExtUnit> | null {\n  try {\n    return scope.useAtomValue(columnUnitsMapAtom) as Map<number, ExtUnit>;\n  } catch {\n    return null;\n  }\n}\n\nexport function useCompositeScale(): CompositeColumnScale {\n  const ctx = useMacrostratColumnData();\n  return useMemo(\n    () => createCompositeScale(ctx.sections, true),\n    [ctx.sections],\n  );\n}\n\nexport function MacrostratColumnProvider(props) {\n  /** A column provider specialized the Macrostrat API. Maps more\n   * generic concepts to Macrostrat-specific ones.\n   */\n\n  const { axisType } = useMacrostratColumnData();\n  const { units, domain, pixelScale, scale, children } = props;\n  return h(\n    ColumnProvider,\n    {\n      axisType,\n      divisions: units,\n      range: domain,\n      pixelsPerMeter: pixelScale,\n      scale,\n    },\n    children,\n  );\n}\n\n/** This is now a legacy provider */\nexport function LithologiesProvider({ children }) {\n  useEffect(() => {\n    console.warn(\n      \"LithologiesProvider is deprecated. Replace with MacrostratDataProvider\",\n    );\n  }, []);\n  return children;\n}\n"],"names":[],"mappings":";;;;;;;AAkBO,MAAM,QAAQ,kBAAA;AAEd,MAAM,kBAAkB,KAAA;AAExB,MAAM,qBAAqB,KAAmC,CAAC,QAAQ;AAC5E,QAAM,QAAQ,IAAI,eAAe;AACjC,MAAI,CAAC,MAAO,QAAO;AACnB,QAAM,8BAAc,IAAA;AACpB,QAAM,QAAQ,CAAC,SAAS;AACtB,YAAQ,IAAI,KAAK,SAAS,IAAI;AAAA,EAChC,CAAC;AACD,SAAO;AACT,CAAC;AAWM,SAAS,8BAAkD;AAAA,EAChE;AAAA,EACA;AAAA,EACA,qBAAqB;AAAA,EACrB;AAAA,EACA;AACF,GAAgC;AAS9B,QAAM,kBAAkB,QAAQ,MAAM;AACpC,QAAI,oBAAoB;AACtB,aAAO;AAAA,IACT;AACA,WAAO,gBAAgB,QAAQ,kBAAkB;AAAA,EACnD,GAAG,CAAA,CAAE;AAEL,QAAM,UAAmB;AAAA,IACvB,CAAC,iBAAiB,KAAK;AAAA,IACvB,CAAC,wBAAwB,eAAe;AAAA,IACxC,CAAC,oBAAoB,YAAY;AAAA,EAAA;AAGnC,MAAI,oBAA+B;AACnC,MAAI,iBAAiB;AACnB,wBAAoB,EAAE,8BAA8B,EAAE,eAAA,CAAgB;AAAA,EACxE;AAEA,SAAO;AAAA,IACL,MAAM;AAAA,IACN;AAAA,MACE,OAAO;AAAA,MACP,aAAa;AAAA,MACb,SAAS;AAAA,IAAA;AAAA,IAEX,CAAC,mBAAmB,QAAQ;AAAA,EAAA;AAEhC;AAeA,MAAM,8BACJ,cAAgD,IAAI;AAE/C,SAAS,6BAAiD;AAAA,EAC/D;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AACF,GAA+B;AAY7B,QAAM,QAAQ,QAAQ,MAAM;AAE1B,WAAO;AAAA,MACL;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,IAAA;AAAA,EAEJ,GAAG,CAAC,OAAO,UAAU,aAAa,QAAQ,CAAC;AAE3C,SAAO;AAAA,IACL;AAAA,IACA;AAAA,MACE;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,IAAA;AAAA,IAEF,EAAE,4BAA4B,UAAU,EAAE,MAAA,GAAS,QAAQ;AAAA,EAAA;AAE/D;AAEO,SAAS,sBAAsB,OAAsC;AAI1E,SAAO,EAAE,+BAA+B;AAAA,IACtC,GAAG;AAAA,IACH,oBAAoB;AAAA,EAAA,CACrB;AACH;AAEO,SAAS,0BAA0B;AACxC,QAAM,MAAM,WAAW,2BAA2B;AAClD,MAAI,CAAC,KAAK;AACR,UAAM,IAAI;AAAA,MACR;AAAA,IAAA;AAAA,EAEJ;AACA,SAAO;AACT;AAEO,SAAS,qBAAqB;AACnC,SAAO,MAAM,aAAa,eAAe;AAC3C;AAEO,SAAS,oBAAiD;AAC/D,MAAI;AACF,WAAO,MAAM,aAAa,kBAAkB;AAAA,EAC9C,QAAQ;AACN,WAAO;AAAA,EACT;AACF;AAEO,SAAS,oBAA0C;AACxD,QAAM,MAAM,wBAAA;AACZ,SAAO;AAAA,IACL,MAAM,qBAAqB,IAAI,UAAU,IAAI;AAAA,IAC7C,CAAC,IAAI,QAAQ;AAAA,EAAA;AAEjB;AAEO,SAAS,yBAAyB,OAAO;AAK9C,QAAM,EAAE,SAAA,IAAa,wBAAA;AACrB,QAAM,EAAE,OAAO,QAAQ,YAAY,OAAO,aAAa;AACvD,SAAO;AAAA,IACL;AAAA,IACA;AAAA,MACE;AAAA,MACA,WAAW;AAAA,MACX,OAAO;AAAA,MACP,gBAAgB;AAAA,MAChB;AAAA,IAAA;AAAA,IAEF;AAAA,EAAA;AAEJ;AAGO,SAAS,oBAAoB,EAAE,YAAY;AAChD,YAAU,MAAM;AACd,YAAQ;AAAA,MACN;AAAA,IAAA;AAAA,EAEJ,GAAG,CAAA,CAAE;AACL,SAAO;AACT;"}

package/dist/data-provider/unit-selection.cjs

@@ -3,32 +3,32 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const uiComponents = require("@macrostrat/ui-components");
 const React = require("react");
 const jotai = require("jotai");
-const core = require("./core.cjs");
+const store = require("./store.cjs");
 const stratigraphyUtils = require("@macrostrat/stratigraphy-utils");
 function useUnitSelectionDispatch() {
-  return core.scope.useSetAtom(selectedUnitAtom);
+  return store.scope.useSetAtom(selectedUnitAtom);
 }
 function useSelectedUnit() {
-  return core.scope.useAtomValue(selectedUnitAtom);
+  return store.scope.useAtomValue(selectedUnitAtom);
 }
 const allowUnitSelectionAtom = jotai.atom(true);
 const selectedUnitIDAtom = jotai.atom();
 const overlayPositionAtom = jotai.atom();
 const columnRefAtom = jotai.atom({ current: null });
 function useColumnRef() {
-  return core.scope.useAtomValue(columnRefAtom);
+  return store.scope.useAtomValue(columnRefAtom);
 }
 const selectedUnitAtom = jotai.atom(
   (get) => {
     if (!get(allowUnitSelectionAtom)) return null;
     const unitID = get(selectedUnitIDAtom);
     if (unitID == null) return null;
-    const unitsMap = get(core.columnUnitsMapAtom);
+    const unitsMap = get(store.columnUnitsMapAtom);
     return unitsMap?.get(unitID) || null;
   },
   (get, set, selectedUnit, target = null) => {
     if (!get(allowUnitSelectionAtom)) {
-      throw new Error("Unit selection is disabled.");
+      console.error("Unit selection is disabled.");
     }
     let unitID;
     let unit = null;
@@ -40,7 +40,7 @@ const selectedUnitAtom = jotai.atom(
       unitID = selectedUnit.unit_id;
     }
     if (unitID != null) {
-      const unitsMap = get(core.columnUnitsMapAtom);
+      const unitsMap = get(store.columnUnitsMapAtom);
       if (!unitsMap?.has(unitID)) {
         throw new Error(
           `Unit with ID ${unitID} not found in current column units.`
@@ -66,12 +66,12 @@ const selectedUnitAtom = jotai.atom(
   }
 );
 function useAtomOverlayPosition() {
-  return core.scope.useAtomValue(overlayPositionAtom);
+  return store.scope.useAtomValue(overlayPositionAtom);
 }
 function UnitSelectionCallbackManager({
   onUnitSelected
 }) {
-  const selectedUnit = core.scope.useAtomValue(selectedUnitAtom);
+  const selectedUnit = store.scope.useAtomValue(selectedUnitAtom);
   React.useEffect(() => {
     onUnitSelected?.(selectedUnit?.unit_id ?? null, selectedUnit ?? null);
   }, [selectedUnit?.unit_id]);

package/dist/data-provider/unit-selection.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"unit-selection.cjs","sources":["../../src/data-provider/unit-selection.ts"],"sourcesContent":["import { BaseUnit, UnitLong } from \"@macrostrat/api-types\";\nimport { useKeyHandler } from \"@macrostrat/ui-components\";\nimport { useEffect, useRef, useCallback, useMemo } from \"react\";\nimport type { RectBounds, IUnit } from \"../units/types\";\nimport { atom } from \"jotai\";\nimport { columnUnitsMapAtom, scope } from \"./core\";\nimport { ColumnData } from \"@macrostrat/column-views\";\nimport {\n  AgeRangeQuantifiedDifference,\n  ageRangeQuantifiedDifference,\n  AgeRangeRelationship,\n} from \"@macrostrat/stratigraphy-utils\";\n\ntype UnitSelectDispatch = (\n  unit: number | BaseUnit | null,\n  target: HTMLElement | null,\n) => void;\n\nexport function useUnitSelectionDispatch(): UnitSelectDispatch {\n  return scope.useSetAtom(selectedUnitAtom);\n}\n\nexport function useSelectedUnit() {\n  return scope.useAtomValue(selectedUnitAtom);\n}\n\nexport interface ColumnClickData {\n  unitID: number | null;\n  unit: BaseUnit | null;\n  target: HTMLElement | null;\n  height: number;\n  // Room for boundary IDs eventually\n}\n\nexport interface UnitSelectionCallbacks {\n  // It's sort of unfortunate that we need to pass in the column ref here\n  onClickedColumn?: (columnClickData: ColumnClickData, event: Event) => void;\n  onUnitSelected?: <T extends BaseUnit>(\n    unitID: number | null,\n    unit: T | null,\n  ) => void;\n}\n\nexport const allowUnitSelectionAtom = atom<boolean>(true);\n\nexport const selectedUnitIDAtom = atom<number | null>();\n\nconst overlayPositionAtom = atom<RectBounds | null>();\n\nconst columnRefAtom = atom<{ current: HTMLElement | null }>({ current: null });\n\nexport function useColumnRef() {\n  return scope.useAtomValue(columnRefAtom);\n}\n\nconst selectedUnitAtom = atom(\n  (get) => {\n    if (!get(allowUnitSelectionAtom)) return null;\n\n    const unitID = get(selectedUnitIDAtom);\n    if (unitID == null) return null;\n    const unitsMap = get(columnUnitsMapAtom);\n    return unitsMap?.get(unitID) || null;\n  },\n  (\n    get,\n    set,\n    selectedUnit: number | BaseUnit | null,\n    target: HTMLElement | null = null,\n  ): BaseUnit | null => {\n    if (!get(allowUnitSelectionAtom)) {\n      throw new Error(\"Unit selection is disabled.\");\n    }\n\n    let unitID: number | null;\n    let unit: BaseUnit | null = null;\n    if (selectedUnit == null) {\n      unitID = null;\n    } else if (typeof selectedUnit === \"number\") {\n      unitID = selectedUnit;\n    } else if (\"unit_id\" in selectedUnit) {\n      unitID = selectedUnit.unit_id;\n    }\n\n    if (unitID != null) {\n      // Verify that the unit exists in the current colum, else throw\n      const unitsMap = get(columnUnitsMapAtom);\n      if (!unitsMap?.has(unitID)) {\n        throw new Error(\n          `Unit with ID ${unitID} not found in current column units.`,\n        );\n      }\n      unit = unitsMap.get(unitID) ?? null;\n    }\n\n    let overlayPosition: RectBounds | null = null;\n\n    const columnEl = get(columnRefAtom)?.current;\n\n    if (unit != null && columnEl != null && target != null) {\n      const rect = columnEl.getBoundingClientRect();\n      const targetRect = target.getBoundingClientRect();\n      overlayPosition = {\n        x: targetRect.left - rect.left,\n        y: targetRect.top - rect.top,\n        width: targetRect.width,\n        height: targetRect.height,\n      };\n    }\n\n    set(selectedUnitIDAtom, unitID);\n    set(overlayPositionAtom, overlayPosition);\n\n    return unit;\n  },\n);\n\nexport function useAtomOverlayPosition() {\n  return scope.useAtomValue(overlayPositionAtom);\n}\n\nexport function UnitSelectionCallbackManager({\n  onUnitSelected,\n}: UnitSelectionCallbacks) {\n  const selectedUnit = scope.useAtomValue(selectedUnitAtom);\n  useEffect(() => {\n    onUnitSelected?.(selectedUnit?.unit_id ?? null, selectedUnit ?? null);\n  }, [selectedUnit?.unit_id]);\n  return null;\n}\n\n/** TODO: figure out if onClickedColumn is still needed\n /** This is not the natural place to get positions within the column,\n * but it will work for now.\nif (props.onClickedColumn) {\n  // Infer height from top and bottom height of unit (because that's passed back with the call)\n  //const py = event.y;\n  //const [bottom, top] = getUnitHeightRange(unit, axisType);\n  //const height = Math.abs(bottom - top);\n\n  const columnClickData: ColumnClickData = {\n    unitID: unit?.unit_id,\n    unit,\n    target,\n    height: el?.getBoundingClientRect().height || 0,\n  };\n  props.onClickedColumn(columnClickData, event);\n}*/\n\nexport function useUnitSelectionTarget(\n  unit: IUnit,\n): [React.RefObject<HTMLElement>, boolean, (evt: Event) => void] {\n  const ref = useRef<HTMLElement>();\n  const selectedUnit = useSelectedUnit();\n  const selectUnit = useUnitSelectionDispatch();\n  const selected = selectedUnit?.unit_id == unit.unit_id;\n\n  const onClick = useCallback(\n    (evt: Event) => {\n      selectUnit?.(unit, ref.current);\n      evt.stopPropagation();\n    },\n    [unit, selectUnit],\n  );\n\n  useEffect(() => {\n    if (!selected || selectUnit == null) return;\n    // In case we haven't set the position of the unit (if we don't have a target), set the selected unit\n    selectUnit(unit, ref.current);\n\n    // Scroll the unit into view\n    ref.current?.scrollIntoView({\n      behavior: \"smooth\",\n      block: \"center\",\n      inline: \"nearest\",\n    });\n  }, [selected, selectUnit]);\n\n  return [ref, selected, onClick];\n}\n\nexport function UnitKeyboardNavigation({\n  columnData,\n  units,\n  allowHorizontalNavigation,\n}: {\n  columnData?: ColumnData[];\n  units?: UnitLong[];\n  allowHorizontalNavigation?: boolean;\n}) {\n  if (units == null && columnData == null) {\n    throw new Error(\"Either units or columnData must be provided.\");\n  }\n\n  let _columnData: ColumnData[] = useMemo(() => {\n    if (columnData != null) return columnData;\n    // Build column data from units\n    const colMap = new Map<number, UnitLong[]>();\n    for (const unit of units!) {\n      if (!colMap.has(unit.col_id)) {\n        colMap.set(unit.col_id, []);\n      }\n      colMap.get(unit.col_id)!.push(unit);\n    }\n    const cols: ColumnData[] = [];\n    for (const [colID, units] of colMap) {\n      cols.push({ columnID: colID, units });\n    }\n    // Sort columns by columnID\n    cols.sort((a, b) => a.columnID - b.columnID);\n    return cols;\n  }, [columnData, units]);\n\n  // Default to allowing horizontal navigation only if columnData is provided\n  const _allowHorizontalNavigation =\n    allowHorizontalNavigation ?? columnData != null;\n\n  const selectedUnit = useSelectedUnit() as UnitLong | null;\n  const selectUnit = useUnitSelectionDispatch();\n\n  const keyMap: Record<number, Direction> = {\n    38: \"up\",\n    40: \"down\",\n  };\n  if (_allowHorizontalNavigation) {\n    keyMap[37] = \"left\";\n    keyMap[39] = \"right\";\n  }\n\n  useKeyHandler(\n    (event) => {\n      const direction = keyMap[event.keyCode];\n      if (direction == null) return;\n      const nextUnit = getBestUnit(_columnData, selectedUnit, direction);\n      if (nextUnit == null) return;\n      selectUnit(nextUnit, null);\n      event.stopPropagation();\n    },\n    [_columnData, selectedUnit],\n  );\n  return null;\n}\n\ntype Direction = \"up\" | \"down\" | \"left\" | \"right\";\n\nfunction getBestUnit(\n  columnData: ColumnData[],\n  targetUnit: UnitLong,\n  direction: Direction,\n): UnitLong | null {\n  const thisColIndex = columnData.findIndex(\n    (col) => col.columnID === targetUnit.col_id,\n  );\n  if (thisColIndex === -1) return null;\n\n  // If up or down, stay in the same column\n  if (direction === \"up\" || direction === \"down\") {\n    const units = columnData[thisColIndex].units;\n    const ix = units.findIndex((unit) => unit.unit_id === targetUnit.unit_id);\n    if (ix === -1) return null;\n    if (direction === \"up\") {\n      return units[ix - 1] || null;\n    } else {\n      return units[ix + 1] || null;\n    }\n  }\n\n  // If left or right, move to adjacent column\n  let adjacentColIndex: number;\n  if (direction === \"left\") {\n    adjacentColIndex =\n      (thisColIndex - 1 + columnData.length) % columnData.length;\n  } else {\n    adjacentColIndex = (thisColIndex + 1) % columnData.length;\n  }\n\n  const adjacentColUnits = columnData[adjacentColIndex].units;\n  return getMostOverlappingUnit(targetUnit, adjacentColUnits);\n}\n\ntype UnitAgeRangeRelationship = AgeRangeQuantifiedDifference & {\n  unit: UnitLong;\n};\n\nfunction getMostOverlappingUnit(\n  targetUnit: UnitLong,\n  candidateUnits: UnitLong[],\n): UnitLong | null {\n  const targetAgeRange = [targetUnit.b_age, targetUnit.t_age];\n\n  const overlaps: UnitAgeRangeRelationship[] = [];\n  for (const candidate of candidateUnits) {\n    const candidateAgeRange = [candidate.b_age, candidate.t_age];\n\n    const rel = ageRangeQuantifiedDifference(targetAgeRange, candidateAgeRange);\n    if (rel.type === AgeRangeRelationship.Identical) {\n      return candidate;\n    }\n    overlaps.push({ ...rel, unit: candidate });\n  }\n\n  let bestOverlaps = overlaps.filter(\n    (d) => d.type === AgeRangeRelationship.Containing,\n  );\n  bestOverlaps.sort((a, b) => b.overlap - a.overlap);\n  if (bestOverlaps.length > 0) {\n    return bestOverlaps[0].unit;\n  }\n\n  bestOverlaps = overlaps.filter(\n    (d) => d.type === AgeRangeRelationship.Contained,\n  );\n  bestOverlaps.sort((a, b) => b.overlap - a.overlap);\n  if (bestOverlaps.length > 0) {\n    return bestOverlaps[0].unit;\n  }\n\n  bestOverlaps = overlaps.filter(\n    (d) => d.type === AgeRangeRelationship.PartialOverlap,\n  );\n  bestOverlaps.sort((a, b) => b.overlap - a.overlap);\n  if (bestOverlaps.length > 0) {\n    return bestOverlaps[0].unit;\n  }\n\n  bestOverlaps = overlaps.filter(\n    (d) => d.type === AgeRangeRelationship.Disjoint,\n  );\n  bestOverlaps.sort((a, b) => a.distance - b.distance);\n  if (bestOverlaps.length > 0) {\n    return bestOverlaps[0].unit;\n  }\n  return null;\n}\n"],"names":["scope","atom","columnUnitsMapAtom","useEffect","useRef","useCallback","useMemo","units","useKeyHandler","ageRangeQuantifiedDifference","AgeRangeRelationship"],"mappings":"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"}
+{"version":3,"file":"unit-selection.cjs","sources":["../../src/data-provider/unit-selection.ts"],"sourcesContent":["import type { BaseUnit, UnitLong } from \"@macrostrat/api-types\";\nimport { useKeyHandler } from \"@macrostrat/ui-components\";\nimport { useEffect, useRef, useCallback, useMemo } from \"react\";\nimport type { RectBounds, IUnit } from \"../units/types\";\nimport { atom } from \"jotai\";\nimport { scope, columnUnitsMapAtom } from \"./store\";\nimport {\n  AgeRangeQuantifiedDifference,\n  ageRangeQuantifiedDifference,\n  AgeRangeRelationship,\n} from \"@macrostrat/stratigraphy-utils\";\nimport type { ColumnData } from \"@macrostrat/data-provider\";\n\ntype UnitSelectDispatch = (\n  unit: number | BaseUnit | null,\n  target: HTMLElement | null,\n) => void;\n\nexport function useUnitSelectionDispatch(): UnitSelectDispatch {\n  return scope.useSetAtom(selectedUnitAtom);\n}\n\nexport function useSelectedUnit() {\n  return scope.useAtomValue(selectedUnitAtom);\n}\n\nexport interface ColumnClickData {\n  unitID: number | null;\n  unit: BaseUnit | null;\n  target: HTMLElement | null;\n  height: number;\n  // Room for boundary IDs eventually\n}\n\nexport interface UnitSelectionCallbacks {\n  // It's sort of unfortunate that we need to pass in the column ref here\n  onClickedColumn?: (columnClickData: ColumnClickData, event: Event) => void;\n  onUnitSelected?: <T extends BaseUnit>(\n    unitID: number | null,\n    unit: T | null,\n  ) => void;\n}\n\nexport const allowUnitSelectionAtom = atom<boolean>(true);\n\nexport const selectedUnitIDAtom = atom<number | null>();\n\nconst overlayPositionAtom = atom<RectBounds | null>();\n\nconst columnRefAtom = atom<{ current: HTMLElement | null }>({ current: null });\n\nexport function useColumnRef() {\n  return scope.useAtomValue(columnRefAtom);\n}\n\nconst selectedUnitAtom = atom(\n  (get) => {\n    if (!get(allowUnitSelectionAtom)) return null;\n\n    const unitID = get(selectedUnitIDAtom);\n    if (unitID == null) return null;\n    const unitsMap = get(columnUnitsMapAtom);\n    return unitsMap?.get(unitID) || null;\n  },\n  (\n    get,\n    set,\n    selectedUnit: number | BaseUnit | null,\n    target: HTMLElement | null = null,\n  ): BaseUnit | null => {\n    if (!get(allowUnitSelectionAtom)) {\n      console.error(\"Unit selection is disabled.\");\n    }\n\n    let unitID: number | null;\n    let unit: BaseUnit | null = null;\n    if (selectedUnit == null) {\n      unitID = null;\n    } else if (typeof selectedUnit === \"number\") {\n      unitID = selectedUnit;\n    } else if (\"unit_id\" in selectedUnit) {\n      unitID = selectedUnit.unit_id;\n    }\n\n    if (unitID != null) {\n      // Verify that the unit exists in the current colum, else throw\n      const unitsMap = get(columnUnitsMapAtom);\n      if (!unitsMap?.has(unitID)) {\n        throw new Error(\n          `Unit with ID ${unitID} not found in current column units.`,\n        );\n      }\n      unit = unitsMap.get(unitID) ?? null;\n    }\n\n    let overlayPosition: RectBounds | null = null;\n\n    const columnEl = get(columnRefAtom)?.current;\n\n    if (unit != null && columnEl != null && target != null) {\n      const rect = columnEl.getBoundingClientRect();\n      const targetRect = target.getBoundingClientRect();\n      overlayPosition = {\n        x: targetRect.left - rect.left,\n        y: targetRect.top - rect.top,\n        width: targetRect.width,\n        height: targetRect.height,\n      };\n    }\n\n    set(selectedUnitIDAtom, unitID);\n    set(overlayPositionAtom, overlayPosition);\n\n    return unit;\n  },\n);\n\nexport function useAtomOverlayPosition() {\n  return scope.useAtomValue(overlayPositionAtom);\n}\n\nexport function UnitSelectionCallbackManager({\n  onUnitSelected,\n}: UnitSelectionCallbacks) {\n  const selectedUnit = scope.useAtomValue(selectedUnitAtom);\n  useEffect(() => {\n    onUnitSelected?.(selectedUnit?.unit_id ?? null, selectedUnit ?? null);\n  }, [selectedUnit?.unit_id]);\n  return null;\n}\n\n/** TODO: figure out if onClickedColumn is still needed\n /** This is not the natural place to get positions within the column,\n * but it will work for now.\nif (props.onClickedColumn) {\n  // Infer height from top and bottom height of unit (because that's passed back with the call)\n  //const py = event.y;\n  //const [bottom, top] = getUnitHeightRange(unit, axisType);\n  //const height = Math.abs(bottom - top);\n\n  const columnClickData: ColumnClickData = {\n    unitID: unit?.unit_id,\n    unit,\n    target,\n    height: el?.getBoundingClientRect().height || 0,\n  };\n  props.onClickedColumn(columnClickData, event);\n}*/\n\nexport function useUnitSelectionTarget(\n  unit: IUnit,\n): [React.RefObject<HTMLElement>, boolean, (evt: Event) => void] {\n  const ref = useRef<HTMLElement>();\n  const selectedUnit = useSelectedUnit();\n  const selectUnit = useUnitSelectionDispatch();\n  const selected = selectedUnit?.unit_id == unit.unit_id;\n\n  const onClick = useCallback(\n    (evt: Event) => {\n      selectUnit?.(unit, ref.current);\n      evt.stopPropagation();\n    },\n    [unit, selectUnit],\n  );\n\n  useEffect(() => {\n    if (!selected || selectUnit == null) return;\n    // In case we haven't set the position of the unit (if we don't have a target), set the selected unit\n    selectUnit(unit, ref.current);\n\n    // Scroll the unit into view\n    ref.current?.scrollIntoView({\n      behavior: \"smooth\",\n      block: \"center\",\n      inline: \"nearest\",\n    });\n  }, [selected, selectUnit]);\n\n  return [ref, selected, onClick];\n}\n\nexport function UnitKeyboardNavigation({\n  columnData,\n  units,\n  allowHorizontalNavigation,\n}: {\n  columnData?: ColumnData[];\n  units?: UnitLong[];\n  allowHorizontalNavigation?: boolean;\n}) {\n  if (units == null && columnData == null) {\n    throw new Error(\"Either units or columnData must be provided.\");\n  }\n\n  let _columnData: ColumnData[] = useMemo(() => {\n    if (columnData != null) return columnData;\n    // Build column data from units\n    const colMap = new Map<number, UnitLong[]>();\n    for (const unit of units!) {\n      if (!colMap.has(unit.col_id)) {\n        colMap.set(unit.col_id, []);\n      }\n      colMap.get(unit.col_id)!.push(unit);\n    }\n    const cols: ColumnData[] = [];\n    for (const [colID, units] of colMap) {\n      cols.push({ columnID: colID, units });\n    }\n    // Sort columns by columnID\n    cols.sort((a, b) => a.columnID - b.columnID);\n    return cols;\n  }, [columnData, units]);\n\n  // Default to allowing horizontal navigation only if columnData is provided\n  const _allowHorizontalNavigation =\n    allowHorizontalNavigation ?? columnData != null;\n\n  const selectedUnit = useSelectedUnit() as UnitLong | null;\n  const selectUnit = useUnitSelectionDispatch();\n\n  const keyMap: Record<number, Direction> = {\n    38: \"up\",\n    40: \"down\",\n  };\n  if (_allowHorizontalNavigation) {\n    keyMap[37] = \"left\";\n    keyMap[39] = \"right\";\n  }\n\n  useKeyHandler(\n    (event) => {\n      const direction = keyMap[event.keyCode];\n      if (direction == null) return;\n      const nextUnit = getBestUnit(_columnData, selectedUnit, direction);\n      if (nextUnit == null) return;\n      selectUnit(nextUnit, null);\n      event.stopPropagation();\n    },\n    [_columnData, selectedUnit],\n  );\n  return null;\n}\n\ntype Direction = \"up\" | \"down\" | \"left\" | \"right\";\n\nfunction getBestUnit(\n  columnData: ColumnData[],\n  targetUnit: UnitLong,\n  direction: Direction,\n): UnitLong | null {\n  const thisColIndex = columnData.findIndex(\n    (col) => col.columnID === targetUnit.col_id,\n  );\n  if (thisColIndex === -1) return null;\n\n  // If up or down, stay in the same column\n  if (direction === \"up\" || direction === \"down\") {\n    const units = columnData[thisColIndex].units;\n    const ix = units.findIndex((unit) => unit.unit_id === targetUnit.unit_id);\n    if (ix === -1) return null;\n    if (direction === \"up\") {\n      return units[ix - 1] || null;\n    } else {\n      return units[ix + 1] || null;\n    }\n  }\n\n  // If left or right, move to adjacent column\n  let adjacentColIndex: number;\n  if (direction === \"left\") {\n    adjacentColIndex =\n      (thisColIndex - 1 + columnData.length) % columnData.length;\n  } else {\n    adjacentColIndex = (thisColIndex + 1) % columnData.length;\n  }\n\n  const adjacentColUnits = columnData[adjacentColIndex].units;\n  return getMostOverlappingUnit(targetUnit, adjacentColUnits);\n}\n\ntype UnitAgeRangeRelationship = AgeRangeQuantifiedDifference & {\n  unit: UnitLong;\n};\n\nfunction getMostOverlappingUnit(\n  targetUnit: UnitLong,\n  candidateUnits: UnitLong[],\n): UnitLong | null {\n  const targetAgeRange = [targetUnit.b_age, targetUnit.t_age];\n\n  const overlaps: UnitAgeRangeRelationship[] = [];\n  for (const candidate of candidateUnits) {\n    const candidateAgeRange = [candidate.b_age, candidate.t_age];\n\n    const rel = ageRangeQuantifiedDifference(targetAgeRange, candidateAgeRange);\n    if (rel.type === AgeRangeRelationship.Identical) {\n      return candidate;\n    }\n    overlaps.push({ ...rel, unit: candidate });\n  }\n\n  let bestOverlaps = overlaps.filter(\n    (d) => d.type === AgeRangeRelationship.Containing,\n  );\n  bestOverlaps.sort((a, b) => b.overlap - a.overlap);\n  if (bestOverlaps.length > 0) {\n    return bestOverlaps[0].unit;\n  }\n\n  bestOverlaps = overlaps.filter(\n    (d) => d.type === AgeRangeRelationship.Contained,\n  );\n  bestOverlaps.sort((a, b) => b.overlap - a.overlap);\n  if (bestOverlaps.length > 0) {\n    return bestOverlaps[0].unit;\n  }\n\n  bestOverlaps = overlaps.filter(\n    (d) => d.type === AgeRangeRelationship.PartialOverlap,\n  );\n  bestOverlaps.sort((a, b) => b.overlap - a.overlap);\n  if (bestOverlaps.length > 0) {\n    return bestOverlaps[0].unit;\n  }\n\n  bestOverlaps = overlaps.filter(\n    (d) => d.type === AgeRangeRelationship.Disjoint,\n  );\n  bestOverlaps.sort((a, b) => a.distance - b.distance);\n  if (bestOverlaps.length > 0) {\n    return bestOverlaps[0].unit;\n  }\n  return null;\n}\n"],"names":["scope","atom","columnUnitsMapAtom","useEffect","useRef","useCallback","useMemo","units","useKeyHandler","ageRangeQuantifiedDifference","AgeRangeRelationship"],"mappings":"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"}

package/dist/data-provider/unit-selection.d.ts

@@ -1,6 +1,6 @@
 import { BaseUnit, UnitLong } from '@macrostrat/api-types';
 import { IUnit } from '../units/types';
-import { ColumnData } from '@macrostrat/column-views';
+import { ColumnData } from '@macrostrat/data-provider';
 type UnitSelectDispatch = (unit: number | BaseUnit | null, target: HTMLElement | null) => void;
 export declare function useUnitSelectionDispatch(): UnitSelectDispatch;
 export declare function useSelectedUnit(): any;

package/dist/data-provider/unit-selection.js

@@ -1,7 +1,7 @@
 import { useKeyHandler } from "@macrostrat/ui-components";
 import { useMemo, useEffect, useRef, useCallback } from "react";
 import { atom } from "jotai";
-import { scope, columnUnitsMapAtom } from "./core.js";
+import { scope, columnUnitsMapAtom } from "./store.js";
 import { ageRangeQuantifiedDifference, AgeRangeRelationship } from "@macrostrat/stratigraphy-utils";
 function useUnitSelectionDispatch() {
   return scope.useSetAtom(selectedUnitAtom);
@@ -26,7 +26,7 @@ const selectedUnitAtom = atom(
   },
   (get, set, selectedUnit, target = null) => {
     if (!get(allowUnitSelectionAtom)) {
-      throw new Error("Unit selection is disabled.");
+      console.error("Unit selection is disabled.");
     }
     let unitID;
     let unit = null;

package/dist/data-provider/unit-selection.js.map

@@ -1 +1 @@
-{"version":3,"file":"unit-selection.js","sources":["../../src/data-provider/unit-selection.ts"],"sourcesContent":["import { BaseUnit, UnitLong } from \"@macrostrat/api-types\";\nimport { useKeyHandler } from \"@macrostrat/ui-components\";\nimport { useEffect, useRef, useCallback, useMemo } from \"react\";\nimport type { RectBounds, IUnit } from \"../units/types\";\nimport { atom } from \"jotai\";\nimport { columnUnitsMapAtom, scope } from \"./core\";\nimport { ColumnData } from \"@macrostrat/column-views\";\nimport {\n  AgeRangeQuantifiedDifference,\n  ageRangeQuantifiedDifference,\n  AgeRangeRelationship,\n} from \"@macrostrat/stratigraphy-utils\";\n\ntype UnitSelectDispatch = (\n  unit: number | BaseUnit | null,\n  target: HTMLElement | null,\n) => void;\n\nexport function useUnitSelectionDispatch(): UnitSelectDispatch {\n  return scope.useSetAtom(selectedUnitAtom);\n}\n\nexport function useSelectedUnit() {\n  return scope.useAtomValue(selectedUnitAtom);\n}\n\nexport interface ColumnClickData {\n  unitID: number | null;\n  unit: BaseUnit | null;\n  target: HTMLElement | null;\n  height: number;\n  // Room for boundary IDs eventually\n}\n\nexport interface UnitSelectionCallbacks {\n  // It's sort of unfortunate that we need to pass in the column ref here\n  onClickedColumn?: (columnClickData: ColumnClickData, event: Event) => void;\n  onUnitSelected?: <T extends BaseUnit>(\n    unitID: number | null,\n    unit: T | null,\n  ) => void;\n}\n\nexport const allowUnitSelectionAtom = atom<boolean>(true);\n\nexport const selectedUnitIDAtom = atom<number | null>();\n\nconst overlayPositionAtom = atom<RectBounds | null>();\n\nconst columnRefAtom = atom<{ current: HTMLElement | null }>({ current: null });\n\nexport function useColumnRef() {\n  return scope.useAtomValue(columnRefAtom);\n}\n\nconst selectedUnitAtom = atom(\n  (get) => {\n    if (!get(allowUnitSelectionAtom)) return null;\n\n    const unitID = get(selectedUnitIDAtom);\n    if (unitID == null) return null;\n    const unitsMap = get(columnUnitsMapAtom);\n    return unitsMap?.get(unitID) || null;\n  },\n  (\n    get,\n    set,\n    selectedUnit: number | BaseUnit | null,\n    target: HTMLElement | null = null,\n  ): BaseUnit | null => {\n    if (!get(allowUnitSelectionAtom)) {\n      throw new Error(\"Unit selection is disabled.\");\n    }\n\n    let unitID: number | null;\n    let unit: BaseUnit | null = null;\n    if (selectedUnit == null) {\n      unitID = null;\n    } else if (typeof selectedUnit === \"number\") {\n      unitID = selectedUnit;\n    } else if (\"unit_id\" in selectedUnit) {\n      unitID = selectedUnit.unit_id;\n    }\n\n    if (unitID != null) {\n      // Verify that the unit exists in the current colum, else throw\n      const unitsMap = get(columnUnitsMapAtom);\n      if (!unitsMap?.has(unitID)) {\n        throw new Error(\n          `Unit with ID ${unitID} not found in current column units.`,\n        );\n      }\n      unit = unitsMap.get(unitID) ?? null;\n    }\n\n    let overlayPosition: RectBounds | null = null;\n\n    const columnEl = get(columnRefAtom)?.current;\n\n    if (unit != null && columnEl != null && target != null) {\n      const rect = columnEl.getBoundingClientRect();\n      const targetRect = target.getBoundingClientRect();\n      overlayPosition = {\n        x: targetRect.left - rect.left,\n        y: targetRect.top - rect.top,\n        width: targetRect.width,\n        height: targetRect.height,\n      };\n    }\n\n    set(selectedUnitIDAtom, unitID);\n    set(overlayPositionAtom, overlayPosition);\n\n    return unit;\n  },\n);\n\nexport function useAtomOverlayPosition() {\n  return scope.useAtomValue(overlayPositionAtom);\n}\n\nexport function UnitSelectionCallbackManager({\n  onUnitSelected,\n}: UnitSelectionCallbacks) {\n  const selectedUnit = scope.useAtomValue(selectedUnitAtom);\n  useEffect(() => {\n    onUnitSelected?.(selectedUnit?.unit_id ?? null, selectedUnit ?? null);\n  }, [selectedUnit?.unit_id]);\n  return null;\n}\n\n/** TODO: figure out if onClickedColumn is still needed\n /** This is not the natural place to get positions within the column,\n * but it will work for now.\nif (props.onClickedColumn) {\n  // Infer height from top and bottom height of unit (because that's passed back with the call)\n  //const py = event.y;\n  //const [bottom, top] = getUnitHeightRange(unit, axisType);\n  //const height = Math.abs(bottom - top);\n\n  const columnClickData: ColumnClickData = {\n    unitID: unit?.unit_id,\n    unit,\n    target,\n    height: el?.getBoundingClientRect().height || 0,\n  };\n  props.onClickedColumn(columnClickData, event);\n}*/\n\nexport function useUnitSelectionTarget(\n  unit: IUnit,\n): [React.RefObject<HTMLElement>, boolean, (evt: Event) => void] {\n  const ref = useRef<HTMLElement>();\n  const selectedUnit = useSelectedUnit();\n  const selectUnit = useUnitSelectionDispatch();\n  const selected = selectedUnit?.unit_id == unit.unit_id;\n\n  const onClick = useCallback(\n    (evt: Event) => {\n      selectUnit?.(unit, ref.current);\n      evt.stopPropagation();\n    },\n    [unit, selectUnit],\n  );\n\n  useEffect(() => {\n    if (!selected || selectUnit == null) return;\n    // In case we haven't set the position of the unit (if we don't have a target), set the selected unit\n    selectUnit(unit, ref.current);\n\n    // Scroll the unit into view\n    ref.current?.scrollIntoView({\n      behavior: \"smooth\",\n      block: \"center\",\n      inline: \"nearest\",\n    });\n  }, [selected, selectUnit]);\n\n  return [ref, selected, onClick];\n}\n\nexport function UnitKeyboardNavigation({\n  columnData,\n  units,\n  allowHorizontalNavigation,\n}: {\n  columnData?: ColumnData[];\n  units?: UnitLong[];\n  allowHorizontalNavigation?: boolean;\n}) {\n  if (units == null && columnData == null) {\n    throw new Error(\"Either units or columnData must be provided.\");\n  }\n\n  let _columnData: ColumnData[] = useMemo(() => {\n    if (columnData != null) return columnData;\n    // Build column data from units\n    const colMap = new Map<number, UnitLong[]>();\n    for (const unit of units!) {\n      if (!colMap.has(unit.col_id)) {\n        colMap.set(unit.col_id, []);\n      }\n      colMap.get(unit.col_id)!.push(unit);\n    }\n    const cols: ColumnData[] = [];\n    for (const [colID, units] of colMap) {\n      cols.push({ columnID: colID, units });\n    }\n    // Sort columns by columnID\n    cols.sort((a, b) => a.columnID - b.columnID);\n    return cols;\n  }, [columnData, units]);\n\n  // Default to allowing horizontal navigation only if columnData is provided\n  const _allowHorizontalNavigation =\n    allowHorizontalNavigation ?? columnData != null;\n\n  const selectedUnit = useSelectedUnit() as UnitLong | null;\n  const selectUnit = useUnitSelectionDispatch();\n\n  const keyMap: Record<number, Direction> = {\n    38: \"up\",\n    40: \"down\",\n  };\n  if (_allowHorizontalNavigation) {\n    keyMap[37] = \"left\";\n    keyMap[39] = \"right\";\n  }\n\n  useKeyHandler(\n    (event) => {\n      const direction = keyMap[event.keyCode];\n      if (direction == null) return;\n      const nextUnit = getBestUnit(_columnData, selectedUnit, direction);\n      if (nextUnit == null) return;\n      selectUnit(nextUnit, null);\n      event.stopPropagation();\n    },\n    [_columnData, selectedUnit],\n  );\n  return null;\n}\n\ntype Direction = \"up\" | \"down\" | \"left\" | \"right\";\n\nfunction getBestUnit(\n  columnData: ColumnData[],\n  targetUnit: UnitLong,\n  direction: Direction,\n): UnitLong | null {\n  const thisColIndex = columnData.findIndex(\n    (col) => col.columnID === targetUnit.col_id,\n  );\n  if (thisColIndex === -1) return null;\n\n  // If up or down, stay in the same column\n  if (direction === \"up\" || direction === \"down\") {\n    const units = columnData[thisColIndex].units;\n    const ix = units.findIndex((unit) => unit.unit_id === targetUnit.unit_id);\n    if (ix === -1) return null;\n    if (direction === \"up\") {\n      return units[ix - 1] || null;\n    } else {\n      return units[ix + 1] || null;\n    }\n  }\n\n  // If left or right, move to adjacent column\n  let adjacentColIndex: number;\n  if (direction === \"left\") {\n    adjacentColIndex =\n      (thisColIndex - 1 + columnData.length) % columnData.length;\n  } else {\n    adjacentColIndex = (thisColIndex + 1) % columnData.length;\n  }\n\n  const adjacentColUnits = columnData[adjacentColIndex].units;\n  return getMostOverlappingUnit(targetUnit, adjacentColUnits);\n}\n\ntype UnitAgeRangeRelationship = AgeRangeQuantifiedDifference & {\n  unit: UnitLong;\n};\n\nfunction getMostOverlappingUnit(\n  targetUnit: UnitLong,\n  candidateUnits: UnitLong[],\n): UnitLong | null {\n  const targetAgeRange = [targetUnit.b_age, targetUnit.t_age];\n\n  const overlaps: UnitAgeRangeRelationship[] = [];\n  for (const candidate of candidateUnits) {\n    const candidateAgeRange = [candidate.b_age, candidate.t_age];\n\n    const rel = ageRangeQuantifiedDifference(targetAgeRange, candidateAgeRange);\n    if (rel.type === AgeRangeRelationship.Identical) {\n      return candidate;\n    }\n    overlaps.push({ ...rel, unit: candidate });\n  }\n\n  let bestOverlaps = overlaps.filter(\n    (d) => d.type === AgeRangeRelationship.Containing,\n  );\n  bestOverlaps.sort((a, b) => b.overlap - a.overlap);\n  if (bestOverlaps.length > 0) {\n    return bestOverlaps[0].unit;\n  }\n\n  bestOverlaps = overlaps.filter(\n    (d) => d.type === AgeRangeRelationship.Contained,\n  );\n  bestOverlaps.sort((a, b) => b.overlap - a.overlap);\n  if (bestOverlaps.length > 0) {\n    return bestOverlaps[0].unit;\n  }\n\n  bestOverlaps = overlaps.filter(\n    (d) => d.type === AgeRangeRelationship.PartialOverlap,\n  );\n  bestOverlaps.sort((a, b) => b.overlap - a.overlap);\n  if (bestOverlaps.length > 0) {\n    return bestOverlaps[0].unit;\n  }\n\n  bestOverlaps = overlaps.filter(\n    (d) => d.type === AgeRangeRelationship.Disjoint,\n  );\n  bestOverlaps.sort((a, b) => a.distance - b.distance);\n  if (bestOverlaps.length > 0) {\n    return bestOverlaps[0].unit;\n  }\n  return null;\n}\n"],"names":["units"],"mappings":"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"}
+{"version":3,"file":"unit-selection.js","sources":["../../src/data-provider/unit-selection.ts"],"sourcesContent":["import type { BaseUnit, UnitLong } from \"@macrostrat/api-types\";\nimport { useKeyHandler } from \"@macrostrat/ui-components\";\nimport { useEffect, useRef, useCallback, useMemo } from \"react\";\nimport type { RectBounds, IUnit } from \"../units/types\";\nimport { atom } from \"jotai\";\nimport { scope, columnUnitsMapAtom } from \"./store\";\nimport {\n  AgeRangeQuantifiedDifference,\n  ageRangeQuantifiedDifference,\n  AgeRangeRelationship,\n} from \"@macrostrat/stratigraphy-utils\";\nimport type { ColumnData } from \"@macrostrat/data-provider\";\n\ntype UnitSelectDispatch = (\n  unit: number | BaseUnit | null,\n  target: HTMLElement | null,\n) => void;\n\nexport function useUnitSelectionDispatch(): UnitSelectDispatch {\n  return scope.useSetAtom(selectedUnitAtom);\n}\n\nexport function useSelectedUnit() {\n  return scope.useAtomValue(selectedUnitAtom);\n}\n\nexport interface ColumnClickData {\n  unitID: number | null;\n  unit: BaseUnit | null;\n  target: HTMLElement | null;\n  height: number;\n  // Room for boundary IDs eventually\n}\n\nexport interface UnitSelectionCallbacks {\n  // It's sort of unfortunate that we need to pass in the column ref here\n  onClickedColumn?: (columnClickData: ColumnClickData, event: Event) => void;\n  onUnitSelected?: <T extends BaseUnit>(\n    unitID: number | null,\n    unit: T | null,\n  ) => void;\n}\n\nexport const allowUnitSelectionAtom = atom<boolean>(true);\n\nexport const selectedUnitIDAtom = atom<number | null>();\n\nconst overlayPositionAtom = atom<RectBounds | null>();\n\nconst columnRefAtom = atom<{ current: HTMLElement | null }>({ current: null });\n\nexport function useColumnRef() {\n  return scope.useAtomValue(columnRefAtom);\n}\n\nconst selectedUnitAtom = atom(\n  (get) => {\n    if (!get(allowUnitSelectionAtom)) return null;\n\n    const unitID = get(selectedUnitIDAtom);\n    if (unitID == null) return null;\n    const unitsMap = get(columnUnitsMapAtom);\n    return unitsMap?.get(unitID) || null;\n  },\n  (\n    get,\n    set,\n    selectedUnit: number | BaseUnit | null,\n    target: HTMLElement | null = null,\n  ): BaseUnit | null => {\n    if (!get(allowUnitSelectionAtom)) {\n      console.error(\"Unit selection is disabled.\");\n    }\n\n    let unitID: number | null;\n    let unit: BaseUnit | null = null;\n    if (selectedUnit == null) {\n      unitID = null;\n    } else if (typeof selectedUnit === \"number\") {\n      unitID = selectedUnit;\n    } else if (\"unit_id\" in selectedUnit) {\n      unitID = selectedUnit.unit_id;\n    }\n\n    if (unitID != null) {\n      // Verify that the unit exists in the current colum, else throw\n      const unitsMap = get(columnUnitsMapAtom);\n      if (!unitsMap?.has(unitID)) {\n        throw new Error(\n          `Unit with ID ${unitID} not found in current column units.`,\n        );\n      }\n      unit = unitsMap.get(unitID) ?? null;\n    }\n\n    let overlayPosition: RectBounds | null = null;\n\n    const columnEl = get(columnRefAtom)?.current;\n\n    if (unit != null && columnEl != null && target != null) {\n      const rect = columnEl.getBoundingClientRect();\n      const targetRect = target.getBoundingClientRect();\n      overlayPosition = {\n        x: targetRect.left - rect.left,\n        y: targetRect.top - rect.top,\n        width: targetRect.width,\n        height: targetRect.height,\n      };\n    }\n\n    set(selectedUnitIDAtom, unitID);\n    set(overlayPositionAtom, overlayPosition);\n\n    return unit;\n  },\n);\n\nexport function useAtomOverlayPosition() {\n  return scope.useAtomValue(overlayPositionAtom);\n}\n\nexport function UnitSelectionCallbackManager({\n  onUnitSelected,\n}: UnitSelectionCallbacks) {\n  const selectedUnit = scope.useAtomValue(selectedUnitAtom);\n  useEffect(() => {\n    onUnitSelected?.(selectedUnit?.unit_id ?? null, selectedUnit ?? null);\n  }, [selectedUnit?.unit_id]);\n  return null;\n}\n\n/** TODO: figure out if onClickedColumn is still needed\n /** This is not the natural place to get positions within the column,\n * but it will work for now.\nif (props.onClickedColumn) {\n  // Infer height from top and bottom height of unit (because that's passed back with the call)\n  //const py = event.y;\n  //const [bottom, top] = getUnitHeightRange(unit, axisType);\n  //const height = Math.abs(bottom - top);\n\n  const columnClickData: ColumnClickData = {\n    unitID: unit?.unit_id,\n    unit,\n    target,\n    height: el?.getBoundingClientRect().height || 0,\n  };\n  props.onClickedColumn(columnClickData, event);\n}*/\n\nexport function useUnitSelectionTarget(\n  unit: IUnit,\n): [React.RefObject<HTMLElement>, boolean, (evt: Event) => void] {\n  const ref = useRef<HTMLElement>();\n  const selectedUnit = useSelectedUnit();\n  const selectUnit = useUnitSelectionDispatch();\n  const selected = selectedUnit?.unit_id == unit.unit_id;\n\n  const onClick = useCallback(\n    (evt: Event) => {\n      selectUnit?.(unit, ref.current);\n      evt.stopPropagation();\n    },\n    [unit, selectUnit],\n  );\n\n  useEffect(() => {\n    if (!selected || selectUnit == null) return;\n    // In case we haven't set the position of the unit (if we don't have a target), set the selected unit\n    selectUnit(unit, ref.current);\n\n    // Scroll the unit into view\n    ref.current?.scrollIntoView({\n      behavior: \"smooth\",\n      block: \"center\",\n      inline: \"nearest\",\n    });\n  }, [selected, selectUnit]);\n\n  return [ref, selected, onClick];\n}\n\nexport function UnitKeyboardNavigation({\n  columnData,\n  units,\n  allowHorizontalNavigation,\n}: {\n  columnData?: ColumnData[];\n  units?: UnitLong[];\n  allowHorizontalNavigation?: boolean;\n}) {\n  if (units == null && columnData == null) {\n    throw new Error(\"Either units or columnData must be provided.\");\n  }\n\n  let _columnData: ColumnData[] = useMemo(() => {\n    if (columnData != null) return columnData;\n    // Build column data from units\n    const colMap = new Map<number, UnitLong[]>();\n    for (const unit of units!) {\n      if (!colMap.has(unit.col_id)) {\n        colMap.set(unit.col_id, []);\n      }\n      colMap.get(unit.col_id)!.push(unit);\n    }\n    const cols: ColumnData[] = [];\n    for (const [colID, units] of colMap) {\n      cols.push({ columnID: colID, units });\n    }\n    // Sort columns by columnID\n    cols.sort((a, b) => a.columnID - b.columnID);\n    return cols;\n  }, [columnData, units]);\n\n  // Default to allowing horizontal navigation only if columnData is provided\n  const _allowHorizontalNavigation =\n    allowHorizontalNavigation ?? columnData != null;\n\n  const selectedUnit = useSelectedUnit() as UnitLong | null;\n  const selectUnit = useUnitSelectionDispatch();\n\n  const keyMap: Record<number, Direction> = {\n    38: \"up\",\n    40: \"down\",\n  };\n  if (_allowHorizontalNavigation) {\n    keyMap[37] = \"left\";\n    keyMap[39] = \"right\";\n  }\n\n  useKeyHandler(\n    (event) => {\n      const direction = keyMap[event.keyCode];\n      if (direction == null) return;\n      const nextUnit = getBestUnit(_columnData, selectedUnit, direction);\n      if (nextUnit == null) return;\n      selectUnit(nextUnit, null);\n      event.stopPropagation();\n    },\n    [_columnData, selectedUnit],\n  );\n  return null;\n}\n\ntype Direction = \"up\" | \"down\" | \"left\" | \"right\";\n\nfunction getBestUnit(\n  columnData: ColumnData[],\n  targetUnit: UnitLong,\n  direction: Direction,\n): UnitLong | null {\n  const thisColIndex = columnData.findIndex(\n    (col) => col.columnID === targetUnit.col_id,\n  );\n  if (thisColIndex === -1) return null;\n\n  // If up or down, stay in the same column\n  if (direction === \"up\" || direction === \"down\") {\n    const units = columnData[thisColIndex].units;\n    const ix = units.findIndex((unit) => unit.unit_id === targetUnit.unit_id);\n    if (ix === -1) return null;\n    if (direction === \"up\") {\n      return units[ix - 1] || null;\n    } else {\n      return units[ix + 1] || null;\n    }\n  }\n\n  // If left or right, move to adjacent column\n  let adjacentColIndex: number;\n  if (direction === \"left\") {\n    adjacentColIndex =\n      (thisColIndex - 1 + columnData.length) % columnData.length;\n  } else {\n    adjacentColIndex = (thisColIndex + 1) % columnData.length;\n  }\n\n  const adjacentColUnits = columnData[adjacentColIndex].units;\n  return getMostOverlappingUnit(targetUnit, adjacentColUnits);\n}\n\ntype UnitAgeRangeRelationship = AgeRangeQuantifiedDifference & {\n  unit: UnitLong;\n};\n\nfunction getMostOverlappingUnit(\n  targetUnit: UnitLong,\n  candidateUnits: UnitLong[],\n): UnitLong | null {\n  const targetAgeRange = [targetUnit.b_age, targetUnit.t_age];\n\n  const overlaps: UnitAgeRangeRelationship[] = [];\n  for (const candidate of candidateUnits) {\n    const candidateAgeRange = [candidate.b_age, candidate.t_age];\n\n    const rel = ageRangeQuantifiedDifference(targetAgeRange, candidateAgeRange);\n    if (rel.type === AgeRangeRelationship.Identical) {\n      return candidate;\n    }\n    overlaps.push({ ...rel, unit: candidate });\n  }\n\n  let bestOverlaps = overlaps.filter(\n    (d) => d.type === AgeRangeRelationship.Containing,\n  );\n  bestOverlaps.sort((a, b) => b.overlap - a.overlap);\n  if (bestOverlaps.length > 0) {\n    return bestOverlaps[0].unit;\n  }\n\n  bestOverlaps = overlaps.filter(\n    (d) => d.type === AgeRangeRelationship.Contained,\n  );\n  bestOverlaps.sort((a, b) => b.overlap - a.overlap);\n  if (bestOverlaps.length > 0) {\n    return bestOverlaps[0].unit;\n  }\n\n  bestOverlaps = overlaps.filter(\n    (d) => d.type === AgeRangeRelationship.PartialOverlap,\n  );\n  bestOverlaps.sort((a, b) => b.overlap - a.overlap);\n  if (bestOverlaps.length > 0) {\n    return bestOverlaps[0].unit;\n  }\n\n  bestOverlaps = overlaps.filter(\n    (d) => d.type === AgeRangeRelationship.Disjoint,\n  );\n  bestOverlaps.sort((a, b) => a.distance - b.distance);\n  if (bestOverlaps.length > 0) {\n    return bestOverlaps[0].unit;\n  }\n  return null;\n}\n"],"names":["units"],"mappings":"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"}

package/dist/index.cjs

@@ -21,7 +21,6 @@ const provider = require("./facets/fossils/provider.cjs");
 const types = require("./prepare-units/types.cjs");
 const insetMap = require("./maps/_shared/inset-map.cjs");
 const isotopesColumn = require("./facets/carbon-isotopes/isotopes-column.cjs");
-const base$1 = require("./data-provider/base.cjs");
 const store = require("./data-provider/store.cjs");
 const dataProvider = require("./facets/carbon-isotopes/data-provider.cjs");
 const utils = require("./prepare-units/utils.cjs");
@@ -32,7 +31,6 @@ const modalPanel = require("./unit-details/modal-panel.cjs");
 const popover = require("./unit-details/popover.cjs");
 const unitSelection = require("./data-provider/unit-selection.cjs");
 const styles = require("./maps/_shared/styles.cjs");
-const fetch = require("./data-provider/fetch.cjs");
 const colors = require("./units/colors.cjs");
 const hashString = require("./correlation-chart/hash-string.cjs");
 const helpers = require("./prepare-units/helpers.cjs");
@@ -101,22 +99,14 @@ exports.HybridScaleType = types.HybridScaleType;
 exports.InsetMap = insetMap.InsetMap;
 exports.IsotopesColumn = isotopesColumn.IsotopesColumn;
 exports.IsotopesDataset = isotopesColumn.IsotopesDataset;
-exports.LithologiesProvider = base$1.LithologiesProvider;
-exports.MacrostratAPIProvider = base$1.MacrostratAPIProvider;
-exports.MacrostratColumnProvider = base$1.MacrostratColumnProvider;
-exports.MacrostratDataProvider = base$1.MacrostratDataProvider;
-exports.useEnvironments = base$1.useEnvironments;
-exports.useLithologies = base$1.useLithologies;
-exports.useMacrostratBaseURL = base$1.useMacrostratBaseURL;
-exports.useMacrostratColumnInfo = base$1.useMacrostratColumnInfo;
-exports.useMacrostratColumns = base$1.useMacrostratColumns;
-exports.useMacrostratData = base$1.useMacrostratData;
-exports.useMacrostratDefs = base$1.useMacrostratDefs;
-exports.useMacrostratFetch = base$1.useMacrostratFetch;
-exports.useMacrostratStore = base$1.useMacrostratStore;
+exports.LithologiesProvider = store.LithologiesProvider;
 exports.MacrostratColumnDataProvider = store.MacrostratColumnDataProvider;
+exports.MacrostratColumnProvider = store.MacrostratColumnProvider;
 exports.MacrostratColumnStateProvider = store.MacrostratColumnStateProvider;
 exports.UnitSelectionProvider = store.UnitSelectionProvider;
+exports.columnUnitsAtom = store.columnUnitsAtom;
+exports.columnUnitsMapAtom = store.columnUnitsMapAtom;
+exports.scope = store.scope;
 exports.useColumnUnitsMap = store.useColumnUnitsMap;
 exports.useCompositeScale = store.useCompositeScale;
 exports.useMacrostratColumnData = store.useMacrostratColumnData;
@@ -148,15 +138,6 @@ exports.useSelectedUnit = unitSelection.useSelectedUnit;
 exports.useUnitSelectionDispatch = unitSelection.useUnitSelectionDispatch;
 exports.useUnitSelectionTarget = unitSelection.useUnitSelectionTarget;
 exports.buildColumnsStyle = styles.buildColumnsStyle;
-exports.fetchAllColumns = fetch.fetchAllColumns;
-exports.fetchColumnUnits = fetch.fetchColumnUnits;
-exports.fetchEnvironments = fetch.fetchEnvironments;
-exports.fetchIntervals = fetch.fetchIntervals;
-exports.fetchLithologies = fetch.fetchLithologies;
-exports.fetchRefs = fetch.fetchRefs;
-exports.fetchStratNames = fetch.fetchStratNames;
-exports.fetchUnits = fetch.fetchUnits;
-exports.useColumnFeatures = fetch.useColumnFeatures;
 exports.getMixedUnitColor = colors.getMixedUnitColor;
 exports.parseLineFromString = hashString.parseLineFromString;
 exports.stringifyLine = hashString.stringifyLine;

package/dist/index.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"index.cjs","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}
+{"version":3,"file":"index.cjs","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}