@myst-theme/site 0.8.1 → 0.8.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@myst-theme/site",
-  "version": "0.8.1",
+  "version": "0.8.3",
   "type": "module",
   "main": "./src/index.ts",
   "types": "./src/index.ts",
@@ -17,19 +17,19 @@
   "dependencies": {
     "@headlessui/react": "^1.7.15",
     "@heroicons/react": "^2.0.18",
-    "@myst-theme/common": "^0.8.1",
-    "@myst-theme/diagrams": "^0.8.1",
-    "@myst-theme/frontmatter": "^0.8.1",
-    "@myst-theme/jupyter": "^0.8.1",
-    "@myst-theme/providers": "^0.8.1",
+    "@myst-theme/common": "^0.8.3",
+    "@myst-theme/diagrams": "^0.8.3",
+    "@myst-theme/frontmatter": "^0.8.3",
+    "@myst-theme/jupyter": "^0.8.3",
+    "@myst-theme/providers": "^0.8.3",
     "@radix-ui/react-collapsible": "^1.0.3",
     "classnames": "^2.3.2",
     "lodash.throttle": "^4.1.1",
-    "myst-common": "^1.1.34",
-    "myst-config": "^1.1.34",
-    "myst-demo": "^0.8.1",
-    "myst-spec-ext": "^1.1.34",
-    "myst-to-react": "^0.8.1",
+    "myst-common": "^1.1.35",
+    "myst-config": "^1.1.35",
+    "myst-demo": "^0.8.3",
+    "myst-spec-ext": "^1.1.35",
+    "myst-to-react": "^0.8.3",
     "nbtx": "^0.2.3",
     "node-cache": "^5.1.2",
     "node-fetch": "^2.6.11",

package/src/pages/Article.tsx

@@ -1,5 +1,5 @@
 import React from 'react';
-import { ReferencesProvider } from '@myst-theme/providers';
+import { ReferencesProvider, useProjectManifest } from '@myst-theme/providers';
 import {
   Bibliography,
   ContentBlocks,
@@ -22,6 +22,24 @@ import {
 } from '@myst-theme/jupyter';
 import { FrontmatterBlock } from '@myst-theme/frontmatter';
 import { extractKnownParts } from '../utils.js';
+import type { SiteAction } from 'myst-config';
+
+/**
+ * Combines the project downloads and the export options
+ */
+function combineDownloads(
+  siteDownloads: SiteAction[] | undefined,
+  pageFrontmatter: PageLoader['frontmatter'],
+) {
+  if (pageFrontmatter.downloads) {
+    return pageFrontmatter.downloads;
+  }
+  // No downloads on the page, combine the exports if they exist
+  if (siteDownloads) {
+    return [...(pageFrontmatter.exports ?? []), ...siteDownloads];
+  }
+  return pageFrontmatter.exports;
+}
 
 export const ArticlePage = React.memo(function ({
   article,
@@ -32,10 +50,11 @@ export const ArticlePage = React.memo(function ({
   hide_all_footer_links?: boolean;
   hideKeywords?: boolean;
 }) {
+  const manifest = useProjectManifest();
   const compute = useComputeOptions();
 
   const { hide_title_block, hide_footer_links } = (article.frontmatter as any)?.options ?? {};
-
+  const downloads = combineDownloads(manifest?.downloads, article.frontmatter);
   const tree = copyNode(article.mdast);
   const keywords = article.frontmatter?.keywords ?? [];
   const parts = extractKnownParts(tree);
@@ -50,7 +69,7 @@ export const ArticlePage = React.memo(function ({
           {!hide_title_block && (
             <FrontmatterBlock
               kind={article.kind}
-              frontmatter={article.frontmatter}
+              frontmatter={{ ...article.frontmatter, downloads }}
               className="pt-5 mb-8"
             />
           )}

package/src/pages/Root.tsx

@@ -1,5 +1,6 @@
 import type { SiteManifest } from 'myst-config';
 import type { SiteLoader } from '@myst-theme/common';
+import type { NodeRenderer } from '@myst-theme/providers';
 import { BaseUrlProvider, SiteProvider, Theme, ThemeProvider } from '@myst-theme/providers';
 import {
   Links,
@@ -12,7 +13,7 @@ import {
   Link,
   NavLink,
 } from '@remix-run/react';
-import { DEFAULT_NAV_HEIGHT, renderers } from '../components/index.js';
+import { DEFAULT_NAV_HEIGHT, renderers as defaultRenderers } from '../components/index.js';
 import { Analytics } from '../seo/index.js';
 import { Error404 } from './Error404.js';
 import classNames from 'classnames';
@@ -26,6 +27,7 @@ export function Document({
   staticBuild,
   baseurl,
   top = DEFAULT_NAV_HEIGHT,
+  renderers = defaultRenderers,
 }: {
   children: React.ReactNode;
   scripts?: React.ReactNode;
@@ -35,6 +37,7 @@ export function Document({
   staticBuild?: boolean;
   baseurl?: string;
   top?: number;
+  renderers?: Record<string, NodeRenderer>;
 }) {
   const links = staticBuild
     ? {

package/src/utils.ts

@@ -17,9 +17,9 @@ export type KnownParts = {
 
 export function extractKnownParts(tree: GenericParent): KnownParts {
   const abstract = extractPart(tree, 'abstract');
-  const summary = extractPart(tree, 'summary');
-  const keypoints = extractPart(tree, 'keypoints');
-  const data_availability = extractPart(tree, 'data_availability');
-  const acknowledgments = extractPart(tree, 'acknowledgments');
+  const summary = extractPart(tree, 'summary', { requireExplicitPart: true });
+  const keypoints = extractPart(tree, ['keypoints'], { requireExplicitPart: true });
+  const data_availability = extractPart(tree, ['data_availability', 'data availability']);
+  const acknowledgments = extractPart(tree, ['acknowledgments', 'acknowledgements']);
   return { abstract, summary, keypoints, data_availability, acknowledgments };
 }