@macrostrat/column-views 3.10.0 → 3.12.0

package/dist/units/composite.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"composite.cjs","sources":["../../src/units/composite.ts"],"sourcesContent":["import { hyperStyled } from \"@macrostrat/hyper\";\nimport {\n  ColumnContext,\n  LithologyColumn,\n  SVG,\n} from \"@macrostrat/column-components\";\nimport { defaultNameFunction, UnitNamesColumn } from \"./names\";\nimport {\n  createContext,\n  useCallback,\n  useContext,\n  useEffect,\n  useRef,\n  useState,\n} from \"react\";\nimport { BaseUnit } from \"@macrostrat/api-types\";\nimport { LabeledUnit, UnitBoxes } from \"./boxes\";\nimport styles from \"./composite.module.sass\";\nimport {\n  useCompositeScale,\n  useMacrostratColumnData,\n  useUnitSelectionDispatch,\n} from \"../data-provider\";\n\nconst h = hyperStyled(styles);\n\ninterface LabelTracker {\n  [key: number]: boolean;\n}\n\nconst LabelTrackerContext = createContext(null);\nconst UnlabeledDivisionsContext = createContext(null);\n\nconst findMacrostratUnitID = (u) => u.unit_id;\n\nexport function LabelTrackerProvider(props) {\n  /** Tracker for units to handle state for whether their labels fit inline or not.\n   * Designed to work for single or composite columns.\n   */\n  const { children, units, findUnitID = findMacrostratUnitID } = props;\n  const [unlabeledDivisions, setUnlabeledDivisions] = useState<\n    BaseUnit[] | null\n  >(null);\n  const labelTrackerRef = useRef<LabelTracker>({});\n\n  const recompute = useCallback(() => {\n    // Recompute over the *current* unit set (which changes as the column zooms).\n    // The tracker ref accumulates entries for units seen at any zoom level, so\n    // we gate on whether every currently-visible unit has reported — not on the\n    // total number of tracked units, which would go stale and freeze the notes.\n    const tracker = labelTrackerRef.current;\n    const allReported = units.every((d) => findUnitID(d) in tracker);\n    if (!allReported) return;\n    setUnlabeledDivisions(units.filter((d) => tracker[findUnitID(d)] === false));\n  }, [units, findUnitID]);\n\n  const trackLabelVisibility = useCallback(\n    (div, visible) => {\n      labelTrackerRef.current[findUnitID(div)] = visible;\n      recompute();\n    },\n    [recompute, findUnitID],\n  );\n\n  // Re-sync when the visible unit set changes (e.g. on zoom), so a unit whose\n  // label now fits inline stops also rendering as a note, and vice versa.\n  useEffect(() => {\n    recompute();\n  }, [recompute]);\n\n  const value = trackLabelVisibility;\n  return h(\n    LabelTrackerContext.Provider,\n    { value },\n    h(\n      UnlabeledDivisionsContext.Provider,\n      { value: unlabeledDivisions },\n      children,\n    ),\n  );\n}\n\nfunction TrackedLabeledUnit({\n  division,\n  nameForDivision = defaultNameFunction,\n  ...rest\n}) {\n  const trackLabelVisibility = useContext(LabelTrackerContext);\n  return h(LabeledUnit, {\n    division,\n    label: nameForDivision(division),\n    onLabelUpdated(label, visible) {\n      // If there is al LabelTrackerContext, update the label visibility\n      trackLabelVisibility?.(division, visible);\n    },\n    ...rest,\n  });\n}\n\nexport const CompositeUnitComponent = TrackedLabeledUnit;\n\ntype BaseUnitProps = {\n  width: number;\n  showLabels?: boolean;\n  columnWidth?: number;\n  clipToFrame?: boolean;\n};\n\ntype ICompositeUnitProps = BaseUnitProps & {\n  gutterWidth?: number;\n  labelOffset?: number;\n  paddingLeft?: number;\n  nameForDivision?: (division: BaseUnit) => string;\n  children?: React.ReactNode;\n  unitComponent?: React.FC<any>;\n  unitComponentProps?: any;\n  noteMode?: \"labeled\" | \"unlabeled\";\n  showLabelColumn?: boolean;\n  noteComponent?: React.FC<any>;\n  shouldRenderNote?: (d: any) => boolean;\n};\n\ninterface CompositeUnitProps {\n  unitComponent: React.FC<any>;\n  unitComponentProps?: any;\n  width: number;\n  showLabels?: boolean;\n  clipToFrame?: boolean;\n}\n\nexport function CompositeUnitsColumn(props: CompositeUnitProps) {\n  /*\n  A column with units and names either\n  overlapping or offset to the right\n  */\n  const {\n    width,\n    unitComponent = TrackedLabeledUnit,\n    unitComponentProps,\n    clipToFrame,\n    ...rest\n  } = props;\n\n  return h(LithologyColumn, { width, clipToFrame }, [\n    h(UnitBoxes, {\n      unitComponent,\n      unitComponentProps,\n      ...rest,\n    }),\n  ]);\n}\n\nexport function AnnotatedUnitsColumn(props: ICompositeUnitProps) {\n  useEffect(() => {\n    console.warn(\n      \"AnnotatedUnitsColumn is deprecated and currently renders a no-op for transition purposes\",\n    );\n  }, []);\n  return null;\n}\n\nexport function SectionLabelsColumn(props: ICompositeUnitProps) {\n  // Section with \"squishy\" time scale\n  const {\n    width = 300,\n    noteMode = \"unlabeled\",\n    labelOffset = 30,\n    noteComponent,\n    shouldRenderNote,\n  } = props;\n\n  const { totalHeight, axisType } = useMacrostratColumnData();\n  const _compositeScale = useCompositeScale();\n\n  const unlabeledUnits = useContext(UnlabeledDivisionsContext);\n  const unitsToLabel = noteMode == \"unlabeled\" ? unlabeledUnits : undefined;\n\n  const selectUnit = useUnitSelectionDispatch();\n\n  return h(\"div.section-labels-column\", [\n    h(\n      ColumnNotesProvider,\n      {\n        units: [],\n        scale: _compositeScale,\n        totalHeight,\n        axisType,\n      },\n      h(\n        SVG,\n        {\n          height: totalHeight,\n          innerWidth: width - 4,\n          paddingH: 1,\n          paddingLeft: 3,\n        },\n        h(UnitNamesColumn, {\n          divisions: unitsToLabel,\n          paddingLeft: labelOffset,\n          width,\n          noteComponent,\n          shouldRenderNote,\n          scale: _compositeScale,\n          onClickNote(note) {\n            selectUnit(note.data, null, null);\n          },\n        }),\n      ),\n    ),\n  ]);\n}\n\nexport function ColumnNotesProvider(props) {\n  // A fake column axis provider that allows scales to cross\n  const { children, scale, totalHeight, pixelScale } = props;\n\n  const { axisType } = useMacrostratColumnData();\n\n  return h(\n    ColumnContext.Provider,\n    {\n      value: {\n        divisions: [],\n        scale,\n        scaleClamped: scale,\n        pixelHeight: totalHeight,\n        pixelsPerMeter: pixelScale,\n        axisType,\n        zoom: 1,\n      },\n    },\n    children,\n  );\n}\n\nexport { TrackedLabeledUnit, ICompositeUnitProps };\n"],"names":["hyperStyled","styles","createContext","useState","useRef","useCallback","useEffect","defaultNameFunction","useContext","LabeledUnit","LithologyColumn","UnitBoxes","useMacrostratColumnData","useCompositeScale","useUnitSelectionDispatch","SVG","UnitNamesColumn","ColumnContext"],"mappings":"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"}
+{"version":3,"file":"composite.cjs","sources":["../../src/units/composite.ts"],"sourcesContent":["import { hyperStyled } from \"@macrostrat/hyper\";\nimport {\n  ColumnContext,\n  LithologyColumn,\n  SVG,\n} from \"@macrostrat/column-components\";\nimport { defaultNameFunction, UnitNamesColumn } from \"./names\";\nimport {\n  createContext,\n  useCallback,\n  useContext,\n  useEffect,\n  useRef,\n  useState,\n} from \"react\";\nimport { BaseUnit } from \"@macrostrat/api-types\";\nimport { LabeledUnit, UnitBoxes } from \"./boxes\";\nimport styles from \"./composite.module.sass\";\nimport {\n  useCompositeScale,\n  useMacrostratColumnData,\n  useUnitSelectionDispatch,\n} from \"../data-provider\";\n\nconst h = hyperStyled(styles);\n\ninterface LabelTracker {\n  [key: number]: boolean;\n}\n\nconst LabelTrackerContext = createContext(null);\nconst UnlabeledDivisionsContext = createContext(null);\n\nconst findMacrostratUnitID = (u) => u.unit_id;\n\nexport function LabelTrackerProvider(props) {\n  /** Tracker for units to handle state for whether their labels fit inline or not.\n   * Designed to work for single or composite columns.\n   */\n  const { children, units, findUnitID = findMacrostratUnitID } = props;\n  const [unlabeledDivisions, setUnlabeledDivisions] = useState<\n    BaseUnit[] | null\n  >(null);\n  const labelTrackerRef = useRef<LabelTracker>({});\n\n  const recompute = useCallback(() => {\n    // Recompute over the *current* unit set (which changes as the column zooms).\n    // The tracker ref accumulates entries for units seen at any zoom level, so\n    // we gate on whether every currently-visible unit has reported — not on the\n    // total number of tracked units, which would go stale and freeze the notes.\n    const tracker = labelTrackerRef.current;\n    const allReported = units.every((d) => findUnitID(d) in tracker);\n    if (!allReported) return;\n    setUnlabeledDivisions(units.filter((d) => tracker[findUnitID(d)] === false));\n  }, [units, findUnitID]);\n\n  const trackLabelVisibility = useCallback(\n    (div, visible) => {\n      labelTrackerRef.current[findUnitID(div)] = visible;\n      recompute();\n    },\n    [recompute, findUnitID],\n  );\n\n  // Re-sync when the visible unit set changes (e.g. on zoom), so a unit whose\n  // label now fits inline stops also rendering as a note, and vice versa.\n  useEffect(() => {\n    recompute();\n  }, [recompute]);\n\n  const value = trackLabelVisibility;\n  return h(\n    LabelTrackerContext.Provider,\n    { value },\n    h(\n      UnlabeledDivisionsContext.Provider,\n      { value: unlabeledDivisions },\n      children,\n    ),\n  );\n}\n\nfunction TrackedLabeledUnit({\n  division,\n  nameForDivision = defaultNameFunction,\n  ...rest\n}) {\n  const trackLabelVisibility = useContext(LabelTrackerContext);\n  return h(LabeledUnit, {\n    division,\n    label: nameForDivision(division),\n    onLabelUpdated(label, visible) {\n      // If there is al LabelTrackerContext, update the label visibility\n      trackLabelVisibility?.(division, visible);\n    },\n    ...rest,\n  });\n}\n\nexport const CompositeUnitComponent = TrackedLabeledUnit;\n\ntype BaseUnitProps = {\n  width: number;\n  showLabels?: boolean;\n  columnWidth?: number;\n  clipToFrame?: boolean;\n};\n\ntype ICompositeUnitProps = BaseUnitProps & {\n  gutterWidth?: number;\n  labelOffset?: number;\n  paddingLeft?: number;\n  nameForDivision?: (division: BaseUnit) => string;\n  children?: React.ReactNode;\n  unitComponent?: React.FC<any>;\n  unitComponentProps?: any;\n  noteMode?: \"labeled\" | \"unlabeled\";\n  showLabelColumn?: boolean;\n  noteComponent?: React.FC<any>;\n  shouldRenderNote?: (d: any) => boolean;\n  /** Suppress the label for a unit drawn thinner than this many pixels */\n  labelSuppressHeight?: number;\n};\n\ninterface CompositeUnitProps {\n  unitComponent: React.FC<any>;\n  unitComponentProps?: any;\n  width: number;\n  showLabels?: boolean;\n  clipToFrame?: boolean;\n}\n\nexport function CompositeUnitsColumn(props: CompositeUnitProps) {\n  /*\n  A column with units and names either\n  overlapping or offset to the right\n  */\n  const {\n    width,\n    unitComponent = TrackedLabeledUnit,\n    unitComponentProps,\n    clipToFrame,\n    ...rest\n  } = props;\n\n  return h(LithologyColumn, { width, clipToFrame }, [\n    h(UnitBoxes, {\n      unitComponent,\n      unitComponentProps,\n      ...rest,\n    }),\n  ]);\n}\n\nexport function AnnotatedUnitsColumn(props: ICompositeUnitProps) {\n  useEffect(() => {\n    console.warn(\n      \"AnnotatedUnitsColumn is deprecated and currently renders a no-op for transition purposes\",\n    );\n  }, []);\n  return null;\n}\n\n/** A unit drawn thinner than this gets no label. The notes column can place\n * a label away from its unit and run a leader line back, so a thin unit is\n * labelable in principle — but below a pixel or two there is nothing on the\n * page to lead back to, and a dense column spends its labels on units the\n * reader cannot see. */\nconst DEFAULT_LABEL_SUPPRESS_HEIGHT = 2;\n\nexport function SectionLabelsColumn(props: ICompositeUnitProps) {\n  // Section with \"squishy\" time scale\n  const {\n    width = 300,\n    noteMode = \"unlabeled\",\n    labelOffset = 30,\n    noteComponent,\n    shouldRenderNote,\n    labelSuppressHeight = DEFAULT_LABEL_SUPPRESS_HEIGHT,\n  } = props;\n\n  const { totalHeight, axisType } = useMacrostratColumnData();\n  const _compositeScale = useCompositeScale();\n\n  const unlabeledUnits = useContext(UnlabeledDivisionsContext);\n  const unitsToLabel = noteMode == \"unlabeled\" ? unlabeledUnits : undefined;\n\n  const selectUnit = useUnitSelectionDispatch();\n\n  return h(\"div.section-labels-column\", [\n    h(\n      ColumnNotesProvider,\n      {\n        units: [],\n        scale: _compositeScale,\n        totalHeight,\n        axisType,\n      },\n      h(\n        SVG,\n        {\n          height: totalHeight,\n          innerWidth: width - 4,\n          paddingH: 1,\n          paddingLeft: 3,\n        },\n        h(UnitNamesColumn, {\n          divisions: unitsToLabel,\n          paddingLeft: labelOffset,\n          width,\n          minimumHeight: labelSuppressHeight,\n          noteComponent,\n          shouldRenderNote,\n          scale: _compositeScale,\n          onClickNote(note) {\n            selectUnit(note.data, null, null);\n          },\n        }),\n      ),\n    ),\n  ]);\n}\n\nexport function ColumnNotesProvider(props) {\n  // A fake column axis provider that allows scales to cross\n  const { children, scale, totalHeight, pixelScale } = props;\n\n  const { axisType } = useMacrostratColumnData();\n\n  return h(\n    ColumnContext.Provider,\n    {\n      value: {\n        divisions: [],\n        scale,\n        scaleClamped: scale,\n        pixelHeight: totalHeight,\n        pixelsPerMeter: pixelScale,\n        axisType,\n        zoom: 1,\n      },\n    },\n    children,\n  );\n}\n\nexport { TrackedLabeledUnit, ICompositeUnitProps };\n"],"names":["hyperStyled","styles","createContext","useState","useRef","useCallback","useEffect","defaultNameFunction","useContext","LabeledUnit","LithologyColumn","UnitBoxes","useMacrostratColumnData","useCompositeScale","useUnitSelectionDispatch","SVG","UnitNamesColumn","ColumnContext"],"mappings":"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"}

