dineway 0.1.4 → 0.1.6

package/src/components/Table.astro

@@ -2,8 +2,13 @@
 /**
  * Portable Text Table block component
  *
- * Renders tables from WordPress imports.
+ * Renders tables from content imports. Cell content is rendered through the
+ * standard Portable Text pipeline so all marks, including links, are handled
+ * by the registered mark components.
  */
+import { PortableText } from "astro-portabletext";
+import { dinewayMarkComponents } from "./marks.js";
+
 export interface Props {
 	node: {
 		_type: "table";
@@ -32,6 +37,8 @@ export interface Props {
 	};
 }
 
+const markComponents = { mark: dinewayMarkComponents };
+
 const { node } = Astro.props;
 const rows = node?.rows ?? [];
 
@@ -39,45 +46,61 @@ if (!rows.length) {
 	return null;
 }
 
-// Helper to render cell content as text (simplified - doesn't handle marks)
-function renderCellText(
-	content: Array<{ text: string; marks?: string[] }>,
-): string {
-	return content.map((span) => span.text).join("");
+function cellToBlock(cell: Props["node"]["rows"][number]["cells"][number]) {
+	return [
+		{
+			_type: "block" as const,
+			_key: cell._key,
+			children: cell.content,
+			markDefs: cell.markDefs ?? [],
+		},
+	];
 }
----
 
-{() => {
-	const hasHeader = node?.hasHeaderRow;
-	const headerRow = hasHeader ? rows[0] : null;
-	const bodyRows = hasHeader ? rows.slice(1) : rows;
+const hasHeader = node?.hasHeaderRow;
+const headerRow = hasHeader ? rows[0] : null;
+const bodyRows = hasHeader ? rows.slice(1) : rows;
+---
 
-	return (
-		<div class="dineway-table-wrapper">
-			<table class="dineway-table">
-				{headerRow && (
-					<thead>
-						<tr>
-							{headerRow.cells.map((cell) => (
-								<th>{renderCellText(cell.content)}</th>
-							))}
-						</tr>
-					</thead>
-				)}
-				<tbody>
-					{bodyRows.map((row) => (
-						<tr>
-							{row.cells.map((cell) => {
-								const CellTag = cell.isHeader ? "th" : "td";
-								return <CellTag>{renderCellText(cell.content)}</CellTag>;
-							})}
-						</tr>
-					))}
-				</tbody>
-			</table>
-		</div>
-	);
-}}
+<div class="dineway-table-wrapper">
+	<table class="dineway-table">
+		{
+			headerRow && (
+				<thead>
+					<tr>
+						{headerRow.cells.map((cell) => (
+							<th>
+								<PortableText
+									value={cellToBlock(cell)}
+									components={markComponents}
+								/>
+							</th>
+						))}
+					</tr>
+				</thead>
+			)
+		}
+		<tbody>
+			{
+				bodyRows.map((row) => (
+					<tr>
+						{row.cells.map((cell) => {
+							const CellTag = cell.isHeader ? "th" : "td";
+							return (
+								<CellTag>
+									<PortableText
+										value={cellToBlock(cell)}
+										components={markComponents}
+									/>
+								</CellTag>
+							);
+						})}
+					</tr>
+				))
+			}
+		</tbody>
+	</table>
+</div>
 
 <style>
 	.dineway-table-wrapper {
@@ -91,18 +114,22 @@ function renderCellText(
 	}
 	.dineway-table th,
 	.dineway-table td {
-		border: 1px solid #ddd;
+		border: 1px solid var(--color-border, #ddd);
 		padding: 0.75rem;
 		text-align: left;
 	}
+	.dineway-table th :global(p),
+	.dineway-table td :global(p) {
+		margin: 0;
+	}
 	.dineway-table th {
-		background: #f5f5f5;
+		background: var(--color-surface, #f5f5f5);
 		font-weight: 600;
 	}
 	.dineway-table tbody tr:nth-child(even) {
-		background: #fafafa;
+		background: var(--color-bg-subtle, #fafafa);
 	}
 	.dineway-table tbody tr:hover {
-		background: #f0f0f0;
+		background: var(--color-surface, #f0f0f0);
 	}
 </style>

package/src/components/index.ts

@@ -69,11 +69,7 @@ import GalleryComponent from "./Gallery.astro";
 import HtmlBlockComponent from "./HtmlBlock.astro";
 // Pre-configured components object for PortableText
 import ImageComponent from "./Image.astro";
-import LinkMark from "./marks/Link.astro";
-import StrikeThroughMark from "./marks/StrikeThrough.astro";
-import SubscriptMark from "./marks/Subscript.astro";
-import SuperscriptMark from "./marks/Superscript.astro";
-import UnderlineMark from "./marks/Underline.astro";
+import { dinewayMarkComponents } from "./marks.js";
 import PullquoteComponent from "./Pullquote.astro";
 import TableComponent from "./Table.astro";
 
@@ -101,13 +97,7 @@ export const dinewayComponents = {
 		file: FileComponent,
 		pullquote: PullquoteComponent,
 	},
-	mark: {
-		superscript: SuperscriptMark,
-		subscript: SubscriptMark,
-		underline: UnderlineMark,
-		"strike-through": StrikeThroughMark,
-		link: LinkMark,
-	},
+	mark: dinewayMarkComponents,
 };
 
 // Public page contribution components

package/src/components/marks.ts

@@ -0,0 +1,19 @@
+/**
+ * Shared mark component map for Portable Text rendering.
+ *
+ * Used by the top-level `dinewayComponents` config and block components that
+ * render nested inline content through the Portable Text pipeline.
+ */
+import LinkMark from "./marks/Link.astro";
+import StrikeThroughMark from "./marks/StrikeThrough.astro";
+import SubscriptMark from "./marks/Subscript.astro";
+import SuperscriptMark from "./marks/Superscript.astro";
+import UnderlineMark from "./marks/Underline.astro";
+
+export const dinewayMarkComponents = {
+	superscript: SuperscriptMark,
+	subscript: SubscriptMark,
+	underline: UnderlineMark,
+	"strike-through": StrikeThroughMark,
+	link: LinkMark,
+};

package/LICENSE

@@ -1,9 +0,0 @@
-The MIT License
-
-Copyright 2026 Cloudflare Inc.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.