@macrostrat/column-views 3.8.0 → 3.10.0

package/dist/units/boxes.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"boxes.cjs","sources":["../../src/units/boxes.ts"],"sourcesContent":["import {\n  ColumnAxisType,\n  ColumnContext,\n  ColumnLayoutContext,\n  ForeignObject,\n  PatternDefsProvider,\n  useColumn,\n  useGeologicPattern,\n  zigZagBoxPath,\n} from \"@macrostrat/column-components\";\nimport { SizeAwareLabel, Clickable } from \"@macrostrat/ui-components\";\nimport hyper from \"@macrostrat/hyper\";\nimport { forwardRef, ReactNode, useContext, useMemo } from \"react\";\nimport { resolveID, scalePattern } from \"./resolvers\";\nimport { useUnitSelectionTarget } from \"../data-provider\";\nimport { useLithologies } from \"@macrostrat/data-provider\";\nimport { IUnit } from \"./types\";\nimport styles from \"./boxes.module.sass\";\nimport classNames from \"classnames\";\nimport { getUnitHeightRange } from \"../prepare-units/utils\";\nimport { getMixedUnitColor } from \"./colors\";\nimport type { RectBounds } from \"./types\";\n\nconst h = hyper.styled(styles);\n\ninterface UnitRectOptions {\n  widthFraction?: number;\n  axisType?: ColumnAxisType;\n  // Padding to create overflow for zig-zags or other ornamented edges\n  padding?: number;\n}\n\ninterface UnitProps extends Clickable, Partial<RectBounds>, UnitRectOptions {\n  division: IUnit;\n  resolveID?(IUnit): string;\n  UUID?: string;\n  defaultFill?: string;\n  widthFraction?: number;\n  children?: ReactNode;\n  className?: string;\n  fill?: string;\n  backgroundColor?: string;\n  patternColor?: string;\n  patternID?: string | number;\n}\n\nexport interface LabeledUnitProps\n  extends UnitRectOptions, Clickable, Partial<RectBounds> {\n  division: IUnit;\n  patternID?: string | number;\n  label: string;\n  onLabelUpdated?(label: string, shown: boolean);\n  halfWidth?: boolean;\n  showLabel?: boolean;\n  backgroundColor?: string;\n}\n\nfunction useUnitRect(\n  division: IUnit,\n  options: UnitRectOptions = {},\n): RectBounds {\n  const {\n    widthFraction = 1,\n    axisType = ColumnAxisType.AGE,\n    padding = 0,\n  } = options;\n  const { scale } = useContext(ColumnContext);\n  const { width } = useContext(ColumnLayoutContext);\n\n  const [bottomHeight, topHeight] = getUnitHeightRange(division, axisType);\n\n  const y = scale(topHeight);\n  const height = Math.abs(scale(bottomHeight) - y);\n\n  return {\n    x: width * (1 - widthFraction) - padding,\n    y: y - padding,\n    height: height + padding * 2,\n    width: widthFraction * width + padding * 2,\n  };\n}\n\nexport function MinimalUnit(props) {\n  const {\n    division: d,\n    children,\n    className,\n    widthFraction = 1,\n    axisType: _, // not sure why this is brought in...\n    nColumns: __,\n    ...baseBounds\n  } = props;\n\n  const { axisType } = useColumn();\n  const lithMap = useLithologies();\n  const bounds = {\n    ...useUnitRect(d, { widthFraction, axisType }),\n    ...baseBounds,\n  };\n\n  const backgroundColor = getMixedUnitColor(d, lithMap, null, false);\n\n  const [ref, selected, onClick, linked] = useUnitSelectionTarget(d);\n\n  return h(\n    \"g.unit\",\n    {\n      className,\n      style: {\n        \"--column-unit-background-color\": backgroundColor,\n        \"--column-stroke-color\": backgroundColor,\n      },\n    },\n    [\n      h(\"rect.unit.background\", {\n        ref,\n        ...bounds,\n        fill: backgroundColor,\n        fillOpacity: 0.8,\n        stroke: backgroundColor,\n        onClick,\n      }),\n      h.if(linked)(\"rect.linked-overlay\", bounds),\n      h.if(selected)(\"rect.selection-overlay\", bounds),\n    ],\n  );\n}\n\nfunction Unit(props: UnitProps) {\n  const {\n    division: d,\n    children,\n    fill,\n    defaultFill = \"transparent\",\n    className,\n    widthFraction = 1,\n    backgroundColor,\n    patternColor,\n    patternID,\n    axisType: _, // not sure why this is brought in...\n    ...baseBounds\n  } = props;\n\n  const { axisType } = useColumn();\n\n  const hasOverflowTop = d.t_clip_pos != null;\n  const hasOverflowBottom = d.b_clip_pos != null;\n\n  const bounds = {\n    ...useUnitRect(d, { widthFraction, axisType }),\n    ...baseBounds,\n    overflowTop: hasOverflowTop,\n    overflowBottom: hasOverflowBottom,\n  };\n  const _patternID = patternID ?? resolveID(d);\n  let _fill = fill ?? useGeologicPattern(_patternID, defaultFill);\n\n  const hasBackgroundColor = backgroundColor != null;\n\n  const _className = classNames(className, { colored: hasBackgroundColor });\n\n  const [ref, selected, onClick, linked] = useUnitSelectionTarget(d);\n\n  return h(\n    \"g.unit\",\n    {\n      className: _className,\n      style: {\n        \"--column-unit-background-color\": backgroundColor,\n      },\n    },\n    [\n      h(UnitRect, {\n        ...bounds,\n        fill: backgroundColor,\n        onClick,\n        className: \"background\",\n      }),\n      h(UnitRect, {\n        ref,\n        ...bounds,\n        fill: _fill,\n        //mask,\n        onClick,\n        className: \"unit\",\n      }),\n      h.if(linked)(UnitRect, { ...bounds, className: \"linked-overlay\" }),\n      h.if(selected)(UnitRect, { ...bounds, className: \"selection-overlay\" }),\n      //defs,\n      children,\n    ],\n  );\n}\n\ninterface UnitRectProps {\n  x: number;\n  y: number;\n  width: number;\n  height: number;\n  className: string;\n  // Used to determine if the rect should have a zig-zag edge on the top or bottom\n  overflowTop?: boolean;\n  overflowBottom?: boolean;\n  [key: string]: any;\n}\n\nconst UnitRect = forwardRef((props: UnitRectProps, ref) => {\n  const {\n    x,\n    y,\n    width,\n    height,\n    overflowTop = false,\n    overflowBottom = false,\n    ...rest\n  } = props;\n\n  if (!overflowTop && !overflowBottom) {\n    return h(\"rect\", {\n      x,\n      y,\n      width,\n      height,\n      ref,\n      ...rest,\n    });\n  } else {\n    const d = zigZagBoxPath(x, y, width, height, overflowTop, overflowBottom);\n    return h(\"path\", {\n      d,\n      ref,\n      ...rest,\n    });\n  }\n});\n\nfunction LabeledUnit(props: LabeledUnitProps) {\n  const {\n    division,\n    label,\n    onLabelUpdated,\n    widthFraction,\n    showLabel = true,\n    backgroundColor,\n    patternID,\n    axisType: _, // not sure why this is brought in...\n    ...baseBounds\n  } = props;\n\n  const { axisType } = useColumn();\n  const bounds = {\n    ...useUnitRect(division, { widthFraction, axisType }),\n    ...baseBounds,\n  };\n  const { width, height } = bounds;\n  return h(\n    Unit,\n    {\n      className: \"labeled-unit\",\n      division,\n      backgroundColor,\n      patternID,\n      ...bounds,\n    },\n    [\n      h.if(showLabel)(\n        ForeignObject,\n        { ...bounds, className: \"unit-label-container\" },\n        h(SizeAwareLabel, {\n          className: \"unit-overlay\",\n          labelClassName: \"unit-label\",\n          style: { width, height },\n          label,\n          onVisibilityChanged(viz) {\n            onLabelUpdated(label, viz);\n          },\n        }),\n      ),\n    ],\n  );\n}\n\nfunction UnitBoxes<T>(props: {\n  unitComponent: React.FunctionComponent<{ division: T }>;\n  unitComponentProps?: any;\n  transformDivisions?(divisions: T[]): T[];\n  transformDivision?: (\n    division: any,\n    index: number,\n    divisions: any[],\n  ) => T | null;\n}) {\n  const { unitComponent = Unit, unitComponentProps = {} } = props;\n  const { divisions } = useContext(ColumnContext);\n\n  if (divisions.length == 0) {\n    console.warn(\"No divisions found in column context\");\n    return null;\n  }\n\n  const children = useMemo(() => {\n    return divisions.map((division: any, i) => {\n      // @ts-ignore\n      return h(unitComponent, {\n        division,\n        key: division.unit_id,\n        ...unitComponentProps,\n      });\n    });\n  }, [divisions, unitComponent, unitComponentProps]);\n\n  return h(\n    PatternDefsProvider,\n    { resolveID, scalePattern },\n    h(\"g.divisions\", children),\n  );\n}\n\nexport { LabeledUnit, Unit, UnitBoxes, UnitProps };\n"],"names":["hyper","styles","ColumnAxisType","useContext","ColumnContext","ColumnLayoutContext","getUnitHeightRange","useColumn","resolveID","useGeologicPattern","classNames","useUnitSelectionTarget","forwardRef","zigZagBoxPath","ForeignObject","SizeAwareLabel","useMemo","PatternDefsProvider","scalePattern"],"mappings":"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"}
+{"version":3,"file":"boxes.cjs","sources":["../../src/units/boxes.ts"],"sourcesContent":["import {\n  ColumnAxisType,\n  ColumnContext,\n  ColumnLayoutContext,\n  ClippableRect,\n  ForeignObject,\n  PatternDefsProvider,\n  useColumn,\n  useGeologicPattern,\n} from \"@macrostrat/column-components\";\nimport { SizeAwareLabel, Clickable } from \"@macrostrat/ui-components\";\nimport hyper from \"@macrostrat/hyper\";\nimport { ReactNode, useContext, useMemo } from \"react\";\nimport { useUnitSelectionTarget } from \"../data-provider\";\nimport { useLithologies } from \"@macrostrat/data-provider\";\nimport { IUnit } from \"./types\";\nimport styles from \"./boxes.module.sass\";\nimport classNames from \"classnames\";\nimport { getUnitHeightRange } from \"../prepare-units/utils\";\nimport type { RectBounds } from \"./types\";\nimport {\n  getBestFGDCPatternForUnit,\n  scalePattern,\n  getMixedUnitColor,\n} from \"@macrostrat/stratigraphy-utils\";\n\nconst h = hyper.styled(styles);\n\n/** Resolve a class name through this file's CSS module exactly as the styled\n * `h` would (module-scoped classes are hashed; unknown/global classes pass\n * through). Needed because `ClippableRect` renders the element in\n * `@macrostrat/column-components`, so class resolution must happen here. */\nconst cls = (name: string): string => (styles as any)[name] ?? name;\n\ninterface UnitRectOptions {\n  widthFraction?: number;\n  axisType?: ColumnAxisType;\n  // Padding to create overflow for zig-zags or other ornamented edges\n  padding?: number;\n}\n\ninterface UnitProps extends Clickable, Partial<RectBounds>, UnitRectOptions {\n  division: IUnit;\n  resolveID?(IUnit): string;\n  UUID?: string;\n  defaultFill?: string;\n  widthFraction?: number;\n  children?: ReactNode;\n  className?: string;\n  fill?: string;\n  backgroundColor?: string;\n  patternColor?: string;\n  patternID?: string | number;\n}\n\nexport interface LabeledUnitProps\n  extends UnitRectOptions, Clickable, Partial<RectBounds> {\n  division: IUnit;\n  patternID?: string | number;\n  label: string;\n  onLabelUpdated?(label: string, shown: boolean);\n  halfWidth?: boolean;\n  showLabel?: boolean;\n  backgroundColor?: string;\n}\n\nfunction useUnitRect(\n  division: IUnit,\n  options: UnitRectOptions = {},\n): RectBounds {\n  const {\n    widthFraction = 1,\n    axisType = ColumnAxisType.AGE,\n    padding = 0,\n  } = options;\n  const { scale } = useContext(ColumnContext);\n  const { width } = useContext(ColumnLayoutContext);\n\n  const [bottomHeight, topHeight] = getUnitHeightRange(division, axisType);\n\n  const y = scale(topHeight);\n  const height = Math.abs(scale(bottomHeight) - y);\n\n  return {\n    x: width * (1 - widthFraction) - padding,\n    y: y - padding,\n    height: height + padding * 2,\n    width: widthFraction * width + padding * 2,\n  };\n}\n\nexport function MinimalUnit(props) {\n  const {\n    division: d,\n    children,\n    className,\n    widthFraction = 1,\n    axisType: _, // not sure why this is brought in...\n    nColumns: __,\n    ...baseBounds\n  } = props;\n\n  const { axisType } = useColumn();\n  const lithMap = useLithologies();\n  const bounds = {\n    ...useUnitRect(d, { widthFraction, axisType }),\n    ...baseBounds,\n  };\n\n  const backgroundColor = getMixedUnitColor(d, lithMap, null, false);\n\n  const [ref, selected, onClick, linked] = useUnitSelectionTarget(d);\n\n  return h(\n    \"g.unit\",\n    {\n      className,\n      style: {\n        \"--column-unit-background-color\": backgroundColor,\n        \"--column-stroke-color\": backgroundColor,\n      },\n    },\n    [\n      h(\"rect.unit.background\", {\n        ref,\n        ...bounds,\n        fill: backgroundColor,\n        fillOpacity: 0.8,\n        stroke: backgroundColor,\n        onClick,\n      }),\n      h.if(linked)(\"rect.linked-overlay\", bounds),\n      h.if(selected)(\"rect.selection-overlay\", bounds),\n    ],\n  );\n}\n\nfunction Unit(props: UnitProps) {\n  const {\n    division: d,\n    children,\n    fill,\n    defaultFill = \"transparent\",\n    className,\n    widthFraction = 1,\n    backgroundColor,\n    patternColor,\n    patternID,\n    axisType: _, // not sure why this is brought in...\n    ...baseBounds\n  } = props;\n\n  const { axisType } = useColumn();\n\n  const hasOverflowTop = d.t_clip_pos != null;\n  const hasOverflowBottom = d.b_clip_pos != null;\n\n  const bounds = {\n    ...useUnitRect(d, { widthFraction, axisType }),\n    ...baseBounds,\n    overflowTop: hasOverflowTop,\n    overflowBottom: hasOverflowBottom,\n  };\n  const _patternID = patternID ?? getBestFGDCPatternForUnit(d);\n  let _fill = fill ?? useGeologicPattern(_patternID, defaultFill);\n\n  const hasBackgroundColor = backgroundColor != null;\n\n  const _className = classNames(className, { colored: hasBackgroundColor });\n\n  const [ref, selected, onClick, linked] = useUnitSelectionTarget(d);\n\n  return h(\n    \"g.unit\",\n    {\n      className: _className,\n      style: {\n        \"--column-unit-background-color\": backgroundColor,\n      },\n    },\n    [\n      h(ClippableRect, {\n        ...bounds,\n        fill: backgroundColor,\n        onClick,\n        className: cls(\"background\"),\n      }),\n      h(ClippableRect, {\n        ref,\n        ...bounds,\n        fill: _fill,\n        //mask,\n        onClick,\n        className: cls(\"unit\"),\n      }),\n      h.if(linked)(ClippableRect, {\n        ...bounds,\n        className: cls(\"linked-overlay\"),\n      }),\n      h.if(selected)(ClippableRect, {\n        ...bounds,\n        className: cls(\"selection-overlay\"),\n      }),\n      //defs,\n      children,\n    ],\n  );\n}\n\nfunction LabeledUnit(props: LabeledUnitProps) {\n  const {\n    division,\n    label,\n    onLabelUpdated,\n    widthFraction,\n    showLabel = true,\n    backgroundColor,\n    patternID,\n    axisType: _, // not sure why this is brought in...\n    ...baseBounds\n  } = props;\n\n  const { axisType, isTransitioning, hideLabelsWhileTransitioning } =\n    useColumn();\n  const bounds = {\n    ...useUnitRect(division, { widthFraction, axisType }),\n    ...baseBounds,\n  };\n  const { width, height } = bounds;\n  // Labels stay visible through the animation by default. `hideLabelsWhileTransitioning`\n  // is a perf escape hatch: when set, the `foreignObject` label (whose HTML\n  // reflows on every size change) is skipped mid-transition and restored on settle.\n  const skipLabel = isTransitioning && hideLabelsWhileTransitioning;\n  return h(\n    Unit,\n    {\n      className: \"labeled-unit\",\n      division,\n      backgroundColor,\n      patternID,\n      ...bounds,\n    },\n    [\n      h.if(showLabel && !skipLabel)(\n        ForeignObject,\n        { ...bounds, className: \"unit-label-container\" },\n        h(SizeAwareLabel, {\n          className: \"unit-overlay\",\n          labelClassName: \"unit-label\",\n          style: { width, height },\n          label,\n          // Re-fit the label when a transition settles (isTransitioning flips),\n          // not on every intermediate frame.\n          remeasureKey: isTransitioning,\n          onVisibilityChanged(viz) {\n            onLabelUpdated(label, viz);\n          },\n        }),\n      ),\n    ],\n  );\n}\n\nfunction UnitBoxes<T>(props: {\n  unitComponent: React.FunctionComponent<{ division: T }>;\n  unitComponentProps?: any;\n  transformDivisions?(divisions: T[]): T[];\n  transformDivision?: (\n    division: any,\n    index: number,\n    divisions: any[],\n  ) => T | null;\n}) {\n  const { unitComponent = Unit, unitComponentProps = {} } = props;\n  const { divisions } = useContext(ColumnContext);\n\n  if (divisions.length == 0) {\n    console.warn(\"No divisions found in column context\");\n    return null;\n  }\n\n  const children = useMemo(() => {\n    return divisions.map((division: any, i) => {\n      // @ts-ignore\n      return h(unitComponent, {\n        division,\n        key: division.unit_id,\n        ...unitComponentProps,\n      });\n    });\n  }, [divisions, unitComponent, unitComponentProps]);\n\n  return h(\n    PatternDefsProvider,\n    { resolveID: getBestFGDCPatternForUnit, scalePattern },\n    h(\"g.divisions\", children),\n  );\n}\n\nexport { LabeledUnit, Unit, UnitBoxes, UnitProps };\n"],"names":["hyper","styles","ColumnAxisType","useContext","ColumnContext","ColumnLayoutContext","getUnitHeightRange","useColumn","getBestFGDCPatternForUnit","useGeologicPattern","classNames","useUnitSelectionTarget","ClippableRect","ForeignObject","SizeAwareLabel","useMemo","PatternDefsProvider","scalePattern"],"mappings":"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"}

