Column updates #183

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged

davenquinn merged 47 commits into main from column-updates

Nov 29, 2025

package.json

-Original file line number
+Diff line change
@@ Expand Up / @@ -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",
@@ Expand Down @@

packages/api-types/CHANGELOG.md

-Original file line number
+Diff line change
@@ Expand Up @@
     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`
@@ Expand Down @@

packages/api-types/package.json

-Original file line number
+Diff line change
@@ -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",
@@ Expand Down @@

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

-Original file line number
+Diff line change
@@ Expand Up / @@ -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

-Original file line number
+Diff line change
@@ Expand Up @@
     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
@@ Expand Down @@

packages/color-utils/package.json

-Original file line number
+Diff line change
@@ -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",
@@ Expand Down @@

packages/column-components/CHANGELOG.md

-Original file line number
+Diff line change
@@ Expand Up @@
     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
@@ Expand Down @@

packages/column-components/package.json

-Original file line number
+Diff line change
@@ -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",
@@ Expand Down @@

packages/column-components/src/axis.ts

-Original file line number
+Diff line change
@@ Expand Up / @@ -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 {
@@ Expand All / @@ -21,7 +21,8 @@ interface ColumnAxisProps { @@
     }
     interface AgeAxisProps extends ColumnAxisProps {
-      scale?: ScaleLinear<number, number>;
+      scale?: ScaleContinuousNumeric<number, number>;
+      minTickSpacing?: number;
     }
     const __d3axisKeys = [
@@ Expand All / @@ -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,
@@ Expand Down @@

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

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -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 {

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

-Original file line number
+Diff line change
@@ Expand Up / @@ -12,8 +12,9 @@ import { ReactNode } from "react"; @@
     //# This isn't really used yet...
-    export interface ColumnLayoutCtx<T extends ColumnDivision>
-      extends ColumnCtx<T> {
+    export interface ColumnLayoutCtx<
+      T extends ColumnDivision,
+    > extends ColumnCtx<T> {
       width: number;
       grainSizes?: string[];
       grainsizeScale?: (d: string) => number;
@@ Expand All @@
       zoom: 1,
     });
-    export interface ColumnLayoutProviderProps<T extends ColumnDivision>
-      extends Partial<ColumnCtx<T>> {
+    export interface ColumnLayoutProviderProps<
+      T extends ColumnDivision,
+    > extends Partial<ColumnCtx<T>> {
       grainSizes?: string[];
       grainsizeScale?: (d: string) => number;
       width: number;
@@ Expand Down Expand Up / @@ -77,7 +79,7 @@ export interface CrossAxisLayoutProviderProps { @@
     class CrossAxisLayoutProvider extends Component<CrossAxisLayoutProviderProps> {
       static contextType = ColumnContext;
-      context: ColumnCtx<ColumnDivision>;
+      declare context: ColumnCtx<ColumnDivision>;
       render() {
         let { domain, range, width, children } = this.props;
         if (range == null) {
@@ Expand Down @@

packages/column-components/src/edit-overlay.ts

-Original file line number
+Diff line change
@@ Expand Up / @@ -139,7 +139,7 @@ export class DivisionEditOverlay extends Component< @@
       };
       timeout: any;
-      context: ColumnLayoutCtx<ColumnDivision>;
+      declare context: ColumnLayoutCtx<ColumnDivision>;
       constructor(props: DivisionEditOverlayProps) {
         super(props);
         this.onHoverInterval = this.onHoverInterval.bind(this);
@@ Expand Down @@

packages/column-components/src/editor/facies/color-picker.ts

-Original file line number
+Diff line change
@@ Expand Up / @@ -19,7 +19,7 @@ interface FaciesColorPickerProps { @@
     class FaciesColorPicker extends Component<FaciesColorPickerProps> {
       static contextType = FaciesContext;
-      context: any;
+      declare context: any;
       render() {
         const { setFaciesColor } = this.context;
@@ Expand Down @@

packages/column-components/src/editor/facies/description.ts

-Original file line number
+Diff line change
@@ Expand Up @@
       static contextType = FaciesContext;
       static defaultProps = { selected: null, isEditable: false };
-      context: any;
+      declare context: any;
       renderEach(d: FaciesData) {
         let onClick = null;
@@ Expand Down @@

packages/column-components/src/editor/facies/picker.ts

-Original file line number
+Diff line change
@@ Expand Up / @@ -20,7 +20,8 @@ interface FaciesPickerProps { @@
     export class FaciesPicker extends Component<FaciesPickerProps> {
       static contextType = FaciesContext;
-      context: any;
+      declare context: any;
       render() {
         const { facies } = this.context;
         const { interval, onChange } = this.props;
@@ Expand Down @@

packages/column-components/src/lithology/index.ts

-Original file line number
+Diff line change
@@ Expand Up / @@ -240,7 +240,7 @@ class LithologyBoxes extends UUIDComponent<any> { @@
         resolveID: defaultResolveID,
         minimumHeight: 0,
       };
-      context: ColumnLayoutCtx<ColumnDivision>;
+      declare context: ColumnLayoutCtx<ColumnDivision>;
       constructor(props) {
         super(props);
         this.constructLithologyDivisions =
@@ Expand Down @@

packages/column-components/src/notes/layout.ts

-Original file line number
+Diff line change
@@ Expand Up / @@ -48,10 +48,13 @@ const buildColumnIndex = function () { @@
     function withinDomain(scale) {
       const scaleDomain = scale.domain();
+      const d1: [number, number] = [
+        Math.min(...scaleDomain),
+        Math.max(...scaleDomain),
+      ];
       return (d) => {
         const noteRange: [number, number] = [d.height, d.top_height ?? d.height];
-        const rel = compareAgeRanges(scaleDomain, noteRange);
+        const rel = compareAgeRanges(d1, noteRange);
         return rel !== AgeRangeRelationship.Disjoint;
       };
@@ Expand Down Expand Up / @@ -101,7 +104,7 @@ class NoteLayoutProvider extends StatefulComponent< @@
           return 12;
         },
       };
-      context: ColumnCtx<ColumnDivision>;
+      declare context: ColumnCtx<ColumnDivision>;
       _previousContext: ColumnCtx<ColumnDivision>;
       _rendererIndex: object;
@@ Expand Down @@

packages/column-components/src/util/scroll-box.ts

-Original file line number
+Diff line change
@@ Expand Up @@
       static contextType: Context<ColumnCtx<ColumnDivision>> = ColumnContext;
-      context: ColumnCtx<ColumnDivision>;
+      declare context: ColumnCtx<ColumnDivision>;
       render() {
         const keys = [
@@ Expand Down @@

packages/column-views/CHANGELOG.md

-Original file line number
+Diff line change
@@ Expand Up @@
     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).
+    ## [2.2.0] - 2025-11-28
+    - Update SGP and PBDB facets
+    - Improve `UnitDetailsPanel` styling and information content
+    - Improve use of discontinous scales
+    - Create `hybridScale` options block to allow more dynamic scale generation
     ## [2.1.4] - 2025-10-29
     - Improve stories
@@ Expand Down @@

packages/column-views/package.json

-Original file line number
+Diff line change
@@ -1,6 +1,6 @@
     {
       "name": "@macrostrat/column-views",
-      "version": "2.1.4",
+      "version": "2.2.0",
       "description": "Data views for Macrostrat stratigraphic columns",
       "type": "module",
       "source": "src/index.ts",
@@ Expand Down @@

packages/column-views/src/age-axis.module.sass

-Original file line number
+Diff line change
@@ Expand Up / @@ -42,6 +42,8 @@ @@
         background-color: var(--column-background-color)
         text-align: center
+    .composite-age-axis
+      position: relative
+      display: flex
+      flex-direction: row

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Column updates #183

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!