Merge pull request #162 from UW-Macrostrat/info-panel

xDD and Macrostrat linked data update

Author: davidsklar99

packages/map-interface/CHANGELOG.md

@@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file. The format
 is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this
 project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.5.4] - 2025-07-31
+
+- Nested xdd panel expansion option
+- Macrostrat interval links work
+
 ## [1.5.3] - 2025-07-31
 
 Broke apart info panel into 5 components

packages/map-interface/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@macrostrat/map-interface",
-  "version": "1.5.3",
+  "version": "1.5.4",
   "description": "Map interface for Macrostrat",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",

packages/map-interface/src/location-details/location-details.stories.ts

@@ -1,4 +1,4 @@
-import { ComponentStory, ComponentMeta } from "@storybook/react-vite";
+import { ComponentMeta } from "@storybook/react-vite";
 import h from "@macrostrat/hyper";
 import { RegionalStratigraphy } from "./reg-strat";
 import { Physiography } from "./physiography";
@@ -90,7 +90,7 @@ export function xddInfoExample() {
     return null;
   }
 
-  return h(XddExpansion, { xddInfo, expanded: true });
+  return h(XddExpansion, { xddInfo, expanded: true, nestedExpanded: true });
 }
 
 export function FossilsExample() {

packages/map-interface/src/location-details/macrostrat-linked.ts

@@ -57,19 +57,20 @@ function AgeInformation(props) {
   const { source, mapInfo, intervalURL } = props;
   const { macrostrat } = source;
 
-  if (!macrostrat?.b_age) return h(MapAgeRenderer, { mapInfo });
+  if (!macrostrat?.b_age) return h(MapAgeRenderer, { mapInfo, intervalURL });
 
   return h(MacrostratAgeInfo, { macrostrat, mapInfo, intervalURL });
 }
 
 function MapAgeRenderer(props) {
-  const { mapInfo, ...rest } = props;
+  const { mapInfo, intervalURL, ...rest } = props;
   return h(
     DescribedAgeInfo,
     {
       ageElement: h(AgeChip, {
         b_int: mapInfo.mapData[0].b_int,
         t_int: mapInfo.mapData[0].t_int,
+        intervalURL,
       }),
     },
     "Based on geologic map description.",

packages/map-interface/src/location-details/xdd-panel/Journal.tsx

@@ -23,11 +23,12 @@ type JournalProps = {
   articles: XDDSnippet[];
   name: string;
   publisher: string;
+  nestedExpanded?: boolean;
 };
 
 // Still up for review
 function Journal_(props: JournalProps) {
-  const { articles, name, publisher } = props;
+  const { articles, name, publisher, nestedExpanded } = props;
 
   const helpText = articles[0].pubname;
 
@@ -36,6 +37,7 @@ function Journal_(props: JournalProps) {
     {
       title: name,
       helpText: publisher,
+      expanded: nestedExpanded,
     },
     [
       articles.map((article, i) => {

packages/map-interface/src/location-details/xdd-panel/index.ts

@@ -16,16 +16,27 @@ export interface XDDSnippet {
   highlight: string[];
 }
 
-export function XddExpansion({ xddInfo, expanded = false }) {
+export function XddExpansion({
+  xddInfo,
+  expanded = false,
+  nestedExpanded = true,
+}) {
   return h(xDDPanelCore, {
     className: "regional-panel",
     data: xddInfo,
     isFetching: xddInfo == undefined || xddInfo.length === 0,
     expanded,
+    nestedExpanded,
   });
 }
 
-export function xDDPanelCore({ isFetching, data: xddInfo, expanded, ...rest }) {
+export function xDDPanelCore({
+  isFetching,
+  data: xddInfo,
+  expanded,
+  nestedExpanded,
+  ...rest
+}) {
   const groupedData = groupSnippetsByJournal(xddInfo);
 
   console.log("expanded", expanded);
@@ -44,6 +55,7 @@ export function xDDPanelCore({ isFetching, data: xddInfo, expanded, ...rest }) {
       h.if(!isFetching && xddInfo.length > 0)([
         Array.from(groupedData.entries())?.map(([journal, snippets]) => {
           return h(Journal, {
+            nestedExpanded,
             name: journal,
             articles: snippets,
             publisher: snippets[0].publisher,