@macrostrat/column-views 3.4.1 → 3.5.0

package/CHANGELOG.md

@@ -1,5 +1,27 @@
 # Changelog
 
+## [3.5.0] - 2026-05-24 [_changes_](https://github.com/UW-Macrostrat/web-components/compare/@macrostrat/column-views-v3.4.2...@macrostrat/column-views-v3.5.0)
+
+### Minor Changes
+
+- Createa a basic ColumnRef interface
+
+### Patch Changes
+
+- Updated dependencies
+- Updated dependencies
+  - @macrostrat/data-components@1.1.12
+  - @macrostrat/data-provider@1.1.0
+
+## [3.4.2] - 2026-05-22 [_changes_](https://github.com/UW-Macrostrat/web-components/compare/@macrostrat/column-views-v3.4.1...@macrostrat/column-views-v3.4.2)
+
+### Patch Changes
+
+- Fix interval provision for timescales
+- Updated dependencies
+  - @macrostrat/data-provider@1.0.5
+  - @macrostrat/timescale@3.1.4
+
 ## [3.4.1] - 2026-05-22 [_changes_](https://github.com/UW-Macrostrat/web-components/compare/@macrostrat/column-views-v3.4.0...@macrostrat/column-views-v3.4.1)
 
 ### Patch Changes

package/dist/column.cjs

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const columnComponents = require("@macrostrat/column-components");
-const h$1 = require("@macrostrat/hyper");
 const uiComponents = require("@macrostrat/ui-components");
 const classNames = require("classnames");
 const React = require("react");
@@ -20,7 +19,6 @@ const identifiers = require("./unit-details/identifiers.cjs");
 const panel = require("./unit-details/panel.cjs");
 const _interopDefault = (e) => e && e.__esModule ? e : { default: e };
 const classNames__default = /* @__PURE__ */ _interopDefault(classNames);
