@macrostrat/column-views 3.3.5 → 3.4.1

package/dist/unit-details/panel.js.map

@@ -1 +1 @@
-{"version":3,"file":"panel.js","sources":["../../src/unit-details/panel.ts"],"sourcesContent":["import { JSONView } from \"@macrostrat/ui-components\";\nimport { Button, ButtonGroup } from \"@blueprintjs/core\";\nimport { ReactNode, useMemo, useState } from \"react\";\nimport {\n  DataField,\n  EnvironmentsList,\n  isClickable,\n  ItemInteractionProps,\n  ItemList,\n  LithologyList,\n  LithologyTagFeature,\n  MacrostratInteractionManager,\n  MacrostratInteractionProvider,\n  MacrostratItemIdentifier,\n  Parenthetical,\n  useInteractionManager,\n  useInteractionProps,\n  Value,\n} from \"@macrostrat/data-components\";\nimport { useColumnUnitsMap } from \"../data-provider\";\nimport {\n  useMacrostratColumnInfo,\n  useMacrostratData,\n  useMacrostratDefs,\n  useStratNames,\n} from \"@macrostrat/data-provider\";\nimport type {\n  Environment,\n  Interval,\n  Lithology,\n  UnitLithology,\n  UnitLong,\n  UnitLongFull,\n} from \"@macrostrat/api-types\";\nimport { defaultNameFunction } from \"../units/names\";\nimport classNames from \"classnames\";\nimport { AgeField, Duration, IntervalProportions } from \"./age-range\";\nimport { formatRange, formatSignificance } from \"./utils.ts\";\nimport h from \"./panel.module.sass\";\n\nexport interface UnitDetailsPanelProps {\n  unit: any;\n  onClose?: any;\n  className?: string;\n  actions?: ReactNode;\n  hiddenActions?: ReactNode;\n  features?: Set<UnitDetailsFeature>;\n  lithologyFeatures?: Set<LithologyTagFeature>;\n  onSelectUnit?: (unitID: number) => void;\n  onClickItem?: MacrostratItemClickHandler;\n  interactionManager?: MacrostratInteractionManager;\n}\n\nexport function UnitDetailsPanel({\n  unit,\n  onClose,\n  className,\n  features = new Set<UnitDetailsFeature>([\n    UnitDetailsFeature.AdjacentUnits,\n    UnitDetailsFeature.OutcropType,\n    UnitDetailsFeature.JSONToggle,\n    UnitDetailsFeature.DepthRange,\n  ]),\n  lithologyFeatures,\n  actions,\n  hiddenActions = null,\n  onSelectUnit,\n  onClickItem,\n}: UnitDetailsPanelProps) {\n  const [showJSON, setShowJSON] = useState(false);\n\n  let content: ReactNode = null;\n  if (showJSON) {\n    content = h(JSONView, { data: unit, showRoot: false });\n  } else {\n    content = h(UnitDetailsContent, {\n      unit,\n      features,\n      lithologyFeatures,\n      onClickItem,\n    });\n  }\n\n  let title = defaultNameFunction(unit);\n\n  if (features.has(UnitDetailsFeature.JSONToggle)) {\n    hiddenActions = h([\n      h(Button, {\n        icon: \"code\",\n        small: true,\n        minimal: true,\n        key: \"json-view-toggle\",\n        className: classNames(\"json-view-toggle\", { enabled: setShowJSON }),\n        onClick(evt) {\n          setShowJSON(!showJSON);\n          evt.stopPropagation();\n        },\n      }),\n      hiddenActions,\n    ]);\n  }\n\n  const main = h(\"div.unit-details-panel\", { className }, [\n    h(LegendPanelHeader, {\n      onClose,\n      title,\n      id: unit.unit_id,\n      actions,\n      hiddenActions,\n    }),\n    h(\"div.unit-details-content-holder\", content),\n  ]);\n\n  /** Handle unit selection clicks */\n  const clickHandlerForItem = useMemo(() => {\n    if (onSelectUnit == null || onClickItem == null) return null;\n    return (item: MacrostratItemIdentifier) => {\n      if (\"unit_id\" in item && !(\"col_id\" in item)) {\n        // We are selecting a unit within the column\n        return (event: MouseEvent) => {\n          if (onSelectUnit != null) {\n            onSelectUnit(item.unit_id);\n          } else if (onClickItem != null) {\n            console.warn(\n              \"Unit selection: onClickItem is defined but onSelectUnit is not; ignoring click\",\n            );\n          }\n          // Don't allow event to propagate further (e.g., to open a link)\n          event.preventDefault();\n        };\n      }\n      return undefined;\n    };\n  }, [onSelectUnit, onClickItem]);\n\n  if (clickHandlerForItem != null) {\n    // We wrap this in a MacrostratInteractionManager to handle unit selection\n    return h(\n      MacrostratInteractionProvider,\n      {\n        clickHandlerForItem,\n        inherit: true,\n      },\n      main,\n    );\n  }\n\n  return main;\n}\n\nexport function LegendPanelHeader({\n  title,\n  id,\n  onClose,\n  actions = null,\n  hiddenActions,\n}: {\n  title?: string | null;\n  id?: number | null;\n  onClose?: () => void;\n  actions?: ReactNode | null;\n  hiddenActions?: ReactNode | null;\n}) {\n  return h(\"header.legend-panel-header\", [\n    h(\"div.title-container\", [\n      h.if(title != null)(\"h3\", title),\n      h.if(hiddenActions != null)(\n        \"span.hidden-actions-container\",\n        h(\"div.hidden-actions\", hiddenActions),\n      ),\n    ]),\n    h(\"div.spacer\"),\n    h.if(id != null)(\"code.unit-id\", id),\n    h.if(actions != null)(ButtonGroup, { minimal: true }, actions),\n    h.if(onClose != null)(Button, {\n      icon: \"cross\",\n      minimal: true,\n      small: true,\n      onClick() {\n        onClose?.();\n      },\n    }),\n  ]);\n}\n\nexport enum UnitDetailsFeature {\n  AdjacentUnits = \"adjacent-units\",\n  Color = \"color\",\n  OutcropType = \"outcrop-type\",\n  JSONToggle = \"json-toggle\",\n  DepthRange = \"depth-range\",\n  ColumnName = \"column-name\",\n}\n\nexport type MacrostratItemClickHandler = (\n  event: MouseEvent,\n  item:\n    | Lithology\n    | Environment\n    | UnitLong\n    | Interval\n    | { strat_name_id: number },\n) => void;\n\nfunction UnitDetailsContent({\n  unit,\n  lithologyFeatures = new Set([\n    LithologyTagFeature.Proportion,\n    LithologyTagFeature.Attributes,\n  ]),\n  features = new Set<UnitDetailsFeature>([\n    UnitDetailsFeature.AdjacentUnits,\n    UnitDetailsFeature.OutcropType,\n  ]),\n  onClickItem,\n  getItemHref,\n}: {\n  unit: UnitLong;\n  lithologyFeatures?: Set<LithologyTagFeature>;\n  features?: Set<UnitDetailsFeature>;\n  onClickItem?: MacrostratItemClickHandler;\n  getItemHref?: (item: Lithology | Environment | UnitLong) => string | null;\n}) {\n  const lithMap = useMacrostratDefs(\"lithologies\");\n  const envMap = useMacrostratDefs(\"environments\");\n\n  const environments = enhanceEnvironments(unit.environ, envMap);\n  const lithologies = enhanceLithologies(unit.lith ?? [], lithMap);\n\n  let outcropField: ReactNode = null;\n  if (features.has(UnitDetailsFeature.OutcropType)) {\n    // Determine outcrop type\n    let outcrop = unit.outcrop;\n    if (outcrop == \"both\") {\n      outcrop = \"surface and subsurface\";\n    }\n    outcropField = h(DataField, {\n      label: \"Outcrop\",\n      value: outcrop,\n    });\n  }\n\n  let thicknessOrHeightRange: ReactNode = null;\n  const [thickness, thicknessUnit] = getThickness(unit);\n  // Proxy for actual heights in t_pos and b_pos\n  if (\n    features.has(UnitDetailsFeature.DepthRange) &&\n    unit.t_pos != null &&\n    unit.b_pos != null &&\n    unit.min_thick == unit.max_thick && // We have an actual fixed height\n    unit.min_thick != 0 // Not a zero thickness\n  ) {\n    const label = unit.t_pos < unit.b_pos ? \"Depth\" : \"Height\";\n    const u1 = \"m\";\n\n    thicknessOrHeightRange = h(DataField, {\n      unit: u1,\n      label,\n      value: formatRange(unit.b_pos, unit.t_pos),\n      children: h(\n        Parenthetical,\n        h(Value, { value: thickness, unit: thicknessUnit }),\n      ),\n    });\n  }\n  thicknessOrHeightRange ??= h(DataField, {\n    label: \"Thickness\",\n    value: thickness,\n    unit: thicknessUnit,\n  });\n\n  /** We are trying to move away from passing the \"color\" parameter in the API */\n  let colorSwatch: ReactNode = null;\n  if (\"color\" in unit && features.has(UnitDetailsFeature.Color)) {\n    const unit1 = unit as UnitLongFull;\n    colorSwatch = h(\"div.color-swatch\", {\n      style: { backgroundColor: unit1.color },\n    });\n  }\n\n  return h(\"div.unit-details-content\", [\n    h.if(features.has(UnitDetailsFeature.ColumnName))(ColumnNameField, {\n      col_id: unit.col_id,\n    }),\n    thicknessOrHeightRange,\n    h.if(lithologies != null)(LithologyList, {\n      label: \"Lithology\",\n      lithologies: lithologies ?? [],\n      features: lithologyFeatures,\n    }),\n    h(AgeField, { unit }, [\n      h(Parenthetical, h(Duration, { value: unit.b_age - unit.t_age })),\n      h(IntervalProportions, {\n        unit,\n        onClickItem,\n      }),\n    ]),\n    h.if(environments != null)(EnvironmentsList, {\n      environments,\n    }),\n    h.if(unit.strat_name_id != null)(StratNameField, {\n      strat_name_id: unit.strat_name_id,\n    }),\n    outcropField,\n    h.if(features.has(UnitDetailsFeature.AdjacentUnits))([\n      h.if(unit.units_above != null)(\n        DataField,\n        { label: \"Above\" },\n        h(UnitIDList, {\n          units: unit.units_above,\n          showNames: true,\n        }),\n      ),\n      h.if(unit.units_below != null)(\n        DataField,\n        { label: \"Below\" },\n        h(UnitIDList, {\n          units: unit.units_below,\n          showNames: true,\n        }),\n      ),\n    ]),\n    colorSwatch,\n    h(ReferencesField, { refs: unit.refs, inline: true }),\n  ]);\n}\n\nfunction ColumnNameField({\n  col_id,\n  showIdentifier = false,\n}: {\n  col_id: number;\n  showIdentifier?: boolean;\n}) {\n  const colData = useMacrostratColumnInfo(col_id);\n  let inner: any = h(Identifier, { id: col_id });\n  const name = colData?.col_name;\n  if (name != null) {\n    inner = h(\"span.value\", [\n      h(\"span.col-name\", name),\n      h.if(showIdentifier)([\" \", h(Parenthetical, inner)]),\n    ]);\n  }\n\n  return h(\n    DataField,\n    {\n      label: \"Column\",\n    },\n    inner,\n  );\n}\n\nexport function ReferencesField({ refs, className = null, ...rest }) {\n  if (refs == null || refs.length === 0) {\n    return null;\n  }\n\n  return h(\n    DataField,\n    {\n      label: \"References\",\n      className: classNames(\"refs-field\", className),\n      ...rest,\n    },\n    h(BibInfo, { refs }),\n  );\n}\n\nfunction useStratNameData(strat_name_id: number) {\n  const stratNames = useStratNames([strat_name_id]);\n  return stratNames?.[0];\n}\n\nfunction StratNameField(\n  props: {\n    strat_name_id: number;\n    className?: string;\n  } & ItemInteractionProps,\n) {\n  /** Handling for stratigraphic name field */\n  const { strat_name_id, className, ...rest } = props;\n  const data = useStratNameData(strat_name_id);\n\n  const baseInteractionProps = useInteractionProps({ strat_name_id });\n\n  const coreProps = {\n    ...baseInteractionProps,\n    ...rest,\n  };\n\n  let inner: any = h(Identifier, { id: strat_name_id });\n  const name = data?.strat_name_long;\n  if (name != null) {\n    inner = h(\"span.strat-name\", name);\n  }\n\n  const clickable = isClickable(coreProps);\n\n  return h(\n    DataField,\n    {\n      label: \"Stratigraphic name\",\n    },\n    h(\n      clickable ? \"a\" : \"span\",\n      {\n        className: classNames({ clickable }, className),\n        ...coreProps,\n      },\n      inner,\n    ),\n  );\n}\n\nfunction getThickness(unit): [string, string] {\n  let minThickness = unit.min_thick ?? 0;\n  let maxThickness = unit.max_thick ?? unit.min_thick ?? 0;\n  let _unit = \"m\";\n\n  if (minThickness == 0 && maxThickness == 0) {\n    return [\"Unknown\", null];\n  }\n\n  if (minThickness < 0.8 && maxThickness < 1.2) {\n    // Convert to cm\n    minThickness = minThickness * 100;\n    maxThickness = maxThickness * 100;\n    _unit = \"cm\";\n  } else if (minThickness > 800 && maxThickness > 1200) {\n    // Convert to km\n    minThickness = minThickness / 1000;\n    maxThickness = maxThickness / 1000;\n    _unit = \"km\";\n  }\n\n  if (minThickness == maxThickness) {\n    return [formatSignificance(minThickness), _unit];\n  }\n\n  return [formatRange(minThickness, maxThickness), _unit];\n}\n\nexport function ThicknessField({ unit, label = \"Thickness\" }) {\n  const [value, thicknessUnit] = getThickness(unit);\n  return h(DataField, {\n    label,\n    value,\n    unit: thicknessUnit,\n  });\n}\n\nfunction BibInfo({ refs }) {\n  const refData = useMacrostratData(\"refs\", refs);\n\n  if (refData == null || refData.length === 0) {\n    return null;\n  }\n\n  if (refData.length == 1) {\n    return h(Citation, {\n      data: refData[0],\n      tag: \"span\",\n      key: refData[0].ref_id,\n    });\n  }\n\n  return h(\n    \"ul.refs\",\n    refData.map((data, i) =>\n      h(Citation, { data, tag: \"li\", key: data.ref_id }),\n    ),\n  );\n}\n\nfunction Citation({ data, tag = \"p\" }) {\n  return h(tag, { className: \"citation\" }, [\n    h(\"span.authors\", data.author),\n    \", \",\n    h(\"span.year\", data.pub_year),\n    \", \",\n    h(\"span.title\", data.ref),\n  ]);\n}\n\nfunction enhanceEnvironments(\n  environments?: Partial<Environment>[] | null,\n  envMap?: Map<number, Environment> | null,\n) {\n  return environments?.map((env) => {\n    return {\n      ...(envMap?.get(env.environ_id) ?? {}),\n      ...env,\n    };\n  });\n}\n\ntype LithID =\n  | (Partial<Lithology> & Pick<Lithology, \"lith_id\">)\n  | UnitLithology\n  | Lithology;\n\nfunction enhanceLithologies(\n  lithologies?: LithID[] | null,\n  lithMap?: Map<number, any> | null,\n) {\n  return lithologies?.map((lith) => {\n    return {\n      ...(lithMap?.get(lith.lith_id) ?? {}), // get lithology details\n      ...lith, // override with the unit's specific lithology data\n    };\n  });\n}\n\nexport function ClickableText({\n  className,\n  ...rest\n}: {\n  className?: string;\n  children: ReactNode;\n} & ItemInteractionProps) {\n  /** An optionally clickable text element */\n  const clickable = isClickable(rest);\n  const tag = clickable ? \"a\" : \"span\";\n  return h(tag, { className: classNames(className, { clickable }), ...rest });\n}\n\nexport function Identifier({\n  id,\n  className,\n  ...rest\n}: {\n  id: number | string;\n  className?: string;\n} & ItemInteractionProps) {\n  /** An item that displays a numeric identifier, optionally clickable */\n  return h(\n    ClickableText,\n    {\n      className: classNames(\"identifier\", className),\n      ...rest,\n    },\n    id,\n  );\n}\n\ntype UnitInfo = {\n  unitID: number;\n  colID?: number;\n  name?: string;\n};\n\nfunction UnitIDList({ units, showNames = false }) {\n  const unitsMap = useColumnUnitsMap();\n\n  const interactionManager = useInteractionManager();\n\n  const extUnits: UnitInfo[] = useMemo(() => {\n    const u1 = units.filter((d) => d != 0);\n    if (showNames) {\n      return u1.map((unitID) => {\n        const unitData = unitsMap?.get(unitID);\n        let name: string = undefined;\n        if (unitData != null) {\n          name = defaultNameFunction(unitData);\n        }\n        return {\n          unitID,\n          colID: unitData?.col_id,\n          name,\n        };\n      });\n    } else {\n      return u1.map((unitID) => ({ unitID }));\n    }\n  }, [units, unitsMap]);\n\n  if (extUnits.length === 0) {\n    return h(\"span.no-units\", \"None\");\n  }\n\n  return h(\n    ItemList,\n    { className: \"units-list\" },\n    extUnits.map((info) => {\n      return h(\n        \"span.item\",\n        h(UnitIdentifier, {\n          ...info,\n          ...interactionManager?.interactionPropsForItem({\n            unit_id: info.unitID,\n          }),\n        }),\n      );\n    }),\n  );\n}\n\nfunction UnitIdentifier({\n  unitID,\n  colID,\n  name,\n  ...interactionProps\n}: UnitInfo & ItemInteractionProps) {\n  if (name != null) {\n    return h(\n      ClickableText,\n      {\n        className: \"unit-name\",\n        ...interactionProps,\n      },\n      name,\n    );\n  }\n\n  return h(Identifier, {\n    className: \"unit-id\",\n    key: unitID,\n    id: unitID,\n    ...interactionProps,\n  });\n}\n"],"names":["UnitDetailsFeature"],"mappings":"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"}
+{"version":3,"file":"panel.js","sources":["../../src/unit-details/panel.ts"],"sourcesContent":["import { JSONView } from \"@macrostrat/ui-components\";\nimport { Button, ButtonGroup } from \"@blueprintjs/core\";\nimport { ReactNode, useMemo, useState } from \"react\";\nimport {\n  DataField,\n  EnvironmentsList,\n  ItemList,\n  LithologyList,\n  LithologyTagFeature,\n  MacrostratInteractionManager,\n  MacrostratInteractionProvider,\n  MacrostratItemIdentifier,\n  Parenthetical,\n  useInteractionManager,\n  Value,\n} from \"@macrostrat/data-components\";\nimport { useColumnUnitsMap } from \"../data-provider\";\nimport {\n  useMacrostratColumnInfo,\n  useMacrostratData,\n  useMacrostratDefs,\n} from \"@macrostrat/data-provider\";\nimport type {\n  Environment,\n  EnvironmentIdentifier,\n  Interval,\n  Lithology,\n  UnitLong,\n  UnitLongFull,\n} from \"@macrostrat/api-types\";\nimport { defaultNameFunction } from \"../units/names\";\nimport classNames from \"classnames\";\nimport { AgeField, Duration, IntervalProportions } from \"./age-range\";\nimport { formatRange, formatSignificance } from \"./utils.ts\";\nimport h from \"./panel.module.sass\";\nimport { StratNameField } from \"./strat-names.ts\";\nimport { Identifier, UnitIdentifier, UnitInfo } from \"./identifiers.ts\";\nimport { LithologyIdentifier } from \"@macrostrat/api-types/src/lithologies\";\n\nexport interface UnitDetailsPanelProps {\n  unit: any;\n  onClose?: any;\n  className?: string;\n  actions?: ReactNode;\n  hiddenActions?: ReactNode;\n  features?: Set<UnitDetailsFeature>;\n  lithologyFeatures?: Set<LithologyTagFeature>;\n  onSelectUnit?: (unitID: number) => void;\n  onClickItem?: MacrostratItemClickHandler;\n  interactionManager?: MacrostratInteractionManager;\n  showJSON?: boolean;\n}\n\nexport function UnitDetailsPanel({\n  unit,\n  onClose,\n  className,\n  features = new Set<UnitDetailsFeature>([\n    UnitDetailsFeature.AdjacentUnits,\n    UnitDetailsFeature.OutcropType,\n    UnitDetailsFeature.JSONToggle,\n    UnitDetailsFeature.DepthRange,\n  ]),\n  lithologyFeatures,\n  actions,\n  hiddenActions = null,\n  onSelectUnit,\n  onClickItem,\n  showJSON,\n}: UnitDetailsPanelProps) {\n  const [_showJSON, setShowJSON] = useState(false);\n\n  let content: ReactNode = null;\n  if (showJSON ?? _showJSON) {\n    content = h(JSONView, { data: unit, showRoot: false });\n  } else {\n    content = h(UnitDetailsContent, {\n      unit,\n      features,\n      lithologyFeatures,\n      onClickItem,\n    });\n  }\n\n  let title = defaultNameFunction(unit);\n\n  if (features.has(UnitDetailsFeature.JSONToggle)) {\n    hiddenActions = h([\n      h(Button, {\n        icon: \"code\",\n        small: true,\n        minimal: true,\n        key: \"json-view-toggle\",\n        className: classNames(\"json-view-toggle\", { enabled: setShowJSON }),\n        onClick(evt) {\n          setShowJSON(!showJSON);\n          evt.stopPropagation();\n        },\n      }),\n      hiddenActions,\n    ]);\n  }\n\n  const main = h(\"div.unit-details-panel\", { className }, [\n    h(LegendPanelHeader, {\n      onClose,\n      title,\n      id: unit.unit_id,\n      actions,\n      hiddenActions,\n    }),\n    h(\"div.unit-details-content-holder\", content),\n  ]);\n\n  /** Handle unit selection clicks */\n  const clickHandlerForItem = useMemo(() => {\n    if (onSelectUnit == null && onClickItem == null) return null;\n    return (item: MacrostratItemIdentifier) => {\n      if (\"unit_id\" in item && !(\"col_id\" in item)) {\n        // We are selecting a unit within the column\n        return (event: MouseEvent) => {\n          if (onSelectUnit != null) {\n            onSelectUnit(item.unit_id);\n          } else if (onClickItem != null) {\n            console.warn(\n              \"Unit selection: onClickItem is defined but onSelectUnit is not; ignoring click\",\n            );\n          }\n          // Don't allow event to propagate further (e.g., to open a link)\n          event.preventDefault();\n        };\n      }\n      return undefined;\n    };\n  }, [onSelectUnit, onClickItem]);\n\n  if (clickHandlerForItem != null) {\n    // We wrap this in a MacrostratInteractionManager to handle unit selection\n    return h(\n      MacrostratInteractionProvider,\n      {\n        clickHandlerForItem,\n        inherit: true,\n      },\n      main,\n    );\n  }\n\n  return main;\n}\n\nexport function LegendPanelHeader({\n  title,\n  id,\n  onClose,\n  actions = null,\n  hiddenActions,\n}: {\n  title?: string | null;\n  id?: number | null;\n  onClose?: () => void;\n  actions?: ReactNode | null;\n  hiddenActions?: ReactNode | null;\n}) {\n  return h(\"header.legend-panel-header\", [\n    h(\"div.title-container\", [\n      h.if(title != null)(\"h3\", title),\n      h.if(hiddenActions != null)(\n        \"span.hidden-actions-container\",\n        h(\"div.hidden-actions\", hiddenActions),\n      ),\n    ]),\n    h(\"div.spacer\"),\n    h.if(id != null)(\"code.unit-id\", id),\n    h.if(actions != null)(ButtonGroup, { minimal: true }, actions),\n    h.if(onClose != null)(Button, {\n      icon: \"cross\",\n      minimal: true,\n      small: true,\n      onClick() {\n        onClose?.();\n      },\n    }),\n  ]);\n}\n\nexport enum UnitDetailsFeature {\n  AdjacentUnits = \"adjacent-units\",\n  Color = \"color\",\n  OutcropType = \"outcrop-type\",\n  JSONToggle = \"json-toggle\",\n  DepthRange = \"depth-range\",\n  ColumnName = \"column-name\",\n}\n\nexport type MacrostratItemClickHandler = (\n  event: MouseEvent,\n  item:\n    | Lithology\n    | Environment\n    | UnitLong\n    | Interval\n    | { strat_name_id: number },\n) => void;\n\nfunction UnitDetailsContent({\n  unit,\n  lithologyFeatures = new Set([\n    LithologyTagFeature.Proportion,\n    LithologyTagFeature.Attributes,\n  ]),\n  features = new Set<UnitDetailsFeature>([\n    UnitDetailsFeature.AdjacentUnits,\n    UnitDetailsFeature.OutcropType,\n  ]),\n  onClickItem,\n  getItemHref,\n}: {\n  unit: UnitLong;\n  lithologyFeatures?: Set<LithologyTagFeature>;\n  features?: Set<UnitDetailsFeature>;\n  onClickItem?: MacrostratItemClickHandler;\n  getItemHref?: (item: Lithology | Environment | UnitLong) => string | null;\n}) {\n  const lithMap = useMacrostratDefs(\"lithologies\");\n  const envMap = useMacrostratDefs(\"environments\");\n\n  const environments = enhanceEnvironments(unit.environ, envMap);\n  const lithologies = enhanceLithologies(unit.lith ?? [], lithMap);\n\n  let outcropField: ReactNode = null;\n  if (features.has(UnitDetailsFeature.OutcropType)) {\n    // Determine outcrop type\n    let outcrop = unit.outcrop;\n    if (outcrop == \"both\") {\n      outcrop = \"surface and subsurface\";\n    }\n    outcropField = h(DataField, {\n      label: \"Outcrop\",\n      value: outcrop,\n    });\n  }\n\n  let thicknessOrHeightRange: ReactNode = null;\n  const [thickness, thicknessUnit] = getThickness(unit);\n  // Proxy for actual heights in t_pos and b_pos\n  if (\n    features.has(UnitDetailsFeature.DepthRange) &&\n    unit.t_pos != null &&\n    unit.b_pos != null &&\n    unit.min_thick == unit.max_thick && // We have an actual fixed height\n    unit.min_thick != 0 // Not a zero thickness\n  ) {\n    const label = unit.t_pos < unit.b_pos ? \"Depth\" : \"Height\";\n    const u1 = \"m\";\n\n    thicknessOrHeightRange = h(DataField, {\n      unit: u1,\n      label,\n      value: formatRange(unit.b_pos, unit.t_pos),\n      children: h(\n        Parenthetical,\n        h(Value, { value: thickness, unit: thicknessUnit }),\n      ),\n    });\n  }\n  thicknessOrHeightRange ??= h(DataField, {\n    label: \"Thickness\",\n    value: thickness,\n    unit: thicknessUnit,\n  });\n\n  /** We are trying to move away from passing the \"color\" parameter in the API */\n  let colorSwatch: ReactNode = null;\n  if (\"color\" in unit && features.has(UnitDetailsFeature.Color)) {\n    const unit1 = unit as UnitLongFull;\n    colorSwatch = h(\"div.color-swatch\", {\n      style: { backgroundColor: unit1.color },\n    });\n  }\n\n  return h(\"div.unit-details-content\", [\n    h.if(features.has(UnitDetailsFeature.ColumnName))(ColumnNameField, {\n      col_id: unit.col_id,\n    }),\n    thicknessOrHeightRange,\n    h.if(lithologies != null)(LithologyList, {\n      label: \"Lithology\",\n      lithologies: lithologies ?? [],\n      features: lithologyFeatures,\n    }),\n    h(AgeField, { unit }, [\n      h(Parenthetical, h(Duration, { value: unit.b_age - unit.t_age })),\n      h(IntervalProportions, {\n        unit,\n        onClickItem,\n      }),\n    ]),\n    h.if(environments != null)(EnvironmentsList, {\n      environments,\n    }),\n    h.if(unit.strat_name_id != null)(StratNameField, {\n      strat_name_id: unit.strat_name_id,\n    }),\n    outcropField,\n    h.if(features.has(UnitDetailsFeature.AdjacentUnits))([\n      h.if(unit.units_above != null)(\n        DataField,\n        { label: \"Above\" },\n        h(UnitIDList, {\n          units: unit.units_above,\n          showNames: true,\n        }),\n      ),\n      h.if(unit.units_below != null)(\n        DataField,\n        { label: \"Below\" },\n        h(UnitIDList, {\n          units: unit.units_below,\n          showNames: true,\n        }),\n      ),\n    ]),\n    colorSwatch,\n    h(ReferencesField, { refs: unit.refs, inline: true }),\n  ]);\n}\n\nfunction ColumnNameField({\n  col_id,\n  showIdentifier = false,\n}: {\n  col_id: number;\n  showIdentifier?: boolean;\n}) {\n  const colData = useMacrostratColumnInfo(col_id);\n  let inner: any = h(Identifier, { id: col_id });\n  const name = colData?.col_name;\n  if (name != null) {\n    inner = h(\"span.value\", [\n      h(\"span.col-name\", name),\n      h.if(showIdentifier)([\" \", h(Parenthetical, inner)]),\n    ]);\n  }\n\n  return h(\n    DataField,\n    {\n      label: \"Column\",\n    },\n    inner,\n  );\n}\n\nexport function ReferencesField({ refs, className = null, ...rest }) {\n  if (refs == null || refs.length === 0) {\n    return null;\n  }\n\n  return h(\n    DataField,\n    {\n      label: \"References\",\n      className: classNames(\"refs-field\", className),\n      ...rest,\n    },\n    h(BibInfo, { refs }),\n  );\n}\n\nfunction getThickness(unit): [string, string | null] {\n  let minThickness = unit.min_thick ?? 0;\n  let maxThickness = unit.max_thick ?? unit.min_thick ?? 0;\n  let _unit = \"m\";\n\n  if (minThickness == 0 && maxThickness == 0) {\n    return [\"Unknown\", null];\n  }\n\n  if (minThickness < 0.8 && maxThickness < 1.2) {\n    // Convert to cm\n    minThickness = minThickness * 100;\n    maxThickness = maxThickness * 100;\n    _unit = \"cm\";\n  } else if (minThickness > 800 && maxThickness > 1200) {\n    // Convert to km\n    minThickness = minThickness / 1000;\n    maxThickness = maxThickness / 1000;\n    _unit = \"km\";\n  }\n\n  if (minThickness == maxThickness) {\n    return [formatSignificance(minThickness), _unit];\n  }\n\n  return [formatRange(minThickness, maxThickness), _unit];\n}\n\nexport function ThicknessField({ unit, label = \"Thickness\" }) {\n  const [value, thicknessUnit] = getThickness(unit);\n  return h(DataField, {\n    label,\n    value,\n    unit: thicknessUnit,\n  });\n}\n\nfunction BibInfo({ refs }) {\n  const refData = useMacrostratData(\"refs\", refs);\n\n  if (refData == null || refData.length === 0) {\n    return null;\n  }\n\n  if (refData.length == 1) {\n    return h(Citation, {\n      data: refData[0],\n      tag: \"span\",\n      key: refData[0].ref_id,\n    });\n  }\n\n  return h(\n    \"ul.refs\",\n    refData.map((data, i) =>\n      h(Citation, { data, tag: \"li\", key: data.ref_id }),\n    ),\n  );\n}\n\nfunction Citation({ data, tag = \"p\" }) {\n  return h(tag, { className: \"citation\" }, [\n    h(\"span.authors\", data.author),\n    \", \",\n    h(\"span.year\", data.pub_year),\n    \", \",\n    h(\"span.title\", data.ref),\n  ]);\n}\n\nfunction enhanceEnvironments(\n  environments?: EnvironmentIdentifier[] | null,\n  envMap?: Map<number, Environment> | null,\n) {\n  return environments?.map((env) => {\n    return {\n      ...(envMap?.get(env.environ_id) ?? {}),\n      ...env,\n    };\n  });\n}\n\nfunction enhanceLithologies(\n  lithologies?: LithologyIdentifier[] | null,\n  lithMap?: Map<number, any> | null,\n) {\n  return lithologies?.map((lith) => {\n    return {\n      ...(lithMap?.get(lith.lith_id) ?? {}), // get lithology details\n      ...lith, // override with the unit's specific lithology data\n    };\n  });\n}\n\nfunction UnitIDList({ units, showNames = false }) {\n  const unitsMap = useColumnUnitsMap();\n\n  const interactionManager = useInteractionManager();\n\n  const extUnits: UnitInfo[] = useMemo(() => {\n    const u1 = units.filter((d) => d != 0);\n    if (showNames) {\n      return u1.map((unitID) => {\n        const unitData = unitsMap?.get(unitID);\n        let name: string | null = null;\n        if (unitData != null) {\n          name = defaultNameFunction(unitData);\n        }\n        return {\n          unitID,\n          colID: unitData?.col_id,\n          name,\n        };\n      });\n    } else {\n      return u1.map((unitID) => ({ unitID }));\n    }\n  }, [units, unitsMap]);\n\n  if (extUnits.length === 0) {\n    return h(\"span.no-units\", \"None\");\n  }\n\n  return h(\n    ItemList,\n    { className: \"units-list\" },\n    extUnits.map((info) => {\n      return h(\n        \"span.item\",\n        h(UnitIdentifier, {\n          ...info,\n          ...interactionManager?.interactionPropsForItem({\n            unit_id: info.unitID,\n          }),\n        }),\n      );\n    }),\n  );\n}\n"],"names":["UnitDetailsFeature"],"mappings":"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"}

