Merge pull request #183 from UW-Macrostrat/column-updates

Column updates

Author: davenquinn

package.json

@@ -16,7 +16,7 @@
     "publish:storybook": "./scripts/publish-storybook.sh",
     "format": "prettier --write .",
     "check-types": "tsc --noEmit",
-    "check-circular": "madge --circular --extensions ts,tsx ."
+    "check-circular": "madge --exclude __archive --circular --extensions ts,tsx ."
   },
   "author": "Daven Quinn",
   "license": "ISC",

packages/api-types/CHANGELOG.md

@@ -6,6 +6,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to
 [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.1.3] - 2025-11-28
+
+- Update `MacrostratInterval` and `Interval` types
+
 ## [1.1.2] - 2025-08-22
 
 - Added types for `StratName` and `StratNameConcept`

packages/api-types/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@macrostrat/api-types",
-  "version": "1.1.2",
+  "version": "1.1.3",
   "description": "Type definitions for Macrostrat's API",
   "main": "./src/index.d.ts",
   "types": "./src/index.d.ts",

packages/api-types/src/defs.d.ts

@@ -23,12 +23,22 @@ export interface MacrostratRef {
   t_units: number;
 }
 
-export type Interval = {
+export type TimescaleRef = {
+  timescale_id: number;
+  name: string;
+};
+
+export type MacrostratInterval = {
   int_id: number;
   name: string;
   abbrev?: string;
   t_age?: number;
   b_age?: number;
-  timescales?: string[];
+  int_type?: string;
+  timescales?: TimescaleRef[];
   color: string;
 };
+
+type Interval = MacrostratInterval;
+
+export type { Interval };

packages/color-utils/CHANGELOG.md

@@ -6,6 +6,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to
 [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.1.2] - 2025-11-28
+
+Updated Parcel bundler
+
 ## [1.1.1] - 2025-06-25
 
 Add `delta` parameter to `getLuminanceAdjustedColorScheme` to control the

packages/color-utils/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@macrostrat/color-utils",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "description": "Color utility functions",
   "type": "module",
   "main": "dist/index.js",

packages/column-components/CHANGELOG.md

@@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file. The format
 is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this
 project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.3.1] - 2025-11-28
+
+- Update axis components
+- Improve handling on nonlinear and discontinuous axes
+
 ## [1.3.0] - 2025-10-29
 
 - Switch to `@visx/axis` for axis rendering

packages/column-components/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@macrostrat/column-components",
-  "version": "1.3.0",
+  "version": "1.3.1",
   "description": "React rendering primitives for stratigraphic columns",
   "keywords": [
     "geology",

packages/column-components/src/axis.ts

@@ -2,7 +2,7 @@ import { useContext, useEffect, useRef } from "react";
 import h from "./hyper";
 import { select } from "d3-selection";
 import { axisLeft } from "d3-axis";
-import { scaleLinear, ScaleLinear } from "d3-scale";
+import { ScaleContinuousNumeric, scaleLinear, ScaleLinear } from "d3-scale";
 import { useColumn } from "./context";
 
 interface ColumnAxisProps {
@@ -21,7 +21,8 @@ interface ColumnAxisProps {
 }
 
 interface AgeAxisProps extends ColumnAxisProps {
-  scale?: ScaleLinear<number, number>;
+  scale?: ScaleContinuousNumeric<number, number>;
+  minTickSpacing?: number;
 }
 
 const __d3axisKeys = [
@@ -46,23 +47,33 @@ export function AgeAxis(props: AgeAxisProps) {
     className,
     showDomain = true,
     tickSpacing = 60,
+    minTickSpacing = 20,
     scale,
   } = props;
 
   const range = scale.range();
-  const pixelHeight = Math.abs(range[0] - range[1]);
+
+  const pixelHeight = Math.abs(range[0] - range[range.length - 1]);
 
   let tickValues: number[] = undefined;
 
+  let ticks = Math.max(Math.round(pixelHeight / tickSpacing), 2);
   if (pixelHeight < 3 * tickSpacing || scale.ticks(2).length < 2) {
     // Push ticks towards extrema
     const t0 = scale.ticks(4);
 
     tickValues = [t0[0], t0[t0.length - 1]];
   }
 
+  if (pixelHeight < minTickSpacing) {
+    ticks = 1;
+    tickValues = scale.ticks(1);
+    // Get the last tick value only
+    tickValues = [tickValues[0]];
+  }
+
   const defaultProps = {
-    ticks: Math.max(Math.round(pixelHeight / tickSpacing), 2),
+    ticks,
     // Suppress domain endpoints
     tickSizeOuter: 0,
     tickValues,

packages/column-components/src/context/column.ts

@@ -2,10 +2,10 @@ import { scaleLinear, ScaleContinuousNumeric, ScaleLinear } from "d3-scale";
 import React, { createContext, useContext, useMemo } from "react";
 import h from "@macrostrat/hyper";
 
-type HeightRange = [number, number];
+type HeightRange = number;
 type ColumnScale = ScaleContinuousNumeric<HeightRange, number> | any;
 
-type ColumnScaleClamped = ScaleLinear<number, number>;
+type ColumnScaleClamped = ScaleContinuousNumeric<number, number>;
 
 export declare interface ColumnDivision {
   section_id: string;
@@ -55,6 +55,7 @@ export interface ColumnProviderProps<T extends ColumnDivision> {
   width?: number;
   axisType?: ColumnAxisType;
   children?: any;
+  scale?: ColumnScale;
 }
 
 function ColumnProvider<T extends ColumnDivision>(
@@ -75,6 +76,7 @@ function ColumnProvider<T extends ColumnDivision>(
     divisions = [],
     width = 150,
     axisType = ColumnAxisType.HEIGHT,
+    scale: _scale,
     ...rest
   } = props;
 
@@ -103,9 +105,17 @@ function ColumnProvider<T extends ColumnDivision>(
     }
 
     // same as the old `innerHeight`
-    const pixelHeight = height * pixelsPerMeter * zoom;
-
-    const scale = scaleLinear().domain(range).range([pixelHeight, 0]);
+    let scale = _scale;
+    let pixelHeight: number;
+    if (scale == null) {
+      pixelHeight = height * pixelsPerMeter * zoom;
+      scale = scaleLinear().domain(range).range([pixelHeight, 0]);
+    } else {
+      pixelHeight = Math.abs(scale.range()[1] - scale.range()[0]);
+      // Remove any offset that might exist from paddings, scale breaks, etc.
+      const r1 = scale.range().map((d) => d - scale.range()[0]);
+      scale = _scale.copy().range(r1);
+    }
     const scaleClamped = scale.copy().clamp(true);
 
     return {