-const h = h$1.hyperStyled(column_module.default);
 function Column(props) {
   const {
     showUnitPopover = false,
@@ -44,6 +42,7 @@ function Column(props) {
     hybridScale,
     scale,
     axisType,
+    ref,
     ...rest
   } = props;
   let _targetUnitHeight = targetUnitHeight;
@@ -78,16 +77,16 @@ function Column(props) {
     hybridScale
   });
   if (sections.length === 0) {
-    return h(
+    return column_module.default(
       "div.column-container.empty",
-      h(core.NonIdealState, {
+      column_module.default(core.NonIdealState, {
         title: "Empty column",
         description: "No sections found in this column.",
         icon: "warning-sign"
       })
     );
   }
-  return h(
+  return column_module.default(
     store.MacrostratColumnDataProvider,
     {
       units,
@@ -96,12 +95,13 @@ function Column(props) {
       axisType: _axisType,
       allowUnitSelection: showUnitPopover || allowUnitSelection,
       onUnitSelected,
-      selectedUnit
+      selectedUnit,
+      ref
     },
-    h(ColumnInner, { ageAxisComponent, ...rest }, [
+    column_module.default(ColumnInner, { ageAxisComponent, ...rest }, [
       children,
-      h.if(showUnitPopover)(popover.UnitSelectionPopover),
-      h.if(keyboardNavigation)(unitSelection.UnitKeyboardNavigation, { units })
+      column_module.default.if(showUnitPopover)(popover.UnitSelectionPopover),
+      column_module.default.if(keyboardNavigation)(unitSelection.UnitKeyboardNavigation, { units })
     ])
   );
 }
@@ -152,20 +152,20 @@ function ColumnInner(props) {
     _showTimescale = true;
   }
   _showTimescale = axisType == columnComponents.ColumnAxisType.AGE && _showTimescale;
-  return h(
+  return column_module.default(
     ColumnContainer,
     {
       ...useMouseEventHandlers(onMouseOver),
       style: paddingVars,
       className
     },
-    h("div.column", { ref: columnRef }, [
-      h(ageAxisComponent),
-      h.if(_showTimescale)(section.CompositeTimescale, {
+    column_module.default("div.column", { ref: columnRef }, [
+      column_module.default(ageAxisComponent),
+      column_module.default.if(_showTimescale)(section.CompositeTimescale, {
         levels: timescaleLevels,
         unconformityLabels: _timescaleUnconformityLabels
       }),
-      h(section.SectionsColumn, {
+      column_module.default(section.SectionsColumn, {
         unitComponent,
         showLabels,
         width,
@@ -213,7 +213,7 @@ function useMouseEventHandlers(_onMouseOver = null) {
 function ColumnContainer(props) {
   const { className, ...rest } = props;
   const darkMode = uiComponents.useDarkMode();
-  return h(uiComponents.Box, {
+  return column_module.default(uiComponents.Box, {
     className: classNames__default.default(
       className,
       {
@@ -230,13 +230,13 @@ function ColumnBasicInfo({
   showReferences = true
 }) {
   if (data == null) return null;
-  return h("div.column-info", [
-    h("div.column-title-row", [
-      h("h2", data.col_name),
-      h.if(showColumnID)("h4", h(identifiers.Identifier, { id: data.col_id }))
+  return column_module.default("div.column-info", [
+    column_module.default("div.column-title-row", [
+      column_module.default("h2", data.col_name),
+      column_module.default.if(showColumnID)("h4", column_module.default(identifiers.Identifier, { id: data.col_id }))
     ]),
-    h(dataComponents.DataField, { row: true, label: "Group", value: data.col_group }),
-    h.if(showReferences)(panel.ReferencesField, {
+    column_module.default(dataComponents.DataField, { row: true, label: "Group", value: data.col_group }),
+    column_module.default.if(showReferences)(panel.ReferencesField, {
       refs: data.refs,
       inline: false,
       row: false,

package/dist/column.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"column.cjs","sources":["../src/column.ts"],"sourcesContent":["import { ColumnAxisType } from \"@macrostrat/column-components\";\nimport { hyperStyled } from \"@macrostrat/hyper\";\nimport {\n  Box,\n  extractPadding,\n  Padding,\n  useDarkMode,\n} from \"@macrostrat/ui-components\";\nimport classNames from \"classnames\";\nimport {\n  HTMLAttributes,\n  useCallback,\n  CSSProperties,\n  ComponentType,\n} from \"react\";\nimport styles from \"./column.module.sass\";\nimport { UnitComponent } from \"./units\";\nimport {\n  UnitKeyboardNavigation,\n  useColumnRef,\n  useUnitSelectionDispatch,\n} from \"./data-provider\";\n\nimport {\n  Identifier,\n  ReferencesField,\n  UnitSelectionPopover,\n} from \"./unit-details\";\nimport {\n  MacrostratColumnDataProvider,\n  useCompositeScale,\n  useMacrostratColumnData,\n} from \"./data-provider\";\nimport {\n  SectionSharedProps,\n  CompositeTimescale,\n  SectionsColumn,\n} from \"./section\";\nimport { ApproximateHeightAxis, CompositeAgeAxis } from \"./age-axis\";\nimport {\n  MergeSectionsMode,\n  usePreparedColumnUnits,\n  HybridScaleType,\n  ColumnHeightScaleOptions,\n} from \"./prepare-units\";\nimport { UnitLong } from \"@macrostrat/api-types\";\nimport { NonIdealState } from \"@blueprintjs/core\";\nimport { DataField } from \"@macrostrat/data-components\";\nimport { ScaleContinuousNumeric } from \"d3-scale\";\n\nconst h = hyperStyled(styles);\n\ninterface BaseColumnProps extends Omit<\n  SectionSharedProps,\n  \"unconformityLabels\"\n> {\n  className?: string;\n  showLabelColumn?: boolean;\n  keyboardNavigation?: boolean;\n  showLabels?: boolean;\n  maxInternalColumns?: number;\n  // Timescale properties\n  showTimescale?: boolean;\n  timescaleLevels?: number | [number, number];\n  unconformityLabels?: boolean | UnconformityLabelPlacement;\n  onMouseOver?: (\n    unit: UnitLong | null,\n    height: number | null,\n    evt: MouseEvent,\n  ) => void;\n}\n\nexport type UnconformityLabelPlacement = \"minimal\" | \"prominent\" | \"none\";\n\nexport interface ColumnProps\n  extends Padding, BaseColumnProps, ColumnHeightScaleOptions {\n  // Macrostrat units\n  units: UnitLong[];\n  t_age?: number;\n  b_age?: number;\n  t_pos?: number;\n  b_pos?: number;\n  mergeSections?: MergeSectionsMode;\n  showUnitPopover?: boolean;\n  allowUnitSelection?: boolean;\n  selectedUnit?: number | null;\n  onUnitSelected?: (unitID: number | null, unit: any) => void;\n  // Unconformity height in pixels\n  unconformityHeight?: number;\n  scale?: ScaleContinuousNumeric<number, number>;\n}\n\nexport function Column(props: ColumnProps) {\n  const {\n    showUnitPopover = false,\n    keyboardNavigation = false,\n    mergeSections,\n    onUnitSelected,\n    selectedUnit,\n    children,\n    units: rawUnits,\n    t_age,\n    b_age,\n    t_pos,\n    b_pos,\n    unconformityHeight = 30,\n    targetUnitHeight = 20,\n    pixelScale,\n    minPixelScale = 0.2,\n    minSectionHeight = 50,\n    collapseSmallUnconformities = true,\n    allowUnitSelection = false,\n    hybridScale,\n    scale,\n    axisType,\n    ...rest\n  } = props;\n\n  /* Make pixelScale and targetUnitHeight mutually exclusive. PixelScale implies\n   * standardization of scales in all sections */\n  let _targetUnitHeight: number | null = targetUnitHeight;\n  let _minSectionHeight = minSectionHeight;\n  let _minPixelScale = minPixelScale;\n  if (pixelScale != null) {\n    _targetUnitHeight = null;\n    _minSectionHeight = 0;\n    _minPixelScale = pixelScale;\n  }\n\n  // Handle special cases for hybrid scales (WIP, we need to regularize this)\n  let _axisType = axisType ?? ColumnAxisType.AGE;\n  let ageAxisComponent = CompositeAgeAxis;\n  if (\n    hybridScale?.type === HybridScaleType.ApproximateHeight &&\n    _axisType != ColumnAxisType.AGE\n  ) {\n    // Use approximate height axis for non-age columns if a non-age axis type is requested\n    ageAxisComponent = ApproximateHeightAxis;\n    _axisType = ColumnAxisType.AGE;\n  }\n\n  const { sections, units, totalHeight } = usePreparedColumnUnits(rawUnits, {\n    axisType: _axisType,\n    t_age,\n    b_age,\n    t_pos,\n    b_pos,\n    mergeSections,\n    targetUnitHeight: _targetUnitHeight,\n    unconformityHeight,\n    pixelScale,\n    minPixelScale: _minPixelScale,\n    minSectionHeight: _minSectionHeight,\n    collapseSmallUnconformities,\n    // TODO: consider unifying scale and hybridScale options\n    scale,\n    hybridScale,\n  });\n\n  if (sections.length === 0) {\n    return h(\n      \"div.column-container.empty\",\n      h(NonIdealState, {\n        title: \"Empty column\",\n        description: \"No sections found in this column.\",\n        icon: \"warning-sign\",\n      }),\n    );\n  }\n\n  return h(\n    MacrostratColumnDataProvider,\n    {\n      units,\n      sections,\n      totalHeight,\n      axisType: _axisType,\n      allowUnitSelection: showUnitPopover || allowUnitSelection,\n      onUnitSelected,\n      selectedUnit,\n    },\n    h(ColumnInner, { ageAxisComponent, ...rest }, [\n      children,\n      h.if(showUnitPopover)(UnitSelectionPopover),\n      h.if(keyboardNavigation)(UnitKeyboardNavigation, { units }),\n    ]),\n  );\n}\n\ninterface ColumnInnerProps extends BaseColumnProps {\n  ageAxisComponent?: ComponentType;\n}\n\nfunction ColumnInner(props: ColumnInnerProps) {\n  const padding = extractPadding(props);\n\n  // TODO: integrate padding vars more closely with the rest of the spacing (right now padding is a bit ad-hoc)\n  const paddingVars: any = {\n    \"--column-padding-top\": `${padding.paddingTop}px`,\n    \"--column-padding-bottom\": `${padding.paddingBottom}px`,\n    \"--column-padding-left\": `${padding.paddingLeft}px`,\n    \"--column-padding-right\": `${padding.paddingRight}px`,\n  };\n\n  const {\n    unitComponent = UnitComponent,\n    unconformityLabels = \"minimal\",\n    showLabels = true,\n    width: _width = 300,\n    columnWidth: _columnWidth = 150,\n    showLabelColumn: _showLabelColumn = true,\n    className,\n    clipUnits = false,\n    children,\n    showTimescale,\n    timescaleLevels,\n    maxInternalColumns,\n    onMouseOver,\n    ageAxisComponent = CompositeAgeAxis,\n  } = props;\n\n  const { axisType } = useMacrostratColumnData();\n\n  const columnRef = useColumnRef();\n\n  // Coalesce unconformity label setting to a boolean\n  let _timescaleUnconformityLabels = false;\n  let _sectionUnconformityLabels = false;\n  if (unconformityLabels === true || unconformityLabels === \"prominent\") {\n    _sectionUnconformityLabels = true;\n  } else if (unconformityLabels === \"minimal\") {\n    _timescaleUnconformityLabels = true;\n  }\n\n  let width = _width;\n  let columnWidth = _columnWidth;\n  if (columnWidth > width) {\n    columnWidth = width;\n  }\n  let showLabelColumn = _showLabelColumn;\n  if (columnWidth > width - 10) {\n    showLabelColumn = false;\n  }\n\n  let _showTimescale = showTimescale ?? true;\n  if (timescaleLevels != null) {\n    _showTimescale = true;\n  }\n  _showTimescale = axisType == ColumnAxisType.AGE && _showTimescale;\n\n  return h(\n    ColumnContainer,\n    {\n      ...useMouseEventHandlers(onMouseOver),\n      style: paddingVars,\n      className,\n    },\n    h(\"div.column\", { ref: columnRef }, [\n      h(ageAxisComponent),\n      h.if(_showTimescale)(CompositeTimescale, {\n        levels: timescaleLevels,\n        unconformityLabels: _timescaleUnconformityLabels,\n      }),\n      h(SectionsColumn, {\n        unitComponent,\n        showLabels,\n        width,\n        columnWidth,\n        showLabelColumn,\n        clipUnits,\n        unconformityLabels: _sectionUnconformityLabels,\n        maxInternalColumns,\n      }),\n      children,\n    ]),\n  );\n}\n\ntype ColumnMouseOverHandler = (\n  unit: UnitLong | null,\n  height: number | null,\n  evt: MouseEvent,\n) => void;\n\nfunction useMouseEventHandlers(\n  _onMouseOver: ColumnMouseOverHandler | null = null,\n) {\n  /** Click event handler */\n\n  // Click handler for unit selection\n  const dispatch = useUnitSelectionDispatch();\n  const onClick = useCallback(\n    (evt) => {\n      dispatch?.(null, null);\n    },\n    [dispatch],\n  );\n\n  /** Hover event handlers */\n  const scale = useCompositeScale();\n\n  const onMouseOver = useCallback(\n    (evt) => {\n      const height = scale.invert(\n        evt.clientY - evt.currentTarget.getBoundingClientRect().top,\n      );\n      _onMouseOver?.(null, height, evt);\n    },\n    [scale, _onMouseOver],\n  );\n\n  const onMouseOut = useCallback(() => {\n    _onMouseOver?.(null, null, null);\n  }, [_onMouseOver]);\n\n  if (_onMouseOver == null) {\n    return {\n      onClick,\n      onMouseOver: undefined,\n      onMouseMove: undefined,\n      onMouseOut: undefined,\n    };\n  }\n\n  return { onMouseOver, onMouseMove: onMouseOver, onMouseOut, onClick };\n}\n\nexport interface ColumnContainerProps extends HTMLAttributes<HTMLDivElement> {\n  className?: string;\n  style?: CSSProperties;\n}\n\nexport function ColumnContainer(props: ColumnContainerProps) {\n  const { className, ...rest } = props;\n  const darkMode = useDarkMode();\n\n  return h(Box, {\n    className: classNames(\n      className,\n      {\n        \"dark-mode\": darkMode?.isEnabled ?? false,\n      },\n      \"column-container\",\n    ),\n    ...rest,\n  });\n}\n\nexport function ColumnBasicInfo({\n  data,\n  showColumnID = true,\n  showReferences = true,\n}) {\n  if (data == null) return null;\n  return h(\"div.column-info\", [\n    h(\"div.column-title-row\", [\n      h(\"h2\", data.col_name),\n      h.if(showColumnID)(\"h4\", h(Identifier, { id: data.col_id })),\n    ]),\n    h(DataField, { row: true, label: \"Group\", value: data.col_group }),\n    h.if(showReferences)(ReferencesField, {\n      refs: data.refs,\n      inline: false,\n      row: false,\n      className: \"column-refs\",\n    }),\n  ]);\n}\n"],"names":["hyperStyled","styles","ColumnAxisType","CompositeAgeAxis","HybridScaleType","ApproximateHeightAxis","usePreparedColumnUnits","NonIdealState","MacrostratColumnDataProvider","UnitSelectionPopover","UnitKeyboardNavigation","extractPadding","UnitComponent","useMacrostratColumnData","useColumnRef","CompositeTimescale","SectionsColumn","useUnitSelectionDispatch","useCallback","useCompositeScale","useDarkMode","Box","classNames","Identifier","DataField","ReferencesField"],"mappings":";;;;;;;;;;;;;;;;;;;;;;AAkDA,MAAM,IAAIA,IAAAA,YAAYC,qBAAM;AA0CrB,SAAS,OAAO,OAAoB;AACzC,QAAM;AAAA,IACJ,kBAAkB;AAAA,IAClB,qBAAqB;AAAA,IACrB;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA,OAAO;AAAA,IACP;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA,qBAAqB;AAAA,IACrB,mBAAmB;AAAA,IACnB;AAAA,IACA,gBAAgB;AAAA,IAChB,mBAAmB;AAAA,IACnB,8BAA8B;AAAA,IAC9B,qBAAqB;AAAA,IACrB;AAAA,IACA;AAAA,IACA;AAAA,IACA,GAAG;AAAA,EAAA,IACD;AAIJ,MAAI,oBAAmC;AACvC,MAAI,oBAAoB;AACxB,MAAI,iBAAiB;AACrB,MAAI,cAAc,MAAM;AACtB,wBAAoB;AACpB,wBAAoB;AACpB,qBAAiB;AAAA,EACnB;AAGA,MAAI,YAAY,YAAYC,iBAAAA,eAAe;AAC3C,MAAI,mBAAmBC,QAAAA;AACvB,MACE,aAAa,SAASC,MAAAA,gBAAgB,qBACtC,aAAaF,iBAAAA,eAAe,KAC5B;AAEA,uBAAmBG,QAAAA;AACnB,gBAAYH,iBAAAA,eAAe;AAAA,EAC7B;AAEA,QAAM,EAAE,UAAU,OAAO,YAAA,IAAgBI,MAAAA,uBAAuB,UAAU;AAAA,IACxE,UAAU;AAAA,IACV;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA,kBAAkB;AAAA,IAClB;AAAA,IACA;AAAA,IACA,eAAe;AAAA,IACf,kBAAkB;AAAA,IAClB;AAAA;AAAA,IAEA;AAAA,IACA;AAAA,EAAA,CACD;AAED,MAAI,SAAS,WAAW,GAAG;AACzB,WAAO;AAAA,MACL;AAAA,MACA,EAAEC,KAAAA,eAAe;AAAA,QACf,OAAO;AAAA,QACP,aAAa;AAAA,QACb,MAAM;AAAA,MAAA,CACP;AAAA,IAAA;AAAA,EAEL;AAEA,SAAO;AAAA,IACLC,MAAAA;AAAAA,IACA;AAAA,MACE;AAAA,MACA;AAAA,MACA;AAAA,MACA,UAAU;AAAA,MACV,oBAAoB,mBAAmB;AAAA,MACvC;AAAA,MACA;AAAA,IAAA;AAAA,IAEF,EAAE,aAAa,EAAE,kBAAkB,GAAG,QAAQ;AAAA,MAC5C;AAAA,MACA,EAAE,GAAG,eAAe,EAAEC,4BAAoB;AAAA,MAC1C,EAAE,GAAG,kBAAkB,EAAEC,cAAAA,wBAAwB,EAAE,OAAO;AAAA,IAAA,CAC3D;AAAA,EAAA;AAEL;AAMA,SAAS,YAAY,OAAyB;AAC5C,QAAM,UAAUC,aAAAA,eAAe,KAAK;AAGpC,QAAM,cAAmB;AAAA,IACvB,wBAAwB,GAAG,QAAQ,UAAU;AAAA,IAC7C,2BAA2B,GAAG,QAAQ,aAAa;AAAA,IACnD,yBAAyB,GAAG,QAAQ,WAAW;AAAA,IAC/C,0BAA0B,GAAG,QAAQ,YAAY;AAAA,EAAA;AAGnD,QAAM;AAAA,IACJ,gBAAgBC,QAAAA;AAAAA,IAChB,qBAAqB;AAAA,IACrB,aAAa;AAAA,IACb,OAAO,SAAS;AAAA,IAChB,aAAa,eAAe;AAAA,IAC5B,iBAAiB,mBAAmB;AAAA,IACpC;AAAA,IACA,YAAY;AAAA,IACZ;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA,mBAAmBT,QAAAA;AAAAA,EAAA,IACjB;AAEJ,QAAM,EAAE,SAAA,IAAaU,8BAAA;AAErB,QAAM,YAAYC,cAAAA,aAAA;AAGlB,MAAI,+BAA+B;AACnC,MAAI,6BAA6B;AACjC,MAAI,uBAAuB,QAAQ,uBAAuB,aAAa;AACrE,iCAA6B;AAAA,EAC/B,WAAW,uBAAuB,WAAW;AAC3C,mCAA+B;AAAA,EACjC;AAEA,MAAI,QAAQ;AACZ,MAAI,cAAc;AAClB,MAAI,cAAc,OAAO;AACvB,kBAAc;AAAA,EAChB;AACA,MAAI,kBAAkB;AACtB,MAAI,cAAc,QAAQ,IAAI;AAC5B,sBAAkB;AAAA,EACpB;AAEA,MAAI,iBAAiB,iBAAiB;AACtC,MAAI,mBAAmB,MAAM;AAC3B,qBAAiB;AAAA,EACnB;AACA,mBAAiB,YAAYZ,gCAAe,OAAO;AAEnD,SAAO;AAAA,IACL;AAAA,IACA;AAAA,MACE,GAAG,sBAAsB,WAAW;AAAA,MACpC,OAAO;AAAA,MACP;AAAA,IAAA;AAAA,IAEF,EAAE,cAAc,EAAE,KAAK,aAAa;AAAA,MAClC,EAAE,gBAAgB;AAAA,MAClB,EAAE,GAAG,cAAc,EAAEa,4BAAoB;AAAA,QACvC,QAAQ;AAAA,QACR,oBAAoB;AAAA,MAAA,CACrB;AAAA,MACD,EAAEC,QAAAA,gBAAgB;AAAA,QAChB;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA,oBAAoB;AAAA,QACpB;AAAA,MAAA,CACD;AAAA,MACD;AAAA,IAAA,CACD;AAAA,EAAA;AAEL;AAQA,SAAS,sBACP,eAA8C,MAC9C;AAIA,QAAM,WAAWC,cAAAA,yBAAA;AACjB,QAAM,UAAUC,MAAAA;AAAAA,IACd,CAAC,QAAQ;AACP,iBAAW,MAAM,IAAI;AAAA,IACvB;AAAA,IACA,CAAC,QAAQ;AAAA,EAAA;AAIX,QAAM,QAAQC,MAAAA,kBAAA;AAEd,QAAM,cAAcD,MAAAA;AAAAA,IAClB,CAAC,QAAQ;AACP,YAAM,SAAS,MAAM;AAAA,QACnB,IAAI,UAAU,IAAI,cAAc,wBAAwB;AAAA,MAAA;AAE1D,qBAAe,MAAM,QAAQ,GAAG;AAAA,IAClC;AAAA,IACA,CAAC,OAAO,YAAY;AAAA,EAAA;AAGtB,QAAM,aAAaA,MAAAA,YAAY,MAAM;AACnC,mBAAe,MAAM,MAAM,IAAI;AAAA,EACjC,GAAG,CAAC,YAAY,CAAC;AAEjB,MAAI,gBAAgB,MAAM;AACxB,WAAO;AAAA,MACL;AAAA,MACA,aAAa;AAAA,MACb,aAAa;AAAA,MACb,YAAY;AAAA,IAAA;AAAA,EAEhB;AAEA,SAAO,EAAE,aAAa,aAAa,aAAa,YAAY,QAAA;AAC9D;AAOO,SAAS,gBAAgB,OAA6B;AAC3D,QAAM,EAAE,WAAW,GAAG,KAAA,IAAS;AAC/B,QAAM,WAAWE,aAAAA,YAAA;AAEjB,SAAO,EAAEC,aAAAA,KAAK;AAAA,IACZ,WAAWC,oBAAAA;AAAAA,MACT;AAAA,MACA;AAAA,QACE,aAAa,UAAU,aAAa;AAAA,MAAA;AAAA,MAEtC;AAAA,IAAA;AAAA,IAEF,GAAG;AAAA,EAAA,CACJ;AACH;AAEO,SAAS,gBAAgB;AAAA,EAC9B;AAAA,EACA,eAAe;AAAA,EACf,iBAAiB;AACnB,GAAG;AACD,MAAI,QAAQ,KAAM,QAAO;AACzB,SAAO,EAAE,mBAAmB;AAAA,IAC1B,EAAE,wBAAwB;AAAA,MACxB,EAAE,MAAM,KAAK,QAAQ;AAAA,MACrB,EAAE,GAAG,YAAY,EAAE,MAAM,EAAEC,YAAAA,YAAY,EAAE,IAAI,KAAK,QAAQ,CAAC;AAAA,IAAA,CAC5D;AAAA,IACD,EAAEC,eAAAA,WAAW,EAAE,KAAK,MAAM,OAAO,SAAS,OAAO,KAAK,WAAW;AAAA,IACjE,EAAE,GAAG,cAAc,EAAEC,uBAAiB;AAAA,MACpC,MAAM,KAAK;AAAA,MACX,QAAQ;AAAA,MACR,KAAK;AAAA,MACL,WAAW;AAAA,IAAA,CACZ;AAAA,EAAA,CACF;AACH;;;;"}
+{"version":3,"file":"column.cjs","sources":["../src/column.ts"],"sourcesContent":["import { ColumnAxisType } from \"@macrostrat/column-components\";\nimport {\n  Box,\n  extractPadding,\n  Padding,\n  useDarkMode,\n} from \"@macrostrat/ui-components\";\nimport classNames from \"classnames\";\nimport {\n  HTMLAttributes,\n  useCallback,\n  CSSProperties,\n  ComponentType,\n  RefObject,\n} from \"react\";\nimport h from \"./column.module.sass\";\nimport { UnitComponent } from \"./units\";\nimport {\n  ColumnRef,\n  UnitKeyboardNavigation,\n  useColumnRef,\n  useUnitSelectionDispatch,\n} from \"./data-provider\";\n\nimport {\n  Identifier,\n  ReferencesField,\n  UnitSelectionPopover,\n} from \"./unit-details\";\nimport {\n  MacrostratColumnDataProvider,\n  useCompositeScale,\n  useMacrostratColumnData,\n} from \"./data-provider\";\nimport {\n  SectionSharedProps,\n  CompositeTimescale,\n  SectionsColumn,\n} from \"./section\";\nimport { ApproximateHeightAxis, CompositeAgeAxis } from \"./age-axis\";\nimport {\n  MergeSectionsMode,\n  usePreparedColumnUnits,\n  HybridScaleType,\n  ColumnHeightScaleOptions,\n} from \"./prepare-units\";\nimport { UnitLong } from \"@macrostrat/api-types\";\nimport { NonIdealState } from \"@blueprintjs/core\";\nimport { DataField } from \"@macrostrat/data-components\";\nimport { ScaleContinuousNumeric } from \"d3-scale\";\n\ninterface BaseColumnProps extends Omit<\n  SectionSharedProps,\n  \"unconformityLabels\"\n> {\n  className?: string;\n  showLabelColumn?: boolean;\n  keyboardNavigation?: boolean;\n  showLabels?: boolean;\n  maxInternalColumns?: number;\n  // Timescale properties\n  showTimescale?: boolean;\n  timescaleLevels?: number | [number, number];\n  unconformityLabels?: boolean | UnconformityLabelPlacement;\n  onMouseOver?: (\n    unit: UnitLong | null,\n    height: number | null,\n    evt: MouseEvent,\n  ) => void;\n}\n\nexport type UnconformityLabelPlacement = \"minimal\" | \"prominent\" | \"none\";\n\nexport interface ColumnProps\n  extends Padding, BaseColumnProps, ColumnHeightScaleOptions {\n  // Macrostrat units\n  units: UnitLong[];\n  t_age?: number;\n  b_age?: number;\n  t_pos?: number;\n  b_pos?: number;\n  mergeSections?: MergeSectionsMode;\n  showUnitPopover?: boolean;\n  allowUnitSelection?: boolean;\n  selectedUnit?: number | null;\n  onUnitSelected?: (unitID: number | null, unit: any) => void;\n  // Unconformity height in pixels\n  unconformityHeight?: number;\n  scale?: ScaleContinuousNumeric<number, number>;\n  ref?: RefObject<ColumnRef>;\n}\n\nexport function Column(props: ColumnProps) {\n  const {\n    showUnitPopover = false,\n    keyboardNavigation = false,\n    mergeSections,\n    onUnitSelected,\n    selectedUnit,\n    children,\n    units: rawUnits,\n    t_age,\n    b_age,\n    t_pos,\n    b_pos,\n    unconformityHeight = 30,\n    targetUnitHeight = 20,\n    pixelScale,\n    minPixelScale = 0.2,\n    minSectionHeight = 50,\n    collapseSmallUnconformities = true,\n    allowUnitSelection = false,\n    hybridScale,\n    scale,\n    axisType,\n    ref,\n    ...rest\n  } = props;\n\n  /* Make pixelScale and targetUnitHeight mutually exclusive. PixelScale implies\n   * standardization of scales in all sections */\n  let _targetUnitHeight: number | null = targetUnitHeight;\n  let _minSectionHeight = minSectionHeight;\n  let _minPixelScale = minPixelScale;\n  if (pixelScale != null) {\n    _targetUnitHeight = null;\n    _minSectionHeight = 0;\n    _minPixelScale = pixelScale;\n  }\n\n  // Handle special cases for hybrid scales (WIP, we need to regularize this)\n  let _axisType = axisType ?? ColumnAxisType.AGE;\n  let ageAxisComponent = CompositeAgeAxis;\n  if (\n    hybridScale?.type === HybridScaleType.ApproximateHeight &&\n    _axisType != ColumnAxisType.AGE\n  ) {\n    // Use approximate height axis for non-age columns if a non-age axis type is requested\n    ageAxisComponent = ApproximateHeightAxis;\n    _axisType = ColumnAxisType.AGE;\n  }\n\n  const { sections, units, totalHeight } = usePreparedColumnUnits(rawUnits, {\n    axisType: _axisType,\n    t_age,\n    b_age,\n    t_pos,\n    b_pos,\n    mergeSections,\n    targetUnitHeight: _targetUnitHeight,\n    unconformityHeight,\n    pixelScale,\n    minPixelScale: _minPixelScale,\n    minSectionHeight: _minSectionHeight,\n    collapseSmallUnconformities,\n    // TODO: consider unifying scale and hybridScale options\n    scale,\n    hybridScale,\n  });\n\n  if (sections.length === 0) {\n    return h(\n      \"div.column-container.empty\",\n      h(NonIdealState, {\n        title: \"Empty column\",\n        description: \"No sections found in this column.\",\n        icon: \"warning-sign\",\n      }),\n    );\n  }\n\n  return h(\n    MacrostratColumnDataProvider,\n    {\n      units,\n      sections,\n      totalHeight,\n      axisType: _axisType,\n      allowUnitSelection: showUnitPopover || allowUnitSelection,\n      onUnitSelected,\n      selectedUnit,\n      ref,\n    },\n    h(ColumnInner, { ageAxisComponent, ...rest }, [\n      children,\n      h.if(showUnitPopover)(UnitSelectionPopover),\n      h.if(keyboardNavigation)(UnitKeyboardNavigation, { units }),\n    ]),\n  );\n}\n\ninterface ColumnInnerProps extends BaseColumnProps {\n  ageAxisComponent?: ComponentType;\n}\n\nfunction ColumnInner(props: ColumnInnerProps) {\n  const padding = extractPadding(props);\n\n  // TODO: integrate padding vars more closely with the rest of the spacing (right now padding is a bit ad-hoc)\n  const paddingVars: any = {\n    \"--column-padding-top\": `${padding.paddingTop}px`,\n    \"--column-padding-bottom\": `${padding.paddingBottom}px`,\n    \"--column-padding-left\": `${padding.paddingLeft}px`,\n    \"--column-padding-right\": `${padding.paddingRight}px`,\n  };\n\n  const {\n    unitComponent = UnitComponent,\n    unconformityLabels = \"minimal\",\n    showLabels = true,\n    width: _width = 300,\n    columnWidth: _columnWidth = 150,\n    showLabelColumn: _showLabelColumn = true,\n    className,\n    clipUnits = false,\n    children,\n    showTimescale,\n    timescaleLevels,\n    maxInternalColumns,\n    onMouseOver,\n    ageAxisComponent = CompositeAgeAxis,\n  } = props;\n\n  const { axisType } = useMacrostratColumnData();\n\n  const columnRef = useColumnRef();\n\n  // Coalesce unconformity label setting to a boolean\n  let _timescaleUnconformityLabels = false;\n  let _sectionUnconformityLabels = false;\n  if (unconformityLabels === true || unconformityLabels === \"prominent\") {\n    _sectionUnconformityLabels = true;\n  } else if (unconformityLabels === \"minimal\") {\n    _timescaleUnconformityLabels = true;\n  }\n\n  let width = _width;\n  let columnWidth = _columnWidth;\n  if (columnWidth > width) {\n    columnWidth = width;\n  }\n  let showLabelColumn = _showLabelColumn;\n  if (columnWidth > width - 10) {\n    showLabelColumn = false;\n  }\n\n  let _showTimescale = showTimescale ?? true;\n  if (timescaleLevels != null) {\n    _showTimescale = true;\n  }\n  _showTimescale = axisType == ColumnAxisType.AGE && _showTimescale;\n\n  return h(\n    ColumnContainer,\n    {\n      ...useMouseEventHandlers(onMouseOver),\n      style: paddingVars,\n      className,\n    },\n    h(\"div.column\", { ref: columnRef }, [\n      h(ageAxisComponent),\n      h.if(_showTimescale)(CompositeTimescale, {\n        levels: timescaleLevels,\n        unconformityLabels: _timescaleUnconformityLabels,\n      }),\n      h(SectionsColumn, {\n        unitComponent,\n        showLabels,\n        width,\n        columnWidth,\n        showLabelColumn,\n        clipUnits,\n        unconformityLabels: _sectionUnconformityLabels,\n        maxInternalColumns,\n      }),\n      children,\n    ]),\n  );\n}\n\ntype ColumnMouseOverHandler = (\n  unit: UnitLong | null,\n  height: number | null,\n  evt: MouseEvent,\n) => void;\n\nfunction useMouseEventHandlers(\n  _onMouseOver: ColumnMouseOverHandler | null = null,\n) {\n  /** Click event handler */\n\n  // Click handler for unit selection\n  const dispatch = useUnitSelectionDispatch();\n  const onClick = useCallback(\n    (evt) => {\n      dispatch?.(null, null);\n    },\n    [dispatch],\n  );\n\n  /** Hover event handlers */\n  const scale = useCompositeScale();\n\n  const onMouseOver = useCallback(\n    (evt) => {\n      const height = scale.invert(\n        evt.clientY - evt.currentTarget.getBoundingClientRect().top,\n      );\n      _onMouseOver?.(null, height, evt);\n    },\n    [scale, _onMouseOver],\n  );\n\n  const onMouseOut = useCallback(() => {\n    _onMouseOver?.(null, null, null);\n  }, [_onMouseOver]);\n\n  if (_onMouseOver == null) {\n    return {\n      onClick,\n      onMouseOver: undefined,\n      onMouseMove: undefined,\n      onMouseOut: undefined,\n    };\n  }\n\n  return { onMouseOver, onMouseMove: onMouseOver, onMouseOut, onClick };\n}\n\nexport interface ColumnContainerProps extends HTMLAttributes<HTMLDivElement> {\n  className?: string;\n  style?: CSSProperties;\n}\n\nexport function ColumnContainer(props: ColumnContainerProps) {\n  const { className, ...rest } = props;\n  const darkMode = useDarkMode();\n\n  return h(Box, {\n    className: classNames(\n      className,\n      {\n        \"dark-mode\": darkMode?.isEnabled ?? false,\n      },\n      \"column-container\",\n    ),\n    ...rest,\n  });\n}\n\nexport function ColumnBasicInfo({\n  data,\n  showColumnID = true,\n  showReferences = true,\n}) {\n  if (data == null) return null;\n  return h(\"div.column-info\", [\n    h(\"div.column-title-row\", [\n      h(\"h2\", data.col_name),\n      h.if(showColumnID)(\"h4\", h(Identifier, { id: data.col_id })),\n    ]),\n    h(DataField, { row: true, label: \"Group\", value: data.col_group }),\n    h.if(showReferences)(ReferencesField, {\n      refs: data.refs,\n      inline: false,\n      row: false,\n      className: \"column-refs\",\n    }),\n  ]);\n}\n"],"names":["ColumnAxisType","CompositeAgeAxis","HybridScaleType","ApproximateHeightAxis","usePreparedColumnUnits","h","NonIdealState","MacrostratColumnDataProvider","UnitSelectionPopover","UnitKeyboardNavigation","extractPadding","UnitComponent","useMacrostratColumnData","useColumnRef","CompositeTimescale","SectionsColumn","useUnitSelectionDispatch","useCallback","useCompositeScale","useDarkMode","Box","classNames","Identifier","DataField","ReferencesField"],"mappings":"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"}

package/dist/column.d.ts

@@ -1,5 +1,6 @@
 import { Padding } from '@macrostrat/ui-components';
-import { HTMLAttributes, CSSProperties } from 'react';
+import { HTMLAttributes, CSSProperties, RefObject } from 'react';
+import { ColumnRef } from './data-provider';
 import { SectionSharedProps } from './section';
 import { MergeSectionsMode, ColumnHeightScaleOptions } from './prepare-units';
 import { UnitLong } from '@macrostrat/api-types';
@@ -29,6 +30,7 @@ export interface ColumnProps extends Padding, BaseColumnProps, ColumnHeightScale
     onUnitSelected?: (unitID: number | null, unit: any) => void;
     unconformityHeight?: number;
     scale?: ScaleContinuousNumeric<number, number>;
+    ref?: RefObject<ColumnRef>;
 }
 export declare function Column(props: ColumnProps): import('react').ReactElement<import('react').FunctionComponentElement<import('@blueprintjs/core').NonIdealStateProps>, string | import('react').JSXElementConstructor<any>> | import('react').FunctionComponentElement<import('./data-provider').ColumnDataProviderProps<import('@macrostrat/api-types').BaseUnit>>;
 export interface ColumnContainerProps extends HTMLAttributes<HTMLDivElement> {

package/dist/column.js

@@ -1,9 +1,8 @@
 import { ColumnAxisType } from "@macrostrat/column-components";
-import { hyperStyled } from "@macrostrat/hyper";
 import { useDarkMode, Box, extractPadding } from "@macrostrat/ui-components";
 import classNames from "classnames";
 import { useCallback } from "react";
-import h$1 from "./column.module.sass.js";
+import h from "./column.module.sass.js";
 import { UnitComponent } from "./units/index.js";
 import { CompositeTimescale, SectionsColumn } from "./section.js";
 import { CompositeAgeAxis, ApproximateHeightAxis } from "./age-axis.js";
@@ -16,7 +15,6 @@ import { UnitSelectionPopover } from "./unit-details/popover.js";
 import { UnitKeyboardNavigation, useColumnRef, useUnitSelectionDispatch } from "./data-provider/unit-selection.js";
 import { Identifier } from "./unit-details/identifiers.js";
 import { ReferencesField } from "./unit-details/panel.js";
-const h = hyperStyled(h$1);
 function Column(props) {
   const {
     showUnitPopover = false,
@@ -40,6 +38,7 @@ function Column(props) {
     hybridScale,
     scale,
     axisType,
+    ref,
     ...rest
   } = props;
   let _targetUnitHeight = targetUnitHeight;
@@ -92,7 +91,8 @@ function Column(props) {
       axisType: _axisType,
       allowUnitSelection: showUnitPopover || allowUnitSelection,
       onUnitSelected,
-      selectedUnit
+      selectedUnit,
+      ref
     },
     h(ColumnInner, { ageAxisComponent, ...rest }, [
       children,

package/dist/column.js.map

@@ -1 +1 @@
-{"version":3,"file":"column.js","sources":["../src/column.ts"],"sourcesContent":["import { ColumnAxisType } from \"@macrostrat/column-components\";\nimport { hyperStyled } from \"@macrostrat/hyper\";\nimport {\n  Box,\n  extractPadding,\n  Padding,\n  useDarkMode,\n} from \"@macrostrat/ui-components\";\nimport classNames from \"classnames\";\nimport {\n  HTMLAttributes,\n  useCallback,\n  CSSProperties,\n  ComponentType,\n} from \"react\";\nimport styles from \"./column.module.sass\";\nimport { UnitComponent } from \"./units\";\nimport {\n  UnitKeyboardNavigation,\n  useColumnRef,\n  useUnitSelectionDispatch,\n} from \"./data-provider\";\n\nimport {\n  Identifier,\n  ReferencesField,\n  UnitSelectionPopover,\n} from \"./unit-details\";\nimport {\n  MacrostratColumnDataProvider,\n  useCompositeScale,\n  useMacrostratColumnData,\n} from \"./data-provider\";\nimport {\n  SectionSharedProps,\n  CompositeTimescale,\n  SectionsColumn,\n} from \"./section\";\nimport { ApproximateHeightAxis, CompositeAgeAxis } from \"./age-axis\";\nimport {\n  MergeSectionsMode,\n  usePreparedColumnUnits,\n  HybridScaleType,\n  ColumnHeightScaleOptions,\n} from \"./prepare-units\";\nimport { UnitLong } from \"@macrostrat/api-types\";\nimport { NonIdealState } from \"@blueprintjs/core\";\nimport { DataField } from \"@macrostrat/data-components\";\nimport { ScaleContinuousNumeric } from \"d3-scale\";\n\nconst h = hyperStyled(styles);\n\ninterface BaseColumnProps extends Omit<\n  SectionSharedProps,\n  \"unconformityLabels\"\n> {\n  className?: string;\n  showLabelColumn?: boolean;\n  keyboardNavigation?: boolean;\n  showLabels?: boolean;\n  maxInternalColumns?: number;\n  // Timescale properties\n  showTimescale?: boolean;\n  timescaleLevels?: number | [number, number];\n  unconformityLabels?: boolean | UnconformityLabelPlacement;\n  onMouseOver?: (\n    unit: UnitLong | null,\n    height: number | null,\n    evt: MouseEvent,\n  ) => void;\n}\n\nexport type UnconformityLabelPlacement = \"minimal\" | \"prominent\" | \"none\";\n\nexport interface ColumnProps\n  extends Padding, BaseColumnProps, ColumnHeightScaleOptions {\n  // Macrostrat units\n  units: UnitLong[];\n  t_age?: number;\n  b_age?: number;\n  t_pos?: number;\n  b_pos?: number;\n  mergeSections?: MergeSectionsMode;\n  showUnitPopover?: boolean;\n  allowUnitSelection?: boolean;\n  selectedUnit?: number | null;\n  onUnitSelected?: (unitID: number | null, unit: any) => void;\n  // Unconformity height in pixels\n  unconformityHeight?: number;\n  scale?: ScaleContinuousNumeric<number, number>;\n}\n\nexport function Column(props: ColumnProps) {\n  const {\n    showUnitPopover = false,\n    keyboardNavigation = false,\n    mergeSections,\n    onUnitSelected,\n    selectedUnit,\n    children,\n    units: rawUnits,\n    t_age,\n    b_age,\n    t_pos,\n    b_pos,\n    unconformityHeight = 30,\n    targetUnitHeight = 20,\n    pixelScale,\n    minPixelScale = 0.2,\n    minSectionHeight = 50,\n    collapseSmallUnconformities = true,\n    allowUnitSelection = false,\n    hybridScale,\n    scale,\n    axisType,\n    ...rest\n  } = props;\n\n  /* Make pixelScale and targetUnitHeight mutually exclusive. PixelScale implies\n   * standardization of scales in all sections */\n  let _targetUnitHeight: number | null = targetUnitHeight;\n  let _minSectionHeight = minSectionHeight;\n  let _minPixelScale = minPixelScale;\n  if (pixelScale != null) {\n    _targetUnitHeight = null;\n    _minSectionHeight = 0;\n    _minPixelScale = pixelScale;\n  }\n\n  // Handle special cases for hybrid scales (WIP, we need to regularize this)\n  let _axisType = axisType ?? ColumnAxisType.AGE;\n  let ageAxisComponent = CompositeAgeAxis;\n  if (\n    hybridScale?.type === HybridScaleType.ApproximateHeight &&\n    _axisType != ColumnAxisType.AGE\n  ) {\n    // Use approximate height axis for non-age columns if a non-age axis type is requested\n    ageAxisComponent = ApproximateHeightAxis;\n    _axisType = ColumnAxisType.AGE;\n  }\n\n  const { sections, units, totalHeight } = usePreparedColumnUnits(rawUnits, {\n    axisType: _axisType,\n    t_age,\n    b_age,\n    t_pos,\n    b_pos,\n    mergeSections,\n    targetUnitHeight: _targetUnitHeight,\n    unconformityHeight,\n    pixelScale,\n    minPixelScale: _minPixelScale,\n    minSectionHeight: _minSectionHeight,\n    collapseSmallUnconformities,\n    // TODO: consider unifying scale and hybridScale options\n    scale,\n    hybridScale,\n  });\n\n  if (sections.length === 0) {\n    return h(\n      \"div.column-container.empty\",\n      h(NonIdealState, {\n        title: \"Empty column\",\n        description: \"No sections found in this column.\",\n        icon: \"warning-sign\",\n      }),\n    );\n  }\n\n  return h(\n    MacrostratColumnDataProvider,\n    {\n      units,\n      sections,\n      totalHeight,\n      axisType: _axisType,\n      allowUnitSelection: showUnitPopover || allowUnitSelection,\n      onUnitSelected,\n      selectedUnit,\n    },\n    h(ColumnInner, { ageAxisComponent, ...rest }, [\n      children,\n      h.if(showUnitPopover)(UnitSelectionPopover),\n      h.if(keyboardNavigation)(UnitKeyboardNavigation, { units }),\n    ]),\n  );\n}\n\ninterface ColumnInnerProps extends BaseColumnProps {\n  ageAxisComponent?: ComponentType;\n}\n\nfunction ColumnInner(props: ColumnInnerProps) {\n  const padding = extractPadding(props);\n\n  // TODO: integrate padding vars more closely with the rest of the spacing (right now padding is a bit ad-hoc)\n  const paddingVars: any = {\n    \"--column-padding-top\": `${padding.paddingTop}px`,\n    \"--column-padding-bottom\": `${padding.paddingBottom}px`,\n    \"--column-padding-left\": `${padding.paddingLeft}px`,\n    \"--column-padding-right\": `${padding.paddingRight}px`,\n  };\n\n  const {\n    unitComponent = UnitComponent,\n    unconformityLabels = \"minimal\",\n    showLabels = true,\n    width: _width = 300,\n    columnWidth: _columnWidth = 150,\n    showLabelColumn: _showLabelColumn = true,\n    className,\n    clipUnits = false,\n    children,\n    showTimescale,\n    timescaleLevels,\n    maxInternalColumns,\n    onMouseOver,\n    ageAxisComponent = CompositeAgeAxis,\n  } = props;\n\n  const { axisType } = useMacrostratColumnData();\n\n  const columnRef = useColumnRef();\n\n  // Coalesce unconformity label setting to a boolean\n  let _timescaleUnconformityLabels = false;\n  let _sectionUnconformityLabels = false;\n  if (unconformityLabels === true || unconformityLabels === \"prominent\") {\n    _sectionUnconformityLabels = true;\n  } else if (unconformityLabels === \"minimal\") {\n    _timescaleUnconformityLabels = true;\n  }\n\n  let width = _width;\n  let columnWidth = _columnWidth;\n  if (columnWidth > width) {\n    columnWidth = width;\n  }\n  let showLabelColumn = _showLabelColumn;\n  if (columnWidth > width - 10) {\n    showLabelColumn = false;\n  }\n\n  let _showTimescale = showTimescale ?? true;\n  if (timescaleLevels != null) {\n    _showTimescale = true;\n  }\n  _showTimescale = axisType == ColumnAxisType.AGE && _showTimescale;\n\n  return h(\n    ColumnContainer,\n    {\n      ...useMouseEventHandlers(onMouseOver),\n      style: paddingVars,\n      className,\n    },\n    h(\"div.column\", { ref: columnRef }, [\n      h(ageAxisComponent),\n      h.if(_showTimescale)(CompositeTimescale, {\n        levels: timescaleLevels,\n        unconformityLabels: _timescaleUnconformityLabels,\n      }),\n      h(SectionsColumn, {\n        unitComponent,\n        showLabels,\n        width,\n        columnWidth,\n        showLabelColumn,\n        clipUnits,\n        unconformityLabels: _sectionUnconformityLabels,\n        maxInternalColumns,\n      }),\n      children,\n    ]),\n  );\n}\n\ntype ColumnMouseOverHandler = (\n  unit: UnitLong | null,\n  height: number | null,\n  evt: MouseEvent,\n) => void;\n\nfunction useMouseEventHandlers(\n  _onMouseOver: ColumnMouseOverHandler | null = null,\n) {\n  /** Click event handler */\n\n  // Click handler for unit selection\n  const dispatch = useUnitSelectionDispatch();\n  const onClick = useCallback(\n    (evt) => {\n      dispatch?.(null, null);\n    },\n    [dispatch],\n  );\n\n  /** Hover event handlers */\n  const scale = useCompositeScale();\n\n  const onMouseOver = useCallback(\n    (evt) => {\n      const height = scale.invert(\n        evt.clientY - evt.currentTarget.getBoundingClientRect().top,\n      );\n      _onMouseOver?.(null, height, evt);\n    },\n    [scale, _onMouseOver],\n  );\n\n  const onMouseOut = useCallback(() => {\n    _onMouseOver?.(null, null, null);\n  }, [_onMouseOver]);\n\n  if (_onMouseOver == null) {\n    return {\n      onClick,\n      onMouseOver: undefined,\n      onMouseMove: undefined,\n      onMouseOut: undefined,\n    };\n  }\n\n  return { onMouseOver, onMouseMove: onMouseOver, onMouseOut, onClick };\n}\n\nexport interface ColumnContainerProps extends HTMLAttributes<HTMLDivElement> {\n  className?: string;\n  style?: CSSProperties;\n}\n\nexport function ColumnContainer(props: ColumnContainerProps) {\n  const { className, ...rest } = props;\n  const darkMode = useDarkMode();\n\n  return h(Box, {\n    className: classNames(\n      className,\n      {\n        \"dark-mode\": darkMode?.isEnabled ?? false,\n      },\n      \"column-container\",\n    ),\n    ...rest,\n  });\n}\n\nexport function ColumnBasicInfo({\n  data,\n  showColumnID = true,\n  showReferences = true,\n}) {\n  if (data == null) return null;\n  return h(\"div.column-info\", [\n    h(\"div.column-title-row\", [\n      h(\"h2\", data.col_name),\n      h.if(showColumnID)(\"h4\", h(Identifier, { id: data.col_id })),\n    ]),\n    h(DataField, { row: true, label: \"Group\", value: data.col_group }),\n    h.if(showReferences)(ReferencesField, {\n      refs: data.refs,\n      inline: false,\n      row: false,\n      className: \"column-refs\",\n    }),\n  ]);\n}\n"],"names":["styles"],"mappings":"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"}
+{"version":3,"file":"column.js","sources":["../src/column.ts"],"sourcesContent":["import { ColumnAxisType } from \"@macrostrat/column-components\";\nimport {\n  Box,\n  extractPadding,\n  Padding,\n  useDarkMode,\n} from \"@macrostrat/ui-components\";\nimport classNames from \"classnames\";\nimport {\n  HTMLAttributes,\n  useCallback,\n  CSSProperties,\n  ComponentType,\n  RefObject,\n} from \"react\";\nimport h from \"./column.module.sass\";\nimport { UnitComponent } from \"./units\";\nimport {\n  ColumnRef,\n  UnitKeyboardNavigation,\n  useColumnRef,\n  useUnitSelectionDispatch,\n} from \"./data-provider\";\n\nimport {\n  Identifier,\n  ReferencesField,\n  UnitSelectionPopover,\n} from \"./unit-details\";\nimport {\n  MacrostratColumnDataProvider,\n  useCompositeScale,\n  useMacrostratColumnData,\n} from \"./data-provider\";\nimport {\n  SectionSharedProps,\n  CompositeTimescale,\n  SectionsColumn,\n} from \"./section\";\nimport { ApproximateHeightAxis, CompositeAgeAxis } from \"./age-axis\";\nimport {\n  MergeSectionsMode,\n  usePreparedColumnUnits,\n  HybridScaleType,\n  ColumnHeightScaleOptions,\n} from \"./prepare-units\";\nimport { UnitLong } from \"@macrostrat/api-types\";\nimport { NonIdealState } from \"@blueprintjs/core\";\nimport { DataField } from \"@macrostrat/data-components\";\nimport { ScaleContinuousNumeric } from \"d3-scale\";\n\ninterface BaseColumnProps extends Omit<\n  SectionSharedProps,\n  \"unconformityLabels\"\n> {\n  className?: string;\n  showLabelColumn?: boolean;\n  keyboardNavigation?: boolean;\n  showLabels?: boolean;\n  maxInternalColumns?: number;\n  // Timescale properties\n  showTimescale?: boolean;\n  timescaleLevels?: number | [number, number];\n  unconformityLabels?: boolean | UnconformityLabelPlacement;\n  onMouseOver?: (\n    unit: UnitLong | null,\n    height: number | null,\n    evt: MouseEvent,\n  ) => void;\n}\n\nexport type UnconformityLabelPlacement = \"minimal\" | \"prominent\" | \"none\";\n\nexport interface ColumnProps\n  extends Padding, BaseColumnProps, ColumnHeightScaleOptions {\n  // Macrostrat units\n  units: UnitLong[];\n  t_age?: number;\n  b_age?: number;\n  t_pos?: number;\n  b_pos?: number;\n  mergeSections?: MergeSectionsMode;\n  showUnitPopover?: boolean;\n  allowUnitSelection?: boolean;\n  selectedUnit?: number | null;\n  onUnitSelected?: (unitID: number | null, unit: any) => void;\n  // Unconformity height in pixels\n  unconformityHeight?: number;\n  scale?: ScaleContinuousNumeric<number, number>;\n  ref?: RefObject<ColumnRef>;\n}\n\nexport function Column(props: ColumnProps) {\n  const {\n    showUnitPopover = false,\n    keyboardNavigation = false,\n    mergeSections,\n    onUnitSelected,\n    selectedUnit,\n    children,\n    units: rawUnits,\n    t_age,\n    b_age,\n    t_pos,\n    b_pos,\n    unconformityHeight = 30,\n    targetUnitHeight = 20,\n    pixelScale,\n    minPixelScale = 0.2,\n    minSectionHeight = 50,\n    collapseSmallUnconformities = true,\n    allowUnitSelection = false,\n    hybridScale,\n    scale,\n    axisType,\n    ref,\n    ...rest\n  } = props;\n\n  /* Make pixelScale and targetUnitHeight mutually exclusive. PixelScale implies\n   * standardization of scales in all sections */\n  let _targetUnitHeight: number | null = targetUnitHeight;\n  let _minSectionHeight = minSectionHeight;\n  let _minPixelScale = minPixelScale;\n  if (pixelScale != null) {\n    _targetUnitHeight = null;\n    _minSectionHeight = 0;\n    _minPixelScale = pixelScale;\n  }\n\n  // Handle special cases for hybrid scales (WIP, we need to regularize this)\n  let _axisType = axisType ?? ColumnAxisType.AGE;\n  let ageAxisComponent = CompositeAgeAxis;\n  if (\n    hybridScale?.type === HybridScaleType.ApproximateHeight &&\n    _axisType != ColumnAxisType.AGE\n  ) {\n    // Use approximate height axis for non-age columns if a non-age axis type is requested\n    ageAxisComponent = ApproximateHeightAxis;\n    _axisType = ColumnAxisType.AGE;\n  }\n\n  const { sections, units, totalHeight } = usePreparedColumnUnits(rawUnits, {\n    axisType: _axisType,\n    t_age,\n    b_age,\n    t_pos,\n    b_pos,\n    mergeSections,\n    targetUnitHeight: _targetUnitHeight,\n    unconformityHeight,\n    pixelScale,\n    minPixelScale: _minPixelScale,\n    minSectionHeight: _minSectionHeight,\n    collapseSmallUnconformities,\n    // TODO: consider unifying scale and hybridScale options\n    scale,\n    hybridScale,\n  });\n\n  if (sections.length === 0) {\n    return h(\n      \"div.column-container.empty\",\n      h(NonIdealState, {\n        title: \"Empty column\",\n        description: \"No sections found in this column.\",\n        icon: \"warning-sign\",\n      }),\n    );\n  }\n\n  return h(\n    MacrostratColumnDataProvider,\n    {\n      units,\n      sections,\n      totalHeight,\n      axisType: _axisType,\n      allowUnitSelection: showUnitPopover || allowUnitSelection,\n      onUnitSelected,\n      selectedUnit,\n      ref,\n    },\n    h(ColumnInner, { ageAxisComponent, ...rest }, [\n      children,\n      h.if(showUnitPopover)(UnitSelectionPopover),\n      h.if(keyboardNavigation)(UnitKeyboardNavigation, { units }),\n    ]),\n  );\n}\n\ninterface ColumnInnerProps extends BaseColumnProps {\n  ageAxisComponent?: ComponentType;\n}\n\nfunction ColumnInner(props: ColumnInnerProps) {\n  const padding = extractPadding(props);\n\n  // TODO: integrate padding vars more closely with the rest of the spacing (right now padding is a bit ad-hoc)\n  const paddingVars: any = {\n    \"--column-padding-top\": `${padding.paddingTop}px`,\n    \"--column-padding-bottom\": `${padding.paddingBottom}px`,\n    \"--column-padding-left\": `${padding.paddingLeft}px`,\n    \"--column-padding-right\": `${padding.paddingRight}px`,\n  };\n\n  const {\n    unitComponent = UnitComponent,\n    unconformityLabels = \"minimal\",\n    showLabels = true,\n    width: _width = 300,\n    columnWidth: _columnWidth = 150,\n    showLabelColumn: _showLabelColumn = true,\n    className,\n    clipUnits = false,\n    children,\n    showTimescale,\n    timescaleLevels,\n    maxInternalColumns,\n    onMouseOver,\n    ageAxisComponent = CompositeAgeAxis,\n  } = props;\n\n  const { axisType } = useMacrostratColumnData();\n\n  const columnRef = useColumnRef();\n\n  // Coalesce unconformity label setting to a boolean\n  let _timescaleUnconformityLabels = false;\n  let _sectionUnconformityLabels = false;\n  if (unconformityLabels === true || unconformityLabels === \"prominent\") {\n    _sectionUnconformityLabels = true;\n  } else if (unconformityLabels === \"minimal\") {\n    _timescaleUnconformityLabels = true;\n  }\n\n  let width = _width;\n  let columnWidth = _columnWidth;\n  if (columnWidth > width) {\n    columnWidth = width;\n  }\n  let showLabelColumn = _showLabelColumn;\n  if (columnWidth > width - 10) {\n    showLabelColumn = false;\n  }\n\n  let _showTimescale = showTimescale ?? true;\n  if (timescaleLevels != null) {\n    _showTimescale = true;\n  }\n  _showTimescale = axisType == ColumnAxisType.AGE && _showTimescale;\n\n  return h(\n    ColumnContainer,\n    {\n      ...useMouseEventHandlers(onMouseOver),\n      style: paddingVars,\n      className,\n    },\n    h(\"div.column\", { ref: columnRef }, [\n      h(ageAxisComponent),\n      h.if(_showTimescale)(CompositeTimescale, {\n        levels: timescaleLevels,\n        unconformityLabels: _timescaleUnconformityLabels,\n      }),\n      h(SectionsColumn, {\n        unitComponent,\n        showLabels,\n        width,\n        columnWidth,\n        showLabelColumn,\n        clipUnits,\n        unconformityLabels: _sectionUnconformityLabels,\n        maxInternalColumns,\n      }),\n      children,\n    ]),\n  );\n}\n\ntype ColumnMouseOverHandler = (\n  unit: UnitLong | null,\n  height: number | null,\n  evt: MouseEvent,\n) => void;\n\nfunction useMouseEventHandlers(\n  _onMouseOver: ColumnMouseOverHandler | null = null,\n) {\n  /** Click event handler */\n\n  // Click handler for unit selection\n  const dispatch = useUnitSelectionDispatch();\n  const onClick = useCallback(\n    (evt) => {\n      dispatch?.(null, null);\n    },\n    [dispatch],\n  );\n\n  /** Hover event handlers */\n  const scale = useCompositeScale();\n\n  const onMouseOver = useCallback(\n    (evt) => {\n      const height = scale.invert(\n        evt.clientY - evt.currentTarget.getBoundingClientRect().top,\n      );\n      _onMouseOver?.(null, height, evt);\n    },\n    [scale, _onMouseOver],\n  );\n\n  const onMouseOut = useCallback(() => {\n    _onMouseOver?.(null, null, null);\n  }, [_onMouseOver]);\n\n  if (_onMouseOver == null) {\n    return {\n      onClick,\n      onMouseOver: undefined,\n      onMouseMove: undefined,\n      onMouseOut: undefined,\n    };\n  }\n\n  return { onMouseOver, onMouseMove: onMouseOver, onMouseOut, onClick };\n}\n\nexport interface ColumnContainerProps extends HTMLAttributes<HTMLDivElement> {\n  className?: string;\n  style?: CSSProperties;\n}\n\nexport function ColumnContainer(props: ColumnContainerProps) {\n  const { className, ...rest } = props;\n  const darkMode = useDarkMode();\n\n  return h(Box, {\n    className: classNames(\n      className,\n      {\n        \"dark-mode\": darkMode?.isEnabled ?? false,\n      },\n      \"column-container\",\n    ),\n    ...rest,\n  });\n}\n\nexport function ColumnBasicInfo({\n  data,\n  showColumnID = true,\n  showReferences = true,\n}) {\n  if (data == null) return null;\n  return h(\"div.column-info\", [\n    h(\"div.column-title-row\", [\n      h(\"h2\", data.col_name),\n      h.if(showColumnID)(\"h4\", h(Identifier, { id: data.col_id })),\n    ]),\n    h(DataField, { row: true, label: \"Group\", value: data.col_group }),\n    h.if(showReferences)(ReferencesField, {\n      refs: data.refs,\n      inline: false,\n      row: false,\n      className: \"column-refs\",\n    }),\n  ]);\n}\n"],"names":[],"mappings":"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"}

package/dist/data-provider/store.cjs

@@ -61,7 +61,8 @@ function MacrostratColumnDataProvider({
   axisType,
   allowUnitSelection,
   onUnitSelected,
-  selectedUnit
+  selectedUnit,
+  ref
 }) {
   const value = React.useMemo(() => {
     return {
@@ -77,11 +78,33 @@ function MacrostratColumnDataProvider({
       units,
       allowUnitSelection,
       onUnitSelected,
-      selectedUnit
+      selectedUnit,
+      ref
     },
-    h__default.default(MacrostratColumnDataContext.Provider, { value }, children)
+    [
+      h__default.default(ColumnRefManager, { ref }),
+      h__default.default(MacrostratColumnDataContext.Provider, { value }, children)
+    ]
   );
 }
+function ColumnRefManager({ ref }) {
+  const selectedUnitElement = scope.useAtomValue(unitSelection.selectedUnitElementAtom);
+  React.useEffect(() => {
+    if (ref == null) return;
+    ref.current = {
+      scrollSelectedUnitIntoView(opts) {
+        selectedUnitElement?.scrollIntoView(
+          opts ?? {
+            behavior: "smooth",
+            block: "center",
+            inline: "nearest"
+          }
+        );
+      }
+    };
+  }, [ref, selectedUnitElement]);
+  return null;
+}
 function UnitSelectionProvider(props) {
   return h__default.default(MacrostratColumnStateProvider, {
     ...props,

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, 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\";\nimport { useEffect } from \"react\";\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","useEffect"],"mappings":"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"}
+{"version":3,"file":"store.cjs","sources":["../../src/data-provider/store.ts"],"sourcesContent":["import {\n  createContext,\n  ReactNode,\n  RefObject,\n  useContext,\n  useMemo,\n} 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  selectedUnitElementAtom,\n} from \"./unit-selection\";\nimport type { BaseUnit } from \"@macrostrat/api-types\";\nimport {\n  type AtomMap,\n  createScopedStore,\n  StateIsolation,\n} from \"@macrostrat/data-components\";\nimport { atom } from \"jotai\";\nimport { useEffect } from \"react\";\n\nexport const scope: StateIsolation = 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\n/** Interface for imperative handlers that can\n * be invoked outside of the column's react context\n */\nexport interface ColumnRef {\n  scrollSelectedUnitIntoView(): void;\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  ref: RefObject<ColumnRef>;\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  ref,\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      ref,\n    },\n    [\n      h(ColumnRefManager, { ref }),\n      h(MacrostratColumnDataContext.Provider, { value }, children),\n    ],\n  );\n}\n\nfunction ColumnRefManager({ ref }: { ref?: RefObject<ColumnRef> }) {\n  const selectedUnitElement = scope.useAtomValue(selectedUnitElementAtom);\n  useEffect(() => {\n    if (ref == null) return;\n    ref.current = {\n      scrollSelectedUnitIntoView(opts?: ScrollIntoViewOptions) {\n        selectedUnitElement?.scrollIntoView(\n          opts ?? {\n            behavior: \"smooth\",\n            block: \"center\",\n            inline: \"nearest\",\n          },\n        );\n      },\n    };\n  }, [ref, selectedUnitElement]);\n\n  return null;\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","selectedUnitElementAtom","useEffect","useContext","createCompositeScale","ColumnProvider"],"mappings":"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"}

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

@@ -0,0 +1,52 @@
+import { ReactNode, RefObject } from 'react';
+import { CompositeColumnScale } from '../prepare-units/composite-scale';
+import { ColumnAxisType } from '@macrostrat/column-components';
+import { ExtUnit, PackageLayoutData } from '../prepare-units';
+import { UnitSelectionCallbacks } from './unit-selection';
+import { BaseUnit } from '@macrostrat/api-types';
+import { AtomMap, StateIsolation } from '@macrostrat/data-components';
+export declare const scope: StateIsolation;
+export declare const columnUnitsAtom: import('jotai').PrimitiveAtom<BaseUnit[] | undefined> & {
+    init: BaseUnit[] | undefined;
+};
+export declare const columnUnitsMapAtom: import('jotai').Atom<Map<number, BaseUnit> | null>;
+export interface ColumnStateProviderProps<T extends BaseUnit> extends Partial<UnitSelectionCallbacks> {
+    children: ReactNode;
+    units: T[];
+    selectedUnit: number | null;
+    allowUnitSelection?: boolean;
+}
+export declare function MacrostratColumnStateProvider<T extends BaseUnit>({ children, units, allowUnitSelection, onUnitSelected, selectedUnit, }: ColumnStateProviderProps<T>): import('react').FunctionComponentElement<{
+    children: ReactNode;
+    atoms?: AtomMap;
+    keepUpdated?: boolean;
+    inherit?: boolean;
+}>;
+/** Interface for imperative handlers that can
+ * be invoked outside of the column's react context
+ */
+export interface ColumnRef {
+    scrollSelectedUnitIntoView(): void;
+}
+export interface MacrostratColumnDataContext<T extends BaseUnit> {
+    units: T[];
+    sections: PackageLayoutData[];
+    totalHeight?: number;
+    axisType?: ColumnAxisType;
+    allowUnitSelection?: boolean;
+}
+export interface ColumnDataProviderProps<T extends BaseUnit> extends MacrostratColumnDataContext<T>, ColumnStateProviderProps<T> {
+    children: ReactNode;
+    ref: RefObject<ColumnRef>;
+}
+export declare function MacrostratColumnDataProvider<T extends BaseUnit>({ children, units, sections, totalHeight, axisType, allowUnitSelection, onUnitSelected, selectedUnit, ref, }: ColumnDataProviderProps<T>): import('react').FunctionComponentElement<ColumnStateProviderProps<BaseUnit>>;
+export declare function UnitSelectionProvider(props: ColumnStateProviderProps<any>): import('react').FunctionComponentElement<ColumnStateProviderProps<BaseUnit>>;
+export declare function useMacrostratColumnData(): MacrostratColumnDataContext<any>;
+export declare function useMacrostratUnits(): any;
+export declare function useColumnUnitsMap(): Map<number, ExtUnit> | null;
+export declare function useCompositeScale(): CompositeColumnScale;
+export declare function MacrostratColumnProvider(props: any): import('react').FunctionComponentElement<import('@macrostrat/column-components').ColumnProviderProps<import('@macrostrat/column-components').ColumnDivision>>;
+/** This is now a legacy provider */
+export declare function LithologiesProvider({ children }: {
+    children: any;
+}): any;

package/dist/data-provider/store.js

@@ -2,7 +2,7 @@ import { useEffect, 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 { UnitSelectionCallbackManager, allowUnitSelectionAtom, selectedUnitIDAtom, selectedUnitElementAtom } from "./unit-selection.js";
 import { createScopedStore } from "@macrostrat/data-components";
 import { atom } from "jotai";
 const scope = createScopedStore();
@@ -57,7 +57,8 @@ function MacrostratColumnDataProvider({
   axisType,
   allowUnitSelection,
   onUnitSelected,
-  selectedUnit
+  selectedUnit,
+  ref
 }) {
   const value = useMemo(() => {
     return {
@@ -73,11 +74,33 @@ function MacrostratColumnDataProvider({
       units,
       allowUnitSelection,
       onUnitSelected,
-      selectedUnit
+      selectedUnit,
+      ref
     },
-    h(MacrostratColumnDataContext.Provider, { value }, children)
+    [
+      h(ColumnRefManager, { ref }),
+      h(MacrostratColumnDataContext.Provider, { value }, children)
+    ]
   );
 }
+function ColumnRefManager({ ref }) {
+  const selectedUnitElement = scope.useAtomValue(selectedUnitElementAtom);
+  useEffect(() => {
+    if (ref == null) return;
+    ref.current = {
+      scrollSelectedUnitIntoView(opts) {
+        selectedUnitElement?.scrollIntoView(
+          opts ?? {
+            behavior: "smooth",
+            block: "center",
+            inline: "nearest"
+          }
+        );
+      }
+    };
+  }, [ref, selectedUnitElement]);
+  return null;
+}
 function UnitSelectionProvider(props) {
   return h(MacrostratColumnStateProvider, {
     ...props,

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, 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\";\nimport { useEffect } from \"react\";\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":"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"}
+{"version":3,"file":"store.js","sources":["../../src/data-provider/store.ts"],"sourcesContent":["import {\n  createContext,\n  ReactNode,\n  RefObject,\n  useContext,\n  useMemo,\n} 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  selectedUnitElementAtom,\n} from \"./unit-selection\";\nimport type { BaseUnit } from \"@macrostrat/api-types\";\nimport {\n  type AtomMap,\n  createScopedStore,\n  StateIsolation,\n} from \"@macrostrat/data-components\";\nimport { atom } from \"jotai\";\nimport { useEffect } from \"react\";\n\nexport const scope: StateIsolation = 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\n/** Interface for imperative handlers that can\n * be invoked outside of the column's react context\n */\nexport interface ColumnRef {\n  scrollSelectedUnitIntoView(): void;\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  ref: RefObject<ColumnRef>;\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  ref,\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      ref,\n    },\n    [\n      h(ColumnRefManager, { ref }),\n      h(MacrostratColumnDataContext.Provider, { value }, children),\n    ],\n  );\n}\n\nfunction ColumnRefManager({ ref }: { ref?: RefObject<ColumnRef> }) {\n  const selectedUnitElement = scope.useAtomValue(selectedUnitElementAtom);\n  useEffect(() => {\n    if (ref == null) return;\n    ref.current = {\n      scrollSelectedUnitIntoView(opts?: ScrollIntoViewOptions) {\n        selectedUnitElement?.scrollIntoView(\n          opts ?? {\n            behavior: \"smooth\",\n            block: \"center\",\n            inline: \"nearest\",\n          },\n        );\n      },\n    };\n  }, [ref, selectedUnitElement]);\n\n  return null;\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":"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"}