From 5c00b8034b752ba8d49a5365dfbb78599743143c Mon Sep 17 00:00:00 2001
From: Mitchell Christ <mitchell@human.mareketing>
Date: Fri, 11 Oct 2024 11:03:13 -0700
Subject: [PATCH] Richtext module adjustments

---
 package.json                              |  2 +-
 sanity/schemas/modules/richtext-module.ts | 13 +++++++++++++
 src/styles/app.css                        |  1 -
 src/ui/Announcement.tsx                   |  6 +++---
 src/ui/modules/RichtextModule/index.tsx   | 20 ++++++++++++++++----
 5 files changed, 33 insertions(+), 9 deletions(-)

diff --git a/package.json b/package.json
index 726ab03..743013c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "sanitypress",
-	"version": "4.9.3",
+	"version": "4.9.4",
 	"description": "A Next.js + Sanity.io Starter Template",
 	"author": "nuotsu <mitchell@nuotsu.dev> (https://nuotsu.dev)",
 	"license": "ISC",
diff --git a/sanity/schemas/modules/richtext-module.ts b/sanity/schemas/modules/richtext-module.ts
index abf9b84..f259224 100644
--- a/sanity/schemas/modules/richtext-module.ts
+++ b/sanity/schemas/modules/richtext-module.ts
@@ -13,6 +13,12 @@ export default defineType({
 		{ name: 'options', title: 'Options' },
 	],
 	fields: [
+		defineField({
+			name: 'uid',
+			title: 'Unique Identifier',
+			type: 'uid',
+			group: 'options',
+		}),
 		defineField({
 			name: 'content',
 			type: 'array',
@@ -46,6 +52,13 @@ export default defineType({
 			initialValue: 'right',
 			group: 'options',
 		}),
+		defineField({
+			name: 'stretch',
+			type: 'boolean',
+			initialValue: false,
+			hidden: ({ parent }) => parent.tableOfContents,
+			group: 'options',
+		}),
 	],
 	preview: {
 		select: {
diff --git a/src/styles/app.css b/src/styles/app.css
index 5076bdc..280c968 100644
--- a/src/styles/app.css
+++ b/src/styles/app.css
@@ -123,7 +123,6 @@
 	.is-external::after {
 		content: ' ↗';
 		font-size: 0.7em;
-		vertical-align: top;
 	}
 
 	/* layout */
diff --git a/src/ui/Announcement.tsx b/src/ui/Announcement.tsx
index 6e5f13c..b513b7f 100644
--- a/src/ui/Announcement.tsx
+++ b/src/ui/Announcement.tsx
@@ -27,12 +27,12 @@ export default async function Announcement() {
 	if (!active) return null
 
 	return (
-		<aside className="flex items-center justify-center gap-x-4 bg-accent p-2 text-center text-canvas max-md:text-sm md:gap-x-6">
-			<div className="anim-fade-to-r [&_a]:link text-balance">
+		<aside className="flex items-center justify-center gap-x-4 text-balance bg-accent p-2 text-center text-canvas max-md:text-sm md:gap-x-6">
+			<div className="anim-fade-to-r [&_a]:link">
 				<PortableText value={active.content} />
 			</div>
 
-			<CTA className="link anim-fade-to-l shrink-0" link={active.cta} />
+			<CTA className="link anim-fade-to-l shrink" link={active.cta} />
 		</aside>
 	)
 }
diff --git a/src/ui/modules/RichtextModule/index.tsx b/src/ui/modules/RichtextModule/index.tsx
index 1c5cc0c..da33388 100644
--- a/src/ui/modules/RichtextModule/index.tsx
+++ b/src/ui/modules/RichtextModule/index.tsx
@@ -1,3 +1,4 @@
+import moduleProps from '@/lib/moduleProps'
 import TableOfContents from './TableOfContents'
 import Content from './Content'
 import { cn } from '@/lib/utils'
@@ -7,24 +8,30 @@ export default function RichtextModule({
 	content,
 	tableOfContents,
 	tocPosition = 'right',
+	stretch,
 	headings,
+	...props
 }: Partial<{
 	content: any
 	tableOfContents: boolean
 	tocPosition: 'left' | 'right'
+	stretch: boolean
 	headings: {
 		style: string
 		text: string
 	}[]
-}>) {
-	const tocRight = tableOfContents && stegaClean(tocPosition) === 'right'
+}> &
+	Sanity.Module) {
+	const tocRight = stegaClean(tocPosition) === 'right'
 
 	return (
 		<section
 			className={cn(
 				'section grid gap-8',
-				tocRight ? 'lg:grid-cols-[1fr,auto]' : 'lg:grid-cols-[auto,1fr]',
+				tableOfContents &&
+					(tocRight ? 'lg:grid-cols-[1fr,auto]' : 'lg:grid-cols-[auto,1fr]'),
 			)}
+			{...moduleProps(props)}
 		>
 			{tableOfContents && (
 				<aside
@@ -37,7 +44,12 @@ export default function RichtextModule({
 				</aside>
 			)}
 
-			<Content value={content} className="max-w-screen-lg" />
+			<Content
+				value={content}
+				className={cn(
+					!tableOfContents && (stretch ? 'max-w-screen-lg' : 'max-w-screen-md'),
+				)}
+			/>
 		</section>
 	)
 }