@macrostrat/column-views 2.0.1 → 2.1.1

package/src/units/composite.ts

@@ -1,7 +1,6 @@
 import { hyperStyled } from "@macrostrat/hyper";
 import {
   LithologyColumn,
-  ColumnAxisType,
   SVG,
   ColumnContext,
 } from "@macrostrat/column-components";
@@ -18,6 +17,7 @@ import { BaseUnit } from "@macrostrat/api-types";
 import { LabeledUnit, UnitBoxes } from "./boxes";
 import styles from "./composite.module.sass";
 import { useMacrostratColumnData } from "../data-provider";
+import { useUnitSelectionDispatch } from "../units";
 
 const h = hyperStyled(styles);
 
@@ -49,11 +49,11 @@ export function LabelTrackerProvider(props) {
           units.filter((d) => {
             const id = findUnitID(d);
             return labelTrackerRef.current[id] == false;
-          })
+          }),
         );
       }
     },
-    [labelTrackerRef, units, findUnitID]
+    [labelTrackerRef, units, findUnitID],
   );
 
   const value = trackLabelVisibility;
@@ -63,8 +63,8 @@ export function LabelTrackerProvider(props) {
     h(
       UnlabeledDivisionsContext.Provider,
       { value: unlabeledDivisions },
-      children
-    )
+      children,
+    ),
   );
 }
 
@@ -141,7 +141,7 @@ export function CompositeUnitsColumn(props: CompositeUnitProps) {
 export function AnnotatedUnitsColumn(props: ICompositeUnitProps) {
   useEffect(() => {
     console.warn(
-      "AnnotatedUnitsColumn is deprecated and currently renders a no-op for transition purposes"
+      "AnnotatedUnitsColumn is deprecated and currently renders a no-op for transition purposes",
     );
   }, []);
   return null;
@@ -164,6 +164,8 @@ export function SectionLabelsColumn(props: ICompositeUnitProps) {
 
   const _compositeScale = compositeScale(sections);
 
+  const selectUnit = useUnitSelectionDispatch();
+
   return h("div.section-labels-column", [
     h(
       ColumnNotesProvider,
@@ -188,8 +190,11 @@ export function SectionLabelsColumn(props: ICompositeUnitProps) {
           noteComponent,
           shouldRenderNote,
           scale: _compositeScale,
-        })
-      )
+          onClickNote(note) {
+            selectUnit(note.data, null, null);
+          },
+        }),
+      ),
     ),
   ]);
 }
