From 9d183086428f79691a1e2377473c4839ddb3eab6 Mon Sep 17 00:00:00 2001
From: Stefano Pigozzi <me@steffo.eu>
Date: Thu, 21 Jul 2022 18:19:14 +0200
Subject: [PATCH] Make ViewContent a flex-based component

---
 components/events/actions/edit.tsx          | 26 ++++++++++-----------
 components/events/actions/view.module.css   |  3 +++
 components/events/actions/view.tsx          | 16 ++++++++-----
 components/generic/renderers/markdown.tsx   |  7 ++++--
 components/generic/views/content.module.css | 20 +++-------------
 components/generic/views/content.tsx        |  8 +------
 styles/elements.css                         | 13 +++++++++++
 7 files changed, 48 insertions(+), 45 deletions(-)
 create mode 100644 components/events/actions/view.module.css

diff --git a/components/events/actions/edit.tsx b/components/events/actions/edit.tsx
index b3a9f94..1d11eb2 100644
--- a/components/events/actions/edit.tsx
+++ b/components/events/actions/edit.tsx
@@ -28,20 +28,20 @@ export const EventsActionEdit = ({ data, mutate, save, setEditing }: EventsActio
             setEditing(false)
         }}>
             <ViewContent
-                title={
-                    useMemo(
-                        () => (
-                            <input
-                                type="text"
-                                value={name}
-                                onChange={e => mutate((prev) => ({ ...prev!, name: e.target.value }), { revalidate: false })}
-                                placeholder={t("eventNamePlaceholder")}
-                            />
-                        ),
-                        [t, mutate, name]
-                    )
-                }
                 content={<>
+                    <h1>
+                        {useMemo(
+                            () => (
+                                <input
+                                    type="text"
+                                    value={name}
+                                    onChange={e => mutate((prev) => ({ ...prev!, name: e.target.value }), { revalidate: false })}
+                                    placeholder={t("eventNamePlaceholder")}
+                                />
+                            ),
+                            [t, mutate, name]
+                        )}
+                    </h1>
                     {useMemo(
                         () => (
                             <textarea
diff --git a/components/events/actions/view.module.css b/components/events/actions/view.module.css
new file mode 100644
index 0000000..6b3e7b5
--- /dev/null
+++ b/components/events/actions/view.module.css
@@ -0,0 +1,3 @@
+.padAsInput {
+    padding: 10px;
+}
\ No newline at end of file
diff --git a/components/events/actions/view.tsx b/components/events/actions/view.tsx
index 66ce2d5..ebb2cad 100644
--- a/components/events/actions/view.tsx
+++ b/components/events/actions/view.tsx
@@ -2,6 +2,7 @@ import { Event } from "@prisma/client"
 import { memo } from "react"
 import { FestaMarkdownRenderer } from "../../generic/renderers/markdown"
 import { ViewContent } from "../../generic/views/content"
+import style from "./view.module.css"
 
 
 export type EventsActionViewProps = {
@@ -13,12 +14,15 @@ export const EventsActionView = memo(({ data }: EventsActionViewProps) => {
     return (
         <form>
             <ViewContent
-                title={<div style={{ padding: "10px" }}>
-                    {data.name}
-                </div>}
-                content={<div>
-                    <FestaMarkdownRenderer code={data.description} />
-                </div>}
+                content={<>
+                    <h1 className={style.padAsInput}>
+                        {data.name}
+                    </h1>
+                    <FestaMarkdownRenderer
+                        className={style.padAsInput}
+                        code={data.description}
+                    />
+                </>}
             />
         </form>
     )
diff --git a/components/generic/renderers/markdown.tsx b/components/generic/renderers/markdown.tsx
index 81e13a5..8835a06 100644
--- a/components/generic/renderers/markdown.tsx
+++ b/components/generic/renderers/markdown.tsx
@@ -1,7 +1,8 @@
 import { memo } from "react"
 import { default as ReactMarkdown } from "react-markdown"
+import { ReactMarkdownOptions } from "react-markdown/lib/react-markdown"
 
-type FestaMarkdownRendererProps = {
+type FestaMarkdownRendererProps = Omit<ReactMarkdownOptions, "children"> & {
     code: string,
 }
 
@@ -10,9 +11,10 @@ type FestaMarkdownRendererProps = {
  * 
  * Currently, it converts `h1` and `h2` into `h3`, and disables the rendering of `img` elements.
  */
-export const FestaMarkdownRenderer = memo(({ code }: FestaMarkdownRendererProps) => {
+export const FestaMarkdownRenderer = memo(({ code, ...props }: FestaMarkdownRendererProps) => {
     return (
         <ReactMarkdown
+            {...props}
             components={{
                 h1: "h2",  // h1 is reserved for the page name
                 h2: "h3",
@@ -20,6 +22,7 @@ export const FestaMarkdownRenderer = memo(({ code }: FestaMarkdownRendererProps)
                 h4: "h5",
                 h5: "h6",
                 img: undefined, // images reveal the IP of the user to third parties!
+                ...props.components,
             }}
         >
             {code}
diff --git a/components/generic/views/content.module.css b/components/generic/views/content.module.css
index 2c967b6..9170d29 100644
--- a/components/generic/views/content.module.css
+++ b/components/generic/views/content.module.css
@@ -1,25 +1,11 @@
 .viewContent {
-    display: grid;
-    grid-template-areas:
-        "title"
-        "content"
-    ;
-    grid-template-columns: auto;
-    grid-template-rows: auto 1fr;
+    display: flex;
+    flex-direction: column;
 
     gap: 4px;
 
-    justify-content: stretch;
+    align-content: stretch;
 
     max-width: 800px;
     margin: 0 auto;
-}
-
-.viewContentTitle {
-    grid-area: title;
-    text-align: center;
-}
-
-.viewContentContent {
-    grid-area: content;
 }
\ No newline at end of file
diff --git a/components/generic/views/content.tsx b/components/generic/views/content.tsx
index 447cce3..33e1c06 100644
--- a/components/generic/views/content.tsx
+++ b/components/generic/views/content.tsx
@@ -3,7 +3,6 @@ import style from "./content.module.css"
 
 
 export type ViewContentProps = {
-    title: ReactNode
     content: ReactNode
 }
 
@@ -13,12 +12,7 @@ export type ViewContentProps = {
 export const ViewContent = memo((props: ViewContentProps) => {
     return (
         <main className={style.viewContent}>
-            <h1 className={style.viewContentTitle}>
-                {props.title}
-            </h1>
-            <div className={style.viewContentContent}>
-                {props.content}
-            </div>
+            {props.content}
         </main>
     )
 })
diff --git a/styles/elements.css b/styles/elements.css
index 85df956..ee8651b 100644
--- a/styles/elements.css
+++ b/styles/elements.css
@@ -19,6 +19,10 @@ h1, h2, h3, h4, h5, h6 {
     margin: 0;
 }
 
+h1 {
+    text-align: center;
+}
+
 a {
     color: var(--anchor);
 }
@@ -70,8 +74,17 @@ textarea {
     border-radius: 16px 16px 0 16px;
 
     resize: vertical;
+    margin: 0;
 }
 
 pre {
     white-space: pre-wrap;
+}
+
+p:first-child {
+    margin-top: 0;
+}
+
+p:last-child {
+    margin-bottom: 0;
 }
\ No newline at end of file