package/dist/unit-details/popover.cjs

@@ -49,8 +49,7 @@ function InteractionBarrier({ children }) {
   );
 }
 function UnitSelectionPopover(props) {
-  const unit = unitSelection.useSelectedUnit();
-  const selectUnit = unitSelection.useUnitSelectionDispatch();
+  const [unit, selectUnit] = unitSelection.useUnitSelection();
   const position = unitSelection.useAtomOverlayPosition();
   if (unit == null) {
     return null;

package/dist/unit-details/popover.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"popover.cjs","sources":["../../src/unit-details/popover.ts"],"sourcesContent":["import hyper from \"@macrostrat/hyper\";\nimport { Popover } from \"@blueprintjs/core\";\nimport styles from \"./popover.module.sass\";\nimport {\n  useAtomOverlayPosition,\n  useSelectedUnit,\n  useUnitSelectionDispatch,\n} from \"../data-provider\";\nimport {\n  UnitDetailsFeature,\n  UnitDetailsPanel,\n  UnitDetailsPanelProps,\n} from \"./panel\";\nimport { Lithology } from \"@macrostrat/api-types\";\nimport { LithologyTagFeature } from \"@macrostrat/data-components\";\nimport classNames from \"classnames\";\n\nconst h = hyper.styled(styles);\n\nexport function UnitDetailsPopover({\n  style,\n  children,\n  viewportPadding = 20,\n}: {\n  style: object;\n  viewportPadding?: number;\n  children: React.ReactNode;\n}) {\n  const content = h(InteractionBarrier, children);\n\n  return h(\n    \"div.popover-main\",\n    {\n      style,\n    },\n    h(\n      Popover,\n      // @ts-ignore\n      {\n        content,\n        isOpen: true,\n        usePortal: false,\n        position: \"right\",\n        modifiers: {\n          preventOverflow: { options: { padding: viewportPadding } },\n        },\n      },\n      h(\"span.popover-target\"),\n    ),\n  );\n}\n\nfunction InteractionBarrier({ children }) {\n  return h(\n    \"div\",\n    {\n      onClick(e) {\n        // Stop events from leaking to the parent\n        e.stopPropagation();\n      },\n    },\n    children,\n  );\n}\n\nexport function UnitSelectionPopover(\n  props: Omit<UnitDetailsPanelProps, \"onSelectUnit\" | \"unit\">,\n) {\n  const unit = useSelectedUnit();\n  const selectUnit = useUnitSelectionDispatch();\n  const position = useAtomOverlayPosition();\n  if (unit == null) {\n    return null;\n  }\n\n  return h(\n    \"div.unit-popover-container\",\n    h(\n      UnitDetailsPopover,\n      {\n        style: {\n          position: \"absolute\",\n          top: position?.y ?? 0,\n          width: position?.width ?? 100,\n          left: position?.x ?? 0,\n          height: position?.height ?? 100,\n        },\n      },\n      h(UnitDetailsPanel, {\n        ...props,\n        unit,\n        className: classNames(\"legend-panel\", props.className),\n        onSelectUnit: (id: number) => {\n          selectUnit(id, null);\n        },\n      }),\n    ),\n  );\n}\n"],"names":["hyper","styles","Popover","useSelectedUnit","useUnitSelectionDispatch","useAtomOverlayPosition","UnitDetailsPanel","classNames"],"mappings":";;;;;;;;;;;AAiBA,MAAM,IAAIA,WAAAA,QAAM,OAAOC,cAAM;AAEtB,SAAS,mBAAmB;AAAA,EACjC;AAAA,EACA;AAAA,EACA,kBAAkB;AACpB,GAIG;AACD,QAAM,UAAU,EAAE,oBAAoB,QAAQ;AAE9C,SAAO;AAAA,IACL;AAAA,IACA;AAAA,MACE;AAAA,IAAA;AAAA,IAEF;AAAA,MACEC,KAAAA;AAAAA;AAAAA,MAEA;AAAA,QACE;AAAA,QACA,QAAQ;AAAA,QACR,WAAW;AAAA,QACX,UAAU;AAAA,QACV,WAAW;AAAA,UACT,iBAAiB,EAAE,SAAS,EAAE,SAAS,kBAAgB;AAAA,QAAE;AAAA,MAC3D;AAAA,MAEF,EAAE,qBAAqB;AAAA,IAAA;AAAA,EACzB;AAEJ;AAEA,SAAS,mBAAmB,EAAE,YAAY;AACxC,SAAO;AAAA,IACL;AAAA,IACA;AAAA,MACE,QAAQ,GAAG;AAET,UAAE,gBAAA;AAAA,MACJ;AAAA,IAAA;AAAA,IAEF;AAAA,EAAA;AAEJ;AAEO,SAAS,qBACd,OACA;AACA,QAAM,OAAOC,cAAAA,gBAAA;AACb,QAAM,aAAaC,cAAAA,yBAAA;AACnB,QAAM,WAAWC,cAAAA,uBAAA;AACjB,MAAI,QAAQ,MAAM;AAChB,WAAO;AAAA,EACT;AAEA,SAAO;AAAA,IACL;AAAA,IACA;AAAA,MACE;AAAA,MACA;AAAA,QACE,OAAO;AAAA,UACL,UAAU;AAAA,UACV,KAAK,UAAU,KAAK;AAAA,UACpB,OAAO,UAAU,SAAS;AAAA,UAC1B,MAAM,UAAU,KAAK;AAAA,UACrB,QAAQ,UAAU,UAAU;AAAA,QAAA;AAAA,MAC9B;AAAA,MAEF,EAAEC,MAAAA,kBAAkB;AAAA,QAClB,GAAG;AAAA,QACH;AAAA,QACA,WAAWC,oBAAAA,QAAW,gBAAgB,MAAM,SAAS;AAAA,QACrD,cAAc,CAAC,OAAe;AAC5B,qBAAW,IAAI,IAAI;AAAA,QACrB;AAAA,MAAA,CACD;AAAA,IAAA;AAAA,EACH;AAEJ;;;"}
+{"version":3,"file":"popover.cjs","sources":["../../src/unit-details/popover.ts"],"sourcesContent":["import hyper from \"@macrostrat/hyper\";\nimport { Popover } from \"@blueprintjs/core\";\nimport styles from \"./popover.module.sass\";\nimport { useAtomOverlayPosition, useUnitSelection } from \"../data-provider\";\nimport {\n  UnitDetailsFeature,\n  UnitDetailsPanel,\n  UnitDetailsPanelProps,\n} from \"./panel\";\nimport { Lithology } from \"@macrostrat/api-types\";\nimport { LithologyTagFeature } from \"@macrostrat/data-components\";\nimport classNames from \"classnames\";\n\nconst h = hyper.styled(styles);\n\nexport function UnitDetailsPopover({\n  style,\n  children,\n  viewportPadding = 20,\n}: {\n  style: object;\n  viewportPadding?: number;\n  children: React.ReactNode;\n}) {\n  const content = h(InteractionBarrier, children);\n\n  return h(\n    \"div.popover-main\",\n    {\n      style,\n    },\n    h(\n      Popover,\n      // @ts-ignore\n      {\n        content,\n        isOpen: true,\n        usePortal: false,\n        position: \"right\",\n        modifiers: {\n          preventOverflow: { options: { padding: viewportPadding } },\n        },\n      },\n      h(\"span.popover-target\"),\n    ),\n  );\n}\n\nfunction InteractionBarrier({ children }) {\n  return h(\n    \"div\",\n    {\n      onClick(e) {\n        // Stop events from leaking to the parent\n        e.stopPropagation();\n      },\n    },\n    children,\n  );\n}\n\nexport function UnitSelectionPopover(\n  props: Omit<UnitDetailsPanelProps, \"onSelectUnit\" | \"unit\">,\n) {\n  const [unit, selectUnit] = useUnitSelection();\n  const position = useAtomOverlayPosition();\n  if (unit == null) {\n    return null;\n  }\n\n  return h(\n    \"div.unit-popover-container\",\n    h(\n      UnitDetailsPopover,\n      {\n        style: {\n          position: \"absolute\",\n          top: position?.y ?? 0,\n          width: position?.width ?? 100,\n          left: position?.x ?? 0,\n          height: position?.height ?? 100,\n        },\n      },\n      h(UnitDetailsPanel, {\n        ...props,\n        unit,\n        className: classNames(\"legend-panel\", props.className),\n        onSelectUnit: (id: number) => {\n          selectUnit(id, null);\n        },\n      }),\n    ),\n  );\n}\n"],"names":["hyper","styles","Popover","useUnitSelection","useAtomOverlayPosition","UnitDetailsPanel","classNames"],"mappings":";;;;;;;;;;;AAaA,MAAM,IAAIA,WAAAA,QAAM,OAAOC,cAAM;AAEtB,SAAS,mBAAmB;AAAA,EACjC;AAAA,EACA;AAAA,EACA,kBAAkB;AACpB,GAIG;AACD,QAAM,UAAU,EAAE,oBAAoB,QAAQ;AAE9C,SAAO;AAAA,IACL;AAAA,IACA;AAAA,MACE;AAAA,IAAA;AAAA,IAEF;AAAA,MACEC,KAAAA;AAAAA;AAAAA,MAEA;AAAA,QACE;AAAA,QACA,QAAQ;AAAA,QACR,WAAW;AAAA,QACX,UAAU;AAAA,QACV,WAAW;AAAA,UACT,iBAAiB,EAAE,SAAS,EAAE,SAAS,kBAAgB;AAAA,QAAE;AAAA,MAC3D;AAAA,MAEF,EAAE,qBAAqB;AAAA,IAAA;AAAA,EACzB;AAEJ;AAEA,SAAS,mBAAmB,EAAE,YAAY;AACxC,SAAO;AAAA,IACL;AAAA,IACA;AAAA,MACE,QAAQ,GAAG;AAET,UAAE,gBAAA;AAAA,MACJ;AAAA,IAAA;AAAA,IAEF;AAAA,EAAA;AAEJ;AAEO,SAAS,qBACd,OACA;AACA,QAAM,CAAC,MAAM,UAAU,IAAIC,+BAAA;AAC3B,QAAM,WAAWC,cAAAA,uBAAA;AACjB,MAAI,QAAQ,MAAM;AAChB,WAAO;AAAA,EACT;AAEA,SAAO;AAAA,IACL;AAAA,IACA;AAAA,MACE;AAAA,MACA;AAAA,QACE,OAAO;AAAA,UACL,UAAU;AAAA,UACV,KAAK,UAAU,KAAK;AAAA,UACpB,OAAO,UAAU,SAAS;AAAA,UAC1B,MAAM,UAAU,KAAK;AAAA,UACrB,QAAQ,UAAU,UAAU;AAAA,QAAA;AAAA,MAC9B;AAAA,MAEF,EAAEC,MAAAA,kBAAkB;AAAA,QAClB,GAAG;AAAA,QACH;AAAA,QACA,WAAWC,oBAAAA,QAAW,gBAAgB,MAAM,SAAS;AAAA,QACrD,cAAc,CAAC,OAAe;AAC5B,qBAAW,IAAI,IAAI;AAAA,QACrB;AAAA,MAAA,CACD;AAAA,IAAA;AAAA,EACH;AAEJ;;;"}

package/dist/unit-details/popover.js

@@ -3,7 +3,7 @@ import { Popover } from "@blueprintjs/core";
 import h$2 from "./popover.module.sass.js";
 import { UnitDetailsPanel } from "./panel.js";
 import classNames from "classnames";
-import { useSelectedUnit, useUnitSelectionDispatch, useAtomOverlayPosition } from "../data-provider/unit-selection.js";
+import { useUnitSelection, useAtomOverlayPosition } from "../data-provider/unit-selection.js";
 const h = h$1.styled(h$2);
 function UnitDetailsPopover({
   style,
@@ -44,8 +44,7 @@ function InteractionBarrier({ children }) {
   );
 }
 function UnitSelectionPopover(props) {
-  const unit = useSelectedUnit();
-  const selectUnit = useUnitSelectionDispatch();
+  const [unit, selectUnit] = useUnitSelection();
   const position = useAtomOverlayPosition();
   if (unit == null) {
     return null;

package/dist/unit-details/popover.js.map

@@ -1 +1 @@
-{"version":3,"file":"popover.js","sources":["../../src/unit-details/popover.ts"],"sourcesContent":["import hyper from \"@macrostrat/hyper\";\nimport { Popover } from \"@blueprintjs/core\";\nimport styles from \"./popover.module.sass\";\nimport {\n  useAtomOverlayPosition,\n  useSelectedUnit,\n  useUnitSelectionDispatch,\n} from \"../data-provider\";\nimport {\n  UnitDetailsFeature,\n  UnitDetailsPanel,\n  UnitDetailsPanelProps,\n} from \"./panel\";\nimport { Lithology } from \"@macrostrat/api-types\";\nimport { LithologyTagFeature } from \"@macrostrat/data-components\";\nimport classNames from \"classnames\";\n\nconst h = hyper.styled(styles);\n\nexport function UnitDetailsPopover({\n  style,\n  children,\n  viewportPadding = 20,\n}: {\n  style: object;\n  viewportPadding?: number;\n  children: React.ReactNode;\n}) {\n  const content = h(InteractionBarrier, children);\n\n  return h(\n    \"div.popover-main\",\n    {\n      style,\n    },\n    h(\n      Popover,\n      // @ts-ignore\n      {\n        content,\n        isOpen: true,\n        usePortal: false,\n        position: \"right\",\n        modifiers: {\n          preventOverflow: { options: { padding: viewportPadding } },\n        },\n      },\n      h(\"span.popover-target\"),\n    ),\n  );\n}\n\nfunction InteractionBarrier({ children }) {\n  return h(\n    \"div\",\n    {\n      onClick(e) {\n        // Stop events from leaking to the parent\n        e.stopPropagation();\n      },\n    },\n    children,\n  );\n}\n\nexport function UnitSelectionPopover(\n  props: Omit<UnitDetailsPanelProps, \"onSelectUnit\" | \"unit\">,\n) {\n  const unit = useSelectedUnit();\n  const selectUnit = useUnitSelectionDispatch();\n  const position = useAtomOverlayPosition();\n  if (unit == null) {\n    return null;\n  }\n\n  return h(\n    \"div.unit-popover-container\",\n    h(\n      UnitDetailsPopover,\n      {\n        style: {\n          position: \"absolute\",\n          top: position?.y ?? 0,\n          width: position?.width ?? 100,\n          left: position?.x ?? 0,\n          height: position?.height ?? 100,\n        },\n      },\n      h(UnitDetailsPanel, {\n        ...props,\n        unit,\n        className: classNames(\"legend-panel\", props.className),\n        onSelectUnit: (id: number) => {\n          selectUnit(id, null);\n        },\n      }),\n    ),\n  );\n}\n"],"names":["hyper","styles"],"mappings":";;;;;;AAiBA,MAAM,IAAIA,IAAM,OAAOC,GAAM;AAEtB,SAAS,mBAAmB;AAAA,EACjC;AAAA,EACA;AAAA,EACA,kBAAkB;AACpB,GAIG;AACD,QAAM,UAAU,EAAE,oBAAoB,QAAQ;AAE9C,SAAO;AAAA,IACL;AAAA,IACA;AAAA,MACE;AAAA,IAAA;AAAA,IAEF;AAAA,MACE;AAAA;AAAA,MAEA;AAAA,QACE;AAAA,QACA,QAAQ;AAAA,QACR,WAAW;AAAA,QACX,UAAU;AAAA,QACV,WAAW;AAAA,UACT,iBAAiB,EAAE,SAAS,EAAE,SAAS,kBAAgB;AAAA,QAAE;AAAA,MAC3D;AAAA,MAEF,EAAE,qBAAqB;AAAA,IAAA;AAAA,EACzB;AAEJ;AAEA,SAAS,mBAAmB,EAAE,YAAY;AACxC,SAAO;AAAA,IACL;AAAA,IACA;AAAA,MACE,QAAQ,GAAG;AAET,UAAE,gBAAA;AAAA,MACJ;AAAA,IAAA;AAAA,IAEF;AAAA,EAAA;AAEJ;AAEO,SAAS,qBACd,OACA;AACA,QAAM,OAAO,gBAAA;AACb,QAAM,aAAa,yBAAA;AACnB,QAAM,WAAW,uBAAA;AACjB,MAAI,QAAQ,MAAM;AAChB,WAAO;AAAA,EACT;AAEA,SAAO;AAAA,IACL;AAAA,IACA;AAAA,MACE;AAAA,MACA;AAAA,QACE,OAAO;AAAA,UACL,UAAU;AAAA,UACV,KAAK,UAAU,KAAK;AAAA,UACpB,OAAO,UAAU,SAAS;AAAA,UAC1B,MAAM,UAAU,KAAK;AAAA,UACrB,QAAQ,UAAU,UAAU;AAAA,QAAA;AAAA,MAC9B;AAAA,MAEF,EAAE,kBAAkB;AAAA,QAClB,GAAG;AAAA,QACH;AAAA,QACA,WAAW,WAAW,gBAAgB,MAAM,SAAS;AAAA,QACrD,cAAc,CAAC,OAAe;AAC5B,qBAAW,IAAI,IAAI;AAAA,QACrB;AAAA,MAAA,CACD;AAAA,IAAA;AAAA,EACH;AAEJ;"}
+{"version":3,"file":"popover.js","sources":["../../src/unit-details/popover.ts"],"sourcesContent":["import hyper from \"@macrostrat/hyper\";\nimport { Popover } from \"@blueprintjs/core\";\nimport styles from \"./popover.module.sass\";\nimport { useAtomOverlayPosition, useUnitSelection } from \"../data-provider\";\nimport {\n  UnitDetailsFeature,\n  UnitDetailsPanel,\n  UnitDetailsPanelProps,\n} from \"./panel\";\nimport { Lithology } from \"@macrostrat/api-types\";\nimport { LithologyTagFeature } from \"@macrostrat/data-components\";\nimport classNames from \"classnames\";\n\nconst h = hyper.styled(styles);\n\nexport function UnitDetailsPopover({\n  style,\n  children,\n  viewportPadding = 20,\n}: {\n  style: object;\n  viewportPadding?: number;\n  children: React.ReactNode;\n}) {\n  const content = h(InteractionBarrier, children);\n\n  return h(\n    \"div.popover-main\",\n    {\n      style,\n    },\n    h(\n      Popover,\n      // @ts-ignore\n      {\n        content,\n        isOpen: true,\n        usePortal: false,\n        position: \"right\",\n        modifiers: {\n          preventOverflow: { options: { padding: viewportPadding } },\n        },\n      },\n      h(\"span.popover-target\"),\n    ),\n  );\n}\n\nfunction InteractionBarrier({ children }) {\n  return h(\n    \"div\",\n    {\n      onClick(e) {\n        // Stop events from leaking to the parent\n        e.stopPropagation();\n      },\n    },\n    children,\n  );\n}\n\nexport function UnitSelectionPopover(\n  props: Omit<UnitDetailsPanelProps, \"onSelectUnit\" | \"unit\">,\n) {\n  const [unit, selectUnit] = useUnitSelection();\n  const position = useAtomOverlayPosition();\n  if (unit == null) {\n    return null;\n  }\n\n  return h(\n    \"div.unit-popover-container\",\n    h(\n      UnitDetailsPopover,\n      {\n        style: {\n          position: \"absolute\",\n          top: position?.y ?? 0,\n          width: position?.width ?? 100,\n          left: position?.x ?? 0,\n          height: position?.height ?? 100,\n        },\n      },\n      h(UnitDetailsPanel, {\n        ...props,\n        unit,\n        className: classNames(\"legend-panel\", props.className),\n        onSelectUnit: (id: number) => {\n          selectUnit(id, null);\n        },\n      }),\n    ),\n  );\n}\n"],"names":["hyper","styles"],"mappings":";;;;;;AAaA,MAAM,IAAIA,IAAM,OAAOC,GAAM;AAEtB,SAAS,mBAAmB;AAAA,EACjC;AAAA,EACA;AAAA,EACA,kBAAkB;AACpB,GAIG;AACD,QAAM,UAAU,EAAE,oBAAoB,QAAQ;AAE9C,SAAO;AAAA,IACL;AAAA,IACA;AAAA,MACE;AAAA,IAAA;AAAA,IAEF;AAAA,MACE;AAAA;AAAA,MAEA;AAAA,QACE;AAAA,QACA,QAAQ;AAAA,QACR,WAAW;AAAA,QACX,UAAU;AAAA,QACV,WAAW;AAAA,UACT,iBAAiB,EAAE,SAAS,EAAE,SAAS,kBAAgB;AAAA,QAAE;AAAA,MAC3D;AAAA,MAEF,EAAE,qBAAqB;AAAA,IAAA;AAAA,EACzB;AAEJ;AAEA,SAAS,mBAAmB,EAAE,YAAY;AACxC,SAAO;AAAA,IACL;AAAA,IACA;AAAA,MACE,QAAQ,GAAG;AAET,UAAE,gBAAA;AAAA,MACJ;AAAA,IAAA;AAAA,IAEF;AAAA,EAAA;AAEJ;AAEO,SAAS,qBACd,OACA;AACA,QAAM,CAAC,MAAM,UAAU,IAAI,iBAAA;AAC3B,QAAM,WAAW,uBAAA;AACjB,MAAI,QAAQ,MAAM;AAChB,WAAO;AAAA,EACT;AAEA,SAAO;AAAA,IACL;AAAA,IACA;AAAA,MACE;AAAA,MACA;AAAA,QACE,OAAO;AAAA,UACL,UAAU;AAAA,UACV,KAAK,UAAU,KAAK;AAAA,UACpB,OAAO,UAAU,SAAS;AAAA,UAC1B,MAAM,UAAU,KAAK;AAAA,UACrB,QAAQ,UAAU,UAAU;AAAA,QAAA;AAAA,MAC9B;AAAA,MAEF,EAAE,kBAAkB;AAAA,QAClB,GAAG;AAAA,QACH;AAAA,QACA,WAAW,WAAW,gBAAgB,MAAM,SAAS;AAAA,QACrD,cAAc,CAAC,OAAe;AAC5B,qBAAW,IAAI,IAAI;AAAA,QACrB;AAAA,MAAA,CACD;AAAA,IAAA;AAAA,EACH;AAEJ;"}

package/dist/unit-details/strat-names.cjs

@@ -0,0 +1,44 @@
+"use strict";
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const dataComponents = require("@macrostrat/data-components");
+const panel_module = require("./panel.module.sass.cjs");
+const classNames = require("classnames");
+const dataProvider = require("@macrostrat/data-provider");
+const identifiers = require("./identifiers.cjs");
+const _interopDefault = (e) => e && e.__esModule ? e : { default: e };
+const classNames__default = /* @__PURE__ */ _interopDefault(classNames);
+function useStratNameData(strat_name_id) {
+  const stratNames = dataProvider.useStratNames([strat_name_id]);
+  return stratNames?.[0];
+}
+function StratNameField(props) {
+  const { strat_name_id, className, ...rest } = props;
+  const data = useStratNameData(strat_name_id);
+  const baseInteractionProps = dataComponents.useInteractionProps({ strat_name_id });
+  const coreProps = {
+    ...baseInteractionProps,
+    ...rest
+  };
+  let inner = panel_module.default(identifiers.Identifier, { id: strat_name_id });
+  const name = data?.strat_name_long;
+  if (name != null) {
+    inner = panel_module.default("span.strat-name", name);
+  }
+  const clickable = dataComponents.isClickable(coreProps);
+  return panel_module.default(
+    dataComponents.DataField,
+    {
+      label: "Stratigraphic name"
+    },
+    panel_module.default(
+      clickable ? "a" : "span",
+      {
+        className: classNames__default.default({ clickable }, className),
+        ...coreProps
+      },
+      inner
+    )
+  );
+}
+exports.StratNameField = StratNameField;
+//# sourceMappingURL=strat-names.cjs.map

package/dist/unit-details/strat-names.cjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"strat-names.cjs","sources":["../../src/unit-details/strat-names.ts"],"sourcesContent":["import {\n  DataField,\n  isClickable,\n  ItemInteractionProps,\n  useInteractionProps,\n} from \"@macrostrat/data-components\";\nimport h from \"./panel.module.sass\";\nimport classNames from \"classnames\";\nimport { useStratNames } from \"@macrostrat/data-provider\";\nimport { Identifier } from \"./identifiers.ts\";\n\nfunction useStratNameData(strat_name_id: number) {\n  const stratNames = useStratNames([strat_name_id]);\n  return stratNames?.[0];\n}\n\nexport function StratNameField(\n  props: {\n    strat_name_id: number;\n    className?: string;\n  } & ItemInteractionProps,\n) {\n  /** Handling for stratigraphic name field */\n  const { strat_name_id, className, ...rest } = props;\n\n  const data = useStratNameData(strat_name_id);\n\n  const baseInteractionProps = useInteractionProps({ strat_name_id });\n\n  const coreProps = {\n    ...baseInteractionProps,\n    ...rest,\n  };\n\n  let inner: any = h(Identifier, { id: strat_name_id });\n  const name = data?.strat_name_long;\n  if (name != null) {\n    inner = h(\"span.strat-name\", name);\n  }\n\n  const clickable = isClickable(coreProps);\n\n  return h(\n    DataField,\n    {\n      label: \"Stratigraphic name\",\n    },\n    h(\n      clickable ? \"a\" : \"span\",\n      {\n        className: classNames({ clickable }, className),\n        ...coreProps,\n      },\n      inner,\n    ),\n  );\n}\n"],"names":["useStratNames","useInteractionProps","h","Identifier","isClickable","DataField","classNames"],"mappings":";;;;;;;;;AAWA,SAAS,iBAAiB,eAAuB;AAC/C,QAAM,aAAaA,aAAAA,cAAc,CAAC,aAAa,CAAC;AAChD,SAAO,aAAa,CAAC;AACvB;AAEO,SAAS,eACd,OAIA;AAEA,QAAM,EAAE,eAAe,WAAW,GAAG,SAAS;AAE9C,QAAM,OAAO,iBAAiB,aAAa;AAE3C,QAAM,uBAAuBC,eAAAA,oBAAoB,EAAE,eAAe;AAElE,QAAM,YAAY;AAAA,IAChB,GAAG;AAAA,IACH,GAAG;AAAA,EAAA;AAGL,MAAI,QAAaC,aAAAA,QAAEC,YAAAA,YAAY,EAAE,IAAI,eAAe;AACpD,QAAM,OAAO,MAAM;AACnB,MAAI,QAAQ,MAAM;AAChB,YAAQD,aAAAA,QAAE,mBAAmB,IAAI;AAAA,EACnC;AAEA,QAAM,YAAYE,eAAAA,YAAY,SAAS;AAEvC,SAAOF,aAAAA;AAAAA,IACLG,eAAAA;AAAAA,IACA;AAAA,MACE,OAAO;AAAA,IAAA;AAAA,IAETH,aAAAA;AAAAA,MACE,YAAY,MAAM;AAAA,MAClB;AAAA,QACE,WAAWI,oBAAAA,QAAW,EAAE,UAAA,GAAa,SAAS;AAAA,QAC9C,GAAG;AAAA,MAAA;AAAA,MAEL;AAAA,IAAA;AAAA,EACF;AAEJ;;"}

package/dist/unit-details/strat-names.d.ts

@@ -0,0 +1,14 @@
+import { ItemInteractionProps } from '@macrostrat/data-components';
+export declare function StratNameField(props: {
+    strat_name_id: number;
+    className?: string;
+} & ItemInteractionProps): import('react').FunctionComponentElement<{
+    label?: string;
+    value?: any;
+    inline?: boolean;
+    showIfEmpty?: boolean;
+    className?: string;
+    children?: any;
+    unit?: string;
+    row?: boolean;
+}>;

package/dist/unit-details/strat-names.js

@@ -0,0 +1,42 @@
+import { useInteractionProps, isClickable, DataField } from "@macrostrat/data-components";
+import h from "./panel.module.sass.js";
+import classNames from "classnames";
+import { useStratNames } from "@macrostrat/data-provider";
+import { Identifier } from "./identifiers.js";
+function useStratNameData(strat_name_id) {
+  const stratNames = useStratNames([strat_name_id]);
+  return stratNames?.[0];
+}
+function StratNameField(props) {
+  const { strat_name_id, className, ...rest } = props;
+  const data = useStratNameData(strat_name_id);
+  const baseInteractionProps = useInteractionProps({ strat_name_id });
+  const coreProps = {
+    ...baseInteractionProps,
+    ...rest
+  };
+  let inner = h(Identifier, { id: strat_name_id });
+  const name = data?.strat_name_long;
+  if (name != null) {
+    inner = h("span.strat-name", name);
+  }
+  const clickable = isClickable(coreProps);
+  return h(
+    DataField,
+    {
+      label: "Stratigraphic name"
+    },
+    h(
+      clickable ? "a" : "span",
+      {
+        className: classNames({ clickable }, className),
+        ...coreProps
+      },
+      inner
+    )
+  );
+}
+export {
+  StratNameField
+};
+//# sourceMappingURL=strat-names.js.map

package/dist/unit-details/strat-names.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"strat-names.js","sources":["../../src/unit-details/strat-names.ts"],"sourcesContent":["import {\n  DataField,\n  isClickable,\n  ItemInteractionProps,\n  useInteractionProps,\n} from \"@macrostrat/data-components\";\nimport h from \"./panel.module.sass\";\nimport classNames from \"classnames\";\nimport { useStratNames } from \"@macrostrat/data-provider\";\nimport { Identifier } from \"./identifiers.ts\";\n\nfunction useStratNameData(strat_name_id: number) {\n  const stratNames = useStratNames([strat_name_id]);\n  return stratNames?.[0];\n}\n\nexport function StratNameField(\n  props: {\n    strat_name_id: number;\n    className?: string;\n  } & ItemInteractionProps,\n) {\n  /** Handling for stratigraphic name field */\n  const { strat_name_id, className, ...rest } = props;\n\n  const data = useStratNameData(strat_name_id);\n\n  const baseInteractionProps = useInteractionProps({ strat_name_id });\n\n  const coreProps = {\n    ...baseInteractionProps,\n    ...rest,\n  };\n\n  let inner: any = h(Identifier, { id: strat_name_id });\n  const name = data?.strat_name_long;\n  if (name != null) {\n    inner = h(\"span.strat-name\", name);\n  }\n\n  const clickable = isClickable(coreProps);\n\n  return h(\n    DataField,\n    {\n      label: \"Stratigraphic name\",\n    },\n    h(\n      clickable ? \"a\" : \"span\",\n      {\n        className: classNames({ clickable }, className),\n        ...coreProps,\n      },\n      inner,\n    ),\n  );\n}\n"],"names":[],"mappings":";;;;;AAWA,SAAS,iBAAiB,eAAuB;AAC/C,QAAM,aAAa,cAAc,CAAC,aAAa,CAAC;AAChD,SAAO,aAAa,CAAC;AACvB;AAEO,SAAS,eACd,OAIA;AAEA,QAAM,EAAE,eAAe,WAAW,GAAG,SAAS;AAE9C,QAAM,OAAO,iBAAiB,aAAa;AAE3C,QAAM,uBAAuB,oBAAoB,EAAE,eAAe;AAElE,QAAM,YAAY;AAAA,IAChB,GAAG;AAAA,IACH,GAAG;AAAA,EAAA;AAGL,MAAI,QAAa,EAAE,YAAY,EAAE,IAAI,eAAe;AACpD,QAAM,OAAO,MAAM;AACnB,MAAI,QAAQ,MAAM;AAChB,YAAQ,EAAE,mBAAmB,IAAI;AAAA,EACnC;AAEA,QAAM,YAAY,YAAY,SAAS;AAEvC,SAAO;AAAA,IACL;AAAA,IACA;AAAA,MACE,OAAO;AAAA,IAAA;AAAA,IAET;AAAA,MACE,YAAY,MAAM;AAAA,MAClB;AAAA,QACE,WAAW,WAAW,EAAE,UAAA,GAAa,SAAS;AAAA,QAC9C,GAAG;AAAA,MAAA;AAAA,MAEL;AAAA,IAAA;AAAA,EACF;AAEJ;"}

package/dist/units/index.cjs

@@ -36,13 +36,26 @@ function BasicUnitComponent({ division, ...rest }) {
     patternID: division.patternID
   });
 }