package/dist/units/composite.d.ts

@@ -24,6 +24,8 @@ type ICompositeUnitProps = BaseUnitProps & {
     showLabelColumn?: boolean;
     noteComponent?: React.FC<any>;
     shouldRenderNote?: (d: any) => boolean;
+    /** Suppress the label for a unit drawn thinner than this many pixels */
+    labelSuppressHeight?: number;
 };
 interface CompositeUnitProps {
     unitComponent: React.FC<any>;

package/dist/units/composite.js

@@ -81,13 +81,15 @@ function AnnotatedUnitsColumn(props) {
   }, []);
   return null;
 }
+const DEFAULT_LABEL_SUPPRESS_HEIGHT = 2;
 function SectionLabelsColumn(props) {
   const {
     width = 300,
     noteMode = "unlabeled",
     labelOffset = 30,
     noteComponent,
-    shouldRenderNote
+    shouldRenderNote,
+    labelSuppressHeight = DEFAULT_LABEL_SUPPRESS_HEIGHT
   } = props;
   const { totalHeight, axisType } = useMacrostratColumnData();
   const _compositeScale = useCompositeScale();
@@ -115,6 +117,7 @@ function SectionLabelsColumn(props) {
           divisions: unitsToLabel,
           paddingLeft: labelOffset,
           width,
+          minimumHeight: labelSuppressHeight,
           noteComponent,
           shouldRenderNote,
           scale: _compositeScale,

package/dist/units/composite.js.map

@@ -1 +1 @@
-{"version":3,"file":"composite.js","sources":["../../src/units/composite.ts"],"sourcesContent":["import { hyperStyled } from \"@macrostrat/hyper\";\nimport {\n  ColumnContext,\n  LithologyColumn,\n  SVG,\n} from \"@macrostrat/column-components\";\nimport { defaultNameFunction, UnitNamesColumn } from \"./names\";\nimport {\n  createContext,\n  useCallback,\n  useContext,\n  useEffect,\n  useRef,\n  useState,\n} from \"react\";\nimport { BaseUnit } from \"@macrostrat/api-types\";\nimport { LabeledUnit, UnitBoxes } from \"./boxes\";\nimport styles from \"./composite.module.sass\";\nimport {\n  useCompositeScale,\n  useMacrostratColumnData,\n  useUnitSelectionDispatch,\n} from \"../data-provider\";\n\nconst h = hyperStyled(styles);\n\ninterface LabelTracker {\n  [key: number]: boolean;\n}\n\nconst LabelTrackerContext = createContext(null);\nconst UnlabeledDivisionsContext = createContext(null);\n\nconst findMacrostratUnitID = (u) => u.unit_id;\n\nexport function LabelTrackerProvider(props) {\n  /** Tracker for units to handle state for whether their labels fit inline or not.\n   * Designed to work for single or composite columns.\n   */\n  const { children, units, findUnitID = findMacrostratUnitID } = props;\n  const [unlabeledDivisions, setUnlabeledDivisions] = useState<\n    BaseUnit[] | null\n  >(null);\n  const labelTrackerRef = useRef<LabelTracker>({});\n\n  const recompute = useCallback(() => {\n    // Recompute over the *current* unit set (which changes as the column zooms).\n    // The tracker ref accumulates entries for units seen at any zoom level, so\n    // we gate on whether every currently-visible unit has reported — not on the\n    // total number of tracked units, which would go stale and freeze the notes.\n    const tracker = labelTrackerRef.current;\n    const allReported = units.every((d) => findUnitID(d) in tracker);\n    if (!allReported) return;\n    setUnlabeledDivisions(units.filter((d) => tracker[findUnitID(d)] === false));\n  }, [units, findUnitID]);\n\n  const trackLabelVisibility = useCallback(\n    (div, visible) => {\n      labelTrackerRef.current[findUnitID(div)] = visible;\n      recompute();\n    },\n    [recompute, findUnitID],\n  );\n\n  // Re-sync when the visible unit set changes (e.g. on zoom), so a unit whose\n  // label now fits inline stops also rendering as a note, and vice versa.\n  useEffect(() => {\n    recompute();\n  }, [recompute]);\n\n  const value = trackLabelVisibility;\n  return h(\n    LabelTrackerContext.Provider,\n    { value },\n    h(\n      UnlabeledDivisionsContext.Provider,\n      { value: unlabeledDivisions },\n      children,\n    ),\n  );\n}\n\nfunction TrackedLabeledUnit({\n  division,\n  nameForDivision = defaultNameFunction,\n  ...rest\n}) {\n  const trackLabelVisibility = useContext(LabelTrackerContext);\n  return h(LabeledUnit, {\n    division,\n    label: nameForDivision(division),\n    onLabelUpdated(label, visible) {\n      // If there is al LabelTrackerContext, update the label visibility\n      trackLabelVisibility?.(division, visible);\n    },\n    ...rest,\n  });\n}\n\nexport const CompositeUnitComponent = TrackedLabeledUnit;\n\ntype BaseUnitProps = {\n  width: number;\n  showLabels?: boolean;\n  columnWidth?: number;\n  clipToFrame?: boolean;\n};\n\ntype ICompositeUnitProps = BaseUnitProps & {\n  gutterWidth?: number;\n  labelOffset?: number;\n  paddingLeft?: number;\n  nameForDivision?: (division: BaseUnit) => string;\n  children?: React.ReactNode;\n  unitComponent?: React.FC<any>;\n  unitComponentProps?: any;\n  noteMode?: \"labeled\" | \"unlabeled\";\n  showLabelColumn?: boolean;\n  noteComponent?: React.FC<any>;\n  shouldRenderNote?: (d: any) => boolean;\n};\n\ninterface CompositeUnitProps {\n  unitComponent: React.FC<any>;\n  unitComponentProps?: any;\n  width: number;\n  showLabels?: boolean;\n  clipToFrame?: boolean;\n}\n\nexport function CompositeUnitsColumn(props: CompositeUnitProps) {\n  /*\n  A column with units and names either\n  overlapping or offset to the right\n  */\n  const {\n    width,\n    unitComponent = TrackedLabeledUnit,\n    unitComponentProps,\n    clipToFrame,\n    ...rest\n  } = props;\n\n  return h(LithologyColumn, { width, clipToFrame }, [\n    h(UnitBoxes, {\n      unitComponent,\n      unitComponentProps,\n      ...rest,\n    }),\n  ]);\n}\n\nexport function AnnotatedUnitsColumn(props: ICompositeUnitProps) {\n  useEffect(() => {\n    console.warn(\n      \"AnnotatedUnitsColumn is deprecated and currently renders a no-op for transition purposes\",\n    );\n  }, []);\n  return null;\n}\n\nexport function SectionLabelsColumn(props: ICompositeUnitProps) {\n  // Section with \"squishy\" time scale\n  const {\n    width = 300,\n    noteMode = \"unlabeled\",\n    labelOffset = 30,\n    noteComponent,\n    shouldRenderNote,\n  } = props;\n\n  const { totalHeight, axisType } = useMacrostratColumnData();\n  const _compositeScale = useCompositeScale();\n\n  const unlabeledUnits = useContext(UnlabeledDivisionsContext);\n  const unitsToLabel = noteMode == \"unlabeled\" ? unlabeledUnits : undefined;\n\n  const selectUnit = useUnitSelectionDispatch();\n\n  return h(\"div.section-labels-column\", [\n    h(\n      ColumnNotesProvider,\n      {\n        units: [],\n        scale: _compositeScale,\n        totalHeight,\n        axisType,\n      },\n      h(\n        SVG,\n        {\n          height: totalHeight,\n          innerWidth: width - 4,\n          paddingH: 1,\n          paddingLeft: 3,\n        },\n        h(UnitNamesColumn, {\n          divisions: unitsToLabel,\n          paddingLeft: labelOffset,\n          width,\n          noteComponent,\n          shouldRenderNote,\n          scale: _compositeScale,\n          onClickNote(note) {\n            selectUnit(note.data, null, null);\n          },\n        }),\n      ),\n    ),\n  ]);\n}\n\nexport function ColumnNotesProvider(props) {\n  // A fake column axis provider that allows scales to cross\n  const { children, scale, totalHeight, pixelScale } = props;\n\n  const { axisType } = useMacrostratColumnData();\n\n  return h(\n    ColumnContext.Provider,\n    {\n      value: {\n        divisions: [],\n        scale,\n        scaleClamped: scale,\n        pixelHeight: totalHeight,\n        pixelsPerMeter: pixelScale,\n        axisType,\n        zoom: 1,\n      },\n    },\n    children,\n  );\n}\n\nexport { TrackedLabeledUnit, ICompositeUnitProps };\n"],"names":["styles"],"mappings":"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"}
+{"version":3,"file":"composite.js","sources":["../../src/units/composite.ts"],"sourcesContent":["import { hyperStyled } from \"@macrostrat/hyper\";\nimport {\n  ColumnContext,\n  LithologyColumn,\n  SVG,\n} from \"@macrostrat/column-components\";\nimport { defaultNameFunction, UnitNamesColumn } from \"./names\";\nimport {\n  createContext,\n  useCallback,\n  useContext,\n  useEffect,\n  useRef,\n  useState,\n} from \"react\";\nimport { BaseUnit } from \"@macrostrat/api-types\";\nimport { LabeledUnit, UnitBoxes } from \"./boxes\";\nimport styles from \"./composite.module.sass\";\nimport {\n  useCompositeScale,\n  useMacrostratColumnData,\n  useUnitSelectionDispatch,\n} from \"../data-provider\";\n\nconst h = hyperStyled(styles);\n\ninterface LabelTracker {\n  [key: number]: boolean;\n}\n\nconst LabelTrackerContext = createContext(null);\nconst UnlabeledDivisionsContext = createContext(null);\n\nconst findMacrostratUnitID = (u) => u.unit_id;\n\nexport function LabelTrackerProvider(props) {\n  /** Tracker for units to handle state for whether their labels fit inline or not.\n   * Designed to work for single or composite columns.\n   */\n  const { children, units, findUnitID = findMacrostratUnitID } = props;\n  const [unlabeledDivisions, setUnlabeledDivisions] = useState<\n    BaseUnit[] | null\n  >(null);\n  const labelTrackerRef = useRef<LabelTracker>({});\n\n  const recompute = useCallback(() => {\n    // Recompute over the *current* unit set (which changes as the column zooms).\n    // The tracker ref accumulates entries for units seen at any zoom level, so\n    // we gate on whether every currently-visible unit has reported — not on the\n    // total number of tracked units, which would go stale and freeze the notes.\n    const tracker = labelTrackerRef.current;\n    const allReported = units.every((d) => findUnitID(d) in tracker);\n    if (!allReported) return;\n    setUnlabeledDivisions(units.filter((d) => tracker[findUnitID(d)] === false));\n  }, [units, findUnitID]);\n\n  const trackLabelVisibility = useCallback(\n    (div, visible) => {\n      labelTrackerRef.current[findUnitID(div)] = visible;\n      recompute();\n    },\n    [recompute, findUnitID],\n  );\n\n  // Re-sync when the visible unit set changes (e.g. on zoom), so a unit whose\n  // label now fits inline stops also rendering as a note, and vice versa.\n  useEffect(() => {\n    recompute();\n  }, [recompute]);\n\n  const value = trackLabelVisibility;\n  return h(\n    LabelTrackerContext.Provider,\n    { value },\n    h(\n      UnlabeledDivisionsContext.Provider,\n      { value: unlabeledDivisions },\n      children,\n    ),\n  );\n}\n\nfunction TrackedLabeledUnit({\n  division,\n  nameForDivision = defaultNameFunction,\n  ...rest\n}) {\n  const trackLabelVisibility = useContext(LabelTrackerContext);\n  return h(LabeledUnit, {\n    division,\n    label: nameForDivision(division),\n    onLabelUpdated(label, visible) {\n      // If there is al LabelTrackerContext, update the label visibility\n      trackLabelVisibility?.(division, visible);\n    },\n    ...rest,\n  });\n}\n\nexport const CompositeUnitComponent = TrackedLabeledUnit;\n\ntype BaseUnitProps = {\n  width: number;\n  showLabels?: boolean;\n  columnWidth?: number;\n  clipToFrame?: boolean;\n};\n\ntype ICompositeUnitProps = BaseUnitProps & {\n  gutterWidth?: number;\n  labelOffset?: number;\n  paddingLeft?: number;\n  nameForDivision?: (division: BaseUnit) => string;\n  children?: React.ReactNode;\n  unitComponent?: React.FC<any>;\n  unitComponentProps?: any;\n  noteMode?: \"labeled\" | \"unlabeled\";\n  showLabelColumn?: boolean;\n  noteComponent?: React.FC<any>;\n  shouldRenderNote?: (d: any) => boolean;\n  /** Suppress the label for a unit drawn thinner than this many pixels */\n  labelSuppressHeight?: number;\n};\n\ninterface CompositeUnitProps {\n  unitComponent: React.FC<any>;\n  unitComponentProps?: any;\n  width: number;\n  showLabels?: boolean;\n  clipToFrame?: boolean;\n}\n\nexport function CompositeUnitsColumn(props: CompositeUnitProps) {\n  /*\n  A column with units and names either\n  overlapping or offset to the right\n  */\n  const {\n    width,\n    unitComponent = TrackedLabeledUnit,\n    unitComponentProps,\n    clipToFrame,\n    ...rest\n  } = props;\n\n  return h(LithologyColumn, { width, clipToFrame }, [\n    h(UnitBoxes, {\n      unitComponent,\n      unitComponentProps,\n      ...rest,\n    }),\n  ]);\n}\n\nexport function AnnotatedUnitsColumn(props: ICompositeUnitProps) {\n  useEffect(() => {\n    console.warn(\n      \"AnnotatedUnitsColumn is deprecated and currently renders a no-op for transition purposes\",\n    );\n  }, []);\n  return null;\n}\n\n/** A unit drawn thinner than this gets no label. The notes column can place\n * a label away from its unit and run a leader line back, so a thin unit is\n * labelable in principle — but below a pixel or two there is nothing on the\n * page to lead back to, and a dense column spends its labels on units the\n * reader cannot see. */\nconst DEFAULT_LABEL_SUPPRESS_HEIGHT = 2;\n\nexport function SectionLabelsColumn(props: ICompositeUnitProps) {\n  // Section with \"squishy\" time scale\n  const {\n    width = 300,\n    noteMode = \"unlabeled\",\n    labelOffset = 30,\n    noteComponent,\n    shouldRenderNote,\n    labelSuppressHeight = DEFAULT_LABEL_SUPPRESS_HEIGHT,\n  } = props;\n\n  const { totalHeight, axisType } = useMacrostratColumnData();\n  const _compositeScale = useCompositeScale();\n\n  const unlabeledUnits = useContext(UnlabeledDivisionsContext);\n  const unitsToLabel = noteMode == \"unlabeled\" ? unlabeledUnits : undefined;\n\n  const selectUnit = useUnitSelectionDispatch();\n\n  return h(\"div.section-labels-column\", [\n    h(\n      ColumnNotesProvider,\n      {\n        units: [],\n        scale: _compositeScale,\n        totalHeight,\n        axisType,\n      },\n      h(\n        SVG,\n        {\n          height: totalHeight,\n          innerWidth: width - 4,\n          paddingH: 1,\n          paddingLeft: 3,\n        },\n        h(UnitNamesColumn, {\n          divisions: unitsToLabel,\n          paddingLeft: labelOffset,\n          width,\n          minimumHeight: labelSuppressHeight,\n          noteComponent,\n          shouldRenderNote,\n          scale: _compositeScale,\n          onClickNote(note) {\n            selectUnit(note.data, null, null);\n          },\n        }),\n      ),\n    ),\n  ]);\n}\n\nexport function ColumnNotesProvider(props) {\n  // A fake column axis provider that allows scales to cross\n  const { children, scale, totalHeight, pixelScale } = props;\n\n  const { axisType } = useMacrostratColumnData();\n\n  return h(\n    ColumnContext.Provider,\n    {\n      value: {\n        divisions: [],\n        scale,\n        scaleClamped: scale,\n        pixelHeight: totalHeight,\n        pixelsPerMeter: pixelScale,\n        axisType,\n        zoom: 1,\n      },\n    },\n    children,\n  );\n}\n\nexport { TrackedLabeledUnit, ICompositeUnitProps };\n"],"names":["styles"],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@macrostrat/column-views",
-  "version": "3.10.0",
+  "version": "3.12.0",
   "description": "Data views for Macrostrat stratigraphic columns",
   "repository": {
     "type": "git",
@@ -46,16 +46,16 @@
   },
   "dependencies": {
     "@blueprintjs/core": "^6.14.0",
-    "@macrostrat/api-types": "^1.3.0",
+    "@macrostrat/api-types": "^1.4.0",
     "@macrostrat/color-utils": "^1.2.2",
-    "@macrostrat/column-components": "^2.1.0",
+    "@macrostrat/column-components": "^2.2.0",
     "@macrostrat/data-components": "^1.5.1",
-    "@macrostrat/data-provider": "^1.2.0",
+    "@macrostrat/data-provider": "^1.3.1",
     "@macrostrat/hyper": "^3.1.1",
-    "@macrostrat/map-views": "^1.0.0",
+    "@macrostrat/map-views": "^1.1.1",
     "@macrostrat/scoped-store": "^1.1.0",
-    "@macrostrat/stratigraphy-utils": "^1.4.0",
-    "@macrostrat/timescale": "^3.2.0",
+    "@macrostrat/stratigraphy-utils": "^1.4.2",
+    "@macrostrat/timescale": "^3.3.0",
     "@macrostrat/ui-components": "^5.2.0",
     "@types/chroma-js": "^3.1.1",
     "@types/d3-format": "^3.0.4",

package/src/age-model/data.ts

@@ -0,0 +1,98 @@
+/** Data hooks for a column's age model. */
+import { useMemo } from "react";
+import { useAPIResult } from "@macrostrat/ui-components";
+import { useMacrostratBaseURL } from "@macrostrat/data-provider";
+import type { UnitLong } from "@macrostrat/api-types";
+import { useMacrostratColumnData, useMacrostratUnits } from "../data-provider";
+import {
+  type AgeModelBoundary,
+  type ColumnSurface,
+  surfacesFromBoundaries,
+  surfacesFromUnits,
+} from "./types";
+
+export const AGE_MODEL_ROUTE = "/age_model";
+
+/** The age-model boundaries of a column, from `/age_model?col_id=` on the
+ * API the enclosing `MacrostratDataProvider` points at (production when there
+ * is none). `null` while loading or when `col_id` is not set. */
+export function useColumnAgeModel(
+  col_id: number | null | undefined,
+): AgeModelBoundary[] | null {
+  const baseURL = useMacrostratBaseURL();
+  const params = useMemo(() => ({ col_id }), [col_id]);
+  let route: string | null = null;
+  if (col_id != null) {
+    route = baseURL + AGE_MODEL_ROUTE;
+  }
+  return useAPIResult(route, params, unwrapAgeModel) ?? null;
+}
+
+function unwrapAgeModel(res: any): AgeModelBoundary[] {
+  return res?.success?.data ?? [];
+}
+
+/** Where a column's surfaces came from */
+export type SurfacesSource = "provided" | "age-model" | "derived" | "loading";
+
+export interface UseColumnSurfacesOptions {
+  /** Surfaces to show. When given, nothing is fetched. */
+  surfaces?: ColumnSurface[] | null;
+  /** The column whose age model to fetch. Defaults to the column being
+   * rendered (read from its units). */
+  col_id?: number | null;
+  /** When the age model has no boundaries, derive surfaces from the units
+   * instead (default `true`). */
+  fallbackToUnits?: boolean;
+  /** Promote `modeled` surfaces that must in fact constrain the age model to
+   * `relative` (default `true`) — see `inferTiePointStatuses`. */
+  inferTiePoints?: boolean;
+}
+
+export interface ColumnSurfacesData {
+  surfaces: ColumnSurface[];
+  source: SurfacesSource;
+}
+
+/** Resolve the surfaces to show for the enclosing `Column`: the ones passed
+ * in, else the column's age model, else (optionally) surfaces derived from
+ * its units. Must be used inside a `Column`. */
+export function useColumnSurfaces(
+  options: UseColumnSurfacesOptions = {},
+): ColumnSurfacesData {
+  const {
+    surfaces: provided,
+    col_id,
+    fallbackToUnits = true,
+    inferTiePoints = true,
+  } = options;
+  const units = useMacrostratUnits() as UnitLong[] | undefined;
+  const { axisType } = useMacrostratColumnData();
+
+  let fetchID: number | null = null;
+  if (provided == null) {
+    fetchID = col_id ?? units?.[0]?.col_id ?? null;
+  }
+  const boundaries = useColumnAgeModel(fetchID);
+
+  const fromAgeModel = useMemo(
+    () => surfacesFromBoundaries(boundaries, { inferTiePoints }),
+    [boundaries, inferTiePoints],
+  );
+
+  const derived = useMemo(() => {
+    if (!fallbackToUnits) return [];
+    return surfacesFromUnits(units, { axisType });
+  }, [units, axisType, fallbackToUnits]);
+
+  if (provided != null) {
+    return { surfaces: provided, source: "provided" };
+  }
+  if (fetchID != null && boundaries == null) {
+    return { surfaces: [], source: "loading" };
+  }
+  if (fromAgeModel.length > 0) {
+    return { surfaces: fromAgeModel, source: "age-model" };
+  }
+  return { surfaces: derived, source: "derived" };
+}

package/src/age-model/details.module.sass

@@ -0,0 +1,108 @@
+.surface-details-panel
+  display: flex
+  flex-direction: column
+  min-width: 0
+
+.surface-details-header
+  display: flex
+  flex-direction: row
+  align-items: center
+  flex-wrap: wrap
+  gap: 0.5em
+  padding: 0.5em 0
+  border-bottom: 1px solid var(--pz-panel-rule-color, var(--panel-rule-color, #ddd))
+  .spacer
+    flex: 1
+
+.surface-details-title
+  margin: 0
+  font-size: 1.1em
+  .surface-id
+    font-size: 0.85em
+    color: var(--text-subtle-color, var(--pz-text-subtle-color))
+
+.surface-details-tags
+  display: flex
+  gap: 0.3em
+
+.surface-details-content
+  padding: 0.5em 0
+
+.no-surface .placeholder
+  color: var(--text-subtle-color, var(--pz-text-subtle-color))
+  margin: 0
+
+.surface-tag
+  // A colored dot leading the status label
+  &:before
+    content: ''
+    display: inline-block
+    width: 0.6em
+    height: 0.6em
+    border-radius: 50%
+    margin-right: 0.4em
+    background-color: var(--surface-color, currentColor)
+  &.surface-type-tag:before
+    display: none
+  // An inferred status is marked, so the tag doesn't pass for a recorded one
+  &.inferred
+    font-style: italic
+
+.inferred-marker
+  margin-left: 0.15em
+  opacity: 0.7
+
+.calibration-interval
+  display: flex
+  align-items: baseline
+  gap: 0.5em
+  flex-wrap: wrap
+
+.calibration-range
+  color: var(--text-subtle-color, var(--pz-text-subtle-color))
+  font-size: 0.9em
+
+.calibration-proportion
+  margin-top: 0.2em
+
+.surface-units-list
+  list-style: none
+  margin: 0
+  padding: 0
+  li
+    display: inline
+    &:after
+      content: ', '
+    &:last-child:after
+      content: ''
+
+.no-units, .no-calibration
+  color: var(--text-subtle-color, var(--pz-text-subtle-color))
+
+.surface-status-legend
+  list-style: none
+  margin: 0
+  padding: 0
+  display: flex
+  flex-direction: column
+  gap: 0.3em
+  font-size: 0.85em
+  &.with-descriptions
+    gap: 0.6em
+
+.legend-item
+  display: flex
+  flex-direction: row
+  align-items: baseline
+  gap: 0.6em
+  .surface-label-marker
+    flex: none
+    width: 24px
+    align-self: center
+
+.legend-label
+  font-weight: 500
+
+.legend-description
+  color: var(--text-subtle-color, var(--pz-text-subtle-color))
+  font-size: 0.9em