From 177ded39231dddb785929b230c2eb71143f264e1 Mon Sep 17 00:00:00 2001 From: Xylight Date: Mon, 22 Sep 2025 19:57:03 -0700 Subject: [PATCH] misc: rewrite table/list handling --- src/lib/components/markdown/Markdown.svelte | 52 +++++++----- src/lib/components/markdown/MdTree.svelte | 81 ++++++++++++++++--- .../markdown/renderers/MdList.svelte | 9 +-- .../markdown/renderers/MdListItem.svelte | 10 +++ .../components/markdown/renderers/index.ts | 41 ---------- .../renderers/subtext/MdCodespan.svelte | 11 +++ .../markdown/renderers/subtext/MdDel.svelte | 11 +++ .../markdown/renderers/subtext/MdEm.svelte | 11 +++ .../renderers/subtext/MdStrong.svelte | 11 +++ .../markdown/renderers/table/MdTable.svelte | 55 ++++++++++--- .../renderers/table/MdTableCell.svelte | 10 +-- .../renderers/table/MdTableHead.svelte | 8 +- src/routes/modlog/+page.svelte | 22 +++-- 13 files changed, 217 insertions(+), 115 deletions(-) delete mode 100644 src/lib/components/markdown/renderers/index.ts create mode 100644 src/lib/components/markdown/renderers/subtext/MdCodespan.svelte create mode 100644 src/lib/components/markdown/renderers/subtext/MdDel.svelte create mode 100644 src/lib/components/markdown/renderers/subtext/MdEm.svelte create mode 100644 src/lib/components/markdown/renderers/subtext/MdStrong.svelte diff --git a/src/lib/components/markdown/Markdown.svelte b/src/lib/components/markdown/Markdown.svelte index 1ae8cd48..1dcd1214 100644 --- a/src/lib/components/markdown/Markdown.svelte +++ b/src/lib/components/markdown/Markdown.svelte @@ -1,26 +1,5 @@ {#if type} @@ -29,12 +44,60 @@ {@const Renderer = renderers[type]} {#each tokens as token} - {#if token.tokens && token.tokens.length > 0} - - {:else if token.text} - {decodeHtmlEntities(token.text)} - {:else if text} - {text} + {#if type != 'list' && type != 'table'} + {#if token.tokens && token.tokens.length > 0} + + {:else if token.text} + {decodeHtmlEntities(token.text)} + {:else if text} + {text} + {/if} + {:else if type == 'list' && token.items} + {#each token.items as item} + + {/each} + {:else if type == 'table'} + {@const THead = renderers['tablehead']} + {@const TBody = renderers['tablebody']} + {@const TRow = renderers['tablerow']} + {#if token.header} + + + {#each token.header as heading, index} + + {/each} + + + + {/if} + {#if token.rows} + + {#each token.rows as row} + + {#each row as cell, index} + + {/each} + + {/each} + + {/if} + {console.log($state.snapshot(token))} {/if} {/each} diff --git a/src/lib/components/markdown/renderers/MdList.svelte b/src/lib/components/markdown/renderers/MdList.svelte index 9f1cc376..a0417e60 100644 --- a/src/lib/components/markdown/renderers/MdList.svelte +++ b/src/lib/components/markdown/renderers/MdList.svelte @@ -9,16 +9,11 @@ {#if ordered} -
    +
      {@render children?.()}
    {:else} -