@@ -206,7 +211,7 @@ export interface CompositeColumnScale {
 
 export function compositeScale(
   sections,
-  opts: CompositeScaleOpts = {}
+  opts: CompositeScaleOpts = {},
 ): CompositeColumnScale {
   /** A basic composite scale that works across all sections. This isn't a fully featured,
    * contiuous D3 scale, but it shares enough attributes to be useful for
@@ -245,7 +250,7 @@ export function compositeScale(
   return baseScale as CompositeColumnScale;
 }
 
-function ColumnNotesProvider(props) {
+export function ColumnNotesProvider(props) {
   // A fake column axis provider that allows scales to cross
   const { children, scale, totalHeight, pixelScale } = props;
 
@@ -264,7 +269,7 @@ function ColumnNotesProvider(props) {
         zoom: 1,
       },
     },
-    children
+    children,
   );
 }
 

package/src/units/index.ts

@@ -5,12 +5,12 @@ import {
 } from "@macrostrat/column-components";
 import { UnitNamesColumn } from "./names";
 import { ICompositeUnitProps } from "./composite";
-import { UnitBoxes } from "./boxes";
+import { UnitBoxes, UnitProps } from "./boxes";
 import { useColumnLayout } from "@macrostrat/column-components";
 import { useInDarkMode } from "@macrostrat/ui-components";
 import { getMixedUnitColor } from "./colors";
 import { TrackedLabeledUnit } from "./composite";
-import { useLithologies } from "../data-provider";
+import { useEnvironments, useLithologies } from "../data-provider";
 import { useMemo } from "react";
 import { resolveID } from "./resolvers";
 import { Lithology } from "@macrostrat/api-types";
@@ -46,33 +46,100 @@ export function SimpleUnitsColumn(props: ICompositeUnitProps) {
   ]);
 }
 
+export function BasicUnitComponent({ division, ...rest }) {
+  /** A unit that allows directly setting colors and patterns. */
+
+  return h(UnitComponent, {
+    division,
+    ...rest,
+    backgroundColor: division.color,
+    patternID: division.patternID,
+  });
+}
+
 export function UnitComponent({ division, nColumns = 2, ...rest }) {
   const width = rest.width ?? useColumnLayout()?.width;
 
   const nOverlappingUnits = division.overlappingUnits?.length ?? 0;
-  const columnIx = (division.column ?? 0) % nColumns;
+  const _nColumns = nOverlappingUnits == 0 ? 1 : nColumns;
+  const columnIx = (division.column ?? 0) % _nColumns;
+  const reducedWidth = width / _nColumns;
+  const x = (columnIx * width) / _nColumns;
 
   return h(TrackedLabeledUnit, {
     division,
     ...rest,
-    width: nOverlappingUnits > 0 ? width / nColumns : width,
-    x: (columnIx * width) / nColumns,
+    width: reducedWidth,
+    x,
   });
 }
 
+interface UnitColorOptions {
+  asBackground?: boolean;
+}
+
+export function useUnitColor(unit, opts: UnitColorOptions = {}): string | null {
+  /** Get the color for a unit based on its lithology */
+  const lithMap = useLithologies();
+  const inDarkMode = useInDarkMode();
+  const { asBackground = true } = opts;
+
+  return useMemo(() => {
+    if (unit == null || lithMap == null) return null;
+    return getMixedUnitColor(unit, lithMap, inDarkMode, asBackground);
+  }, [unit?.unit_id, lithMap, inDarkMode, asBackground]);
+}
+
 export function ColoredUnitComponent(props) {
   /** A unit component that is colored using a mixture of lithologies.
    * This is a separate component because it depends on more providers/contexts to determine coloring. */
+  const backgroundColor = useUnitColor(props.division);
+
+  const patternID = useMemo(() => {
+    return resolveID(props.division); // ?? getPatternID(props.division.lith, lithMap);
+  }, [props.division?.unit_id]);
+
+  const fill = useGeologicPattern(patternID);
+
+  return h(UnitComponent, {
+    fill,
+    backgroundColor,
+    ...props,
+  });
+}
+
+export function useUnitColorByEnvironment(
+  unit,
+  opts: UnitColorOptions = {},
+): string | null {
+  /** Get the color for a unit based on its lithology */
+  const environmentMap = useEnvironments();
   const lithMap = useLithologies();
   const inDarkMode = useInDarkMode();
+  const { asBackground = true } = opts;
+
+  return useMemo(() => {
+    if (unit == null || environmentMap == null) return null;
+    let c = getMixedUnitColor(unit, environmentMap, inDarkMode, asBackground, {
+      key: "environ",
+      id_key: "environ_id",
+    });
+    if (c != null) {
+      return c;
+    }
+    // Fallback to lithology color if no environment color is found
+    return getMixedUnitColor(unit, lithMap, inDarkMode, asBackground);
+  }, [unit?.unit_id, environmentMap, lithMap, inDarkMode, asBackground]);
+}
 
-  const backgroundColor = useMemo(() => {
-    return getMixedUnitColor(props.division, lithMap, inDarkMode);
-  }, [props.division?.unit_id, lithMap, inDarkMode]);
+export function EnvironmentColoredUnitComponent(props) {
+  /** A unit component that is colored using a mixture of lithologies.
+   * This is a separate component because it depends on more providers/contexts to determine coloring. */
+  const backgroundColor = useUnitColorByEnvironment(props.division);
 
   const patternID = useMemo(() => {
     return resolveID(props.division); // ?? getPatternID(props.division.lith, lithMap);
-  }, [props.division?.unit_id, lithMap]);
+  }, [props.division?.unit_id]);
 
   const fill = useGeologicPattern(patternID);
 
