@macrostrat/column-views 3.3.3 → 3.3.4

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## [3.3.4] - 2026-05-11 [_changes_](https://github.com/UW-Macrostrat/web-components/compare/@macrostrat/column-views-v3.3.3...@macrostrat/column-views-v3.3.4)
+
+### Patch Changes
+
+- Simplify handling of nested scoped stores
+- Updated dependencies
+  - @macrostrat/data-components@1.1.8
+
 ## [3.3.3] - 2026-04-05 [_changes_](https://github.com/UW-Macrostrat/web-components/compare/@macrostrat/column-views-v3.3.2...@macrostrat/column-views-v3.3.3)
 
 ### Patch Changes

package/dist/age-axis.d.ts

@@ -1,4 +1,4 @@
-import { ColumnAxisType } from '@macrostrat/column-components';
+import { ColumnAxisType } from '../../column-components/src/index.ts';
 import { PackageScaleLayoutData } from './prepare-units';
 export declare function VerticalAxisLabel(props: any): import('react').ReactElement<{
     className: any;
@@ -10,8 +10,8 @@ interface CompositeAgeAxisProps {
     className?: string;
     style?: React.CSSProperties;
 }
-export declare function CompositeAgeAxis(rest: CompositeAgeAxisProps): import('react').FunctionComponentElement<CompositeStratigraphicScaleInfo>;
-export declare function ApproximateHeightAxis(rest: CompositeAgeAxisProps): import('react').FunctionComponentElement<CompositeStratigraphicScaleInfo>;
+export declare function CompositeAgeAxis(rest: CompositeAgeAxisProps): import('react').DetailedReactHTMLElement<import('react').InputHTMLAttributes<HTMLInputElement>, HTMLInputElement>;
+export declare function ApproximateHeightAxis(rest: CompositeAgeAxisProps): import('react').DetailedReactHTMLElement<import('react').InputHTMLAttributes<HTMLInputElement>, HTMLInputElement>;
 export interface CompositeStratigraphicScaleInfo extends CompositeAgeAxisProps {
     axisType: ColumnAxisType;
     axisLabel?: string;
@@ -22,12 +22,12 @@ export interface CompositeStratigraphicScaleInfo extends CompositeAgeAxisProps {
 export declare function CompositeAgeAxisCore(props: CompositeStratigraphicScaleInfo): import('react').ReactElement<{
     className?: string;
     style?: React.CSSProperties;
-}, string | import('react').JSXElementConstructor<any>>;
+}, string | import('react').JSXElementConstructor<any>> | null;
 export declare function AgeCursor({ age }: {
     age: any;
 }): import('react').ReactElement<{
     style: {
         top: number;
     };
-}, string | import('react').JSXElementConstructor<any>>;
+}, string | import('react').JSXElementConstructor<any>> | null;
 export {};

package/dist/age-model-overlay.d.ts

@@ -20,5 +20,5 @@
  *       },
  *
  * */
-export declare function BoundaryAgeModelOverlay(): import('react').DOMElement<any, Element>;
+export declare function BoundaryAgeModelOverlay(): import('react').DOMElement<any, Element> | null;
 export declare function ComputedSurfacesOverlay(): import('react').DOMElement<import('react').DOMAttributes<Element>, Element>;

package/dist/column.d.ts

@@ -1,8 +1,8 @@
-import { Padding } from '@macrostrat/ui-components';
+import { Padding } from '../../ui-components/src/index.ts';
 import { HTMLAttributes, CSSProperties } from 'react';
 import { SectionSharedProps } from './section';
 import { MergeSectionsMode, ColumnHeightScaleOptions } from './prepare-units';
-import { UnitLong } from '@macrostrat/api-types';
+import { UnitLong } from '../../api-types/src/index.ts';
 import { ScaleContinuousNumeric } from 'd3-scale';
 interface BaseColumnProps extends Omit<SectionSharedProps, "unconformityLabels"> {
     className?: string;
@@ -30,15 +30,15 @@ export interface ColumnProps extends Padding, BaseColumnProps, ColumnHeightScale
     unconformityHeight?: number;
     scale?: ScaleContinuousNumeric<number, number>;
 }
-export declare function Column(props: ColumnProps): import('react').DOMElement<import('react').DOMAttributes<Element>, Element> | import('react').FunctionComponentElement<import('./data-provider').ColumnDataProviderProps<import('@macrostrat/api-types').BaseUnit>>;
+export declare function Column(props: ColumnProps): import('react').DetailedReactHTMLElement<import('react').InputHTMLAttributes<HTMLInputElement>, HTMLInputElement> | import('react').ReactElement<import('react').FunctionComponentElement<import('@blueprintjs/core').NonIdealStateProps>, string | import('react').JSXElementConstructor<any>>;
 export interface ColumnContainerProps extends HTMLAttributes<HTMLDivElement> {
     className?: string;
     style?: CSSProperties;
 }
-export declare function ColumnContainer(props: ColumnContainerProps): import('react').DetailedReactHTMLElement<import('react').InputHTMLAttributes<HTMLInputElement>, HTMLInputElement>;
+export declare function ColumnContainer(props: ColumnContainerProps): import('react').FunctionComponentElement<import('ui-box').BoxProps<import('react').ElementType<any, keyof import("react").JSX.IntrinsicElements>>>;
 export declare function ColumnBasicInfo({ data, showColumnID, showReferences, }: {
     data: any;
-    showColumnID?: boolean;
-    showReferences?: boolean;
-}): import('react').DOMElement<import('react').DOMAttributes<Element>, Element>;
+    showColumnID?: boolean | undefined;
+    showReferences?: boolean | undefined;
+}): import('react').DOMElement<import('react').DOMAttributes<Element>, Element> | null;
 export {};

package/dist/correlation-chart/main.cjs

