@macrostrat/column-views 2.1.4 → 2.2.0

package/dist/esm/index.d.ts

@@ -1,13 +1,14 @@
-import { UnitLong, BaseUnit, ColumnGeoJSONRecord, MacrostratRef, StratName, ColumnGeoJSONRecordWithID, Environment } from "@macrostrat/api-types";
-import React, { ReactNode, RefObject, ProviderProps, FunctionComponentElement, Context, DOMAttributes, DOMElement, JSXElementConstructor, ReactElement, DetailedReactHTMLElement, FunctionComponent, HTMLAttributes, CSSProperties, AriaRole, ClipboardEventHandler, CompositionEventHandler, FocusEventHandler, FormEventHandler, ReactEventHandler, KeyboardEventHandler, MouseEventHandler, DragEventHandler, TouchEventHandler, PointerEventHandler, UIEventHandler, WheelEventHandler, AnimationEventHandler, TransitionEventHandler, MutableRefObject } from "react";
+import { UnitLong, BaseUnit, ColumnGeoJSONRecord, MacrostratRef, StratName, ColumnGeoJSONRecordWithID, Environment, Interval } from "@macrostrat/api-types";
+import { ScaleContinuousNumeric } from "d3-scale";
+import React, { ReactNode, RefObject, ProviderProps, FunctionComponentElement, Context, DOMAttributes, DOMElement, JSXElementConstructor, ReactElement, DetailedReactHTMLElement, FunctionComponent, HTMLAttributes, CSSProperties, JSX, ElementType, MutableRefObject, InputHTMLAttributes } from "react";
 import { StoreApi } from "zustand";
-import { ScaleLinear } from "d3-scale";
 import { APIConfig, APIConfigOptions } from "@macrostrat/ui-components";
 import { AxiosRequestConfig, AxiosInstance } from "axios";
 import { ColumnDivision, ColumnProviderProps, LithologyColumnProps, ColumnCtx } from "@macrostrat/column-components";
 import { UnitDetailsFeature as _UnitDetailsFeature1, MacrostratColumnDataContext as _MacrostratColumnDataContext1, ColumnContainerProps as _ColumnContainerProps1, BaseMeasurementsColumnProps as _BaseMeasurementsColumnProps1 } from "column-views/src";
 import { LithologyTagFeature as _LithologyTagFeature1 } from "data-components/src";
 import { UnitLong as _UnitLong1 } from "api-types/src";
+import { BoxProps } from "ui-box";
 import { Style } from "mapbox-gl";
 import { ExtendedFeature } from "d3-geo";
 import { Polygon, LineString, Point } from "geojson";
@@ -18,6 +19,17 @@ enum ColumnAxisType {
     DEPTH = "depth",
     ORDINAL = "ordinal"
 }
+interface StrictPadding {
+    paddingLeft: number;
+    paddingRight: number;
+    paddingTop: number;
+    paddingBottom: number;
+}
+interface Padding extends Partial<StrictPadding> {
+    paddingV?: number;
+    paddingH?: number;
+    padding?: number;
+}
 interface Clickable {
     onClick?: (evt: MouseEvent) => void;
 }
@@ -40,26 +52,120 @@ export interface RectBounds {
     width: number;
     height: number;
 }
