mirror of
https://github.com/larvit/adf-codec.git
synced 2026-11-20 07:05:44 +01:00
Check every list item's attributes before walking any
This commit is contained in:
@@ -331,15 +331,20 @@ function tryList(node: AdfNode, path: ConvertErrorPath, depth: number, writing:
|
|||||||
const items = nodeContent(node)
|
const items = nodeContent(node)
|
||||||
const start = listStart(node, items.length)
|
const start = listStart(node, items.length)
|
||||||
if (start === undefined || items.length === 0) return undefined
|
if (start === undefined || items.length === 0) return undefined
|
||||||
const walked: WalkedItem[] = []
|
// Every item is checked before any is walked: a list giving way to its directive walks them again.
|
||||||
let headroom = Number.POSITIVE_INFINITY
|
const marked: { id: MarkedId; node: AdfNode }[] = []
|
||||||
for (const [offset, item] of items.entries()) {
|
for (const item of items) {
|
||||||
const itemId = item.type === 'listItem' ? markedId(item, [], writing.flavour) : undefined
|
const itemId = item.type === 'listItem' ? markedId(item, [], writing.flavour) : undefined
|
||||||
if (itemId === undefined) return undefined
|
if (itemId === undefined) return undefined
|
||||||
const walk = walkBlocks(nodeContent(item), [...path, 'content', offset], depth + 1, writing)
|
marked.push({ id: itemId, node: item })
|
||||||
|
}
|
||||||
|
const walked: WalkedItem[] = []
|
||||||
|
let headroom = Number.POSITIVE_INFINITY
|
||||||
|
for (const [offset, item] of marked.entries()) {
|
||||||
|
const walk = walkBlocks(nodeContent(item.node), [...path, 'content', offset], depth + 1, writing)
|
||||||
if (!walk.ok) return walk
|
if (!walk.ok) return walk
|
||||||
headroom = Math.min(headroom, walk.value.headroom)
|
headroom = Math.min(headroom, walk.value.headroom)
|
||||||
walked.push({ id: itemId, node: item, walk: walk.value })
|
walked.push({ ...item, walk: walk.value })
|
||||||
}
|
}
|
||||||
const inners = walked.map((item) => {
|
const inners = walked.map((item) => {
|
||||||
const inner = joinBlocks(item.walk.blocks, 'list-item')
|
const inner = joinBlocks(item.walk.blocks, 'list-item')
|
||||||
|
|||||||
Reference in New Issue
Block a user