package/dist/units/boxes.js

@@ -1,14 +1,15 @@
-import { useColumn, ForeignObject, ColumnContext, PatternDefsProvider, ColumnAxisType, ColumnLayoutContext, useGeologicPattern, zigZagBoxPath } from "@macrostrat/column-components";
+import { useColumn, ForeignObject, ColumnContext, PatternDefsProvider, ColumnAxisType, ColumnLayoutContext, useGeologicPattern, ClippableRect } from "@macrostrat/column-components";
 import { SizeAwareLabel } from "@macrostrat/ui-components";
 import h$1 from "@macrostrat/hyper";
-import { useContext, useMemo, forwardRef } from "react";
-import { scalePattern, resolveID } from "./resolvers.js";
+import { useContext, useMemo } from "react";
 import "@macrostrat/data-provider";
 import h$2 from "./boxes.module.sass.js";
 import classNames from "classnames";
 import { getUnitHeightRange } from "../prepare-units/utils.js";
+import { scalePattern, getBestFGDCPatternForUnit } from "@macrostrat/stratigraphy-utils";
 import { useUnitSelectionTarget } from "../data-provider/unit-selection.js";
 const h = h$1.styled(h$2);
+const cls = (name) => h$2[name] ?? name;
 function useUnitRect(division, options = {}) {
   const {
     widthFraction = 1,
@@ -51,7 +52,7 @@ function Unit(props) {
     overflowTop: hasOverflowTop,
     overflowBottom: hasOverflowBottom
   };
-  const _patternID = patternID ?? resolveID(d);
+  const _patternID = patternID ?? getBestFGDCPatternForUnit(d);
   let _fill = fill ?? useGeologicPattern(_patternID, defaultFill);
   const hasBackgroundColor = backgroundColor != null;
   const _className = classNames(className, { colored: hasBackgroundColor });
@@ -65,55 +66,33 @@ function Unit(props) {
       }
     },
     [
-      h(UnitRect, {
+      h(ClippableRect, {
         ...bounds,
         fill: backgroundColor,
         onClick,
-        className: "background"
+        className: cls("background")
       }),
-      h(UnitRect, {
+      h(ClippableRect, {
         ref,
         ...bounds,
         fill: _fill,
         //mask,
         onClick,
-        className: "unit"
+        className: cls("unit")
+      }),
+      h.if(linked)(ClippableRect, {
+        ...bounds,
+        className: cls("linked-overlay")
+      }),
+      h.if(selected)(ClippableRect, {
+        ...bounds,
+        className: cls("selection-overlay")
       }),
-      h.if(linked)(UnitRect, { ...bounds, className: "linked-overlay" }),
-      h.if(selected)(UnitRect, { ...bounds, className: "selection-overlay" }),
       //defs,
       children
     ]
   );
 }
-const UnitRect = forwardRef((props, ref) => {
-  const {
-    x,
-    y,
-    width,
-    height,
-    overflowTop = false,
-    overflowBottom = false,
-    ...rest
-  } = props;
-  if (!overflowTop && !overflowBottom) {
-    return h("rect", {
-      x,
-      y,
-      width,
-      height,
-      ref,
-      ...rest
-    });
-  } else {
-    const d = zigZagBoxPath(x, y, width, height, overflowTop, overflowBottom);
-    return h("path", {
-      d,
-      ref,
-      ...rest
-    });
-  }
-});
 function LabeledUnit(props) {
   const {
     division,
@@ -127,12 +106,13 @@ function LabeledUnit(props) {
     // not sure why this is brought in...
     ...baseBounds
   } = props;
-  const { axisType } = useColumn();
+  const { axisType, isTransitioning, hideLabelsWhileTransitioning } = useColumn();
   const bounds = {
     ...useUnitRect(division, { widthFraction, axisType }),
     ...baseBounds
   };
   const { width, height } = bounds;
+  const skipLabel = isTransitioning && hideLabelsWhileTransitioning;
   return h(
     Unit,
     {
@@ -143,7 +123,7 @@ function LabeledUnit(props) {
       ...bounds
     },
     [
-      h.if(showLabel)(
+      h.if(showLabel && !skipLabel)(
         ForeignObject,
         { ...bounds, className: "unit-label-container" },
         h(SizeAwareLabel, {
@@ -151,6 +131,9 @@ function LabeledUnit(props) {
           labelClassName: "unit-label",
           style: { width, height },
           label,
+          // Re-fit the label when a transition settles (isTransitioning flips),
+          // not on every intermediate frame.
+          remeasureKey: isTransitioning,
           onVisibilityChanged(viz) {
             onLabelUpdated(label, viz);
           }
@@ -177,7 +160,7 @@ function UnitBoxes(props) {
   }, [divisions, unitComponent, unitComponentProps]);
   return h(
     PatternDefsProvider,
-    { resolveID, scalePattern },
+    { resolveID: getBestFGDCPatternForUnit, scalePattern },
     h("g.divisions", children)
   );
 }

package/dist/units/boxes.js.map

@@ -1 +1 @@
-{"version":3,"file":"boxes.js","sources":["../../src/units/boxes.ts"],"sourcesContent":["import {\n  ColumnAxisType,\n  ColumnContext,\n  ColumnLayoutContext,\n  ForeignObject,\n  PatternDefsProvider,\n  useColumn,\n  useGeologicPattern,\n  zigZagBoxPath,\n} from \"@macrostrat/column-components\";\nimport { SizeAwareLabel, Clickable } from \"@macrostrat/ui-components\";\nimport hyper from \"@macrostrat/hyper\";\nimport { forwardRef, ReactNode, useContext, useMemo } from \"react\";\nimport { resolveID, scalePattern } from \"./resolvers\";\nimport { useUnitSelectionTarget } from \"../data-provider\";\nimport { useLithologies } from \"@macrostrat/data-provider\";\nimport { IUnit } from \"./types\";\nimport styles from \"./boxes.module.sass\";\nimport classNames from \"classnames\";\nimport { getUnitHeightRange } from \"../prepare-units/utils\";\nimport { getMixedUnitColor } from \"./colors\";\nimport type { RectBounds } from \"./types\";\n\nconst h = hyper.styled(styles);\n\ninterface UnitRectOptions {\n  widthFraction?: number;\n  axisType?: ColumnAxisType;\n  // Padding to create overflow for zig-zags or other ornamented edges\n  padding?: number;\n}\n\ninterface UnitProps extends Clickable, Partial<RectBounds>, UnitRectOptions {\n  division: IUnit;\n  resolveID?(IUnit): string;\n  UUID?: string;\n  defaultFill?: string;\n  widthFraction?: number;\n  children?: ReactNode;\n  className?: string;\n  fill?: string;\n  backgroundColor?: string;\n  patternColor?: string;\n  patternID?: string | number;\n}\n\nexport interface LabeledUnitProps\n  extends UnitRectOptions, Clickable, Partial<RectBounds> {\n  division: IUnit;\n  patternID?: string | number;\n  label: string;\n  onLabelUpdated?(label: string, shown: boolean);\n  halfWidth?: boolean;\n  showLabel?: boolean;\n  backgroundColor?: string;\n}\n\nfunction useUnitRect(\n  division: IUnit,\n  options: UnitRectOptions = {},\n): RectBounds {\n  const {\n    widthFraction = 1,\n    axisType = ColumnAxisType.AGE,\n    padding = 0,\n  } = options;\n  const { scale } = useContext(ColumnContext);\n  const { width } = useContext(ColumnLayoutContext);\n\n  const [bottomHeight, topHeight] = getUnitHeightRange(division, axisType);\n\n  const y = scale(topHeight);\n  const height = Math.abs(scale(bottomHeight) - y);\n\n  return {\n    x: width * (1 - widthFraction) - padding,\n    y: y - padding,\n    height: height + padding * 2,\n    width: widthFraction * width + padding * 2,\n  };\n}\n\nexport function MinimalUnit(props) {\n  const {\n    division: d,\n    children,\n    className,\n    widthFraction = 1,\n    axisType: _, // not sure why this is brought in...\n    nColumns: __,\n    ...baseBounds\n  } = props;\n\n  const { axisType } = useColumn();\n  const lithMap = useLithologies();\n  const bounds = {\n    ...useUnitRect(d, { widthFraction, axisType }),\n    ...baseBounds,\n  };\n\n  const backgroundColor = getMixedUnitColor(d, lithMap, null, false);\n\n  const [ref, selected, onClick, linked] = useUnitSelectionTarget(d);\n\n  return h(\n    \"g.unit\",\n    {\n      className,\n      style: {\n        \"--column-unit-background-color\": backgroundColor,\n        \"--column-stroke-color\": backgroundColor,\n      },\n    },\n    [\n      h(\"rect.unit.background\", {\n        ref,\n        ...bounds,\n        fill: backgroundColor,\n        fillOpacity: 0.8,\n        stroke: backgroundColor,\n        onClick,\n      }),\n      h.if(linked)(\"rect.linked-overlay\", bounds),\n      h.if(selected)(\"rect.selection-overlay\", bounds),\n    ],\n  );\n}\n\nfunction Unit(props: UnitProps) {\n  const {\n    division: d,\n    children,\n    fill,\n    defaultFill = \"transparent\",\n    className,\n    widthFraction = 1,\n    backgroundColor,\n    patternColor,\n    patternID,\n    axisType: _, // not sure why this is brought in...\n    ...baseBounds\n  } = props;\n\n  const { axisType } = useColumn();\n\n  const hasOverflowTop = d.t_clip_pos != null;\n  const hasOverflowBottom = d.b_clip_pos != null;\n\n  const bounds = {\n    ...useUnitRect(d, { widthFraction, axisType }),\n    ...baseBounds,\n    overflowTop: hasOverflowTop,\n    overflowBottom: hasOverflowBottom,\n  };\n  const _patternID = patternID ?? resolveID(d);\n  let _fill = fill ?? useGeologicPattern(_patternID, defaultFill);\n\n  const hasBackgroundColor = backgroundColor != null;\n\n  const _className = classNames(className, { colored: hasBackgroundColor });\n\n  const [ref, selected, onClick, linked] = useUnitSelectionTarget(d);\n\n  return h(\n    \"g.unit\",\n    {\n      className: _className,\n      style: {\n        \"--column-unit-background-color\": backgroundColor,\n      },\n    },\n    [\n      h(UnitRect, {\n        ...bounds,\n        fill: backgroundColor,\n        onClick,\n        className: \"background\",\n      }),\n      h(UnitRect, {\n        ref,\n        ...bounds,\n        fill: _fill,\n        //mask,\n        onClick,\n        className: \"unit\",\n      }),\n      h.if(linked)(UnitRect, { ...bounds, className: \"linked-overlay\" }),\n      h.if(selected)(UnitRect, { ...bounds, className: \"selection-overlay\" }),\n      //defs,\n      children,\n    ],\n  );\n}\n\ninterface UnitRectProps {\n  x: number;\n  y: number;\n  width: number;\n  height: number;\n  className: string;\n  // Used to determine if the rect should have a zig-zag edge on the top or bottom\n  overflowTop?: boolean;\n  overflowBottom?: boolean;\n  [key: string]: any;\n}\n\nconst UnitRect = forwardRef((props: UnitRectProps, ref) => {\n  const {\n    x,\n    y,\n    width,\n    height,\n    overflowTop = false,\n    overflowBottom = false,\n    ...rest\n  } = props;\n\n  if (!overflowTop && !overflowBottom) {\n    return h(\"rect\", {\n      x,\n      y,\n      width,\n      height,\n      ref,\n      ...rest,\n    });\n  } else {\n    const d = zigZagBoxPath(x, y, width, height, overflowTop, overflowBottom);\n    return h(\"path\", {\n      d,\n      ref,\n      ...rest,\n    });\n  }\n});\n\nfunction LabeledUnit(props: LabeledUnitProps) {\n  const {\n    division,\n    label,\n    onLabelUpdated,\n    widthFraction,\n    showLabel = true,\n    backgroundColor,\n    patternID,\n    axisType: _, // not sure why this is brought in...\n    ...baseBounds\n  } = props;\n\n  const { axisType } = useColumn();\n  const bounds = {\n    ...useUnitRect(division, { widthFraction, axisType }),\n    ...baseBounds,\n  };\n  const { width, height } = bounds;\n  return h(\n    Unit,\n    {\n      className: \"labeled-unit\",\n      division,\n      backgroundColor,\n      patternID,\n      ...bounds,\n    },\n    [\n      h.if(showLabel)(\n        ForeignObject,\n        { ...bounds, className: \"unit-label-container\" },\n        h(SizeAwareLabel, {\n          className: \"unit-overlay\",\n          labelClassName: \"unit-label\",\n          style: { width, height },\n          label,\n          onVisibilityChanged(viz) {\n            onLabelUpdated(label, viz);\n          },\n        }),\n      ),\n    ],\n  );\n}\n\nfunction UnitBoxes<T>(props: {\n  unitComponent: React.FunctionComponent<{ division: T }>;\n  unitComponentProps?: any;\n  transformDivisions?(divisions: T[]): T[];\n  transformDivision?: (\n    division: any,\n    index: number,\n    divisions: any[],\n  ) => T | null;\n}) {\n  const { unitComponent = Unit, unitComponentProps = {} } = props;\n  const { divisions } = useContext(ColumnContext);\n\n  if (divisions.length == 0) {\n    console.warn(\"No divisions found in column context\");\n    return null;\n  }\n\n  const children = useMemo(() => {\n    return divisions.map((division: any, i) => {\n      // @ts-ignore\n      return h(unitComponent, {\n        division,\n        key: division.unit_id,\n        ...unitComponentProps,\n      });\n    });\n  }, [divisions, unitComponent, unitComponentProps]);\n\n  return h(\n    PatternDefsProvider,\n    { resolveID, scalePattern },\n    h(\"g.divisions\", children),\n  );\n}\n\nexport { LabeledUnit, Unit, UnitBoxes, UnitProps };\n"],"names":["hyper","styles"],"mappings":"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"}
+{"version":3,"file":"boxes.js","sources":["../../src/units/boxes.ts"],"sourcesContent":["import {\n  ColumnAxisType,\n  ColumnContext,\n  ColumnLayoutContext,\n  ClippableRect,\n  ForeignObject,\n  PatternDefsProvider,\n  useColumn,\n  useGeologicPattern,\n} from \"@macrostrat/column-components\";\nimport { SizeAwareLabel, Clickable } from \"@macrostrat/ui-components\";\nimport hyper from \"@macrostrat/hyper\";\nimport { ReactNode, useContext, useMemo } from \"react\";\nimport { useUnitSelectionTarget } from \"../data-provider\";\nimport { useLithologies } from \"@macrostrat/data-provider\";\nimport { IUnit } from \"./types\";\nimport styles from \"./boxes.module.sass\";\nimport classNames from \"classnames\";\nimport { getUnitHeightRange } from \"../prepare-units/utils\";\nimport type { RectBounds } from \"./types\";\nimport {\n  getBestFGDCPatternForUnit,\n  scalePattern,\n  getMixedUnitColor,\n} from \"@macrostrat/stratigraphy-utils\";\n\nconst h = hyper.styled(styles);\n\n/** Resolve a class name through this file's CSS module exactly as the styled\n * `h` would (module-scoped classes are hashed; unknown/global classes pass\n * through). Needed because `ClippableRect` renders the element in\n * `@macrostrat/column-components`, so class resolution must happen here. */\nconst cls = (name: string): string => (styles as any)[name] ?? name;\n\ninterface UnitRectOptions {\n  widthFraction?: number;\n  axisType?: ColumnAxisType;\n  // Padding to create overflow for zig-zags or other ornamented edges\n  padding?: number;\n}\n\ninterface UnitProps extends Clickable, Partial<RectBounds>, UnitRectOptions {\n  division: IUnit;\n  resolveID?(IUnit): string;\n  UUID?: string;\n  defaultFill?: string;\n  widthFraction?: number;\n  children?: ReactNode;\n  className?: string;\n  fill?: string;\n  backgroundColor?: string;\n  patternColor?: string;\n  patternID?: string | number;\n}\n\nexport interface LabeledUnitProps\n  extends UnitRectOptions, Clickable, Partial<RectBounds> {\n  division: IUnit;\n  patternID?: string | number;\n  label: string;\n  onLabelUpdated?(label: string, shown: boolean);\n  halfWidth?: boolean;\n  showLabel?: boolean;\n  backgroundColor?: string;\n}\n\nfunction useUnitRect(\n  division: IUnit,\n  options: UnitRectOptions = {},\n): RectBounds {\n  const {\n    widthFraction = 1,\n    axisType = ColumnAxisType.AGE,\n    padding = 0,\n  } = options;\n  const { scale } = useContext(ColumnContext);\n  const { width } = useContext(ColumnLayoutContext);\n\n  const [bottomHeight, topHeight] = getUnitHeightRange(division, axisType);\n\n  const y = scale(topHeight);\n  const height = Math.abs(scale(bottomHeight) - y);\n\n  return {\n    x: width * (1 - widthFraction) - padding,\n    y: y - padding,\n    height: height + padding * 2,\n    width: widthFraction * width + padding * 2,\n  };\n}\n\nexport function MinimalUnit(props) {\n  const {\n    division: d,\n    children,\n    className,\n    widthFraction = 1,\n    axisType: _, // not sure why this is brought in...\n    nColumns: __,\n    ...baseBounds\n  } = props;\n\n  const { axisType } = useColumn();\n  const lithMap = useLithologies();\n  const bounds = {\n    ...useUnitRect(d, { widthFraction, axisType }),\n    ...baseBounds,\n  };\n\n  const backgroundColor = getMixedUnitColor(d, lithMap, null, false);\n\n  const [ref, selected, onClick, linked] = useUnitSelectionTarget(d);\n\n  return h(\n    \"g.unit\",\n    {\n      className,\n      style: {\n        \"--column-unit-background-color\": backgroundColor,\n        \"--column-stroke-color\": backgroundColor,\n      },\n    },\n    [\n      h(\"rect.unit.background\", {\n        ref,\n        ...bounds,\n        fill: backgroundColor,\n        fillOpacity: 0.8,\n        stroke: backgroundColor,\n        onClick,\n      }),\n      h.if(linked)(\"rect.linked-overlay\", bounds),\n      h.if(selected)(\"rect.selection-overlay\", bounds),\n    ],\n  );\n}\n\nfunction Unit(props: UnitProps) {\n  const {\n    division: d,\n    children,\n    fill,\n    defaultFill = \"transparent\",\n    className,\n    widthFraction = 1,\n    backgroundColor,\n    patternColor,\n    patternID,\n    axisType: _, // not sure why this is brought in...\n    ...baseBounds\n  } = props;\n\n  const { axisType } = useColumn();\n\n  const hasOverflowTop = d.t_clip_pos != null;\n  const hasOverflowBottom = d.b_clip_pos != null;\n\n  const bounds = {\n    ...useUnitRect(d, { widthFraction, axisType }),\n    ...baseBounds,\n    overflowTop: hasOverflowTop,\n    overflowBottom: hasOverflowBottom,\n  };\n  const _patternID = patternID ?? getBestFGDCPatternForUnit(d);\n  let _fill = fill ?? useGeologicPattern(_patternID, defaultFill);\n\n  const hasBackgroundColor = backgroundColor != null;\n\n  const _className = classNames(className, { colored: hasBackgroundColor });\n\n  const [ref, selected, onClick, linked] = useUnitSelectionTarget(d);\n\n  return h(\n    \"g.unit\",\n    {\n      className: _className,\n      style: {\n        \"--column-unit-background-color\": backgroundColor,\n      },\n    },\n    [\n      h(ClippableRect, {\n        ...bounds,\n        fill: backgroundColor,\n        onClick,\n        className: cls(\"background\"),\n      }),\n      h(ClippableRect, {\n        ref,\n        ...bounds,\n        fill: _fill,\n        //mask,\n        onClick,\n        className: cls(\"unit\"),\n      }),\n      h.if(linked)(ClippableRect, {\n        ...bounds,\n        className: cls(\"linked-overlay\"),\n      }),\n      h.if(selected)(ClippableRect, {\n        ...bounds,\n        className: cls(\"selection-overlay\"),\n      }),\n      //defs,\n      children,\n    ],\n  );\n}\n\nfunction LabeledUnit(props: LabeledUnitProps) {\n  const {\n    division,\n    label,\n    onLabelUpdated,\n    widthFraction,\n    showLabel = true,\n    backgroundColor,\n    patternID,\n    axisType: _, // not sure why this is brought in...\n    ...baseBounds\n  } = props;\n\n  const { axisType, isTransitioning, hideLabelsWhileTransitioning } =\n    useColumn();\n  const bounds = {\n    ...useUnitRect(division, { widthFraction, axisType }),\n    ...baseBounds,\n  };\n  const { width, height } = bounds;\n  // Labels stay visible through the animation by default. `hideLabelsWhileTransitioning`\n  // is a perf escape hatch: when set, the `foreignObject` label (whose HTML\n  // reflows on every size change) is skipped mid-transition and restored on settle.\n  const skipLabel = isTransitioning && hideLabelsWhileTransitioning;\n  return h(\n    Unit,\n    {\n      className: \"labeled-unit\",\n      division,\n      backgroundColor,\n      patternID,\n      ...bounds,\n    },\n    [\n      h.if(showLabel && !skipLabel)(\n        ForeignObject,\n        { ...bounds, className: \"unit-label-container\" },\n        h(SizeAwareLabel, {\n          className: \"unit-overlay\",\n          labelClassName: \"unit-label\",\n          style: { width, height },\n          label,\n          // Re-fit the label when a transition settles (isTransitioning flips),\n          // not on every intermediate frame.\n          remeasureKey: isTransitioning,\n          onVisibilityChanged(viz) {\n            onLabelUpdated(label, viz);\n          },\n        }),\n      ),\n    ],\n  );\n}\n\nfunction UnitBoxes<T>(props: {\n  unitComponent: React.FunctionComponent<{ division: T }>;\n  unitComponentProps?: any;\n  transformDivisions?(divisions: T[]): T[];\n  transformDivision?: (\n    division: any,\n    index: number,\n    divisions: any[],\n  ) => T | null;\n}) {\n  const { unitComponent = Unit, unitComponentProps = {} } = props;\n  const { divisions } = useContext(ColumnContext);\n\n  if (divisions.length == 0) {\n    console.warn(\"No divisions found in column context\");\n    return null;\n  }\n\n  const children = useMemo(() => {\n    return divisions.map((division: any, i) => {\n      // @ts-ignore\n      return h(unitComponent, {\n        division,\n        key: division.unit_id,\n        ...unitComponentProps,\n      });\n    });\n  }, [divisions, unitComponent, unitComponentProps]);\n\n  return h(\n    PatternDefsProvider,\n    { resolveID: getBestFGDCPatternForUnit, scalePattern },\n    h(\"g.divisions\", children),\n  );\n}\n\nexport { LabeledUnit, Unit, UnitBoxes, UnitProps };\n"],"names":["hyper","styles"],"mappings":"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"}

package/dist/units/composite.cjs

@@ -16,22 +16,22 @@ function LabelTrackerProvider(props) {
   const { children, units, findUnitID = findMacrostratUnitID } = props;
   const [unlabeledDivisions, setUnlabeledDivisions] = React.useState(null);
   const labelTrackerRef = React.useRef({});
+  const recompute = React.useCallback(() => {
+    const tracker = labelTrackerRef.current;
+    const allReported = units.every((d) => findUnitID(d) in tracker);
+    if (!allReported) return;
+    setUnlabeledDivisions(units.filter((d) => tracker[findUnitID(d)] === false));
+  }, [units, findUnitID]);
   const trackLabelVisibility = React.useCallback(
     (div, visible) => {
-      const id = findUnitID(div);
-      labelTrackerRef.current[id] = visible;
-      if (Object.keys(labelTrackerRef.current).length == units.length) {
-        setUnlabeledDivisions(
-          // @ts-ignore
-          units.filter((d) => {
-            const id2 = findUnitID(d);
-            return labelTrackerRef.current[id2] == false;
-          })
-        );
-      }
+      labelTrackerRef.current[findUnitID(div)] = visible;
+      recompute();
     },
-    [labelTrackerRef, units, findUnitID]
+    [recompute, findUnitID]
   );
+  React.useEffect(() => {
+    recompute();
+  }, [recompute]);
   const value = trackLabelVisibility;
   return h(
     LabelTrackerContext.Provider,

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  const trackLabelVisibility = useCallback(\n    (div, visible) => {\n      const id = findUnitID(div);\n      labelTrackerRef.current[id] = visible;\n      if (Object.keys(labelTrackerRef.current).length == units.length) {\n        setUnlabeledDivisions(\n          // @ts-ignore\n          units.filter((d) => {\n            const id = findUnitID(d);\n            return labelTrackerRef.current[id] == false;\n          }),\n        );\n      }\n    },\n    [labelTrackerRef, units, findUnitID],\n  );\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","id","defaultNameFunction","useContext","LabeledUnit","LithologyColumn","UnitBoxes","useEffect","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};\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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"}

package/dist/units/composite.js

@@ -14,22 +14,22 @@ function LabelTrackerProvider(props) {
   const { children, units, findUnitID = findMacrostratUnitID } = props;
   const [unlabeledDivisions, setUnlabeledDivisions] = useState(null);
   const labelTrackerRef = useRef({});
+  const recompute = useCallback(() => {
+    const tracker = labelTrackerRef.current;
+    const allReported = units.every((d) => findUnitID(d) in tracker);
+    if (!allReported) return;
+    setUnlabeledDivisions(units.filter((d) => tracker[findUnitID(d)] === false));
+  }, [units, findUnitID]);
   const trackLabelVisibility = useCallback(
     (div, visible) => {
-      const id = findUnitID(div);
-      labelTrackerRef.current[id] = visible;
-      if (Object.keys(labelTrackerRef.current).length == units.length) {
-        setUnlabeledDivisions(
-          // @ts-ignore
-          units.filter((d) => {
-            const id2 = findUnitID(d);
-            return labelTrackerRef.current[id2] == false;
-          })
-        );
-      }
+      labelTrackerRef.current[findUnitID(div)] = visible;
+      recompute();
     },
-    [labelTrackerRef, units, findUnitID]
+    [recompute, findUnitID]
   );
+  useEffect(() => {
+    recompute();
+  }, [recompute]);
   const value = trackLabelVisibility;
   return h(
     LabelTrackerContext.Provider,

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  const trackLabelVisibility = useCallback(\n    (div, visible) => {\n      const id = findUnitID(div);\n      labelTrackerRef.current[id] = visible;\n      if (Object.keys(labelTrackerRef.current).length == units.length) {\n        setUnlabeledDivisions(\n          // @ts-ignore\n          units.filter((d) => {\n            const id = findUnitID(d);\n            return labelTrackerRef.current[id] == false;\n          }),\n        );\n      }\n    },\n    [labelTrackerRef, units, findUnitID],\n  );\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","id"],"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};\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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"}

package/dist/units/index.cjs

@@ -5,11 +5,10 @@ const columnComponents = require("@macrostrat/column-components");
 const names = require("./names.cjs");
 const boxes = require("./boxes.cjs");
 const uiComponents = require("@macrostrat/ui-components");
-const colors = require("./colors.cjs");
+const stratigraphyUtils = require("@macrostrat/stratigraphy-utils");
 const composite = require("./composite.cjs");
 const dataProvider = require("@macrostrat/data-provider");
 const React = require("react");
-const resolvers = require("./resolvers.cjs");
 const _interopDefault = (e) => e && e.__esModule ? e : { default: e };
 const h__default = /* @__PURE__ */ _interopDefault(h);
 function UnitsColumn({ width = 100 }) {
@@ -51,7 +50,7 @@ function UnitComponent({
   let reducedWidth = _nColumns;
   if ("layout" in division) {
     const layout = division.layout;
-    _nColumns = Math.min(_nColumns, layout.totalColumns);
+    _nColumns = layout.totalColumns;
     columnIx = layout.column;
     reducedWidth = width / layout.totalColumns / layout.nColumns;
     x = columnIx * width / _nColumns;
@@ -69,13 +68,13 @@ function useUnitColor(unit, opts = {}) {
   const { asBackground = true } = opts;
   return React.useMemo(() => {
     if (unit == null || lithMap == null) return null;
-    return colors.getMixedUnitColor(unit, lithMap, inDarkMode, asBackground);
+    return stratigraphyUtils.getMixedUnitColor(unit, lithMap, inDarkMode, asBackground);
   }, [unit?.unit_id, lithMap, inDarkMode, asBackground]);
 }
 function ColoredUnitComponent(props) {
   const backgroundColor = useUnitColor(props.division);
   const patternID = React.useMemo(() => {
-    return resolvers.resolveID(props.division);
+    return stratigraphyUtils.getBestFGDCPatternForUnit(props.division);
   }, [props.division?.unit_id]);
   const fill = columnComponents.useGeologicPattern(patternID);
   return h__default.default(UnitComponent, {
@@ -91,20 +90,20 @@ function useUnitColorByEnvironment(unit, opts = {}) {
   const { asBackground = true } = opts;
   return React.useMemo(() => {
     if (unit == null || environmentMap == null) return null;
-    let c = colors.getMixedUnitColor(unit, environmentMap, inDarkMode, asBackground, {
+    let c = stratigraphyUtils.getMixedUnitColor(unit, environmentMap, inDarkMode, asBackground, {
       key: "environ",
       id_key: "environ_id"
     });
     if (c != null) {
       return c;
     }
-    return colors.getMixedUnitColor(unit, lithMap, inDarkMode, asBackground);
+    return stratigraphyUtils.getMixedUnitColor(unit, lithMap, inDarkMode, asBackground);
   }, [unit?.unit_id, environmentMap, lithMap, inDarkMode, asBackground]);
 }
 function EnvironmentColoredUnitComponent(props) {
   const backgroundColor = useUnitColorByEnvironment(props.division);
   const patternID = React.useMemo(() => {
-    return resolvers.resolveID(props.division);
+    return stratigraphyUtils.getBestFGDCPatternForUnit(props.division);
   }, [props.division?.unit_id]);
   const fill = columnComponents.useGeologicPattern(patternID);
   return h__default.default(UnitComponent, {
@@ -113,9 +112,6 @@ function EnvironmentColoredUnitComponent(props) {
     ...props
   });
 }
-exports.flattenLithologies = colors.flattenLithologies;
-exports.getMixedColorForData = colors.getMixedColorForData;
-exports.getMixedUnitColor = colors.getMixedUnitColor;
 exports.AnnotatedUnitsColumn = composite.AnnotatedUnitsColumn;
 exports.ColumnNotesProvider = composite.ColumnNotesProvider;
 exports.CompositeUnitComponent = composite.CompositeUnitComponent;

package/dist/units/index.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"index.cjs","sources":["../../src/units/index.ts"],"sourcesContent":["import h from \"@macrostrat/hyper\";\nimport {\n  LithologyColumn,\n  useGeologicPattern,\n} from \"@macrostrat/column-components\";\nimport { UnitNamesColumn } from \"./names\";\nimport { ICompositeUnitProps } from \"./composite\";\nimport { UnitBoxes, UnitProps } from \"./boxes\";\nimport { useColumnLayout } from \"@macrostrat/column-components\";\nimport { useInDarkMode } from \"@macrostrat/ui-components\";\nimport { getMixedUnitColor } from \"./colors\";\nimport { TrackedLabeledUnit } from \"./composite\";\nimport { useEnvironments, useLithologies } from \"@macrostrat/data-provider\";\nimport { useMemo } from \"react\";\nimport { resolveID } from \"./resolvers\";\nimport { BaseUnit, Lithology } from \"@macrostrat/api-types\";\nimport { UnitWithLayoutParameters } from \"../prepare-units/helpers.ts\";\n\nexport * from \"./composite\";\nexport * from \"./types\";\nexport * from \"./colors\";\n\nexport function UnitsColumn({ width = 100 }) {\n  /*\n  A column showing units with USGS color fill\n  */\n  return h(LithologyColumn, { width }, h(UnitBoxes));\n}\n\nexport function SimpleUnitsColumn(props: ICompositeUnitProps) {\n  /*\n  A column with units and names either\n  overlapping or offset to the right\n  */\n  const { columnWidth, width, gutterWidth = 0, labelOffset = 30 } = props;\n\n  return h([\n    h(UnitsColumn, {\n      width: columnWidth,\n    }),\n    h(UnitNamesColumn, {\n      transform: `translate(${columnWidth + gutterWidth})`,\n      paddingLeft: labelOffset,\n      width: width - columnWidth - gutterWidth,\n    }),\n  ]);\n}\n\nexport function BasicUnitComponent({ division, ...rest }) {\n  /** A unit that allows directly setting colors and patterns. */\n\n  return h(UnitComponent, {\n    division,\n    ...rest,\n    backgroundColor: division.color,\n    patternID: division.patternID,\n  });\n}\n\ninterface UnitComponentProps<T extends BaseUnit> {\n  division: UnitWithLayoutParameters<T> | T;\n  nColumns: number;\n  width?: number;\n}\n\nexport function UnitComponent<T extends BaseUnit>({\n  division,\n  nColumns = 2,\n  ...rest\n}: UnitComponentProps<T>) {\n  const width = rest.width ?? useColumnLayout()?.width;\n\n  let _nColumns = nColumns;\n  if (isNaN(_nColumns)) {\n    _nColumns = 2;\n  }\n  let columnIx = 0;\n  let x = 0;\n\n  let reducedWidth = _nColumns;\n  if (\"layout\" in division) {\n    const layout = division.layout;\n    _nColumns = Math.min(_nColumns, layout.totalColumns);\n    columnIx = layout.column;\n    reducedWidth = width / layout.totalColumns / layout.nColumns;\n    x = (columnIx * width) / _nColumns;\n  }\n  return h(TrackedLabeledUnit, {\n    division,\n    ...rest,\n    width: reducedWidth,\n    x,\n  });\n}\n\ninterface UnitColorOptions {\n  asBackground?: boolean;\n}\n\nexport function useUnitColor(unit, opts: UnitColorOptions = {}): string | null {\n  /** Get the color for a unit based on its lithology */\n  const lithMap = useLithologies();\n  const inDarkMode = useInDarkMode();\n  const { asBackground = true } = opts;\n\n  return useMemo(() => {\n    if (unit == null || lithMap == null) return null;\n    return getMixedUnitColor(unit, lithMap, inDarkMode, asBackground);\n  }, [unit?.unit_id, lithMap, inDarkMode, asBackground]);\n}\n\nexport function ColoredUnitComponent(props) {\n  /** A unit component that is colored using a mixture of lithologies.\n   * This is a separate component because it depends on more providers/contexts to determine coloring. */\n  const backgroundColor = useUnitColor(props.division);\n\n  const patternID = useMemo(() => {\n    return resolveID(props.division); // ?? getPatternID(props.division.lith, lithMap);\n  }, [props.division?.unit_id]);\n\n  const fill = useGeologicPattern(patternID);\n\n  return h(UnitComponent, {\n    fill,\n    backgroundColor,\n    ...props,\n  });\n}\n\nexport function useUnitColorByEnvironment(\n  unit,\n  opts: UnitColorOptions = {},\n): string | null {\n  /** Get the color for a unit based on its lithology */\n  const environmentMap = useEnvironments();\n  const lithMap = useLithologies();\n  const inDarkMode = useInDarkMode();\n  const { asBackground = true } = opts;\n\n  return useMemo(() => {\n    if (unit == null || environmentMap == null) return null;\n    let c = getMixedUnitColor(unit, environmentMap, inDarkMode, asBackground, {\n      key: \"environ\",\n      id_key: \"environ_id\",\n    });\n    if (c != null) {\n      return c;\n    }\n    // Fallback to lithology color if no environment color is found\n    return getMixedUnitColor(unit, lithMap, inDarkMode, asBackground);\n  }, [unit?.unit_id, environmentMap, lithMap, inDarkMode, asBackground]);\n}\n\nexport function EnvironmentColoredUnitComponent(props) {\n  /** A unit component that is colored using a mixture of lithologies.\n   * This is a separate component because it depends on more providers/contexts to determine coloring. */\n  const backgroundColor = useUnitColorByEnvironment(props.division);\n\n  const patternID = useMemo(() => {\n    return resolveID(props.division); // ?? getPatternID(props.division.lith, lithMap);\n  }, [props.division?.unit_id]);\n\n  const fill = useGeologicPattern(patternID);\n\n  return h(UnitComponent, {\n    fill,\n    backgroundColor,\n    ...props,\n  });\n}\n\nfunction getPatternID(\n  liths: Array<Lithology>,\n  lithMap: Map<number, Lithology>,\n): string | null {\n  if (lithMap == null || liths == null || liths.length == 0) {\n    return null;\n  }\n  const patternIDs = new Set<string>();\n  for (const lith of liths) {\n    const lithData = lithMap.get(lith.lith_id);\n    if (lithData) {\n      patternIDs.add(`${lithData.fill}`);\n    }\n  }\n  let id = patternIDs.values()[0];\n  if (id == \"0\") return null;\n  return id;\n}\n"],"names":["h","LithologyColumn","UnitBoxes","UnitNamesColumn","useColumnLayout","TrackedLabeledUnit","useLithologies","useInDarkMode","useMemo","getMixedUnitColor","resolveID","useGeologicPattern","useEnvironments"],"mappings":";;;;;;;;;;;;;;AAsBO,SAAS,YAAY,EAAE,QAAQ,OAAO;AAI3C,SAAOA,WAAAA,QAAEC,iBAAAA,iBAAiB,EAAE,SAASD,WAAAA,QAAEE,MAAAA,SAAS,CAAC;AACnD;AAEO,SAAS,kBAAkB,OAA4B;AAK5D,QAAM,EAAE,aAAa,OAAO,cAAc,GAAG,cAAc,OAAO;AAElE,SAAOF,mBAAE;AAAA,IACPA,WAAAA,QAAE,aAAa;AAAA,MACb,OAAO;AAAA,IAAA,CACR;AAAA,IACDA,WAAAA,QAAEG,MAAAA,iBAAiB;AAAA,MACjB,WAAW,aAAa,cAAc,WAAW;AAAA,MACjD,aAAa;AAAA,MACb,OAAO,QAAQ,cAAc;AAAA,IAAA,CAC9B;AAAA,EAAA,CACF;AACH;AAEO,SAAS,mBAAmB,EAAE,UAAU,GAAG,QAAQ;AAGxD,SAAOH,WAAAA,QAAE,eAAe;AAAA,IACtB;AAAA,IACA,GAAG;AAAA,IACH,iBAAiB,SAAS;AAAA,IAC1B,WAAW,SAAS;AAAA,EAAA,CACrB;AACH;AAQO,SAAS,cAAkC;AAAA,EAChD;AAAA,EACA,WAAW;AAAA,EACX,GAAG;AACL,GAA0B;AACxB,QAAM,QAAQ,KAAK,SAASI,iBAAAA,gBAAA,GAAmB;AAE/C,MAAI,YAAY;AAChB,MAAI,MAAM,SAAS,GAAG;AACpB,gBAAY;AAAA,EACd;AACA,MAAI,WAAW;AACf,MAAI,IAAI;AAER,MAAI,eAAe;AACnB,MAAI,YAAY,UAAU;AACxB,UAAM,SAAS,SAAS;AACxB,gBAAY,KAAK,IAAI,WAAW,OAAO,YAAY;AACnD,eAAW,OAAO;AAClB,mBAAe,QAAQ,OAAO,eAAe,OAAO;AACpD,QAAK,WAAW,QAAS;AAAA,EAC3B;AACA,SAAOJ,WAAAA,QAAEK,UAAAA,oBAAoB;AAAA,IAC3B;AAAA,IACA,GAAG;AAAA,IACH,OAAO;AAAA,IACP;AAAA,EAAA,CACD;AACH;AAMO,SAAS,aAAa,MAAM,OAAyB,IAAmB;AAE7E,QAAM,UAAUC,aAAAA,eAAA;AAChB,QAAM,aAAaC,aAAAA,cAAA;AACnB,QAAM,EAAE,eAAe,KAAA,IAAS;AAEhC,SAAOC,MAAAA,QAAQ,MAAM;AACnB,QAAI,QAAQ,QAAQ,WAAW,KAAM,QAAO;AAC5C,WAAOC,OAAAA,kBAAkB,MAAM,SAAS,YAAY,YAAY;AAAA,EAClE,GAAG,CAAC,MAAM,SAAS,SAAS,YAAY,YAAY,CAAC;AACvD;AAEO,SAAS,qBAAqB,OAAO;AAG1C,QAAM,kBAAkB,aAAa,MAAM,QAAQ;AAEnD,QAAM,YAAYD,MAAAA,QAAQ,MAAM;AAC9B,WAAOE,UAAAA,UAAU,MAAM,QAAQ;AAAA,EACjC,GAAG,CAAC,MAAM,UAAU,OAAO,CAAC;AAE5B,QAAM,OAAOC,iBAAAA,mBAAmB,SAAS;AAEzC,SAAOX,WAAAA,QAAE,eAAe;AAAA,IACtB;AAAA,IACA;AAAA,IACA,GAAG;AAAA,EAAA,CACJ;AACH;AAEO,SAAS,0BACd,MACA,OAAyB,IACV;AAEf,QAAM,iBAAiBY,aAAAA,gBAAA;AACvB,QAAM,UAAUN,aAAAA,eAAA;AAChB,QAAM,aAAaC,aAAAA,cAAA;AACnB,QAAM,EAAE,eAAe,KAAA,IAAS;AAEhC,SAAOC,MAAAA,QAAQ,MAAM;AACnB,QAAI,QAAQ,QAAQ,kBAAkB,KAAM,QAAO;AACnD,QAAI,IAAIC,OAAAA,kBAAkB,MAAM,gBAAgB,YAAY,cAAc;AAAA,MACxE,KAAK;AAAA,MACL,QAAQ;AAAA,IAAA,CACT;AACD,QAAI,KAAK,MAAM;AACb,aAAO;AAAA,IACT;AAEA,WAAOA,OAAAA,kBAAkB,MAAM,SAAS,YAAY,YAAY;AAAA,EAClE,GAAG,CAAC,MAAM,SAAS,gBAAgB,SAAS,YAAY,YAAY,CAAC;AACvE;AAEO,SAAS,gCAAgC,OAAO;AAGrD,QAAM,kBAAkB,0BAA0B,MAAM,QAAQ;AAEhE,QAAM,YAAYD,MAAAA,QAAQ,MAAM;AAC9B,WAAOE,UAAAA,UAAU,MAAM,QAAQ;AAAA,EACjC,GAAG,CAAC,MAAM,UAAU,OAAO,CAAC;AAE5B,QAAM,OAAOC,iBAAAA,mBAAmB,SAAS;AAEzC,SAAOX,WAAAA,QAAE,eAAe;AAAA,IACtB;AAAA,IACA;AAAA,IACA,GAAG;AAAA,EAAA,CACJ;AACH;;;;;;;;;;;;;;;;;;;"}
+{"version":3,"file":"index.cjs","sources":["../../src/units/index.ts"],"sourcesContent":["import h from \"@macrostrat/hyper\";\nimport {\n  LithologyColumn,\n  useGeologicPattern,\n} from \"@macrostrat/column-components\";\nimport { UnitNamesColumn } from \"./names\";\nimport { ICompositeUnitProps } from \"./composite\";\nimport { UnitBoxes } from \"./boxes\";\nimport { useColumnLayout } from \"@macrostrat/column-components\";\nimport { useInDarkMode } from \"@macrostrat/ui-components\";\nimport {\n  getBestFGDCPatternForUnit,\n  getMixedUnitColor,\n} from \"@macrostrat/stratigraphy-utils\";\nimport { TrackedLabeledUnit } from \"./composite\";\nimport { useEnvironments, useLithologies } from \"@macrostrat/data-provider\";\nimport { useMemo } from \"react\";\nimport { BaseUnit, Lithology } from \"@macrostrat/api-types\";\nimport { UnitWithLayoutParameters } from \"../prepare-units/helpers.ts\";\n\nexport * from \"./composite\";\nexport * from \"./types\";\n\nexport function UnitsColumn({ width = 100 }) {\n  /*\n  A column showing units with USGS color fill\n  */\n  return h(LithologyColumn, { width }, h(UnitBoxes));\n}\n\nexport function SimpleUnitsColumn(props: ICompositeUnitProps) {\n  /*\n  A column with units and names either\n  overlapping or offset to the right\n  */\n  const { columnWidth, width, gutterWidth = 0, labelOffset = 30 } = props;\n\n  return h([\n    h(UnitsColumn, {\n      width: columnWidth,\n    }),\n    h(UnitNamesColumn, {\n      transform: `translate(${columnWidth + gutterWidth})`,\n      paddingLeft: labelOffset,\n      width: width - columnWidth - gutterWidth,\n    }),\n  ]);\n}\n\nexport function BasicUnitComponent({ division, ...rest }) {\n  /** A unit that allows directly setting colors and patterns. */\n\n  return h(UnitComponent, {\n    division,\n    ...rest,\n    backgroundColor: division.color,\n    patternID: division.patternID,\n  });\n}\n\ninterface UnitComponentProps<T extends BaseUnit> {\n  division: UnitWithLayoutParameters<T> | T;\n  nColumns: number;\n  width?: number;\n}\n\nexport function UnitComponent<T extends BaseUnit>({\n  division,\n  nColumns = 2,\n  ...rest\n}: UnitComponentProps<T>) {\n  const width = rest.width ?? useColumnLayout()?.width;\n\n  let _nColumns = nColumns;\n  if (isNaN(_nColumns)) {\n    _nColumns = 2;\n  }\n  let columnIx = 0;\n  let x = 0;\n\n  let reducedWidth = _nColumns;\n  if (\"layout\" in division) {\n    const layout = division.layout;\n    _nColumns = layout.totalColumns;\n    columnIx = layout.column;\n    reducedWidth = width / layout.totalColumns / layout.nColumns;\n    x = (columnIx * width) / _nColumns;\n  }\n\n  return h(TrackedLabeledUnit, {\n    division,\n    ...rest,\n    width: reducedWidth,\n    x,\n  });\n}\n\ninterface UnitColorOptions {\n  asBackground?: boolean;\n}\n\nexport function useUnitColor(unit, opts: UnitColorOptions = {}): string | null {\n  /** Get the color for a unit based on its lithology */\n  const lithMap = useLithologies();\n  const inDarkMode = useInDarkMode();\n  const { asBackground = true } = opts;\n\n  return useMemo(() => {\n    if (unit == null || lithMap == null) return null;\n    return getMixedUnitColor(unit, lithMap, inDarkMode, asBackground);\n  }, [unit?.unit_id, lithMap, inDarkMode, asBackground]);\n}\n\nexport function ColoredUnitComponent(props) {\n  /** A unit component that is colored using a mixture of lithologies.\n   * This is a separate component because it depends on more providers/contexts to determine coloring. */\n  const backgroundColor = useUnitColor(props.division);\n\n  const patternID = useMemo(() => {\n    return getBestFGDCPatternForUnit(props.division); // ?? getPatternID(props.division.lith, lithMap);\n  }, [props.division?.unit_id]);\n\n  const fill = useGeologicPattern(patternID);\n\n  return h(UnitComponent, {\n    fill,\n    backgroundColor,\n    ...props,\n  });\n}\n\nexport function useUnitColorByEnvironment(\n  unit,\n  opts: UnitColorOptions = {},\n): string | null {\n  /** Get the color for a unit based on its lithology */\n  const environmentMap = useEnvironments();\n  const lithMap = useLithologies();\n  const inDarkMode = useInDarkMode();\n  const { asBackground = true } = opts;\n\n  return useMemo(() => {\n    if (unit == null || environmentMap == null) return null;\n    let c = getMixedUnitColor(unit, environmentMap, inDarkMode, asBackground, {\n      key: \"environ\",\n      id_key: \"environ_id\",\n    });\n    if (c != null) {\n      return c;\n    }\n    // Fallback to lithology color if no environment color is found\n    return getMixedUnitColor(unit, lithMap, inDarkMode, asBackground);\n  }, [unit?.unit_id, environmentMap, lithMap, inDarkMode, asBackground]);\n}\n\nexport function EnvironmentColoredUnitComponent(props) {\n  /** A unit component that is colored using a mixture of lithologies.\n   * This is a separate component because it depends on more providers/contexts to determine coloring. */\n  const backgroundColor = useUnitColorByEnvironment(props.division);\n\n  const patternID = useMemo(() => {\n    return getBestFGDCPatternForUnit(props.division); // ?? getPatternID(props.division.lith, lithMap);\n  }, [props.division?.unit_id]);\n\n  const fill = useGeologicPattern(patternID);\n\n  return h(UnitComponent, {\n    fill,\n    backgroundColor,\n    ...props,\n  });\n}\n"],"names":["h","LithologyColumn","UnitBoxes","UnitNamesColumn","useColumnLayout","TrackedLabeledUnit","useLithologies","useInDarkMode","useMemo","getMixedUnitColor","getBestFGDCPatternForUnit","useGeologicPattern","useEnvironments"],"mappings":"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"}

package/dist/units/index.d.ts

@@ -3,7 +3,6 @@ import { BaseUnit } from '@macrostrat/api-types';
 import { UnitWithLayoutParameters } from '../prepare-units/helpers.ts';
 export * from './composite';
 export * from './types';
-export * from './colors';
 export declare function UnitsColumn({ width }: {
     width?: number | undefined;
 }): import('react').FunctionComponentElement<import('@macrostrat/column-components').LithologyColumnProps>;

package/dist/units/index.js

@@ -3,13 +3,11 @@ import { useGeologicPattern, useColumnLayout, LithologyColumn } from "@macrostra
 import { UnitNamesColumn } from "./names.js";
 import { UnitBoxes } from "./boxes.js";
 import { useInDarkMode } from "@macrostrat/ui-components";
-import { getMixedUnitColor } from "./colors.js";
-import { flattenLithologies, getMixedColorForData } from "./colors.js";
+import { getBestFGDCPatternForUnit, getMixedUnitColor } from "@macrostrat/stratigraphy-utils";
 import { TrackedLabeledUnit } from "./composite.js";
 import { AnnotatedUnitsColumn, ColumnNotesProvider, CompositeUnitComponent, CompositeUnitsColumn, LabelTrackerProvider, SectionLabelsColumn } from "./composite.js";
 import { useLithologies, useEnvironments } from "@macrostrat/data-provider";
 import { useMemo } from "react";
-import { resolveID } from "./resolvers.js";
 function UnitsColumn({ width = 100 }) {
   return h(LithologyColumn, { width }, h(UnitBoxes));
 }
@@ -49,7 +47,7 @@ function UnitComponent({
   let reducedWidth = _nColumns;
   if ("layout" in division) {
     const layout = division.layout;
-    _nColumns = Math.min(_nColumns, layout.totalColumns);
+    _nColumns = layout.totalColumns;
     columnIx = layout.column;
     reducedWidth = width / layout.totalColumns / layout.nColumns;
     x = columnIx * width / _nColumns;
@@ -73,7 +71,7 @@ function useUnitColor(unit, opts = {}) {
 function ColoredUnitComponent(props) {
   const backgroundColor = useUnitColor(props.division);
   const patternID = useMemo(() => {
-    return resolveID(props.division);
+    return getBestFGDCPatternForUnit(props.division);
   }, [props.division?.unit_id]);
   const fill = useGeologicPattern(patternID);
   return h(UnitComponent, {
@@ -102,7 +100,7 @@ function useUnitColorByEnvironment(unit, opts = {}) {
 function EnvironmentColoredUnitComponent(props) {
   const backgroundColor = useUnitColorByEnvironment(props.division);
   const patternID = useMemo(() => {
-    return resolveID(props.division);
+    return getBestFGDCPatternForUnit(props.division);
   }, [props.division?.unit_id]);
   const fill = useGeologicPattern(patternID);
   return h(UnitComponent, {
@@ -125,9 +123,6 @@ export {
   TrackedLabeledUnit,
   UnitComponent,
   UnitsColumn,
-  flattenLithologies,
-  getMixedColorForData,
-  getMixedUnitColor,
   useUnitColor,
   useUnitColorByEnvironment
 };