@macrostrat/column-views 3.9.0 → 3.10.0

package/CHANGELOG.md

@@ -1,5 +1,30 @@
 # Changelog
 
+## [3.10.0] - 2026-09-01 [_changes_](https://github.com/UW-Macrostrat/web-components/compare/@macrostrat/column-views-v3.9.0...@macrostrat/column-views-v3.10.0)
+
+### Minor Changes
+
+- Improve the internal structure of the correlation map store
+  [4738d3df](https://github.com/UW-Macrostrat/web-components/commit/4738d3df1bdec8f4b233af215cadc0422ed562e8)
+- Created the @macrostrat/map-views module for specific map interactions and
+  [4738d3df](https://github.com/UW-Macrostrat/web-components/commit/4738d3df1bdec8f4b233af215cadc0422ed562e8)
+  high-level views around Macrostrat maps.
+
+### Patch Changes
+
+- Improve the rendering of correlation chart units
+  [4738d3df](https://github.com/UW-Macrostrat/web-components/commit/4738d3df1bdec8f4b233af215cadc0422ed562e8)
+- Updated dependencies
+  [4738d3df](https://github.com/UW-Macrostrat/web-components/commit/4738d3df1bdec8f4b233af215cadc0422ed562e8)
+- Updated dependencies
+  [03860266](https://github.com/UW-Macrostrat/web-components/commit/038602669f6d71fed4b847cd55c9d7c32885c054)
+- Updated dependencies
+  [4738d3df](https://github.com/UW-Macrostrat/web-components/commit/4738d3df1bdec8f4b233af215cadc0422ed562e8)
+  - @macrostrat/map-views@1.0.0
+  - @macrostrat/scoped-store@1.1.0
+  - @macrostrat/stratigraphy-utils@1.4.0
+  - @macrostrat/api-types@1.3.0
+
 ## [3.9.0] - 2026-08-25 [_changes_](https://github.com/UW-Macrostrat/web-components/compare/@macrostrat/column-views-v3.8.0...@macrostrat/column-views-v3.9.0)
 
 ### Minor Changes

package/dist/index.cjs

@@ -2,41 +2,33 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const index = require("./units/index.cjs");
 const ageAxis = require("./age-axis.cjs");
-const index$6 = require("./prepare-units/index.cjs");
+const index$3 = require("./prepare-units/index.cjs");
 const animatedAgeWindow = require("./animated-age-window.cjs");
 const column = require("./column.cjs");
 const ageModelOverlay = require("./age-model-overlay.cjs");
 const notes = require("./notes.cjs");
+const mapViews = require("@macrostrat/map-views");
 const ageRange = require("./unit-details/age-range.cjs");
 const composite = require("./units/composite.cjs");
-const columns = require("./maps/layers/columns.cjs");
 const base = require("./facets/measurements/base.cjs");
 const dataComponents = require("@macrostrat/data-components");
-const layers = require("./maps/column-navigation/svg/layers.cjs");
-const core = require("./maps/column-correlation/core.cjs");
-const state = require("./maps/column-correlation/state.cjs");
-const index$1 = require("./maps/column-navigation/mapbox/index.cjs");
 const columnNav = require("./data-provider/column-nav.cjs");
-const index$2 = require("./maps/column-navigation/svg/index.cjs");
 const main = require("./correlation-chart/main.cjs");
-const index$3 = require("./facets/detrital-zircon/index.cjs");
+const index$1 = require("./facets/detrital-zircon/index.cjs");
 const provider = require("./facets/fossils/provider.cjs");
 const types = require("./prepare-units/types.cjs");
-const index$4 = require("./maps/inset-map/index.cjs");
 const isotopesColumn = require("./facets/carbon-isotopes/isotopes-column.cjs");
 const panel = require("./unit-details/panel.cjs");
 const store = require("./data-provider/store.cjs");
-const units = require("./maps/layers/units.cjs");
 const dataProvider = require("./facets/carbon-isotopes/data-provider.cjs");
 const utils = require("./prepare-units/utils.cjs");
-const index$5 = require("./facets/fossils/index.cjs");
+const index$2 = require("./facets/fossils/index.cjs");
 const taxonRanges = require("./facets/fossils/taxon-ranges.cjs");
 const sgp = require("./facets/measurements/sgp.cjs");
 const stratNames = require("./unit-details/strat-names.cjs");
 const modalPanel = require("./unit-details/modal-panel.cjs");
 const popover = require("./unit-details/popover.cjs");
 const unitSelection = require("./data-provider/unit-selection.cjs");
-const colors = require("./units/colors.cjs");
 const hashString = require("./correlation-chart/hash-string.cjs");
 const helpers = require("./prepare-units/helpers.cjs");
 exports.BasicUnitComponent = index.BasicUnitComponent;
@@ -52,8 +44,8 @@ exports.ApproximateHeightAxis = ageAxis.ApproximateHeightAxis;
 exports.CompositeAgeAxis = ageAxis.CompositeAgeAxis;
 exports.CompositeAgeAxisCore = ageAxis.CompositeAgeAxisCore;
 exports.VerticalAxisLabel = ageAxis.VerticalAxisLabel;
-exports.prepareColumnUnits = index$6.prepareColumnUnits;
-exports.usePreparedColumnUnits = index$6.usePreparedColumnUnits;
+exports.prepareColumnUnits = index$3.prepareColumnUnits;
+exports.usePreparedColumnUnits = index$3.usePreparedColumnUnits;
 exports.useAnimatedAgeWindow = animatedAgeWindow.useAnimatedAgeWindow;
 exports.Column = column.Column;
 exports.ColumnBasicInfo = column.ColumnBasicInfo;
@@ -75,9 +67,6 @@ exports.CompositeUnitsColumn = composite.CompositeUnitsColumn;
 exports.LabelTrackerProvider = composite.LabelTrackerProvider;
 exports.SectionLabelsColumn = composite.SectionLabelsColumn;
 exports.TrackedLabeledUnit = composite.TrackedLabeledUnit;
-exports.BaseColumnsLayer = columns.BaseColumnsLayer;
-exports.SelectedColumnOverlay = columns.SelectedColumnOverlay;
-exports.buildColumnsStyle = columns.buildColumnsStyle;
 exports.BaseMeasurementsColumn = base.BaseMeasurementsColumn;
 exports.TruncatedList = base.TruncatedList;
 exports.groupNotesByPixelDistance = base.groupNotesByPixelDistance;
@@ -95,32 +84,15 @@ Object.defineProperty(exports, "UnitIdentifier", {
   enumerable: true,
   get: () => dataComponents.UnitIdentifier
 });
-exports.ColumnCenters = layers.ColumnCenters;
-exports.ColumnFeatures = layers.ColumnFeatures;
-exports.ColumnKeyboardNavigation = layers.ColumnKeyboardNavigation;
-exports.Columns = layers.Columns;
-exports.CurrentColumn = layers.CurrentColumn;
-exports.MeasurementsLayer = layers.MeasurementsLayer;
-exports.ColumnCorrelationMap = core.ColumnCorrelationMap;
-exports.ColumnCorrelationProvider = state.ColumnCorrelationProvider;
-exports.useColumnMapLink = state.useColumnMapLink;
-exports.useCorrelationMapStore = state.useCorrelationMapStore;
-exports.ColumnHoverInteraction = index$1.ColumnHoverInteraction;
-exports.ColumnNavigationMap = index$1.ColumnNavigationMap;
-exports.ColumnSelectionManager = index$1.ColumnSelectionManager;
-exports.ColumnsNavigationLayer = index$1.ColumnsNavigationLayer;
 exports.ColumnNavProvider = columnNav.ColumnNavProvider;
 exports.useColumnNav = columnNav.useColumnNav;
-exports.ColumnNavigationSVGMap = index$2.ColumnNavigationSVGMap;
-exports.ResizableMapFrame = index$2.ResizableMapFrame;
 exports.CorrelationChart = main.CorrelationChart;
-exports.DetritalColumn = index$3.DetritalColumn;
-exports.DetritalGroup = index$3.DetritalGroup;
+exports.DetritalColumn = index$1.DetritalColumn;
+exports.DetritalGroup = index$1.DetritalGroup;
 exports.FossilDataType = provider.FossilDataType;
 exports.useFossilData = provider.useFossilData;
 exports.HeightMethod = types.HeightMethod;
 exports.HybridScaleType = types.HybridScaleType;
-exports.InsetMap = index$4.InsetMap;
 exports.IsotopesColumn = isotopesColumn.IsotopesColumn;
 exports.IsotopesDataset = isotopesColumn.IsotopesDataset;
 exports.LegendPanelHeader = panel.LegendPanelHeader;
@@ -140,8 +112,6 @@ exports.useColumnUnitsMap = store.useColumnUnitsMap;
 exports.useCompositeScale = store.useCompositeScale;
 exports.useMacrostratColumnData = store.useMacrostratColumnData;
 exports.useMacrostratUnits = store.useMacrostratUnits;
-exports.MacrostratUnitsOverlay = units.MacrostratUnitsOverlay;
-exports.buildUnitsStyle = units.buildUnitsStyle;
 exports.MeasurementDataContext = dataProvider.MeasurementDataContext;
 exports.MeasurementDataProvider = dataProvider.MeasurementDataProvider;
 exports.useMeasurementData = dataProvider.useMeasurementData;
@@ -153,7 +123,7 @@ exports.ensureRealFloat = utils.ensureRealFloat;
 exports.getPositionWithinUnit = utils.getPositionWithinUnit;
 exports.getUnitHeightRange = utils.getUnitHeightRange;
 exports.unitsOverlap = utils.unitsOverlap;
-exports.PBDBFossilsColumn = index$5.PBDBFossilsColumn;
+exports.PBDBFossilsColumn = index$2.PBDBFossilsColumn;
 exports.PBDBOccurrencesMatrix = taxonRanges.PBDBOccurrencesMatrix;
 exports.SGPMeasurementsColumn = sgp.SGPMeasurementsColumn;
 exports.StratNameField = stratNames.StratNameField;
@@ -171,10 +141,13 @@ exports.useSelectedUnit = unitSelection.useSelectedUnit;
 exports.useUnitSelection = unitSelection.useUnitSelection;
 exports.useUnitSelectionDispatch = unitSelection.useUnitSelectionDispatch;
 exports.useUnitSelectionTarget = unitSelection.useUnitSelectionTarget;
-exports.flattenLithologies = colors.flattenLithologies;
-exports.getMixedColorForData = colors.getMixedColorForData;
-exports.getMixedUnitColor = colors.getMixedUnitColor;
 exports.parseLineFromString = hashString.parseLineFromString;
 exports.stringifyLine = hashString.stringifyLine;
 exports.preprocessUnits = helpers.preprocessUnits;
+Object.keys(mapViews).forEach((k) => {
+  if (k !== "default" && !Object.prototype.hasOwnProperty.call(exports, k)) Object.defineProperty(exports, k, {
+    enumerable: true,
+    get: () => mapViews[k]
+  });
+});
 //# sourceMappingURL=index.cjs.map

package/dist/index.cjs.map

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

package/dist/index.d.ts

@@ -5,8 +5,9 @@ export * from './prepare-units';
 export * from './animated-age-window';
 export * from './column';
 export * from './unit-details';
-export * from './maps';
 export * from './age-model-overlay';
 export * from './correlation-chart';
 export * from './notes';
 export * from './facets';
+/** Legacy views */
+export * from '@macrostrat/map-views';

package/dist/index.js

@@ -5,26 +5,19 @@ import { useAnimatedAgeWindow } from "./animated-age-window.js";
 import { Column, ColumnBasicInfo, ColumnContainer } from "./column.js";
 import { BoundaryAgeModelOverlay, ComputedSurfacesOverlay } from "./age-model-overlay.js";
 import { ColumnNotes } from "./notes.js";
+export * from "@macrostrat/map-views";
 import { AgeField, AgeLabel, AgeRange, Duration, IntervalProportions, getAge, getAgeRange } from "./unit-details/age-range.js";
 import { AnnotatedUnitsColumn, ColumnNotesProvider, CompositeUnitComponent, CompositeUnitsColumn, LabelTrackerProvider, SectionLabelsColumn, TrackedLabeledUnit } from "./units/composite.js";
-import { BaseColumnsLayer, SelectedColumnOverlay, buildColumnsStyle } from "./maps/layers/columns.js";
 import { BaseMeasurementsColumn, TruncatedList, groupNotesByPixelDistance, mergeHeightRanges, standardizeMeasurementHeight } from "./facets/measurements/base.js";
 import { ClickableText, Identifier, UnitIdentifier } from "@macrostrat/data-components";
-import { ColumnCenters, ColumnFeatures, ColumnKeyboardNavigation, Columns, CurrentColumn, MeasurementsLayer } from "./maps/column-navigation/svg/layers.js";
-import { ColumnCorrelationMap } from "./maps/column-correlation/core.js";
-import { ColumnCorrelationProvider, useColumnMapLink, useCorrelationMapStore } from "./maps/column-correlation/state.js";
-import { ColumnHoverInteraction, ColumnNavigationMap, ColumnSelectionManager, ColumnsNavigationLayer } from "./maps/column-navigation/mapbox/index.js";
 import { ColumnNavProvider, useColumnNav } from "./data-provider/column-nav.js";
-import { ColumnNavigationSVGMap, ResizableMapFrame } from "./maps/column-navigation/svg/index.js";
 import { CorrelationChart } from "./correlation-chart/main.js";
 import { DetritalColumn, DetritalGroup } from "./facets/detrital-zircon/index.js";
 import { FossilDataType, useFossilData } from "./facets/fossils/provider.js";
 import { HeightMethod, HybridScaleType } from "./prepare-units/types.js";
-import { InsetMap } from "./maps/inset-map/index.js";
 import { IsotopesColumn, IsotopesDataset } from "./facets/carbon-isotopes/isotopes-column.js";
 import { LegendPanelHeader, ReferencesField, ThicknessField, UnitDetailsFeature, UnitDetailsPanel } from "./unit-details/panel.js";
 import { LithologiesProvider, MacrostratColumnDataProvider, MacrostratColumnProvider, MacrostratColumnStateProvider, UnitSelectionProvider, columnUnitsAtom, columnUnitsMapAtom, scope, useColumnUnitsMap, useCompositeScale, useMacrostratColumnData, useMacrostratUnits } from "./data-provider/store.js";
-import { MacrostratUnitsOverlay, buildUnitsStyle } from "./maps/layers/units.js";
 import { MeasurementDataContext, MeasurementDataProvider, useMeasurementData } from "./facets/carbon-isotopes/data-provider.js";
 import { MergeSectionsMode, agesOverlap, createUnitSorter, ensureArray, ensureRealFloat, getPositionWithinUnit, getUnitHeightRange, unitsOverlap } from "./prepare-units/utils.js";
 import { PBDBFossilsColumn } from "./facets/fossils/index.js";
@@ -34,7 +27,6 @@ import { StratNameField } from "./unit-details/strat-names.js";
 import { UnitDetailsPanelWithNavigation } from "./unit-details/modal-panel.js";
 import { UnitDetailsPopover, UnitSelectionPopover } from "./unit-details/popover.js";
 import { UnitKeyboardNavigation, UnitSelectionCallbackManager, allowUnitSelectionAtom, selectedUnitElementAtom, selectedUnitIDAtom, useAtomOverlayPosition, useColumnRef, useSelectedUnit, useUnitSelection, useUnitSelectionDispatch, useUnitSelectionTarget } from "./data-provider/unit-selection.js";
-import { flattenLithologies, getMixedColorForData, getMixedUnitColor } from "./units/colors.js";
 import { parseLineFromString, stringifyLine } from "./correlation-chart/hash-string.js";
 import { preprocessUnits } from "./prepare-units/helpers.js";
 export {
@@ -44,7 +36,6 @@ export {
   AgeRange,
   AnnotatedUnitsColumn,
   ApproximateHeightAxis,
-  BaseColumnsLayer,
   BaseMeasurementsColumn,
   BasicUnitComponent,
   BoundaryAgeModelOverlay,
@@ -52,28 +43,16 @@ export {
   ColoredUnitComponent,
   Column,
   ColumnBasicInfo,
-  ColumnCenters,
   ColumnContainer,
-  ColumnCorrelationMap,
-  ColumnCorrelationProvider,
-  ColumnFeatures,
-  ColumnHoverInteraction,
-  ColumnKeyboardNavigation,
   ColumnNavProvider,
-  ColumnNavigationMap,
-  ColumnNavigationSVGMap,
   ColumnNotes,
   ColumnNotesProvider,
-  ColumnSelectionManager,
-  Columns,
-  ColumnsNavigationLayer,
   CompositeAgeAxis,
   CompositeAgeAxisCore,
   CompositeUnitComponent,
   CompositeUnitsColumn,
   ComputedSurfacesOverlay,
   CorrelationChart,
-  CurrentColumn,
   DetritalColumn,
   DetritalGroup,
   Duration,
@@ -82,7 +61,6 @@ export {
   HeightMethod,
   HybridScaleType,
   Identifier,
-  InsetMap,
   IntervalProportions,
   IsotopesColumn,
   IsotopesDataset,
@@ -92,18 +70,14 @@ export {
   MacrostratColumnDataProvider,
   MacrostratColumnProvider,
   MacrostratColumnStateProvider,
-  MacrostratUnitsOverlay,
   MeasurementDataContext,
   MeasurementDataProvider,
-  MeasurementsLayer,
   MergeSectionsMode,
   PBDBFossilsColumn,
   PBDBOccurrencesMatrix,
   ReferencesField,
-  ResizableMapFrame,
   SGPMeasurementsColumn,
   SectionLabelsColumn,
-  SelectedColumnOverlay,
   SimpleUnitsColumn,
   StratNameField,
   ThicknessField,
@@ -123,18 +97,13 @@ export {
   VerticalAxisLabel,
   agesOverlap,
   allowUnitSelectionAtom,
-  buildColumnsStyle,
-  buildUnitsStyle,
   columnUnitsAtom,
   columnUnitsMapAtom,
   createUnitSorter,
   ensureArray,
   ensureRealFloat,
-  flattenLithologies,
   getAge,
   getAgeRange,
-  getMixedColorForData,
-  getMixedUnitColor,
   getPositionWithinUnit,
   getUnitHeightRange,
   groupNotesByPixelDistance,
@@ -150,12 +119,10 @@ export {
   unitsOverlap,
   useAnimatedAgeWindow,
   useAtomOverlayPosition,
-  useColumnMapLink,
   useColumnNav,
   useColumnRef,
   useColumnUnitsMap,
   useCompositeScale,
-  useCorrelationMapStore,
   useFossilData,
   useMacrostratColumnData,
   useMacrostratUnits,

package/dist/index.js.map

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

package/dist/units/boxes.cjs

@@ -4,11 +4,11 @@ const columnComponents = require("@macrostrat/column-components");
 const uiComponents = require("@macrostrat/ui-components");
 const h$1 = require("@macrostrat/hyper");
 const React = require("react");
-const resolvers = require("./resolvers.cjs");
 require("@macrostrat/data-provider");
 const boxes_module = require("./boxes.module.sass.cjs");
 const classNames = require("classnames");
 const utils = require("../prepare-units/utils.cjs");
+const stratigraphyUtils = require("@macrostrat/stratigraphy-utils");
 const unitSelection = require("../data-provider/unit-selection.cjs");
 const _interopDefault = (e) => e && e.__esModule ? e : { default: e };
 const h__default = /* @__PURE__ */ _interopDefault(h$1);
@@ -57,7 +57,7 @@ function Unit(props) {
     overflowTop: hasOverflowTop,
     overflowBottom: hasOverflowBottom
   };
-  const _patternID = patternID ?? resolvers.resolveID(d);
+  const _patternID = patternID ?? stratigraphyUtils.getBestFGDCPatternForUnit(d);
   let _fill = fill ?? columnComponents.useGeologicPattern(_patternID, defaultFill);
   const hasBackgroundColor = backgroundColor != null;
   const _className = classNames__default.default(className, { colored: hasBackgroundColor });
@@ -165,7 +165,7 @@ function UnitBoxes(props) {
   }, [divisions, unitComponent, unitComponentProps]);
   return h(
     columnComponents.PatternDefsProvider,
-    { resolveID: resolvers.resolveID, scalePattern: resolvers.scalePattern },
+    { resolveID: stratigraphyUtils.getBestFGDCPatternForUnit, scalePattern: stratigraphyUtils.scalePattern },
     h("g.divisions", children)
   );
 }

package/dist/units/boxes.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"boxes.cjs","sources":["../../src/units/boxes.ts"],"sourcesContent":["import {\n  ColumnAxisType,\n  ColumnContext,\n  ColumnLayoutContext,\n  ClippableRect,\n  ForeignObject,\n  PatternDefsProvider,\n  useColumn,\n  useGeologicPattern,\n} from \"@macrostrat/column-components\";\nimport { SizeAwareLabel, Clickable } from \"@macrostrat/ui-components\";\nimport hyper from \"@macrostrat/hyper\";\nimport { ReactNode, useContext, useMemo } from \"react\";\nimport { resolveID, scalePattern } from \"./resolvers\";\nimport { useUnitSelectionTarget } from \"../data-provider\";\nimport { useLithologies } from \"@macrostrat/data-provider\";\nimport { IUnit } from \"./types\";\nimport styles from \"./boxes.module.sass\";\nimport classNames from \"classnames\";\nimport { getUnitHeightRange } from \"../prepare-units/utils\";\nimport { getMixedUnitColor } from \"./colors\";\nimport type { RectBounds } from \"./types\";\n\nconst h = hyper.styled(styles);\n\n/** Resolve a class name through this file's CSS module exactly as the styled\n * `h` would (module-scoped classes are hashed; unknown/global classes pass\n * through). Needed because `ClippableRect` renders the element in\n * `@macrostrat/column-components`, so class resolution must happen here. */\nconst cls = (name: string): string => (styles as any)[name] ?? name;\n\ninterface UnitRectOptions {\n  widthFraction?: number;\n  axisType?: ColumnAxisType;\n  // Padding to create overflow for zig-zags or other ornamented edges\n  padding?: number;\n}\n\ninterface UnitProps extends Clickable, Partial<RectBounds>, UnitRectOptions {\n  division: IUnit;\n  resolveID?(IUnit): string;\n  UUID?: string;\n  defaultFill?: string;\n  widthFraction?: number;\n  children?: ReactNode;\n  className?: string;\n  fill?: string;\n  backgroundColor?: string;\n  patternColor?: string;\n  patternID?: string | number;\n}\n\nexport interface LabeledUnitProps\n  extends UnitRectOptions, Clickable, Partial<RectBounds> {\n  division: IUnit;\n  patternID?: string | number;\n  label: string;\n  onLabelUpdated?(label: string, shown: boolean);\n  halfWidth?: boolean;\n  showLabel?: boolean;\n  backgroundColor?: string;\n}\n\nfunction useUnitRect(\n  division: IUnit,\n  options: UnitRectOptions = {},\n): RectBounds {\n  const {\n    widthFraction = 1,\n    axisType = ColumnAxisType.AGE,\n    padding = 0,\n  } = options;\n  const { scale } = useContext(ColumnContext);\n  const { width } = useContext(ColumnLayoutContext);\n\n  const [bottomHeight, topHeight] = getUnitHeightRange(division, axisType);\n\n  const y = scale(topHeight);\n  const height = Math.abs(scale(bottomHeight) - y);\n\n  return {\n    x: width * (1 - widthFraction) - padding,\n    y: y - padding,\n    height: height + padding * 2,\n    width: widthFraction * width + padding * 2,\n  };\n}\n\nexport function MinimalUnit(props) {\n  const {\n    division: d,\n    children,\n    className,\n    widthFraction = 1,\n    axisType: _, // not sure why this is brought in...\n    nColumns: __,\n    ...baseBounds\n  } = props;\n\n  const { axisType } = useColumn();\n  const lithMap = useLithologies();\n  const bounds = {\n    ...useUnitRect(d, { widthFraction, axisType }),\n    ...baseBounds,\n  };\n\n  const backgroundColor = getMixedUnitColor(d, lithMap, null, false);\n\n  const [ref, selected, onClick, linked] = useUnitSelectionTarget(d);\n\n  return h(\n    \"g.unit\",\n    {\n      className,\n      style: {\n        \"--column-unit-background-color\": backgroundColor,\n        \"--column-stroke-color\": backgroundColor,\n      },\n    },\n    [\n      h(\"rect.unit.background\", {\n        ref,\n        ...bounds,\n        fill: backgroundColor,\n        fillOpacity: 0.8,\n        stroke: backgroundColor,\n        onClick,\n      }),\n      h.if(linked)(\"rect.linked-overlay\", bounds),\n      h.if(selected)(\"rect.selection-overlay\", bounds),\n    ],\n  );\n}\n\nfunction Unit(props: UnitProps) {\n  const {\n    division: d,\n    children,\n    fill,\n    defaultFill = \"transparent\",\n    className,\n    widthFraction = 1,\n    backgroundColor,\n    patternColor,\n    patternID,\n    axisType: _, // not sure why this is brought in...\n    ...baseBounds\n  } = props;\n\n  const { axisType } = useColumn();\n\n  const hasOverflowTop = d.t_clip_pos != null;\n  const hasOverflowBottom = d.b_clip_pos != null;\n\n  const bounds = {\n    ...useUnitRect(d, { widthFraction, axisType }),\n    ...baseBounds,\n    overflowTop: hasOverflowTop,\n    overflowBottom: hasOverflowBottom,\n  };\n  const _patternID = patternID ?? resolveID(d);\n  let _fill = fill ?? useGeologicPattern(_patternID, defaultFill);\n\n  const hasBackgroundColor = backgroundColor != null;\n\n  const _className = classNames(className, { colored: hasBackgroundColor });\n\n  const [ref, selected, onClick, linked] = useUnitSelectionTarget(d);\n\n  return h(\n    \"g.unit\",\n    {\n      className: _className,\n      style: {\n        \"--column-unit-background-color\": backgroundColor,\n      },\n    },\n    [\n      h(ClippableRect, {\n        ...bounds,\n        fill: backgroundColor,\n        onClick,\n        className: cls(\"background\"),\n      }),\n      h(ClippableRect, {\n        ref,\n        ...bounds,\n        fill: _fill,\n        //mask,\n        onClick,\n        className: cls(\"unit\"),\n      }),\n      h.if(linked)(ClippableRect, {\n        ...bounds,\n        className: cls(\"linked-overlay\"),\n      }),\n      h.if(selected)(ClippableRect, {\n        ...bounds,\n        className: cls(\"selection-overlay\"),\n      }),\n      //defs,\n      children,\n    ],\n  );\n}\n\nfunction LabeledUnit(props: LabeledUnitProps) {\n  const {\n    division,\n    label,\n    onLabelUpdated,\n    widthFraction,\n    showLabel = true,\n    backgroundColor,\n    patternID,\n    axisType: _, // not sure why this is brought in...\n    ...baseBounds\n  } = props;\n\n  const { axisType, isTransitioning, hideLabelsWhileTransitioning } =\n    useColumn();\n  const bounds = {\n    ...useUnitRect(division, { widthFraction, axisType }),\n    ...baseBounds,\n  };\n  const { width, height } = bounds;\n  // Labels stay visible through the animation by default. `hideLabelsWhileTransitioning`\n  // is a perf escape hatch: when set, the `foreignObject` label (whose HTML\n  // reflows on every size change) is skipped mid-transition and restored on settle.\n  const skipLabel = isTransitioning && hideLabelsWhileTransitioning;\n  return h(\n    Unit,\n    {\n      className: \"labeled-unit\",\n      division,\n      backgroundColor,\n      patternID,\n      ...bounds,\n    },\n    [\n      h.if(showLabel && !skipLabel)(\n        ForeignObject,\n        { ...bounds, className: \"unit-label-container\" },\n        h(SizeAwareLabel, {\n          className: \"unit-overlay\",\n          labelClassName: \"unit-label\",\n          style: { width, height },\n          label,\n          // Re-fit the label when a transition settles (isTransitioning flips),\n          // not on every intermediate frame.\n          remeasureKey: isTransitioning,\n          onVisibilityChanged(viz) {\n            onLabelUpdated(label, viz);\n          },\n        }),\n      ),\n    ],\n  );\n}\n\nfunction UnitBoxes<T>(props: {\n  unitComponent: React.FunctionComponent<{ division: T }>;\n  unitComponentProps?: any;\n  transformDivisions?(divisions: T[]): T[];\n  transformDivision?: (\n    division: any,\n    index: number,\n    divisions: any[],\n  ) => T | null;\n}) {\n  const { unitComponent = Unit, unitComponentProps = {} } = props;\n  const { divisions } = useContext(ColumnContext);\n\n  if (divisions.length == 0) {\n    console.warn(\"No divisions found in column context\");\n    return null;\n  }\n\n  const children = useMemo(() => {\n    return divisions.map((division: any, i) => {\n      // @ts-ignore\n      return h(unitComponent, {\n        division,\n        key: division.unit_id,\n        ...unitComponentProps,\n      });\n    });\n  }, [divisions, unitComponent, unitComponentProps]);\n\n  return h(\n    PatternDefsProvider,\n    { resolveID, scalePattern },\n    h(\"g.divisions\", children),\n  );\n}\n\nexport { LabeledUnit, Unit, UnitBoxes, UnitProps };\n"],"names":["hyper","styles","ColumnAxisType","useContext","ColumnContext","ColumnLayoutContext","getUnitHeightRange","useColumn","resolveID","useGeologicPattern","classNames","useUnitSelectionTarget","ClippableRect","ForeignObject","SizeAwareLabel","useMemo","PatternDefsProvider","scalePattern"],"mappings":"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"}
+{"version":3,"file":"boxes.cjs","sources":["../../src/units/boxes.ts"],"sourcesContent":["import {\n  ColumnAxisType,\n  ColumnContext,\n  ColumnLayoutContext,\n  ClippableRect,\n  ForeignObject,\n  PatternDefsProvider,\n  useColumn,\n  useGeologicPattern,\n} from \"@macrostrat/column-components\";\nimport { SizeAwareLabel, Clickable } from \"@macrostrat/ui-components\";\nimport hyper from \"@macrostrat/hyper\";\nimport { ReactNode, useContext, useMemo } from \"react\";\nimport { useUnitSelectionTarget } from \"../data-provider\";\nimport { useLithologies } from \"@macrostrat/data-provider\";\nimport { IUnit } from \"./types\";\nimport styles from \"./boxes.module.sass\";\nimport classNames from \"classnames\";\nimport { getUnitHeightRange } from \"../prepare-units/utils\";\nimport type { RectBounds } from \"./types\";\nimport {\n  getBestFGDCPatternForUnit,\n  scalePattern,\n  getMixedUnitColor,\n} from \"@macrostrat/stratigraphy-utils\";\n\nconst h = hyper.styled(styles);\n\n/** Resolve a class name through this file's CSS module exactly as the styled\n * `h` would (module-scoped classes are hashed; unknown/global classes pass\n * through). Needed because `ClippableRect` renders the element in\n * `@macrostrat/column-components`, so class resolution must happen here. */\nconst cls = (name: string): string => (styles as any)[name] ?? name;\n\ninterface UnitRectOptions {\n  widthFraction?: number;\n  axisType?: ColumnAxisType;\n  // Padding to create overflow for zig-zags or other ornamented edges\n  padding?: number;\n}\n\ninterface UnitProps extends Clickable, Partial<RectBounds>, UnitRectOptions {\n  division: IUnit;\n  resolveID?(IUnit): string;\n  UUID?: string;\n  defaultFill?: string;\n  widthFraction?: number;\n  children?: ReactNode;\n  className?: string;\n  fill?: string;\n  backgroundColor?: string;\n  patternColor?: string;\n  patternID?: string | number;\n}\n\nexport interface LabeledUnitProps\n  extends UnitRectOptions, Clickable, Partial<RectBounds> {\n  division: IUnit;\n  patternID?: string | number;\n  label: string;\n  onLabelUpdated?(label: string, shown: boolean);\n  halfWidth?: boolean;\n  showLabel?: boolean;\n  backgroundColor?: string;\n}\n\nfunction useUnitRect(\n  division: IUnit,\n  options: UnitRectOptions = {},\n): RectBounds {\n  const {\n    widthFraction = 1,\n    axisType = ColumnAxisType.AGE,\n    padding = 0,\n  } = options;\n  const { scale } = useContext(ColumnContext);\n  const { width } = useContext(ColumnLayoutContext);\n\n  const [bottomHeight, topHeight] = getUnitHeightRange(division, axisType);\n\n  const y = scale(topHeight);\n  const height = Math.abs(scale(bottomHeight) - y);\n\n  return {\n    x: width * (1 - widthFraction) - padding,\n    y: y - padding,\n    height: height + padding * 2,\n    width: widthFraction * width + padding * 2,\n  };\n}\n\nexport function MinimalUnit(props) {\n  const {\n    division: d,\n    children,\n    className,\n    widthFraction = 1,\n    axisType: _, // not sure why this is brought in...\n    nColumns: __,\n    ...baseBounds\n  } = props;\n\n  const { axisType } = useColumn();\n  const lithMap = useLithologies();\n  const bounds = {\n    ...useUnitRect(d, { widthFraction, axisType }),\n    ...baseBounds,\n  };\n\n  const backgroundColor = getMixedUnitColor(d, lithMap, null, false);\n\n  const [ref, selected, onClick, linked] = useUnitSelectionTarget(d);\n\n  return h(\n    \"g.unit\",\n    {\n      className,\n      style: {\n        \"--column-unit-background-color\": backgroundColor,\n        \"--column-stroke-color\": backgroundColor,\n      },\n    },\n    [\n      h(\"rect.unit.background\", {\n        ref,\n        ...bounds,\n        fill: backgroundColor,\n        fillOpacity: 0.8,\n        stroke: backgroundColor,\n        onClick,\n      }),\n      h.if(linked)(\"rect.linked-overlay\", bounds),\n      h.if(selected)(\"rect.selection-overlay\", bounds),\n    ],\n  );\n}\n\nfunction Unit(props: UnitProps) {\n  const {\n    division: d,\n    children,\n    fill,\n    defaultFill = \"transparent\",\n    className,\n    widthFraction = 1,\n    backgroundColor,\n    patternColor,\n    patternID,\n    axisType: _, // not sure why this is brought in...\n    ...baseBounds\n  } = props;\n\n  const { axisType } = useColumn();\n\n  const hasOverflowTop = d.t_clip_pos != null;\n  const hasOverflowBottom = d.b_clip_pos != null;\n\n  const bounds = {\n    ...useUnitRect(d, { widthFraction, axisType }),\n    ...baseBounds,\n    overflowTop: hasOverflowTop,\n    overflowBottom: hasOverflowBottom,\n  };\n  const _patternID = patternID ?? getBestFGDCPatternForUnit(d);\n  let _fill = fill ?? useGeologicPattern(_patternID, defaultFill);\n\n  const hasBackgroundColor = backgroundColor != null;\n\n  const _className = classNames(className, { colored: hasBackgroundColor });\n\n  const [ref, selected, onClick, linked] = useUnitSelectionTarget(d);\n\n  return h(\n    \"g.unit\",\n    {\n      className: _className,\n      style: {\n        \"--column-unit-background-color\": backgroundColor,\n      },\n    },\n    [\n      h(ClippableRect, {\n        ...bounds,\n        fill: backgroundColor,\n        onClick,\n        className: cls(\"background\"),\n      }),\n      h(ClippableRect, {\n        ref,\n        ...bounds,\n        fill: _fill,\n        //mask,\n        onClick,\n        className: cls(\"unit\"),\n      }),\n      h.if(linked)(ClippableRect, {\n        ...bounds,\n        className: cls(\"linked-overlay\"),\n      }),\n      h.if(selected)(ClippableRect, {\n        ...bounds,\n        className: cls(\"selection-overlay\"),\n      }),\n      //defs,\n      children,\n    ],\n  );\n}\n\nfunction LabeledUnit(props: LabeledUnitProps) {\n  const {\n    division,\n    label,\n    onLabelUpdated,\n    widthFraction,\n    showLabel = true,\n    backgroundColor,\n    patternID,\n    axisType: _, // not sure why this is brought in...\n    ...baseBounds\n  } = props;\n\n  const { axisType, isTransitioning, hideLabelsWhileTransitioning } =\n    useColumn();\n  const bounds = {\n    ...useUnitRect(division, { widthFraction, axisType }),\n    ...baseBounds,\n  };\n  const { width, height } = bounds;\n  // Labels stay visible through the animation by default. `hideLabelsWhileTransitioning`\n  // is a perf escape hatch: when set, the `foreignObject` label (whose HTML\n  // reflows on every size change) is skipped mid-transition and restored on settle.\n  const skipLabel = isTransitioning && hideLabelsWhileTransitioning;\n  return h(\n    Unit,\n    {\n      className: \"labeled-unit\",\n      division,\n      backgroundColor,\n      patternID,\n      ...bounds,\n    },\n    [\n      h.if(showLabel && !skipLabel)(\n        ForeignObject,\n        { ...bounds, className: \"unit-label-container\" },\n        h(SizeAwareLabel, {\n          className: \"unit-overlay\",\n          labelClassName: \"unit-label\",\n          style: { width, height },\n          label,\n          // Re-fit the label when a transition settles (isTransitioning flips),\n          // not on every intermediate frame.\n          remeasureKey: isTransitioning,\n          onVisibilityChanged(viz) {\n            onLabelUpdated(label, viz);\n          },\n        }),\n      ),\n    ],\n  );\n}\n\nfunction UnitBoxes<T>(props: {\n  unitComponent: React.FunctionComponent<{ division: T }>;\n  unitComponentProps?: any;\n  transformDivisions?(divisions: T[]): T[];\n  transformDivision?: (\n    division: any,\n    index: number,\n    divisions: any[],\n  ) => T | null;\n}) {\n  const { unitComponent = Unit, unitComponentProps = {} } = props;\n  const { divisions } = useContext(ColumnContext);\n\n  if (divisions.length == 0) {\n    console.warn(\"No divisions found in column context\");\n    return null;\n  }\n\n  const children = useMemo(() => {\n    return divisions.map((division: any, i) => {\n      // @ts-ignore\n      return h(unitComponent, {\n        division,\n        key: division.unit_id,\n        ...unitComponentProps,\n      });\n    });\n  }, [divisions, unitComponent, unitComponentProps]);\n\n  return h(\n    PatternDefsProvider,\n    { resolveID: getBestFGDCPatternForUnit, scalePattern },\n    h(\"g.divisions\", children),\n  );\n}\n\nexport { LabeledUnit, Unit, UnitBoxes, UnitProps };\n"],"names":["hyper","styles","ColumnAxisType","useContext","ColumnContext","ColumnLayoutContext","getUnitHeightRange","useColumn","getBestFGDCPatternForUnit","useGeologicPattern","classNames","useUnitSelectionTarget","ClippableRect","ForeignObject","SizeAwareLabel","useMemo","PatternDefsProvider","scalePattern"],"mappings":";;;;;;;;;;;;;;;AA0BA,MAAM,IAAIA,WAAAA,QAAM,OAAOC,oBAAM;AAM7B,MAAM,MAAM,CAAC,SAA0BA,qBAAe,IAAI,KAAK;AAkC/D,SAAS,YACP,UACA,UAA2B,IACf;AACZ,QAAM;AAAA,IACJ,gBAAgB;AAAA,IAChB,WAAWC,iBAAAA,eAAe;AAAA,IAC1B,UAAU;AAAA,EAAA,IACR;AACJ,QAAM,EAAE,MAAA,IAAUC,MAAAA,WAAWC,8BAAa;AAC1C,QAAM,EAAE,MAAA,IAAUD,MAAAA,WAAWE,oCAAmB;AAEhD,QAAM,CAAC,cAAc,SAAS,IAAIC,MAAAA,mBAAmB,UAAU,QAAQ;AAEvE,QAAM,IAAI,MAAM,SAAS;AACzB,QAAM,SAAS,KAAK,IAAI,MAAM,YAAY,IAAI,CAAC;AAE/C,SAAO;AAAA,IACL,GAAG,SAAS,IAAI,iBAAiB;AAAA,IACjC,GAAG,IAAI;AAAA,IACP,QAAQ,SAAS,UAAU;AAAA,IAC3B,OAAO,gBAAgB,QAAQ,UAAU;AAAA,EAAA;AAE7C;AAgDA,SAAS,KAAK,OAAkB;AAC9B,QAAM;AAAA,IACJ,UAAU;AAAA,IACV;AAAA,IACA;AAAA,IACA,cAAc;AAAA,IACd;AAAA,IACA,gBAAgB;AAAA,IAChB;AAAA,IACA;AAAA,IACA;AAAA,IACA,UAAU;AAAA;AAAA,IACV,GAAG;AAAA,EAAA,IACD;AAEJ,QAAM,EAAE,SAAA,IAAaC,2BAAA;AAErB,QAAM,iBAAiB,EAAE,cAAc;AACvC,QAAM,oBAAoB,EAAE,cAAc;AAE1C,QAAM,SAAS;AAAA,IACb,GAAG,YAAY,GAAG,EAAE,eAAe,UAAU;AAAA,IAC7C,GAAG;AAAA,IACH,aAAa;AAAA,IACb,gBAAgB;AAAA,EAAA;AAElB,QAAM,aAAa,aAAaC,kBAAAA,0BAA0B,CAAC;AAC3D,MAAI,QAAQ,QAAQC,oCAAmB,YAAY,WAAW;AAE9D,QAAM,qBAAqB,mBAAmB;AAE9C,QAAM,aAAaC,oBAAAA,QAAW,WAAW,EAAE,SAAS,oBAAoB;AAExE,QAAM,CAAC,KAAK,UAAU,SAAS,MAAM,IAAIC,cAAAA,uBAAuB,CAAC;AAEjE,SAAO;AAAA,IACL;AAAA,IACA;AAAA,MACE,WAAW;AAAA,MACX,OAAO;AAAA,QACL,kCAAkC;AAAA,MAAA;AAAA,IACpC;AAAA,IAEF;AAAA,MACE,EAAEC,iBAAAA,eAAe;AAAA,QACf,GAAG;AAAA,QACH,MAAM;AAAA,QACN;AAAA,QACA,WAAW,IAAI,YAAY;AAAA,MAAA,CAC5B;AAAA,MACD,EAAEA,iBAAAA,eAAe;AAAA,QACf;AAAA,QACA,GAAG;AAAA,QACH,MAAM;AAAA;AAAA,QAEN;AAAA,QACA,WAAW,IAAI,MAAM;AAAA,MAAA,CACtB;AAAA,MACD,EAAE,GAAG,MAAM,EAAEA,gCAAe;AAAA,QAC1B,GAAG;AAAA,QACH,WAAW,IAAI,gBAAgB;AAAA,MAAA,CAChC;AAAA,MACD,EAAE,GAAG,QAAQ,EAAEA,gCAAe;AAAA,QAC5B,GAAG;AAAA,QACH,WAAW,IAAI,mBAAmB;AAAA,MAAA,CACnC;AAAA;AAAA,MAED;AAAA,IAAA;AAAA,EACF;AAEJ;AAEA,SAAS,YAAY,OAAyB;AAC5C,QAAM;AAAA,IACJ;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA,YAAY;AAAA,IACZ;AAAA,IACA;AAAA,IACA,UAAU;AAAA;AAAA,IACV,GAAG;AAAA,EAAA,IACD;AAEJ,QAAM,EAAE,UAAU,iBAAiB,6BAAA,IACjCL,iBAAAA,UAAA;AACF,QAAM,SAAS;AAAA,IACb,GAAG,YAAY,UAAU,EAAE,eAAe,UAAU;AAAA,IACpD,GAAG;AAAA,EAAA;AAEL,QAAM,EAAE,OAAO,OAAA,IAAW;AAI1B,QAAM,YAAY,mBAAmB;AACrC,SAAO;AAAA,IACL;AAAA,IACA;AAAA,MACE,WAAW;AAAA,MACX;AAAA,MACA;AAAA,MACA;AAAA,MACA,GAAG;AAAA,IAAA;AAAA,IAEL;AAAA,MACE,EAAE,GAAG,aAAa,CAAC,SAAS;AAAA,QAC1BM,iBAAAA;AAAAA,QACA,EAAE,GAAG,QAAQ,WAAW,uBAAA;AAAA,QACxB,EAAEC,aAAAA,gBAAgB;AAAA,UAChB,WAAW;AAAA,UACX,gBAAgB;AAAA,UAChB,OAAO,EAAE,OAAO,OAAA;AAAA,UAChB;AAAA;AAAA;AAAA,UAGA,cAAc;AAAA,UACd,oBAAoB,KAAK;AACvB,2BAAe,OAAO,GAAG;AAAA,UAC3B;AAAA,QAAA,CACD;AAAA,MAAA;AAAA,IACH;AAAA,EACF;AAEJ;AAEA,SAAS,UAAa,OASnB;AACD,QAAM,EAAE,gBAAgB,MAAM,qBAAqB,CAAA,MAAO;AAC1D,QAAM,EAAE,UAAA,IAAcX,MAAAA,WAAWC,8BAAa;AAE9C,MAAI,UAAU,UAAU,GAAG;AACzB,YAAQ,KAAK,sCAAsC;AACnD,WAAO;AAAA,EACT;AAEA,QAAM,WAAWW,MAAAA,QAAQ,MAAM;AAC7B,WAAO,UAAU,IAAI,CAAC,UAAe,MAAM;AAEzC,aAAO,EAAE,eAAe;AAAA,QACtB;AAAA,QACA,KAAK,SAAS;AAAA,QACd,GAAG;AAAA,MAAA,CACJ;AAAA,IACH,CAAC;AAAA,EACH,GAAG,CAAC,WAAW,eAAe,kBAAkB,CAAC;AAEjD,SAAO;AAAA,IACLC,iBAAAA;AAAAA,IACA,EAAE,WAAWR,kBAAAA,2BAAA,cAA2BS,+BAAA;AAAA,IACxC,EAAE,eAAe,QAAQ;AAAA,EAAA;AAE7B;;;;"}

package/dist/units/boxes.js

@@ -2,11 +2,11 @@ import { useColumn, ForeignObject, ColumnContext, PatternDefsProvider, ColumnAxi
 import { SizeAwareLabel } from "@macrostrat/ui-components";
 import h$1 from "@macrostrat/hyper";
 import { useContext, useMemo } from "react";
-import { scalePattern, resolveID } from "./resolvers.js";
 import "@macrostrat/data-provider";
 import h$2 from "./boxes.module.sass.js";
 import classNames from "classnames";
 import { getUnitHeightRange } from "../prepare-units/utils.js";
+import { scalePattern, getBestFGDCPatternForUnit } from "@macrostrat/stratigraphy-utils";
 import { useUnitSelectionTarget } from "../data-provider/unit-selection.js";
 const h = h$1.styled(h$2);
 const cls = (name) => h$2[name] ?? name;
@@ -52,7 +52,7 @@ function Unit(props) {
     overflowTop: hasOverflowTop,
     overflowBottom: hasOverflowBottom
   };
-  const _patternID = patternID ?? resolveID(d);
+  const _patternID = patternID ?? getBestFGDCPatternForUnit(d);
   let _fill = fill ?? useGeologicPattern(_patternID, defaultFill);
   const hasBackgroundColor = backgroundColor != null;
   const _className = classNames(className, { colored: hasBackgroundColor });
@@ -160,7 +160,7 @@ function UnitBoxes(props) {
   }, [divisions, unitComponent, unitComponentProps]);
   return h(
     PatternDefsProvider,
-    { resolveID, scalePattern },
+    { resolveID: getBestFGDCPatternForUnit, scalePattern },
     h("g.divisions", children)
   );
 }

package/dist/units/boxes.js.map

@@ -1 +1 @@
-{"version":3,"file":"boxes.js","sources":["../../src/units/boxes.ts"],"sourcesContent":["import {\n  ColumnAxisType,\n  ColumnContext,\n  ColumnLayoutContext,\n  ClippableRect,\n  ForeignObject,\n  PatternDefsProvider,\n  useColumn,\n  useGeologicPattern,\n} from \"@macrostrat/column-components\";\nimport { SizeAwareLabel, Clickable } from \"@macrostrat/ui-components\";\nimport hyper from \"@macrostrat/hyper\";\nimport { ReactNode, useContext, useMemo } from \"react\";\nimport { resolveID, scalePattern } from \"./resolvers\";\nimport { useUnitSelectionTarget } from \"../data-provider\";\nimport { useLithologies } from \"@macrostrat/data-provider\";\nimport { IUnit } from \"./types\";\nimport styles from \"./boxes.module.sass\";\nimport classNames from \"classnames\";\nimport { getUnitHeightRange } from \"../prepare-units/utils\";\nimport { getMixedUnitColor } from \"./colors\";\nimport type { RectBounds } from \"./types\";\n\nconst h = hyper.styled(styles);\n\n/** Resolve a class name through this file's CSS module exactly as the styled\n * `h` would (module-scoped classes are hashed; unknown/global classes pass\n * through). Needed because `ClippableRect` renders the element in\n * `@macrostrat/column-components`, so class resolution must happen here. */\nconst cls = (name: string): string => (styles as any)[name] ?? name;\n\ninterface UnitRectOptions {\n  widthFraction?: number;\n  axisType?: ColumnAxisType;\n  // Padding to create overflow for zig-zags or other ornamented edges\n  padding?: number;\n}\n\ninterface UnitProps extends Clickable, Partial<RectBounds>, UnitRectOptions {\n  division: IUnit;\n  resolveID?(IUnit): string;\n  UUID?: string;\n  defaultFill?: string;\n  widthFraction?: number;\n  children?: ReactNode;\n  className?: string;\n  fill?: string;\n  backgroundColor?: string;\n  patternColor?: string;\n  patternID?: string | number;\n}\n\nexport interface LabeledUnitProps\n  extends UnitRectOptions, Clickable, Partial<RectBounds> {\n  division: IUnit;\n  patternID?: string | number;\n  label: string;\n  onLabelUpdated?(label: string, shown: boolean);\n  halfWidth?: boolean;\n  showLabel?: boolean;\n  backgroundColor?: string;\n}\n\nfunction useUnitRect(\n  division: IUnit,\n  options: UnitRectOptions = {},\n): RectBounds {\n  const {\n    widthFraction = 1,\n    axisType = ColumnAxisType.AGE,\n    padding = 0,\n  } = options;\n  const { scale } = useContext(ColumnContext);\n  const { width } = useContext(ColumnLayoutContext);\n\n  const [bottomHeight, topHeight] = getUnitHeightRange(division, axisType);\n\n  const y = scale(topHeight);\n  const height = Math.abs(scale(bottomHeight) - y);\n\n  return {\n    x: width * (1 - widthFraction) - padding,\n    y: y - padding,\n    height: height + padding * 2,\n    width: widthFraction * width + padding * 2,\n  };\n}\n\nexport function MinimalUnit(props) {\n  const {\n    division: d,\n    children,\n    className,\n    widthFraction = 1,\n    axisType: _, // not sure why this is brought in...\n    nColumns: __,\n    ...baseBounds\n  } = props;\n\n  const { axisType } = useColumn();\n  const lithMap = useLithologies();\n  const bounds = {\n    ...useUnitRect(d, { widthFraction, axisType }),\n    ...baseBounds,\n  };\n\n  const backgroundColor = getMixedUnitColor(d, lithMap, null, false);\n\n  const [ref, selected, onClick, linked] = useUnitSelectionTarget(d);\n\n  return h(\n    \"g.unit\",\n    {\n      className,\n      style: {\n        \"--column-unit-background-color\": backgroundColor,\n        \"--column-stroke-color\": backgroundColor,\n      },\n    },\n    [\n      h(\"rect.unit.background\", {\n        ref,\n        ...bounds,\n        fill: backgroundColor,\n        fillOpacity: 0.8,\n        stroke: backgroundColor,\n        onClick,\n      }),\n      h.if(linked)(\"rect.linked-overlay\", bounds),\n      h.if(selected)(\"rect.selection-overlay\", bounds),\n    ],\n  );\n}\n\nfunction Unit(props: UnitProps) {\n  const {\n    division: d,\n    children,\n    fill,\n    defaultFill = \"transparent\",\n    className,\n    widthFraction = 1,\n    backgroundColor,\n    patternColor,\n    patternID,\n    axisType: _, // not sure why this is brought in...\n    ...baseBounds\n  } = props;\n\n  const { axisType } = useColumn();\n\n  const hasOverflowTop = d.t_clip_pos != null;\n  const hasOverflowBottom = d.b_clip_pos != null;\n\n  const bounds = {\n    ...useUnitRect(d, { widthFraction, axisType }),\n    ...baseBounds,\n    overflowTop: hasOverflowTop,\n    overflowBottom: hasOverflowBottom,\n  };\n  const _patternID = patternID ?? resolveID(d);\n  let _fill = fill ?? useGeologicPattern(_patternID, defaultFill);\n\n  const hasBackgroundColor = backgroundColor != null;\n\n  const _className = classNames(className, { colored: hasBackgroundColor });\n\n  const [ref, selected, onClick, linked] = useUnitSelectionTarget(d);\n\n  return h(\n    \"g.unit\",\n    {\n      className: _className,\n      style: {\n        \"--column-unit-background-color\": backgroundColor,\n      },\n    },\n    [\n      h(ClippableRect, {\n        ...bounds,\n        fill: backgroundColor,\n        onClick,\n        className: cls(\"background\"),\n      }),\n      h(ClippableRect, {\n        ref,\n        ...bounds,\n        fill: _fill,\n        //mask,\n        onClick,\n        className: cls(\"unit\"),\n      }),\n      h.if(linked)(ClippableRect, {\n        ...bounds,\n        className: cls(\"linked-overlay\"),\n      }),\n      h.if(selected)(ClippableRect, {\n        ...bounds,\n        className: cls(\"selection-overlay\"),\n      }),\n      //defs,\n      children,\n    ],\n  );\n}\n\nfunction LabeledUnit(props: LabeledUnitProps) {\n  const {\n    division,\n    label,\n    onLabelUpdated,\n    widthFraction,\n    showLabel = true,\n    backgroundColor,\n    patternID,\n    axisType: _, // not sure why this is brought in...\n    ...baseBounds\n  } = props;\n\n  const { axisType, isTransitioning, hideLabelsWhileTransitioning } =\n    useColumn();\n  const bounds = {\n    ...useUnitRect(division, { widthFraction, axisType }),\n    ...baseBounds,\n  };\n  const { width, height } = bounds;\n  // Labels stay visible through the animation by default. `hideLabelsWhileTransitioning`\n  // is a perf escape hatch: when set, the `foreignObject` label (whose HTML\n  // reflows on every size change) is skipped mid-transition and restored on settle.\n  const skipLabel = isTransitioning && hideLabelsWhileTransitioning;\n  return h(\n    Unit,\n    {\n      className: \"labeled-unit\",\n      division,\n      backgroundColor,\n      patternID,\n      ...bounds,\n    },\n    [\n      h.if(showLabel && !skipLabel)(\n        ForeignObject,\n        { ...bounds, className: \"unit-label-container\" },\n        h(SizeAwareLabel, {\n          className: \"unit-overlay\",\n          labelClassName: \"unit-label\",\n          style: { width, height },\n          label,\n          // Re-fit the label when a transition settles (isTransitioning flips),\n          // not on every intermediate frame.\n          remeasureKey: isTransitioning,\n          onVisibilityChanged(viz) {\n            onLabelUpdated(label, viz);\n          },\n        }),\n      ),\n    ],\n  );\n}\n\nfunction UnitBoxes<T>(props: {\n  unitComponent: React.FunctionComponent<{ division: T }>;\n  unitComponentProps?: any;\n  transformDivisions?(divisions: T[]): T[];\n  transformDivision?: (\n    division: any,\n    index: number,\n    divisions: any[],\n  ) => T | null;\n}) {\n  const { unitComponent = Unit, unitComponentProps = {} } = props;\n  const { divisions } = useContext(ColumnContext);\n\n  if (divisions.length == 0) {\n    console.warn(\"No divisions found in column context\");\n    return null;\n  }\n\n  const children = useMemo(() => {\n    return divisions.map((division: any, i) => {\n      // @ts-ignore\n      return h(unitComponent, {\n        division,\n        key: division.unit_id,\n        ...unitComponentProps,\n      });\n    });\n  }, [divisions, unitComponent, unitComponentProps]);\n\n  return h(\n    PatternDefsProvider,\n    { resolveID, scalePattern },\n    h(\"g.divisions\", children),\n  );\n}\n\nexport { LabeledUnit, Unit, UnitBoxes, UnitProps };\n"],"names":["hyper","styles"],"mappings":"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"}
+{"version":3,"file":"boxes.js","sources":["../../src/units/boxes.ts"],"sourcesContent":["import {\n  ColumnAxisType,\n  ColumnContext,\n  ColumnLayoutContext,\n  ClippableRect,\n  ForeignObject,\n  PatternDefsProvider,\n  useColumn,\n  useGeologicPattern,\n} from \"@macrostrat/column-components\";\nimport { SizeAwareLabel, Clickable } from \"@macrostrat/ui-components\";\nimport hyper from \"@macrostrat/hyper\";\nimport { ReactNode, useContext, useMemo } from \"react\";\nimport { useUnitSelectionTarget } from \"../data-provider\";\nimport { useLithologies } from \"@macrostrat/data-provider\";\nimport { IUnit } from \"./types\";\nimport styles from \"./boxes.module.sass\";\nimport classNames from \"classnames\";\nimport { getUnitHeightRange } from \"../prepare-units/utils\";\nimport type { RectBounds } from \"./types\";\nimport {\n  getBestFGDCPatternForUnit,\n  scalePattern,\n  getMixedUnitColor,\n} from \"@macrostrat/stratigraphy-utils\";\n\nconst h = hyper.styled(styles);\n\n/** Resolve a class name through this file's CSS module exactly as the styled\n * `h` would (module-scoped classes are hashed; unknown/global classes pass\n * through). Needed because `ClippableRect` renders the element in\n * `@macrostrat/column-components`, so class resolution must happen here. */\nconst cls = (name: string): string => (styles as any)[name] ?? name;\n\ninterface UnitRectOptions {\n  widthFraction?: number;\n  axisType?: ColumnAxisType;\n  // Padding to create overflow for zig-zags or other ornamented edges\n  padding?: number;\n}\n\ninterface UnitProps extends Clickable, Partial<RectBounds>, UnitRectOptions {\n  division: IUnit;\n  resolveID?(IUnit): string;\n  UUID?: string;\n  defaultFill?: string;\n  widthFraction?: number;\n  children?: ReactNode;\n  className?: string;\n  fill?: string;\n  backgroundColor?: string;\n  patternColor?: string;\n  patternID?: string | number;\n}\n\nexport interface LabeledUnitProps\n  extends UnitRectOptions, Clickable, Partial<RectBounds> {\n  division: IUnit;\n  patternID?: string | number;\n  label: string;\n  onLabelUpdated?(label: string, shown: boolean);\n  halfWidth?: boolean;\n  showLabel?: boolean;\n  backgroundColor?: string;\n}\n\nfunction useUnitRect(\n  division: IUnit,\n  options: UnitRectOptions = {},\n): RectBounds {\n  const {\n    widthFraction = 1,\n    axisType = ColumnAxisType.AGE,\n    padding = 0,\n  } = options;\n  const { scale } = useContext(ColumnContext);\n  const { width } = useContext(ColumnLayoutContext);\n\n  const [bottomHeight, topHeight] = getUnitHeightRange(division, axisType);\n\n  const y = scale(topHeight);\n  const height = Math.abs(scale(bottomHeight) - y);\n\n  return {\n    x: width * (1 - widthFraction) - padding,\n    y: y - padding,\n    height: height + padding * 2,\n    width: widthFraction * width + padding * 2,\n  };\n}\n\nexport function MinimalUnit(props) {\n  const {\n    division: d,\n    children,\n    className,\n    widthFraction = 1,\n    axisType: _, // not sure why this is brought in...\n    nColumns: __,\n    ...baseBounds\n  } = props;\n\n  const { axisType } = useColumn();\n  const lithMap = useLithologies();\n  const bounds = {\n    ...useUnitRect(d, { widthFraction, axisType }),\n    ...baseBounds,\n  };\n\n  const backgroundColor = getMixedUnitColor(d, lithMap, null, false);\n\n  const [ref, selected, onClick, linked] = useUnitSelectionTarget(d);\n\n  return h(\n    \"g.unit\",\n    {\n      className,\n      style: {\n        \"--column-unit-background-color\": backgroundColor,\n        \"--column-stroke-color\": backgroundColor,\n      },\n    },\n    [\n      h(\"rect.unit.background\", {\n        ref,\n        ...bounds,\n        fill: backgroundColor,\n        fillOpacity: 0.8,\n        stroke: backgroundColor,\n        onClick,\n      }),\n      h.if(linked)(\"rect.linked-overlay\", bounds),\n      h.if(selected)(\"rect.selection-overlay\", bounds),\n    ],\n  );\n}\n\nfunction Unit(props: UnitProps) {\n  const {\n    division: d,\n    children,\n    fill,\n    defaultFill = \"transparent\",\n    className,\n    widthFraction = 1,\n    backgroundColor,\n    patternColor,\n    patternID,\n    axisType: _, // not sure why this is brought in...\n    ...baseBounds\n  } = props;\n\n  const { axisType } = useColumn();\n\n  const hasOverflowTop = d.t_clip_pos != null;\n  const hasOverflowBottom = d.b_clip_pos != null;\n\n  const bounds = {\n    ...useUnitRect(d, { widthFraction, axisType }),\n    ...baseBounds,\n    overflowTop: hasOverflowTop,\n    overflowBottom: hasOverflowBottom,\n  };\n  const _patternID = patternID ?? getBestFGDCPatternForUnit(d);\n  let _fill = fill ?? useGeologicPattern(_patternID, defaultFill);\n\n  const hasBackgroundColor = backgroundColor != null;\n\n  const _className = classNames(className, { colored: hasBackgroundColor });\n\n  const [ref, selected, onClick, linked] = useUnitSelectionTarget(d);\n\n  return h(\n    \"g.unit\",\n    {\n      className: _className,\n      style: {\n        \"--column-unit-background-color\": backgroundColor,\n      },\n    },\n    [\n      h(ClippableRect, {\n        ...bounds,\n        fill: backgroundColor,\n        onClick,\n        className: cls(\"background\"),\n      }),\n      h(ClippableRect, {\n        ref,\n        ...bounds,\n        fill: _fill,\n        //mask,\n        onClick,\n        className: cls(\"unit\"),\n      }),\n      h.if(linked)(ClippableRect, {\n        ...bounds,\n        className: cls(\"linked-overlay\"),\n      }),\n      h.if(selected)(ClippableRect, {\n        ...bounds,\n        className: cls(\"selection-overlay\"),\n      }),\n      //defs,\n      children,\n    ],\n  );\n}\n\nfunction LabeledUnit(props: LabeledUnitProps) {\n  const {\n    division,\n    label,\n    onLabelUpdated,\n    widthFraction,\n    showLabel = true,\n    backgroundColor,\n    patternID,\n    axisType: _, // not sure why this is brought in...\n    ...baseBounds\n  } = props;\n\n  const { axisType, isTransitioning, hideLabelsWhileTransitioning } =\n    useColumn();\n  const bounds = {\n    ...useUnitRect(division, { widthFraction, axisType }),\n    ...baseBounds,\n  };\n  const { width, height } = bounds;\n  // Labels stay visible through the animation by default. `hideLabelsWhileTransitioning`\n  // is a perf escape hatch: when set, the `foreignObject` label (whose HTML\n  // reflows on every size change) is skipped mid-transition and restored on settle.\n  const skipLabel = isTransitioning && hideLabelsWhileTransitioning;\n  return h(\n    Unit,\n    {\n      className: \"labeled-unit\",\n      division,\n      backgroundColor,\n      patternID,\n      ...bounds,\n    },\n    [\n      h.if(showLabel && !skipLabel)(\n        ForeignObject,\n        { ...bounds, className: \"unit-label-container\" },\n        h(SizeAwareLabel, {\n          className: \"unit-overlay\",\n          labelClassName: \"unit-label\",\n          style: { width, height },\n          label,\n          // Re-fit the label when a transition settles (isTransitioning flips),\n          // not on every intermediate frame.\n          remeasureKey: isTransitioning,\n          onVisibilityChanged(viz) {\n            onLabelUpdated(label, viz);\n          },\n        }),\n      ),\n    ],\n  );\n}\n\nfunction UnitBoxes<T>(props: {\n  unitComponent: React.FunctionComponent<{ division: T }>;\n  unitComponentProps?: any;\n  transformDivisions?(divisions: T[]): T[];\n  transformDivision?: (\n    division: any,\n    index: number,\n    divisions: any[],\n  ) => T | null;\n}) {\n  const { unitComponent = Unit, unitComponentProps = {} } = props;\n  const { divisions } = useContext(ColumnContext);\n\n  if (divisions.length == 0) {\n    console.warn(\"No divisions found in column context\");\n    return null;\n  }\n\n  const children = useMemo(() => {\n    return divisions.map((division: any, i) => {\n      // @ts-ignore\n      return h(unitComponent, {\n        division,\n        key: division.unit_id,\n        ...unitComponentProps,\n      });\n    });\n  }, [divisions, unitComponent, unitComponentProps]);\n\n  return h(\n    PatternDefsProvider,\n    { resolveID: getBestFGDCPatternForUnit, scalePattern },\n    h(\"g.divisions\", children),\n  );\n}\n\nexport { LabeledUnit, Unit, UnitBoxes, UnitProps };\n"],"names":["hyper","styles"],"mappings":"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"}

package/dist/units/index.cjs

@@ -5,11 +5,10 @@ const columnComponents = require("@macrostrat/column-components");
 const names = require("./names.cjs");
 const boxes = require("./boxes.cjs");
 const uiComponents = require("@macrostrat/ui-components");
-const colors = require("./colors.cjs");
+const stratigraphyUtils = require("@macrostrat/stratigraphy-utils");
 const composite = require("./composite.cjs");
 const dataProvider = require("@macrostrat/data-provider");
 const React = require("react");
-const resolvers = require("./resolvers.cjs");
 const _interopDefault = (e) => e && e.__esModule ? e : { default: e };
 const h__default = /* @__PURE__ */ _interopDefault(h);
 function UnitsColumn({ width = 100 }) {
@@ -51,7 +50,7 @@ function UnitComponent({
   let reducedWidth = _nColumns;
   if ("layout" in division) {
     const layout = division.layout;
-    _nColumns = Math.min(_nColumns, layout.totalColumns);
+    _nColumns = layout.totalColumns;
     columnIx = layout.column;
     reducedWidth = width / layout.totalColumns / layout.nColumns;
     x = columnIx * width / _nColumns;
@@ -69,13 +68,13 @@ function useUnitColor(unit, opts = {}) {
   const { asBackground = true } = opts;
   return React.useMemo(() => {
     if (unit == null || lithMap == null) return null;
-    return colors.getMixedUnitColor(unit, lithMap, inDarkMode, asBackground);
+    return stratigraphyUtils.getMixedUnitColor(unit, lithMap, inDarkMode, asBackground);
   }, [unit?.unit_id, lithMap, inDarkMode, asBackground]);
 }
 function ColoredUnitComponent(props) {
   const backgroundColor = useUnitColor(props.division);
   const patternID = React.useMemo(() => {
-    return resolvers.resolveID(props.division);
+    return stratigraphyUtils.getBestFGDCPatternForUnit(props.division);
   }, [props.division?.unit_id]);
   const fill = columnComponents.useGeologicPattern(patternID);
   return h__default.default(UnitComponent, {
@@ -91,20 +90,20 @@ function useUnitColorByEnvironment(unit, opts = {}) {
   const { asBackground = true } = opts;
   return React.useMemo(() => {
     if (unit == null || environmentMap == null) return null;
-    let c = colors.getMixedUnitColor(unit, environmentMap, inDarkMode, asBackground, {
+    let c = stratigraphyUtils.getMixedUnitColor(unit, environmentMap, inDarkMode, asBackground, {
       key: "environ",
       id_key: "environ_id"
     });
     if (c != null) {
       return c;
     }
-    return colors.getMixedUnitColor(unit, lithMap, inDarkMode, asBackground);
+    return stratigraphyUtils.getMixedUnitColor(unit, lithMap, inDarkMode, asBackground);
   }, [unit?.unit_id, environmentMap, lithMap, inDarkMode, asBackground]);
 }
 function EnvironmentColoredUnitComponent(props) {
   const backgroundColor = useUnitColorByEnvironment(props.division);
   const patternID = React.useMemo(() => {
-    return resolvers.resolveID(props.division);
+    return stratigraphyUtils.getBestFGDCPatternForUnit(props.division);
   }, [props.division?.unit_id]);
   const fill = columnComponents.useGeologicPattern(patternID);
   return h__default.default(UnitComponent, {
@@ -113,9 +112,6 @@ function EnvironmentColoredUnitComponent(props) {
     ...props
   });
 }
-exports.flattenLithologies = colors.flattenLithologies;
-exports.getMixedColorForData = colors.getMixedColorForData;
-exports.getMixedUnitColor = colors.getMixedUnitColor;
 exports.AnnotatedUnitsColumn = composite.AnnotatedUnitsColumn;
 exports.ColumnNotesProvider = composite.ColumnNotesProvider;
 exports.CompositeUnitComponent = composite.CompositeUnitComponent;

package/dist/units/index.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"index.cjs","sources":["../../src/units/index.ts"],"sourcesContent":["import h from \"@macrostrat/hyper\";\nimport {\n  LithologyColumn,\n  useGeologicPattern,\n} from \"@macrostrat/column-components\";\nimport { UnitNamesColumn } from \"./names\";\nimport { ICompositeUnitProps } from \"./composite\";\nimport { UnitBoxes, UnitProps } from \"./boxes\";\nimport { useColumnLayout } from \"@macrostrat/column-components\";\nimport { useInDarkMode } from \"@macrostrat/ui-components\";\nimport { getMixedUnitColor } from \"./colors\";\nimport { TrackedLabeledUnit } from \"./composite\";\nimport { useEnvironments, useLithologies } from \"@macrostrat/data-provider\";\nimport { useMemo } from \"react\";\nimport { resolveID } from \"./resolvers\";\nimport { BaseUnit, Lithology } from \"@macrostrat/api-types\";\nimport { UnitWithLayoutParameters } from \"../prepare-units/helpers.ts\";\n\nexport * from \"./composite\";\nexport * from \"./types\";\nexport * from \"./colors\";\n\nexport function UnitsColumn({ width = 100 }) {\n  /*\n  A column showing units with USGS color fill\n  */\n  return h(LithologyColumn, { width }, h(UnitBoxes));\n}\n\nexport function SimpleUnitsColumn(props: ICompositeUnitProps) {\n  /*\n  A column with units and names either\n  overlapping or offset to the right\n  */\n  const { columnWidth, width, gutterWidth = 0, labelOffset = 30 } = props;\n\n  return h([\n    h(UnitsColumn, {\n      width: columnWidth,\n    }),\n    h(UnitNamesColumn, {\n      transform: `translate(${columnWidth + gutterWidth})`,\n      paddingLeft: labelOffset,\n      width: width - columnWidth - gutterWidth,\n    }),\n  ]);\n}\n\nexport function BasicUnitComponent({ division, ...rest }) {\n  /** A unit that allows directly setting colors and patterns. */\n\n  return h(UnitComponent, {\n    division,\n    ...rest,\n    backgroundColor: division.color,\n    patternID: division.patternID,\n  });\n}\n\ninterface UnitComponentProps<T extends BaseUnit> {\n  division: UnitWithLayoutParameters<T> | T;\n  nColumns: number;\n  width?: number;\n}\n\nexport function UnitComponent<T extends BaseUnit>({\n  division,\n  nColumns = 2,\n  ...rest\n}: UnitComponentProps<T>) {\n  const width = rest.width ?? useColumnLayout()?.width;\n\n  let _nColumns = nColumns;\n  if (isNaN(_nColumns)) {\n    _nColumns = 2;\n  }\n  let columnIx = 0;\n  let x = 0;\n\n  let reducedWidth = _nColumns;\n  if (\"layout\" in division) {\n    const layout = division.layout;\n    _nColumns = Math.min(_nColumns, layout.totalColumns);\n    columnIx = layout.column;\n    reducedWidth = width / layout.totalColumns / layout.nColumns;\n    x = (columnIx * width) / _nColumns;\n  }\n  return h(TrackedLabeledUnit, {\n    division,\n    ...rest,\n    width: reducedWidth,\n    x,\n  });\n}\n\ninterface UnitColorOptions {\n  asBackground?: boolean;\n}\n\nexport function useUnitColor(unit, opts: UnitColorOptions = {}): string | null {\n  /** Get the color for a unit based on its lithology */\n  const lithMap = useLithologies();\n  const inDarkMode = useInDarkMode();\n  const { asBackground = true } = opts;\n\n  return useMemo(() => {\n    if (unit == null || lithMap == null) return null;\n    return getMixedUnitColor(unit, lithMap, inDarkMode, asBackground);\n  }, [unit?.unit_id, lithMap, inDarkMode, asBackground]);\n}\n\nexport function ColoredUnitComponent(props) {\n  /** A unit component that is colored using a mixture of lithologies.\n   * This is a separate component because it depends on more providers/contexts to determine coloring. */\n  const backgroundColor = useUnitColor(props.division);\n\n  const patternID = useMemo(() => {\n    return resolveID(props.division); // ?? getPatternID(props.division.lith, lithMap);\n  }, [props.division?.unit_id]);\n\n  const fill = useGeologicPattern(patternID);\n\n  return h(UnitComponent, {\n    fill,\n    backgroundColor,\n    ...props,\n  });\n}\n\nexport function useUnitColorByEnvironment(\n  unit,\n  opts: UnitColorOptions = {},\n): string | null {\n  /** Get the color for a unit based on its lithology */\n  const environmentMap = useEnvironments();\n  const lithMap = useLithologies();\n  const inDarkMode = useInDarkMode();\n  const { asBackground = true } = opts;\n\n  return useMemo(() => {\n    if (unit == null || environmentMap == null) return null;\n    let c = getMixedUnitColor(unit, environmentMap, inDarkMode, asBackground, {\n      key: \"environ\",\n      id_key: \"environ_id\",\n    });\n    if (c != null) {\n      return c;\n    }\n    // Fallback to lithology color if no environment color is found\n    return getMixedUnitColor(unit, lithMap, inDarkMode, asBackground);\n  }, [unit?.unit_id, environmentMap, lithMap, inDarkMode, asBackground]);\n}\n\nexport function EnvironmentColoredUnitComponent(props) {\n  /** A unit component that is colored using a mixture of lithologies.\n   * This is a separate component because it depends on more providers/contexts to determine coloring. */\n  const backgroundColor = useUnitColorByEnvironment(props.division);\n\n  const patternID = useMemo(() => {\n    return resolveID(props.division); // ?? getPatternID(props.division.lith, lithMap);\n  }, [props.division?.unit_id]);\n\n  const fill = useGeologicPattern(patternID);\n\n  return h(UnitComponent, {\n    fill,\n    backgroundColor,\n    ...props,\n  });\n}\n\nfunction getPatternID(\n  liths: Array<Lithology>,\n  lithMap: Map<number, Lithology>,\n): string | null {\n  if (lithMap == null || liths == null || liths.length == 0) {\n    return null;\n  }\n  const patternIDs = new Set<string>();\n  for (const lith of liths) {\n    const lithData = lithMap.get(lith.lith_id);\n    if (lithData) {\n      patternIDs.add(`${lithData.fill}`);\n    }\n  }\n  let id = patternIDs.values()[0];\n  if (id == \"0\") return null;\n  return id;\n}\n"],"names":["h","LithologyColumn","UnitBoxes","UnitNamesColumn","useColumnLayout","TrackedLabeledUnit","useLithologies","useInDarkMode","useMemo","getMixedUnitColor","resolveID","useGeologicPattern","useEnvironments"],"mappings":";;;;;;;;;;;;;;AAsBO,SAAS,YAAY,EAAE,QAAQ,OAAO;AAI3C,SAAOA,WAAAA,QAAEC,iBAAAA,iBAAiB,EAAE,SAASD,WAAAA,QAAEE,MAAAA,SAAS,CAAC;AACnD;AAEO,SAAS,kBAAkB,OAA4B;AAK5D,QAAM,EAAE,aAAa,OAAO,cAAc,GAAG,cAAc,OAAO;AAElE,SAAOF,mBAAE;AAAA,IACPA,WAAAA,QAAE,aAAa;AAAA,MACb,OAAO;AAAA,IAAA,CACR;AAAA,IACDA,WAAAA,QAAEG,MAAAA,iBAAiB;AAAA,MACjB,WAAW,aAAa,cAAc,WAAW;AAAA,MACjD,aAAa;AAAA,MACb,OAAO,QAAQ,cAAc;AAAA,IAAA,CAC9B;AAAA,EAAA,CACF;AACH;AAEO,SAAS,mBAAmB,EAAE,UAAU,GAAG,QAAQ;AAGxD,SAAOH,WAAAA,QAAE,eAAe;AAAA,IACtB;AAAA,IACA,GAAG;AAAA,IACH,iBAAiB,SAAS;AAAA,IAC1B,WAAW,SAAS;AAAA,EAAA,CACrB;AACH;AAQO,SAAS,cAAkC;AAAA,EAChD;AAAA,EACA,WAAW;AAAA,EACX,GAAG;AACL,GAA0B;AACxB,QAAM,QAAQ,KAAK,SAASI,iBAAAA,gBAAA,GAAmB;AAE/C,MAAI,YAAY;AAChB,MAAI,MAAM,SAAS,GAAG;AACpB,gBAAY;AAAA,EACd;AACA,MAAI,WAAW;AACf,MAAI,IAAI;AAER,MAAI,eAAe;AACnB,MAAI,YAAY,UAAU;AACxB,UAAM,SAAS,SAAS;AACxB,gBAAY,KAAK,IAAI,WAAW,OAAO,YAAY;AACnD,eAAW,OAAO;AAClB,mBAAe,QAAQ,OAAO,eAAe,OAAO;AACpD,QAAK,WAAW,QAAS;AAAA,EAC3B;AACA,SAAOJ,WAAAA,QAAEK,UAAAA,oBAAoB;AAAA,IAC3B;AAAA,IACA,GAAG;AAAA,IACH,OAAO;AAAA,IACP;AAAA,EAAA,CACD;AACH;AAMO,SAAS,aAAa,MAAM,OAAyB,IAAmB;AAE7E,QAAM,UAAUC,aAAAA,eAAA;AAChB,QAAM,aAAaC,aAAAA,cAAA;AACnB,QAAM,EAAE,eAAe,KAAA,IAAS;AAEhC,SAAOC,MAAAA,QAAQ,MAAM;AACnB,QAAI,QAAQ,QAAQ,WAAW,KAAM,QAAO;AAC5C,WAAOC,OAAAA,kBAAkB,MAAM,SAAS,YAAY,YAAY;AAAA,EAClE,GAAG,CAAC,MAAM,SAAS,SAAS,YAAY,YAAY,CAAC;AACvD;AAEO,SAAS,qBAAqB,OAAO;AAG1C,QAAM,kBAAkB,aAAa,MAAM,QAAQ;AAEnD,QAAM,YAAYD,MAAAA,QAAQ,MAAM;AAC9B,WAAOE,UAAAA,UAAU,MAAM,QAAQ;AAAA,EACjC,GAAG,CAAC,MAAM,UAAU,OAAO,CAAC;AAE5B,QAAM,OAAOC,iBAAAA,mBAAmB,SAAS;AAEzC,SAAOX,WAAAA,QAAE,eAAe;AAAA,IACtB;AAAA,IACA;AAAA,IACA,GAAG;AAAA,EAAA,CACJ;AACH;AAEO,SAAS,0BACd,MACA,OAAyB,IACV;AAEf,QAAM,iBAAiBY,aAAAA,gBAAA;AACvB,QAAM,UAAUN,aAAAA,eAAA;AAChB,QAAM,aAAaC,aAAAA,cAAA;AACnB,QAAM,EAAE,eAAe,KAAA,IAAS;AAEhC,SAAOC,MAAAA,QAAQ,MAAM;AACnB,QAAI,QAAQ,QAAQ,kBAAkB,KAAM,QAAO;AACnD,QAAI,IAAIC,OAAAA,kBAAkB,MAAM,gBAAgB,YAAY,cAAc;AAAA,MACxE,KAAK;AAAA,MACL,QAAQ;AAAA,IAAA,CACT;AACD,QAAI,KAAK,MAAM;AACb,aAAO;AAAA,IACT;AAEA,WAAOA,OAAAA,kBAAkB,MAAM,SAAS,YAAY,YAAY;AAAA,EAClE,GAAG,CAAC,MAAM,SAAS,gBAAgB,SAAS,YAAY,YAAY,CAAC;AACvE;AAEO,SAAS,gCAAgC,OAAO;AAGrD,QAAM,kBAAkB,0BAA0B,MAAM,QAAQ;AAEhE,QAAM,YAAYD,MAAAA,QAAQ,MAAM;AAC9B,WAAOE,UAAAA,UAAU,MAAM,QAAQ;AAAA,EACjC,GAAG,CAAC,MAAM,UAAU,OAAO,CAAC;AAE5B,QAAM,OAAOC,iBAAAA,mBAAmB,SAAS;AAEzC,SAAOX,WAAAA,QAAE,eAAe;AAAA,IACtB;AAAA,IACA;AAAA,IACA,GAAG;AAAA,EAAA,CACJ;AACH;;;;;;;;;;;;;;;;;;;"}
+{"version":3,"file":"index.cjs","sources":["../../src/units/index.ts"],"sourcesContent":["import h from \"@macrostrat/hyper\";\nimport {\n  LithologyColumn,\n  useGeologicPattern,\n} from \"@macrostrat/column-components\";\nimport { UnitNamesColumn } from \"./names\";\nimport { ICompositeUnitProps } from \"./composite\";\nimport { UnitBoxes } from \"./boxes\";\nimport { useColumnLayout } from \"@macrostrat/column-components\";\nimport { useInDarkMode } from \"@macrostrat/ui-components\";\nimport {\n  getBestFGDCPatternForUnit,\n  getMixedUnitColor,\n} from \"@macrostrat/stratigraphy-utils\";\nimport { TrackedLabeledUnit } from \"./composite\";\nimport { useEnvironments, useLithologies } from \"@macrostrat/data-provider\";\nimport { useMemo } from \"react\";\nimport { BaseUnit, Lithology } from \"@macrostrat/api-types\";\nimport { UnitWithLayoutParameters } from \"../prepare-units/helpers.ts\";\n\nexport * from \"./composite\";\nexport * from \"./types\";\n\nexport function UnitsColumn({ width = 100 }) {\n  /*\n  A column showing units with USGS color fill\n  */\n  return h(LithologyColumn, { width }, h(UnitBoxes));\n}\n\nexport function SimpleUnitsColumn(props: ICompositeUnitProps) {\n  /*\n  A column with units and names either\n  overlapping or offset to the right\n  */\n  const { columnWidth, width, gutterWidth = 0, labelOffset = 30 } = props;\n\n  return h([\n    h(UnitsColumn, {\n      width: columnWidth,\n    }),\n    h(UnitNamesColumn, {\n      transform: `translate(${columnWidth + gutterWidth})`,\n      paddingLeft: labelOffset,\n      width: width - columnWidth - gutterWidth,\n    }),\n  ]);\n}\n\nexport function BasicUnitComponent({ division, ...rest }) {\n  /** A unit that allows directly setting colors and patterns. */\n\n  return h(UnitComponent, {\n    division,\n    ...rest,\n    backgroundColor: division.color,\n    patternID: division.patternID,\n  });\n}\n\ninterface UnitComponentProps<T extends BaseUnit> {\n  division: UnitWithLayoutParameters<T> | T;\n  nColumns: number;\n  width?: number;\n}\n\nexport function UnitComponent<T extends BaseUnit>({\n  division,\n  nColumns = 2,\n  ...rest\n}: UnitComponentProps<T>) {\n  const width = rest.width ?? useColumnLayout()?.width;\n\n  let _nColumns = nColumns;\n  if (isNaN(_nColumns)) {\n    _nColumns = 2;\n  }\n  let columnIx = 0;\n  let x = 0;\n\n  let reducedWidth = _nColumns;\n  if (\"layout\" in division) {\n    const layout = division.layout;\n    _nColumns = layout.totalColumns;\n    columnIx = layout.column;\n    reducedWidth = width / layout.totalColumns / layout.nColumns;\n    x = (columnIx * width) / _nColumns;\n  }\n\n  return h(TrackedLabeledUnit, {\n    division,\n    ...rest,\n    width: reducedWidth,\n    x,\n  });\n}\n\ninterface UnitColorOptions {\n  asBackground?: boolean;\n}\n\nexport function useUnitColor(unit, opts: UnitColorOptions = {}): string | null {\n  /** Get the color for a unit based on its lithology */\n  const lithMap = useLithologies();\n  const inDarkMode = useInDarkMode();\n  const { asBackground = true } = opts;\n\n  return useMemo(() => {\n    if (unit == null || lithMap == null) return null;\n    return getMixedUnitColor(unit, lithMap, inDarkMode, asBackground);\n  }, [unit?.unit_id, lithMap, inDarkMode, asBackground]);\n}\n\nexport function ColoredUnitComponent(props) {\n  /** A unit component that is colored using a mixture of lithologies.\n   * This is a separate component because it depends on more providers/contexts to determine coloring. */\n  const backgroundColor = useUnitColor(props.division);\n\n  const patternID = useMemo(() => {\n    return getBestFGDCPatternForUnit(props.division); // ?? getPatternID(props.division.lith, lithMap);\n  }, [props.division?.unit_id]);\n\n  const fill = useGeologicPattern(patternID);\n\n  return h(UnitComponent, {\n    fill,\n    backgroundColor,\n    ...props,\n  });\n}\n\nexport function useUnitColorByEnvironment(\n  unit,\n  opts: UnitColorOptions = {},\n): string | null {\n  /** Get the color for a unit based on its lithology */\n  const environmentMap = useEnvironments();\n  const lithMap = useLithologies();\n  const inDarkMode = useInDarkMode();\n  const { asBackground = true } = opts;\n\n  return useMemo(() => {\n    if (unit == null || environmentMap == null) return null;\n    let c = getMixedUnitColor(unit, environmentMap, inDarkMode, asBackground, {\n      key: \"environ\",\n      id_key: \"environ_id\",\n    });\n    if (c != null) {\n      return c;\n    }\n    // Fallback to lithology color if no environment color is found\n    return getMixedUnitColor(unit, lithMap, inDarkMode, asBackground);\n  }, [unit?.unit_id, environmentMap, lithMap, inDarkMode, asBackground]);\n}\n\nexport function EnvironmentColoredUnitComponent(props) {\n  /** A unit component that is colored using a mixture of lithologies.\n   * This is a separate component because it depends on more providers/contexts to determine coloring. */\n  const backgroundColor = useUnitColorByEnvironment(props.division);\n\n  const patternID = useMemo(() => {\n    return getBestFGDCPatternForUnit(props.division); // ?? getPatternID(props.division.lith, lithMap);\n  }, [props.division?.unit_id]);\n\n  const fill = useGeologicPattern(patternID);\n\n  return h(UnitComponent, {\n    fill,\n    backgroundColor,\n    ...props,\n  });\n}\n"],"names":["h","LithologyColumn","UnitBoxes","UnitNamesColumn","useColumnLayout","TrackedLabeledUnit","useLithologies","useInDarkMode","useMemo","getMixedUnitColor","getBestFGDCPatternForUnit","useGeologicPattern","useEnvironments"],"mappings":"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"}

package/dist/units/index.d.ts

@@ -3,7 +3,6 @@ import { BaseUnit } from '@macrostrat/api-types';
 import { UnitWithLayoutParameters } from '../prepare-units/helpers.ts';
 export * from './composite';
 export * from './types';
-export * from './colors';
 export declare function UnitsColumn({ width }: {
     width?: number | undefined;
 }): import('react').FunctionComponentElement<import('@macrostrat/column-components').LithologyColumnProps>;