@macrostrat/column-views 3.8.0 → 3.10.0

package/dist/prepare-units/index.js

@@ -1,7 +1,7 @@
 import { preprocessSectionUnit, getSectionPosRange, getSectionAgeRange, groupUnitsIntoSectionsBySectionID, groupUnitsIntoSectionsByOverlap, mergeOverlappingSections, preprocessUnits } from "./helpers.js";
 import { ColumnAxisType } from "@macrostrat/column-components";
 import { useMemo } from "react";
-import { computeSectionHeights, collapseUnconformitiesByPixelHeight, finalizeSectionHeights } from "./composite-scale.js";
+import { computeSectionHeights, collapseUnconformitiesByPixelHeight, resolveWindowScales, padWindowByPixels, trimSectionsToWindow, finalizeSectionHeights } from "./composite-scale.js";
 import { MergeSectionsMode, agesOverlap, unitsOverlap } from "./utils.js";
 import { createUnitSorter, ensureArray, ensureRealFloat, getPositionWithinUnit, getUnitHeightRange } from "./utils.js";
 function usePreparedColumnUnits(data, options) {
@@ -17,7 +17,8 @@ function prepareColumnUnits(units, options) {
     unconformityHeight,
     collapseSmallUnconformities = false,
     hybridScale,
-    scale
+    scale,
+    windowPadding = 0
   } = options;
   let _totalHeight = null;
   if (scale != null) {
@@ -32,14 +33,17 @@ function prepareColumnUnits(units, options) {
       _totalHeight = Math.abs(scale(b_pos) - scale(t_pos));
     }
   }
+  const clipBeforeLayout = axisType != ColumnAxisType.AGE || hybridScale != null || scale != null;
   let units1 = units.map(preprocessSectionUnit);
-  units1 = units1.filter((d) => {
-    if (axisType == ColumnAxisType.AGE) {
-      return agesOverlap(d, { t_age, b_age });
-    } else {
-      return unitsOverlap(d, { t_pos, b_pos }, axisType);
-    }
-  });
+  if (clipBeforeLayout) {
+    units1 = units1.filter((d) => {
+      if (axisType == ColumnAxisType.AGE) {
+        return agesOverlap(d, { t_age, b_age });
+      } else {
+        return unitsOverlap(d, { t_pos, b_pos }, axisType);
+      }
+    });
+  }
   let mergeMode = mergeSections;
   let sections0;
   if (mergeMode == MergeSectionsMode.ALL) {
@@ -63,7 +67,7 @@ function prepareColumnUnits(units, options) {
   } else {
     sections0 = groupUnitsIntoSectionsByOverlap(units1, axisType);
   }
-  for (let section of sections0) {
+  for (let section of clipBeforeLayout ? sections0 : []) {
     if (axisType == ColumnAxisType.AGE) {
       section.t_age = Math.max(section.t_age, t_age ?? -Infinity);
       section.b_age = Math.min(section.b_age, b_age ?? Infinity);
@@ -80,7 +84,9 @@ function prepareColumnUnits(units, options) {
     sections = mergeOverlappingSections(sections);
   }
   sections = sections.filter((d) => d != null);
-  let sectionsWithScales = computeSectionHeights(sections, options);
+  const focalWindow = clipBeforeLayout ? null : [b_age ?? Infinity, t_age ?? -Infinity];
+  const layoutOptions = { ...options, visibleWindow: focalWindow };
+  let sectionsWithScales = computeSectionHeights(sections, layoutOptions);
   if (collapseSmallUnconformities && hybridScale == null) {
     let threshold = unconformityHeight ?? 30;
     if (typeof collapseSmallUnconformities == "number") {
@@ -89,14 +95,29 @@ function prepareColumnUnits(units, options) {
     sectionsWithScales = collapseUnconformitiesByPixelHeight(
       sectionsWithScales,
       threshold,
-      options
+      layoutOptions
+    );
+  }
+  if (focalWindow != null && (t_age != null || b_age != null)) {
+    const floor = options.minSectionHeight ?? options.targetUnitHeight ?? 0;
+    const scales = resolveWindowScales(sectionsWithScales, focalWindow, floor);
+    const scaleFor = (section) => scales.get(section) ?? section.scaleInfo.pixelScale;
+    const window = windowPadding > 0 ? padWindowByPixels(
+      sectionsWithScales,
+      focalWindow,
+      windowPadding,
+      scaleFor
+    ) : focalWindow;
+    sectionsWithScales = trimSectionsToWindow(
+      sectionsWithScales,
+      window,
+      scaleFor
     );
   }
   let { totalHeight, sections: sections2 } = finalizeSectionHeights(
     sectionsWithScales,
     unconformityHeight
   );
-  console.log(sections2, "sections");
   const sectionsOut = sections2.map((section) => {
     return {
       ...section,

package/dist/prepare-units/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sources":["../../src/prepare-units/index.ts"],"sourcesContent":["import {\n  getSectionAgeRange,\n  getSectionPosRange,\n  groupUnitsIntoSectionsByOverlap,\n  groupUnitsIntoSectionsBySectionID,\n  mergeOverlappingSections,\n  preprocessSectionUnit,\n  preprocessUnits,\n  UnitWithLayoutHints,\n} from \"./helpers\";\nimport { ColumnAxisType } from \"@macrostrat/column-components\";\nimport { useMemo } from \"react\";\nimport { UnitLong } from \"@macrostrat/api-types\";\nimport {\n  collapseUnconformitiesByPixelHeight,\n  computeSectionHeights,\n  finalizeSectionHeights,\n  type CompositeColumnScale,\n} from \"./composite-scale\";\nimport {\n  agesOverlap,\n  MergeSectionsMode,\n  PrepareColumnOptions,\n  PreparedColumnData,\n  unitsOverlap,\n} from \"./utils\";\nimport { SectionInfo } from \"./types\";\n\nexport * from \"./utils\";\nexport * from \"./types\";\nexport { preprocessUnits };\nexport type { CompositeColumnScale };\n\nexport function usePreparedColumnUnits(\n  data: UnitLong[],\n  options: PrepareColumnOptions,\n): PreparedColumnData {\n  /** This function wraps and memoizes all preparation steps for converting\n   * an array of units from the /units route to a form ready for usage.\n   */\n  return useMemo(() => {\n    return prepareColumnUnits(data, options);\n  }, [data, ...Object.values(options)]);\n}\n\nexport function prepareColumnUnits(\n  units: UnitWithLayoutHints<UnitLong>[],\n  options: PrepareColumnOptions,\n): PreparedColumnData {\n  /** Prepare units for rendering into Macrostrat columns */\n\n  let { t_age, b_age, t_pos, b_pos } = options;\n\n  const {\n    mergeSections = MergeSectionsMode.OVERLAPPING,\n    axisType,\n    unconformityHeight,\n    collapseSmallUnconformities = false,\n    hybridScale,\n    scale,\n  } = options;\n\n  let _totalHeight: number | null = null;\n\n  if (scale != null) {\n    // Set t_age and b_age based on scale domain if not already set\n    const domain = scale.domain();\n    if (axisType == ColumnAxisType.AGE) {\n      if (t_age == null) t_age = Math.min(...domain);\n      if (b_age == null) b_age = Math.max(...domain);\n      _totalHeight = Math.abs(scale(b_age) - scale(t_age));\n    } else {\n      if (t_pos == null) t_pos = Math.min(...domain);\n      if (b_pos == null) b_pos = Math.max(...domain);\n      _totalHeight = Math.abs(scale(b_pos) - scale(t_pos));\n    }\n  }\n\n  // Start by ensuring that ages and positions are numbers\n  // also set up some values for eODP-style columns\n  let units1 = units.map(preprocessSectionUnit);\n\n  /** Prototype filtering to age range */\n  units1 = units1.filter((d) => {\n    // Filter units by t_age and b_age, inclusive\n    if (axisType == ColumnAxisType.AGE) {\n      return agesOverlap(d, { t_age, b_age });\n    } else {\n      return unitsOverlap(d, { t_pos, b_pos } as any, axisType);\n    }\n  });\n\n  let mergeMode = mergeSections;\n  // if (axisType != ColumnAxisType.AGE) {\n  //   // For non-age columns, we always merge sections.\n  //   // This is because the \"groupUnitsIntoSections\" function is not well-defined\n  //   // for non-age columns.\n  //   mergeMode = MergeSectionsMode.ALL;\n  // }\n\n  let sections0: SectionInfo<UnitLong>[];\n  if (mergeMode == MergeSectionsMode.ALL) {\n    // For the \"merge sections\" mode, we need to create a single section\n    const [b_unit_pos, t_unit_pos] = getSectionPosRange(units1, axisType);\n    const [b_unit_age, t_unit_age] = getSectionAgeRange(units1);\n    sections0 = [\n      {\n        section_id: 0,\n        /**\n         * If ages limits are directly specified, use them to define the section bounds.\n         * */\n        t_pos: t_unit_pos,\n        b_pos: b_unit_pos,\n        t_age: t_unit_age,\n        b_age: b_unit_age,\n        units: units1,\n      },\n    ];\n  } else if (axisType == ColumnAxisType.AGE) {\n    sections0 = groupUnitsIntoSectionsBySectionID(units1, axisType);\n  } else {\n    sections0 = groupUnitsIntoSectionsByOverlap(units1, axisType);\n  }\n\n  // Limit sections to the range specified by t_age/b_age or t_pos/b_pos global options\n  for (let section of sections0) {\n    if (axisType == ColumnAxisType.AGE) {\n      section.t_age = Math.max(section.t_age, t_age ?? -Infinity);\n      section.b_age = Math.min(section.b_age, b_age ?? Infinity);\n    } else if (axisType == ColumnAxisType.DEPTH) {\n      section.t_pos = Math.max(section.t_pos, t_pos ?? -Infinity);\n      section.b_pos = Math.min(section.b_pos, b_pos ?? Infinity);\n    } else if (axisType == ColumnAxisType.HEIGHT) {\n      section.t_pos = Math.max(section.t_pos, t_pos ?? -Infinity);\n      section.b_pos = Math.min(section.b_pos, b_pos ?? Infinity);\n    }\n  }\n\n  /** Merging overlapping sections really only makes sense for age/height/depth\n   * columns. Ordinal columns are numbered by section so merging them\n   * results in collisions.\n   */\n  let sections = sections0;\n  if (\n    mergeSections == MergeSectionsMode.OVERLAPPING &&\n    axisType == ColumnAxisType.AGE\n  ) {\n    sections = mergeOverlappingSections(sections);\n  }\n  // Filter out undefined sections just in case\n  sections = sections.filter((d) => d != null);\n\n  // SCALES\n\n  /* Compute pixel scales etc. for sections\n   * We need to do this now to determine which unconformities\n   * are small enough to collapse.\n   */\n  let sectionsWithScales = computeSectionHeights(sections, options);\n\n  if (collapseSmallUnconformities && hybridScale == null) {\n    // Collapse small unconformities in pixel height space\n    // TODO: this doesn't seem to work properly for non-age columns?\n    let threshold = unconformityHeight ?? 30;\n    if (typeof collapseSmallUnconformities == \"number\") {\n      threshold = collapseSmallUnconformities;\n    }\n\n    sectionsWithScales = collapseUnconformitiesByPixelHeight(\n      sectionsWithScales,\n      threshold,\n      options,\n    );\n  }\n\n  /** Prepare section scale information using groups.\n   * Total height is computed from section scales.\n   * */\n  let { totalHeight, sections: sections2 } = finalizeSectionHeights(\n    sectionsWithScales,\n    unconformityHeight,\n  );\n\n  /** For each section, find units that are overlapping.\n   * We do this after merging sections so that we can\n   * handle cases where there are overlapping units across sections\n   * */\n  console.log(sections2, \"sections\");\n\n  const sectionsOut = sections2.map((section) => {\n    return {\n      ...section,\n      units: preprocessUnits(section, axisType),\n    };\n  });\n\n  /** Reconstitute the units so that they are sorted by section and properly enhanced.\n   * This is mostly important so that unit keyboard navigation\n   * predictably selects adjacent units.\n   */\n  const units2 = sectionsOut.reduce((acc, group) => {\n    const { units } = group;\n    for (const unit of units) {\n      acc.push(unit);\n    }\n    return acc;\n  }, []);\n\n  return {\n    units: units2,\n    totalHeight: _totalHeight ?? totalHeight,\n    sections: sectionsOut,\n  };\n}\n"],"names":["units"],"mappings":";;;;;;AAiCO,SAAS,uBACd,MACA,SACoB;AAIpB,SAAO,QAAQ,MAAM;AACnB,WAAO,mBAAmB,MAAM,OAAO;AAAA,EACzC,GAAG,CAAC,MAAM,GAAG,OAAO,OAAO,OAAO,CAAC,CAAC;AACtC;AAEO,SAAS,mBACd,OACA,SACoB;AAGpB,MAAI,EAAE,OAAO,OAAO,OAAO,UAAU;AAErC,QAAM;AAAA,IACJ,gBAAgB,kBAAkB;AAAA,IAClC;AAAA,IACA;AAAA,IACA,8BAA8B;AAAA,IAC9B;AAAA,IACA;AAAA,EAAA,IACE;AAEJ,MAAI,eAA8B;AAElC,MAAI,SAAS,MAAM;AAEjB,UAAM,SAAS,MAAM,OAAA;AACrB,QAAI,YAAY,eAAe,KAAK;AAClC,UAAI,SAAS,KAAM,SAAQ,KAAK,IAAI,GAAG,MAAM;AAC7C,UAAI,SAAS,KAAM,SAAQ,KAAK,IAAI,GAAG,MAAM;AAC7C,qBAAe,KAAK,IAAI,MAAM,KAAK,IAAI,MAAM,KAAK,CAAC;AAAA,IACrD,OAAO;AACL,UAAI,SAAS,KAAM,SAAQ,KAAK,IAAI,GAAG,MAAM;AAC7C,UAAI,SAAS,KAAM,SAAQ,KAAK,IAAI,GAAG,MAAM;AAC7C,qBAAe,KAAK,IAAI,MAAM,KAAK,IAAI,MAAM,KAAK,CAAC;AAAA,IACrD;AAAA,EACF;AAIA,MAAI,SAAS,MAAM,IAAI,qBAAqB;AAG5C,WAAS,OAAO,OAAO,CAAC,MAAM;AAE5B,QAAI,YAAY,eAAe,KAAK;AAClC,aAAO,YAAY,GAAG,EAAE,OAAO,OAAO;AAAA,IACxC,OAAO;AACL,aAAO,aAAa,GAAG,EAAE,OAAO,MAAA,GAAgB,QAAQ;AAAA,IAC1D;AAAA,EACF,CAAC;AAED,MAAI,YAAY;AAQhB,MAAI;AACJ,MAAI,aAAa,kBAAkB,KAAK;AAEtC,UAAM,CAAC,YAAY,UAAU,IAAI,mBAAmB,QAAQ,QAAQ;AACpE,UAAM,CAAC,YAAY,UAAU,IAAI,mBAAmB,MAAM;AAC1D,gBAAY;AAAA,MACV;AAAA,QACE,YAAY;AAAA;AAAA;AAAA;AAAA,QAIZ,OAAO;AAAA,QACP,OAAO;AAAA,QACP,OAAO;AAAA,QACP,OAAO;AAAA,QACP,OAAO;AAAA,MAAA;AAAA,IACT;AAAA,EAEJ,WAAW,YAAY,eAAe,KAAK;AACzC,gBAAY,kCAAkC,QAAQ,QAAQ;AAAA,EAChE,OAAO;AACL,gBAAY,gCAAgC,QAAQ,QAAQ;AAAA,EAC9D;AAGA,WAAS,WAAW,WAAW;AAC7B,QAAI,YAAY,eAAe,KAAK;AAClC,cAAQ,QAAQ,KAAK,IAAI,QAAQ,OAAO,SAAS,SAAS;AAC1D,cAAQ,QAAQ,KAAK,IAAI,QAAQ,OAAO,SAAS,QAAQ;AAAA,IAC3D,WAAW,YAAY,eAAe,OAAO;AAC3C,cAAQ,QAAQ,KAAK,IAAI,QAAQ,OAAO,SAAS,SAAS;AAC1D,cAAQ,QAAQ,KAAK,IAAI,QAAQ,OAAO,SAAS,QAAQ;AAAA,IAC3D,WAAW,YAAY,eAAe,QAAQ;AAC5C,cAAQ,QAAQ,KAAK,IAAI,QAAQ,OAAO,SAAS,SAAS;AAC1D,cAAQ,QAAQ,KAAK,IAAI,QAAQ,OAAO,SAAS,QAAQ;AAAA,IAC3D;AAAA,EACF;AAMA,MAAI,WAAW;AACf,MACE,iBAAiB,kBAAkB,eACnC,YAAY,eAAe,KAC3B;AACA,eAAW,yBAAyB,QAAQ;AAAA,EAC9C;AAEA,aAAW,SAAS,OAAO,CAAC,MAAM,KAAK,IAAI;AAQ3C,MAAI,qBAAqB,sBAAsB,UAAU,OAAO;AAEhE,MAAI,+BAA+B,eAAe,MAAM;AAGtD,QAAI,YAAY,sBAAsB;AACtC,QAAI,OAAO,+BAA+B,UAAU;AAClD,kBAAY;AAAA,IACd;AAEA,yBAAqB;AAAA,MACnB;AAAA,MACA;AAAA,MACA;AAAA,IAAA;AAAA,EAEJ;AAKA,MAAI,EAAE,aAAa,UAAU,UAAA,IAAc;AAAA,IACzC;AAAA,IACA;AAAA,EAAA;AAOF,UAAQ,IAAI,WAAW,UAAU;AAEjC,QAAM,cAAc,UAAU,IAAI,CAAC,YAAY;AAC7C,WAAO;AAAA,MACL,GAAG;AAAA,MACH,OAAO,gBAAgB,SAAS,QAAQ;AAAA,IAAA;AAAA,EAE5C,CAAC;AAMD,QAAM,SAAS,YAAY,OAAO,CAAC,KAAK,UAAU;AAChD,UAAM,EAAE,OAAAA,OAAAA,IAAU;AAClB,eAAW,QAAQA,QAAO;AACxB,UAAI,KAAK,IAAI;AAAA,IACf;AACA,WAAO;AAAA,EACT,GAAG,CAAA,CAAE;AAEL,SAAO;AAAA,IACL,OAAO;AAAA,IACP,aAAa,gBAAgB;AAAA,IAC7B,UAAU;AAAA,EAAA;AAEd;"}
+{"version":3,"file":"index.js","sources":["../../src/prepare-units/index.ts"],"sourcesContent":["import {\n  getSectionAgeRange,\n  getSectionPosRange,\n  groupUnitsIntoSectionsByOverlap,\n  groupUnitsIntoSectionsBySectionID,\n  mergeOverlappingSections,\n  preprocessSectionUnit,\n  preprocessUnits,\n  UnitWithLayoutHints,\n} from \"./helpers\";\nimport { ColumnAxisType } from \"@macrostrat/column-components\";\nimport { useMemo } from \"react\";\nimport { UnitLong } from \"@macrostrat/api-types\";\nimport {\n  collapseUnconformitiesByPixelHeight,\n  computeSectionHeights,\n  finalizeSectionHeights,\n  padWindowByPixels,\n  resolveWindowScales,\n  trimSectionsToWindow,\n  type CompositeColumnScale,\n} from \"./composite-scale\";\nimport {\n  agesOverlap,\n  MergeSectionsMode,\n  PrepareColumnOptions,\n  PreparedColumnData,\n  unitsOverlap,\n} from \"./utils\";\nimport { SectionInfo } from \"./types\";\n\nexport * from \"./utils\";\nexport * from \"./types\";\nexport { preprocessUnits };\nexport type { CompositeColumnScale };\n\nexport function usePreparedColumnUnits(\n  data: UnitLong[],\n  options: PrepareColumnOptions,\n): PreparedColumnData {\n  /** This function wraps and memoizes all preparation steps for converting\n   * an array of units from the /units route to a form ready for usage.\n   */\n  return useMemo(() => {\n    return prepareColumnUnits(data, options);\n  }, [data, ...Object.values(options)]);\n}\n\nexport function prepareColumnUnits(\n  units: UnitWithLayoutHints<UnitLong>[],\n  options: PrepareColumnOptions,\n): PreparedColumnData {\n  /** Prepare units for rendering into Macrostrat columns */\n\n  let { t_age, b_age, t_pos, b_pos } = options;\n\n  const {\n    mergeSections = MergeSectionsMode.OVERLAPPING,\n    axisType,\n    unconformityHeight,\n    collapseSmallUnconformities = false,\n    hybridScale,\n    scale,\n    windowPadding = 0,\n  } = options;\n\n  let _totalHeight: number | null = null;\n\n  if (scale != null) {\n    // Set t_age and b_age based on scale domain if not already set\n    const domain = scale.domain();\n    if (axisType == ColumnAxisType.AGE) {\n      if (t_age == null) t_age = Math.min(...domain);\n      if (b_age == null) b_age = Math.max(...domain);\n      _totalHeight = Math.abs(scale(b_age) - scale(t_age));\n    } else {\n      if (t_pos == null) t_pos = Math.min(...domain);\n      if (b_pos == null) b_pos = Math.max(...domain);\n      _totalHeight = Math.abs(scale(b_pos) - scale(t_pos));\n    }\n  }\n\n  /** Age columns lay every section out at its full extent and clip to the\n   * window at the end (see below), so that a section abutting the window is\n   * sized by its own content rather than by the sliver that survives the clip.\n   * Hybrid and externally-supplied scales build their own mapping and can't be\n   * re-derived that way, so they keep the original clip-then-lay-out path. */\n  const clipBeforeLayout =\n    axisType != ColumnAxisType.AGE || hybridScale != null || scale != null;\n\n  // Start by ensuring that ages and positions are numbers\n  // also set up some values for eODP-style columns\n  let units1 = units.map(preprocessSectionUnit);\n\n  if (clipBeforeLayout) {\n    /** Prototype filtering to age range */\n    units1 = units1.filter((d) => {\n      // Filter units by t_age and b_age, inclusive\n      if (axisType == ColumnAxisType.AGE) {\n        return agesOverlap(d, { t_age, b_age });\n      } else {\n        return unitsOverlap(d, { t_pos, b_pos } as any, axisType);\n      }\n    });\n  }\n\n  let mergeMode = mergeSections;\n  // if (axisType != ColumnAxisType.AGE) {\n  //   // For non-age columns, we always merge sections.\n  //   // This is because the \"groupUnitsIntoSections\" function is not well-defined\n  //   // for non-age columns.\n  //   mergeMode = MergeSectionsMode.ALL;\n  // }\n\n  let sections0: SectionInfo<UnitLong>[];\n  if (mergeMode == MergeSectionsMode.ALL) {\n    // For the \"merge sections\" mode, we need to create a single section\n    const [b_unit_pos, t_unit_pos] = getSectionPosRange(units1, axisType);\n    const [b_unit_age, t_unit_age] = getSectionAgeRange(units1);\n    sections0 = [\n      {\n        section_id: 0,\n        /**\n         * If ages limits are directly specified, use them to define the section bounds.\n         * */\n        t_pos: t_unit_pos,\n        b_pos: b_unit_pos,\n        t_age: t_unit_age,\n        b_age: b_unit_age,\n        units: units1,\n      },\n    ];\n  } else if (axisType == ColumnAxisType.AGE) {\n    sections0 = groupUnitsIntoSectionsBySectionID(units1, axisType);\n  } else {\n    sections0 = groupUnitsIntoSectionsByOverlap(units1, axisType);\n  }\n\n  // Limit sections to the range specified by t_age/b_age or t_pos/b_pos global options\n  for (let section of clipBeforeLayout ? sections0 : []) {\n    if (axisType == ColumnAxisType.AGE) {\n      section.t_age = Math.max(section.t_age, t_age ?? -Infinity);\n      section.b_age = Math.min(section.b_age, b_age ?? Infinity);\n    } else if (axisType == ColumnAxisType.DEPTH) {\n      section.t_pos = Math.max(section.t_pos, t_pos ?? -Infinity);\n      section.b_pos = Math.min(section.b_pos, b_pos ?? Infinity);\n    } else if (axisType == ColumnAxisType.HEIGHT) {\n      section.t_pos = Math.max(section.t_pos, t_pos ?? -Infinity);\n      section.b_pos = Math.min(section.b_pos, b_pos ?? Infinity);\n    }\n  }\n\n  /** Merging overlapping sections really only makes sense for age/height/depth\n   * columns. Ordinal columns are numbered by section so merging them\n   * results in collisions.\n   */\n  let sections = sections0;\n  if (\n    mergeSections == MergeSectionsMode.OVERLAPPING &&\n    axisType == ColumnAxisType.AGE\n  ) {\n    sections = mergeOverlappingSections(sections);\n  }\n  // Filter out undefined sections just in case\n  sections = sections.filter((d) => d != null);\n\n  // SCALES\n\n  /** The window we've been asked to render. Unit density is derived from what\n   * it shows (see `findAverageUnitHeight`), so it has to be known before any\n   * section is laid out — but nothing is *clipped* to it until the very end.\n   */\n  const focalWindow: [number, number] | null = clipBeforeLayout\n    ? null\n    : [b_age ?? Infinity, t_age ?? -Infinity];\n\n  const layoutOptions = { ...options, visibleWindow: focalWindow };\n\n  /* Compute pixel scales etc. for sections\n   * We need to do this now to determine which unconformities\n   * are small enough to collapse.\n   */\n  let sectionsWithScales = computeSectionHeights(sections, layoutOptions);\n\n  if (collapseSmallUnconformities && hybridScale == null) {\n    // Collapse small unconformities in pixel height space\n    // TODO: this doesn't seem to work properly for non-age columns?\n    let threshold = unconformityHeight ?? 30;\n    if (typeof collapseSmallUnconformities == \"number\") {\n      threshold = collapseSmallUnconformities;\n    }\n\n    sectionsWithScales = collapseUnconformitiesByPixelHeight(\n      sectionsWithScales,\n      threshold,\n      layoutOptions,\n    );\n  }\n\n  /** Now that every section is laid out at full extent — with its own density\n   * and `minSectionHeight` already settled — apply the rendered window. Padding\n   * is spent here, against real pixel heights, so `windowPadding` px of an\n   * abutting section is exactly that many pixels.\n   */\n  if (focalWindow != null && (t_age != null || b_age != null)) {\n    // Resolve final densities first (a section the window cuts short is\n    // stretched to `minSectionHeight`), then spend the padding budget against\n    // them, so a margin is the pixels asked for rather than those pixels times\n    // whatever stretch its neighbor happened to need.\n    const floor = options.minSectionHeight ?? options.targetUnitHeight ?? 0;\n    const scales = resolveWindowScales(sectionsWithScales, focalWindow, floor);\n    const scaleFor = (section) =>\n      scales.get(section) ?? section.scaleInfo.pixelScale;\n\n    const window =\n      windowPadding > 0\n        ? padWindowByPixels(\n            sectionsWithScales,\n            focalWindow,\n            windowPadding,\n            scaleFor,\n          )\n        : focalWindow;\n\n    sectionsWithScales = trimSectionsToWindow(\n      sectionsWithScales,\n      window,\n      scaleFor,\n    );\n  }\n\n  /** Prepare section scale information using groups.\n   * Total height is computed from section scales.\n   * */\n  let { totalHeight, sections: sections2 } = finalizeSectionHeights(\n    sectionsWithScales,\n    unconformityHeight,\n  );\n\n  /** For each section, find units that are overlapping.\n   * We do this after merging sections so that we can\n   * handle cases where there are overlapping units across sections\n   * */\n  const sectionsOut = sections2.map((section) => {\n    return {\n      ...section,\n      units: preprocessUnits(section, axisType),\n    };\n  });\n\n  /** Reconstitute the units so that they are sorted by section and properly enhanced.\n   * This is mostly important so that unit keyboard navigation\n   * predictably selects adjacent units.\n   */\n  const units2 = sectionsOut.reduce((acc, group) => {\n    const { units } = group;\n    for (const unit of units) {\n      acc.push(unit);\n    }\n    return acc;\n  }, []);\n\n  return {\n    units: units2,\n    totalHeight: _totalHeight ?? totalHeight,\n    sections: sectionsOut,\n  };\n}\n"],"names":["units"],"mappings":"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"}

package/dist/prepare-units/types.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"types.cjs","sources":["../../src/prepare-units/types.ts"],"sourcesContent":["import type { UnitLong } from \"@macrostrat/api-types\";\nimport type { ColumnAxisType } from \"@macrostrat/column-components\";\nimport type { ScaleContinuousNumeric } from \"d3-scale\";\n\nexport interface ColumnHeightScaleOptions {\n  /** A fixed pixel scale to use for the section (pixels per Myr) */\n  pixelScale?: number;\n  /** The target height of a constituent unit in pixels, for dynamic\n   * scale generation */\n  targetUnitHeight?: number;\n  /** Min height of a section in pixels. Will override minPixelScale in some cases. */\n  minSectionHeight?: number;\n  /** The minimum pixel scale to use for the section (pixels per Myr). This is mostly\n   * needed because small sections (<1-2 units) don't necessarily have space to comfortably\n   * render two axis labels */\n  minPixelScale?: number;\n  // Axis scale type\n  axisType?: ColumnAxisType;\n  // Unconformity height in pixels\n  unconformityHeight?: number;\n  // Whether to collapse unconformities that are less than a height threshold\n  collapseSmallUnconformities?: boolean | number;\n  // A continuous scale to use instead of generating one\n  // TODO: discontinuous scales are not yet supported\n  scale?: ScaleContinuousNumeric<number, number>;\n  // Hybrid scale type.\n  // This overrides parameters such as the axis type\n  hybridScale?: HybridScaleDefinition;\n}\n\nexport enum HybridScaleType {\n  // An age-domain scale that puts equal vertical space between surfaces\n  EquidistantSurfaces = \"equidistant-surfaces\",\n  // A height-domain scale that is based on the average height of units between surfaces\n  ApproximateHeight = \"approximate-height\",\n}\n\nexport enum HeightMethod {\n  Minimum = \"minimum\",\n  Average = \"average\",\n  Maximum = \"maximum\",\n}\n\nexport interface HybridScaleOptions {\n  pixelOffset?: number;\n  pixelScale?: number;\n}\n\nexport type ApproxHeightScaleOptions = {\n  minHeight?: number;\n  defaultHeight?: number;\n  heightMethod?: HeightMethod;\n};\n\nexport type HybridScaleDefinition =\n  | ({\n      type: HybridScaleType.ApproximateHeight;\n    } & ApproxHeightScaleOptions)\n  | {\n      type: HybridScaleType.EquidistantSurfaces;\n    };\n\nexport interface SectionScaleOptions extends ColumnHeightScaleOptions {\n  axisType: ColumnAxisType;\n  domain: [number, number];\n}\n\n/** Output of a section scale. For now, this assumes that the\n * mapping is linear, but it could be extended to support arbitrary\n * scale functions.\n */\nexport interface PackageScaleInfo {\n  domain: [number, number];\n  pixelHeight: number;\n  // TODO: add a function\n  scale: ScaleContinuousNumeric<number, number>;\n  pixelScale?: number; // if it's a linear scale, this could be defined\n  // Subsidiary scale for height mapping (for hybrid scales)\n  heightScale?: ScaleContinuousNumeric<number, number>;\n}\n\nexport type PackageScaleLayoutData = PackageScaleInfo & {\n  // A unique key for the section to use in React\n  key: string;\n  offset: number;\n  // How much to\n  paddingTop: number;\n};\nexport interface StratigraphicPackage {\n  /** A collection of stratigraphic information organized in time, corresponding\n   * to single or multiple columns. */\n  t_age: number;\n  b_age: number;\n}\n\nexport interface SectionInfo<\n  T extends UnitLong = ExtUnit,\n> extends StratigraphicPackage {\n  /** A time-bounded part of a single stratigraphic column. */\n  section_id: number | number[];\n  units: T[];\n  b_pos?: number;\n  t_pos?: number;\n}\n\nexport interface ExtUnit extends UnitLong {\n  bottomOverlap: boolean;\n  overlappingUnits: number[];\n  column?: number;\n  /* Positions (ages or heights) where the unit is clipped to its containing section.\n   * This is relevant if we are filtering by age/height/depth range.\n   */\n  t_clip_pos?: number;\n  b_clip_pos?: number;\n}\n\nexport type PackageLayoutData<T extends UnitLong = ExtUnit> = SectionInfo<T> & {\n  scaleInfo: PackageScaleLayoutData;\n  // A unique key for the section to use in React\n  key: string;\n};\n\nexport interface CompositeScaleData {\n  totalHeight: number;\n  sections: PackageScaleLayoutData[];\n}\n\nexport interface ColumnScaleOptions extends ColumnHeightScaleOptions {\n  axisType: ColumnAxisType;\n  unconformityHeight: number;\n}\n\nexport interface CompositeColumnData<T extends UnitLong = ExtUnit> extends Omit<\n  CompositeScaleData,\n  \"sections\"\n> {\n  sections: PackageLayoutData<T>[];\n}\n"],"names":["HybridScaleType","HeightMethod"],"mappings":";;AA8BO,IAAK,oCAAAA,qBAAL;AAELA,mBAAA,qBAAA,IAAsB;AAEtBA,mBAAA,mBAAA,IAAoB;AAJV,SAAAA;AAAA,GAAA,mBAAA,CAAA,CAAA;AAOL,IAAK,iCAAAC,kBAAL;AACLA,gBAAA,SAAA,IAAU;AACVA,gBAAA,SAAA,IAAU;AACVA,gBAAA,SAAA,IAAU;AAHA,SAAAA;AAAA,GAAA,gBAAA,CAAA,CAAA;;;"}
+{"version":3,"file":"types.cjs","sources":["../../src/prepare-units/types.ts"],"sourcesContent":["import type { UnitLong } from \"@macrostrat/api-types\";\nimport type { ColumnAxisType } from \"@macrostrat/column-components\";\nimport type { ScaleContinuousNumeric } from \"d3-scale\";\n\nexport interface ColumnHeightScaleOptions {\n  /** A fixed pixel scale to use for the section (pixels per Myr) */\n  pixelScale?: number;\n  /** The target height of a constituent unit in pixels, for dynamic\n   * scale generation */\n  targetUnitHeight?: number;\n  /** Min height of a section in pixels. Will override minPixelScale in some cases. */\n  minSectionHeight?: number;\n  /** The minimum pixel scale to use for the section (pixels per Myr). This is mostly\n   * needed because small sections (<1-2 units) don't necessarily have space to comfortably\n   * render two axis labels */\n  minPixelScale?: number;\n  /** The requested render window, `[b_age, t_age]`, if there is one. Set\n   * internally by `prepareColumnUnits`: unit density is derived from the units\n   * this window actually shows, so `targetUnitHeight` describes the units you\n   * can see at any zoom depth rather than the section's overall average. */\n  visibleWindow?: [number, number];\n  /** Padding around the `t_age`/`b_age` window, in **pixels** of neighboring\n   * column: how much of the abutting sections to reveal past the window.\n   *\n   * Resolved after every section is laid out at full extent, so it's exact —\n   * each section's own density and each crossed unconformity's fixed height are\n   * spent from the pixel budget. Padding collapses where the column runs out.\n   * Ignored for hybrid or externally-supplied scales. */\n  windowPadding?: number;\n  // Axis scale type\n  axisType?: ColumnAxisType;\n  // Unconformity height in pixels\n  unconformityHeight?: number;\n  // Whether to collapse unconformities that are less than a height threshold\n  collapseSmallUnconformities?: boolean | number;\n  // A continuous scale to use instead of generating one\n  // TODO: discontinuous scales are not yet supported\n  scale?: ScaleContinuousNumeric<number, number>;\n  // Hybrid scale type.\n  // This overrides parameters such as the axis type\n  hybridScale?: HybridScaleDefinition;\n}\n\nexport enum HybridScaleType {\n  // An age-domain scale that puts equal vertical space between surfaces\n  EquidistantSurfaces = \"equidistant-surfaces\",\n  // A height-domain scale that is based on the average height of units between surfaces\n  ApproximateHeight = \"approximate-height\",\n}\n\nexport enum HeightMethod {\n  Minimum = \"minimum\",\n  Average = \"average\",\n  Maximum = \"maximum\",\n}\n\nexport interface HybridScaleOptions {\n  pixelOffset?: number;\n  pixelScale?: number;\n}\n\nexport type ApproxHeightScaleOptions = {\n  minHeight?: number;\n  defaultHeight?: number;\n  heightMethod?: HeightMethod;\n};\n\nexport type HybridScaleDefinition =\n  | ({\n      type: HybridScaleType.ApproximateHeight;\n    } & ApproxHeightScaleOptions)\n  | {\n      type: HybridScaleType.EquidistantSurfaces;\n    };\n\nexport interface SectionScaleOptions extends ColumnHeightScaleOptions {\n  axisType: ColumnAxisType;\n  domain: [number, number];\n}\n\n/** Output of a section scale. For now, this assumes that the\n * mapping is linear, but it could be extended to support arbitrary\n * scale functions.\n */\nexport interface PackageScaleInfo {\n  domain: [number, number];\n  pixelHeight: number;\n  // TODO: add a function\n  scale: ScaleContinuousNumeric<number, number>;\n  pixelScale?: number; // if it's a linear scale, this could be defined\n  // Subsidiary scale for height mapping (for hybrid scales)\n  heightScale?: ScaleContinuousNumeric<number, number>;\n}\n\nexport type PackageScaleLayoutData = PackageScaleInfo & {\n  // A unique key for the section to use in React\n  key: string;\n  offset: number;\n  // How much to\n  paddingTop: number;\n};\nexport interface StratigraphicPackage {\n  /** A collection of stratigraphic information organized in time, corresponding\n   * to single or multiple columns. */\n  t_age: number;\n  b_age: number;\n}\n\nexport interface SectionInfo<\n  T extends UnitLong = ExtUnit,\n> extends StratigraphicPackage {\n  /** A time-bounded part of a single stratigraphic column. */\n  section_id: number | number[];\n  units: T[];\n  b_pos?: number;\n  t_pos?: number;\n}\n\nexport interface ExtUnit extends UnitLong {\n  bottomOverlap: boolean;\n  overlappingUnits: number[];\n  column?: number;\n  /* Positions (ages or heights) where the unit is clipped to its containing section.\n   * This is relevant if we are filtering by age/height/depth range.\n   */\n  t_clip_pos?: number;\n  b_clip_pos?: number;\n}\n\nexport type PackageLayoutData<T extends UnitLong = ExtUnit> = SectionInfo<T> & {\n  scaleInfo: PackageScaleLayoutData;\n  // A unique key for the section to use in React\n  key: string;\n};\n\nexport interface CompositeScaleData {\n  totalHeight: number;\n  sections: PackageScaleLayoutData[];\n}\n\nexport interface ColumnScaleOptions extends ColumnHeightScaleOptions {\n  axisType: ColumnAxisType;\n  unconformityHeight: number;\n}\n\nexport interface CompositeColumnData<T extends UnitLong = ExtUnit> extends Omit<\n  CompositeScaleData,\n  \"sections\"\n> {\n  sections: PackageLayoutData<T>[];\n}\n"],"names":["HybridScaleType","HeightMethod"],"mappings":";;AA2CO,IAAK,oCAAAA,qBAAL;AAELA,mBAAA,qBAAA,IAAsB;AAEtBA,mBAAA,mBAAA,IAAoB;AAJV,SAAAA;AAAA,GAAA,mBAAA,CAAA,CAAA;AAOL,IAAK,iCAAAC,kBAAL;AACLA,gBAAA,SAAA,IAAU;AACVA,gBAAA,SAAA,IAAU;AACVA,gBAAA,SAAA,IAAU;AAHA,SAAAA;AAAA,GAAA,gBAAA,CAAA,CAAA;;;"}

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

@@ -13,6 +13,19 @@ export interface ColumnHeightScaleOptions {
      * needed because small sections (<1-2 units) don't necessarily have space to comfortably
      * render two axis labels */
     minPixelScale?: number;
+    /** The requested render window, `[b_age, t_age]`, if there is one. Set
+     * internally by `prepareColumnUnits`: unit density is derived from the units
+     * this window actually shows, so `targetUnitHeight` describes the units you
+     * can see at any zoom depth rather than the section's overall average. */
+    visibleWindow?: [number, number];
+    /** Padding around the `t_age`/`b_age` window, in **pixels** of neighboring
+     * column: how much of the abutting sections to reveal past the window.
+     *
+     * Resolved after every section is laid out at full extent, so it's exact —
+     * each section's own density and each crossed unconformity's fixed height are
+     * spent from the pixel budget. Padding collapses where the column runs out.
+     * Ignored for hybrid or externally-supplied scales. */
+    windowPadding?: number;
     axisType?: ColumnAxisType;
     unconformityHeight?: number;
     collapseSmallUnconformities?: boolean | number;

package/dist/prepare-units/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sources":["../../src/prepare-units/types.ts"],"sourcesContent":["import type { UnitLong } from \"@macrostrat/api-types\";\nimport type { ColumnAxisType } from \"@macrostrat/column-components\";\nimport type { ScaleContinuousNumeric } from \"d3-scale\";\n\nexport interface ColumnHeightScaleOptions {\n  /** A fixed pixel scale to use for the section (pixels per Myr) */\n  pixelScale?: number;\n  /** The target height of a constituent unit in pixels, for dynamic\n   * scale generation */\n  targetUnitHeight?: number;\n  /** Min height of a section in pixels. Will override minPixelScale in some cases. */\n  minSectionHeight?: number;\n  /** The minimum pixel scale to use for the section (pixels per Myr). This is mostly\n   * needed because small sections (<1-2 units) don't necessarily have space to comfortably\n   * render two axis labels */\n  minPixelScale?: number;\n  // Axis scale type\n  axisType?: ColumnAxisType;\n  // Unconformity height in pixels\n  unconformityHeight?: number;\n  // Whether to collapse unconformities that are less than a height threshold\n  collapseSmallUnconformities?: boolean | number;\n  // A continuous scale to use instead of generating one\n  // TODO: discontinuous scales are not yet supported\n  scale?: ScaleContinuousNumeric<number, number>;\n  // Hybrid scale type.\n  // This overrides parameters such as the axis type\n  hybridScale?: HybridScaleDefinition;\n}\n\nexport enum HybridScaleType {\n  // An age-domain scale that puts equal vertical space between surfaces\n  EquidistantSurfaces = \"equidistant-surfaces\",\n  // A height-domain scale that is based on the average height of units between surfaces\n  ApproximateHeight = \"approximate-height\",\n}\n\nexport enum HeightMethod {\n  Minimum = \"minimum\",\n  Average = \"average\",\n  Maximum = \"maximum\",\n}\n\nexport interface HybridScaleOptions {\n  pixelOffset?: number;\n  pixelScale?: number;\n}\n\nexport type ApproxHeightScaleOptions = {\n  minHeight?: number;\n  defaultHeight?: number;\n  heightMethod?: HeightMethod;\n};\n\nexport type HybridScaleDefinition =\n  | ({\n      type: HybridScaleType.ApproximateHeight;\n    } & ApproxHeightScaleOptions)\n  | {\n      type: HybridScaleType.EquidistantSurfaces;\n    };\n\nexport interface SectionScaleOptions extends ColumnHeightScaleOptions {\n  axisType: ColumnAxisType;\n  domain: [number, number];\n}\n\n/** Output of a section scale. For now, this assumes that the\n * mapping is linear, but it could be extended to support arbitrary\n * scale functions.\n */\nexport interface PackageScaleInfo {\n  domain: [number, number];\n  pixelHeight: number;\n  // TODO: add a function\n  scale: ScaleContinuousNumeric<number, number>;\n  pixelScale?: number; // if it's a linear scale, this could be defined\n  // Subsidiary scale for height mapping (for hybrid scales)\n  heightScale?: ScaleContinuousNumeric<number, number>;\n}\n\nexport type PackageScaleLayoutData = PackageScaleInfo & {\n  // A unique key for the section to use in React\n  key: string;\n  offset: number;\n  // How much to\n  paddingTop: number;\n};\nexport interface StratigraphicPackage {\n  /** A collection of stratigraphic information organized in time, corresponding\n   * to single or multiple columns. */\n  t_age: number;\n  b_age: number;\n}\n\nexport interface SectionInfo<\n  T extends UnitLong = ExtUnit,\n> extends StratigraphicPackage {\n  /** A time-bounded part of a single stratigraphic column. */\n  section_id: number | number[];\n  units: T[];\n  b_pos?: number;\n  t_pos?: number;\n}\n\nexport interface ExtUnit extends UnitLong {\n  bottomOverlap: boolean;\n  overlappingUnits: number[];\n  column?: number;\n  /* Positions (ages or heights) where the unit is clipped to its containing section.\n   * This is relevant if we are filtering by age/height/depth range.\n   */\n  t_clip_pos?: number;\n  b_clip_pos?: number;\n}\n\nexport type PackageLayoutData<T extends UnitLong = ExtUnit> = SectionInfo<T> & {\n  scaleInfo: PackageScaleLayoutData;\n  // A unique key for the section to use in React\n  key: string;\n};\n\nexport interface CompositeScaleData {\n  totalHeight: number;\n  sections: PackageScaleLayoutData[];\n}\n\nexport interface ColumnScaleOptions extends ColumnHeightScaleOptions {\n  axisType: ColumnAxisType;\n  unconformityHeight: number;\n}\n\nexport interface CompositeColumnData<T extends UnitLong = ExtUnit> extends Omit<\n  CompositeScaleData,\n  \"sections\"\n> {\n  sections: PackageLayoutData<T>[];\n}\n"],"names":["HybridScaleType","HeightMethod"],"mappings":"AA8BO,IAAK,oCAAAA,qBAAL;AAELA,mBAAA,qBAAA,IAAsB;AAEtBA,mBAAA,mBAAA,IAAoB;AAJV,SAAAA;AAAA,GAAA,mBAAA,CAAA,CAAA;AAOL,IAAK,iCAAAC,kBAAL;AACLA,gBAAA,SAAA,IAAU;AACVA,gBAAA,SAAA,IAAU;AACVA,gBAAA,SAAA,IAAU;AAHA,SAAAA;AAAA,GAAA,gBAAA,CAAA,CAAA;"}
+{"version":3,"file":"types.js","sources":["../../src/prepare-units/types.ts"],"sourcesContent":["import type { UnitLong } from \"@macrostrat/api-types\";\nimport type { ColumnAxisType } from \"@macrostrat/column-components\";\nimport type { ScaleContinuousNumeric } from \"d3-scale\";\n\nexport interface ColumnHeightScaleOptions {\n  /** A fixed pixel scale to use for the section (pixels per Myr) */\n  pixelScale?: number;\n  /** The target height of a constituent unit in pixels, for dynamic\n   * scale generation */\n  targetUnitHeight?: number;\n  /** Min height of a section in pixels. Will override minPixelScale in some cases. */\n  minSectionHeight?: number;\n  /** The minimum pixel scale to use for the section (pixels per Myr). This is mostly\n   * needed because small sections (<1-2 units) don't necessarily have space to comfortably\n   * render two axis labels */\n  minPixelScale?: number;\n  /** The requested render window, `[b_age, t_age]`, if there is one. Set\n   * internally by `prepareColumnUnits`: unit density is derived from the units\n   * this window actually shows, so `targetUnitHeight` describes the units you\n   * can see at any zoom depth rather than the section's overall average. */\n  visibleWindow?: [number, number];\n  /** Padding around the `t_age`/`b_age` window, in **pixels** of neighboring\n   * column: how much of the abutting sections to reveal past the window.\n   *\n   * Resolved after every section is laid out at full extent, so it's exact —\n   * each section's own density and each crossed unconformity's fixed height are\n   * spent from the pixel budget. Padding collapses where the column runs out.\n   * Ignored for hybrid or externally-supplied scales. */\n  windowPadding?: number;\n  // Axis scale type\n  axisType?: ColumnAxisType;\n  // Unconformity height in pixels\n  unconformityHeight?: number;\n  // Whether to collapse unconformities that are less than a height threshold\n  collapseSmallUnconformities?: boolean | number;\n  // A continuous scale to use instead of generating one\n  // TODO: discontinuous scales are not yet supported\n  scale?: ScaleContinuousNumeric<number, number>;\n  // Hybrid scale type.\n  // This overrides parameters such as the axis type\n  hybridScale?: HybridScaleDefinition;\n}\n\nexport enum HybridScaleType {\n  // An age-domain scale that puts equal vertical space between surfaces\n  EquidistantSurfaces = \"equidistant-surfaces\",\n  // A height-domain scale that is based on the average height of units between surfaces\n  ApproximateHeight = \"approximate-height\",\n}\n\nexport enum HeightMethod {\n  Minimum = \"minimum\",\n  Average = \"average\",\n  Maximum = \"maximum\",\n}\n\nexport interface HybridScaleOptions {\n  pixelOffset?: number;\n  pixelScale?: number;\n}\n\nexport type ApproxHeightScaleOptions = {\n  minHeight?: number;\n  defaultHeight?: number;\n  heightMethod?: HeightMethod;\n};\n\nexport type HybridScaleDefinition =\n  | ({\n      type: HybridScaleType.ApproximateHeight;\n    } & ApproxHeightScaleOptions)\n  | {\n      type: HybridScaleType.EquidistantSurfaces;\n    };\n\nexport interface SectionScaleOptions extends ColumnHeightScaleOptions {\n  axisType: ColumnAxisType;\n  domain: [number, number];\n}\n\n/** Output of a section scale. For now, this assumes that the\n * mapping is linear, but it could be extended to support arbitrary\n * scale functions.\n */\nexport interface PackageScaleInfo {\n  domain: [number, number];\n  pixelHeight: number;\n  // TODO: add a function\n  scale: ScaleContinuousNumeric<number, number>;\n  pixelScale?: number; // if it's a linear scale, this could be defined\n  // Subsidiary scale for height mapping (for hybrid scales)\n  heightScale?: ScaleContinuousNumeric<number, number>;\n}\n\nexport type PackageScaleLayoutData = PackageScaleInfo & {\n  // A unique key for the section to use in React\n  key: string;\n  offset: number;\n  // How much to\n  paddingTop: number;\n};\nexport interface StratigraphicPackage {\n  /** A collection of stratigraphic information organized in time, corresponding\n   * to single or multiple columns. */\n  t_age: number;\n  b_age: number;\n}\n\nexport interface SectionInfo<\n  T extends UnitLong = ExtUnit,\n> extends StratigraphicPackage {\n  /** A time-bounded part of a single stratigraphic column. */\n  section_id: number | number[];\n  units: T[];\n  b_pos?: number;\n  t_pos?: number;\n}\n\nexport interface ExtUnit extends UnitLong {\n  bottomOverlap: boolean;\n  overlappingUnits: number[];\n  column?: number;\n  /* Positions (ages or heights) where the unit is clipped to its containing section.\n   * This is relevant if we are filtering by age/height/depth range.\n   */\n  t_clip_pos?: number;\n  b_clip_pos?: number;\n}\n\nexport type PackageLayoutData<T extends UnitLong = ExtUnit> = SectionInfo<T> & {\n  scaleInfo: PackageScaleLayoutData;\n  // A unique key for the section to use in React\n  key: string;\n};\n\nexport interface CompositeScaleData {\n  totalHeight: number;\n  sections: PackageScaleLayoutData[];\n}\n\nexport interface ColumnScaleOptions extends ColumnHeightScaleOptions {\n  axisType: ColumnAxisType;\n  unconformityHeight: number;\n}\n\nexport interface CompositeColumnData<T extends UnitLong = ExtUnit> extends Omit<\n  CompositeScaleData,\n  \"sections\"\n> {\n  sections: PackageLayoutData<T>[];\n}\n"],"names":["HybridScaleType","HeightMethod"],"mappings":"AA2CO,IAAK,oCAAAA,qBAAL;AAELA,mBAAA,qBAAA,IAAsB;AAEtBA,mBAAA,mBAAA,IAAoB;AAJV,SAAAA;AAAA,GAAA,mBAAA,CAAA,CAAA;AAOL,IAAK,iCAAAC,kBAAL;AACLA,gBAAA,SAAA,IAAU;AACVA,gBAAA,SAAA,IAAU;AACVA,gBAAA,SAAA,IAAU;AAHA,SAAAA;AAAA,GAAA,gBAAA,CAAA,CAAA;"}

package/dist/section.cjs

@@ -158,7 +158,8 @@ function CompositeTimescaleCore(props) {
     levels = 3,
     packages,
     unconformityLabels = false,
-    onClickInterval
+    onClickInterval,
+    intervalStyle
   } = props;
   const baseURL = dataProvider.useMacrostratBaseURL();
   const intervals = timescale.useMacrostratIntervals({ baseURL });
@@ -186,7 +187,8 @@ function CompositeTimescaleCore(props) {
               showAgeAxis: false,
               scale,
               intervals,
-              onClick: onClickInterval
+              onClick: onClickInterval,
+              intervalStyle
             })
           ]
         );

package/dist/section.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"section.cjs","sources":["../src/section.ts"],"sourcesContent":["import {\n  CompositeUnitsColumn,\n  LabelTrackerProvider,\n  SectionLabelsColumn,\n} from \"./units\";\nimport { ReactNode, FunctionComponent, useMemo } from \"react\";\nimport {\n  Timescale,\n  TimescaleOrientation,\n  TimescaleClickHandler,\n  useMacrostratIntervals,\n} from \"@macrostrat/timescale\";\nimport { ColumnAxisType, SVG } from \"@macrostrat/column-components\";\nimport hyper from \"@macrostrat/hyper\";\nimport styles from \"./column.module.sass\";\nimport {\n  useMacrostratColumnData,\n  useMacrostratUnits,\n  MacrostratColumnProvider,\n} from \"./data-provider\";\nimport {\n  useMacrostratBaseURL,\n  useMacrostratData,\n} from \"@macrostrat/data-provider\";\nimport { Duration } from \"./unit-details\";\nimport { Value } from \"@macrostrat/data-components\";\nimport type { ExtUnit, PackageScaleLayoutData } from \"./prepare-units/types\";\n\nconst h = hyper.styled(styles);\n\nexport interface SectionSharedProps {\n  unitComponent?: FunctionComponent<any>;\n  unitComponentProps?: any;\n  showLabels?: boolean;\n  width?: number;\n  columnWidth?: number;\n  children?: ReactNode;\n  showLabelColumn?: boolean;\n  axisType?: ColumnAxisType;\n  className?: string;\n  clipUnits?: boolean;\n  maxInternalColumns?: number;\n  // Space between sections\n  verticalSpacing?: number;\n  // Whether to render unconformity labels\n  unconformityLabels?: boolean;\n}\n\nexport interface SectionProps extends SectionSharedProps {\n  units: ExtUnit[];\n  scaleInfo: PackageScaleLayoutData;\n}\n\nexport function SectionsColumn(props: SectionSharedProps) {\n  const {\n    unconformityLabels = true,\n    unitComponent,\n    unitComponentProps,\n    showLabels = true,\n    width = 300,\n    columnWidth = 150,\n    showLabelColumn = true,\n    clipUnits = true,\n    maxInternalColumns,\n  } = props;\n\n  const units = useMacrostratUnits();\n\n  // Get a unique key for the column\n  const key = units[0]?.col_id;\n\n  return h(LabelTrackerProvider, { units, key }, [\n    h(SectionUnitsColumn, {\n      width: columnWidth,\n      unitComponent,\n      unitComponentProps,\n      showLabels,\n      clipUnits,\n      maxInternalColumns,\n      unconformityLabels,\n    }),\n    h.if(showLabelColumn)(SectionLabelsColumn, {\n      width: width - columnWidth,\n    }),\n  ]);\n}\n\nfunction SectionUnitsColumn(props: SectionSharedProps) {\n  const {\n    width,\n    showLabels,\n    unitComponent,\n    unitComponentProps,\n    clipUnits,\n    maxInternalColumns,\n    axisType,\n    unconformityLabels = true,\n  } = props;\n\n  const { sections, totalHeight } = useMacrostratColumnData();\n\n  const scaleData: PackageScaleLayoutData[] = sections.map((section) => {\n    return section.scaleInfo;\n  });\n\n  const innerWidth = width - 2;\n\n  return h(\"div.section-units-container\", { style: { width } }, [\n    h(\n      SVG,\n      {\n        className: \"sections\",\n        height: totalHeight,\n        innerWidth,\n        paddingH: 1,\n      },\n      sections.map((group) => {\n        const { units, scaleInfo, section_id } = group;\n\n        const key = `section-${section_id}`;\n        return h(\n          SectionUnits,\n          {\n            units,\n            scaleInfo,\n            key,\n            unitComponent,\n            unitComponentProps,\n            showLabels,\n            width: innerWidth,\n            clipUnits,\n            maxInternalColumns,\n          }, // This unconformity is with the section _above_\n        );\n      }),\n    ),\n    h.if(unconformityLabels)(UnconformityLabels, {\n      width,\n      sections: scaleData,\n      verbose: false,\n    }),\n  ]);\n}\n\nfunction SectionUnits(props: SectionProps) {\n  // Section with \"squishy\" timescale\n  const {\n    units,\n    scaleInfo,\n    unitComponent,\n    showLabels = true,\n    width = 300,\n    unitComponentProps,\n    className,\n    clipUnits = true,\n    maxInternalColumns,\n  } = props;\n\n  const { domain, pixelScale, pixelHeight, scale } = scaleInfo;\n\n  /** Ensure that we can arrange units into the maximum number\n   * of columns defined by unitComponentProps, but that we don't\n   * use more than necessary.\n   */\n  const _unitComponentProps = useMemo(() => {\n    return {\n      ...unitComponentProps,\n      nColumns: Math.min(\n        maxInternalColumns ?? Math.floor(width / 10),\n        unitComponentProps?.nColumns ?? Infinity,\n      ),\n      //axisType,\n    };\n  }, [units, unitComponentProps, maxInternalColumns, width]);\n\n  const style = {\n    \"--section-height\": `${pixelHeight}px`,\n    \"--section-width\": `${width}px`,\n  };\n\n  return h(\n    \"g.section\",\n    { className, style, transform: `translate(0 ${scaleInfo.offset})` },\n    h(\n      MacrostratColumnProvider,\n      {\n        units,\n        domain,\n        pixelScale, // Actually pixels per myr,\n        scale,\n      },\n      h(CompositeUnitsColumn, {\n        width,\n        showLabels,\n        unitComponent,\n        unitComponentProps: _unitComponentProps,\n        clipToFrame: clipUnits,\n      }),\n    ),\n  );\n}\n\ninterface CompositeTimescaleProps {\n  levels?: [number, number] | number;\n  unconformityLabels?: boolean;\n}\n\nexport function CompositeTimescale(props: CompositeTimescaleProps) {\n  const { sections } = useMacrostratColumnData();\n  const sectionScales = sections.map((section) => {\n    return section.scaleInfo;\n  });\n\n  return h(CompositeTimescaleCore, {\n    packages: sectionScales,\n    ...props,\n  });\n}\n\ntype CompositeTimescaleCoreProps = CompositeTimescaleProps & {\n  packages: PackageScaleLayoutData[];\n  onClickInterval?: TimescaleClickHandler;\n};\n\nexport function CompositeTimescaleCore(props: CompositeTimescaleCoreProps) {\n  const {\n    levels = 3,\n    packages,\n    unconformityLabels = false,\n    onClickInterval,\n  } = props;\n\n  // Use intervals from Macrostrat API\n  const baseURL = useMacrostratBaseURL();\n  const intervals = useMacrostratIntervals({ baseURL });\n\n  let _levels: [number, number];\n  if (typeof levels === \"number\") {\n    // If levels is a number, use the most common starting level\n    _levels = [2, Math.max(2 + Math.min(levels, 5) - 1, 1)];\n  } else {\n    _levels = levels;\n  }\n\n  const nCols = _levels[1] - _levels[0] + 1;\n\n  return h(\"div.timescale-column\", [\n    h(\n      \"div.timescales\",\n      packages.map((group) => {\n        const { pixelHeight, paddingTop, key, scale } = group;\n        return h(\n          \"div.timescale-container\",\n          { style: { paddingTop, \"--timescale-level-count\": nCols }, key },\n          [\n            h(Timescale, {\n              orientation: TimescaleOrientation.VERTICAL,\n              length: pixelHeight,\n              levels: _levels,\n              absoluteAgeScale: true,\n              showAgeAxis: false,\n              scale,\n              intervals,\n              onClick: onClickInterval,\n            }),\n          ],\n        );\n      }),\n    ),\n    h.if(unconformityLabels)(UnconformityLabels, {\n      width: \"100%\",\n      sections: packages,\n      className: \"unconformity-labels\",\n      axisType: ColumnAxisType.AGE,\n    }),\n  ]);\n}\n\nexport function UnconformityLabels(props: {\n  width: string | number;\n  sections: PackageScaleLayoutData[];\n  axisType?: ColumnAxisType;\n  className?: string;\n  verbose?: boolean;\n}) {\n  const { width, sections, className, axisType, verbose } = props;\n\n  return h(\n    \"div.unconformity-labels\",\n    {\n      style: {\n        width,\n      },\n      className,\n    },\n    sections.map((scaleInfo, i) => {\n      const lastGroup = sections[i - 1];\n      const top = scaleInfo.offset - scaleInfo.paddingTop;\n      const upperAge = lastGroup?.domain[0];\n      const lowerAge = scaleInfo.domain[1];\n      return h(Unconformity, {\n        axisType,\n        upperAge,\n        lowerAge,\n        style: {\n          width,\n          height: scaleInfo.paddingTop,\n          top,\n        },\n        verbose,\n      });\n    }),\n  );\n}\n\nfunction Unconformity({\n  upperAge,\n  lowerAge,\n  style,\n  axisType,\n  verbose = false,\n}) {\n  if (upperAge == null || lowerAge == null) {\n    return null;\n  }\n\n  const ageGap = Math.abs(upperAge - lowerAge);\n\n  let maximumFractionDigits = 0;\n\n  let className: string = null;\n  if (ageGap > 1000) {\n    className = \"giga\";\n  } else if (ageGap > 100) {\n    className = \"mega\";\n  } else if (ageGap > 10) {\n    className = \"large\";\n  } else if (ageGap < 1) {\n    className = \"small\";\n    maximumFractionDigits = 2;\n  } else {\n    maximumFractionDigits = 1;\n  }\n\n  let val: ReactNode;\n  if (axisType === ColumnAxisType.DEPTH || axisType === ColumnAxisType.HEIGHT) {\n    const _txt = ageGap.toLocaleString(\"en-US\", { maximumFractionDigits });\n    val = h(Value, { value: _txt, unit: \"m\" });\n  } else {\n    val = h(Duration, { value: ageGap, maximumFractionDigits });\n  }\n\n  let prefix: ReactNode = null;\n  if (verbose) {\n    prefix = h([\" \", h(\"span.prefix\", \" gap\")]);\n  }\n\n  return h(\"div.unconformity\", { style, className }, [\n    h(\"div.unconformity-inner\", h(\"div.unconformity-text\", [val, prefix])),\n  ]);\n}\n"],"names":["hyper","styles","useMacrostratUnits","LabelTrackerProvider","SectionLabelsColumn","useMacrostratColumnData","SVG","useMemo","MacrostratColumnProvider","CompositeUnitsColumn","useMacrostratBaseURL","useMacrostratIntervals","Timescale","TimescaleOrientation","ColumnAxisType","Value","Duration"],"mappings":"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"}
+{"version":3,"file":"section.cjs","sources":["../src/section.ts"],"sourcesContent":["import {\n  CompositeUnitsColumn,\n  LabelTrackerProvider,\n  SectionLabelsColumn,\n} from \"./units\";\nimport { ReactNode, FunctionComponent, useMemo } from \"react\";\nimport {\n  Timescale,\n  TimescaleOrientation,\n  TimescaleClickHandler,\n  useMacrostratIntervals,\n  type IntervalStyleBuilder,\n} from \"@macrostrat/timescale\";\nimport { ColumnAxisType, SVG } from \"@macrostrat/column-components\";\nimport hyper from \"@macrostrat/hyper\";\nimport styles from \"./column.module.sass\";\nimport {\n  useMacrostratColumnData,\n  useMacrostratUnits,\n  MacrostratColumnProvider,\n} from \"./data-provider\";\nimport {\n  useMacrostratBaseURL,\n  useMacrostratData,\n} from \"@macrostrat/data-provider\";\nimport { Duration } from \"./unit-details\";\nimport { Value } from \"@macrostrat/data-components\";\nimport type { ExtUnit, PackageScaleLayoutData } from \"./prepare-units/types\";\n\nconst h = hyper.styled(styles);\n\nexport interface SectionSharedProps {\n  unitComponent?: FunctionComponent<any>;\n  unitComponentProps?: any;\n  showLabels?: boolean;\n  width?: number;\n  columnWidth?: number;\n  children?: ReactNode;\n  showLabelColumn?: boolean;\n  axisType?: ColumnAxisType;\n  className?: string;\n  clipUnits?: boolean;\n  maxInternalColumns?: number;\n  // Space between sections\n  verticalSpacing?: number;\n  // Whether to render unconformity labels\n  unconformityLabels?: boolean;\n}\n\nexport interface SectionProps extends SectionSharedProps {\n  units: ExtUnit[];\n  scaleInfo: PackageScaleLayoutData;\n}\n\nexport function SectionsColumn(props: SectionSharedProps) {\n  const {\n    unconformityLabels = true,\n    unitComponent,\n    unitComponentProps,\n    showLabels = true,\n    width = 300,\n    columnWidth = 150,\n    showLabelColumn = true,\n    clipUnits = true,\n    maxInternalColumns,\n  } = props;\n\n  const units = useMacrostratUnits();\n\n  // Get a unique key for the column\n  const key = units[0]?.col_id;\n\n  return h(LabelTrackerProvider, { units, key }, [\n    h(SectionUnitsColumn, {\n      width: columnWidth,\n      unitComponent,\n      unitComponentProps,\n      showLabels,\n      clipUnits,\n      maxInternalColumns,\n      unconformityLabels,\n    }),\n    h.if(showLabelColumn)(SectionLabelsColumn, {\n      width: width - columnWidth,\n    }),\n  ]);\n}\n\nfunction SectionUnitsColumn(props: SectionSharedProps) {\n  const {\n    width,\n    showLabels,\n    unitComponent,\n    unitComponentProps,\n    clipUnits,\n    maxInternalColumns,\n    axisType,\n    unconformityLabels = true,\n  } = props;\n\n  const { sections, totalHeight } = useMacrostratColumnData();\n\n  const scaleData: PackageScaleLayoutData[] = sections.map((section) => {\n    return section.scaleInfo;\n  });\n\n  const innerWidth = width - 2;\n\n  return h(\"div.section-units-container\", { style: { width } }, [\n    h(\n      SVG,\n      {\n        className: \"sections\",\n        height: totalHeight,\n        innerWidth,\n        paddingH: 1,\n      },\n      sections.map((group) => {\n        const { units, scaleInfo, section_id } = group;\n\n        const key = `section-${section_id}`;\n        return h(\n          SectionUnits,\n          {\n            units,\n            scaleInfo,\n            key,\n            unitComponent,\n            unitComponentProps,\n            showLabels,\n            width: innerWidth,\n            clipUnits,\n            maxInternalColumns,\n          }, // This unconformity is with the section _above_\n        );\n      }),\n    ),\n    h.if(unconformityLabels)(UnconformityLabels, {\n      width,\n      sections: scaleData,\n      verbose: false,\n    }),\n  ]);\n}\n\nfunction SectionUnits(props: SectionProps) {\n  // Section with \"squishy\" timescale\n  const {\n    units,\n    scaleInfo,\n    unitComponent,\n    showLabels = true,\n    width = 300,\n    unitComponentProps,\n    className,\n    clipUnits = true,\n    maxInternalColumns,\n  } = props;\n\n  const { domain, pixelScale, pixelHeight, scale } = scaleInfo;\n\n  /** Ensure that we can arrange units into the maximum number\n   * of columns defined by unitComponentProps, but that we don't\n   * use more than necessary.\n   */\n  const _unitComponentProps = useMemo(() => {\n    return {\n      ...unitComponentProps,\n      nColumns: Math.min(\n        maxInternalColumns ?? Math.floor(width / 10),\n        unitComponentProps?.nColumns ?? Infinity,\n      ),\n      //axisType,\n    };\n  }, [units, unitComponentProps, maxInternalColumns, width]);\n\n  const style = {\n    \"--section-height\": `${pixelHeight}px`,\n    \"--section-width\": `${width}px`,\n  };\n\n  return h(\n    \"g.section\",\n    { className, style, transform: `translate(0 ${scaleInfo.offset})` },\n    h(\n      MacrostratColumnProvider,\n      {\n        units,\n        domain,\n        pixelScale, // Actually pixels per myr,\n        scale,\n      },\n      h(CompositeUnitsColumn, {\n        width,\n        showLabels,\n        unitComponent,\n        unitComponentProps: _unitComponentProps,\n        clipToFrame: clipUnits,\n      }),\n    ),\n  );\n}\n\ninterface CompositeTimescaleProps {\n  levels?: [number, number] | number;\n  unconformityLabels?: boolean;\n  onClickInterval?: TimescaleClickHandler;\n  /** Per-interval style (e.g. to highlight the currently selected interval). */\n  intervalStyle?: IntervalStyleBuilder;\n}\n\nexport function CompositeTimescale(props: CompositeTimescaleProps) {\n  const { sections } = useMacrostratColumnData();\n  const sectionScales = sections.map((section) => {\n    return section.scaleInfo;\n  });\n\n  return h(CompositeTimescaleCore, {\n    packages: sectionScales,\n    ...props,\n  });\n}\n\ntype CompositeTimescaleCoreProps = CompositeTimescaleProps & {\n  packages: PackageScaleLayoutData[];\n  onClickInterval?: TimescaleClickHandler;\n};\n\nexport function CompositeTimescaleCore(props: CompositeTimescaleCoreProps) {\n  const {\n    levels = 3,\n    packages,\n    unconformityLabels = false,\n    onClickInterval,\n    intervalStyle,\n  } = props;\n\n  // Use intervals from Macrostrat API\n  const baseURL = useMacrostratBaseURL();\n  const intervals = useMacrostratIntervals({ baseURL });\n\n  let _levels: [number, number];\n  if (typeof levels === \"number\") {\n    // If levels is a number, use the most common starting level\n    _levels = [2, Math.max(2 + Math.min(levels, 5) - 1, 1)];\n  } else {\n    _levels = levels;\n  }\n\n  const nCols = _levels[1] - _levels[0] + 1;\n\n  return h(\"div.timescale-column\", [\n    h(\n      \"div.timescales\",\n      packages.map((group) => {\n        const { pixelHeight, paddingTop, key, scale } = group;\n        return h(\n          \"div.timescale-container\",\n          { style: { paddingTop, \"--timescale-level-count\": nCols }, key },\n          [\n            h(Timescale, {\n              orientation: TimescaleOrientation.VERTICAL,\n              length: pixelHeight,\n              levels: _levels,\n              absoluteAgeScale: true,\n              showAgeAxis: false,\n              scale,\n              intervals,\n              onClick: onClickInterval,\n              intervalStyle,\n            }),\n          ],\n        );\n      }),\n    ),\n    h.if(unconformityLabels)(UnconformityLabels, {\n      width: \"100%\",\n      sections: packages,\n      className: \"unconformity-labels\",\n      axisType: ColumnAxisType.AGE,\n    }),\n  ]);\n}\n\nexport function UnconformityLabels(props: {\n  width: string | number;\n  sections: PackageScaleLayoutData[];\n  axisType?: ColumnAxisType;\n  className?: string;\n  verbose?: boolean;\n}) {\n  const { width, sections, className, axisType, verbose } = props;\n\n  return h(\n    \"div.unconformity-labels\",\n    {\n      style: {\n        width,\n      },\n      className,\n    },\n    sections.map((scaleInfo, i) => {\n      const lastGroup = sections[i - 1];\n      const top = scaleInfo.offset - scaleInfo.paddingTop;\n      const upperAge = lastGroup?.domain[0];\n      const lowerAge = scaleInfo.domain[1];\n      return h(Unconformity, {\n        axisType,\n        upperAge,\n        lowerAge,\n        style: {\n          width,\n          height: scaleInfo.paddingTop,\n          top,\n        },\n        verbose,\n      });\n    }),\n  );\n}\n\nfunction Unconformity({\n  upperAge,\n  lowerAge,\n  style,\n  axisType,\n  verbose = false,\n}) {\n  if (upperAge == null || lowerAge == null) {\n    return null;\n  }\n\n  const ageGap = Math.abs(upperAge - lowerAge);\n\n  let maximumFractionDigits = 0;\n\n  let className: string = null;\n  if (ageGap > 1000) {\n    className = \"giga\";\n  } else if (ageGap > 100) {\n    className = \"mega\";\n  } else if (ageGap > 10) {\n    className = \"large\";\n  } else if (ageGap < 1) {\n    className = \"small\";\n    maximumFractionDigits = 2;\n  } else {\n    maximumFractionDigits = 1;\n  }\n\n  let val: ReactNode;\n  if (axisType === ColumnAxisType.DEPTH || axisType === ColumnAxisType.HEIGHT) {\n    const _txt = ageGap.toLocaleString(\"en-US\", { maximumFractionDigits });\n    val = h(Value, { value: _txt, unit: \"m\" });\n  } else {\n    val = h(Duration, { value: ageGap, maximumFractionDigits });\n  }\n\n  let prefix: ReactNode = null;\n  if (verbose) {\n    prefix = h([\" \", h(\"span.prefix\", \" gap\")]);\n  }\n\n  return h(\"div.unconformity\", { style, className }, [\n    h(\"div.unconformity-inner\", h(\"div.unconformity-text\", [val, prefix])),\n  ]);\n}\n"],"names":["hyper","styles","useMacrostratUnits","LabelTrackerProvider","SectionLabelsColumn","useMacrostratColumnData","SVG","useMemo","MacrostratColumnProvider","CompositeUnitsColumn","useMacrostratBaseURL","useMacrostratIntervals","Timescale","TimescaleOrientation","ColumnAxisType","Value","Duration"],"mappings":"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"}

package/dist/section.d.ts

@@ -1,5 +1,5 @@
 import { ReactNode, FunctionComponent } from 'react';
-import { TimescaleClickHandler } from '@macrostrat/timescale';
+import { TimescaleClickHandler, IntervalStyleBuilder } from '@macrostrat/timescale';
 import { ColumnAxisType } from '@macrostrat/column-components';
 import { ExtUnit, PackageScaleLayoutData } from './prepare-units/types';
 export interface SectionSharedProps {
@@ -25,6 +25,9 @@ export declare function SectionsColumn(props: SectionSharedProps): import('react
 interface CompositeTimescaleProps {
     levels?: [number, number] | number;
     unconformityLabels?: boolean;
+    onClickInterval?: TimescaleClickHandler;
+    /** Per-interval style (e.g. to highlight the currently selected interval). */
+    intervalStyle?: IntervalStyleBuilder;
 }
 export declare function CompositeTimescale(props: CompositeTimescaleProps): import('react').FunctionComponentElement<CompositeTimescaleCoreProps>;
 type CompositeTimescaleCoreProps = CompositeTimescaleProps & {

package/dist/section.js

@@ -154,7 +154,8 @@ function CompositeTimescaleCore(props) {
     levels = 3,
     packages,
     unconformityLabels = false,
-    onClickInterval
+    onClickInterval,
+    intervalStyle
   } = props;
   const baseURL = useMacrostratBaseURL();
   const intervals = useMacrostratIntervals({ baseURL });
@@ -182,7 +183,8 @@ function CompositeTimescaleCore(props) {
               showAgeAxis: false,
               scale,
               intervals,
-              onClick: onClickInterval
+              onClick: onClickInterval,
+              intervalStyle
             })
           ]
         );

package/dist/section.js.map

@@ -1 +1 @@
-{"version":3,"file":"section.js","sources":["../src/section.ts"],"sourcesContent":["import {\n  CompositeUnitsColumn,\n  LabelTrackerProvider,\n  SectionLabelsColumn,\n} from \"./units\";\nimport { ReactNode, FunctionComponent, useMemo } from \"react\";\nimport {\n  Timescale,\n  TimescaleOrientation,\n  TimescaleClickHandler,\n  useMacrostratIntervals,\n} from \"@macrostrat/timescale\";\nimport { ColumnAxisType, SVG } from \"@macrostrat/column-components\";\nimport hyper from \"@macrostrat/hyper\";\nimport styles from \"./column.module.sass\";\nimport {\n  useMacrostratColumnData,\n  useMacrostratUnits,\n  MacrostratColumnProvider,\n} from \"./data-provider\";\nimport {\n  useMacrostratBaseURL,\n  useMacrostratData,\n} from \"@macrostrat/data-provider\";\nimport { Duration } from \"./unit-details\";\nimport { Value } from \"@macrostrat/data-components\";\nimport type { ExtUnit, PackageScaleLayoutData } from \"./prepare-units/types\";\n\nconst h = hyper.styled(styles);\n\nexport interface SectionSharedProps {\n  unitComponent?: FunctionComponent<any>;\n  unitComponentProps?: any;\n  showLabels?: boolean;\n  width?: number;\n  columnWidth?: number;\n  children?: ReactNode;\n  showLabelColumn?: boolean;\n  axisType?: ColumnAxisType;\n  className?: string;\n  clipUnits?: boolean;\n  maxInternalColumns?: number;\n  // Space between sections\n  verticalSpacing?: number;\n  // Whether to render unconformity labels\n  unconformityLabels?: boolean;\n}\n\nexport interface SectionProps extends SectionSharedProps {\n  units: ExtUnit[];\n  scaleInfo: PackageScaleLayoutData;\n}\n\nexport function SectionsColumn(props: SectionSharedProps) {\n  const {\n    unconformityLabels = true,\n    unitComponent,\n    unitComponentProps,\n    showLabels = true,\n    width = 300,\n    columnWidth = 150,\n    showLabelColumn = true,\n    clipUnits = true,\n    maxInternalColumns,\n  } = props;\n\n  const units = useMacrostratUnits();\n\n  // Get a unique key for the column\n  const key = units[0]?.col_id;\n\n  return h(LabelTrackerProvider, { units, key }, [\n    h(SectionUnitsColumn, {\n      width: columnWidth,\n      unitComponent,\n      unitComponentProps,\n      showLabels,\n      clipUnits,\n      maxInternalColumns,\n      unconformityLabels,\n    }),\n    h.if(showLabelColumn)(SectionLabelsColumn, {\n      width: width - columnWidth,\n    }),\n  ]);\n}\n\nfunction SectionUnitsColumn(props: SectionSharedProps) {\n  const {\n    width,\n    showLabels,\n    unitComponent,\n    unitComponentProps,\n    clipUnits,\n    maxInternalColumns,\n    axisType,\n    unconformityLabels = true,\n  } = props;\n\n  const { sections, totalHeight } = useMacrostratColumnData();\n\n  const scaleData: PackageScaleLayoutData[] = sections.map((section) => {\n    return section.scaleInfo;\n  });\n\n  const innerWidth = width - 2;\n\n  return h(\"div.section-units-container\", { style: { width } }, [\n    h(\n      SVG,\n      {\n        className: \"sections\",\n        height: totalHeight,\n        innerWidth,\n        paddingH: 1,\n      },\n      sections.map((group) => {\n        const { units, scaleInfo, section_id } = group;\n\n        const key = `section-${section_id}`;\n        return h(\n          SectionUnits,\n          {\n            units,\n            scaleInfo,\n            key,\n            unitComponent,\n            unitComponentProps,\n            showLabels,\n            width: innerWidth,\n            clipUnits,\n            maxInternalColumns,\n          }, // This unconformity is with the section _above_\n        );\n      }),\n    ),\n    h.if(unconformityLabels)(UnconformityLabels, {\n      width,\n      sections: scaleData,\n      verbose: false,\n    }),\n  ]);\n}\n\nfunction SectionUnits(props: SectionProps) {\n  // Section with \"squishy\" timescale\n  const {\n    units,\n    scaleInfo,\n    unitComponent,\n    showLabels = true,\n    width = 300,\n    unitComponentProps,\n    className,\n    clipUnits = true,\n    maxInternalColumns,\n  } = props;\n\n  const { domain, pixelScale, pixelHeight, scale } = scaleInfo;\n\n  /** Ensure that we can arrange units into the maximum number\n   * of columns defined by unitComponentProps, but that we don't\n   * use more than necessary.\n   */\n  const _unitComponentProps = useMemo(() => {\n    return {\n      ...unitComponentProps,\n      nColumns: Math.min(\n        maxInternalColumns ?? Math.floor(width / 10),\n        unitComponentProps?.nColumns ?? Infinity,\n      ),\n      //axisType,\n    };\n  }, [units, unitComponentProps, maxInternalColumns, width]);\n\n  const style = {\n    \"--section-height\": `${pixelHeight}px`,\n    \"--section-width\": `${width}px`,\n  };\n\n  return h(\n    \"g.section\",\n    { className, style, transform: `translate(0 ${scaleInfo.offset})` },\n    h(\n      MacrostratColumnProvider,\n      {\n        units,\n        domain,\n        pixelScale, // Actually pixels per myr,\n        scale,\n      },\n      h(CompositeUnitsColumn, {\n        width,\n        showLabels,\n        unitComponent,\n        unitComponentProps: _unitComponentProps,\n        clipToFrame: clipUnits,\n      }),\n    ),\n  );\n}\n\ninterface CompositeTimescaleProps {\n  levels?: [number, number] | number;\n  unconformityLabels?: boolean;\n}\n\nexport function CompositeTimescale(props: CompositeTimescaleProps) {\n  const { sections } = useMacrostratColumnData();\n  const sectionScales = sections.map((section) => {\n    return section.scaleInfo;\n  });\n\n  return h(CompositeTimescaleCore, {\n    packages: sectionScales,\n    ...props,\n  });\n}\n\ntype CompositeTimescaleCoreProps = CompositeTimescaleProps & {\n  packages: PackageScaleLayoutData[];\n  onClickInterval?: TimescaleClickHandler;\n};\n\nexport function CompositeTimescaleCore(props: CompositeTimescaleCoreProps) {\n  const {\n    levels = 3,\n    packages,\n    unconformityLabels = false,\n    onClickInterval,\n  } = props;\n\n  // Use intervals from Macrostrat API\n  const baseURL = useMacrostratBaseURL();\n  const intervals = useMacrostratIntervals({ baseURL });\n\n  let _levels: [number, number];\n  if (typeof levels === \"number\") {\n    // If levels is a number, use the most common starting level\n    _levels = [2, Math.max(2 + Math.min(levels, 5) - 1, 1)];\n  } else {\n    _levels = levels;\n  }\n\n  const nCols = _levels[1] - _levels[0] + 1;\n\n  return h(\"div.timescale-column\", [\n    h(\n      \"div.timescales\",\n      packages.map((group) => {\n        const { pixelHeight, paddingTop, key, scale } = group;\n        return h(\n          \"div.timescale-container\",\n          { style: { paddingTop, \"--timescale-level-count\": nCols }, key },\n          [\n            h(Timescale, {\n              orientation: TimescaleOrientation.VERTICAL,\n              length: pixelHeight,\n              levels: _levels,\n              absoluteAgeScale: true,\n              showAgeAxis: false,\n              scale,\n              intervals,\n              onClick: onClickInterval,\n            }),\n          ],\n        );\n      }),\n    ),\n    h.if(unconformityLabels)(UnconformityLabels, {\n      width: \"100%\",\n      sections: packages,\n      className: \"unconformity-labels\",\n      axisType: ColumnAxisType.AGE,\n    }),\n  ]);\n}\n\nexport function UnconformityLabels(props: {\n  width: string | number;\n  sections: PackageScaleLayoutData[];\n  axisType?: ColumnAxisType;\n  className?: string;\n  verbose?: boolean;\n}) {\n  const { width, sections, className, axisType, verbose } = props;\n\n  return h(\n    \"div.unconformity-labels\",\n    {\n      style: {\n        width,\n      },\n      className,\n    },\n    sections.map((scaleInfo, i) => {\n      const lastGroup = sections[i - 1];\n      const top = scaleInfo.offset - scaleInfo.paddingTop;\n      const upperAge = lastGroup?.domain[0];\n      const lowerAge = scaleInfo.domain[1];\n      return h(Unconformity, {\n        axisType,\n        upperAge,\n        lowerAge,\n        style: {\n          width,\n          height: scaleInfo.paddingTop,\n          top,\n        },\n        verbose,\n      });\n    }),\n  );\n}\n\nfunction Unconformity({\n  upperAge,\n  lowerAge,\n  style,\n  axisType,\n  verbose = false,\n}) {\n  if (upperAge == null || lowerAge == null) {\n    return null;\n  }\n\n  const ageGap = Math.abs(upperAge - lowerAge);\n\n  let maximumFractionDigits = 0;\n\n  let className: string = null;\n  if (ageGap > 1000) {\n    className = \"giga\";\n  } else if (ageGap > 100) {\n    className = \"mega\";\n  } else if (ageGap > 10) {\n    className = \"large\";\n  } else if (ageGap < 1) {\n    className = \"small\";\n    maximumFractionDigits = 2;\n  } else {\n    maximumFractionDigits = 1;\n  }\n\n  let val: ReactNode;\n  if (axisType === ColumnAxisType.DEPTH || axisType === ColumnAxisType.HEIGHT) {\n    const _txt = ageGap.toLocaleString(\"en-US\", { maximumFractionDigits });\n    val = h(Value, { value: _txt, unit: \"m\" });\n  } else {\n    val = h(Duration, { value: ageGap, maximumFractionDigits });\n  }\n\n  let prefix: ReactNode = null;\n  if (verbose) {\n    prefix = h([\" \", h(\"span.prefix\", \" gap\")]);\n  }\n\n  return h(\"div.unconformity\", { style, className }, [\n    h(\"div.unconformity-inner\", h(\"div.unconformity-text\", [val, prefix])),\n  ]);\n}\n"],"names":["hyper","styles"],"mappings":"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"}
+{"version":3,"file":"section.js","sources":["../src/section.ts"],"sourcesContent":["import {\n  CompositeUnitsColumn,\n  LabelTrackerProvider,\n  SectionLabelsColumn,\n} from \"./units\";\nimport { ReactNode, FunctionComponent, useMemo } from \"react\";\nimport {\n  Timescale,\n  TimescaleOrientation,\n  TimescaleClickHandler,\n  useMacrostratIntervals,\n  type IntervalStyleBuilder,\n} from \"@macrostrat/timescale\";\nimport { ColumnAxisType, SVG } from \"@macrostrat/column-components\";\nimport hyper from \"@macrostrat/hyper\";\nimport styles from \"./column.module.sass\";\nimport {\n  useMacrostratColumnData,\n  useMacrostratUnits,\n  MacrostratColumnProvider,\n} from \"./data-provider\";\nimport {\n  useMacrostratBaseURL,\n  useMacrostratData,\n} from \"@macrostrat/data-provider\";\nimport { Duration } from \"./unit-details\";\nimport { Value } from \"@macrostrat/data-components\";\nimport type { ExtUnit, PackageScaleLayoutData } from \"./prepare-units/types\";\n\nconst h = hyper.styled(styles);\n\nexport interface SectionSharedProps {\n  unitComponent?: FunctionComponent<any>;\n  unitComponentProps?: any;\n  showLabels?: boolean;\n  width?: number;\n  columnWidth?: number;\n  children?: ReactNode;\n  showLabelColumn?: boolean;\n  axisType?: ColumnAxisType;\n  className?: string;\n  clipUnits?: boolean;\n  maxInternalColumns?: number;\n  // Space between sections\n  verticalSpacing?: number;\n  // Whether to render unconformity labels\n  unconformityLabels?: boolean;\n}\n\nexport interface SectionProps extends SectionSharedProps {\n  units: ExtUnit[];\n  scaleInfo: PackageScaleLayoutData;\n}\n\nexport function SectionsColumn(props: SectionSharedProps) {\n  const {\n    unconformityLabels = true,\n    unitComponent,\n    unitComponentProps,\n    showLabels = true,\n    width = 300,\n    columnWidth = 150,\n    showLabelColumn = true,\n    clipUnits = true,\n    maxInternalColumns,\n  } = props;\n\n  const units = useMacrostratUnits();\n\n  // Get a unique key for the column\n  const key = units[0]?.col_id;\n\n  return h(LabelTrackerProvider, { units, key }, [\n    h(SectionUnitsColumn, {\n      width: columnWidth,\n      unitComponent,\n      unitComponentProps,\n      showLabels,\n      clipUnits,\n      maxInternalColumns,\n      unconformityLabels,\n    }),\n    h.if(showLabelColumn)(SectionLabelsColumn, {\n      width: width - columnWidth,\n    }),\n  ]);\n}\n\nfunction SectionUnitsColumn(props: SectionSharedProps) {\n  const {\n    width,\n    showLabels,\n    unitComponent,\n    unitComponentProps,\n    clipUnits,\n    maxInternalColumns,\n    axisType,\n    unconformityLabels = true,\n  } = props;\n\n  const { sections, totalHeight } = useMacrostratColumnData();\n\n  const scaleData: PackageScaleLayoutData[] = sections.map((section) => {\n    return section.scaleInfo;\n  });\n\n  const innerWidth = width - 2;\n\n  return h(\"div.section-units-container\", { style: { width } }, [\n    h(\n      SVG,\n      {\n        className: \"sections\",\n        height: totalHeight,\n        innerWidth,\n        paddingH: 1,\n      },\n      sections.map((group) => {\n        const { units, scaleInfo, section_id } = group;\n\n        const key = `section-${section_id}`;\n        return h(\n          SectionUnits,\n          {\n            units,\n            scaleInfo,\n            key,\n            unitComponent,\n            unitComponentProps,\n            showLabels,\n            width: innerWidth,\n            clipUnits,\n            maxInternalColumns,\n          }, // This unconformity is with the section _above_\n        );\n      }),\n    ),\n    h.if(unconformityLabels)(UnconformityLabels, {\n      width,\n      sections: scaleData,\n      verbose: false,\n    }),\n  ]);\n}\n\nfunction SectionUnits(props: SectionProps) {\n  // Section with \"squishy\" timescale\n  const {\n    units,\n    scaleInfo,\n    unitComponent,\n    showLabels = true,\n    width = 300,\n    unitComponentProps,\n    className,\n    clipUnits = true,\n    maxInternalColumns,\n  } = props;\n\n  const { domain, pixelScale, pixelHeight, scale } = scaleInfo;\n\n  /** Ensure that we can arrange units into the maximum number\n   * of columns defined by unitComponentProps, but that we don't\n   * use more than necessary.\n   */\n  const _unitComponentProps = useMemo(() => {\n    return {\n      ...unitComponentProps,\n      nColumns: Math.min(\n        maxInternalColumns ?? Math.floor(width / 10),\n        unitComponentProps?.nColumns ?? Infinity,\n      ),\n      //axisType,\n    };\n  }, [units, unitComponentProps, maxInternalColumns, width]);\n\n  const style = {\n    \"--section-height\": `${pixelHeight}px`,\n    \"--section-width\": `${width}px`,\n  };\n\n  return h(\n    \"g.section\",\n    { className, style, transform: `translate(0 ${scaleInfo.offset})` },\n    h(\n      MacrostratColumnProvider,\n      {\n        units,\n        domain,\n        pixelScale, // Actually pixels per myr,\n        scale,\n      },\n      h(CompositeUnitsColumn, {\n        width,\n        showLabels,\n        unitComponent,\n        unitComponentProps: _unitComponentProps,\n        clipToFrame: clipUnits,\n      }),\n    ),\n  );\n}\n\ninterface CompositeTimescaleProps {\n  levels?: [number, number] | number;\n  unconformityLabels?: boolean;\n  onClickInterval?: TimescaleClickHandler;\n  /** Per-interval style (e.g. to highlight the currently selected interval). */\n  intervalStyle?: IntervalStyleBuilder;\n}\n\nexport function CompositeTimescale(props: CompositeTimescaleProps) {\n  const { sections } = useMacrostratColumnData();\n  const sectionScales = sections.map((section) => {\n    return section.scaleInfo;\n  });\n\n  return h(CompositeTimescaleCore, {\n    packages: sectionScales,\n    ...props,\n  });\n}\n\ntype CompositeTimescaleCoreProps = CompositeTimescaleProps & {\n  packages: PackageScaleLayoutData[];\n  onClickInterval?: TimescaleClickHandler;\n};\n\nexport function CompositeTimescaleCore(props: CompositeTimescaleCoreProps) {\n  const {\n    levels = 3,\n    packages,\n    unconformityLabels = false,\n    onClickInterval,\n    intervalStyle,\n  } = props;\n\n  // Use intervals from Macrostrat API\n  const baseURL = useMacrostratBaseURL();\n  const intervals = useMacrostratIntervals({ baseURL });\n\n  let _levels: [number, number];\n  if (typeof levels === \"number\") {\n    // If levels is a number, use the most common starting level\n    _levels = [2, Math.max(2 + Math.min(levels, 5) - 1, 1)];\n  } else {\n    _levels = levels;\n  }\n\n  const nCols = _levels[1] - _levels[0] + 1;\n\n  return h(\"div.timescale-column\", [\n    h(\n      \"div.timescales\",\n      packages.map((group) => {\n        const { pixelHeight, paddingTop, key, scale } = group;\n        return h(\n          \"div.timescale-container\",\n          { style: { paddingTop, \"--timescale-level-count\": nCols }, key },\n          [\n            h(Timescale, {\n              orientation: TimescaleOrientation.VERTICAL,\n              length: pixelHeight,\n              levels: _levels,\n              absoluteAgeScale: true,\n              showAgeAxis: false,\n              scale,\n              intervals,\n              onClick: onClickInterval,\n              intervalStyle,\n            }),\n          ],\n        );\n      }),\n    ),\n    h.if(unconformityLabels)(UnconformityLabels, {\n      width: \"100%\",\n      sections: packages,\n      className: \"unconformity-labels\",\n      axisType: ColumnAxisType.AGE,\n    }),\n  ]);\n}\n\nexport function UnconformityLabels(props: {\n  width: string | number;\n  sections: PackageScaleLayoutData[];\n  axisType?: ColumnAxisType;\n  className?: string;\n  verbose?: boolean;\n}) {\n  const { width, sections, className, axisType, verbose } = props;\n\n  return h(\n    \"div.unconformity-labels\",\n    {\n      style: {\n        width,\n      },\n      className,\n    },\n    sections.map((scaleInfo, i) => {\n      const lastGroup = sections[i - 1];\n      const top = scaleInfo.offset - scaleInfo.paddingTop;\n      const upperAge = lastGroup?.domain[0];\n      const lowerAge = scaleInfo.domain[1];\n      return h(Unconformity, {\n        axisType,\n        upperAge,\n        lowerAge,\n        style: {\n          width,\n          height: scaleInfo.paddingTop,\n          top,\n        },\n        verbose,\n      });\n    }),\n  );\n}\n\nfunction Unconformity({\n  upperAge,\n  lowerAge,\n  style,\n  axisType,\n  verbose = false,\n}) {\n  if (upperAge == null || lowerAge == null) {\n    return null;\n  }\n\n  const ageGap = Math.abs(upperAge - lowerAge);\n\n  let maximumFractionDigits = 0;\n\n  let className: string = null;\n  if (ageGap > 1000) {\n    className = \"giga\";\n  } else if (ageGap > 100) {\n    className = \"mega\";\n  } else if (ageGap > 10) {\n    className = \"large\";\n  } else if (ageGap < 1) {\n    className = \"small\";\n    maximumFractionDigits = 2;\n  } else {\n    maximumFractionDigits = 1;\n  }\n\n  let val: ReactNode;\n  if (axisType === ColumnAxisType.DEPTH || axisType === ColumnAxisType.HEIGHT) {\n    const _txt = ageGap.toLocaleString(\"en-US\", { maximumFractionDigits });\n    val = h(Value, { value: _txt, unit: \"m\" });\n  } else {\n    val = h(Duration, { value: ageGap, maximumFractionDigits });\n  }\n\n  let prefix: ReactNode = null;\n  if (verbose) {\n    prefix = h([\" \", h(\"span.prefix\", \" gap\")]);\n  }\n\n  return h(\"div.unconformity\", { style, className }, [\n    h(\"div.unconformity-inner\", h(\"div.unconformity-text\", [val, prefix])),\n  ]);\n}\n"],"names":["hyper","styles"],"mappings":"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"}

package/dist/units/boxes.cjs

@@ -4,16 +4,17 @@ 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);
 const classNames__default = /* @__PURE__ */ _interopDefault(classNames);
 const h = h__default.default.styled(boxes_module.default);
+const cls = (name) => boxes_module.default[name] ?? name;
 function useUnitRect(division, options = {}) {
   const {
     widthFraction = 1,
@@ -56,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 });
@@ -70,55 +71,33 @@ function Unit(props) {
       }
     },
     [
-      h(UnitRect, {
+      h(columnComponents.ClippableRect, {
         ...bounds,
         fill: backgroundColor,
         onClick,
-        className: "background"
+        className: cls("background")
       }),
-      h(UnitRect, {
+      h(columnComponents.ClippableRect, {
         ref,
         ...bounds,
         fill: _fill,
         //mask,
         onClick,
-        className: "unit"
+        className: cls("unit")
+      }),
+      h.if(linked)(columnComponents.ClippableRect, {
+        ...bounds,
+        className: cls("linked-overlay")
+      }),
+      h.if(selected)(columnComponents.ClippableRect, {
+        ...bounds,
+        className: cls("selection-overlay")
       }),
-      h.if(linked)(UnitRect, { ...bounds, className: "linked-overlay" }),
-      h.if(selected)(UnitRect, { ...bounds, className: "selection-overlay" }),
       //defs,
       children
     ]
   );
 }
-const UnitRect = React.forwardRef((props, ref) => {
-  const {
-    x,
-    y,
-    width,
-    height,
-    overflowTop = false,
-    overflowBottom = false,
-    ...rest
-  } = props;
-  if (!overflowTop && !overflowBottom) {
-    return h("rect", {
-      x,
-      y,
-      width,
-      height,
-      ref,
-      ...rest
-    });
-  } else {
-    const d = columnComponents.zigZagBoxPath(x, y, width, height, overflowTop, overflowBottom);
-    return h("path", {
-      d,
-      ref,
-      ...rest
-    });
-  }
-});
 function LabeledUnit(props) {
   const {
     division,
@@ -132,12 +111,13 @@ function LabeledUnit(props) {
     // not sure why this is brought in...
     ...baseBounds
   } = props;
-  const { axisType } = columnComponents.useColumn();
+  const { axisType, isTransitioning, hideLabelsWhileTransitioning } = columnComponents.useColumn();
   const bounds = {
     ...useUnitRect(division, { widthFraction, axisType }),
     ...baseBounds
   };
   const { width, height } = bounds;
+  const skipLabel = isTransitioning && hideLabelsWhileTransitioning;
   return h(
     Unit,
     {
@@ -148,7 +128,7 @@ function LabeledUnit(props) {
       ...bounds
     },
     [
-      h.if(showLabel)(
+      h.if(showLabel && !skipLabel)(
         columnComponents.ForeignObject,
         { ...bounds, className: "unit-label-container" },
         h(uiComponents.SizeAwareLabel, {
@@ -156,6 +136,9 @@ function LabeledUnit(props) {
           labelClassName: "unit-label",
           style: { width, height },
           label,
+          // Re-fit the label when a transition settles (isTransitioning flips),
+          // not on every intermediate frame.
+          remeasureKey: isTransitioning,
           onVisibilityChanged(viz) {
             onLabelUpdated(label, viz);
           }
@@ -182,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)
   );
 }