@myst-theme/site 0.5.11 → 0.5.12

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@myst-theme/site",
3
- "version": "0.5.11",
3
+ "version": "0.5.12",
4
4
  "type": "module",
5
5
  "main": "./src/index.ts",
6
6
  "types": "./src/index.ts",
@@ -17,19 +17,19 @@
17
17
  "dependencies": {
18
18
  "@headlessui/react": "^1.7.15",
19
19
  "@heroicons/react": "^2.0.18",
20
- "@myst-theme/common": "^0.5.11",
21
- "@myst-theme/diagrams": "^0.5.11",
22
- "@myst-theme/frontmatter": "^0.5.11",
23
- "@myst-theme/jupyter": "^0.5.11",
24
- "@myst-theme/providers": "^0.5.11",
20
+ "@myst-theme/common": "^0.5.12",
21
+ "@myst-theme/diagrams": "^0.5.12",
22
+ "@myst-theme/frontmatter": "^0.5.12",
23
+ "@myst-theme/jupyter": "^0.5.12",
24
+ "@myst-theme/providers": "^0.5.12",
25
25
  "@radix-ui/react-collapsible": "^1.0.3",
26
26
  "classnames": "^2.3.2",
27
27
  "lodash.throttle": "^4.1.1",
28
- "myst-common": "^1.1.8",
29
- "myst-config": "^1.1.8",
30
- "myst-demo": "^0.5.11",
31
- "myst-spec-ext": "^1.1.8",
32
- "myst-to-react": "^0.5.11",
28
+ "myst-common": "^1.1.12",
29
+ "myst-config": "^1.1.12",
30
+ "myst-demo": "^0.5.12",
31
+ "myst-spec-ext": "^1.1.12",
32
+ "myst-to-react": "^0.5.12",
33
33
  "nbtx": "^0.2.3",
34
34
  "node-cache": "^5.1.2",
35
35
  "node-fetch": "^2.6.11",
@@ -35,11 +35,11 @@ function nestToc(toc: Heading[]): NestedHeading[] {
35
35
  return items;
36
36
  }
37
37
 
38
- function childrenOpen(headings: NestedHeading[], pathname: string): string[] {
38
+ function childrenOpen(headings: NestedHeading[], pathname: string, baseurl?: string): string[] {
39
39
  return headings
40
40
  .map((heading) => {
41
- if (heading.path === pathname) return [heading.id];
42
- const open = childrenOpen(heading.children, pathname);
41
+ if (withBaseurl(heading.path, baseurl) === pathname) return [heading.id];
42
+ const open = childrenOpen(heading.children, pathname, baseurl);
43
43
  if (open.length === 0) return [];
44
44
  return [heading.id, ...open];
45
45
  })
@@ -103,14 +103,14 @@ function LinkItem({
103
103
 
104
104
  const NestedToc = ({ heading }: { heading: NestedHeading }) => {
105
105
  const { pathname } = useLocation();
106
- const startOpen = childrenOpen([heading], pathname).includes(heading.id);
106
+ const baseurl = useBaseurl();
107
+ const startOpen = childrenOpen([heading], pathname, baseurl).includes(heading.id);
107
108
  const nav = useNavigation();
108
- nav.state;
109
109
  const [open, setOpen] = React.useState(startOpen);
110
110
  useEffect(() => {
111
111
  if (nav.state === 'idle') setOpen(startOpen);
112
112
  }, [nav.state]);
113
- const exact = pathname === heading.path;
113
+ const exact = pathname === withBaseurl(heading.path, baseurl);
114
114
  if (!heading.children || heading.children.length === 0) {
115
115
  return (
116
116
  <LinkItem