@macrostrat/column-views 3.11.0 → 3.12.1

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

@@ -45,6 +45,11 @@ export interface ColumnDataProviderProps<T extends BaseUnit> extends MacrostratC
     ref: RefObject<ColumnRef>;
 }
 export declare function MacrostratColumnDataProvider<T extends BaseUnit>({ children, units, sections, totalHeight, axisType, allowUnitSelection, onUnitSelected, selectedUnit, isTransitioning, hideLabelsWhileTransitioning, ref, }: ColumnDataProviderProps<T>): import('react').FunctionComponentElement<ColumnStateProviderProps<BaseUnit>>;
+/** Claim the column's label column for this component while it is mounted:
+ * the unit labels are hidden in favor of whatever the caller draws there. */
+export declare function useClaimLabelColumn(active?: boolean): void;
+/** Whether a child of the column has claimed the label column */
+export declare function useLabelColumnClaimed(): boolean;
 export declare function UnitSelectionProvider(props: ColumnStateProviderProps<any>): import('react').FunctionComponentElement<ColumnStateProviderProps<BaseUnit>>;
 export declare function useMacrostratColumnData(): MacrostratColumnDataContext<any>;
 export declare function useMacrostratUnits(): any;

package/dist/data-provider/store.js

@@ -1,4 +1,4 @@
-import { useEffect, useMemo, useContext, createContext } from "react";
+import { useEffect, useMemo, useContext, createContext, useState, useCallback } from "react";
 import h from "@macrostrat/hyper";
 import { createCompositeScale } from "../prepare-units/composite-scale.js";
 import { ColumnProvider } from "@macrostrat/column-components";
@@ -98,10 +98,41 @@ function MacrostratColumnDataProvider({
     },
     [
       h(ColumnRefManager, { ref }),
-      h(MacrostratColumnDataContext.Provider, { value }, children)
+      h(
+        MacrostratColumnDataContext.Provider,
+        { value },
+        h(ColumnLayoutOverridesProvider, null, children)
+      )
     ]
   );
 }