@@ -85,7 +152,7 @@ export function ColoredUnitComponent(props) {
 
 function getPatternID(
   liths: Array<Lithology>,
-  lithMap: Map<number, Lithology>
+  lithMap: Map<number, Lithology>,
 ): string | null {
   if (lithMap == null || liths == null || liths.length == 0) {
     return null;

package/src/units/names.ts

@@ -1,7 +1,6 @@
 import h from "@macrostrat/hyper";
-import { useContext, useCallback } from "react";
+import { useCallback, useMemo } from "react";
 import {
-  ColumnContext,
   ColumnAxisType,
   NotesColumn,
   NotesColumnProps,
@@ -11,6 +10,7 @@ import { IUnit } from "./types";
 import React from "react";
 import { getUnitHeightRange } from "../prepare-units/utils";
 import { CompositeColumnScale } from "./composite";
+import { useCompositeScale, useMacrostratColumnData } from "../data-provider";
 
 interface UnitDataProps extends NotesColumnProps {
   left?: number;
@@ -31,7 +31,7 @@ type UnitNote = {
 
 function noteForDivision(
   div: IUnit,
-  opts: { axisType: ColumnAxisType }
+  opts: { axisType: ColumnAxisType },
 ): UnitNote {
   const { axisType } = opts;
 
@@ -53,35 +53,34 @@ const defaultNameFunction = (div) => {
 };
 
 function UnitDataColumn_(props: UnitDataProps) {
-  const ctx = useContext(ColumnContext);
+  const { axisType, units } = useMacrostratColumnData();
+  const scale = useCompositeScale();
   const {
-    left,
+    left = 0,
     noteComponent,
     shouldRenderNote = (note: ColumnDivision | IUnit, i: number) => true,
     minimumHeight = 0,
-    divisions = ctx?.divisions,
+    divisions = units,
     ...rest
   } = props;
 
-  const { scale } = ctx;
-
   const minimumHeightFilter = useCallback(
     (d) => {
       if (minimumHeight == 0) return true;
       const dy = Math.abs(scale(d.top_height) - scale(d.height));
       return dy > minimumHeight;
     },
-    [scale, minimumHeight]
+    [scale, minimumHeight],
   );
 
   if (divisions == null) return null;
   const notes: UnitNote[] = divisions
     .filter(shouldRenderNote)
-    .map((d: IUnit) => noteForDivision(d, { axisType: ctx.axisType }))
+    .map((d: IUnit) => noteForDivision(d, { axisType }))
     .filter(minimumHeightFilter);
 
   return h(NotesColumn, {
-    transform: `translate(${left || 0})`,
+    transform: `translate(${left})`,
     editable: false,
     noteComponent,
     notes,
@@ -98,6 +97,7 @@ interface UnitNamesProps extends UnitDataProps {
   nameForDivision?(obj: IUnit): string;
   paddingLeft?: number;
   width: number;
+  onClickNote?: (note: any) => void;
 }
 
 export function UnitNamesColumn(props: UnitNamesProps) {
@@ -107,13 +107,16 @@ export function UnitNamesColumn(props: UnitNamesProps) {
     ...rest
   } = props;
 
-  const NoteComponent = (props) => {
-    const { note } = props;
-    return h("p.col-note-label", nameForDivision(note.data));
-  };
+  const defaultNoteComponent = useMemo(
+    () => (props) => {
+      const { note } = props;
+      return h("p.col-note-label", nameForDivision(note.data));
+    },
+    [nameForDivision],
+  );
 
   return h(UnitDataColumn, {
-    noteComponent: noteComponent ?? NoteComponent,
+    noteComponent: noteComponent ?? defaultNoteComponent,
     ...rest,
   });
 }

package/src/units/resolvers.ts

@@ -55,6 +55,9 @@ const symbolIndex = {
 };
 
 const resolveID = (d: any) => {
+  if (d.lith == null || d.lith.length == 0) {
+    return null;
+  }
   let liths = [...d.lith];
   let environs = d.environ.map((d) => d.name).join(" ");
   liths.sort((a, b) => b.prop - a.prop);

package/src/units/selection.ts

@@ -10,14 +10,19 @@ import {
   RefObject,
   useRef,
   useCallback,
+  MouseEvent,
 } from "react";
 import { createStore, StoreApi, useStore } from "zustand";
 import type { RectBounds, IUnit } from "./types";
+import {
+  getUnitHeightRange,
+  useMacrostratColumnData,
+} from "@macrostrat/column-views";
 
 type UnitSelectDispatch = (
   unit: BaseUnit | null,
   target: HTMLElement | null,
-  event: Event | null
+  event: Event | null,
 ) => void;
 
 const UnitSelectionContext = createContext<StoreApi<UnitSelectionStore>>(null);
@@ -31,13 +36,11 @@ export function useUnitSelectionDispatch(): UnitSelectDispatch {
 }
 
 export function useUnitSelectionStore<T>(
-  selector: (state: UnitSelectionStore) => T
+  selector: (state: UnitSelectionStore) => T,
 ): T {
   const store = useContext(UnitSelectionContext);
   if (store == null) {
-    throw new Error(
-      "useUnitSelectionStore must be used within a UnitSelectionProvider"
-    );
+    return null;
   }
   return useStore(store, selector);
 }
@@ -54,11 +57,20 @@ interface UnitSelectionStore {
   setSelectedUnit: (unit: number | null) => void;
 }
 
+export interface ColumnClickData {
+  unitID: number | null;
+  unit: BaseUnit | null;
+  target: HTMLElement | null;
+  height: number;
+  // Room for boundary IDs eventually
+}
+
 export function UnitSelectionProvider<T extends BaseUnit>(props: {
   children: ReactNode;
   columnRef?: RefObject<HTMLElement>;
   units: T[];
   selectedUnit: number | null;
+  onClickedColumn?: (columnClickData: ColumnClickData, event: Event) => void;
   onUnitSelected?: (unitID: number | null, unit: T | null) => void;
 }) {
   const [store] = useState(() =>
@@ -80,10 +92,30 @@ export function UnitSelectionProvider<T extends BaseUnit>(props: {
           });
         }
       },
-      onUnitSelected: (unit: T, target: HTMLElement, event: Event) => {
+      onUnitSelected: (unit: T, target: HTMLElement, event: PointerEvent) => {
         console.log("onUnitSelected", unit, target, event);
         const el = props.columnRef?.current;
         let overlayPosition = null;
+
+        /** This is not the natural place to get positions within the column,
+         * but it will work for now.
+         */
+        if (props.onClickedColumn) {
+          // Infer height from top and bottom height of unit (because that's passed back with the call)
+          //const py = event.y;
+          //const [bottom, top] = getUnitHeightRange(unit, axisType);
+          //const height = Math.abs(bottom - top);
+
+          /** Ideally this would be defined at the column level */
+          const columnClickData: ColumnClickData = {
+            unitID: unit?.unit_id,
+            unit,
+            target,
+            height: el?.getBoundingClientRect().height || 0,
+          };
+          props.onClickedColumn(columnClickData, event);
+        }
+
         if (unit != null && el != null && target != null) {
           const rect = el.getBoundingClientRect();
           const targetRect = target.getBoundingClientRect();
@@ -103,7 +135,7 @@ export function UnitSelectionProvider<T extends BaseUnit>(props: {
           overlayPosition,
         });
       },
-    }))
+    })),
   );
 
   const { units, selectedUnit } = props;
@@ -122,7 +154,7 @@ export function UnitSelectionProvider<T extends BaseUnit>(props: {
 }
 
 export function useUnitSelectionTarget(
-  unit: IUnit
+  unit: IUnit,
 ): [React.RefObject<HTMLElement>, boolean, (evt: Event) => void] {
   const ref = useRef<HTMLElement>();
   const selectedUnit = useSelectedUnit();
@@ -131,14 +163,15 @@ export function useUnitSelectionTarget(
 
   const onClick = useCallback(
     (evt: Event) => {
+      if (onSelectUnit == null) return;
       onSelectUnit(unit, ref.current, evt);
       evt.stopPropagation();
     },
-    [unit, onSelectUnit]
+    [unit, onSelectUnit],
   );
 
   useEffect(() => {
-    if (!selected) return;
+    if (!selected || onSelectUnit == null) return;
     // In case we haven't set the position of the unit (if we don't have a target), set the selected unit
     onSelectUnit(unit, ref.current, null);
 
@@ -175,7 +208,7 @@ export function UnitKeyboardNavigation<T extends BaseUnit>({
       selectUnit(units[nextIx], null, null);
       event.stopPropagation();
     },
-    [units, ix]
+    [units, ix],
   );
   return null;
 }

package/src/units/types.ts

@@ -5,6 +5,8 @@ export interface IUnit {
   t_age: number;
   b_age: number;
   [x: string]: any;
+  patternID?: string | number;
+  color?: string;
 }
 
 export interface RectBounds {

package/dist/esm/column-views.062d164a.js

@@ -1,86 +0,0 @@
-import {line as $8epey$line} from "d3-shape";
-import {createContext as $8epey$createContext, useContext as $8epey$useContext} from "react";
-import $8epey$macrostrathyper from "@macrostrat/hyper";
-import {ColumnLayoutContext as $8epey$ColumnLayoutContext} from "@macrostrat/column-components";
-
-
-
-
-
-const $1dbd903fb3e2f029$var$inDomain = (scale, num)=>{
-    const domain = scale.domain();
-    return domain[0] < num < domain[1];
-};
-const $1dbd903fb3e2f029$var$createPointLocator = function(opts) {
-    const { xScale: xScale, scale: scale, getHeight: getHeight, ...rest } = opts;
-    return function(d, s = 0) {
-        const height = getHeight(d);
-        if (!$1dbd903fb3e2f029$var$inDomain(scale, height)) return null;
-        return [
-            xScale(d.value),
-            scale(height)
-        ];
-    };
-};
-const $1dbd903fb3e2f029$var$IsotopesDataContext = (0, $8epey$createContext)(null);
-const $1dbd903fb3e2f029$export$309ef8546e07d921 = function(props) {
-    const { xScale: xScale, scale: scale } = (0, $8epey$useContext)((0, $8epey$ColumnLayoutContext)) ?? {};
-    let { corrected: corrected, system: system, children: children, getHeight: getHeight, clipY: clipY } = props;
-    if (getHeight == null) getHeight = function(d) {
-        if (d.height == null) console.log(d);
-        return d.height;
-    };
-    // Handlers for creating points and lines
-    const pointLocator = $1dbd903fb3e2f029$var$createPointLocator({
-        xScale: xScale,
-        scale: scale,
-        corrected: corrected,
-        system: system,
-        getHeight: getHeight
-    });
-    let column = "avg_" + system;
-    if (corrected) column += "_corr";
-    const lineLocator = (0, $8epey$line)().x((d)=>xScale(d[column]))// @ts-ignore
-    .y((d)=>scale(d.height));
-    const value = {
-        pointLocator: pointLocator,
-        lineLocator: lineLocator,
-        corrected: corrected,
-        system: system,
-        clipY: clipY
-    };
-    return (0, $8epey$macrostrathyper)($1dbd903fb3e2f029$var$IsotopesDataContext.Provider, {
-        value: value
-    }, (0, $8epey$macrostrathyper)("g.data", children));
-};
-$1dbd903fb3e2f029$export$309ef8546e07d921.defaultProps = {
-    clipY: false
-};
-const $1dbd903fb3e2f029$export$4cb5d059db4e2bd = function(props) {
-    const { pointLocator: pointLocator } = (0, $8epey$useContext)($1dbd903fb3e2f029$var$IsotopesDataContext);
-    const { datum: datum, strokeWidth: strokeWidth, ...rest } = props;
-    const loc = pointLocator(datum);
-    if (loc == null) return null;
-    const [cx, cy] = loc;
-    return (0, $8epey$macrostrathyper)("circle", {
-        key: datum.sample_id,
-        cx: cx,
-        cy: cy,
-        r: 2,
-        ...rest
-    });
-};
-const $1dbd903fb3e2f029$export$628a3ef6eb9c3a89 = function(props) {
-    const { values: lineValues, ...rest } = props;
-    const { lineLocator: lineLocator } = (0, $8epey$useContext)($1dbd903fb3e2f029$var$IsotopesDataContext);
-    return (0, $8epey$macrostrathyper)("path", {
-        d: lineLocator(lineValues),
-        fill: "transparent",
-        ...rest
-    });
-};
-const $1dbd903fb3e2f029$export$919dbb10b6b5b75 = ()=>(0, $8epey$useContext)($1dbd903fb3e2f029$var$IsotopesDataContext);
-
-
-export {$1dbd903fb3e2f029$export$309ef8546e07d921 as IsotopesDataArea, $1dbd903fb3e2f029$export$4cb5d059db4e2bd as IsotopeDataPoint, $1dbd903fb3e2f029$export$628a3ef6eb9c3a89 as IsotopeDataLine, $1dbd903fb3e2f029$export$919dbb10b6b5b75 as useDataLocator};
-//# sourceMappingURL=column-views.062d164a.js.map

package/dist/esm/column-views.062d164a.js.map

@@ -1 +0,0 @@
-{"mappings":";;;;;;;;;AAKA,MAAM,iCAAW,CAAC,OAAO;IACvB,MAAM,SAAS,MAAM,MAAM;IAC3B,OAAO,MAAM,CAAC,EAAE,GAAG,MAAM,MAAM,CAAC,EAAE;AACpC;AAEA,MAAM,2CAAqB,SAAU,IAAI;IACvC,MAAM,UAAE,MAAM,SAAE,KAAK,aAAE,SAAS,EAAE,GAAG,MAAM,GAAG;IAC9C,OAAO,SAAU,CAAC,EAAE,IAAI,CAAC;QACvB,MAAM,SAAS,UAAU;QACzB,IAAI,CAAC,+BAAS,OAAO,SAAS,OAAO;QACrC,OAAO;YAAC,OAAO,EAAE,KAAK;YAAG,MAAM;SAAQ;IACzC;AACF;AAEA,MAAM,4CAAsB,CAAA,GAAA,oBAAY,EAAE;AAW1C,MAAM,4CAAmB,SAAU,KAAoB;IACrD,MAAM,UAAE,MAAM,SAAE,KAAK,EAAE,GAAG,CAAA,GAAA,iBAAS,EAAE,CAAA,GAAA,0BAAkB,MAAM,CAAC;IAE9D,IAAI,aAAE,SAAS,UAAE,MAAM,YAAE,QAAQ,aAAE,SAAS,SAAE,KAAK,EAAE,GAAG;IACxD,IAAI,aAAa,MACf,YAAY,SAAU,CAAC;QACrB,IAAI,EAAE,MAAM,IAAI,MACd,QAAQ,GAAG,CAAC;QAEd,OAAO,EAAE,MAAM;IACjB;IAGF,yCAAyC;IACzC,MAAM,eAAe,yCAAmB;gBACtC;eACA;mBACA;gBACA;mBACA;IACF;IAEA,IAAI,SAAS,SAAS;IACtB,IAAI,WACF,UAAU;IAEZ,MAAM,cAAc,CAAA,GAAA,WAAG,IACpB,CAAC,CAAC,CAAC,IAAM,OAAO,CAAC,CAAC,OAAO,EAC1B,aAAa;KACZ,CAAC,CAAC,CAAC,IAAM,MAAM,EAAE,MAAM;IAE1B,MAAM,QAAQ;sBAAE;qBAAc;mBAAa;gBAAW;eAAQ;IAAM;IACpE,OAAO,CAAA,GAAA,sBAAA,EAAE,0CAAoB,QAAQ,EAAE;eAAE;IAAM,GAAG,CAAA,GAAA,sBAAA,EAAE,UAAU;AAChE;AAEA,0CAAiB,YAAY,GAAG;IAAE,OAAO;AAAM;AAE/C,MAAM,2CAAmB,SAAU,KAAK;IACtC,MAAM,gBAAE,YAAY,EAAE,GAAG,CAAA,GAAA,iBAAS,EAAE;IACpC,MAAM,SAAE,KAAK,eAAE,WAAW,EAAE,GAAG,MAAM,GAAG;IACxC,MAAM,MAAM,aAAa;IACzB,IAAI,OAAO,MAAM,OAAO;IACxB,MAAM,CAAC,IAAI,GAAG,GAAG;IAEjB,OAAO,CAAA,GAAA,sBAAA,EAAE,UAAU;QACjB,KAAK,MAAM,SAAS;YACpB;YACA;QACA,GAAG;QACH,GAAG,IAAI;IACT;AACF;AAEA,MAAM,4CAAkB,SAAU,KAAK;IACrC,MAAM,EAAE,QAAQ,UAAU,EAAE,GAAG,MAAM,GAAG;IACxC,MAAM,eAAE,WAAW,EAAE,GAAG,CAAA,GAAA,iBAAS,EAAE;IACnC,OAAO,CAAA,GAAA,sBAAA,EAAE,QAAQ;QACf,GAAG,YAAY;QACf,MAAM;QACN,GAAG,IAAI;IACT;AACF;AAEA,MAAM,2CAAiB,IAAM,CAAA,GAAA,iBAAS,EAAE","sources":["packages/column-views/src/carbon-isotopes/data-area.ts"],"sourcesContent":["import { line } from \"d3-shape\";\nimport { createContext, useContext } from \"react\";\nimport h from \"@macrostrat/hyper\";\nimport { ColumnLayoutContext } from \"@macrostrat/column-components\";\n\nconst inDomain = (scale, num) => {\n  const domain = scale.domain();\n  return domain[0] < num < domain[1];\n};\n\nconst createPointLocator = function (opts) {\n  const { xScale, scale, getHeight, ...rest } = opts;\n  return function (d, s = 0) {\n    const height = getHeight(d);\n    if (!inDomain(scale, height)) return null;\n    return [xScale(d.value), scale(height)];\n  };\n};\n\nconst IsotopesDataContext = createContext(null);\n\nexport interface DataAreaProps {\n  clipY: boolean;\n  parameter: string;\n  corrected: boolean;\n  system: string;\n  children: React.ReactNode;\n  getHeight?: Function;\n}\n\nconst IsotopesDataArea = function (props: DataAreaProps) {\n  const { xScale, scale } = useContext(ColumnLayoutContext) ?? {};\n\n  let { corrected, system, children, getHeight, clipY } = props;\n  if (getHeight == null) {\n    getHeight = function (d) {\n      if (d.height == null) {\n        console.log(d);\n      }\n      return d.height;\n    };\n  }\n\n  // Handlers for creating points and lines\n  const pointLocator = createPointLocator({\n    xScale,\n    scale,\n    corrected,\n    system,\n    getHeight,\n  });\n\n  let column = \"avg_\" + system;\n  if (corrected) {\n    column += \"_corr\";\n  }\n  const lineLocator = line()\n    .x((d) => xScale(d[column]))\n    // @ts-ignore\n    .y((d) => scale(d.height));\n\n  const value = { pointLocator, lineLocator, corrected, system, clipY };\n  return h(IsotopesDataContext.Provider, { value }, h(\"g.data\", children));\n};\n\nIsotopesDataArea.defaultProps = { clipY: false };\n\nconst IsotopeDataPoint = function (props) {\n  const { pointLocator } = useContext(IsotopesDataContext);\n  const { datum, strokeWidth, ...rest } = props;\n  const loc = pointLocator(datum);\n  if (loc == null) return null;\n  const [cx, cy] = loc;\n\n  return h(\"circle\", {\n    key: datum.sample_id,\n    cx,\n    cy,\n    r: 2,\n    ...rest,\n  });\n};\n\nconst IsotopeDataLine = function (props) {\n  const { values: lineValues, ...rest } = props;\n  const { lineLocator } = useContext(IsotopesDataContext);\n  return h(\"path\", {\n    d: lineLocator(lineValues),\n    fill: \"transparent\",\n    ...rest,\n  });\n};\n\nconst useDataLocator = () => useContext(IsotopesDataContext);\n\nexport { IsotopesDataArea, IsotopeDataPoint, IsotopeDataLine, useDataLocator };\n"],"names":[],"version":3,"file":"column-views.062d164a.js.map"}

package/dist/esm/column-views.07521ce6.js

@@ -1,25 +0,0 @@
-import $hiXDY$macrostrathyper from "@macrostrat/hyper";
-import {createContext as $hiXDY$createContext, useContext as $hiXDY$useContext} from "react";
-import {useAPIResult as $hiXDY$useAPIResult} from "@macrostrat/ui-components";
-
-
-
-
-const $8adf39b8c41fe3cc$export$c644ef985ce7a4c4 = (0, $hiXDY$createContext)(null);
-function $8adf39b8c41fe3cc$export$5f01d5b342a89841(props) {
-    const { children: children, ...params } = props;
-    const res = (0, $hiXDY$useAPIResult)("/measurements", {
-        ...params,
-        show_values: true,
-        response: "long"
-    });
-    return (0, $hiXDY$macrostrathyper)($8adf39b8c41fe3cc$export$c644ef985ce7a4c4.Provider, {
-        value: res,
-        children: children
-    });
-}
-const $8adf39b8c41fe3cc$export$8a0335fd9ff72150 = ()=>(0, $hiXDY$useContext)($8adf39b8c41fe3cc$export$c644ef985ce7a4c4);
-
-
-export {$8adf39b8c41fe3cc$export$c644ef985ce7a4c4 as MeasurementDataContext, $8adf39b8c41fe3cc$export$5f01d5b342a89841 as MeasurementDataProvider, $8adf39b8c41fe3cc$export$8a0335fd9ff72150 as useMeasurementData};
-//# sourceMappingURL=column-views.07521ce6.js.map

package/dist/esm/column-views.07521ce6.js.map

@@ -1 +0,0 @@
-{"mappings":";;;;;;;AAIA,MAAM,4CAAyB,CAAA,GAAA,oBAAY,EAAE;AAEtC,SAAS,0CAAwB,KAAK;IAC3C,MAAM,YAAE,QAAQ,EAAE,GAAG,QAAQ,GAAG;IAChC,MAAM,MAAM,CAAA,GAAA,mBAAW,EAAE,iBAAiB;QACxC,GAAG,MAAM;QACT,aAAa;QACb,UAAU;IACZ;IACA,OAAO,CAAA,GAAA,sBAAA,EAAE,0CAAuB,QAAQ,EAAE;QAAE,OAAO;kBAAK;IAAS;AACnE;AAEA,MAAM,4CAAqB,IAAM,CAAA,GAAA,iBAAS,EAAE","sources":["packages/column-views/src/carbon-isotopes/data-provider.ts"],"sourcesContent":["import h from \"@macrostrat/hyper\";\nimport { useContext, createContext } from \"react\";\nimport { useAPIResult } from \"@macrostrat/ui-components\";\n\nconst MeasurementDataContext = createContext(null);\n\nexport function MeasurementDataProvider(props) {\n  const { children, ...params } = props;\n  const res = useAPIResult(\"/measurements\", {\n    ...params,\n    show_values: true,\n    response: \"long\",\n  });\n  return h(MeasurementDataContext.Provider, { value: res, children });\n}\n\nconst useMeasurementData = () => useContext(MeasurementDataContext);\n\nexport { useMeasurementData, MeasurementDataContext };\n"],"names":[],"version":3,"file":"column-views.07521ce6.js.map"}

package/dist/esm/column-views.1c589cc4.js.map

@@ -1 +0,0 @@
-{"mappings":"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","sources":["packages/column-views/src/prepare-units/helpers.ts"],"sourcesContent":["import type { BaseUnit, UnitLong } from \"@macrostrat/api-types\";\nimport { group } from \"d3-array\";\nimport { ColumnAxisType } from \"@macrostrat/column-components\";\nimport {\n  unitsOverlap,\n  getUnitHeightRange,\n  createUnitSorter,\n  ensureArray,\n  ensureRealFloat,\n} from \"./utils\";\n\nconst dt = 0.001;\n\nexport interface StratigraphicPackage {\n  /** A collection of stratigraphic information organized in time, corresponding\n   * to single or multiple columns. */\n  t_age: number;\n  b_age: number;\n}\n\nexport interface SectionInfo<T extends UnitLong = ExtUnit>\n  extends StratigraphicPackage {\n  /** A time-bounded part of a single stratigraphic column. */\n  section_id: number | number[];\n  units: T[];\n}\n\nexport interface ExtUnit extends UnitLong {\n  bottomOverlap: boolean;\n  overlappingUnits: number[];\n  column?: number;\n  /* Positions (ages or heights) where the unit is clipped to its containing section.\n   * This is relevant if we are filtering by age/height/depth range.\n   */\n  t_clip_pos?: number;\n  b_clip_pos?: number;\n}\n\nexport function preprocessUnits<T extends UnitLong = UnitLong>(\n  section: SectionInfo<T>,\n  axisType: ColumnAxisType = ColumnAxisType.AGE\n): ExtUnit[] {\n  /** Preprocess units to add overlapping units and columns. */\n  const units = section.units;\n  let divisions = units.map((...args) => extendDivision(...args, axisType));\n  for (let d of divisions) {\n    const overlappingUnits = divisions.filter((u) =>\n      d.overlappingUnits.includes(u.unit_id)\n    );\n\n    // Overlapping columns\n    const columns = overlappingUnits.map((d) => d.column);\n\n    if (columns.includes(d.column)) {\n      let col = 0;\n      // Go through columns to find a better index\n      while (columns.includes(col)) {\n        col++;\n      }\n      d.column = col;\n    }\n\n    // If unit overlaps the edges of a section, set the clip positions\n    if (axisType == ColumnAxisType.AGE) {\n      const [b_pos, t_pos] = getUnitHeightRange(d, axisType);\n      if (b_pos > section.b_age) {\n        d.b_clip_pos = section.b_age;\n      }\n      if (t_pos < section.t_age) {\n        d.t_clip_pos = section.t_age;\n      }\n    }\n  }\n\n  if (axisType != ColumnAxisType.AGE) {\n    return preprocessSectionUnits(divisions, axisType);\n  }\n\n  return divisions;\n}\n\nfunction extendDivision(\n  unit: UnitLong,\n  i: number,\n  divisions: UnitLong[],\n  axisType: ColumnAxisType = ColumnAxisType.AGE\n): ExtUnit {\n  const overlappingUnits = divisions.filter(\n    (d) => d.unit_id != unit.unit_id && unitsOverlap(unit, d, axisType)\n  );\n  const u_pos = getUnitHeightRange(unit, axisType);\n  const bottomOverlap = overlappingUnits.some((d) => {\n    const d_pos = getUnitHeightRange(d, axisType);\n    // Check if the unit is below the current unit\n    return d_pos[0] < u_pos[0] + dt;\n  });\n  let column = 0;\n  if (overlappingUnits.length == 1) {\n    column = 1;\n  }\n\n  return {\n    ...unit,\n    bottomOverlap,\n    column,\n    overlappingUnits: overlappingUnits.map((d) => d.unit_id),\n  };\n}\n\nexport function groupUnitsIntoSections<T extends UnitLong>(\n  units: T[],\n  axisType: ColumnAxisType = ColumnAxisType.AGE\n): SectionInfo<T>[] {\n  let groups = Array.from(group(units, (d) => d.section_id));\n  const unitComparator = createUnitSorter(axisType);\n\n  const groups1 = groups.map(([section_id, sectionUnits]) => {\n    const [b_age, t_age] = getSectionAgeRange(sectionUnits);\n    // sort units by position\n    sectionUnits.sort(unitComparator);\n    return { section_id, t_age, b_age, units: sectionUnits };\n  });\n  // Sort sections by increasing top age, then increasing bottom age.\n  // Sections have no relative ordinal position other than age...\n  const compareSections = createUnitSorter(ColumnAxisType.AGE) as (\n    a: StratigraphicPackage,\n    b: StratigraphicPackage\n  ) => number;\n  groups1.sort(compareSections);\n  return groups1;\n}\n\nexport function getSectionAgeRange(units: BaseUnit[]): [number, number] {\n  /** Get the overall age range of a set of units. */\n  const t_ages = units.map((d) => d.t_age);\n  const b_ages = units.map((d) => d.b_age);\n  const t_age = Math.min(...t_ages);\n  const b_age = Math.max(...b_ages);\n  return [b_age, t_age];\n}\n\nexport function mergeOverlappingSections<T extends UnitLong>(\n  sections: SectionInfo<T>[]\n): SectionInfo<T>[] {\n  /** Columns can have sections that overlap in time. Here, we merge overlapping\n   * sections into a single section to correctly render gap-bound packages.\n   */\n  const [firstSection, ...rest] = sections;\n  const newSections = [firstSection];\n  for (const section of rest) {\n    const lastSection = newSections[newSections.length - 1];\n    if (\n      lastSection.b_age < section.t_age ||\n      lastSection.t_age > section.b_age\n    ) {\n      // No overlap, add the section as normal\n      newSections.push(section);\n      continue;\n    }\n\n    // Overlap, merge the sections\n    lastSection.section_id = [\n      ...ensureArray(lastSection.section_id),\n      ...ensureArray(section.section_id),\n    ];\n    lastSection.units.push(...section.units);\n    lastSection.b_age = Math.max(lastSection.b_age, section.b_age);\n    lastSection.t_age = Math.min(lastSection.t_age, section.t_age);\n  }\n  return newSections;\n}\n\nfunction preprocessSectionUnits(\n  units: UnitLong[],\n  axisType: ColumnAxisType = ColumnAxisType.DEPTH\n): ExtUnit[] {\n  /** Preprocess units for a \"section\" column type, which is guaranteed to be simpler. */\n  // We have to assume the units are ordered...\n  let thickness = 0;\n  return units.map((unit, i) => {\n    let u1 = preprocessSectionUnit(unit, i, units, thickness, axisType);\n    thickness += Math.abs(u1.t_pos - u1.b_pos);\n    return u1;\n  });\n}\n\nfunction preprocessSectionUnit(\n  unit: UnitLong,\n  i: number,\n  units: UnitLong[],\n  accumulatedThickness: number = 0,\n  axisType: ColumnAxisType = ColumnAxisType.DEPTH\n): ExtUnit {\n  /** Preprocess a single unit for a \"section\" column type.\n   * No provision for overlapping units.\n   * */\n\n  let b_pos = unit.b_pos;\n  let t_pos = unit.t_pos;\n\n  if (b_pos == t_pos && axisType == ColumnAxisType.ORDINAL) {\n    t_pos = t_pos - 1;\n  }\n\n  let unit_name = unit.unit_name;\n\n  // eODP columns sometimes have overlapping core sections, which are encoded in the name field\n  // Match eODP section names\n  const match = unit.unit_name.match(/^(\\d+(\\.\\d+)?)-(\\d+(\\.\\d+)?): (.+)/);\n\n  if (match) {\n    // These values should already be set if we've used the show_positions flag\n    t_pos ??= ensureRealFloat(match[1]);\n    b_pos ??= ensureRealFloat(match[3]);\n    unit_name = match[5];\n  }\n\n  return {\n    ...unit,\n    b_pos: ensureRealFloat(b_pos),\n    t_pos: ensureRealFloat(t_pos),\n    unit_name,\n    bottomOverlap: false,\n    overlappingUnits: [],\n  };\n}\n"],"names":[],"version":3,"file":"column-views.1c589cc4.js.map"}