@macrostrat/column-views 3.9.0 → 3.11.0

package/dist/index.js

@@ -5,26 +5,20 @@ 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 { AgeWindowTag, intervalShortFromTimescale } from "./unit-details/age-window-tag.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 +28,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 {
@@ -42,9 +35,9 @@ export {
   AgeField,
   AgeLabel,
   AgeRange,
+  AgeWindowTag,
   AnnotatedUnitsColumn,
   ApproximateHeightAxis,
-  BaseColumnsLayer,
   BaseMeasurementsColumn,
   BasicUnitComponent,
   BoundaryAgeModelOverlay,
@@ -52,28 +45,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 +63,6 @@ export {
   HeightMethod,
   HybridScaleType,
   Identifier,
-  InsetMap,
   IntervalProportions,
   IsotopesColumn,
   IsotopesDataset,
@@ -92,18 +72,14 @@ export {
   MacrostratColumnDataProvider,
   MacrostratColumnProvider,
   MacrostratColumnStateProvider,
-  MacrostratUnitsOverlay,
   MeasurementDataContext,
   MeasurementDataProvider,
-  MeasurementsLayer,
   MergeSectionsMode,
   PBDBFossilsColumn,
   PBDBOccurrencesMatrix,
   ReferencesField,
-  ResizableMapFrame,
   SGPMeasurementsColumn,
   SectionLabelsColumn,
-  SelectedColumnOverlay,
   SimpleUnitsColumn,
   StratNameField,
   ThicknessField,
@@ -123,21 +99,17 @@ export {
   VerticalAxisLabel,
   agesOverlap,
   allowUnitSelectionAtom,
-  buildColumnsStyle,
-  buildUnitsStyle,
   columnUnitsAtom,
   columnUnitsMapAtom,
   createUnitSorter,
   ensureArray,
   ensureRealFloat,
-  flattenLithologies,
   getAge,
   getAgeRange,
-  getMixedColorForData,
-  getMixedUnitColor,
   getPositionWithinUnit,
   getUnitHeightRange,
   groupNotesByPixelDistance,
+  intervalShortFromTimescale,
   mergeHeightRanges,
   parseLineFromString,
   prepareColumnUnits,
@@ -150,12 +122,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/unit-details/age-window-tag.cjs

@@ -0,0 +1,68 @@
+"use strict";
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const core = require("@blueprintjs/core");
+const dataComponents = require("@macrostrat/data-components");
+const classNames = require("classnames");
+const ageWindowTag_module = require("./age-window-tag.module.sass.cjs");
+const ageRange = require("./age-range.cjs");
+const _interopDefault = (e) => e && e.__esModule ? e : { default: e };
+const classNames__default = /* @__PURE__ */ _interopDefault(classNames);
+function intervalShortFromTimescale(interval) {
+  return {
+    id: interval.int_id ?? interval.oid,
+    name: interval.nam,
+    color: interval.col,
+    b_age: interval.eag,
+    t_age: interval.lag,
+    rank: interval.lvl
+  };
+}
+function AgeWindowTag(props) {
+  const {
+    interval = null,
+    window = null,
+    onClear,
+    size = dataComponents.TagSize.Small,
+    className
+  } = props;
+  if (interval == null && window == null) return null;
+  let tag = null;
+  if (interval == null) {
+    tag = ageWindowTag_module(dataComponents.Tag, { size, name: ageWindowTag_module(ageRange.AgeRange, { data: window }) });
+  } else if (window == null || windowMatchesInterval(window, interval)) {
+    tag = ageWindowTag_module(dataComponents.IntervalTag, { interval, showAgeRange: true, size });
+  } else {
+    tag = ageWindowTag_module(RefinedIntervalTag, { interval, window, size });
+  }
+  return ageWindowTag_module("span.age-window-tag", { className: classNames__default.default(className) }, [
+    tag,
+    ageWindowTag_module.if(onClear != null)(core.Button, {
+      className: "clear-button",
+      icon: "cross",
+      minimal: true,
+      small: true,
+      title: "Clear",
+      onClick: onClear
+    })
+  ]);
+}
+function RefinedIntervalTag({
+  interval,
+  window,
+  size
+}) {
+  const interaction = dataComponents.useInteractionProps({ int_id: interval.id });
+  return ageWindowTag_module(dataComponents.Tag, {
+    ...interaction,
+    size,
+    name: interval.name,
+    color: interval.color,
+    details: ageWindowTag_module(ageRange.AgeRange, { data: window })
+  });
+}
+function windowMatchesInterval(window, interval) {
+  return window.t_age === interval.t_age && window.b_age === interval.b_age;
+}
+exports.AgeWindowTag = AgeWindowTag;
+exports.intervalShortFromTimescale = intervalShortFromTimescale;
+//# sourceMappingURL=age-window-tag.cjs.map

package/dist/unit-details/age-window-tag.cjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"age-window-tag.cjs","sources":["../../src/unit-details/age-window-tag.ts"],"sourcesContent":["import { Button } from \"@blueprintjs/core\";\nimport {\n  IntervalShort,\n  IntervalTag,\n  Tag,\n  TagSize,\n  useInteractionProps,\n} from \"@macrostrat/data-components\";\nimport type { Interval } from \"@macrostrat/timescale\";\nimport classNames from \"classnames\";\nimport h from \"./age-window-tag.module.sass\";\nimport { AgeRange } from \"./age-range\";\nimport type { AgeWindow } from \"../animated-age-window\";\n\n/** Adapt a timescale `Interval` (as delivered by a `Timescale` click, with\n * `eag`/`lag`/`nam`/`col`) to the `IntervalShort` shape the tag components\n * take. The id prefers the Macrostrat `int_id` when the interval tree was built\n * from the API, falling back to the interval's own `oid`. */\nexport function intervalShortFromTimescale(interval: Interval): IntervalShort {\n  return {\n    id: interval.int_id ?? interval.oid,\n    name: interval.nam,\n    color: interval.col,\n    b_age: interval.eag,\n    t_age: interval.lag,\n    rank: interval.lvl,\n  };\n}\n\nexport interface AgeWindowTagProps {\n  /** The interval the window was set from, if any. */\n  interval?: IntervalShort | null;\n  /** The rendered window. When it differs from the interval's own span (a\n   * refined window) it is shown in place of the interval's range. */\n  window?: AgeWindow | null;\n  /** Renders a clear button when given. */\n  onClear?: () => void;\n  size?: TagSize;\n  className?: string;\n}\n\n/** A compact, clearable indicator of the age window a column or correlation\n * chart is focused on — an interval tag (linking to the interval, with its\n * range) or a bare age range. Renders nothing without an interval or window,\n * so it can live permanently in a chart's `axisTopContent`. */\nexport function AgeWindowTag(props: AgeWindowTagProps) {\n  const {\n    interval = null,\n    window = null,\n    onClear,\n    size = TagSize.Small,\n    className,\n  } = props;\n  if (interval == null && window == null) return null;\n\n  let tag = null;\n  if (interval == null) {\n    tag = h(Tag, { size, name: h(AgeRange, { data: window }) });\n  } else if (window == null || windowMatchesInterval(window, interval)) {\n    tag = h(IntervalTag, { interval, showAgeRange: true, size });\n  } else {\n    tag = h(RefinedIntervalTag, { interval, window, size });\n  }\n\n  return h(\"span.age-window-tag\", { className: classNames(className) }, [\n    tag,\n    h.if(onClear != null)(Button, {\n      className: \"clear-button\",\n      icon: \"cross\",\n      minimal: true,\n      small: true,\n      title: \"Clear\",\n      onClick: onClear,\n    }),\n  ]);\n}\n\nfunction RefinedIntervalTag({\n  interval,\n  window,\n  size,\n}: {\n  interval: IntervalShort;\n  window: AgeWindow;\n  size: TagSize;\n}) {\n  const interaction = useInteractionProps({ int_id: interval.id });\n  return h(Tag, {\n    ...interaction,\n    size,\n    name: interval.name,\n    color: interval.color,\n    details: h(AgeRange, { data: window }),\n  });\n}\n\nfunction windowMatchesInterval(\n  window: AgeWindow,\n  interval: IntervalShort,\n): boolean {\n  return window.t_age === interval.t_age && window.b_age === interval.b_age;\n}\n"],"names":["TagSize","h","Tag","AgeRange","IntervalTag","classNames","Button","useInteractionProps"],"mappings":";;;;;;;;;AAkBO,SAAS,2BAA2B,UAAmC;AAC5E,SAAO;AAAA,IACL,IAAI,SAAS,UAAU,SAAS;AAAA,IAChC,MAAM,SAAS;AAAA,IACf,OAAO,SAAS;AAAA,IAChB,OAAO,SAAS;AAAA,IAChB,OAAO,SAAS;AAAA,IAChB,MAAM,SAAS;AAAA,EAAA;AAEnB;AAkBO,SAAS,aAAa,OAA0B;AACrD,QAAM;AAAA,IACJ,WAAW;AAAA,IACX,SAAS;AAAA,IACT;AAAA,IACA,OAAOA,eAAAA,QAAQ;AAAA,IACf;AAAA,EAAA,IACE;AACJ,MAAI,YAAY,QAAQ,UAAU,KAAM,QAAO;AAE/C,MAAI,MAAM;AACV,MAAI,YAAY,MAAM;AACpB,UAAMC,oBAAEC,oBAAK,EAAE,MAAM,MAAMD,oBAAEE,SAAAA,UAAU,EAAE,MAAM,OAAA,CAAQ,EAAA,CAAG;AAAA,EAC5D,WAAW,UAAU,QAAQ,sBAAsB,QAAQ,QAAQ,GAAG;AACpE,UAAMF,oBAAEG,4BAAa,EAAE,UAAU,cAAc,MAAM,MAAM;AAAA,EAC7D,OAAO;AACL,UAAMH,oBAAE,oBAAoB,EAAE,UAAU,QAAQ,MAAM;AAAA,EACxD;AAEA,SAAOA,oBAAE,uBAAuB,EAAE,WAAWI,oBAAAA,QAAW,SAAS,KAAK;AAAA,IACpE;AAAA,IACAJ,oBAAE,GAAG,WAAW,IAAI,EAAEK,KAAAA,QAAQ;AAAA,MAC5B,WAAW;AAAA,MACX,MAAM;AAAA,MACN,SAAS;AAAA,MACT,OAAO;AAAA,MACP,OAAO;AAAA,MACP,SAAS;AAAA,IAAA,CACV;AAAA,EAAA,CACF;AACH;AAEA,SAAS,mBAAmB;AAAA,EAC1B;AAAA,EACA;AAAA,EACA;AACF,GAIG;AACD,QAAM,cAAcC,eAAAA,oBAAoB,EAAE,QAAQ,SAAS,IAAI;AAC/D,SAAON,oBAAEC,eAAAA,KAAK;AAAA,IACZ,GAAG;AAAA,IACH;AAAA,IACA,MAAM,SAAS;AAAA,IACf,OAAO,SAAS;AAAA,IAChB,SAASD,oBAAEE,SAAAA,UAAU,EAAE,MAAM,QAAQ;AAAA,EAAA,CACtC;AACH;AAEA,SAAS,sBACP,QACA,UACS;AACT,SAAO,OAAO,UAAU,SAAS,SAAS,OAAO,UAAU,SAAS;AACtE;;;"}

package/dist/unit-details/age-window-tag.d.ts

@@ -0,0 +1,26 @@
+import { IntervalShort, TagSize } from '@macrostrat/data-components';
+import { Interval } from '@macrostrat/timescale';
+import { AgeWindow } from '../animated-age-window';
+/** Adapt a timescale `Interval` (as delivered by a `Timescale` click, with
+ * `eag`/`lag`/`nam`/`col`) to the `IntervalShort` shape the tag components
+ * take. The id prefers the Macrostrat `int_id` when the interval tree was built
+ * from the API, falling back to the interval's own `oid`. */
+export declare function intervalShortFromTimescale(interval: Interval): IntervalShort;
+export interface AgeWindowTagProps {
+    /** The interval the window was set from, if any. */
+    interval?: IntervalShort | null;
+    /** The rendered window. When it differs from the interval's own span (a
+     * refined window) it is shown in place of the interval's range. */
+    window?: AgeWindow | null;
+    /** Renders a clear button when given. */
+    onClear?: () => void;
+    size?: TagSize;
+    className?: string;
+}
+/** A compact, clearable indicator of the age window a column or correlation
+ * chart is focused on — an interval tag (linking to the interval, with its
+ * range) or a bare age range. Renders nothing without an interval or window,
+ * so it can live permanently in a chart's `axisTopContent`. */
+export declare function AgeWindowTag(props: AgeWindowTagProps): import('react').ReactElement<{
+    className: string;
+}, string | import('react').JSXElementConstructor<any>> | null;

package/dist/unit-details/age-window-tag.js

@@ -0,0 +1,66 @@
+import { Button } from "@blueprintjs/core";
+import { TagSize, Tag, IntervalTag, useInteractionProps } from "@macrostrat/data-components";
+import classNames from "classnames";
+import h from "./age-window-tag.module.sass.js";
+import { AgeRange } from "./age-range.js";
+function intervalShortFromTimescale(interval) {
+  return {
+    id: interval.int_id ?? interval.oid,
+    name: interval.nam,
+    color: interval.col,
+    b_age: interval.eag,
+    t_age: interval.lag,
+    rank: interval.lvl
+  };
+}
+function AgeWindowTag(props) {
+  const {
+    interval = null,
+    window = null,
+    onClear,
+    size = TagSize.Small,
+    className
+  } = props;
+  if (interval == null && window == null) return null;
+  let tag = null;
+  if (interval == null) {
+    tag = h(Tag, { size, name: h(AgeRange, { data: window }) });
+  } else if (window == null || windowMatchesInterval(window, interval)) {
+    tag = h(IntervalTag, { interval, showAgeRange: true, size });
+  } else {
+    tag = h(RefinedIntervalTag, { interval, window, size });
+  }
+  return h("span.age-window-tag", { className: classNames(className) }, [
+    tag,
+    h.if(onClear != null)(Button, {
+      className: "clear-button",
+      icon: "cross",
+      minimal: true,
+      small: true,
+      title: "Clear",
+      onClick: onClear
+    })
+  ]);
+}
+function RefinedIntervalTag({
+  interval,
+  window,
+  size
+}) {
+  const interaction = useInteractionProps({ int_id: interval.id });
+  return h(Tag, {
+    ...interaction,
+    size,
+    name: interval.name,
+    color: interval.color,
+    details: h(AgeRange, { data: window })
+  });
+}
+function windowMatchesInterval(window, interval) {
+  return window.t_age === interval.t_age && window.b_age === interval.b_age;
+}
+export {
+  AgeWindowTag,
+  intervalShortFromTimescale
+};
+//# sourceMappingURL=age-window-tag.js.map

package/dist/unit-details/age-window-tag.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"age-window-tag.js","sources":["../../src/unit-details/age-window-tag.ts"],"sourcesContent":["import { Button } from \"@blueprintjs/core\";\nimport {\n  IntervalShort,\n  IntervalTag,\n  Tag,\n  TagSize,\n  useInteractionProps,\n} from \"@macrostrat/data-components\";\nimport type { Interval } from \"@macrostrat/timescale\";\nimport classNames from \"classnames\";\nimport h from \"./age-window-tag.module.sass\";\nimport { AgeRange } from \"./age-range\";\nimport type { AgeWindow } from \"../animated-age-window\";\n\n/** Adapt a timescale `Interval` (as delivered by a `Timescale` click, with\n * `eag`/`lag`/`nam`/`col`) to the `IntervalShort` shape the tag components\n * take. The id prefers the Macrostrat `int_id` when the interval tree was built\n * from the API, falling back to the interval's own `oid`. */\nexport function intervalShortFromTimescale(interval: Interval): IntervalShort {\n  return {\n    id: interval.int_id ?? interval.oid,\n    name: interval.nam,\n    color: interval.col,\n    b_age: interval.eag,\n    t_age: interval.lag,\n    rank: interval.lvl,\n  };\n}\n\nexport interface AgeWindowTagProps {\n  /** The interval the window was set from, if any. */\n  interval?: IntervalShort | null;\n  /** The rendered window. When it differs from the interval's own span (a\n   * refined window) it is shown in place of the interval's range. */\n  window?: AgeWindow | null;\n  /** Renders a clear button when given. */\n  onClear?: () => void;\n  size?: TagSize;\n  className?: string;\n}\n\n/** A compact, clearable indicator of the age window a column or correlation\n * chart is focused on — an interval tag (linking to the interval, with its\n * range) or a bare age range. Renders nothing without an interval or window,\n * so it can live permanently in a chart's `axisTopContent`. */\nexport function AgeWindowTag(props: AgeWindowTagProps) {\n  const {\n    interval = null,\n    window = null,\n    onClear,\n    size = TagSize.Small,\n    className,\n  } = props;\n  if (interval == null && window == null) return null;\n\n  let tag = null;\n  if (interval == null) {\n    tag = h(Tag, { size, name: h(AgeRange, { data: window }) });\n  } else if (window == null || windowMatchesInterval(window, interval)) {\n    tag = h(IntervalTag, { interval, showAgeRange: true, size });\n  } else {\n    tag = h(RefinedIntervalTag, { interval, window, size });\n  }\n\n  return h(\"span.age-window-tag\", { className: classNames(className) }, [\n    tag,\n    h.if(onClear != null)(Button, {\n      className: \"clear-button\",\n      icon: \"cross\",\n      minimal: true,\n      small: true,\n      title: \"Clear\",\n      onClick: onClear,\n    }),\n  ]);\n}\n\nfunction RefinedIntervalTag({\n  interval,\n  window,\n  size,\n}: {\n  interval: IntervalShort;\n  window: AgeWindow;\n  size: TagSize;\n}) {\n  const interaction = useInteractionProps({ int_id: interval.id });\n  return h(Tag, {\n    ...interaction,\n    size,\n    name: interval.name,\n    color: interval.color,\n    details: h(AgeRange, { data: window }),\n  });\n}\n\nfunction windowMatchesInterval(\n  window: AgeWindow,\n  interval: IntervalShort,\n): boolean {\n  return window.t_age === interval.t_age && window.b_age === interval.b_age;\n}\n"],"names":[],"mappings":";;;;;AAkBO,SAAS,2BAA2B,UAAmC;AAC5E,SAAO;AAAA,IACL,IAAI,SAAS,UAAU,SAAS;AAAA,IAChC,MAAM,SAAS;AAAA,IACf,OAAO,SAAS;AAAA,IAChB,OAAO,SAAS;AAAA,IAChB,OAAO,SAAS;AAAA,IAChB,MAAM,SAAS;AAAA,EAAA;AAEnB;AAkBO,SAAS,aAAa,OAA0B;AACrD,QAAM;AAAA,IACJ,WAAW;AAAA,IACX,SAAS;AAAA,IACT;AAAA,IACA,OAAO,QAAQ;AAAA,IACf;AAAA,EAAA,IACE;AACJ,MAAI,YAAY,QAAQ,UAAU,KAAM,QAAO;AAE/C,MAAI,MAAM;AACV,MAAI,YAAY,MAAM;AACpB,UAAM,EAAE,KAAK,EAAE,MAAM,MAAM,EAAE,UAAU,EAAE,MAAM,OAAA,CAAQ,EAAA,CAAG;AAAA,EAC5D,WAAW,UAAU,QAAQ,sBAAsB,QAAQ,QAAQ,GAAG;AACpE,UAAM,EAAE,aAAa,EAAE,UAAU,cAAc,MAAM,MAAM;AAAA,EAC7D,OAAO;AACL,UAAM,EAAE,oBAAoB,EAAE,UAAU,QAAQ,MAAM;AAAA,EACxD;AAEA,SAAO,EAAE,uBAAuB,EAAE,WAAW,WAAW,SAAS,KAAK;AAAA,IACpE;AAAA,IACA,EAAE,GAAG,WAAW,IAAI,EAAE,QAAQ;AAAA,MAC5B,WAAW;AAAA,MACX,MAAM;AAAA,MACN,SAAS;AAAA,MACT,OAAO;AAAA,MACP,OAAO;AAAA,MACP,SAAS;AAAA,IAAA,CACV;AAAA,EAAA,CACF;AACH;AAEA,SAAS,mBAAmB;AAAA,EAC1B;AAAA,EACA;AAAA,EACA;AACF,GAIG;AACD,QAAM,cAAc,oBAAoB,EAAE,QAAQ,SAAS,IAAI;AAC/D,SAAO,EAAE,KAAK;AAAA,IACZ,GAAG;AAAA,IACH;AAAA,IACA,MAAM,SAAS;AAAA,IACf,OAAO,SAAS;AAAA,IAChB,SAAS,EAAE,UAAU,EAAE,MAAM,QAAQ;AAAA,EAAA,CACtC;AACH;AAEA,SAAS,sBACP,QACA,UACS;AACT,SAAO,OAAO,UAAU,SAAS,SAAS,OAAO,UAAU,SAAS;AACtE;"}

package/dist/unit-details/age-window-tag.module.sass.cjs

@@ -0,0 +1,12 @@
+"use strict";
+const h$1 = require("@macrostrat/hyper");
+const _interopDefault = (e) => e && e.__esModule ? e : { default: e };
+const h__default = /* @__PURE__ */ _interopDefault(h$1);
+const styles = {
+  "age-window-tag": "_age-window-tag_1tskh_1",
+  "clear-button": "_clear-button_1tskh_8"
+};
+let h = h__default.default.styled(styles);
+Object.assign(h, styles);
+module.exports = h;
+//# sourceMappingURL=age-window-tag.module.sass.cjs.map

package/dist/unit-details/age-window-tag.module.sass.cjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"age-window-tag.module.sass.cjs","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;"}

package/dist/unit-details/age-window-tag.module.sass.js

@@ -0,0 +1,11 @@
+import h$1 from "@macrostrat/hyper";
+const styles = {
+  "age-window-tag": "_age-window-tag_1tskh_1",
+  "clear-button": "_clear-button_1tskh_8"
+};
+let h = h$1.styled(styles);
+Object.assign(h, styles);
+export {
+  h as default
+};
+//# sourceMappingURL=age-window-tag.module.sass.js.map

package/dist/unit-details/age-window-tag.module.sass.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"age-window-tag.module.sass.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;"}

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

@@ -2,5 +2,6 @@ export * from './panel';
 export * from './popover';
 export * from './modal-panel';
 export * from './age-range';
+export * from './age-window-tag';
 export * from './strat-names';
 export { ClickableText, Identifier, UnitIdentifier, } from '@macrostrat/data-components';

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":"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"}

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;