Support slot data in the ItemDescription & EnhancedMarkdown components

Author: FileEX

web/src/components/EnhancedMarkdown.astro

@@ -3,33 +3,43 @@ import { Code } from '@astrojs/starlight/components';
 import { marked } from 'marked';
 
 interface Props {
-  content: string;
+  content?: string;
   inline?: boolean;
 }
 
 const { content, inline = false } = Astro.props;
 
+let slotMarkdown = '';
+if (!content && Astro.slots.has('default')) {
+  slotMarkdown = await Astro.slots.render('default');
+}
+
+const rawContent = content ?? slotMarkdown;
+
+if (!rawContent) {
+  throw new Error('EnhancedMarkdown requires content prop or slot content.');
+}
 
 // We shouldn't this as we're now organizing pages in folders
 // TODO let's move away from MediaWiki links in the future
 
 function convertMediaWikiLinks(text: string): string {
   const redirects: Record<string, string> = {
-    'ACL': 'acl',
+    ACL: 'acl',
   };
 
   return text.replace(
     /\[\[([^|\]#]+)(?:#([^\]]+))?(?:\|([^\]]+))?\]\]/g,
     (_, link, hash, text) => {
-      const redirectedLink = redirects[link] ?? link;
-      const url = `/reference/${redirectedLink}${hash ? `#${hash}` : ''}`;
+      const redirected = redirects[link] ?? link;
+      const url = `/reference/${redirected}${hash ? `#${hash}` : ''}`;
       return `[${text || link}](${url})`;
     }
   );
 }
 
-const processedContent = convertMediaWikiLinks(content);
-const tokens = inline ? marked.Lexer.lexInline(processedContent) : marked.lexer(processedContent);
+const processed = convertMediaWikiLinks(rawContent);
+const tokens = inline ? marked.Lexer.lexInline(processed) : marked.lexer(processed);
 ---
 
 {

web/src/components/ItemDescription.astro

@@ -3,24 +3,33 @@ import EnhancedMarkdown from './EnhancedMarkdown.astro';
 import { SITE_CONTRIBUTING_URL } from '@src/content.constants';
 
 interface Props {
-  description: string;
+  description?: string;
   requiresReview?: boolean;
 }
 
 const { description, requiresReview = false } = Astro.props;
 
 let path = Astro.url.pathname;
-// Remove trailing slash if any
 path = path.endsWith('/') ? path.slice(0, -1) : path;
-// Also remove anything before the last slash, effectively removing folders
 path = path.substring(path.lastIndexOf('/'));
+
+const hasSlot = Astro.slots.has('default');
 ---
+
 <div pagefind-weight="6">
   {requiresReview && (
+    <>
       <p style="color: var(--sl-color-orange); font-size: 1.6rem;"><strong>Manual Review Required</strong></p>
       <p style="color: var(--sl-color-orange); font-size: 1.25rem;">Please finish this page using the <a target="_blank" href={"https://wiki.multitheftauto.com/wiki" + path}>corresponding Old Wiki article</a>. Go to <a target="_blank" href={SITE_CONTRIBUTING_URL}>Contribution guidelines</a> for more information.</p>
-      <hr>
+      <hr />
+    </>
   )}
 
-  <EnhancedMarkdown content={description} />
-</div>
+  {description ? (
+    <EnhancedMarkdown content={description} />
+  ) : hasSlot ? (
+    <EnhancedMarkdown>
+      <slot />
+    </EnhancedMarkdown>
+  ) : null}
+</div>