@@ -124,7 +124,7 @@ function Package({
 }) {
   return h("g.package", { transform: `translate(0 ${offset})` }, [
     // Disable the SVG overlay for now
-    //h(PackageSVGOverlay, { data, columnSpacing }),
+    //h(PackageSVGOverlay, { columnData, columnSpacing }),
     h("g.column-units", [
       columnData.map((data, i) => {
         return h(Column, {
@@ -176,7 +176,7 @@ function Column(props) {
         unitComponentProps: {
           nColumns: 2,
           width: columnWidth,
-          showLabel: false
+          showLabel: true
         }
       })
     )

package/dist/correlation-chart/main.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"main.cjs","sources":["../../src/correlation-chart/main.ts"],"sourcesContent":["/** Correlation chart */\nimport {\n  UnitSelectionProvider,\n  UnitKeyboardNavigation,\n  useUnitSelectionDispatch,\n  useColumnRef,\n} from \"../data-provider\";\nimport { UnitDetailsFeature, UnitSelectionPopover } from \"../unit-details\";\nimport hyper from \"@macrostrat/hyper\";\nimport styles from \"./main.module.sass\";\nimport { useMemo } from \"react\";\nimport { useInDarkMode } from \"@macrostrat/ui-components\";\nimport { CompositeTimescaleCore } from \"../section\";\nimport classNames from \"classnames\";\nimport {\n  findLaterallyExtensiveUnits,\n  splitStratIntoBoxes,\n  UnitGroupBox,\n  CorrelationChartSettings,\n  buildCorrelationChartData,\n} from \"./prepare-data\";\nimport {\n  CompositeAgeAxisCore,\n  CompositeStratigraphicScaleInfo,\n} from \"../age-axis\";\nimport {\n  ColumnAxisType,\n  ColumnProvider,\n  SVG,\n} from \"@macrostrat/column-components\";\nimport { ColoredUnitComponent } from \"../units\";\nimport { UnitBoxes } from \"../units/boxes\";\nimport { ColumnContainer } from \"../column\";\nimport { ColumnData } from \"../data-provider\";\nimport { BaseUnit } from \"@macrostrat/api-types\";\nimport { ScaleContinuousNumeric } from \"d3-scale\";\nimport { ExtUnit } from \"../prepare-units/types\";\n\nconst h = hyper.styled(styles);\n\nexport interface CorrelationChartProps extends CorrelationChartSettings {\n  data: ColumnData[];\n  columnWidth?: number;\n  columnSpacing?: number;\n  targetUnitHeight?: number;\n  unconformityLabels?: boolean;\n  selectedUnit?: number | null;\n  showUnitPopover?: boolean;\n  unitComponent?: any;\n  onUnitSelected?: (unitID: number | null, unit: BaseUnit | null) => void;\n}\n\nfunction MainChartArea({ children }) {\n  const columnRef = useColumnRef();\n  return h(\"div.main-chart\", { ref: columnRef }, children);\n}\n\nconst unitPopoverFeatures = new Set([\n  UnitDetailsFeature.AdjacentUnits,\n  UnitDetailsFeature.OutcropType,\n  UnitDetailsFeature.DepthRange,\n  UnitDetailsFeature.ColumnName,\n]);\n\nexport function CorrelationChart({\n  data,\n  columnSpacing = 0,\n  columnWidth = 130,\n  unconformityLabels = true,\n  showUnitPopover = true,\n  selectedUnit,\n  onUnitSelected,\n  unitComponent,\n  ...scaleProps\n}: CorrelationChartProps) {\n  const defaultScaleProps = {\n    targetUnitHeight: 10,\n    unconformityHeight: 60,\n    minSectionHeight: 60,\n    collapseSmallUnconformities: true,\n  };\n\n  const chartData = useMemo(() => {\n    if (!data) return null;\n    return buildCorrelationChartData(data, {\n      ...defaultScaleProps,\n      ...scaleProps,\n    });\n  }, [data, ...Object.values(scaleProps)]);\n\n  // A flattened units array is used to support keyboard navigation\n  const units = useMemo(() => {\n    return data?.map((d0) => d0.units).flat() ?? [];\n  }, [data]);\n\n  const inDarkMode = useInDarkMode();\n\n  const className = classNames({\n    \"dark-mode\": inDarkMode,\n  });\n\n  if (chartData == null) {\n    return null;\n  }\n\n  const { packages, scaleInfo, nColumns } = chartData;\n\n  const mainWidth = (columnWidth + columnSpacing) * nColumns;\n\n  return h(\n    ColumnContainer,\n    { className: \"correlation-diagram\" },\n    h(\n      UnitSelectionProvider,\n      { selectedUnit, onUnitSelected, units },\n      h(ChartArea, [\n        h(TimescaleColumn, {\n          key: \"timescale\",\n          scaleInfo,\n          unconformityLabels,\n        }),\n        h(MainChartArea, [\n          h(\n            SVG,\n            {\n              className,\n              innerWidth: mainWidth,\n              height: scaleInfo.totalHeight,\n              paddingH: 4,\n            },\n            packages.map((pkg, i) => {\n              const { offset, domain, pixelScale, scale, key } =\n                scaleInfo.packages[i];\n              return h(Package, {\n                columnData: pkg.columnData,\n                key,\n                columnWidth,\n                columnSpacing,\n                offset,\n                domain,\n                pixelScale,\n                scale,\n                unitComponent,\n              });\n            }),\n          ),\n          h.if(showUnitPopover)(UnitSelectionPopover, {\n            features: unitPopoverFeatures,\n          }),\n          // Navigation only works within a column for now...\n          h(UnitKeyboardNavigation, { columnData: data }),\n        ]),\n      ]),\n    ),\n  );\n}\n\nfunction Package({\n  columnData,\n  columnSpacing,\n  columnWidth,\n  unitComponent,\n  offset,\n  domain,\n  pixelScale,\n  scale,\n}) {\n  return h(\"g.package\", { transform: `translate(0 ${offset})` }, [\n    // Disable the SVG overlay for now\n    //h(PackageSVGOverlay, { data, columnSpacing }),\n    h(\"g.column-units\", [\n      columnData.map((data, i) => {\n        return h(Column, {\n          units: data.units,\n          unitComponent,\n          width: columnWidth,\n          key: i,\n          domain,\n          pixelScale,\n          scale,\n          offsetLeft: i * (columnWidth + columnSpacing),\n        });\n      }),\n    ]),\n  ]);\n}\n\ninterface ColumnProps {\n  units: ExtUnit[];\n  unitComponent?: React.FunctionComponent<any>;\n  unitComponentProps?: any;\n  showLabels?: boolean;\n  width?: number;\n  columnWidth?: number;\n  columnSpacing?: number;\n  targetUnitHeight?: number;\n  offsetLeft?: number;\n  domain: [number, number];\n  pixelScale: number;\n  scale?: ScaleContinuousNumeric<number, number>;\n}\n\nfunction Column(props: ColumnProps) {\n  const {\n    units,\n    width = 150,\n    offsetLeft,\n    domain,\n    pixelScale,\n    scale,\n    unitComponent = ColoredUnitComponent,\n  } = props;\n\n  const columnWidth = width;\n\n  if (units.length == 0) {\n    return null;\n  }\n\n  return h(\n    \"g.section\",\n    {\n      transform: `translate(${offsetLeft} 0)`,\n    },\n    h(\n      ColumnProvider,\n      {\n        // Need to tighten up types here...\n        divisions: units as any[],\n        range: domain,\n        scale,\n        pixelsPerMeter: pixelScale, // Actually pixels per myr\n        axisType: ColumnAxisType.AGE,\n      },\n      h(UnitBoxes, {\n        unitComponent,\n        unitComponentProps: {\n          nColumns: 2,\n          width: columnWidth,\n          showLabel: false,\n        },\n      }),\n    ),\n  );\n}\n\nfunction PackageSVGOverlay({ data, columnWidth = 100, columnSpacing = 0 }) {\n  const { b_age, t_age, bestPixelScale, columnData } = data;\n\n  const width = (columnWidth + columnSpacing) * columnData.length;\n  const height = Math.ceil((b_age - t_age) * bestPixelScale) + 2;\n\n  const extensiveUnits = findLaterallyExtensiveUnits(data);\n\n  const scale = (val: number) => {\n    return (val - t_age) * bestPixelScale;\n  };\n\n  return h(\n    \"div.package-overlay\",\n    { style: { width, height } },\n    extensiveUnits.map((d) => {\n      return h(LaterallyExtensiveUnit, {\n        data: d,\n        scale,\n        pixelScale: bestPixelScale,\n        columnSpacing,\n      });\n    }),\n  );\n}\n\nfunction LaterallyExtensiveUnit({ data, scale, pixelScale, columnSpacing }) {\n  const { b_age, t_age, strat_name_long, units } = data;\n  // Build boxes by column groups\n  const boxes: UnitGroupBox[] = splitStratIntoBoxes(data);\n\n  return h(\n    \"div.laterally-extensive-unit\",\n    boxes.map((d, i) => {\n      return h(StratColSpan, {\n        scale,\n        data: d,\n        pixelScale,\n        key: i,\n        columnSpacing,\n      });\n    }),\n  );\n}\n\nfunction StratColSpan({\n  data,\n  scale,\n  columnWidth = 100,\n  columnSpacing = 0,\n  pixelScale = 1,\n}) {\n  const { startCol, endCol, strat_name_long, t_age, b_age } = data;\n  const top = scale(t_age);\n  const left = startCol * (columnWidth + columnSpacing);\n  const width = (endCol - startCol + 1) * (columnWidth + columnSpacing);\n  const height = (b_age - t_age) * pixelScale;\n  return h(\n    \"div.strat-col-span\",\n    { style: { top, height, width, left } },\n    strat_name_long,\n  );\n}\n\nfunction ChartArea({ children }) {\n  const setSelectedUnit = useUnitSelectionDispatch();\n\n  return h(\n    \"div.correlation-chart-inner\",\n    {\n      onClick() {\n        setSelectedUnit(null, null);\n      },\n    },\n    children,\n  );\n}\n\ninterface TimescaleColumnProps {\n  scaleInfo: CompositeStratigraphicScaleInfo;\n  showLabels?: boolean;\n  unconformityLabels?: boolean;\n}\n\nfunction TimescaleColumn(props: TimescaleColumnProps) {\n  const { scaleInfo, unconformityLabels = true } = props;\n  return h(\"div.column-container.age-axis-container\", [\n    h(CompositeAgeAxisCore, { ...scaleInfo }),\n    h(CompositeTimescaleCore, { ...scaleInfo, unconformityLabels }),\n  ]);\n}\n"],"names":["hyper","styles","useColumnRef","UnitDetailsFeature","useMemo","buildCorrelationChartData","useInDarkMode","classNames","ColumnContainer","UnitSelectionProvider","SVG","UnitSelectionPopover","UnitKeyboardNavigation","ColoredUnitComponent","ColumnProvider","ColumnAxisType","UnitBoxes","useUnitSelectionDispatch","CompositeAgeAxisCore","CompositeTimescaleCore"],"mappings":"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"}
+{"version":3,"file":"main.cjs","sources":["../../src/correlation-chart/main.ts"],"sourcesContent":["/** Correlation chart */\nimport {\n  UnitSelectionProvider,\n  UnitKeyboardNavigation,\n  useUnitSelectionDispatch,\n  useColumnRef,\n} from \"../data-provider\";\nimport { UnitDetailsFeature, UnitSelectionPopover } from \"../unit-details\";\nimport hyper from \"@macrostrat/hyper\";\nimport styles from \"./main.module.sass\";\nimport { useMemo } from \"react\";\nimport { useInDarkMode } from \"@macrostrat/ui-components\";\nimport { CompositeTimescaleCore } from \"../section\";\nimport classNames from \"classnames\";\nimport {\n  findLaterallyExtensiveUnits,\n  splitStratIntoBoxes,\n  UnitGroupBox,\n  CorrelationChartSettings,\n  buildCorrelationChartData,\n} from \"./prepare-data\";\nimport {\n  CompositeAgeAxisCore,\n  CompositeStratigraphicScaleInfo,\n} from \"../age-axis\";\nimport {\n  ColumnAxisType,\n  ColumnProvider,\n  SVG,\n} from \"@macrostrat/column-components\";\nimport { ColoredUnitComponent } from \"../units\";\nimport { UnitBoxes } from \"../units/boxes\";\nimport { ColumnContainer } from \"../column\";\nimport { ColumnData } from \"../data-provider\";\nimport { BaseUnit } from \"@macrostrat/api-types\";\nimport { ScaleContinuousNumeric } from \"d3-scale\";\nimport { ExtUnit } from \"../prepare-units/types\";\n\nconst h = hyper.styled(styles);\n\nexport interface CorrelationChartProps extends CorrelationChartSettings {\n  data: ColumnData[];\n  columnWidth?: number;\n  columnSpacing?: number;\n  targetUnitHeight?: number;\n  unconformityLabels?: boolean;\n  selectedUnit?: number | null;\n  showUnitPopover?: boolean;\n  unitComponent?: any;\n  onUnitSelected?: (unitID: number | null, unit: BaseUnit | null) => void;\n}\n\nfunction MainChartArea({ children }) {\n  const columnRef = useColumnRef();\n  return h(\"div.main-chart\", { ref: columnRef }, children);\n}\n\nconst unitPopoverFeatures = new Set([\n  UnitDetailsFeature.AdjacentUnits,\n  UnitDetailsFeature.OutcropType,\n  UnitDetailsFeature.DepthRange,\n  UnitDetailsFeature.ColumnName,\n]);\n\nexport function CorrelationChart({\n  data,\n  columnSpacing = 0,\n  columnWidth = 130,\n  unconformityLabels = true,\n  showUnitPopover = true,\n  selectedUnit,\n  onUnitSelected,\n  unitComponent,\n  ...scaleProps\n}: CorrelationChartProps) {\n  const defaultScaleProps = {\n    targetUnitHeight: 10,\n    unconformityHeight: 60,\n    minSectionHeight: 60,\n    collapseSmallUnconformities: true,\n  };\n\n  const chartData = useMemo(() => {\n    if (!data) return null;\n    return buildCorrelationChartData(data, {\n      ...defaultScaleProps,\n      ...scaleProps,\n    });\n  }, [data, ...Object.values(scaleProps)]);\n\n  // A flattened units array is used to support keyboard navigation\n  const units = useMemo(() => {\n    return data?.map((d0) => d0.units).flat() ?? [];\n  }, [data]);\n\n  const inDarkMode = useInDarkMode();\n\n  const className = classNames({\n    \"dark-mode\": inDarkMode,\n  });\n\n  if (chartData == null) {\n    return null;\n  }\n\n  const { packages, scaleInfo, nColumns } = chartData;\n\n  const mainWidth = (columnWidth + columnSpacing) * nColumns;\n\n  return h(\n    ColumnContainer,\n    { className: \"correlation-diagram\" },\n    h(\n      UnitSelectionProvider,\n      { selectedUnit, onUnitSelected, units },\n      h(ChartArea, [\n        h(TimescaleColumn, {\n          key: \"timescale\",\n          scaleInfo,\n          unconformityLabels,\n        }),\n        h(MainChartArea, [\n          h(\n            SVG,\n            {\n              className,\n              innerWidth: mainWidth,\n              height: scaleInfo.totalHeight,\n              paddingH: 4,\n            },\n            packages.map((pkg, i) => {\n              const { offset, domain, pixelScale, scale, key } =\n                scaleInfo.packages[i];\n              return h(Package, {\n                columnData: pkg.columnData,\n                key,\n                columnWidth,\n                columnSpacing,\n                offset,\n                domain,\n                pixelScale,\n                scale,\n                unitComponent,\n              });\n            }),\n          ),\n          h.if(showUnitPopover)(UnitSelectionPopover, {\n            features: unitPopoverFeatures,\n          }),\n          // Navigation only works within a column for now...\n          h(UnitKeyboardNavigation, { columnData: data }),\n        ]),\n      ]),\n    ),\n  );\n}\n\nfunction Package({\n  columnData,\n  columnSpacing,\n  columnWidth,\n  unitComponent,\n  offset,\n  domain,\n  pixelScale,\n  scale,\n}) {\n  return h(\"g.package\", { transform: `translate(0 ${offset})` }, [\n    // Disable the SVG overlay for now\n    //h(PackageSVGOverlay, { columnData, columnSpacing }),\n    h(\"g.column-units\", [\n      columnData.map((data, i) => {\n        return h(Column, {\n          units: data.units,\n          unitComponent,\n          width: columnWidth,\n          key: i,\n          domain,\n          pixelScale,\n          scale,\n          offsetLeft: i * (columnWidth + columnSpacing),\n        });\n      }),\n    ]),\n  ]);\n}\n\ninterface ColumnProps {\n  units: ExtUnit[];\n  unitComponent?: React.FunctionComponent<any>;\n  unitComponentProps?: any;\n  showLabels?: boolean;\n  width?: number;\n  columnWidth?: number;\n  columnSpacing?: number;\n  targetUnitHeight?: number;\n  offsetLeft?: number;\n  domain: [number, number];\n  pixelScale: number;\n  scale?: ScaleContinuousNumeric<number, number>;\n}\n\nfunction Column(props: ColumnProps) {\n  const {\n    units,\n    width = 150,\n    offsetLeft,\n    domain,\n    pixelScale,\n    scale,\n    unitComponent = ColoredUnitComponent,\n  } = props;\n\n  const columnWidth = width;\n\n  if (units.length == 0) {\n    return null;\n  }\n\n  return h(\n    \"g.section\",\n    {\n      transform: `translate(${offsetLeft} 0)`,\n    },\n    h(\n      ColumnProvider,\n      {\n        // Need to tighten up types here...\n        divisions: units as any[],\n        range: domain,\n        scale,\n        pixelsPerMeter: pixelScale, // Actually pixels per myr\n        axisType: ColumnAxisType.AGE,\n      },\n      h(UnitBoxes, {\n        unitComponent,\n        unitComponentProps: {\n          nColumns: 2,\n          width: columnWidth,\n          showLabel: true,\n        },\n      }),\n    ),\n  );\n}\n\nfunction PackageSVGOverlay({ data, columnWidth = 100, columnSpacing = 0 }) {\n  const { b_age, t_age, bestPixelScale, columnData } = data;\n\n  const width = (columnWidth + columnSpacing) * columnData.length;\n  const height = Math.ceil((b_age - t_age) * bestPixelScale) + 2;\n\n  const extensiveUnits = findLaterallyExtensiveUnits(data);\n\n  const scale = (val: number) => {\n    return (val - t_age) * bestPixelScale;\n  };\n\n  return h(\n    \"div.package-overlay\",\n    { style: { width, height } },\n    extensiveUnits.map((d) => {\n      return h(LaterallyExtensiveUnit, {\n        data: d,\n        scale,\n        pixelScale: bestPixelScale,\n        columnSpacing,\n      });\n    }),\n  );\n}\n\nfunction LaterallyExtensiveUnit({ data, scale, pixelScale, columnSpacing }) {\n  const { b_age, t_age, strat_name_long, units } = data;\n  // Build boxes by column groups\n  const boxes: UnitGroupBox[] = splitStratIntoBoxes(data);\n\n  return h(\n    \"div.laterally-extensive-unit\",\n    boxes.map((d, i) => {\n      return h(StratColSpan, {\n        scale,\n        data: d,\n        pixelScale,\n        key: i,\n        columnSpacing,\n      });\n    }),\n  );\n}\n\nfunction StratColSpan({\n  data,\n  scale,\n  columnWidth = 100,\n  columnSpacing = 0,\n  pixelScale = 1,\n}) {\n  const { startCol, endCol, strat_name_long, t_age, b_age } = data;\n  const top = scale(t_age);\n  const left = startCol * (columnWidth + columnSpacing);\n  const width = (endCol - startCol + 1) * (columnWidth + columnSpacing);\n  const height = (b_age - t_age) * pixelScale;\n  return h(\n    \"div.strat-col-span\",\n    { style: { top, height, width, left } },\n    strat_name_long,\n  );\n}\n\nfunction ChartArea({ children }) {\n  const setSelectedUnit = useUnitSelectionDispatch();\n\n  return h(\n    \"div.correlation-chart-inner\",\n    {\n      onClick() {\n        setSelectedUnit(null, null);\n      },\n    },\n    children,\n  );\n}\n\ninterface TimescaleColumnProps {\n  scaleInfo: CompositeStratigraphicScaleInfo;\n  showLabels?: boolean;\n  unconformityLabels?: boolean;\n}\n\nfunction TimescaleColumn(props: TimescaleColumnProps) {\n  const { scaleInfo, unconformityLabels = true } = props;\n  return h(\"div.column-container.age-axis-container\", [\n    h(CompositeAgeAxisCore, { ...scaleInfo }),\n    h(CompositeTimescaleCore, { ...scaleInfo, unconformityLabels }),\n  ]);\n}\n"],"names":["hyper","styles","useColumnRef","UnitDetailsFeature","useMemo","buildCorrelationChartData","useInDarkMode","classNames","ColumnContainer","UnitSelectionProvider","SVG","UnitSelectionPopover","UnitKeyboardNavigation","ColoredUnitComponent","ColumnProvider","ColumnAxisType","UnitBoxes","useUnitSelectionDispatch","CompositeAgeAxisCore","CompositeTimescaleCore"],"mappings":"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"}

package/dist/correlation-chart/main.d.ts

@@ -1,6 +1,6 @@
 import { CorrelationChartSettings } from './prepare-data';
 import { ColumnData } from '../data-provider';
-import { BaseUnit } from '@macrostrat/api-types';
+import { BaseUnit } from '../../../api-types/src/index.ts';
 export interface CorrelationChartProps extends CorrelationChartSettings {
     data: ColumnData[];
     columnWidth?: number;
@@ -12,4 +12,4 @@ export interface CorrelationChartProps extends CorrelationChartSettings {
     unitComponent?: any;
     onUnitSelected?: (unitID: number | null, unit: BaseUnit | null) => void;
 }
-export declare function CorrelationChart({ data, columnSpacing, columnWidth, unconformityLabels, showUnitPopover, selectedUnit, onUnitSelected, unitComponent, ...scaleProps }: CorrelationChartProps): import('react').FunctionComponentElement<import('..').ColumnContainerProps>;
+export declare function CorrelationChart({ data, columnSpacing, columnWidth, unconformityLabels, showUnitPopover, selectedUnit, onUnitSelected, unitComponent, ...scaleProps }: CorrelationChartProps): import('react').FunctionComponentElement<import('..').ColumnContainerProps> | null;

package/dist/correlation-chart/main.js

@@ -119,7 +119,7 @@ function Package({
 }) {
   return h("g.package", { transform: `translate(0 ${offset})` }, [
     // Disable the SVG overlay for now
-    //h(PackageSVGOverlay, { data, columnSpacing }),
+    //h(PackageSVGOverlay, { columnData, columnSpacing }),
     h("g.column-units", [
       columnData.map((data, i) => {
         return h(Column, {
@@ -171,7 +171,7 @@ function Column(props) {
         unitComponentProps: {
           nColumns: 2,
           width: columnWidth,
-          showLabel: false
+          showLabel: true
         }
       })
     )

package/dist/correlation-chart/main.js.map

@@ -1 +1 @@
-{"version":3,"file":"main.js","sources":["../../src/correlation-chart/main.ts"],"sourcesContent":["/** Correlation chart */\nimport {\n  UnitSelectionProvider,\n  UnitKeyboardNavigation,\n  useUnitSelectionDispatch,\n  useColumnRef,\n} from \"../data-provider\";\nimport { UnitDetailsFeature, UnitSelectionPopover } from \"../unit-details\";\nimport hyper from \"@macrostrat/hyper\";\nimport styles from \"./main.module.sass\";\nimport { useMemo } from \"react\";\nimport { useInDarkMode } from \"@macrostrat/ui-components\";\nimport { CompositeTimescaleCore } from \"../section\";\nimport classNames from \"classnames\";\nimport {\n  findLaterallyExtensiveUnits,\n  splitStratIntoBoxes,\n  UnitGroupBox,\n  CorrelationChartSettings,\n  buildCorrelationChartData,\n} from \"./prepare-data\";\nimport {\n  CompositeAgeAxisCore,\n  CompositeStratigraphicScaleInfo,\n} from \"../age-axis\";\nimport {\n  ColumnAxisType,\n  ColumnProvider,\n  SVG,\n} from \"@macrostrat/column-components\";\nimport { ColoredUnitComponent } from \"../units\";\nimport { UnitBoxes } from \"../units/boxes\";\nimport { ColumnContainer } from \"../column\";\nimport { ColumnData } from \"../data-provider\";\nimport { BaseUnit } from \"@macrostrat/api-types\";\nimport { ScaleContinuousNumeric } from \"d3-scale\";\nimport { ExtUnit } from \"../prepare-units/types\";\n\nconst h = hyper.styled(styles);\n\nexport interface CorrelationChartProps extends CorrelationChartSettings {\n  data: ColumnData[];\n  columnWidth?: number;\n  columnSpacing?: number;\n  targetUnitHeight?: number;\n  unconformityLabels?: boolean;\n  selectedUnit?: number | null;\n  showUnitPopover?: boolean;\n  unitComponent?: any;\n  onUnitSelected?: (unitID: number | null, unit: BaseUnit | null) => void;\n}\n\nfunction MainChartArea({ children }) {\n  const columnRef = useColumnRef();\n  return h(\"div.main-chart\", { ref: columnRef }, children);\n}\n\nconst unitPopoverFeatures = new Set([\n  UnitDetailsFeature.AdjacentUnits,\n  UnitDetailsFeature.OutcropType,\n  UnitDetailsFeature.DepthRange,\n  UnitDetailsFeature.ColumnName,\n]);\n\nexport function CorrelationChart({\n  data,\n  columnSpacing = 0,\n  columnWidth = 130,\n  unconformityLabels = true,\n  showUnitPopover = true,\n  selectedUnit,\n  onUnitSelected,\n  unitComponent,\n  ...scaleProps\n}: CorrelationChartProps) {\n  const defaultScaleProps = {\n    targetUnitHeight: 10,\n    unconformityHeight: 60,\n    minSectionHeight: 60,\n    collapseSmallUnconformities: true,\n  };\n\n  const chartData = useMemo(() => {\n    if (!data) return null;\n    return buildCorrelationChartData(data, {\n      ...defaultScaleProps,\n      ...scaleProps,\n    });\n  }, [data, ...Object.values(scaleProps)]);\n\n  // A flattened units array is used to support keyboard navigation\n  const units = useMemo(() => {\n    return data?.map((d0) => d0.units).flat() ?? [];\n  }, [data]);\n\n  const inDarkMode = useInDarkMode();\n\n  const className = classNames({\n    \"dark-mode\": inDarkMode,\n  });\n\n  if (chartData == null) {\n    return null;\n  }\n\n  const { packages, scaleInfo, nColumns } = chartData;\n\n  const mainWidth = (columnWidth + columnSpacing) * nColumns;\n\n  return h(\n    ColumnContainer,\n    { className: \"correlation-diagram\" },\n    h(\n      UnitSelectionProvider,\n      { selectedUnit, onUnitSelected, units },\n      h(ChartArea, [\n        h(TimescaleColumn, {\n          key: \"timescale\",\n          scaleInfo,\n          unconformityLabels,\n        }),\n        h(MainChartArea, [\n          h(\n            SVG,\n            {\n              className,\n              innerWidth: mainWidth,\n              height: scaleInfo.totalHeight,\n              paddingH: 4,\n            },\n            packages.map((pkg, i) => {\n              const { offset, domain, pixelScale, scale, key } =\n                scaleInfo.packages[i];\n              return h(Package, {\n                columnData: pkg.columnData,\n                key,\n                columnWidth,\n                columnSpacing,\n                offset,\n                domain,\n                pixelScale,\n                scale,\n                unitComponent,\n              });\n            }),\n          ),\n          h.if(showUnitPopover)(UnitSelectionPopover, {\n            features: unitPopoverFeatures,\n          }),\n          // Navigation only works within a column for now...\n          h(UnitKeyboardNavigation, { columnData: data }),\n        ]),\n      ]),\n    ),\n  );\n}\n\nfunction Package({\n  columnData,\n  columnSpacing,\n  columnWidth,\n  unitComponent,\n  offset,\n  domain,\n  pixelScale,\n  scale,\n}) {\n  return h(\"g.package\", { transform: `translate(0 ${offset})` }, [\n    // Disable the SVG overlay for now\n    //h(PackageSVGOverlay, { data, columnSpacing }),\n    h(\"g.column-units\", [\n      columnData.map((data, i) => {\n        return h(Column, {\n          units: data.units,\n          unitComponent,\n          width: columnWidth,\n          key: i,\n          domain,\n          pixelScale,\n          scale,\n          offsetLeft: i * (columnWidth + columnSpacing),\n        });\n      }),\n    ]),\n  ]);\n}\n\ninterface ColumnProps {\n  units: ExtUnit[];\n  unitComponent?: React.FunctionComponent<any>;\n  unitComponentProps?: any;\n  showLabels?: boolean;\n  width?: number;\n  columnWidth?: number;\n  columnSpacing?: number;\n  targetUnitHeight?: number;\n  offsetLeft?: number;\n  domain: [number, number];\n  pixelScale: number;\n  scale?: ScaleContinuousNumeric<number, number>;\n}\n\nfunction Column(props: ColumnProps) {\n  const {\n    units,\n    width = 150,\n    offsetLeft,\n    domain,\n    pixelScale,\n    scale,\n    unitComponent = ColoredUnitComponent,\n  } = props;\n\n  const columnWidth = width;\n\n  if (units.length == 0) {\n    return null;\n  }\n\n  return h(\n    \"g.section\",\n    {\n      transform: `translate(${offsetLeft} 0)`,\n    },\n    h(\n      ColumnProvider,\n      {\n        // Need to tighten up types here...\n        divisions: units as any[],\n        range: domain,\n        scale,\n        pixelsPerMeter: pixelScale, // Actually pixels per myr\n        axisType: ColumnAxisType.AGE,\n      },\n      h(UnitBoxes, {\n        unitComponent,\n        unitComponentProps: {\n          nColumns: 2,\n          width: columnWidth,\n          showLabel: false,\n        },\n      }),\n    ),\n  );\n}\n\nfunction PackageSVGOverlay({ data, columnWidth = 100, columnSpacing = 0 }) {\n  const { b_age, t_age, bestPixelScale, columnData } = data;\n\n  const width = (columnWidth + columnSpacing) * columnData.length;\n  const height = Math.ceil((b_age - t_age) * bestPixelScale) + 2;\n\n  const extensiveUnits = findLaterallyExtensiveUnits(data);\n\n  const scale = (val: number) => {\n    return (val - t_age) * bestPixelScale;\n  };\n\n  return h(\n    \"div.package-overlay\",\n    { style: { width, height } },\n    extensiveUnits.map((d) => {\n      return h(LaterallyExtensiveUnit, {\n        data: d,\n        scale,\n        pixelScale: bestPixelScale,\n        columnSpacing,\n      });\n    }),\n  );\n}\n\nfunction LaterallyExtensiveUnit({ data, scale, pixelScale, columnSpacing }) {\n  const { b_age, t_age, strat_name_long, units } = data;\n  // Build boxes by column groups\n  const boxes: UnitGroupBox[] = splitStratIntoBoxes(data);\n\n  return h(\n    \"div.laterally-extensive-unit\",\n    boxes.map((d, i) => {\n      return h(StratColSpan, {\n        scale,\n        data: d,\n        pixelScale,\n        key: i,\n        columnSpacing,\n      });\n    }),\n  );\n}\n\nfunction StratColSpan({\n  data,\n  scale,\n  columnWidth = 100,\n  columnSpacing = 0,\n  pixelScale = 1,\n}) {\n  const { startCol, endCol, strat_name_long, t_age, b_age } = data;\n  const top = scale(t_age);\n  const left = startCol * (columnWidth + columnSpacing);\n  const width = (endCol - startCol + 1) * (columnWidth + columnSpacing);\n  const height = (b_age - t_age) * pixelScale;\n  return h(\n    \"div.strat-col-span\",\n    { style: { top, height, width, left } },\n    strat_name_long,\n  );\n}\n\nfunction ChartArea({ children }) {\n  const setSelectedUnit = useUnitSelectionDispatch();\n\n  return h(\n    \"div.correlation-chart-inner\",\n    {\n      onClick() {\n        setSelectedUnit(null, null);\n      },\n    },\n    children,\n  );\n}\n\ninterface TimescaleColumnProps {\n  scaleInfo: CompositeStratigraphicScaleInfo;\n  showLabels?: boolean;\n  unconformityLabels?: boolean;\n}\n\nfunction TimescaleColumn(props: TimescaleColumnProps) {\n  const { scaleInfo, unconformityLabels = true } = props;\n  return h(\"div.column-container.age-axis-container\", [\n    h(CompositeAgeAxisCore, { ...scaleInfo }),\n    h(CompositeTimescaleCore, { ...scaleInfo, unconformityLabels }),\n  ]);\n}\n"],"names":["hyper","styles"],"mappings":"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"}
+{"version":3,"file":"main.js","sources":["../../src/correlation-chart/main.ts"],"sourcesContent":["/** Correlation chart */\nimport {\n  UnitSelectionProvider,\n  UnitKeyboardNavigation,\n  useUnitSelectionDispatch,\n  useColumnRef,\n} from \"../data-provider\";\nimport { UnitDetailsFeature, UnitSelectionPopover } from \"../unit-details\";\nimport hyper from \"@macrostrat/hyper\";\nimport styles from \"./main.module.sass\";\nimport { useMemo } from \"react\";\nimport { useInDarkMode } from \"@macrostrat/ui-components\";\nimport { CompositeTimescaleCore } from \"../section\";\nimport classNames from \"classnames\";\nimport {\n  findLaterallyExtensiveUnits,\n  splitStratIntoBoxes,\n  UnitGroupBox,\n  CorrelationChartSettings,\n  buildCorrelationChartData,\n} from \"./prepare-data\";\nimport {\n  CompositeAgeAxisCore,\n  CompositeStratigraphicScaleInfo,\n} from \"../age-axis\";\nimport {\n  ColumnAxisType,\n  ColumnProvider,\n  SVG,\n} from \"@macrostrat/column-components\";\nimport { ColoredUnitComponent } from \"../units\";\nimport { UnitBoxes } from \"../units/boxes\";\nimport { ColumnContainer } from \"../column\";\nimport { ColumnData } from \"../data-provider\";\nimport { BaseUnit } from \"@macrostrat/api-types\";\nimport { ScaleContinuousNumeric } from \"d3-scale\";\nimport { ExtUnit } from \"../prepare-units/types\";\n\nconst h = hyper.styled(styles);\n\nexport interface CorrelationChartProps extends CorrelationChartSettings {\n  data: ColumnData[];\n  columnWidth?: number;\n  columnSpacing?: number;\n  targetUnitHeight?: number;\n  unconformityLabels?: boolean;\n  selectedUnit?: number | null;\n  showUnitPopover?: boolean;\n  unitComponent?: any;\n  onUnitSelected?: (unitID: number | null, unit: BaseUnit | null) => void;\n}\n\nfunction MainChartArea({ children }) {\n  const columnRef = useColumnRef();\n  return h(\"div.main-chart\", { ref: columnRef }, children);\n}\n\nconst unitPopoverFeatures = new Set([\n  UnitDetailsFeature.AdjacentUnits,\n  UnitDetailsFeature.OutcropType,\n  UnitDetailsFeature.DepthRange,\n  UnitDetailsFeature.ColumnName,\n]);\n\nexport function CorrelationChart({\n  data,\n  columnSpacing = 0,\n  columnWidth = 130,\n  unconformityLabels = true,\n  showUnitPopover = true,\n  selectedUnit,\n  onUnitSelected,\n  unitComponent,\n  ...scaleProps\n}: CorrelationChartProps) {\n  const defaultScaleProps = {\n    targetUnitHeight: 10,\n    unconformityHeight: 60,\n    minSectionHeight: 60,\n    collapseSmallUnconformities: true,\n  };\n\n  const chartData = useMemo(() => {\n    if (!data) return null;\n    return buildCorrelationChartData(data, {\n      ...defaultScaleProps,\n      ...scaleProps,\n    });\n  }, [data, ...Object.values(scaleProps)]);\n\n  // A flattened units array is used to support keyboard navigation\n  const units = useMemo(() => {\n    return data?.map((d0) => d0.units).flat() ?? [];\n  }, [data]);\n\n  const inDarkMode = useInDarkMode();\n\n  const className = classNames({\n    \"dark-mode\": inDarkMode,\n  });\n\n  if (chartData == null) {\n    return null;\n  }\n\n  const { packages, scaleInfo, nColumns } = chartData;\n\n  const mainWidth = (columnWidth + columnSpacing) * nColumns;\n\n  return h(\n    ColumnContainer,\n    { className: \"correlation-diagram\" },\n    h(\n      UnitSelectionProvider,\n      { selectedUnit, onUnitSelected, units },\n      h(ChartArea, [\n        h(TimescaleColumn, {\n          key: \"timescale\",\n          scaleInfo,\n          unconformityLabels,\n        }),\n        h(MainChartArea, [\n          h(\n            SVG,\n            {\n              className,\n              innerWidth: mainWidth,\n              height: scaleInfo.totalHeight,\n              paddingH: 4,\n            },\n            packages.map((pkg, i) => {\n              const { offset, domain, pixelScale, scale, key } =\n                scaleInfo.packages[i];\n              return h(Package, {\n                columnData: pkg.columnData,\n                key,\n                columnWidth,\n                columnSpacing,\n                offset,\n                domain,\n                pixelScale,\n                scale,\n                unitComponent,\n              });\n            }),\n          ),\n          h.if(showUnitPopover)(UnitSelectionPopover, {\n            features: unitPopoverFeatures,\n          }),\n          // Navigation only works within a column for now...\n          h(UnitKeyboardNavigation, { columnData: data }),\n        ]),\n      ]),\n    ),\n  );\n}\n\nfunction Package({\n  columnData,\n  columnSpacing,\n  columnWidth,\n  unitComponent,\n  offset,\n  domain,\n  pixelScale,\n  scale,\n}) {\n  return h(\"g.package\", { transform: `translate(0 ${offset})` }, [\n    // Disable the SVG overlay for now\n    //h(PackageSVGOverlay, { columnData, columnSpacing }),\n    h(\"g.column-units\", [\n      columnData.map((data, i) => {\n        return h(Column, {\n          units: data.units,\n          unitComponent,\n          width: columnWidth,\n          key: i,\n          domain,\n          pixelScale,\n          scale,\n          offsetLeft: i * (columnWidth + columnSpacing),\n        });\n      }),\n    ]),\n  ]);\n}\n\ninterface ColumnProps {\n  units: ExtUnit[];\n  unitComponent?: React.FunctionComponent<any>;\n  unitComponentProps?: any;\n  showLabels?: boolean;\n  width?: number;\n  columnWidth?: number;\n  columnSpacing?: number;\n  targetUnitHeight?: number;\n  offsetLeft?: number;\n  domain: [number, number];\n  pixelScale: number;\n  scale?: ScaleContinuousNumeric<number, number>;\n}\n\nfunction Column(props: ColumnProps) {\n  const {\n    units,\n    width = 150,\n    offsetLeft,\n    domain,\n    pixelScale,\n    scale,\n    unitComponent = ColoredUnitComponent,\n  } = props;\n\n  const columnWidth = width;\n\n  if (units.length == 0) {\n    return null;\n  }\n\n  return h(\n    \"g.section\",\n    {\n      transform: `translate(${offsetLeft} 0)`,\n    },\n    h(\n      ColumnProvider,\n      {\n        // Need to tighten up types here...\n        divisions: units as any[],\n        range: domain,\n        scale,\n        pixelsPerMeter: pixelScale, // Actually pixels per myr\n        axisType: ColumnAxisType.AGE,\n      },\n      h(UnitBoxes, {\n        unitComponent,\n        unitComponentProps: {\n          nColumns: 2,\n          width: columnWidth,\n          showLabel: true,\n        },\n      }),\n    ),\n  );\n}\n\nfunction PackageSVGOverlay({ data, columnWidth = 100, columnSpacing = 0 }) {\n  const { b_age, t_age, bestPixelScale, columnData } = data;\n\n  const width = (columnWidth + columnSpacing) * columnData.length;\n  const height = Math.ceil((b_age - t_age) * bestPixelScale) + 2;\n\n  const extensiveUnits = findLaterallyExtensiveUnits(data);\n\n  const scale = (val: number) => {\n    return (val - t_age) * bestPixelScale;\n  };\n\n  return h(\n    \"div.package-overlay\",\n    { style: { width, height } },\n    extensiveUnits.map((d) => {\n      return h(LaterallyExtensiveUnit, {\n        data: d,\n        scale,\n        pixelScale: bestPixelScale,\n        columnSpacing,\n      });\n    }),\n  );\n}\n\nfunction LaterallyExtensiveUnit({ data, scale, pixelScale, columnSpacing }) {\n  const { b_age, t_age, strat_name_long, units } = data;\n  // Build boxes by column groups\n  const boxes: UnitGroupBox[] = splitStratIntoBoxes(data);\n\n  return h(\n    \"div.laterally-extensive-unit\",\n    boxes.map((d, i) => {\n      return h(StratColSpan, {\n        scale,\n        data: d,\n        pixelScale,\n        key: i,\n        columnSpacing,\n      });\n    }),\n  );\n}\n\nfunction StratColSpan({\n  data,\n  scale,\n  columnWidth = 100,\n  columnSpacing = 0,\n  pixelScale = 1,\n}) {\n  const { startCol, endCol, strat_name_long, t_age, b_age } = data;\n  const top = scale(t_age);\n  const left = startCol * (columnWidth + columnSpacing);\n  const width = (endCol - startCol + 1) * (columnWidth + columnSpacing);\n  const height = (b_age - t_age) * pixelScale;\n  return h(\n    \"div.strat-col-span\",\n    { style: { top, height, width, left } },\n    strat_name_long,\n  );\n}\n\nfunction ChartArea({ children }) {\n  const setSelectedUnit = useUnitSelectionDispatch();\n\n  return h(\n    \"div.correlation-chart-inner\",\n    {\n      onClick() {\n        setSelectedUnit(null, null);\n      },\n    },\n    children,\n  );\n}\n\ninterface TimescaleColumnProps {\n  scaleInfo: CompositeStratigraphicScaleInfo;\n  showLabels?: boolean;\n  unconformityLabels?: boolean;\n}\n\nfunction TimescaleColumn(props: TimescaleColumnProps) {\n  const { scaleInfo, unconformityLabels = true } = props;\n  return h(\"div.column-container.age-axis-container\", [\n    h(CompositeAgeAxisCore, { ...scaleInfo }),\n    h(CompositeTimescaleCore, { ...scaleInfo, unconformityLabels }),\n  ]);\n}\n"],"names":["hyper","styles"],"mappings":"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"}

package/dist/correlation-chart/prepare-data.d.ts

@@ -1,5 +1,5 @@
 import { CompositeStratigraphicScaleInfo } from '../age-axis';
-import { ColumnGeoJSONRecord, UnitLong } from '@macrostrat/api-types';
+import { ColumnGeoJSONRecord, UnitLong } from '../../../api-types/src/index.ts';
 import { PrepareColumnOptions } from '../prepare-units';
 export interface ColumnIdentifier {
     col_id: number;

package/dist/correlation-chart/stories/utils.d.ts

@@ -1,5 +1,5 @@
 export declare function useCorrelationLine(): {
-    focusedLine: import('geojson').LineString;
+    focusedLine: import('geojson').LineString | null;
     setFocusedLine: (line: any) => void;
     selectedUnit: any;
     setSelectedUnit: (selectedUnit: any) => void;

package/dist/data-provider/column-nav.d.ts

@@ -9,5 +9,5 @@ export declare function useColumnNav(defaultArgs?: ColumnArgs): ColumnManagerDat
 export declare function ColumnNavProvider({ children, ...defaultArgs }: {
     [x: string]: any;
     children: any;
-}): import('react').FunctionComponentElement<import('react').ProviderProps<ColumnManagerData>>;
+}): import('react').FunctionComponentElement<import('react').ProviderProps<ColumnManagerData | null>>;
 export {};

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

@@ -30,7 +30,7 @@ const selectedUnitAtom = jotai.atom(
     if (!get(allowUnitSelectionAtom)) {
       console.error("Unit selection is disabled.");
     }
-    let unitID;
+    let unitID = null;
     let unit = null;
     if (selectedUnit == null) {
       unitID = null;

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 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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"}
+{"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 = 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 { BaseUnit, UnitLong } from '../../../api-types/src/index.ts';
 import { IUnit } from '../units/types';
-import { ColumnData } from '@macrostrat/data-provider';
+import { ColumnData } from '../../../data-provider/src/index.ts';
 type UnitSelectDispatch = (unit: number | BaseUnit | null, target: HTMLElement | null) => void;
 export declare function useUnitSelectionDispatch(): UnitSelectDispatch;
 export declare function useSelectedUnit(): any;
@@ -17,12 +17,12 @@ export interface UnitSelectionCallbacks {
 export declare const allowUnitSelectionAtom: import('jotai').PrimitiveAtom<boolean> & {
     init: boolean;
 };
-export declare const selectedUnitIDAtom: import('jotai').PrimitiveAtom<number> & {
-    init: number;
+export declare const selectedUnitIDAtom: import('jotai').PrimitiveAtom<number | null | undefined> & {
+    init: number | null | undefined;
 };
 export declare function useColumnRef(): any;
 export declare function useAtomOverlayPosition(): any;
-export declare function UnitSelectionCallbackManager({ onUnitSelected, }: UnitSelectionCallbacks): any;
+export declare function UnitSelectionCallbackManager({ onUnitSelected, }: UnitSelectionCallbacks): null;
 /** TODO: figure out if onClickedColumn is still needed
  /** This is not the natural place to get positions within the column,
  * but it will work for now.
@@ -45,5 +45,5 @@ export declare function UnitKeyboardNavigation({ columnData, units, allowHorizon
     columnData?: ColumnData[];
     units?: UnitLong[];
     allowHorizontalNavigation?: boolean;
-}): any;
+}): null;
 export {};

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

@@ -28,7 +28,7 @@ const selectedUnitAtom = atom(
     if (!get(allowUnitSelectionAtom)) {
       console.error("Unit selection is disabled.");
     }
-    let unitID;
+    let unitID = null;
     let unit = null;
     if (selectedUnit == null) {
       unitID = 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 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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"}
+{"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 = 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/facets/carbon-isotopes/data-area.d.ts

@@ -6,8 +6,8 @@ export interface DataAreaProps {
     children: React.ReactNode;
     getHeight?: Function;
 }
-declare const IsotopesDataArea: (props: DataAreaProps) => import('react').FunctionComponentElement<import('react').ProviderProps<any>>;
-declare const IsotopeDataPoint: (props: any) => import('react').DOMElement<any, Element>;
+declare const IsotopesDataArea: (props: DataAreaProps) => import('react').DetailedReactHTMLElement<import('react').InputHTMLAttributes<HTMLInputElement>, HTMLInputElement>;
+declare const IsotopeDataPoint: (props: any) => import('react').DOMElement<any, Element> | null;
 declare const IsotopeDataLine: (props: any) => import('react').DOMElement<any, Element>;
-declare const useDataLocator: () => any;
+declare const useDataLocator: () => null;
 export { IsotopesDataArea, IsotopeDataPoint, IsotopeDataLine, useDataLocator };

package/dist/facets/carbon-isotopes/data-provider.d.ts

@@ -1,4 +1,4 @@
-declare const MeasurementDataContext: import('react').Context<any>;
-export declare function MeasurementDataProvider(props: any): import('react').FunctionComponentElement<import('react').ProviderProps<any>>;
-declare const useMeasurementData: () => any;
+declare const MeasurementDataContext: import('react').Context<null>;
+export declare function MeasurementDataProvider(props: any): import('react').DetailedReactHTMLElement<import('react').InputHTMLAttributes<HTMLInputElement>, HTMLInputElement>;
+declare const useMeasurementData: () => null;
 export { useMeasurementData, MeasurementDataContext };

package/dist/facets/detrital-zircon/index.d.ts

@@ -16,7 +16,7 @@ interface DZMeasurementInfo extends ColumnMeasurementData<MeasurementInfo[]> {
 }
 declare function DetritalColumn({ columnID, color }: {
     columnID: any;
-    color?: string;
+    color?: string | undefined;
 }): import('react').FunctionComponentElement<import('@blueprintjs/core').NonIdealStateProps> | import('react').FunctionComponentElement<import('..').BaseMeasurementsColumnProps<any>>;
 declare function DetritalGroup(props: DetritalItemProps): import('react').ReactElement<{
     className: string;

package/dist/facets/detrital-zircon/provider.d.ts

@@ -28,4 +28,4 @@ export interface MeasurementInfo {
     sample_no: string[];
     error_units: string;
 }
-export declare function useDetritalMeasurements(columnArgs: any): MeasurementInfo[];
+export declare function useDetritalMeasurements(columnArgs: any): MeasurementInfo[] | null;

package/dist/facets/fossils/index.d.ts

@@ -4,4 +4,4 @@ export * from './taxon-ranges';
 export declare function PBDBFossilsColumn({ columnID, type, }: {
     columnID: number;
     type: FossilDataType;
-}): import('react').FunctionComponentElement<import('..').BaseMeasurementsColumnProps<any>>;
+}): import('react').FunctionComponentElement<import('..').BaseMeasurementsColumnProps<any>> | null;

package/dist/facets/fossils/taxon-ranges.d.ts

@@ -1,3 +1,3 @@
 export declare function PBDBOccurrencesMatrix({ columnID }: {
     columnID: any;
-}): import('react').DetailedReactHTMLElement<import('react').InputHTMLAttributes<HTMLInputElement>, HTMLInputElement>;
+}): import('react').FunctionComponentElement<import('ui-box').BoxProps<import('react').ElementType<any, keyof import("react").JSX.IntrinsicElements>>> | null;

package/dist/facets/measurements/base.d.ts

@@ -1,6 +1,6 @@
 import { CompositeColumnScale } from '../../prepare-units';
-import { UnitLong } from '@macrostrat/api-types';
-import { ColumnAxisType } from '@macrostrat/column-components';
+import { UnitLong } from '../../../../api-types/src/index.ts';
+import { ColumnAxisType } from '../../../../column-components/src/index.ts';
 type GetHeightRangeFn<T> = (data: T, unit: UnitLong | null, axisType: ColumnAxisType) => MeasurementHeightData;
 export interface BaseMeasurementsColumnProps<T> {
     data: T[];
@@ -29,8 +29,8 @@ export type MeasurementHeightData = {
     top_height?: number | null;
 };
 export declare function BaseMeasurementsColumn({ data, noteComponent, width, paddingLeft, className, deltaConnectorAttachment, focusedNoteComponent, }: BaseMeasurementsColumnProps<any>): import('react').ReactElement<{
-    className: string;
-}, string | import('react').JSXElementConstructor<any>>;
+    className: string | undefined;
+}, string | import('react').JSXElementConstructor<any>> | null;
 interface TruncatedListProps {
     data: any[];
     className?: string;
@@ -40,7 +40,7 @@ interface TruncatedListProps {
     }) => any;
 }
 export declare function TruncatedList({ data, className, maxItems, itemRenderer, }: TruncatedListProps): import('react').ReactElement<{
-    className: string;
+    className: string | undefined;
 }, string | import('react').JSXElementConstructor<any>>;
 export declare function groupNotesByPixelDistance<T = any>(data: ColumnMeasurementData<T[]>[], scale: CompositeColumnScale, axisType: ColumnAxisType, groupDistance: number): ColumnMeasurementData<T[]>[];
 export {};

package/dist/facets/measurements/sgp.d.ts

@@ -1,3 +1,3 @@
 export declare function SGPMeasurementsColumn({ columnID }: {
     columnID: any;
-}): import('react').FunctionComponentElement<import('./base').BaseMeasurementsColumnProps<any>>;
+}): import('react').FunctionComponentElement<import('./base').BaseMeasurementsColumnProps<any>> | null;

package/dist/maps/column-correlation/state.d.ts

@@ -1,6 +1,6 @@
 import { LineString, Point } from 'geojson';
 import { StoreApi } from 'zustand';
-import { ColumnGeoJSONRecord } from '@macrostrat/api-types';
+import { ColumnGeoJSONRecord } from '../../../../api-types/src/index.ts';
 import { ReactNode } from 'react';
 export interface CorrelationMapInput {
     columns: ColumnGeoJSONRecord[];
@@ -20,7 +20,7 @@ export interface CorrelationProviderProps extends CorrelationMapInput {
 type ComputedStore = {
     focusedColumns: FocusedColumnGeoJSONRecord[];
 };
-export declare function ColumnCorrelationProvider({ children, columns, projectID, inProcess, focusedLine, onSelectColumns, }: CorrelationProviderProps): import('react').FunctionComponentElement<import('react').ProviderProps<StoreApi<CorrelationMapStore>>>;
+export declare function ColumnCorrelationProvider({ children, columns, projectID, inProcess, focusedLine, onSelectColumns, }: CorrelationProviderProps): import('react').FunctionComponentElement<import('react').ProviderProps<StoreApi<CorrelationMapStore> | null>>;
 export declare function useCorrelationMapStore(selector: (state: CorrelationMapStore & ComputedStore) => any): any;
 interface FocusedColumnGeoJSONRecord extends ColumnGeoJSONRecord {
     properties: {

package/dist/maps/column-navigation/mapbox/keyboard-navigation.d.ts

@@ -3,6 +3,6 @@ interface KeyboardNavProps {
     showTriangulation: boolean;
     triangulationColor?: string;
 }
-export declare function ColumnKeyboardNavigation(props: KeyboardNavProps): any;
+export declare function ColumnKeyboardNavigation(props: KeyboardNavProps): null;
 export declare function buildKeyboardNavigationStyle(color?: string): Partial<StyleSpecification>;
 export {};

package/dist/maps/column-navigation/mapbox/state.d.ts

@@ -1,5 +1,5 @@
 import { StoreApi } from 'zustand';
-import { ColumnGeoJSONRecordWithID } from '@macrostrat/api-types';
+import { ColumnGeoJSONRecordWithID } from '../../../../../api-types/src/index.ts';
 import { ReactNode } from 'react';
 export interface NavigationStore {
     columns: ColumnGeoJSONRecordWithID[];
@@ -19,5 +19,5 @@ export interface NavigationProviderProps {
     onSelectColumn?: (col_id: number | null, column: any) => void;
     onHoverColumn?: (col_id: number | null, column: any) => void;
 }
-export declare function ColumnNavigationProvider({ children, columns, columnIDs, selectedColumn, projectID, inProcess, onSelectColumn, onHoverColumn, }: NavigationProviderProps): import('react').FunctionComponentElement<import('react').ProviderProps<StoreApi<NavigationStore>>>;
+export declare function ColumnNavigationProvider({ children, columns, columnIDs, selectedColumn, projectID, inProcess, onSelectColumn, onHoverColumn, }: NavigationProviderProps): import('react').FunctionComponentElement<import('react').ProviderProps<StoreApi<NavigationStore> | null>>;
 export declare function useColumnNavigationStore(selector: (state: NavigationStore) => any): any;

package/dist/maps/column-navigation/svg/data-fetcher.d.ts

@@ -3,4 +3,4 @@ export declare function useColumnFeatures({ status_code, project_id, format, }:
     status_code?: string;
     project_id?: number;
     format?: "geojson" | "topojson" | "geojson_bare";
-}): import('@macrostrat/api-types').ColumnGeoJSONRecord[];
+}): import('../../../../../api-types/src/index.ts').ColumnGeoJSONRecord[] | null;

package/dist/maps/column-navigation/svg/index.d.ts

@@ -1,5 +1,5 @@
 export declare function ResizableMapFrame(props: any): import('react').ReactElement<{
-    ref: import('react').MutableRefObject<any>;
+    ref: import('react').RefObject<null>;
     style: any;
     className: any;
 }, string | import('react').JSXElementConstructor<any>>;

package/dist/maps/column-navigation/svg/layers.d.ts

@@ -3,11 +3,11 @@ import { Polygon } from 'geojson';
 export declare function MeasurementsLayer(props: any): import('react').FunctionComponentElement<{
     [k: string]: any;
     geometry?: object;
-    features?: import('@macrostrat/svg-map-components').IFeature[];
+    features?: import('../../../../../svg-map-components/src/index.ts').IFeature[];
     useCanvas?: boolean;
 } & {
     children?: import('react').ReactNode | undefined;
-}>;
+}> | null;
 type ColumnProps = {
     col_id: number;
 };
@@ -15,7 +15,7 @@ type ColumnFeature = ExtendedFeature<Polygon, ColumnProps>;
 declare function ColumnFeatures(props: any): import('react').FunctionComponentElement<{
     [k: string]: any;
     geometry?: object;
-    features?: import('@macrostrat/svg-map-components').IFeature[];
+    features?: import('../../../../../svg-map-components/src/index.ts').IFeature[];
     useCanvas?: boolean;
 } & {
     children?: import('react').ReactNode | undefined;
@@ -33,7 +33,7 @@ interface KeyboardNavProps extends ColumnNavProps {
     features: ColumnFeature[];
     showLayers: boolean;
 }
-declare function ColumnKeyboardNavigation(props: KeyboardNavProps): import('react').ReactElement<unknown, string | import('react').JSXElementConstructor<any>>;
+declare function ColumnKeyboardNavigation(props: KeyboardNavProps): import('react').ReactElement<unknown, string | import('react').JSXElementConstructor<any>> | null;
 interface ColumnExtraInfo {
     apiRoute?: string;
     color?: string;
@@ -41,12 +41,12 @@ interface ColumnExtraInfo {
     showDebugLayers?: boolean;
     format?: "topojson" | "geojson";
 }
-declare const Columns: (props: ColumnNavProps & ColumnExtraInfo) => import('react').ReactElement<unknown, string | import('react').JSXElementConstructor<any>>;
+declare const Columns: (props: ColumnNavProps & ColumnExtraInfo) => import('react').ReactElement<unknown, string | import('react').JSXElementConstructor<any>> | null;
 declare const ColumnCenters: (props: ColumnNavProps) => import('react').FunctionComponentElement<ColumnNavProps & ColumnExtraInfo>;
 declare const CurrentColumn: (props: any) => import('react').FunctionComponentElement<{
     [k: string]: any;
     geometry?: object;
-    features?: import('@macrostrat/svg-map-components').IFeature[];
+    features?: import('../../../../../svg-map-components/src/index.ts').IFeature[];
     useCanvas?: boolean;
 } & {
     children?: import('react').ReactNode | undefined;

package/dist/maps/column-navigation/utils/keyboard-navigation.d.ts

@@ -3,7 +3,7 @@ export declare function buildKeyMapping(neighbors: any, centroids: any, currentI
     38: any;
     39: any;
     40: any;
-};
+} | undefined;
 export declare function buildTriangulation(features: any): {
     centroids: any;
     tri: any;

package/dist/maps/inset-map/index.d.ts

@@ -1,4 +1,4 @@
-import { MapViewProps } from '@macrostrat/map-interface';
+import { MapViewProps } from '../../../../map-interface/src/index.ts';
 import { ReactNode, CSSProperties } from 'react';
 export interface InsetMapProps extends Omit<MapViewProps, "style"> {
     controls?: ReactNode;
@@ -11,6 +11,6 @@ export interface InsetMapProps extends Omit<MapViewProps, "style"> {
     showRoads?: boolean;
 }
 export declare function InsetMap({ controls, className, children, style, mapStyle, accessToken, showLabels, showAdmin, showRoads, ...rest }: InsetMapProps): import('react').ReactElement<{
-    className: string;
-    style: CSSProperties;
+    className: string | undefined;
+    style: CSSProperties | undefined;
 }, string | import('react').JSXElementConstructor<any>>;

package/dist/maps/layers/columns.d.ts

@@ -1,6 +1,6 @@
 import { default as GeoJSON, FeatureCollection } from 'geojson';
 import { GeoJSONFeature } from 'mapbox-gl';
-import { StyleFragment } from '@macrostrat/mapbox-react';
+import { StyleFragment } from '../../../../mapbox-react/src/index.ts';
 export interface ColumnsStyleOptions {
     color?: string | any[];
     selectedColor?: string | any[];
@@ -14,14 +14,14 @@ interface ColumnLayerOptions extends ColumnsStyleOptions {
     enabled: boolean;
     columns: FeatureCollection | GeoJSONFeature[];
 }
-export declare function BaseColumnsLayer({ enabled, columns, ...rest }: ColumnLayerOptions): any;
+export declare function BaseColumnsLayer({ enabled, columns, ...rest }: ColumnLayerOptions): null;
 export declare function buildColumnsStyle(opts?: ColumnsStyleOptions): StyleFragment;
 export type ColumnFeature = GeoJSON.Feature & {
     id: number;
 };
 export declare function SelectedColumnOverlay({ selectedColumn, ...styleOpts }: {
     selectedColumn: ColumnFeature | null;
-} & SelectedColumnStyleOpts): any;
+} & SelectedColumnStyleOpts): null;
 interface SelectedColumnStyleOpts {
     color?: string | any[];
 }

package/dist/maps/layers/units.d.ts

@@ -1,4 +1,4 @@
-import { StyleFragment } from '@macrostrat/map-styles';
+import { StyleFragment } from '../../../../map-styles/src/index.ts';
 export interface UnitsOverlayProps {
     time: number;
     ageSpan?: number;

package/dist/prepare-units/composite-scale.d.ts

@@ -1,4 +1,4 @@
-import { UnitLong } from '@macrostrat/api-types';
+import { UnitLong } from '../../../api-types/src/index.ts';
 import { ExtUnit, SectionInfo, ColumnScaleOptions, CompositeColumnData, CompositeScaleData, PackageLayoutData, PackageScaleInfo } from './types';
 export declare function buildCompositeScaleInfo(inputScales: PackageScaleInfo[], unconformityHeight: number): CompositeScaleData;
 export declare function finalizeSectionHeights<T extends UnitLong>(sections: SectionInfoWithScale<T>[], unconformityHeight: number): CompositeColumnData<T>;

package/dist/prepare-units/dynamic-scales.d.ts

@@ -1,4 +1,4 @@
-import { UnitLong } from '@macrostrat/api-types';
+import { UnitLong } from '../../../api-types/src/index.ts';
 import { ApproxHeightScaleOptions, HybridScaleDefinition, HybridScaleOptions, PackageScaleInfo } from './types';
 interface BaseSurface {
     index: number;

package/dist/prepare-units/helpers.d.ts

@@ -1,5 +1,5 @@
-import { BaseUnit, UnitLong } from '@macrostrat/api-types';
-import { ColumnAxisType } from '@macrostrat/column-components';
+import { BaseUnit, UnitLong } from '../../../api-types/src/index.ts';
+import { ColumnAxisType } from '../../../column-components/src/index.ts';
 import { ExtUnit, SectionInfo } from './types';
 export declare function preprocessUnits<T extends UnitLong = UnitLong>(section: SectionInfo<T>, axisType?: ColumnAxisType): ExtUnit[];
 export declare function groupUnitsIntoSectionsBySectionID<T extends UnitLong>(units: T[], axisType?: ColumnAxisType): SectionInfo<T>[];

package/dist/prepare-units/index.d.ts

@@ -1,5 +1,5 @@
 import { preprocessUnits } from './helpers';
-import { UnitLong } from '@macrostrat/api-types';
+import { UnitLong } from '../../../api-types/src/index.ts';
 import { CompositeColumnScale } from './composite-scale';
 import { PrepareColumnOptions, PreparedColumnData } from './utils';
 export * from './utils';

package/dist/prepare-units/types.d.ts

@@ -1,5 +1,5 @@
-import { UnitLong } from '@macrostrat/api-types';
-import { ColumnAxisType } from '@macrostrat/column-components';
+import { UnitLong } from '../../../api-types/src/index.ts';
+import { ColumnAxisType } from '../../../column-components/src/index.ts';
 import { ScaleContinuousNumeric } from 'd3-scale';
 export interface ColumnHeightScaleOptions {
     /** A fixed pixel scale to use for the section (pixels per Myr) */

package/dist/prepare-units/utils.d.ts

@@ -1,5 +1,5 @@
-import { BaseUnit } from '@macrostrat/api-types';
-import { ColumnAxisType } from '@macrostrat/column-components';
+import { BaseUnit } from '../../../api-types/src/index.ts';
+import { ColumnAxisType } from '../../../column-components/src/index.ts';
 import { ScaleContinuousNumeric } from 'd3-scale';
 import { ColumnScaleOptions, CompositeColumnData, ExtUnit, PackageLayoutData, StratigraphicPackage } from './types';
 export interface PrepareColumnOptions extends ColumnScaleOptions {

package/dist/section.d.ts

@@ -1,5 +1,5 @@
 import { ReactNode, FunctionComponent } from 'react';
-import { ColumnAxisType } from '@macrostrat/column-components';
+import { ColumnAxisType } from '../../column-components/src/index.ts';
 import { ExtUnit, PackageScaleLayoutData } from './prepare-units/types';
 export interface SectionSharedProps {
     unitComponent?: FunctionComponent<any>;
@@ -40,6 +40,6 @@ export declare function UnconformityLabels(props: {
     style: {
         width: string | number;
     };
-    className: string;
+    className: string | undefined;
 }, string | import('react').JSXElementConstructor<any>>;
 export {};

package/dist/unit-details/age-range.d.ts

@@ -1,4 +1,4 @@
-import { IntervalTagProps } from '@macrostrat/data-components';
+import { IntervalTagProps } from '../../../data-components/src/index.ts';
 export declare function AgeField({ unit, children, ...rest }: {
     [x: string]: any;
     unit: any;
@@ -38,8 +38,8 @@ export declare function AgeLabel({ age, maximumFractionDigits, minimumFractionDi
 }>;
 export declare function Duration({ value, maximumFractionDigits, minimumFractionDigits, }: {
     value: any;
-    maximumFractionDigits?: number;
-    minimumFractionDigits?: number;
+    maximumFractionDigits?: number | undefined;
+    minimumFractionDigits?: number | undefined;
 }): import('react').FunctionComponentElement<{
     value?: any;
     unit?: string;
@@ -64,7 +64,7 @@ export interface IntervalProportionsProps extends Omit<IntervalTagProps, "interv
 export declare function IntervalProportions({ unit, className, showProportions, calculateProportionsFromAges, ...rest }: IntervalProportionsProps): import('react').FunctionComponentElement<{
     children?: import('react').ReactNode;
     className: string;
-}>;
+}> | null;
 export declare function getAgeRange(_unit: any): any[];
 export declare function getAge(value: any): any[];
 export {};

package/dist/unit-details/modal-panel.d.ts

@@ -1 +1 @@
-export declare function UnitDetailsPanelWithNavigation(props: any): import('react').FunctionComponentElement<import('./panel').UnitDetailsPanelProps>;
+export declare function UnitDetailsPanelWithNavigation(props: any): import('react').FunctionComponentElement<import('./panel').UnitDetailsPanelProps> | null;

package/dist/unit-details/popover.d.ts

@@ -6,4 +6,8 @@ export declare function UnitDetailsPopover({ style, children, viewportPadding, }
 }): import('react').ReactElement<{
     style: object;
 }, string | import('react').JSXElementConstructor<any>>;
-export declare function UnitSelectionPopover(props: Omit<UnitDetailsPanelProps, "onSelectUnit" | "unit">): import('react').DOMElement<import('react').DOMAttributes<Element>, Element>;
+export declare function UnitSelectionPopover(props: Omit<UnitDetailsPanelProps, "onSelectUnit" | "unit">): import('react').ReactElement<import('react').FunctionComponentElement<{
+    style: object;
+    viewportPadding?: number;
+    children: React.ReactNode;
+}>, string | import('react').JSXElementConstructor<any>> | null;

package/dist/unit-details/utils.d.ts

@@ -1,3 +1,3 @@
 export declare const formatProportion: (d: any) => any;
-export declare function formatRange(min: any, max: any, precision?: any): any;
-export declare function formatSignificance(value: any, precision?: any): any;
+export declare function formatRange(min: any, max: any, precision?: null): any;
+export declare function formatSignificance(value: any, precision?: null): any;

package/dist/units/boxes.d.ts

@@ -1,5 +1,5 @@
-import { ColumnAxisType } from '@macrostrat/column-components';
-import { Clickable } from '@macrostrat/ui-components';
+import { ColumnAxisType } from '../../../column-components/src/index.ts';
+import { Clickable } from '../../../ui-components/src/index.ts';
 import { ReactNode } from 'react';
 import { IUnit, RectBounds } from './types';
 interface UnitRectOptions {
@@ -32,14 +32,14 @@ export interface LabeledUnitProps extends UnitRectOptions, Clickable, Partial<Re
 export declare function MinimalUnit(props: any): import('react').ReactElement<{
     className: any;
     style: {
-        "--column-unit-background-color": string;
-        "--column-stroke-color": string;
+        "--column-unit-background-color": string | null;
+        "--column-stroke-color": string | null;
     };
 }, string | import('react').JSXElementConstructor<any>>;
 declare function Unit(props: UnitProps): import('react').ReactElement<{
     className: string;
     style: {
-        "--column-unit-background-color": string;
+        "--column-unit-background-color": string | undefined;
     };
 }, string | import('react').JSXElementConstructor<any>>;
 declare function LabeledUnit(props: LabeledUnitProps): import('react').FunctionComponentElement<UnitProps>;
@@ -50,5 +50,5 @@ declare function UnitBoxes<T>(props: {
     unitComponentProps?: any;
     transformDivisions?(divisions: T[]): T[];
     transformDivision?: (division: any, index: number, divisions: any[]) => T | null;
-}): import('react').FunctionComponentElement<any>;
+}): import('react').FunctionComponentElement<any> | null;
 export { LabeledUnit, Unit, UnitBoxes, UnitProps };

package/dist/units/colors.d.ts

@@ -1,4 +1,4 @@
-import { Environment, Lithology, UnitLithology, UnitLong } from '@macrostrat/api-types';
+import { Environment, Lithology, UnitLithology, UnitLong } from '../../../api-types/src/index.ts';
 interface KeyOptions {
     key?: "lith" | "environ";
     id_key?: "lith_id" | "environ_id";

package/dist/units/composite.d.ts

@@ -1,9 +1,9 @@
-import { BaseUnit } from '@macrostrat/api-types';
-export declare function LabelTrackerProvider(props: any): import('react').FunctionComponentElement<import('react').ProviderProps<any>>;
+import { BaseUnit } from '../../../api-types/src/index.ts';
+export declare function LabelTrackerProvider(props: any): import('react').DetailedReactHTMLElement<import('react').InputHTMLAttributes<HTMLInputElement>, HTMLInputElement>;
 declare function TrackedLabeledUnit({ division, nameForDivision, ...rest }: {
     [x: string]: any;
     division: any;
-    nameForDivision?: (div: any) => any;
+    nameForDivision?: ((div: any) => any) | undefined;
 }): import('react').FunctionComponentElement<import('./boxes').LabeledUnitProps>;
 export declare const CompositeUnitComponent: typeof TrackedLabeledUnit;
 type BaseUnitProps = {
@@ -32,8 +32,8 @@ interface CompositeUnitProps {
     showLabels?: boolean;
     clipToFrame?: boolean;
 }
-export declare function CompositeUnitsColumn(props: CompositeUnitProps): import('react').FunctionComponentElement<import('@macrostrat/column-components').LithologyColumnProps>;
-export declare function AnnotatedUnitsColumn(props: ICompositeUnitProps): any;
+export declare function CompositeUnitsColumn(props: CompositeUnitProps): import('react').FunctionComponentElement<import('../../../column-components/src/index.ts').LithologyColumnProps>;
+export declare function AnnotatedUnitsColumn(props: ICompositeUnitProps): null;
 export declare function SectionLabelsColumn(props: ICompositeUnitProps): import('react').DOMElement<import('react').DOMAttributes<Element>, Element>;
-export declare function ColumnNotesProvider(props: any): import('react').FunctionComponentElement<import('react').ProviderProps<import('@macrostrat/column-components').ColumnCtx<import('@macrostrat/column-components').ColumnDivision>>>;
+export declare function ColumnNotesProvider(props: any): import('react').FunctionComponentElement<import('react').ProviderProps<import('../../../column-components/src/index.ts').ColumnCtx<import('../../../column-components/src/index.ts').ColumnDivision>>>;
 export { TrackedLabeledUnit, ICompositeUnitProps };

package/dist/units/index.d.ts

@@ -3,8 +3,8 @@ export * from './composite';
 export * from './types';
 export * from './colors';
 export declare function UnitsColumn({ width }: {
-    width?: number;
-}): import('react').FunctionComponentElement<import('@macrostrat/column-components').LithologyColumnProps>;
+    width?: number | undefined;
+}): import('react').FunctionComponentElement<import('../../../column-components/src/index.ts').LithologyColumnProps>;
 export declare function SimpleUnitsColumn(props: ICompositeUnitProps): import('react').ReactElement<unknown, string | import('react').JSXElementConstructor<any>>;
 export declare function BasicUnitComponent({ division, ...rest }: {
     [x: string]: any;
@@ -12,16 +12,16 @@ export declare function BasicUnitComponent({ division, ...rest }: {
 }): import('react').FunctionComponentElement<{
     [x: string]: any;
     division: any;
-    nColumns?: number;
+    nColumns?: number | undefined;
 }>;
 export declare function UnitComponent({ division, nColumns, ...rest }: {
     [x: string]: any;
     division: any;
-    nColumns?: number;
+    nColumns?: number | undefined;
 }): import('react').FunctionComponentElement<{
     [x: string]: any;
     division: any;
-    nameForDivision?: (div: any) => any;
+    nameForDivision?: ((div: any) => any) | undefined;
 }>;
 interface UnitColorOptions {
     asBackground?: boolean;
@@ -30,11 +30,11 @@ export declare function useUnitColor(unit: any, opts?: UnitColorOptions): string
 export declare function ColoredUnitComponent(props: any): import('react').FunctionComponentElement<{
     [x: string]: any;
     division: any;
-    nColumns?: number;
+    nColumns?: number | undefined;
 }>;
 export declare function useUnitColorByEnvironment(unit: any, opts?: UnitColorOptions): string | null;
 export declare function EnvironmentColoredUnitComponent(props: any): import('react').FunctionComponentElement<{
     [x: string]: any;
     division: any;
-    nColumns?: number;
+    nColumns?: number | undefined;
 }>;

package/dist/units/names.d.ts

@@ -1,4 +1,4 @@
-import { ColumnAxisType, ColumnDivision, NoteData, NotesColumnProps } from '@macrostrat/column-components';
+import { ColumnAxisType, ColumnDivision, NoteData, NotesColumnProps } from '../../../column-components/src/index.ts';
 import { IUnit } from './types';
 import { default as React } from 'react';
 import { CompositeColumnScale } from '../prepare-units';
@@ -23,7 +23,8 @@ declare function noteForDivision(div: IUnit, opts: {
     nameForDivision?: (obj: IUnit) => string;
 }): UnitNote;
 declare const defaultNameFunction: (div: any) => any;
-declare const UnitDataColumn: React.NamedExoticComponent<UnitDataProps>;
+declare function UnitDataColumn_(props: UnitDataProps): import('react').FunctionComponentElement<NotesColumnProps> | null;
+declare const UnitDataColumn: React.MemoExoticComponent<typeof UnitDataColumn_>;
 export interface UnitNamesProps extends UnitDataProps {
     paddingLeft?: number;
     width: number;

package/dist/units/resolvers.d.ts

@@ -1,4 +1,4 @@
-import { Lithology, UnitLithology } from '@macrostrat/api-types';
+import { Lithology, UnitLithology } from '../../../api-types/src/index.ts';
 export declare function getBestFGDCPatternForLithologyList<T extends UnitLithology | Lithology>(liths: T[]): {
     lith: T;
     patternID: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@macrostrat/column-views",
-  "version": "3.3.3",
+  "version": "3.3.4",
   "description": "Data views for Macrostrat stratigraphic columns",
   "repository": {
     "type": "git",
@@ -49,17 +49,17 @@
     "@macrostrat/api-types": "^1.1.5",
     "@macrostrat/color-utils": "^1.2.1",
     "@macrostrat/column-components": "^2.0.6",
-    "@macrostrat/data-components": "^1.1.5",
+    "@macrostrat/data-components": "^1.1.8",
     "@macrostrat/data-provider": "^1.0.2",
     "@macrostrat/hyper": "^3.1.0",
-    "@macrostrat/map-interface": "^2.2.3",
-    "@macrostrat/map-styles": "^2.1.2",
-    "@macrostrat/mapbox-react": "^3.1.3",
+    "@macrostrat/map-interface": "^2.2.4",
+    "@macrostrat/map-styles": "^2.2.1",
+    "@macrostrat/mapbox-react": "^3.2.0",
     "@macrostrat/mapbox-utils": "^1.7.3",
     "@macrostrat/stratigraphy-utils": "^1.2.1",
     "@macrostrat/svg-map-components": "^2.0.2",
     "@macrostrat/timescale": "^3.1.2",
-    "@macrostrat/ui-components": "^5.0.7",
+    "@macrostrat/ui-components": "^5.0.8",
     "@turf/boolean-point-in-polygon": "^7.3.2",
     "@turf/buffer": "^7.3.2",
     "@turf/centroid": "^7.3.2",

package/src/correlation-chart/main.ts

@@ -167,7 +167,7 @@ function Package({
 }) {
   return h("g.package", { transform: `translate(0 ${offset})` }, [
     // Disable the SVG overlay for now
-    //h(PackageSVGOverlay, { data, columnSpacing }),
+    //h(PackageSVGOverlay, { columnData, columnSpacing }),
     h("g.column-units", [
       columnData.map((data, i) => {
         return h(Column, {
@@ -237,7 +237,7 @@ function Column(props: ColumnProps) {
         unitComponentProps: {
           nColumns: 2,
           width: columnWidth,
-          showLabel: false,
+          showLabel: true,
         },
       }),
     ),

package/src/data-provider/unit-selection.ts

@@ -72,7 +72,7 @@ const selectedUnitAtom = atom(
       console.error("Unit selection is disabled.");
     }
 
-    let unitID: number | null;
+    let unitID: number | null = null;
     let unit: BaseUnit | null = null;
     if (selectedUnit == null) {
       unitID = null;