Skip to content

Commit ca3bd99

Browse files
committed
Updated column stories renderer
1 parent 66b2a81 commit ca3bd99

File tree

2 files changed

+26
-11
lines changed

2 files changed

+26
-11
lines changed

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,6 @@ function PatternDefsProvider(props: LithProviderProps) {
8787
function useGeologicPattern(patternID: string, fallback: string = "#aaa") {
8888
const ctx1 = useContext(GeologicPatternContext);
8989
const ctx = useContext(PatternDefsContext);
90-
console.log(ctx, ctx1);
9190
const UUID = useUUID();
9291
useEffect(() => {
9392
ctx?.trackPattern(patternID);
Lines changed: 26 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import h from "@macrostrat/hyper";
2-
import type { Meta } from "@storybook/react";
2+
import { Meta, StoryObj } from "@storybook/react";
33
import { useAPIResult } from "@macrostrat/ui-components";
44

55
import { Column, preprocessUnits } from "../src";
@@ -8,7 +8,7 @@ import { PatternProvider } from "@macrostrat/column-components/stories/base-sect
88

99
interface ColumnProps {
1010
id: number;
11-
name: string;
11+
unconformityLabels?: boolean;
1212
}
1313

1414
function useColumnUnits(col_id) {
@@ -21,24 +21,38 @@ function useColumnUnits(col_id) {
2121
);
2222
}
2323

24+
function useColumnBasicInfo(col_id) {
25+
return useAPIResult(
26+
"https://macrostrat.org/api/v2/columns",
27+
{ col_id },
28+
(res) => {
29+
return res.success.data[0];
30+
}
31+
);
32+
}
33+
2434
function BasicColumn(props: ColumnProps) {
35+
const info = useColumnBasicInfo(props.id);
2536
const units = useColumnUnits(props.id);
2637

27-
if (units == null) {
38+
if (units == null || info == null) {
2839
return h(Spinner);
2940
}
3041

31-
console.log(units);
32-
33-
return h(Column, { data: units });
42+
return h("div", [
43+
h("h2", info.col_name),
44+
h(Column, { ...props, data: units }),
45+
]);
3446
}
3547

48+
type Story = StoryObj<typeof BasicColumn>;
49+
3650
const meta: Meta<ColumnProps> = {
3751
title: "Column views/Stratigraphic columns",
3852
component: BasicColumn,
3953
args: {
4054
id: 432,
41-
name: "Western Illinois",
55+
unconformityLabels: true,
4256
},
4357
decorators: [
4458
(Story) => {
@@ -49,8 +63,10 @@ const meta: Meta<ColumnProps> = {
4963

5064
export default meta;
5165

52-
export function WesternIllinois() {
53-
return h(BasicColumn, { id: 432, name: "Western Illinois" });
54-
}
66+
export const Primary: Story = {
67+
args: {
68+
id: 432,
69+
},
70+
};
5571

5672
// More on default export: https://storybook.js.org/docs/react/writing-stories/introduction#default-export

0 commit comments

Comments
 (0)