+const ColumnLayoutOverridesContext = createContext({
+  labelColumnClaims: 0,
+  claimLabelColumn: () => () => {
+  }
+});
+function ColumnLayoutOverridesProvider({ children }) {
+  const [labelColumnClaims, setClaims] = useState(0);
+  const claimLabelColumn = useCallback(() => {
+    setClaims((n) => n + 1);
+    return () => setClaims((n) => Math.max(n - 1, 0));
+  }, []);
+  const value = useMemo(
+    () => ({ labelColumnClaims, claimLabelColumn }),
+    [labelColumnClaims, claimLabelColumn]
+  );
+  return h(ColumnLayoutOverridesContext.Provider, { value }, children);
+}
+function useClaimLabelColumn(active = true) {
+  const { claimLabelColumn } = useContext(ColumnLayoutOverridesContext);
+  useEffect(() => {
+    if (!active) return;
+    return claimLabelColumn();
+  }, [active, claimLabelColumn]);
+}
+function useLabelColumnClaimed() {
+  return useContext(ColumnLayoutOverridesContext).labelColumnClaims > 0;
+}
 function ColumnRefManager({ ref }) {
   const selectedUnitElement = scope.useAtomValue(selectedUnitElementAtom);
   useEffect(() => {
@@ -186,8 +217,10 @@ export {
   columnUnitsAtom,
   columnUnitsMapAtom,
   scope,
+  useClaimLabelColumn,
   useColumnUnitsMap,
   useCompositeScale,
+  useLabelColumnClaimed,
   useMacrostratColumnData,
   useMacrostratUnits
 };

package/dist/data-provider/store.js.map

@@ -1 +1 @@
-{"version":3,"file":"store.js","sources":["../../src/data-provider/store.ts"],"sourcesContent":["import {\n  createContext,\n  ReactNode,\n  RefObject,\n  useContext,\n  useMemo,\n} from \"react\";\nimport h from \"@macrostrat/hyper\";\nimport {\n  CompositeColumnScale,\n  createCompositeScale,\n} from \"../prepare-units/composite-scale\";\nimport { ColumnAxisType, ColumnProvider } from \"@macrostrat/column-components\";\nimport type { ExtUnit, PackageLayoutData } from \"../prepare-units\";\nimport {\n  allowUnitSelectionAtom,\n  selectedUnitIDAtom,\n  UnitSelectionCallbacks,\n  UnitSelectionCallbackManager,\n  selectedUnitElementAtom,\n} from \"./unit-selection\";\nimport type { BaseUnit } from \"@macrostrat/api-types\";\nimport {\n  type AtomMap,\n  createScopedStore,\n  StateIsolation,\n} from \"@macrostrat/scoped-store\";\nimport { atom } from \"jotai\";\nimport { useEffect } from \"react\";\n\nexport const scope: StateIsolation = createScopedStore();\n\nexport const columnUnitsAtom = atom<BaseUnit[]>();\n\nexport const columnUnitsMapAtom = atom<Map<number, BaseUnit> | null>((get) => {\n  const units = get(columnUnitsAtom);\n  if (!units) return null;\n  const unitMap = new Map<number, BaseUnit>();\n  units.forEach((unit) => {\n    unitMap.set(unit.unit_id, unit);\n  });\n  return unitMap;\n});\n\nexport interface ColumnStateProviderProps<\n  T extends BaseUnit,\n> extends Partial<UnitSelectionCallbacks> {\n  children: ReactNode;\n  units: T[];\n  selectedUnit: number | null;\n  allowUnitSelection?: boolean;\n}\n\nexport function MacrostratColumnStateProvider<T extends BaseUnit>({\n  children,\n  units,\n  allowUnitSelection = false,\n  onUnitSelected,\n  selectedUnit,\n}: ColumnStateProviderProps<T>) {\n  /** Top-level provider for Macrostrat column data.\n   * It is either provided by the Column component itself, or\n   * can be hoisted higher in the tree to provide a common data context\n   */\n\n  /* By default, unit selection is disabled. However, if any related props are passed,\n  we enable it.\n  */\n  const _allowSelection = useMemo(() => {\n    if (allowUnitSelection) {\n      return true;\n    }\n    return selectedUnit != null || onUnitSelected != null;\n  }, []);\n\n  // Check if we're already in a columnStateProvider, and render a no-op if so\n  const existingUnits = scope.useAtomValueIfExists(columnUnitsAtom);\n  if (existingUnits != null) {\n    if (allowUnitSelection || onUnitSelected || selectedUnit != null) {\n      console.warn(\n        \"MacrostratColumnStateProvider: unit selection props are ignored because a provider already exists in the tree\",\n      );\n    }\n    return children;\n  }\n\n  const atomMap: AtomMap = [\n    [columnUnitsAtom, units],\n    [allowUnitSelectionAtom, _allowSelection],\n    [selectedUnitIDAtom, selectedUnit],\n  ];\n\n  let selectionHandlers: ReactNode = null;\n  if (_allowSelection) {\n    selectionHandlers = h(UnitSelectionCallbackManager, { onUnitSelected });\n  }\n\n  return h(\n    scope.Provider,\n    {\n      atoms: atomMap,\n      keepUpdated: true,\n    },\n    [selectionHandlers, children],\n  );\n}\n\n/** Interface for imperative handlers that can\n * be invoked outside of the column's react context\n */\nexport interface ColumnRef {\n  scrollSelectedUnitIntoView(): void;\n}\n\nexport interface MacrostratColumnDataContext<T extends BaseUnit> {\n  units: T[];\n  sections: PackageLayoutData[];\n  totalHeight?: number;\n  axisType?: ColumnAxisType;\n  allowUnitSelection?: boolean;\n  /** True while the age window is animating; propagated to each section's\n   * `ColumnProvider` so per-frame label/pattern work can be skipped. */\n  isTransitioning?: boolean;\n  /** Hide unit labels while transitioning (perf escape hatch; default false). */\n  hideLabelsWhileTransitioning?: boolean;\n}\n\nexport interface ColumnDataProviderProps<T extends BaseUnit>\n  extends MacrostratColumnDataContext<T>, ColumnStateProviderProps<T> {\n  children: ReactNode;\n  ref: RefObject<ColumnRef>;\n}\n\nconst MacrostratColumnDataContext =\n  createContext<MacrostratColumnDataContext<any>>(null);\n\nexport function MacrostratColumnDataProvider<T extends BaseUnit>({\n  children,\n  units,\n  sections,\n  totalHeight,\n  axisType,\n  allowUnitSelection,\n  onUnitSelected,\n  selectedUnit,\n  isTransitioning,\n  hideLabelsWhileTransitioning,\n  ref,\n}: ColumnDataProviderProps<T>) {\n  /** Internal provider for Macrostrat column data.\n   * As a general rule, we want to provide data and column-axis\n   * height calculations through the context, since these need to\n   * be accessed by any component that lays out information on the\n   * column.\n   *\n   * Cross-axis layout and view configuration (e.g., showing and hiding\n   * of different components or labels) should be handled through passing\n   * props to the components themselves.\n   * */\n\n  const value = useMemo(() => {\n    // For now, change ordinal axis types to age axis types\n    return {\n      units,\n      sections,\n      totalHeight,\n      axisType,\n      isTransitioning,\n      hideLabelsWhileTransitioning,\n    };\n  }, [\n    units,\n    sections,\n    totalHeight,\n    axisType,\n    isTransitioning,\n    hideLabelsWhileTransitioning,\n  ]);\n\n  return h(\n    MacrostratColumnStateProvider,\n    {\n      units,\n      allowUnitSelection,\n      onUnitSelected,\n      selectedUnit,\n      ref,\n    },\n    [\n      h(ColumnRefManager, { ref }),\n      h(MacrostratColumnDataContext.Provider, { value }, children),\n    ],\n  );\n}\n\nfunction ColumnRefManager({ ref }: { ref?: RefObject<ColumnRef> }) {\n  const selectedUnitElement = scope.useAtomValue(selectedUnitElementAtom);\n  useEffect(() => {\n    if (ref == null) return;\n    ref.current = {\n      scrollSelectedUnitIntoView(opts?: ScrollIntoViewOptions) {\n        selectedUnitElement?.scrollIntoView(\n          opts ?? {\n            behavior: \"smooth\",\n            block: \"center\",\n            inline: \"nearest\",\n          },\n        );\n      },\n    };\n  }, [ref, selectedUnitElement]);\n\n  return null;\n}\n\nexport function UnitSelectionProvider(props: ColumnStateProviderProps<any>) {\n  /* A basic unit selection provider without column data context.\n  Mostly for use with the CorrelationChart component.\n   */\n  return h(MacrostratColumnStateProvider, {\n    ...props,\n    allowUnitSelection: true,\n  });\n}\n\nexport function useMacrostratColumnData() {\n  const ctx = useContext(MacrostratColumnDataContext);\n  if (!ctx) {\n    throw new Error(\n      \"useMacrostratColumnData must be used within a MacrostratColumnDataProvider\",\n    );\n  }\n  return ctx;\n}\n\nexport function useMacrostratUnits() {\n  return scope.useAtomValue(columnUnitsAtom);\n}\n\nexport function useColumnUnitsMap(): Map<number, ExtUnit> | null {\n  try {\n    return scope.useAtomValue(columnUnitsMapAtom) as Map<number, ExtUnit>;\n  } catch {\n    return null;\n  }\n}\n\nexport function useCompositeScale(): CompositeColumnScale {\n  const ctx = useMacrostratColumnData();\n  return useMemo(\n    () => createCompositeScale(ctx.sections, true),\n    [ctx.sections],\n  );\n}\n\nexport function MacrostratColumnProvider(props) {\n  /** A column provider specialized the Macrostrat API. Maps more\n   * generic concepts to Macrostrat-specific ones.\n   */\n\n  const { axisType, isTransitioning, hideLabelsWhileTransitioning } =\n    useMacrostratColumnData();\n  const { units, domain, pixelScale, scale, children } = props;\n  return h(\n    ColumnProvider,\n    {\n      axisType,\n      divisions: units,\n      range: domain,\n      pixelsPerMeter: pixelScale,\n      scale,\n      isTransitioning,\n      hideLabelsWhileTransitioning,\n    },\n    children,\n  );\n}\n\n/** This is now a legacy provider */\nexport function LithologiesProvider({ children }) {\n  useEffect(() => {\n    console.warn(\n      \"LithologiesProvider is deprecated. Replace with MacrostratDataProvider\",\n    );\n  }, []);\n  return children;\n}\n"],"names":[],"mappings":";;;;;;;AA8BO,MAAM,QAAwB,kBAAA;AAE9B,MAAM,kBAAkB,KAAA;AAExB,MAAM,qBAAqB,KAAmC,CAAC,QAAQ;AAC5E,QAAM,QAAQ,IAAI,eAAe;AACjC,MAAI,CAAC,MAAO,QAAO;AACnB,QAAM,8BAAc,IAAA;AACpB,QAAM,QAAQ,CAAC,SAAS;AACtB,YAAQ,IAAI,KAAK,SAAS,IAAI;AAAA,EAChC,CAAC;AACD,SAAO;AACT,CAAC;AAWM,SAAS,8BAAkD;AAAA,EAChE;AAAA,EACA;AAAA,EACA,qBAAqB;AAAA,EACrB;AAAA,EACA;AACF,GAAgC;AAS9B,QAAM,kBAAkB,QAAQ,MAAM;AACpC,QAAI,oBAAoB;AACtB,aAAO;AAAA,IACT;AACA,WAAO,gBAAgB,QAAQ,kBAAkB;AAAA,EACnD,GAAG,CAAA,CAAE;AAGL,QAAM,gBAAgB,MAAM,qBAAqB,eAAe;AAChE,MAAI,iBAAiB,MAAM;AACzB,QAAI,sBAAsB,kBAAkB,gBAAgB,MAAM;AAChE,cAAQ;AAAA,QACN;AAAA,MAAA;AAAA,IAEJ;AACA,WAAO;AAAA,EACT;AAEA,QAAM,UAAmB;AAAA,IACvB,CAAC,iBAAiB,KAAK;AAAA,IACvB,CAAC,wBAAwB,eAAe;AAAA,IACxC,CAAC,oBAAoB,YAAY;AAAA,EAAA;AAGnC,MAAI,oBAA+B;AACnC,MAAI,iBAAiB;AACnB,wBAAoB,EAAE,8BAA8B,EAAE,eAAA,CAAgB;AAAA,EACxE;AAEA,SAAO;AAAA,IACL,MAAM;AAAA,IACN;AAAA,MACE,OAAO;AAAA,MACP,aAAa;AAAA,IAAA;AAAA,IAEf,CAAC,mBAAmB,QAAQ;AAAA,EAAA;AAEhC;AA4BA,MAAM,8BACJ,cAAgD,IAAI;AAE/C,SAAS,6BAAiD;AAAA,EAC/D;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AACF,GAA+B;AAY7B,QAAM,QAAQ,QAAQ,MAAM;AAE1B,WAAO;AAAA,MACL;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,IAAA;AAAA,EAEJ,GAAG;AAAA,IACD;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,EAAA,CACD;AAED,SAAO;AAAA,IACL;AAAA,IACA;AAAA,MACE;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,IAAA;AAAA,IAEF;AAAA,MACE,EAAE,kBAAkB,EAAE,KAAK;AAAA,MAC3B,EAAE,4BAA4B,UAAU,EAAE,MAAA,GAAS,QAAQ;AAAA,IAAA;AAAA,EAC7D;AAEJ;AAEA,SAAS,iBAAiB,EAAE,OAAuC;AACjE,QAAM,sBAAsB,MAAM,aAAa,uBAAuB;AACtE,YAAU,MAAM;AACd,QAAI,OAAO,KAAM;AACjB,QAAI,UAAU;AAAA,MACZ,2BAA2B,MAA8B;AACvD,6BAAqB;AAAA,UACnB,QAAQ;AAAA,YACN,UAAU;AAAA,YACV,OAAO;AAAA,YACP,QAAQ;AAAA,UAAA;AAAA,QACV;AAAA,MAEJ;AAAA,IAAA;AAAA,EAEJ,GAAG,CAAC,KAAK,mBAAmB,CAAC;AAE7B,SAAO;AACT;AAEO,SAAS,sBAAsB,OAAsC;AAI1E,SAAO,EAAE,+BAA+B;AAAA,IACtC,GAAG;AAAA,IACH,oBAAoB;AAAA,EAAA,CACrB;AACH;AAEO,SAAS,0BAA0B;AACxC,QAAM,MAAM,WAAW,2BAA2B;AAClD,MAAI,CAAC,KAAK;AACR,UAAM,IAAI;AAAA,MACR;AAAA,IAAA;AAAA,EAEJ;AACA,SAAO;AACT;AAEO,SAAS,qBAAqB;AACnC,SAAO,MAAM,aAAa,eAAe;AAC3C;AAEO,SAAS,oBAAiD;AAC/D,MAAI;AACF,WAAO,MAAM,aAAa,kBAAkB;AAAA,EAC9C,QAAQ;AACN,WAAO;AAAA,EACT;AACF;AAEO,SAAS,oBAA0C;AACxD,QAAM,MAAM,wBAAA;AACZ,SAAO;AAAA,IACL,MAAM,qBAAqB,IAAI,UAAU,IAAI;AAAA,IAC7C,CAAC,IAAI,QAAQ;AAAA,EAAA;AAEjB;AAEO,SAAS,yBAAyB,OAAO;AAK9C,QAAM,EAAE,UAAU,iBAAiB,6BAAA,IACjC,wBAAA;AACF,QAAM,EAAE,OAAO,QAAQ,YAAY,OAAO,aAAa;AACvD,SAAO;AAAA,IACL;AAAA,IACA;AAAA,MACE;AAAA,MACA,WAAW;AAAA,MACX,OAAO;AAAA,MACP,gBAAgB;AAAA,MAChB;AAAA,MACA;AAAA,MACA;AAAA,IAAA;AAAA,IAEF;AAAA,EAAA;AAEJ;AAGO,SAAS,oBAAoB,EAAE,YAAY;AAChD,YAAU,MAAM;AACd,YAAQ;AAAA,MACN;AAAA,IAAA;AAAA,EAEJ,GAAG,CAAA,CAAE;AACL,SAAO;AACT;"}
+{"version":3,"file":"store.js","sources":["../../src/data-provider/store.ts"],"sourcesContent":["import {\n  createContext,\n  ReactNode,\n  RefObject,\n  useCallback,\n  useContext,\n  useMemo,\n  useState,\n} from \"react\";\nimport h from \"@macrostrat/hyper\";\nimport {\n  CompositeColumnScale,\n  createCompositeScale,\n} from \"../prepare-units/composite-scale\";\nimport { ColumnAxisType, ColumnProvider } from \"@macrostrat/column-components\";\nimport type { ExtUnit, PackageLayoutData } from \"../prepare-units\";\nimport {\n  allowUnitSelectionAtom,\n  selectedUnitIDAtom,\n  UnitSelectionCallbacks,\n  UnitSelectionCallbackManager,\n  selectedUnitElementAtom,\n} from \"./unit-selection\";\nimport type { BaseUnit } from \"@macrostrat/api-types\";\nimport {\n  type AtomMap,\n  createScopedStore,\n  StateIsolation,\n} from \"@macrostrat/scoped-store\";\nimport { atom } from \"jotai\";\nimport { useEffect } from \"react\";\n\nexport const scope: StateIsolation = createScopedStore();\n\nexport const columnUnitsAtom = atom<BaseUnit[]>();\n\nexport const columnUnitsMapAtom = atom<Map<number, BaseUnit> | null>((get) => {\n  const units = get(columnUnitsAtom);\n  if (!units) return null;\n  const unitMap = new Map<number, BaseUnit>();\n  units.forEach((unit) => {\n    unitMap.set(unit.unit_id, unit);\n  });\n  return unitMap;\n});\n\nexport interface ColumnStateProviderProps<\n  T extends BaseUnit,\n> extends Partial<UnitSelectionCallbacks> {\n  children: ReactNode;\n  units: T[];\n  selectedUnit: number | null;\n  allowUnitSelection?: boolean;\n}\n\nexport function MacrostratColumnStateProvider<T extends BaseUnit>({\n  children,\n  units,\n  allowUnitSelection = false,\n  onUnitSelected,\n  selectedUnit,\n}: ColumnStateProviderProps<T>) {\n  /** Top-level provider for Macrostrat column data.\n   * It is either provided by the Column component itself, or\n   * can be hoisted higher in the tree to provide a common data context\n   */\n\n  /* By default, unit selection is disabled. However, if any related props are passed,\n  we enable it.\n  */\n  const _allowSelection = useMemo(() => {\n    if (allowUnitSelection) {\n      return true;\n    }\n    return selectedUnit != null || onUnitSelected != null;\n  }, []);\n\n  // Check if we're already in a columnStateProvider, and render a no-op if so\n  const existingUnits = scope.useAtomValueIfExists(columnUnitsAtom);\n  if (existingUnits != null) {\n    if (allowUnitSelection || onUnitSelected || selectedUnit != null) {\n      console.warn(\n        \"MacrostratColumnStateProvider: unit selection props are ignored because a provider already exists in the tree\",\n      );\n    }\n    return children;\n  }\n\n  const atomMap: AtomMap = [\n    [columnUnitsAtom, units],\n    [allowUnitSelectionAtom, _allowSelection],\n    [selectedUnitIDAtom, selectedUnit],\n  ];\n\n  let selectionHandlers: ReactNode = null;\n  if (_allowSelection) {\n    selectionHandlers = h(UnitSelectionCallbackManager, { onUnitSelected });\n  }\n\n  return h(\n    scope.Provider,\n    {\n      atoms: atomMap,\n      keepUpdated: true,\n    },\n    [selectionHandlers, children],\n  );\n}\n\n/** Interface for imperative handlers that can\n * be invoked outside of the column's react context\n */\nexport interface ColumnRef {\n  scrollSelectedUnitIntoView(): void;\n}\n\nexport interface MacrostratColumnDataContext<T extends BaseUnit> {\n  units: T[];\n  sections: PackageLayoutData[];\n  totalHeight?: number;\n  axisType?: ColumnAxisType;\n  allowUnitSelection?: boolean;\n  /** True while the age window is animating; propagated to each section's\n   * `ColumnProvider` so per-frame label/pattern work can be skipped. */\n  isTransitioning?: boolean;\n  /** Hide unit labels while transitioning (perf escape hatch; default false). */\n  hideLabelsWhileTransitioning?: boolean;\n}\n\nexport interface ColumnDataProviderProps<T extends BaseUnit>\n  extends MacrostratColumnDataContext<T>, ColumnStateProviderProps<T> {\n  children: ReactNode;\n  ref: RefObject<ColumnRef>;\n}\n\nconst MacrostratColumnDataContext =\n  createContext<MacrostratColumnDataContext<any>>(null);\n\nexport function MacrostratColumnDataProvider<T extends BaseUnit>({\n  children,\n  units,\n  sections,\n  totalHeight,\n  axisType,\n  allowUnitSelection,\n  onUnitSelected,\n  selectedUnit,\n  isTransitioning,\n  hideLabelsWhileTransitioning,\n  ref,\n}: ColumnDataProviderProps<T>) {\n  /** Internal provider for Macrostrat column data.\n   * As a general rule, we want to provide data and column-axis\n   * height calculations through the context, since these need to\n   * be accessed by any component that lays out information on the\n   * column.\n   *\n   * Cross-axis layout and view configuration (e.g., showing and hiding\n   * of different components or labels) should be handled through passing\n   * props to the components themselves.\n   * */\n\n  const value = useMemo(() => {\n    // For now, change ordinal axis types to age axis types\n    return {\n      units,\n      sections,\n      totalHeight,\n      axisType,\n      isTransitioning,\n      hideLabelsWhileTransitioning,\n    };\n  }, [\n    units,\n    sections,\n    totalHeight,\n    axisType,\n    isTransitioning,\n    hideLabelsWhileTransitioning,\n  ]);\n\n  return h(\n    MacrostratColumnStateProvider,\n    {\n      units,\n      allowUnitSelection,\n      onUnitSelected,\n      selectedUnit,\n      ref,\n    },\n    [\n      h(ColumnRefManager, { ref }),\n      h(\n        MacrostratColumnDataContext.Provider,\n        { value },\n        h(ColumnLayoutOverridesProvider, null, children),\n      ),\n    ],\n  );\n}\n\n/* Layout overrides requested by a column's children. A layer that draws its\n * own labels beside the units (the surfaces view) claims the label column, so\n * the unit labels give way: it is one set of labels or the other. */\n\ninterface ColumnLayoutOverrides {\n  /** How many children currently claim the label column */\n  labelColumnClaims: number;\n  claimLabelColumn(): () => void;\n}\n\nconst ColumnLayoutOverridesContext = createContext<ColumnLayoutOverrides>({\n  labelColumnClaims: 0,\n  claimLabelColumn: () => () => {},\n});\n\nfunction ColumnLayoutOverridesProvider({ children }: { children: ReactNode }) {\n  const [labelColumnClaims, setClaims] = useState(0);\n  const claimLabelColumn = useCallback(() => {\n    setClaims((n) => n + 1);\n    return () => setClaims((n) => Math.max(n - 1, 0));\n  }, []);\n  const value = useMemo(\n    () => ({ labelColumnClaims, claimLabelColumn }),\n    [labelColumnClaims, claimLabelColumn],\n  );\n  return h(ColumnLayoutOverridesContext.Provider, { value }, children);\n}\n\n/** Claim the column's label column for this component while it is mounted:\n * the unit labels are hidden in favor of whatever the caller draws there. */\nexport function useClaimLabelColumn(active: boolean = true) {\n  const { claimLabelColumn } = useContext(ColumnLayoutOverridesContext);\n  useEffect(() => {\n    if (!active) return;\n    return claimLabelColumn();\n  }, [active, claimLabelColumn]);\n}\n\n/** Whether a child of the column has claimed the label column */\nexport function useLabelColumnClaimed(): boolean {\n  return useContext(ColumnLayoutOverridesContext).labelColumnClaims > 0;\n}\n\nfunction ColumnRefManager({ ref }: { ref?: RefObject<ColumnRef> }) {\n  const selectedUnitElement = scope.useAtomValue(selectedUnitElementAtom);\n  useEffect(() => {\n    if (ref == null) return;\n    ref.current = {\n      scrollSelectedUnitIntoView(opts?: ScrollIntoViewOptions) {\n        selectedUnitElement?.scrollIntoView(\n          opts ?? {\n            behavior: \"smooth\",\n            block: \"center\",\n            inline: \"nearest\",\n          },\n        );\n      },\n    };\n  }, [ref, selectedUnitElement]);\n\n  return null;\n}\n\nexport function UnitSelectionProvider(props: ColumnStateProviderProps<any>) {\n  /* A basic unit selection provider without column data context.\n  Mostly for use with the CorrelationChart component.\n   */\n  return h(MacrostratColumnStateProvider, {\n    ...props,\n    allowUnitSelection: true,\n  });\n}\n\nexport function useMacrostratColumnData() {\n  const ctx = useContext(MacrostratColumnDataContext);\n  if (!ctx) {\n    throw new Error(\n      \"useMacrostratColumnData must be used within a MacrostratColumnDataProvider\",\n    );\n  }\n  return ctx;\n}\n\nexport function useMacrostratUnits() {\n  return scope.useAtomValue(columnUnitsAtom);\n}\n\nexport function useColumnUnitsMap(): Map<number, ExtUnit> | null {\n  try {\n    return scope.useAtomValue(columnUnitsMapAtom) as Map<number, ExtUnit>;\n  } catch {\n    return null;\n  }\n}\n\nexport function useCompositeScale(): CompositeColumnScale {\n  const ctx = useMacrostratColumnData();\n  return useMemo(\n    () => createCompositeScale(ctx.sections, true),\n    [ctx.sections],\n  );\n}\n\nexport function MacrostratColumnProvider(props) {\n  /** A column provider specialized the Macrostrat API. Maps more\n   * generic concepts to Macrostrat-specific ones.\n   */\n\n  const { axisType, isTransitioning, hideLabelsWhileTransitioning } =\n    useMacrostratColumnData();\n  const { units, domain, pixelScale, scale, children } = props;\n  return h(\n    ColumnProvider,\n    {\n      axisType,\n      divisions: units,\n      range: domain,\n      pixelsPerMeter: pixelScale,\n      scale,\n      isTransitioning,\n      hideLabelsWhileTransitioning,\n    },\n    children,\n  );\n}\n\n/** This is now a legacy provider */\nexport function LithologiesProvider({ children }) {\n  useEffect(() => {\n    console.warn(\n      \"LithologiesProvider is deprecated. Replace with MacrostratDataProvider\",\n    );\n  }, []);\n  return children;\n}\n"],"names":[],"mappings":"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"}

package/dist/index.cjs

@@ -4,20 +4,26 @@ const index = require("./units/index.cjs");
 const ageAxis = require("./age-axis.cjs");
 const index$3 = require("./prepare-units/index.cjs");
 const animatedAgeWindow = require("./animated-age-window.cjs");
+const timescaleZoom = require("./timescale-zoom.cjs");
 const column = require("./column.cjs");
-const ageModelOverlay = require("./age-model-overlay.cjs");
+const section = require("./section.cjs");
 const notes = require("./notes.cjs");
 const mapViews = require("@macrostrat/map-views");
+const data = require("./age-model/data.cjs");
 const ageRange = require("./unit-details/age-range.cjs");
+const dataComponents = require("@macrostrat/data-components");
 const ageWindowTag = require("./unit-details/age-window-tag.cjs");
 const composite = require("./units/composite.cjs");
 const base = require("./facets/measurements/base.cjs");
-const dataComponents = require("@macrostrat/data-components");
+const legacy = require("./age-model/legacy.cjs");
 const columnNav = require("./data-provider/column-nav.cjs");
+const surfaces = require("./age-model/surfaces.cjs");
 const main = require("./correlation-chart/main.cjs");
+const density = require("./prepare-units/density.cjs");
 const index$1 = require("./facets/detrital-zircon/index.cjs");
 const provider = require("./facets/fossils/provider.cjs");
 const types = require("./prepare-units/types.cjs");
+const types$1 = require("./age-model/types.cjs");
 const isotopesColumn = require("./facets/carbon-isotopes/isotopes-column.cjs");
 const panel = require("./unit-details/panel.cjs");
 const store = require("./data-provider/store.cjs");
@@ -27,6 +33,7 @@ const index$2 = require("./facets/fossils/index.cjs");
 const taxonRanges = require("./facets/fossils/taxon-ranges.cjs");
 const sgp = require("./facets/measurements/sgp.cjs");
 const stratNames = require("./unit-details/strat-names.cjs");
+const details = require("./age-model/details.cjs");
 const modalPanel = require("./unit-details/modal-panel.cjs");
 const popover = require("./unit-details/popover.cjs");
 const unitSelection = require("./data-provider/unit-selection.cjs");
@@ -48,19 +55,47 @@ exports.VerticalAxisLabel = ageAxis.VerticalAxisLabel;
 exports.prepareColumnUnits = index$3.prepareColumnUnits;
 exports.usePreparedColumnUnits = index$3.usePreparedColumnUnits;
 exports.useAnimatedAgeWindow = animatedAgeWindow.useAnimatedAgeWindow;
+exports.levelsForSelected = timescaleZoom.levelsForSelected;
+exports.unitsAgeExtent = timescaleZoom.unitsAgeExtent;
+exports.useTimescaleZoom = timescaleZoom.useTimescaleZoom;
 exports.Column = column.Column;
 exports.ColumnBasicInfo = column.ColumnBasicInfo;
 exports.ColumnContainer = column.ColumnContainer;
-exports.BoundaryAgeModelOverlay = ageModelOverlay.BoundaryAgeModelOverlay;
-exports.ComputedSurfacesOverlay = ageModelOverlay.ComputedSurfacesOverlay;
+exports.CompositeTimescale = section.CompositeTimescale;
+exports.CompositeTimescaleCore = section.CompositeTimescaleCore;
 exports.ColumnNotes = notes.ColumnNotes;
+exports.AGE_MODEL_ROUTE = data.AGE_MODEL_ROUTE;
+exports.useColumnAgeModel = data.useColumnAgeModel;
+exports.useColumnSurfaces = data.useColumnSurfaces;
 exports.AgeField = ageRange.AgeField;
-exports.AgeLabel = ageRange.AgeLabel;
 exports.AgeRange = ageRange.AgeRange;
 exports.Duration = ageRange.Duration;
 exports.IntervalProportions = ageRange.IntervalProportions;
-exports.getAge = ageRange.getAge;
 exports.getAgeRange = ageRange.getAgeRange;
+Object.defineProperty(exports, "AgeLabel", {
+  enumerable: true,
+  get: () => dataComponents.AgeLabel
+});
+Object.defineProperty(exports, "ClickableText", {
+  enumerable: true,
+  get: () => dataComponents.ClickableText
+});
+Object.defineProperty(exports, "Identifier", {
+  enumerable: true,
+  get: () => dataComponents.Identifier
+});
+Object.defineProperty(exports, "Proportion", {
+  enumerable: true,
+  get: () => dataComponents.IntervalProportion
+});
+Object.defineProperty(exports, "UnitIdentifier", {
+  enumerable: true,
+  get: () => dataComponents.UnitIdentifier
+});
+Object.defineProperty(exports, "getAge", {
+  enumerable: true,
+  get: () => dataComponents.getAge
+});
 exports.AgeWindowTag = ageWindowTag.AgeWindowTag;
 exports.intervalShortFromTimescale = ageWindowTag.intervalShortFromTimescale;
 exports.AnnotatedUnitsColumn = composite.AnnotatedUnitsColumn;
@@ -75,27 +110,46 @@ exports.TruncatedList = base.TruncatedList;
 exports.groupNotesByPixelDistance = base.groupNotesByPixelDistance;
 exports.mergeHeightRanges = base.mergeHeightRanges;
 exports.standardizeMeasurementHeight = base.standardizeMeasurementHeight;
-Object.defineProperty(exports, "ClickableText", {
-  enumerable: true,
-  get: () => dataComponents.ClickableText
-});
-Object.defineProperty(exports, "Identifier", {
-  enumerable: true,
-  get: () => dataComponents.Identifier
-});
-Object.defineProperty(exports, "UnitIdentifier", {
-  enumerable: true,
-  get: () => dataComponents.UnitIdentifier
-});
+exports.BoundaryAgeModelOverlay = legacy.BoundaryAgeModelOverlay;
+exports.ComputedSurfacesOverlay = legacy.ComputedSurfacesOverlay;
 exports.ColumnNavProvider = columnNav.ColumnNavProvider;
 exports.useColumnNav = columnNav.useColumnNav;
+exports.ColumnSurfaceLabels = surfaces.ColumnSurfaceLabels;
+exports.ColumnSurfaceLines = surfaces.ColumnSurfaceLines;
+exports.ColumnSurfaces = surfaces.ColumnSurfaces;
+exports.surfaceClasses = surfaces.surfaceClasses;
 exports.CorrelationChart = main.CorrelationChart;
+exports.DEFAULT_TARGET_UNIT_HEIGHT = density.DEFAULT_TARGET_UNIT_HEIGHT;
+exports.atLeast = density.atLeast;
+exports.fixedDensity = density.fixedDensity;
+exports.resolveDensity = density.resolveDensity;
+exports.sectionDensity = density.sectionDensity;
+exports.sectionHeight = density.sectionHeight;
+exports.statedDensity = density.statedDensity;
+exports.unitHeight = density.unitHeight;
 exports.DetritalColumn = index$1.DetritalColumn;
 exports.DetritalGroup = index$1.DetritalGroup;
 exports.FossilDataType = provider.FossilDataType;
 exports.useFossilData = provider.useFossilData;
 exports.HeightMethod = types.HeightMethod;
 exports.HybridScaleType = types.HybridScaleType;
+exports.INTERVAL_BOUND_TOLERANCE = types$1.INTERVAL_BOUND_TOLERANCE;
+exports.TIE_POINT_STATUSES = types$1.TIE_POINT_STATUSES;
+exports.boundaryToSurface = types$1.boundaryToSurface;
+exports.compareAlongAxis = types$1.compareAlongAxis;
+exports.formatAge = types$1.formatAge;
+exports.formatProportion = types$1.formatProportion;
+exports.inferTiePointStatuses = types$1.inferTiePointStatuses;
+exports.isPositionAxis = types$1.isPositionAxis;
+exports.nullifyUnitID = types$1.nullifyUnitID;
+exports.surfaceLabel = types$1.surfaceLabel;
+exports.surfacePosition = types$1.surfacePosition;
+exports.surfaceStatusDescriptions = types$1.surfaceStatusDescriptions;
+exports.surfaceStatusLabels = types$1.surfaceStatusLabels;
+exports.surfaceStatuses = types$1.surfaceStatuses;
+exports.surfaceToken = types$1.surfaceToken;
+exports.surfacesFromBoundaries = types$1.surfacesFromBoundaries;
+exports.surfacesFromUnits = types$1.surfacesFromUnits;
 exports.IsotopesColumn = isotopesColumn.IsotopesColumn;
 exports.IsotopesDataset = isotopesColumn.IsotopesDataset;
 exports.LegendPanelHeader = panel.LegendPanelHeader;
@@ -111,8 +165,10 @@ exports.UnitSelectionProvider = store.UnitSelectionProvider;
 exports.columnUnitsAtom = store.columnUnitsAtom;
 exports.columnUnitsMapAtom = store.columnUnitsMapAtom;
 exports.scope = store.scope;
+exports.useClaimLabelColumn = store.useClaimLabelColumn;
 exports.useColumnUnitsMap = store.useColumnUnitsMap;
 exports.useCompositeScale = store.useCompositeScale;
+exports.useLabelColumnClaimed = store.useLabelColumnClaimed;
 exports.useMacrostratColumnData = store.useMacrostratColumnData;
 exports.useMacrostratUnits = store.useMacrostratUnits;
 exports.MeasurementDataContext = dataProvider.MeasurementDataContext;
@@ -130,6 +186,10 @@ exports.PBDBFossilsColumn = index$2.PBDBFossilsColumn;
 exports.PBDBOccurrencesMatrix = taxonRanges.PBDBOccurrencesMatrix;
 exports.SGPMeasurementsColumn = sgp.SGPMeasurementsColumn;
 exports.StratNameField = stratNames.StratNameField;
+exports.SurfaceDetailsPanel = details.SurfaceDetailsPanel;
+exports.SurfaceStatusLegend = details.SurfaceStatusLegend;
+exports.SurfaceStatusTag = details.SurfaceStatusTag;
+exports.SurfaceTypeTag = details.SurfaceTypeTag;
 exports.UnitDetailsPanelWithNavigation = modalPanel.UnitDetailsPanelWithNavigation;
 exports.UnitDetailsPopover = popover.UnitDetailsPopover;
 exports.UnitSelectionPopover = popover.UnitSelectionPopover;

package/dist/index.cjs.map

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

package/dist/index.d.ts

@@ -3,9 +3,11 @@ export * from './data-provider';
 export * from './age-axis';
 export * from './prepare-units';
 export * from './animated-age-window';
+export * from './timescale-zoom';
 export * from './column';
+export { CompositeTimescale, CompositeTimescaleCore } from './section';
 export * from './unit-details';
-export * from './age-model-overlay';
+export * from './age-model';
 export * from './correlation-chart';
 export * from './notes';
 export * from './facets';

package/dist/index.js

@@ -2,35 +2,43 @@ import { BasicUnitComponent, ColoredUnitComponent, EnvironmentColoredUnitCompone
 import { AgeCursor, ApproximateHeightAxis, CompositeAgeAxis, CompositeAgeAxisCore, VerticalAxisLabel } from "./age-axis.js";
 import { prepareColumnUnits, usePreparedColumnUnits } from "./prepare-units/index.js";
 import { useAnimatedAgeWindow } from "./animated-age-window.js";
+import { levelsForSelected, unitsAgeExtent, useTimescaleZoom } from "./timescale-zoom.js";
 import { Column, ColumnBasicInfo, ColumnContainer } from "./column.js";
-import { BoundaryAgeModelOverlay, ComputedSurfacesOverlay } from "./age-model-overlay.js";
+import { CompositeTimescale, CompositeTimescaleCore } from "./section.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 { AGE_MODEL_ROUTE, useColumnAgeModel, useColumnSurfaces } from "./age-model/data.js";
+import { AgeField, AgeRange, Duration, IntervalProportions, getAgeRange } from "./unit-details/age-range.js";
+import { AgeLabel, ClickableText, Identifier, IntervalProportion, UnitIdentifier, getAge } from "@macrostrat/data-components";
 import { AgeWindowTag, intervalShortFromTimescale } from "./unit-details/age-window-tag.js";
 import { AnnotatedUnitsColumn, ColumnNotesProvider, CompositeUnitComponent, CompositeUnitsColumn, LabelTrackerProvider, SectionLabelsColumn, TrackedLabeledUnit } from "./units/composite.js";
 import { BaseMeasurementsColumn, TruncatedList, groupNotesByPixelDistance, mergeHeightRanges, standardizeMeasurementHeight } from "./facets/measurements/base.js";
-import { ClickableText, Identifier, UnitIdentifier } from "@macrostrat/data-components";
+import { BoundaryAgeModelOverlay, ComputedSurfacesOverlay } from "./age-model/legacy.js";
 import { ColumnNavProvider, useColumnNav } from "./data-provider/column-nav.js";
+import { ColumnSurfaceLabels, ColumnSurfaceLines, ColumnSurfaces, surfaceClasses } from "./age-model/surfaces.js";
 import { CorrelationChart } from "./correlation-chart/main.js";
+import { DEFAULT_TARGET_UNIT_HEIGHT, atLeast, fixedDensity, resolveDensity, sectionDensity, sectionHeight, statedDensity, unitHeight } from "./prepare-units/density.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 { INTERVAL_BOUND_TOLERANCE, TIE_POINT_STATUSES, boundaryToSurface, compareAlongAxis, formatAge, formatProportion, inferTiePointStatuses, isPositionAxis, nullifyUnitID, surfaceLabel, surfacePosition, surfaceStatusDescriptions, surfaceStatusLabels, surfaceStatuses, surfaceToken, surfacesFromBoundaries, surfacesFromUnits } from "./age-model/types.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 { LithologiesProvider, MacrostratColumnDataProvider, MacrostratColumnProvider, MacrostratColumnStateProvider, UnitSelectionProvider, columnUnitsAtom, columnUnitsMapAtom, scope, useClaimLabelColumn, useColumnUnitsMap, useCompositeScale, useLabelColumnClaimed, useMacrostratColumnData, useMacrostratUnits } from "./data-provider/store.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";
 import { PBDBOccurrencesMatrix } from "./facets/fossils/taxon-ranges.js";
 import { SGPMeasurementsColumn } from "./facets/measurements/sgp.js";
 import { StratNameField } from "./unit-details/strat-names.js";
+import { SurfaceDetailsPanel, SurfaceStatusLegend, SurfaceStatusTag, SurfaceTypeTag } from "./age-model/details.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 { parseLineFromString, stringifyLine } from "./correlation-chart/hash-string.js";
 import { preprocessUnits } from "./prepare-units/helpers.js";
 export {
+  AGE_MODEL_ROUTE,
   AgeCursor,
   AgeField,
   AgeLabel,
@@ -49,12 +57,18 @@ export {
   ColumnNavProvider,
   ColumnNotes,
   ColumnNotesProvider,
+  ColumnSurfaceLabels,
+  ColumnSurfaceLines,
+  ColumnSurfaces,
   CompositeAgeAxis,
   CompositeAgeAxisCore,
+  CompositeTimescale,
+  CompositeTimescaleCore,
   CompositeUnitComponent,
   CompositeUnitsColumn,
   ComputedSurfacesOverlay,
   CorrelationChart,
+  DEFAULT_TARGET_UNIT_HEIGHT,
   DetritalColumn,
   DetritalGroup,
   Duration,
@@ -62,6 +76,7 @@ export {
   FossilDataType,
   HeightMethod,
   HybridScaleType,
+  INTERVAL_BOUND_TOLERANCE,
   Identifier,
   IntervalProportions,
   IsotopesColumn,
@@ -77,11 +92,17 @@ export {
   MergeSectionsMode,
   PBDBFossilsColumn,
   PBDBOccurrencesMatrix,
+  IntervalProportion as Proportion,
   ReferencesField,
   SGPMeasurementsColumn,
   SectionLabelsColumn,
   SimpleUnitsColumn,
   StratNameField,
+  SurfaceDetailsPanel,
+  SurfaceStatusLegend,
+  SurfaceStatusTag,
+  SurfaceTypeTag,
+  TIE_POINT_STATUSES,
   ThicknessField,
   TrackedLabeledUnit,
   TruncatedList,
@@ -99,39 +120,69 @@ export {
   VerticalAxisLabel,
   agesOverlap,
   allowUnitSelectionAtom,
+  atLeast,
+  boundaryToSurface,
   columnUnitsAtom,
   columnUnitsMapAtom,
+  compareAlongAxis,
   createUnitSorter,
   ensureArray,
   ensureRealFloat,
+  fixedDensity,
+  formatAge,
+  formatProportion,
   getAge,
   getAgeRange,
   getPositionWithinUnit,
   getUnitHeightRange,
   groupNotesByPixelDistance,
+  inferTiePointStatuses,
   intervalShortFromTimescale,
+  isPositionAxis,
+  levelsForSelected,
   mergeHeightRanges,
+  nullifyUnitID,
   parseLineFromString,
   prepareColumnUnits,
   preprocessUnits,
+  resolveDensity,
   scope,
+  sectionDensity,
+  sectionHeight,
   selectedUnitElementAtom,
   selectedUnitIDAtom,
   standardizeMeasurementHeight,
+  statedDensity,
   stringifyLine,
+  surfaceClasses,
+  surfaceLabel,
+  surfacePosition,
+  surfaceStatusDescriptions,
+  surfaceStatusLabels,
+  surfaceStatuses,
+  surfaceToken,
+  surfacesFromBoundaries,
+  surfacesFromUnits,
+  unitHeight,
+  unitsAgeExtent,
   unitsOverlap,
   useAnimatedAgeWindow,
   useAtomOverlayPosition,
+  useClaimLabelColumn,
+  useColumnAgeModel,
   useColumnNav,
   useColumnRef,
+  useColumnSurfaces,
   useColumnUnitsMap,
   useCompositeScale,
   useFossilData,
+  useLabelColumnClaimed,
   useMacrostratColumnData,
   useMacrostratUnits,
   useMeasurementData,
   usePreparedColumnUnits,
   useSelectedUnit,
+  useTimescaleZoom,
   useUnitColor,
   useUnitColorByEnvironment,
   useUnitSelection,

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/notes.cjs

@@ -13,6 +13,11 @@ function ColumnNotes({
   paddingLeft = 60,
   deltaConnectorAttachment,
   focusedNoteComponent,
+  onClickNote,
+  forceOptions,
+  connectorOverhang,
+  showPointMarker,
+  className,
   children
 }) {
   const { totalHeight } = store.useMacrostratColumnData();
@@ -25,14 +30,18 @@ function ColumnNotes({
       pixelScale: -1
     },
     [
-      h__default.default(columnComponents.SVG, { width, height: totalHeight, paddingH: 4 }, [
+      h__default.default(columnComponents.SVG, { width, height: totalHeight, paddingH: 4, className }, [
         h__default.default(columnComponents.NotesColumn, {
           width,
           notes,
           noteComponent,
           paddingLeft,
           deltaConnectorAttachment,
-          focusedNoteComponent
+          focusedNoteComponent,
+          onClickNote,
+          forceOptions,
+          connectorOverhang,
+          showPointMarker
         })
       ]),
       children

package/dist/notes.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"notes.cjs","sources":["../src/notes.ts"],"sourcesContent":["import h from \"@macrostrat/hyper\";\n\nimport { ColumnNotesProvider } from \"./units\";\n\nimport { NotesColumn, SVG } from \"@macrostrat/column-components\";\nimport { useCompositeScale, useMacrostratColumnData } from \"./data-provider\";\nimport type { ComponentType, ReactNode } from \"react\";\n\ninterface ColumnNotesProps {\n  notes: any[];\n  width?: number;\n  noteComponent?: any;\n  paddingLeft?: number;\n  deltaConnectorAttachment?: number;\n  children?: ReactNode;\n  focusedNoteComponent?: ComponentType<any> | null;\n}\n\nexport function ColumnNotes({\n  notes,\n  width = 200,\n  noteComponent,\n  paddingLeft = 60,\n  deltaConnectorAttachment,\n  focusedNoteComponent,\n  children,\n}: ColumnNotesProps) {\n  const { totalHeight } = useMacrostratColumnData();\n  const scale = useCompositeScale();\n\n  return h(\n    ColumnNotesProvider,\n    {\n      scale,\n      totalHeight,\n      pixelScale: -1,\n    },\n    [\n      h(SVG, { width, height: totalHeight, paddingH: 4 }, [\n        h(NotesColumn, {\n          width,\n          notes,\n          noteComponent,\n          paddingLeft,\n          deltaConnectorAttachment,\n          focusedNoteComponent,\n        }),\n      ]),\n      children,\n    ],\n  );\n}\n"],"names":["useMacrostratColumnData","useCompositeScale","h","ColumnNotesProvider","SVG","NotesColumn"],"mappings":";;;;;;;;AAkBO,SAAS,YAAY;AAAA,EAC1B;AAAA,EACA,QAAQ;AAAA,EACR;AAAA,EACA,cAAc;AAAA,EACd;AAAA,EACA;AAAA,EACA;AACF,GAAqB;AACnB,QAAM,EAAE,YAAA,IAAgBA,8BAAA;AACxB,QAAM,QAAQC,MAAAA,kBAAA;AAEd,SAAOC,WAAAA;AAAAA,IACLC,UAAAA;AAAAA,IACA;AAAA,MACE;AAAA,MACA;AAAA,MACA,YAAY;AAAA,IAAA;AAAA,IAEd;AAAA,MACED,WAAAA,QAAEE,iBAAAA,KAAK,EAAE,OAAO,QAAQ,aAAa,UAAU,KAAK;AAAA,QAClDF,WAAAA,QAAEG,iBAAAA,aAAa;AAAA,UACb;AAAA,UACA;AAAA,UACA;AAAA,UACA;AAAA,UACA;AAAA,UACA;AAAA,QAAA,CACD;AAAA,MAAA,CACF;AAAA,MACD;AAAA,IAAA;AAAA,EACF;AAEJ;;"}
+{"version":3,"file":"notes.cjs","sources":["../src/notes.ts"],"sourcesContent":["import h from \"@macrostrat/hyper\";\n\nimport { ColumnNotesProvider } from \"./units\";\n\nimport { NotesColumn, SVG, type NoteData } from \"@macrostrat/column-components\";\nimport { useCompositeScale, useMacrostratColumnData } from \"./data-provider\";\nimport type { ComponentType, ReactNode } from \"react\";\n\ninterface ColumnNotesProps {\n  notes: any[];\n  width?: number;\n  noteComponent?: any;\n  paddingLeft?: number;\n  deltaConnectorAttachment?: number;\n  children?: ReactNode;\n  focusedNoteComponent?: ComponentType<any> | null;\n  /** Called when a note is clicked */\n  onClickNote?: (note: NoteData) => void;\n  /** Px the connector continues past each end (see `NodeConnectorOptions`) */\n  connectorOverhang?: number | [number, number];\n  /** Draw the marker at a point note's height (default true) */\n  showPointMarker?: boolean;\n  /** Options for the label force layout (e.g. `nodeSpacing`) */\n  forceOptions?: object;\n  className?: string;\n}\n\nexport function ColumnNotes({\n  notes,\n  width = 200,\n  noteComponent,\n  paddingLeft = 60,\n  deltaConnectorAttachment,\n  focusedNoteComponent,\n  onClickNote,\n  forceOptions,\n  connectorOverhang,\n  showPointMarker,\n  className,\n  children,\n}: ColumnNotesProps) {\n  const { totalHeight } = useMacrostratColumnData();\n  const scale = useCompositeScale();\n\n  return h(\n    ColumnNotesProvider,\n    {\n      scale,\n      totalHeight,\n      pixelScale: -1,\n    },\n    [\n      h(SVG, { width, height: totalHeight, paddingH: 4, className }, [\n        h(NotesColumn, {\n          width,\n          notes,\n          noteComponent,\n          paddingLeft,\n          deltaConnectorAttachment,\n          focusedNoteComponent,\n          onClickNote,\n          forceOptions,\n          connectorOverhang,\n          showPointMarker,\n        }),\n      ]),\n      children,\n    ],\n  );\n}\n"],"names":["useMacrostratColumnData","useCompositeScale","h","ColumnNotesProvider","SVG","NotesColumn"],"mappings":";;;;;;;;AA2BO,SAAS,YAAY;AAAA,EAC1B;AAAA,EACA,QAAQ;AAAA,EACR;AAAA,EACA,cAAc;AAAA,EACd;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AACF,GAAqB;AACnB,QAAM,EAAE,YAAA,IAAgBA,8BAAA;AACxB,QAAM,QAAQC,MAAAA,kBAAA;AAEd,SAAOC,WAAAA;AAAAA,IACLC,UAAAA;AAAAA,IACA;AAAA,MACE;AAAA,MACA;AAAA,MACA,YAAY;AAAA,IAAA;AAAA,IAEd;AAAA,MACED,mBAAEE,iBAAAA,KAAK,EAAE,OAAO,QAAQ,aAAa,UAAU,GAAG,aAAa;AAAA,QAC7DF,WAAAA,QAAEG,iBAAAA,aAAa;AAAA,UACb;AAAA,UACA;AAAA,UACA;AAAA,UACA;AAAA,UACA;AAAA,UACA;AAAA,UACA;AAAA,UACA;AAAA,UACA;AAAA,UACA;AAAA,QAAA,CACD;AAAA,MAAA,CACF;AAAA,MACD;AAAA,IAAA;AAAA,EACF;AAEJ;;"}

package/dist/notes.d.ts

@@ -1,3 +1,4 @@
+import { NoteData } from '@macrostrat/column-components';
 import { ComponentType, ReactNode } from 'react';
 interface ColumnNotesProps {
     notes: any[];
@@ -7,6 +8,15 @@ interface ColumnNotesProps {
     deltaConnectorAttachment?: number;
     children?: ReactNode;
     focusedNoteComponent?: ComponentType<any> | null;
+    /** Called when a note is clicked */
+    onClickNote?: (note: NoteData) => void;
+    /** Px the connector continues past each end (see `NodeConnectorOptions`) */
+    connectorOverhang?: number | [number, number];
+    /** Draw the marker at a point note's height (default true) */
+    showPointMarker?: boolean;
+    /** Options for the label force layout (e.g. `nodeSpacing`) */
+    forceOptions?: object;
+    className?: string;
 }
-export declare function ColumnNotes({ notes, width, noteComponent, paddingLeft, deltaConnectorAttachment, focusedNoteComponent, children, }: ColumnNotesProps): import('react').FunctionComponentElement<any>;
+export declare function ColumnNotes({ notes, width, noteComponent, paddingLeft, deltaConnectorAttachment, focusedNoteComponent, onClickNote, forceOptions, connectorOverhang, showPointMarker, className, children, }: ColumnNotesProps): import('react').FunctionComponentElement<any>;
 export {};

package/dist/notes.js

@@ -9,6 +9,11 @@ function ColumnNotes({
   paddingLeft = 60,
   deltaConnectorAttachment,
   focusedNoteComponent,
+  onClickNote,
+  forceOptions,
+  connectorOverhang,
+  showPointMarker,
+  className,
   children
 }) {
   const { totalHeight } = useMacrostratColumnData();
@@ -21,14 +26,18 @@ function ColumnNotes({
       pixelScale: -1
     },
     [
-      h(SVG, { width, height: totalHeight, paddingH: 4 }, [
+      h(SVG, { width, height: totalHeight, paddingH: 4, className }, [
         h(NotesColumn, {
           width,
           notes,
           noteComponent,
           paddingLeft,
           deltaConnectorAttachment,
-          focusedNoteComponent
+          focusedNoteComponent,
+          onClickNote,
+          forceOptions,
+          connectorOverhang,
+          showPointMarker
         })
       ]),
       children

package/dist/notes.js.map

@@ -1 +1 @@
-{"version":3,"file":"notes.js","sources":["../src/notes.ts"],"sourcesContent":["import h from \"@macrostrat/hyper\";\n\nimport { ColumnNotesProvider } from \"./units\";\n\nimport { NotesColumn, SVG } from \"@macrostrat/column-components\";\nimport { useCompositeScale, useMacrostratColumnData } from \"./data-provider\";\nimport type { ComponentType, ReactNode } from \"react\";\n\ninterface ColumnNotesProps {\n  notes: any[];\n  width?: number;\n  noteComponent?: any;\n  paddingLeft?: number;\n  deltaConnectorAttachment?: number;\n  children?: ReactNode;\n  focusedNoteComponent?: ComponentType<any> | null;\n}\n\nexport function ColumnNotes({\n  notes,\n  width = 200,\n  noteComponent,\n  paddingLeft = 60,\n  deltaConnectorAttachment,\n  focusedNoteComponent,\n  children,\n}: ColumnNotesProps) {\n  const { totalHeight } = useMacrostratColumnData();\n  const scale = useCompositeScale();\n\n  return h(\n    ColumnNotesProvider,\n    {\n      scale,\n      totalHeight,\n      pixelScale: -1,\n    },\n    [\n      h(SVG, { width, height: totalHeight, paddingH: 4 }, [\n        h(NotesColumn, {\n          width,\n          notes,\n          noteComponent,\n          paddingLeft,\n          deltaConnectorAttachment,\n          focusedNoteComponent,\n        }),\n      ]),\n      children,\n    ],\n  );\n}\n"],"names":[],"mappings":";;;;AAkBO,SAAS,YAAY;AAAA,EAC1B;AAAA,EACA,QAAQ;AAAA,EACR;AAAA,EACA,cAAc;AAAA,EACd;AAAA,EACA;AAAA,EACA;AACF,GAAqB;AACnB,QAAM,EAAE,YAAA,IAAgB,wBAAA;AACxB,QAAM,QAAQ,kBAAA;AAEd,SAAO;AAAA,IACL;AAAA,IACA;AAAA,MACE;AAAA,MACA;AAAA,MACA,YAAY;AAAA,IAAA;AAAA,IAEd;AAAA,MACE,EAAE,KAAK,EAAE,OAAO,QAAQ,aAAa,UAAU,KAAK;AAAA,QAClD,EAAE,aAAa;AAAA,UACb;AAAA,UACA;AAAA,UACA;AAAA,UACA;AAAA,UACA;AAAA,UACA;AAAA,QAAA,CACD;AAAA,MAAA,CACF;AAAA,MACD;AAAA,IAAA;AAAA,EACF;AAEJ;"}
+{"version":3,"file":"notes.js","sources":["../src/notes.ts"],"sourcesContent":["import h from \"@macrostrat/hyper\";\n\nimport { ColumnNotesProvider } from \"./units\";\n\nimport { NotesColumn, SVG, type NoteData } from \"@macrostrat/column-components\";\nimport { useCompositeScale, useMacrostratColumnData } from \"./data-provider\";\nimport type { ComponentType, ReactNode } from \"react\";\n\ninterface ColumnNotesProps {\n  notes: any[];\n  width?: number;\n  noteComponent?: any;\n  paddingLeft?: number;\n  deltaConnectorAttachment?: number;\n  children?: ReactNode;\n  focusedNoteComponent?: ComponentType<any> | null;\n  /** Called when a note is clicked */\n  onClickNote?: (note: NoteData) => void;\n  /** Px the connector continues past each end (see `NodeConnectorOptions`) */\n  connectorOverhang?: number | [number, number];\n  /** Draw the marker at a point note's height (default true) */\n  showPointMarker?: boolean;\n  /** Options for the label force layout (e.g. `nodeSpacing`) */\n  forceOptions?: object;\n  className?: string;\n}\n\nexport function ColumnNotes({\n  notes,\n  width = 200,\n  noteComponent,\n  paddingLeft = 60,\n  deltaConnectorAttachment,\n  focusedNoteComponent,\n  onClickNote,\n  forceOptions,\n  connectorOverhang,\n  showPointMarker,\n  className,\n  children,\n}: ColumnNotesProps) {\n  const { totalHeight } = useMacrostratColumnData();\n  const scale = useCompositeScale();\n\n  return h(\n    ColumnNotesProvider,\n    {\n      scale,\n      totalHeight,\n      pixelScale: -1,\n    },\n    [\n      h(SVG, { width, height: totalHeight, paddingH: 4, className }, [\n        h(NotesColumn, {\n          width,\n          notes,\n          noteComponent,\n          paddingLeft,\n          deltaConnectorAttachment,\n          focusedNoteComponent,\n          onClickNote,\n          forceOptions,\n          connectorOverhang,\n          showPointMarker,\n        }),\n      ]),\n      children,\n    ],\n  );\n}\n"],"names":[],"mappings":";;;;AA2BO,SAAS,YAAY;AAAA,EAC1B;AAAA,EACA,QAAQ;AAAA,EACR;AAAA,EACA,cAAc;AAAA,EACd;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AACF,GAAqB;AACnB,QAAM,EAAE,YAAA,IAAgB,wBAAA;AACxB,QAAM,QAAQ,kBAAA;AAEd,SAAO;AAAA,IACL;AAAA,IACA;AAAA,MACE;AAAA,MACA;AAAA,MACA,YAAY;AAAA,IAAA;AAAA,IAEd;AAAA,MACE,EAAE,KAAK,EAAE,OAAO,QAAQ,aAAa,UAAU,GAAG,aAAa;AAAA,QAC7D,EAAE,aAAa;AAAA,UACb;AAAA,UACA;AAAA,UACA;AAAA,UACA;AAAA,UACA;AAAA,UACA;AAAA,UACA;AAAA,UACA;AAAA,UACA;AAAA,UACA;AAAA,QAAA,CACD;AAAA,MAAA,CACF;AAAA,MACD;AAAA,IAAA;AAAA,EACF;AAEJ;"}