ilyakooo0/urbit
1
0
Fork 0
mirror of https://github.com/ilyakooo0/urbit.git synced 2024-12-01 11:33:41 +03:00
Code Issues Packages Projects Releases Wiki Activity

groups: correctly display blockquote content in full

Browse Source 
as of now, a blockquote would discard any other content after
a URL and would put it on a new line.

eg '> some text https://urbit.org this is urbit' would be rendered as

```
> some text https://urbit.org

this is urbit
```

this commit joins all content inside of a blockquote as one block.
This commit is contained in:
André Fincato 2022-04-18 14:55:03 +02:00
parent 0a03e44632
commit 96482ca99c
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pkg/interface/src/views/landscape/components/Graph/GraphContent.tsx
View File

@ -218,7 +218,7 @@ function getChildren<T extends unknown>(node: T): AstContent[] {
}
export function asParent<T extends BlockContent>(node: T): Parent | undefined {
return ['paragraph', 'heading', 'list', 'listItem', 'table'].includes(
return ['paragraph', 'heading', 'list', 'listItem', 'table', 'blockquote'].includes(
node.type
)
? (node as Parent)
@ -242,6 +242,20 @@ function stitchMerge(a: Root, b: Root) {
children: [...aChildren.slice(0, -1), mergedPara, ...bChildren.slice(1)]
};
}
// example of joining blockquote made of several types
// eg: text, url, text
// this might be a bit naive as we check only for paragraphs
if (lastType === 'blockquote' && bChildren[0]?.type === 'paragraph') {
let grandChildren = getChildren(last(aChildren));
grandChildren[0].children.push(getChildren(last(bChildren))[0]);
return {
...last(aChildren),
children: grandChildren,
};
}
return { ...a, children: [...aChildren, ...bChildren] };
}
@ -260,7 +274,7 @@ function stitchAsts(asts: [StitchMode, GraphAstNode][]) {
return _.reduce(
asts,
([prevMode, ast], [mode, val]): [StitchMode, GraphAstNode] => {
if (prevMode === 'block') {
if (prevMode === 'block' || prevMode === 'inline') {
if (mode === 'inline') {
return [mode, stitchInlineAfterBlock(ast, val?.children ?? [])];
}