-interface StratigraphicPackage {
+export interface ColumnHeightScaleOptions {
+    /** A fixed pixel scale to use for the section (pixels per Myr) */
+    pixelScale?: number;
+    /** The target height of a constituent unit in pixels, for dynamic
+     * scale generation */
+    targetUnitHeight?: number;
+    /** Min height of a section in pixels. Will override minPixelScale in some cases. */
+    minSectionHeight?: number;
+    /** The minimum pixel scale to use for the section (pixels per Myr). This is mostly
+     * needed because small sections (<1-2 units) don't necessarily have space to comfortably
+     * render two axis labels */
+    minPixelScale?: number;
+    axisType?: ColumnAxisType;
+    unconformityHeight?: number;
+    collapseSmallUnconformities?: boolean | number;
+    scale?: ScaleContinuousNumeric<number, number>;
+    hybridScale?: HybridScaleDefinition;
+}
+export enum HybridScaleType {
+    EquidistantSurfaces = "equidistant-surfaces",
+    ApproximateHeight = "approximate-height"
+}
+export enum HeightMethod {
+    Minimum = "minimum",
+    Average = "average",
+    Maximum = "maximum"
+}
+export interface HybridScaleOptions {
+    pixelOffset?: number;
+    pixelScale?: number;
+}
+export type ApproxHeightScaleOptions = {
+    minHeight?: number;
+    defaultHeight?: number;
+    heightMethod?: HeightMethod;
+};
+export type HybridScaleDefinition = ({
+    type: HybridScaleType.ApproximateHeight;
+} & ApproxHeightScaleOptions) | {
+    type: HybridScaleType.EquidistantSurfaces;
+};
+export interface SectionScaleOptions extends ColumnHeightScaleOptions {
+    axisType: ColumnAxisType;
+    domain: [number, number];
+}
+/** Output of a section scale. For now, this assumes that the
+ * mapping is linear, but it could be extended to support arbitrary
+ * scale functions.
+ */
+export interface PackageScaleInfo {
+    domain: [number, number];
+    pixelHeight: number;
+    scale: ScaleContinuousNumeric<number, number>;
+    pixelScale?: number;
+    heightScale?: ScaleContinuousNumeric<number, number>;
+}
+export type PackageScaleLayoutData = PackageScaleInfo & {
+    key: string;
+    offset: number;
+    paddingTop: number;
+};
+export interface StratigraphicPackage {
     /** A collection of stratigraphic information organized in time, corresponding
      * to single or multiple columns. */
     t_age: number;
     b_age: number;
 }
-interface SectionInfo<T extends UnitLong = ExtUnit> extends StratigraphicPackage {
+export interface SectionInfo<T extends UnitLong = ExtUnit> extends StratigraphicPackage {
     /** A time-bounded part of a single stratigraphic column. */
     section_id: number | number[];
     units: T[];
+    b_pos?: number;
+    t_pos?: number;
 }
-interface ExtUnit extends UnitLong {
+export interface ExtUnit extends UnitLong {
     bottomOverlap: boolean;
     overlappingUnits: number[];
     column?: number;
     t_clip_pos?: number;
     b_clip_pos?: number;
 }
-export function preprocessUnits<T extends UnitLong = UnitLong>(section: SectionInfo<T>, axisType?: ColumnAxisType): ExtUnit[];
-export function groupUnitsIntoSections<T extends UnitLong>(units: T[], axisType?: ColumnAxisType): SectionInfo<T>[];
+export type PackageLayoutData<T extends UnitLong = ExtUnit> = SectionInfo<T> & {
+    scaleInfo: PackageScaleLayoutData;
+    key: string;
+};
+export interface CompositeScaleData {
+    totalHeight: number;
+    sections: PackageScaleLayoutData[];
+}
+export interface ColumnScaleOptions extends ColumnHeightScaleOptions {
+    axisType: ColumnAxisType;
+    unconformityHeight: number;
+}
+export interface CompositeColumnData<T extends UnitLong = ExtUnit> extends Omit<CompositeScaleData, "sections"> {
+    sections: PackageLayoutData<T>[];
+}
+export interface PrepareColumnOptions extends ColumnScaleOptions {
+    axisType: ColumnAxisType;
+    t_age?: number;
+    b_age?: number;
+    t_pos?: number;
+    b_pos?: number;
+    mergeSections?: MergeSectionsMode;
+    collapseSmallUnconformities?: boolean | number;
+    scale?: ScaleContinuousNumeric<any, any>;
+}
+export enum MergeSectionsMode {
+    ALL = "all",
+    OVERLAPPING = "overlapping"
+}
+export interface PreparedColumnData extends CompositeColumnData {
+    sections: PackageLayoutData[];
+    units: ExtUnit[];
+}
 interface UnitsOverlap {
     (a: StratigraphicPackage, b: StratigraphicPackage, axisType?: ColumnAxisType.AGE, tolerance?: number): boolean;
     (a: BaseUnit, b: BaseUnit, axisType: ColumnAxisType, tolerance?: number): boolean;
@@ -75,7 +181,7 @@ export function getUnitHeightRange(unit: PossiblyClippedUnit, axisType: ColumnAx
 export const createUnitSorter: (axisType: ColumnAxisType) => (a: BaseUnit, b: BaseUnit) => number;
 export function ensureArray<T>(x: T | T[]): T[];
 export function ensureRealFloat(x: number | string | null): number | null;
-type UnitSelectDispatch = (unit: BaseUnit | null, target: HTMLElement | null, event: Event | null) => void;
+type UnitSelectDispatch = (unit: number | BaseUnit | null, target: HTMLElement | null, event: Event | null) => void;
 export function useUnitSelectionDispatch(): UnitSelectDispatch;
 export function useUnitSelectionStore<T>(selector: (state: UnitSelectionStore) => T): T;
 export function useSelectedUnit(): BaseUnit;
@@ -105,10 +211,11 @@ export function UnitKeyboardNavigation<T extends BaseUnit>({ units, }: {
     units: T[];
 }): any;
 declare function defaultFetch(url: string, options?: RequestInit | undefined): Promise<Response>;
+export type ColumnStatusCode = "in process" | "active" | "obsolete";
 export interface ColumnFetchOptions {
     apiBaseURL?: string;
     projectID?: number;
-    statusCode?: "in process";
+    statusCode?: ColumnStatusCode | ColumnStatusCode[];
     format?: "geojson" | "topojson" | "geojson_bare";
     fetch?: any;
 }
@@ -130,60 +237,16 @@ export type ColumnData = {
 };
 export function fetchUnits(columns: number[], fetch?: typeof defaultFetch): Promise<ColumnData[]>;
 export function fetchColumnUnits(col_id: number, fetch?: typeof defaultFetch): Promise<ColumnData>;
-interface ColumnHeightScaleOptions {
-    /** A fixed pixel scale to use for the section (pixels per Myr) */
-    pixelScale?: number;
-    /** The target height of a constituent unit in pixels, for dynamic
-     * scale generation */
-    targetUnitHeight?: number;
-    /** Min height of a section in pixels. Will override minPixelScale in some cases. */
-    minSectionHeight?: number;
-    /** The minimum pixel scale to use for the section (pixels per Myr). This is mostly
-     * needed because small sections (<1-2 units) don't necessarily have space to comfortably
-     * render two axis labels */
-    minPixelScale?: number;
-    axisType?: ColumnAxisType;
-    unconformityHeight?: number;
-    collapseSmallUnconformities?: boolean | number;
-}
-interface LinearScaleDef {
-    domain: [number, number];
-    pixelScale: number;
-}
-/** Output of a section scale. For now, this assumes that the
- * mapping is linear, but it could be extended to support arbitrary
- * scale functions.
- */
-interface PackageScaleInfo extends LinearScaleDef {
-    pixelHeight: number;
-    scale: ScaleLinear<number, number>;
-}
-type PackageScaleLayoutData = PackageScaleInfo & {
-    key: string;
-    offset: number;
-    paddingTop: number;
-};
-type PackageLayoutData<T extends UnitLong = ExtUnit> = SectionInfo<T> & {
-    scaleInfo: PackageScaleLayoutData;
-    key: string;
-};
-interface CompositeScaleData {
-    totalHeight: number;
-    sections: PackageScaleLayoutData[];
-}
-interface ColumnScaleOptions extends ColumnHeightScaleOptions {
-    axisType: ColumnAxisType;
-    unconformityHeight: number;
-}
-interface CompositeColumnData<T extends UnitLong = ExtUnit> extends Omit<CompositeScaleData, "sections"> {
-    sections: PackageLayoutData<T>[];
-}
 interface _CompositeColumnScale1 {
     (age: number): number | null;
     copy(): _CompositeColumnScale1;
     domain(): [number, number];
     invert(pixelHeight: number): number | null;
+    clamp(clamp: boolean): void;
 }
+export function preprocessUnits<T extends UnitLong = UnitLong>(section: SectionInfo<T>, axisType?: ColumnAxisType): ExtUnit[];
+export function usePreparedColumnUnits(data: UnitLong[], options: PrepareColumnOptions): PreparedColumnData;
+export function prepareColumnUnits(units: UnitLong[], options: PrepareColumnOptions): PreparedColumnData;
 export interface MacrostratColumnDataContext {
     units: ExtUnit[];
     sections: PackageLayoutData[];
@@ -195,6 +258,7 @@ export function MacrostratColumnDataProvider({ children, units, sections, totalH
 }): FunctionComponentElement<ProviderProps<MacrostratColumnDataContext>>;
 export function useMacrostratColumnData(): MacrostratColumnDataContext;
 export function useMacrostratUnits(): ExtUnit[];
+export function useColumnUnitsMap(): Map<number, ExtUnit> | null;
 export function useCompositeScale(): _CompositeColumnScale1;
 export interface MacrostratDataProviderProps {
     baseURL: string;
@@ -216,7 +280,7 @@ interface MacrostratStore extends RefsSlice {
     lithologies: Map<number, any> | null;
     getLithologies(ids: number[] | null): Promise<any>;
     intervals: Map<number, any> | null;
-    getIntervals(ids: number[] | null, timescaleID: number | null): Promise<any>;
+    getIntervals(ids: number[] | null, timescaleID: number | null): Promise<Interval[]>;
     environments: Map<number, Environment> | null;
     getEnvironments(ids: number[] | null): Promise<Environment[]>;
     columnFootprints: Map<number, ColumnFootprintsStorage>;
@@ -226,6 +290,7 @@ interface MacrostratStore extends RefsSlice {
 }
 type MacrostratSelector = (store: MacrostratStore) => any;
 export function useMacrostratStore(selector: MacrostratSelector | "api"): any;
+export function useMacrostratBaseURL(defaultURL?: string): string;
 type DataTypeKey = "lithologies" | "intervals" | "columns" | "environments" | "refs" | "strat_names";
 export function useMacrostratDefs(dataType: string): Map<number, any> | null;
 export function useMacrostratColumns(projectID: number | null, inProcess: boolean): any;
@@ -322,15 +387,11 @@ interface CompositeUnitProps {
 export function CompositeUnitsColumn(props: CompositeUnitProps): FunctionComponentElement<LithologyColumnProps>;
 export function AnnotatedUnitsColumn(props: ICompositeUnitProps): any;
 export function SectionLabelsColumn(props: ICompositeUnitProps): DOMElement<DOMAttributes<Element>, Element>;
-type CompositeScaleOpts = {
-    clamped?: boolean;
-};
 export interface CompositeColumnScale {
     (val: number): number;
     copy(): CompositeColumnScale;
     domain(): number[];
 }
-export function compositeScale(sections: any, opts?: CompositeScaleOpts): CompositeColumnScale;
 export function ColumnNotesProvider(props: any): FunctionComponentElement<ProviderProps<ColumnCtx<ColumnDivision>>>;
 export function UnitsColumn({ width }: {
     width?: number;
@@ -388,45 +449,17 @@ type MapPosition = {
     camera: CameraPosition;
     target?: TargetPosition;
 };
-type MapboxCoreOptions = Omit<mapboxgl.MapboxOptions, "container">;
-interface MapViewProps extends MapboxCoreOptions {
-    showLineSymbols?: boolean;
-    children?: React.ReactNode;
-    mapboxToken?: string;
-    accessToken?: string;
-    terrainSourceID?: string;
-    enableTerrain?: boolean;
-    infoMarkerPosition?: mapboxgl.LngLatLike;
-    mapPosition?: MapPosition;
-    initializeMap?: (container: HTMLElement, args: MapboxOptionsExt) => mapboxgl.Map;
-    onMapLoaded?: (map: mapboxgl.Map) => void;
-    onStyleLoaded?: (map: mapboxgl.Map) => void;
-    onMapMoved?: (mapPosition: MapPosition, map: mapboxgl.Map) => void;
-    /** This map sets its own viewport, rather than being positioned by a parent.
-     * This is a hack to ensure that the map can overflow its "safe area" when false */
-    standalone?: boolean;
-    /** Overlay styles to apply to the map: a list of mapbox style objects or fragments to
-     * overlay on top of the main map style at runtime */
-    overlayStyles?: Partial<mapboxgl.StyleSpecification>[];
-    /** A function to transform the map style before it is loaded */
-    transformStyle?: (style: mapboxgl.StyleSpecification) => mapboxgl.StyleSpecification;
-    loadingIgnoredSources?: string[];
-    id?: string;
-    className?: string;
-}
-interface MapboxOptionsExt extends MapboxCoreOptions {
-    mapPosition?: MapPosition;
-}
-export function UnitDetailsPanel({ unit, onClose, className, features, lithologyFeatures, actions, selectUnit, columnUnits, onClickItem, }: {
+export function UnitDetailsPanel({ unit, onClose, className, features, lithologyFeatures, actions, hiddenActions, onSelectUnit, columnUnits, onClickItem, }: {
     unit: any;
     onClose?: any;
     showLithologyProportions?: boolean;
     className?: string;
     actions?: ReactNode;
+    hiddenActions?: ReactNode;
     features?: Set<UnitDetailsFeature>;
     lithologyFeatures?: Set<LithologyTagFeature>;
     columnUnits?: UnitLong[];
-    selectUnit?: (unitID: number) => void;
+    onSelectUnit?: (unitID: number) => void;
     onClickItem?: (item: any) => void;
 }): ReactElement<{
     className: string;
@@ -480,14 +513,23 @@ export function Duration({ value, maximumFractionDigits, minimumFractionDigits,
     children?: any;
     className?: string;
 }>;
-export function Identifier({ id, onClick, className, }: {
-    id: number | string;
-    onClick?: (id: number | string) => void;
+export function ClickableText({ onClick, className, children, }: {
+    onClick: () => void;
     className?: string;
+    children: ReactNode;
 }): DetailedReactHTMLElement<{
-    onClick(): void;
+    onClick: () => void;
     className: string;
 }, HTMLElement>;
+export function Identifier({ id, onClick, className, }: {
+    id: number | string;
+    onClick?: (id: number | string) => void;
+    className?: string;
+}): FunctionComponentElement<{
+    onClick: () => void;
+    className?: string;
+    children: ReactNode;
+}>;
 export function UnitDetailsPopover({ style, children, viewportPadding, }: {
     style: object;
     viewportPadding?: number;
@@ -502,10 +544,11 @@ export function UnitDetailsPanelWithNavigation(props: any): FunctionComponentEle
     showLithologyProportions?: boolean;
     className?: string;
     actions?: ReactNode;
+    hiddenActions?: ReactNode;
     features?: Set<_UnitDetailsFeature1>;
     lithologyFeatures?: Set<_LithologyTagFeature1>;
     columnUnits?: _UnitLong1[];
-    selectUnit?: (unitID: number) => void;
+    onSelectUnit?: (unitID: number) => void;
     onClickItem?: (item: any) => void;
 }>;
 export function VerticalAxisLabel(props: any): ReactElement<{
@@ -514,13 +557,23 @@ export function VerticalAxisLabel(props: any): ReactElement<{
         height: any;
     };
 }, string | JSXElementConstructor<any>>;
-export function CompositeAgeAxis(): FunctionComponentElement<CompositeStratigraphicScaleInfo>;
-export interface CompositeStratigraphicScaleInfo {
+interface CompositeAgeAxisProps {
+    className?: string;
+    style?: React.CSSProperties;
+}
+export function CompositeAgeAxis(rest: CompositeAgeAxisProps): FunctionComponentElement<CompositeStratigraphicScaleInfo>;
+export function ApproximateHeightAxis(rest: CompositeAgeAxisProps): FunctionComponentElement<CompositeStratigraphicScaleInfo>;
+export interface CompositeStratigraphicScaleInfo extends CompositeAgeAxisProps {
     axisType: ColumnAxisType;
+    axisLabel?: string;
+    axisUnit?: string;
     totalHeight: number;
     packages: PackageScaleLayoutData[];
 }
-export function CompositeAgeAxisCore(props: CompositeStratigraphicScaleInfo): ReactElement<any, string | JSXElementConstructor<any>>;
+export function CompositeAgeAxisCore(props: CompositeStratigraphicScaleInfo): ReactElement<{
+    className?: string;
+    style?: React.CSSProperties;
+}, string | JSXElementConstructor<any>>;
 export function AgeCursor({ age }: {
     age: any;
 }): ReactElement<{
@@ -528,23 +581,6 @@ export function AgeCursor({ age }: {
         top: number;
     };
 }, string | JSXElementConstructor<any>>;
-export interface PrepareColumnOptions extends ColumnScaleOptions {
-    axisType: ColumnAxisType;
-    t_age?: number;
-    b_age?: number;
-    mergeSections?: MergeSectionsMode;
-    collapseSmallUnconformities?: boolean | number;
-}
-export enum MergeSectionsMode {
-    ALL = "all",
-    OVERLAPPING = "overlapping"
-}
-export interface PreparedColumnData extends CompositeColumnData {
-    sections: PackageLayoutData[];
-    units: ExtUnit[];
-}
-export function usePreparedColumnUnits(data: UnitLong[], options: PrepareColumnOptions): PreparedColumnData;
-export function prepareColumnUnits(units: UnitLong[], options: PrepareColumnOptions): PreparedColumnData;
 declare namespace AgeAxis {
     var defaultProps: {
         width: number;
@@ -576,295 +612,61 @@ interface BaseColumnProps extends SectionSharedProps {
     timescaleLevels?: number | [number, number];
     onMouseOver?: (unit: UnitLong | null, height: number | null, evt: MouseEvent) => void;
 }
-export interface ColumnProps extends BaseColumnProps, ColumnHeightScaleOptions {
+export interface ColumnProps extends Padding, BaseColumnProps, ColumnHeightScaleOptions {
     units: UnitLong[];
     t_age?: number;
     b_age?: number;
+    t_pos?: number;
+    b_pos?: number;
     mergeSections?: MergeSectionsMode;
     showUnitPopover?: boolean;
     allowUnitSelection?: boolean;
     selectedUnit?: number | null;
     onUnitSelected?: (unitID: number | null, unit: any) => void;
     unconformityHeight?: number;
+    scale?: ScaleContinuousNumeric<number, number>;
 }
 export function Column(props: ColumnProps): DOMElement<DOMAttributes<Element>, Element> | FunctionComponentElement<_MacrostratColumnDataContext1 & {
     children: ReactNode;
 }>;
 export interface ColumnContainerProps extends HTMLAttributes<HTMLDivElement> {
     className?: string;
+    style?: CSSProperties;
 }
-export function ColumnContainer(props: ColumnContainerProps): DOMElement<{
-    defaultChecked?: boolean | undefined;
-    defaultValue?: string | number | readonly string[] | undefined;
-    suppressContentEditableWarning?: boolean | undefined;
-    suppressHydrationWarning?: boolean | undefined;
-    accessKey?: string | undefined;
-    autoCapitalize?: "off" | "none" | "on" | "sentences" | "words" | "characters" | undefined | (string & {});
-    autoFocus?: boolean | undefined;
-    contentEditable?: (boolean | "true" | "false") | "inherit" | "plaintext-only" | undefined;
-    contextMenu?: string | undefined;
-    dir?: string | undefined;
-    draggable?: (boolean | "true" | "false") | undefined;
-    enterKeyHint?: "enter" | "done" | "go" | "next" | "previous" | "search" | "send" | undefined;
-    hidden?: boolean | undefined;
-    id?: string | undefined;
-    lang?: string | undefined;
-    nonce?: string | undefined;
-    slot?: string | undefined;
-    spellCheck?: (boolean | "true" | "false") | undefined;
-    style?: CSSProperties | undefined;
-    tabIndex?: number | undefined;
-    title?: string | undefined;
-    translate?: "yes" | "no" | undefined;
-    radioGroup?: string | undefined;
-    role?: AriaRole | undefined;
-    about?: string | undefined;
-    content?: string | undefined;
-    datatype?: string | undefined;
-    inlist?: any;
-    prefix?: string | undefined;
-    property?: string | undefined;
-    rel?: string | undefined;
-    resource?: string | undefined;
-    rev?: string | undefined;
-    typeof?: string | undefined;
-    vocab?: string | undefined;
-    autoCorrect?: string | undefined;
-    autoSave?: string | undefined;
-    color?: string | undefined;
-    itemProp?: string | undefined;
-    itemScope?: boolean | undefined;
-    itemType?: string | undefined;
-    itemID?: string | undefined;
-    itemRef?: string | undefined;
-    results?: number | undefined;
-    security?: string | undefined;
-    unselectable?: "on" | "off" | undefined;
-    inputMode?: "none" | "text" | "tel" | "url" | "email" | "numeric" | "decimal" | "search" | undefined;
-    is?: string | undefined;
-    "aria-activedescendant"?: string | undefined;
-    "aria-atomic"?: (boolean | "true" | "false") | undefined;
-    "aria-autocomplete"?: "none" | "inline" | "list" | "both" | undefined;
-    "aria-braillelabel"?: string | undefined;
-    "aria-brailleroledescription"?: string | undefined;
-    "aria-busy"?: (boolean | "true" | "false") | undefined;
-    "aria-checked"?: boolean | "false" | "mixed" | "true" | undefined;
-    "aria-colcount"?: number | undefined;
-    "aria-colindex"?: number | undefined;
-    "aria-colindextext"?: string | undefined;
-    "aria-colspan"?: number | undefined;
-    "aria-controls"?: string | undefined;
-    "aria-current"?: boolean | "false" | "true" | "page" | "step" | "location" | "date" | "time" | undefined;
-    "aria-describedby"?: string | undefined;
-    "aria-description"?: string | undefined;
-    "aria-details"?: string | undefined;
-    "aria-disabled"?: (boolean | "true" | "false") | undefined;
-    "aria-dropeffect"?: "none" | "copy" | "execute" | "link" | "move" | "popup" | undefined;
-    "aria-errormessage"?: string | undefined;
-    "aria-expanded"?: (boolean | "true" | "false") | undefined;
-    "aria-flowto"?: string | undefined;
-    "aria-grabbed"?: (boolean | "true" | "false") | undefined;
-    "aria-haspopup"?: boolean | "false" | "true" | "menu" | "listbox" | "tree" | "grid" | "dialog" | undefined;
-    "aria-hidden"?: (boolean | "true" | "false") | undefined;
-    "aria-invalid"?: boolean | "false" | "true" | "grammar" | "spelling" | undefined;
-    "aria-keyshortcuts"?: string | undefined;
-    "aria-label"?: string | undefined;
-    "aria-labelledby"?: string | undefined;
-    "aria-level"?: number | undefined;
-    "aria-live"?: "off" | "assertive" | "polite" | undefined;
-    "aria-modal"?: (boolean | "true" | "false") | undefined;
-    "aria-multiline"?: (boolean | "true" | "false") | undefined;
-    "aria-multiselectable"?: (boolean | "true" | "false") | undefined;
-    "aria-orientation"?: "horizontal" | "vertical" | undefined;
-    "aria-owns"?: string | undefined;
-    "aria-placeholder"?: string | undefined;
-    "aria-posinset"?: number | undefined;
-    "aria-pressed"?: boolean | "false" | "mixed" | "true" | undefined;
-    "aria-readonly"?: (boolean | "true" | "false") | undefined;
-    "aria-relevant"?: "additions" | "additions removals" | "additions text" | "all" | "removals" | "removals additions" | "removals text" | "text" | "text additions" | "text removals" | undefined;
-    "aria-required"?: (boolean | "true" | "false") | undefined;
-    "aria-roledescription"?: string | undefined;
-    "aria-rowcount"?: number | undefined;
-    "aria-rowindex"?: number | undefined;
-    "aria-rowindextext"?: string | undefined;
-    "aria-rowspan"?: number | undefined;
-    "aria-selected"?: (boolean | "true" | "false") | undefined;
-    "aria-setsize"?: number | undefined;
-    "aria-sort"?: "none" | "ascending" | "descending" | "other" | undefined;
-    "aria-valuemax"?: number | undefined;
-    "aria-valuemin"?: number | undefined;
-    "aria-valuenow"?: number | undefined;
-    "aria-valuetext"?: string | undefined;
-    children?: ReactNode | undefined;
-    dangerouslySetInnerHTML?: {
-        __html: string | TrustedHTML;
-    } | undefined;
-    onCopy?: ClipboardEventHandler<HTMLDivElement>;
-    onCopyCapture?: ClipboardEventHandler<HTMLDivElement>;
-    onCut?: ClipboardEventHandler<HTMLDivElement>;
-    onCutCapture?: ClipboardEventHandler<HTMLDivElement>;
-    onPaste?: ClipboardEventHandler<HTMLDivElement>;
-    onPasteCapture?: ClipboardEventHandler<HTMLDivElement>;
-    onCompositionEnd?: CompositionEventHandler<HTMLDivElement>;
-    onCompositionEndCapture?: CompositionEventHandler<HTMLDivElement>;
-    onCompositionStart?: CompositionEventHandler<HTMLDivElement>;
-    onCompositionStartCapture?: CompositionEventHandler<HTMLDivElement>;
-    onCompositionUpdate?: CompositionEventHandler<HTMLDivElement>;
-    onCompositionUpdateCapture?: CompositionEventHandler<HTMLDivElement>;
-    onFocus?: FocusEventHandler<HTMLDivElement>;
-    onFocusCapture?: FocusEventHandler<HTMLDivElement>;
-    onBlur?: FocusEventHandler<HTMLDivElement>;
-    onBlurCapture?: FocusEventHandler<HTMLDivElement>;
-    onChange?: FormEventHandler<HTMLDivElement>;
-    onChangeCapture?: FormEventHandler<HTMLDivElement>;
-    onBeforeInput?: FormEventHandler<HTMLDivElement>;
-    onBeforeInputCapture?: FormEventHandler<HTMLDivElement>;
-    onInput?: FormEventHandler<HTMLDivElement>;
-    onInputCapture?: FormEventHandler<HTMLDivElement>;
-    onReset?: FormEventHandler<HTMLDivElement>;
-    onResetCapture?: FormEventHandler<HTMLDivElement>;
-    onSubmit?: FormEventHandler<HTMLDivElement>;
-    onSubmitCapture?: FormEventHandler<HTMLDivElement>;
-    onInvalid?: FormEventHandler<HTMLDivElement>;
-    onInvalidCapture?: FormEventHandler<HTMLDivElement>;
-    onLoad?: ReactEventHandler<HTMLDivElement>;
-    onLoadCapture?: ReactEventHandler<HTMLDivElement>;
-    onError?: ReactEventHandler<HTMLDivElement>;
-    onErrorCapture?: ReactEventHandler<HTMLDivElement>;
-    onKeyDown?: KeyboardEventHandler<HTMLDivElement>;
-    onKeyDownCapture?: KeyboardEventHandler<HTMLDivElement>;
-    onKeyPress?: KeyboardEventHandler<HTMLDivElement>;
-    onKeyPressCapture?: KeyboardEventHandler<HTMLDivElement>;
-    onKeyUp?: KeyboardEventHandler<HTMLDivElement>;
-    onKeyUpCapture?: KeyboardEventHandler<HTMLDivElement>;
-    onAbort?: ReactEventHandler<HTMLDivElement>;
-    onAbortCapture?: ReactEventHandler<HTMLDivElement>;
-    onCanPlay?: ReactEventHandler<HTMLDivElement>;
-    onCanPlayCapture?: ReactEventHandler<HTMLDivElement>;
-    onCanPlayThrough?: ReactEventHandler<HTMLDivElement>;
-    onCanPlayThroughCapture?: ReactEventHandler<HTMLDivElement>;
-    onDurationChange?: ReactEventHandler<HTMLDivElement>;
-    onDurationChangeCapture?: ReactEventHandler<HTMLDivElement>;
-    onEmptied?: ReactEventHandler<HTMLDivElement>;
-    onEmptiedCapture?: ReactEventHandler<HTMLDivElement>;
-    onEncrypted?: ReactEventHandler<HTMLDivElement>;
-    onEncryptedCapture?: ReactEventHandler<HTMLDivElement>;
-    onEnded?: ReactEventHandler<HTMLDivElement>;
-    onEndedCapture?: ReactEventHandler<HTMLDivElement>;
-    onLoadedData?: ReactEventHandler<HTMLDivElement>;
-    onLoadedDataCapture?: ReactEventHandler<HTMLDivElement>;
-    onLoadedMetadata?: ReactEventHandler<HTMLDivElement>;
-    onLoadedMetadataCapture?: ReactEventHandler<HTMLDivElement>;
-    onLoadStart?: ReactEventHandler<HTMLDivElement>;
-    onLoadStartCapture?: ReactEventHandler<HTMLDivElement>;
-    onPause?: ReactEventHandler<HTMLDivElement>;
-    onPauseCapture?: ReactEventHandler<HTMLDivElement>;
-    onPlay?: ReactEventHandler<HTMLDivElement>;
-    onPlayCapture?: ReactEventHandler<HTMLDivElement>;
-    onPlaying?: ReactEventHandler<HTMLDivElement>;
-    onPlayingCapture?: ReactEventHandler<HTMLDivElement>;
-    onProgress?: ReactEventHandler<HTMLDivElement>;
-    onProgressCapture?: ReactEventHandler<HTMLDivElement>;
-    onRateChange?: ReactEventHandler<HTMLDivElement>;
-    onRateChangeCapture?: ReactEventHandler<HTMLDivElement>;
-    onResize?: ReactEventHandler<HTMLDivElement>;
-    onResizeCapture?: ReactEventHandler<HTMLDivElement>;
-    onSeeked?: ReactEventHandler<HTMLDivElement>;
-    onSeekedCapture?: ReactEventHandler<HTMLDivElement>;
-    onSeeking?: ReactEventHandler<HTMLDivElement>;
-    onSeekingCapture?: ReactEventHandler<HTMLDivElement>;
-    onStalled?: ReactEventHandler<HTMLDivElement>;
-    onStalledCapture?: ReactEventHandler<HTMLDivElement>;
-    onSuspend?: ReactEventHandler<HTMLDivElement>;
-    onSuspendCapture?: ReactEventHandler<HTMLDivElement>;
-    onTimeUpdate?: ReactEventHandler<HTMLDivElement>;
-    onTimeUpdateCapture?: ReactEventHandler<HTMLDivElement>;
-    onVolumeChange?: ReactEventHandler<HTMLDivElement>;
-    onVolumeChangeCapture?: ReactEventHandler<HTMLDivElement>;
-    onWaiting?: ReactEventHandler<HTMLDivElement>;
-    onWaitingCapture?: ReactEventHandler<HTMLDivElement>;
-    onAuxClick?: MouseEventHandler<HTMLDivElement>;
-    onAuxClickCapture?: MouseEventHandler<HTMLDivElement>;
-    onClick?: MouseEventHandler<HTMLDivElement>;
-    onClickCapture?: MouseEventHandler<HTMLDivElement>;
-    onContextMenu?: MouseEventHandler<HTMLDivElement>;
-    onContextMenuCapture?: MouseEventHandler<HTMLDivElement>;
-    onDoubleClick?: MouseEventHandler<HTMLDivElement>;
-    onDoubleClickCapture?: MouseEventHandler<HTMLDivElement>;
-    onDrag?: DragEventHandler<HTMLDivElement>;
-    onDragCapture?: DragEventHandler<HTMLDivElement>;
-    onDragEnd?: DragEventHandler<HTMLDivElement>;
-    onDragEndCapture?: DragEventHandler<HTMLDivElement>;
-    onDragEnter?: DragEventHandler<HTMLDivElement>;
-    onDragEnterCapture?: DragEventHandler<HTMLDivElement>;
-    onDragExit?: DragEventHandler<HTMLDivElement>;
-    onDragExitCapture?: DragEventHandler<HTMLDivElement>;
-    onDragLeave?: DragEventHandler<HTMLDivElement>;
-    onDragLeaveCapture?: DragEventHandler<HTMLDivElement>;
-    onDragOver?: DragEventHandler<HTMLDivElement>;
-    onDragOverCapture?: DragEventHandler<HTMLDivElement>;
-    onDragStart?: DragEventHandler<HTMLDivElement>;
-    onDragStartCapture?: DragEventHandler<HTMLDivElement>;
-    onDrop?: DragEventHandler<HTMLDivElement>;
-    onDropCapture?: DragEventHandler<HTMLDivElement>;
-    onMouseDown?: MouseEventHandler<HTMLDivElement>;
-    onMouseDownCapture?: MouseEventHandler<HTMLDivElement>;
-    onMouseEnter?: MouseEventHandler<HTMLDivElement>;
-    onMouseLeave?: MouseEventHandler<HTMLDivElement>;
-    onMouseMove?: MouseEventHandler<HTMLDivElement>;
-    onMouseMoveCapture?: MouseEventHandler<HTMLDivElement>;
-    onMouseOut?: MouseEventHandler<HTMLDivElement>;
-    onMouseOutCapture?: MouseEventHandler<HTMLDivElement>;
-    onMouseOver?: MouseEventHandler<HTMLDivElement>;
-    onMouseOverCapture?: MouseEventHandler<HTMLDivElement>;
-    onMouseUp?: MouseEventHandler<HTMLDivElement>;
-    onMouseUpCapture?: MouseEventHandler<HTMLDivElement>;
-    onSelect?: ReactEventHandler<HTMLDivElement>;
-    onSelectCapture?: ReactEventHandler<HTMLDivElement>;
-    onTouchCancel?: TouchEventHandler<HTMLDivElement>;
-    onTouchCancelCapture?: TouchEventHandler<HTMLDivElement>;
-    onTouchEnd?: TouchEventHandler<HTMLDivElement>;
-    onTouchEndCapture?: TouchEventHandler<HTMLDivElement>;
-    onTouchMove?: TouchEventHandler<HTMLDivElement>;
-    onTouchMoveCapture?: TouchEventHandler<HTMLDivElement>;
-    onTouchStart?: TouchEventHandler<HTMLDivElement>;
-    onTouchStartCapture?: TouchEventHandler<HTMLDivElement>;
-    onPointerDown?: PointerEventHandler<HTMLDivElement>;
-    onPointerDownCapture?: PointerEventHandler<HTMLDivElement>;
-    onPointerMove?: PointerEventHandler<HTMLDivElement>;
-    onPointerMoveCapture?: PointerEventHandler<HTMLDivElement>;
-    onPointerUp?: PointerEventHandler<HTMLDivElement>;
-    onPointerUpCapture?: PointerEventHandler<HTMLDivElement>;
-    onPointerCancel?: PointerEventHandler<HTMLDivElement>;
-    onPointerCancelCapture?: PointerEventHandler<HTMLDivElement>;
-    onPointerEnter?: PointerEventHandler<HTMLDivElement>;
-    onPointerLeave?: PointerEventHandler<HTMLDivElement>;
-    onPointerOver?: PointerEventHandler<HTMLDivElement>;
-    onPointerOverCapture?: PointerEventHandler<HTMLDivElement>;
-    onPointerOut?: PointerEventHandler<HTMLDivElement>;
-    onPointerOutCapture?: PointerEventHandler<HTMLDivElement>;
-    onGotPointerCapture?: PointerEventHandler<HTMLDivElement>;
-    onGotPointerCaptureCapture?: PointerEventHandler<HTMLDivElement>;
-    onLostPointerCapture?: PointerEventHandler<HTMLDivElement>;
-    onLostPointerCaptureCapture?: PointerEventHandler<HTMLDivElement>;
-    onScroll?: UIEventHandler<HTMLDivElement>;
-    onScrollCapture?: UIEventHandler<HTMLDivElement>;
-    onWheel?: WheelEventHandler<HTMLDivElement>;
-    onWheelCapture?: WheelEventHandler<HTMLDivElement>;
-    onAnimationStart?: AnimationEventHandler<HTMLDivElement>;
-    onAnimationStartCapture?: AnimationEventHandler<HTMLDivElement>;
-    onAnimationEnd?: AnimationEventHandler<HTMLDivElement>;
-    onAnimationEndCapture?: AnimationEventHandler<HTMLDivElement>;
-    onAnimationIteration?: AnimationEventHandler<HTMLDivElement>;
-    onAnimationIterationCapture?: AnimationEventHandler<HTMLDivElement>;
-    onTransitionEnd?: TransitionEventHandler<HTMLDivElement>;
-    onTransitionEndCapture?: TransitionEventHandler<HTMLDivElement>;
-    className: string;
-}, Element>;
+export function ColumnContainer(props: ColumnContainerProps): FunctionComponentElement<BoxProps<ElementType<any, keyof JSX.IntrinsicElements>>>;
 export function ColumnBasicInfo({ data, showColumnID }: {
     data: any;
     showColumnID?: boolean;
 }): DOMElement<DOMAttributes<Element>, Element>;
+type MapboxCoreOptions = Omit<mapboxgl.MapboxOptions, "container">;
+interface MapViewProps extends MapboxCoreOptions {
+    showLineSymbols?: boolean;
+    children?: React.ReactNode;
+    mapboxToken?: string;
+    accessToken?: string;
+    terrainSourceID?: string;
+    enableTerrain?: boolean;
+    infoMarkerPosition?: mapboxgl.LngLatLike;
+    mapPosition?: MapPosition;
+    initializeMap?: (container: HTMLElement, args: MapboxOptionsExt) => mapboxgl.Map;
+    onMapLoaded?: (map: mapboxgl.Map) => void;
+    onStyleLoaded?: (map: mapboxgl.Map) => void;
+    onMapMoved?: (mapPosition: MapPosition, map: mapboxgl.Map) => void;
+    /** This map sets its own viewport, rather than being positioned by a parent.
+     * This is a hack to ensure that the map can overflow its "safe area" when false */
+    standalone?: boolean;
+    /** Overlay styles to apply to the map: a list of mapbox style objects or fragments to
+     * overlay on top of the main map style at runtime */
+    overlayStyles?: Partial<mapboxgl.StyleSpecification>[];
+    /** A function to transform the map style before it is loaded */
+    transformStyle?: (style: mapboxgl.StyleSpecification) => mapboxgl.StyleSpecification;
+    loadingIgnoredSources?: string[];
+    id?: string;
+    className?: string;
+}
+interface MapboxOptionsExt extends MapboxCoreOptions {
+    mapPosition?: MapPosition;
+}
 export interface InsetMapProps extends Omit<MapViewProps, "style"> {
     controls?: ReactNode;
     className?: string;
@@ -997,6 +799,7 @@ export interface CorrelationMapProps extends InsetMapProps {
 }
 export function ColumnCorrelationMap(props: CorrelationMapProps): FunctionComponentElement<InsetMapProps>;
 export function BoundaryAgeModelOverlay(): DOMElement<any, Element>;
+export function ComputedSurfacesOverlay(): DOMElement<DOMAttributes<Element>, Element>;
 interface CorrelationChartSettings extends Omit<PrepareColumnOptions, "axisType"> {
     targetUnitHeight?: number;
 }
@@ -1023,6 +826,22 @@ interface ColumnNotesProps {
     children?: ReactNode;
 }
 export function ColumnNotes({ notes, width, noteComponent, paddingLeft, deltaConnectorAttachment, children, }: ColumnNotesProps): FunctionComponentElement<any>;
+export enum FossilDataType {
+    Occurrences = "occs",
+    Collections = "colls"
+}
+export interface BaseMeasurementsColumnProps<T> {
+    data: T[];
+    noteComponent?: any;
+    width?: number;
+    paddingLeft?: number;
+    className?: string;
+    getUnitID?: (d: T) => number | string;
+    matchingUnit?: (dz: T) => (d: any) => boolean;
+}
+export function BaseMeasurementsColumn({ data, noteComponent, width, paddingLeft, className, getUnitID, matchingUnit, }: BaseMeasurementsColumnProps<any>): DetailedReactHTMLElement<{
+    className: string;
+}, HTMLElement>;
 interface TruncatedListProps {
     data: any[];
     className?: string;
@@ -1034,21 +853,13 @@ interface TruncatedListProps {
 export function TruncatedList({ data, className, maxItems, itemRenderer, }: TruncatedListProps): ReactElement<{
     className: string;
 }, string | JSXElementConstructor<any>>;
-export function PBDBFossilsColumn({ columnID, color }: {
+export function PBDBFossilsColumn({ columnID, type, }: {
+    columnID: number;
+    type: FossilDataType;
+}): DetailedReactHTMLElement<InputHTMLAttributes<HTMLInputElement>, HTMLInputElement>;
+export function PBDBOccurrencesMatrix({ columnID }: {
     columnID: any;
-    color?: string;
-}): DOMElement<DOMAttributes<Element>, Element>;
-export interface BaseMeasurementsColumnProps<T> {
-    data: T[];
-    noteComponent?: any;
-    width?: number;
-    paddingLeft?: number;
-    className?: string;
-    getUnitID?: (d: T) => number | string;
-}
-export function BaseMeasurementsColumn({ data, noteComponent, width, paddingLeft, className, getUnitID, }: BaseMeasurementsColumnProps<any>): DetailedReactHTMLElement<{
-    className: string;
-}, HTMLElement>;
+}): FunctionComponentElement<BoxProps<ElementType<any, keyof JSX.IntrinsicElements>>>;
 interface MeasurementInfo {
     measurement_id: number;
     measuremeta_id: number;
@@ -1092,13 +903,13 @@ interface DetritalItemProps {
     height?: number;
     color?: string;
 }
-export function DetritalGroup(props: DetritalItemProps): ReactElement<{
-    className: string;
-}, string | JSXElementConstructor<any>>;
 export function DetritalColumn({ columnID, color }: {
     columnID: any;
     color?: string;
-}): DOMElement<DOMAttributes<Element>, Element>;
+}): DetailedReactHTMLElement<InputHTMLAttributes<HTMLInputElement>, HTMLInputElement>;
+export function DetritalGroup(props: DetritalItemProps): ReactElement<{
+    className: string;
+}, string | JSXElementConstructor<any>>;
 export const MeasurementDataContext: Context<any>;
 export function MeasurementDataProvider(props: any): FunctionComponentElement<ProviderProps<any>>;
 export const useMeasurementData: () => any;