-function UnitComponent({ division, nColumns = 2, ...rest }) {
+function UnitComponent({
+  division,
+  nColumns = 2,
+  ...rest
+}) {
   const width = rest.width ?? columnComponents.useColumnLayout()?.width;
-  const nOverlappingUnits = division.overlappingUnits?.length ?? 0;
-  const _nColumns = nOverlappingUnits == 0 ? 1 : nColumns;
-  const columnIx = (division.column ?? 0) % _nColumns;
-  const reducedWidth = width / _nColumns;
-  const x = columnIx * width / _nColumns;
+  let _nColumns = nColumns;
+  if (isNaN(_nColumns)) {
+    _nColumns = 2;
+  }
+  let columnIx = 0;
+  let x = 0;
+  let reducedWidth = _nColumns;
+  if ("overlap" in division) {
+    const overlap = division.overlap;
+    _nColumns = Math.min(_nColumns, overlap.nColumns);
+    columnIx = overlap.column;
+    reducedWidth = width / _nColumns;
+    x = columnIx * width / _nColumns;
+  }
   return h__default.default(composite.TrackedLabeledUnit, {
     division,
     ...rest,

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 { Lithology } from \"@macrostrat/api-types\";\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\nexport function UnitComponent({ division, nColumns = 2, ...rest }) {\n  const width = rest.width ?? useColumnLayout()?.width;\n\n  const nOverlappingUnits = division.overlappingUnits?.length ?? 0;\n  const _nColumns = nOverlappingUnits == 0 ? 1 : nColumns;\n  const columnIx = (division.column ?? 0) % _nColumns;\n  const reducedWidth = width / _nColumns;\n  const 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":"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"}
+{"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 { UnitWithDefinedOverlap } 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: UnitWithDefinedOverlap<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 (\"overlap\" in division) {\n    const overlap = division.overlap;\n    _nColumns = Math.min(_nColumns, overlap.nColumns);\n    columnIx = overlap.column;\n    reducedWidth = width / _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":"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"}

package/dist/units/index.d.ts

@@ -1,4 +1,6 @@
 import { ICompositeUnitProps } from './composite';
+import { BaseUnit } from '@macrostrat/api-types';
+import { UnitWithDefinedOverlap } from '../prepare-units/helpers.ts';
 export * from './composite';
 export * from './types';
 export * from './colors';
@@ -9,16 +11,13 @@ export declare function SimpleUnitsColumn(props: ICompositeUnitProps): import('r
 export declare function BasicUnitComponent({ division, ...rest }: {
     [x: string]: any;
     division: any;
-}): import('react').FunctionComponentElement<{
-    [x: string]: any;
-    division: any;
-    nColumns?: number | undefined;
-}>;
-export declare function UnitComponent({ division, nColumns, ...rest }: {
-    [x: string]: any;
-    division: any;
-    nColumns?: number | undefined;
-}): import('react').FunctionComponentElement<{
+}): import('react').FunctionComponentElement<UnitComponentProps<BaseUnit>>;
+interface UnitComponentProps<T extends BaseUnit> {
+    division: UnitWithDefinedOverlap<T> | T;
+    nColumns: number;
+    width?: number;
+}
+export declare function UnitComponent<T extends BaseUnit>({ division, nColumns, ...rest }: UnitComponentProps<T>): import('react').FunctionComponentElement<{
     [x: string]: any;
     division: any;
     nameForDivision?: ((div: any) => any) | undefined;
@@ -27,14 +26,6 @@ interface UnitColorOptions {
     asBackground?: boolean;
 }
 export declare function useUnitColor(unit: any, opts?: UnitColorOptions): string | null;
-export declare function ColoredUnitComponent(props: any): import('react').FunctionComponentElement<{
-    [x: string]: any;
-    division: any;
-    nColumns?: number | undefined;
-}>;
+export declare function ColoredUnitComponent(props: any): import('react').FunctionComponentElement<UnitComponentProps<BaseUnit>>;
 export declare function useUnitColorByEnvironment(unit: any, opts?: UnitColorOptions): string | null;
-export declare function EnvironmentColoredUnitComponent(props: any): import('react').FunctionComponentElement<{
-    [x: string]: any;
-    division: any;
-    nColumns?: number | undefined;
-}>;
+export declare function EnvironmentColoredUnitComponent(props: any): import('react').FunctionComponentElement<UnitComponentProps<BaseUnit>>;

package/dist/units/index.js

@@ -34,13 +34,26 @@ function BasicUnitComponent({ division, ...rest }) {
     patternID: division.patternID
   });
 }
-function UnitComponent({ division, nColumns = 2, ...rest }) {
+function UnitComponent({
+  division,
+  nColumns = 2,
+  ...rest
+}) {
   const width = rest.width ?? useColumnLayout()?.width;
-  const nOverlappingUnits = division.overlappingUnits?.length ?? 0;
-  const _nColumns = nOverlappingUnits == 0 ? 1 : nColumns;
-  const columnIx = (division.column ?? 0) % _nColumns;
-  const reducedWidth = width / _nColumns;
-  const x = columnIx * width / _nColumns;
+  let _nColumns = nColumns;
+  if (isNaN(_nColumns)) {
+    _nColumns = 2;
+  }
+  let columnIx = 0;
+  let x = 0;
+  let reducedWidth = _nColumns;
+  if ("overlap" in division) {
+    const overlap = division.overlap;
+    _nColumns = Math.min(_nColumns, overlap.nColumns);
+    columnIx = overlap.column;
+    reducedWidth = width / _nColumns;
+    x = columnIx * width / _nColumns;
+  }
   return h(TrackedLabeledUnit, {
     division,
     ...rest,

package/dist/units/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","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 { Lithology } from \"@macrostrat/api-types\";\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\nexport function UnitComponent({ division, nColumns = 2, ...rest }) {\n  const width = rest.width ?? useColumnLayout()?.width;\n\n  const nOverlappingUnits = division.overlappingUnits?.length ?? 0;\n  const _nColumns = nOverlappingUnits == 0 ? 1 : nColumns;\n  const columnIx = (division.column ?? 0) % _nColumns;\n  const reducedWidth = width / _nColumns;\n  const 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":[],"mappings":"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"}
+{"version":3,"file":"index.js","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 { UnitWithDefinedOverlap } 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: UnitWithDefinedOverlap<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 (\"overlap\" in division) {\n    const overlap = division.overlap;\n    _nColumns = Math.min(_nColumns, overlap.nColumns);\n    columnIx = overlap.column;\n    reducedWidth = width / _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":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@macrostrat/column-views",
-  "version": "3.3.5",
+  "version": "3.4.1",
   "description": "Data views for Macrostrat stratigraphic columns",
   "repository": {
     "type": "git",
@@ -45,21 +45,21 @@
     "react": "^18.0.0||^19.0.0"
   },
   "dependencies": {
-    "@blueprintjs/core": "^6.11.3",
-    "@macrostrat/api-types": "^1.1.6",
+    "@blueprintjs/core": "^6.14.0",
+    "@macrostrat/api-types": "^1.2.0",
     "@macrostrat/color-utils": "^1.2.2",
-    "@macrostrat/column-components": "^2.0.7",
-    "@macrostrat/data-components": "^1.1.9",
-    "@macrostrat/data-provider": "^1.0.3",
+    "@macrostrat/column-components": "^2.0.8",
+    "@macrostrat/data-components": "^1.1.11",
+    "@macrostrat/data-provider": "^1.0.4",
     "@macrostrat/hyper": "^3.1.1",
-    "@macrostrat/map-interface": "^2.2.5",
-    "@macrostrat/map-styles": "^2.2.2",
-    "@macrostrat/mapbox-react": "^3.2.1",
+    "@macrostrat/map-interface": "^2.2.6",
+    "@macrostrat/map-styles": "^2.2.3",
+    "@macrostrat/mapbox-react": "^3.2.2",
     "@macrostrat/mapbox-utils": "^1.7.4",
-    "@macrostrat/stratigraphy-utils": "^1.2.2",
+    "@macrostrat/stratigraphy-utils": "^1.3.0",
     "@macrostrat/svg-map-components": "^2.0.3",
     "@macrostrat/timescale": "^3.1.3",
-    "@macrostrat/ui-components": "^5.0.9",
+    "@macrostrat/ui-components": "^5.0.10",
     "@turf/boolean-point-in-polygon": "^7.3.2",
     "@turf/buffer": "^7.3.2",
     "@turf/centroid": "^7.3.2",
@@ -82,8 +82,7 @@
     "d3-path": "^3.1.0",
     "d3-scale": "^4.0.2",
     "d3-shape": "^3.2.0",
-    "jotai": "^2.16.0",
-    "jotai-scope": "^0.10.0",
+    "jotai": "^2.20.0",
     "mapbox-gl": "^3.0.0",
     "p-map": "^7.0.4",
     "react-spring": "^9.7.5",
@@ -92,7 +91,8 @@
     "zustand-computed": "^2.0.2"
   },
   "devDependencies": {
-    "@macrostrat/web-components-bundler": "1.0.1"
+    "@macrostrat/web-components-bundler": "1.0.1",
+    "jotai-scope": "^0.11.0"
   },
   "publishConfig": {
     "access": "public"

package/src/column.ts

@@ -118,7 +118,7 @@ export function Column(props: ColumnProps) {
 
   /* Make pixelScale and targetUnitHeight mutually exclusive. PixelScale implies
    * standardization of scales in all sections */
-  let _targetUnitHeight = targetUnitHeight;
+  let _targetUnitHeight: number | null = targetUnitHeight;
   let _minSectionHeight = minSectionHeight;
   let _minPixelScale = minPixelScale;
   if (pixelScale != null) {

package/src/data-provider/unit-selection.ts

@@ -16,6 +16,10 @@ type UnitSelectDispatch = (
   target: HTMLElement | null,
 ) => void;
 
+export function useUnitSelection() {
+  return scope.use(selectedUnitAtom);
+}
+
 export function useUnitSelectionDispatch(): UnitSelectDispatch {
   return scope.useSetAtom(selectedUnitAtom);
 }
@@ -70,6 +74,7 @@ const selectedUnitAtom = atom(
   ): BaseUnit | null => {
     if (!get(allowUnitSelectionAtom)) {
       console.error("Unit selection is disabled.");
+      return null;
     }
 
     let unitID: number | null = null;
@@ -83,8 +88,8 @@ const selectedUnitAtom = atom(
     }
 
     if (unitID != null) {
-      // Verify that the unit exists in the current colum, else throw
       const unitsMap = get(columnUnitsMapAtom);
+      // Verify that the unit exists in the current colum, else throw
       if (!unitsMap?.has(unitID)) {
         throw new Error(
           `Unit with ID ${unitID} not found in current column units.`,
@@ -150,9 +155,8 @@ if (props.onClickedColumn) {
 export function useUnitSelectionTarget(
   unit: IUnit,
 ): [React.RefObject<HTMLElement>, boolean, (evt: Event) => void] {
-  const ref = useRef<HTMLElement>();
-  const selectedUnit = useSelectedUnit();
-  const selectUnit = useUnitSelectionDispatch();
+  const ref = useRef<HTMLElement>(null);
+  const [selectedUnit, selectUnit] = useUnitSelection();
   const selected = selectedUnit?.unit_id == unit.unit_id;
 
   const onClick = useCallback(