misc: rewrite table/list handling

This commit is contained in:
Xylight committed 2025-09-22 19:57:03 -07:00
1 parent 248120ed95
commit 177ded3923
13 files changed
+217 -115

No files matched your search

+31 -21
View File
@@ -1,26 +1,5 @@
<script lang="ts" module>
import { marked } from 'marked'
import {
MdCode,
MdHeading,
MdHr,
MdHtml,
MdImage,
MdLink,
MdQuote,
MdList,
MdTable,
MdTableBody,
MdSpoiler,
MdTableCell,
MdTableHead,
MdTableRow,
MdParagraph,
MdListItem,
MdSubscript,
MdSuperscript,
MdText,
} from './renderers/index'
import { linkify, subSupscriptExtension } from './renderers/plugins.js'
import containerExtension from './renderers/spoiler/spoiler.js'
@@ -86,6 +65,10 @@
space: MdParagraph,
list_item: MdListItem,
text: MdText,
em: MdEm,
strong: MdStrong,
del: MdDel,
codespan: MdCodespan,
}
export const inlineRenderers = {
@@ -94,6 +77,10 @@
superscript: MdSuperscript,
text: MdText,
link: MdLink,
em: MdEm,
strong: MdStrong,
del: MdDel,
codespan: MdCodespan,
}
export type Renderer = keyof typeof renderers
@@ -103,6 +90,29 @@
import { setContext } from 'svelte'
import type { ClassValue } from 'svelte/elements'
import MdTree from './MdTree.svelte'
import MdEm from './renderers/subtext/MdEm.svelte'
import MdHeading from './renderers/MdHeading.svelte'
import MdImage from './renderers/MdImage.svelte'
import MdLink from './renderers/MdLink.svelte'
import MdQuote from './renderers/MdQuote.svelte'
import MdHr from './renderers/MdHr.svelte'
import MdHtml from './renderers/MdHtml.svelte'
import MdCode from './renderers/MdCode.svelte'
import MdList from './renderers/MdList.svelte'
import MdSpoiler from './renderers/MdSpoiler.svelte'
import MdTable from './renderers/table/MdTable.svelte'
import MdTableBody from './renderers/table/MdTableBody.svelte'
import MdTableCell from './renderers/table/MdTableCell.svelte'
import MdTableHead from './renderers/table/MdTableHead.svelte'
import MdTableRow from './renderers/table/MdTableRow.svelte'
import MdParagraph from './renderers/MdParagraph.svelte'
import MdListItem from './renderers/MdListItem.svelte'
import MdSubscript from './renderers/MdSubscript.svelte'
import MdSuperscript from './renderers/MdSuperscript.svelte'
import MdText from './renderers/MdText.svelte'
import MdStrong from './renderers/subtext/MdStrong.svelte'
import MdDel from './renderers/subtext/MdDel.svelte'
import MdCodespan from './renderers/subtext/MdCodespan.svelte'
interface RendererOptions {
autoloadImages: boolean
+72 -9
View File
@@ -1,5 +1,5 @@
<script lang="ts">
import { type Token } from 'marked'
import type { Tokens } from 'marked'
import type { Renderer } from './Markdown.svelte'
import Self from './MdTree.svelte'
@@ -8,11 +8,21 @@
type?: Renderer
raw?: string
renderers: any
tokens?: (Token & { tokens?: Token[]; text?: string })[]
tokens?: Tokens.Generic[]
text?: string
align?: string
header?: boolean
}
let { type, tokens = [], renderers, raw, text, ...rest }: Props = $props()
let {
type,
tokens = [],
renderers,
raw,
text,
header,
...rest
}: Props = $props()
function decodeHtmlEntities(input: string) {
return input
@@ -22,6 +32,11 @@
.replace(/&gt;/g, '>')
.replace(/&amp;/g, '&')
}
if (header) {
type = 'tablecell'
console.log(type)
}
</script>
{#if type}
@@ -29,12 +44,60 @@
{@const Renderer = renderers[type]}
<Renderer {...rest} {raw} {text}>
{#each tokens as token}
{#if token.tokens && token.tokens.length > 0}
<Self tokens={token.tokens} {renderers} {...rest} />
{:else if token.text}
{decodeHtmlEntities(token.text)}
{:else if text}
{text}
{#if type != 'list' && type != 'table'}
{#if token.tokens && token.tokens.length > 0}
<Self
tokens={token.tokens as Tokens.Generic[]}
{renderers}
{...rest}
/>
{:else if token.text}
{decodeHtmlEntities(token.text)}
{:else if text}
{text}
{/if}
{:else if type == 'list' && token.items}
{#each token.items as item}
<Self type="list_item" {renderers} tokens={[item]} {...rest} />
{/each}
{:else if type == 'table'}
{@const THead = renderers['tablehead']}
{@const TBody = renderers['tablebody']}
{@const TRow = renderers['tablerow']}
{#if token.header}
<THead>
<TRow>
{#each token.header as heading, index}
<Self
{...rest}
type="tablecell"
{renderers}
tokens={heading.tokens}
align={token.align[index]}
/>
{/each}
</TRow>
</THead>
<!-- <Self {renderers} tokens={token.header} {...rest} /> -->
{/if}
{#if token.rows}
<TBody>
{#each token.rows as row}
<TRow>
{#each row as cell, index}
<Self
{...rest}
type="tablecell"
{renderers}
tokens={cell.tokens}
align={token.align[index]}
/>
{/each}
</TRow>
{/each}
</TBody>
{/if}
{console.log($state.snapshot(token))}
{/if}
{/each}
</Renderer>
@@ -9,16 +9,11 @@
</script>
{#if ordered}
<ol
{start}
class="pl-5 list-decimal *:marker:font-medium *:marker:text-primary-900 dark:*:marker:text-primary-100"
>
<ol {start} class="pl-5 list-decimal">
{@render children?.()}
</ol>
{:else}
<ul
class="list-disc pl-4 *:marker:text-primary-900 dark:*:marker:text-primary-100"
>
<ul class="list-disc pl-8 *:marker:content-['• ']!">
{@render children?.()}
</ul>
{/if}
@@ -5,3 +5,13 @@
<li>
{@render children?.()}
</li>
<style>
@reference '../../../../app.css';
li::marker {
color: var(--color-slate-400);
@variant dark {
color: var(--color-zinc-600);
}
}
</style>
@@ -1,41 +0,0 @@
import MdHeading from './MdHeading.svelte'
import MdImage from './MdImage.svelte'
import MdLink from './MdLink.svelte'
import MdQuote from './MdQuote.svelte'
import MdHr from './MdHr.svelte'
import MdCode from './MdCode.svelte'
import MdHtml from './MdHtml.svelte'
import MdList from './MdList.svelte'
import MdSpoiler from './MdSpoiler.svelte'
import MdTable from './table/MdTable.svelte'
import MdTableBody from './table/MdTableBody.svelte'
import MdTableCell from './table/MdTableCell.svelte'
import MdTableHead from './table/MdTableHead.svelte'
import MdTableRow from './table/MdTableRow.svelte'
import MdParagraph from './MdParagraph.svelte'
import MdListItem from './MdListItem.svelte'
import MdSubscript from './MdSubscript.svelte'
import MdSuperscript from './MdSuperscript.svelte'
import MdText from './MdText.svelte'
export {
MdCode,
MdHeading,
MdHr,
MdHtml,
MdImage,
MdLink,
MdQuote,
MdList,
MdSpoiler,
MdTable,
MdTableBody,
MdTableCell,
MdTableHead,
MdTableRow,
MdParagraph,
MdListItem,
MdSubscript,
MdSuperscript,
MdText,
}
@@ -0,0 +1,11 @@
<script lang="ts">
import type { Snippet } from 'svelte'
interface Props {
children: Snippet
}
let { children }: Props = $props()
</script>
<code>{@render children?.()}</code>
@@ -0,0 +1,11 @@
<script lang="ts">
import type { Snippet } from 'svelte'
interface Props {
children: Snippet
}
let { children }: Props = $props()
</script>
<del>{@render children?.()}</del>
@@ -0,0 +1,11 @@
<script lang="ts">
import type { Snippet } from 'svelte'
interface Props {
children: Snippet
}
let { children }: Props = $props()
</script>
<em>{@render children?.()}</em>
@@ -0,0 +1,11 @@
<script lang="ts">
import type { Snippet } from 'svelte'
interface Props {
children: Snippet
}
let { children }: Props = $props()
</script>
<strong>{@render children?.()}</strong>
@@ -1,13 +1,48 @@
<script>
/**
* @typedef {Object} Props
* @property {import('svelte').Snippet} [children]
*/
/** @type {Props} */
<script lang="ts">
let { children } = $props()
</script>
<table class="overflow-auto w-full table-fixed rounded-xl">
{@render children?.()}
</table>
<div class="overflow-auto w-full table-container">
<table class="w-full table-fixed rounded-xl min-w-md">
{@render children?.()}
</table>
</div>
<style>
@reference "../../../../../app.css";
.table-container {
border: 1px solid var(--color-slate-200);
background-color: white;
border-radius: var(--radius-2xl);
@variant dark {
background-color: var(--color-zinc-950);
border: 1px solid var(--color-zinc-800);
}
}
.table-container table {
table-layout: fixed !important;
:global(thead tr td) {
padding: calc(var(--spacing) * 1.5) calc(var(--spacing) * 3);
border-bottom: 1px solid var(--color-slate-200);
font-weight: var(--font-weight-medium);
font-size: var(--text-base);
background-color: var(--color-slate-25);
@variant dark {
background-color: var(--color-zinc-900);
border-bottom: 1px solid var(--color-zinc-800);
}
}
}
.table-container table {
:global(tbody tr td) {
font-size: var(--text-sm);
padding: calc(var(--spacing) * 1) calc(var(--spacing) * 3);
}
}
</style>
@@ -9,17 +9,11 @@
</script>
{#if header}
<th
class="bg-slate-50 dark:bg-zinc-900 border border-slate-200 dark:border-zinc-800 py-2 px-3"
{align}
>
<th {align}>
{@render children?.()}
</th>
{:else}
<td
class="bg-slate-25 dark:bg-zinc-950 border border-slate-200 dark:border-zinc-800 py-2 px-3"
{align}
>
<td {align}>
{@render children?.()}
</td>
{/if}
@@ -1,10 +1,4 @@
<script>
/**
* @typedef {Object} Props
* @property {import('svelte').Snippet} [children]
*/
/** @type {Props} */
<script lang="ts">
let { children } = $props()
</script>