From 81c60feed960ba0f7c3a2e062c7e274e69699bb9 Mon Sep 17 00:00:00 2001
From: Gregor Lohaus <lohausgregor@gmail.com>
Date: Fri, 19 Jun 2026 14:48:38 +0200
Subject: [PATCH] mdx layout components

---
 src/app/_components/MdeFormField.tsx          | 25 ------------
 .../_components/MdxComponentReference.tsx     | 20 ++++++++++
 .../_components/useMdxEditorFieldProps.tsx    | 21 ++++++++++
 src/app/cv/page.tsx                           |  2 +-
 src/app/projects/page.tsx                     |  2 +-
 src/components/mdx-components.tsx             | 38 ++++++++++++++++++-
 6 files changed, 80 insertions(+), 28 deletions(-)
 delete mode 100644 src/app/_components/MdeFormField.tsx

diff --git a/src/app/_components/MdeFormField.tsx b/src/app/_components/MdeFormField.tsx
deleted file mode 100644
index 1e06a66..0000000
--- a/src/app/_components/MdeFormField.tsx
+++ /dev/null
@@ -1,25 +0,0 @@
-import MDEditor from "@uiw/react-md-editor";
-import type { Control, FieldValues, Path } from "react-hook-form";
-import { FormControl, FormField, FormItem, FormLabel } from "~/components/ui/form";
-export default function MdeFormField<T extends FieldValues>(params: { control: Control<T>, name: Path<T>, label: string, dataColorMode: "dark"|"light" }) {
-  return (
-    <FormField
-      control={params.control}
-      name={params.name}
-      render={({ field }) => (
-        <FormItem>
-          <FormLabel>
-            {params.label}
-          </FormLabel>
-          <FormControl>
-            <MDEditor
-              value={field.value ? field.value : ""}
-              onChange={field.onChange}
-              data-color-mode={params.dataColorMode}
-            />
-          </FormControl>
-        </FormItem>
-      )}
-    />
-  )
-}
diff --git a/src/app/admin/_components/MdxComponentReference.tsx b/src/app/admin/_components/MdxComponentReference.tsx
index e44f65a..2253f94 100644
--- a/src/app/admin/_components/MdxComponentReference.tsx
+++ b/src/app/admin/_components/MdxComponentReference.tsx
@@ -44,6 +44,26 @@ External resource
   alt="Describe the image"
   caption="Optional caption"
 />`,
+  },
+  {
+    name: "Layout / Row / Column",
+    description: "Border-less flex layout. Columns sit side by side and wrap when narrow.",
+    code: `<Layout>
+<Row>
+<Column>
+
+- First list item
+- Second list item
+
+</Column>
+<Column>
+
+- Another list
+- Side by side
+
+</Column>
+</Row>
+</Layout>`,
   },
   {
     name: "PullQuote",
diff --git a/src/app/admin/_components/useMdxEditorFieldProps.tsx b/src/app/admin/_components/useMdxEditorFieldProps.tsx
index b479d15..1edb793 100644
--- a/src/app/admin/_components/useMdxEditorFieldProps.tsx
+++ b/src/app/admin/_components/useMdxEditorFieldProps.tsx
@@ -73,6 +73,27 @@ const mdxAutocompleteSuggestions: MdeAutocompleteSuggestion[] = [
     group: 'Component',
     trigger: '<',
   },
+  {
+    label: 'Layout',
+    value: `<Layout>\n<Row>\n<Column>\n${AUTOCOMPLETE_CURSOR_MARKER}\n</Column>\n<Column>\n\n</Column>\n</Row>\n</Layout>`,
+    detail: 'Flex layout wrapper with side-by-side, wrapping columns.',
+    group: 'Component',
+    trigger: '<',
+  },
+  {
+    label: 'Row',
+    value: `<Row>\n<Column>\n${AUTOCOMPLETE_CURSOR_MARKER}\n</Column>\n<Column>\n\n</Column>\n</Row>`,
+    detail: 'Side-by-side columns that wrap when narrow.',
+    group: 'Component',
+    trigger: '<',
+  },
+  {
+    label: 'Column',
+    value: `<Column>\n${AUTOCOMPLETE_CURSOR_MARKER}\n</Column>`,
+    detail: 'Vertically stacked column within a Row.',
+    group: 'Component',
+    trigger: '<',
+  },
   {
     label: 'PullQuote',
     value: `<PullQuote>\n${AUTOCOMPLETE_CURSOR_MARKER}\n</PullQuote>`,
diff --git a/src/app/cv/page.tsx b/src/app/cv/page.tsx
index caf9f82..4f09abb 100644
--- a/src/app/cv/page.tsx
+++ b/src/app/cv/page.tsx
@@ -24,7 +24,7 @@ export default async function CvPage() {
           components={mdxComponents}
           options={{
             mdxOptions: {
-              format: "md",
+              format: "mdx",
               remarkPlugins: [remarkGfm],
               rehypePlugins: [rehypeHighlight],
             },
diff --git a/src/app/projects/page.tsx b/src/app/projects/page.tsx
index 8ea2bf4..7f8cc9b 100644
--- a/src/app/projects/page.tsx
+++ b/src/app/projects/page.tsx
@@ -23,7 +23,7 @@ export default async function ProjectsPage() {
         components={mdxComponents}
         options={{
           mdxOptions: {
-            format: "md",
+            format: "mdx",
             remarkPlugins: [remarkGfm],
             rehypePlugins: [rehypeHighlight],
           },
diff --git a/src/components/mdx-components.tsx b/src/components/mdx-components.tsx
index f86a445..05908a0 100644
--- a/src/components/mdx-components.tsx
+++ b/src/components/mdx-components.tsx
@@ -111,6 +111,31 @@ function Img({ src, alt, title }: { src: string; alt?: string; title?: string })
   return <img src={src} alt={alt ?? ""} className="w-full rounded-md border object-cover" />;
 }
 
+// Composable, border-less flex layout primitives for MDX.
+//
+//   <Layout>        — section wrapper, stacks its children with spacing
+//     <Row>         — lays children side by side, wraps when too narrow
+//       <Column>    — stacks its own children vertically
+//
+// Row/Column nest freely. A Row sizes its direct children into equal,
+// flex-growing tracks with a min width, so two lists/Columns sit side by
+// side and drop to stacked once they can't keep ~16rem each.
+function Layout({ children }: { children: ReactNode }) {
+  return <div className="my-6 flex flex-col gap-6 [&>*]:my-0">{children}</div>;
+}
+
+function Row({ children }: { children: ReactNode }) {
+  return (
+    <div className="flex flex-wrap gap-x-8 gap-y-4 [&>*]:mt-0 [&>*]:min-w-[16rem] [&>*]:flex-1">
+      {children}
+    </div>
+  );
+}
+
+function Column({ children }: { children: ReactNode }) {
+  return <div className="flex min-w-0 flex-col gap-2 [&>*]:my-0">{children}</div>;
+}
+
 function PullQuote({ children }: { children: ReactNode }) {
   return (
     <blockquote className="border-primary my-8 border-l-4 pl-5 text-xl leading-8 font-medium">
@@ -135,7 +160,15 @@ function ExternalLink(props: ComponentPropsWithoutRef<"a">) {
   );
 }
 
-const blockComponents = new Set<unknown>([Callout, Figure, PullQuote, TagList]);
+const blockComponents = new Set<unknown>([
+  Callout,
+  Column,
+  Figure,
+  Layout,
+  PullQuote,
+  Row,
+  TagList,
+]);
 
 function Paragraph({ children }: { children: ReactNode }) {
   const containsBlockComponent = Children.toArray(children).some(
@@ -153,9 +186,12 @@ export const mdxComponents = {
   Badge,
   ButtonLink,
   Callout,
+  Column,
   Figure,
   img: Img,
+  Layout,
   Lead,
   PullQuote,
+  Row,
   TagList,
 };