diff options
Diffstat (limited to 'util')
| -rw-r--r-- | util/processOrg.tsx | 146 | ||||
| -rw-r--r-- | util/uniorg.tsx | 9 |
2 files changed, 116 insertions, 39 deletions
diff --git a/util/processOrg.tsx b/util/processOrg.tsx index 84eb280..26d9377 100644 --- a/util/processOrg.tsx +++ b/util/processOrg.tsx @@ -12,16 +12,30 @@ import katex from 'rehype-katex' import 'katex/dist/katex.css' import rehype2react from 'rehype-react' +import remarkParse from 'remark-parse' +import remarkGFM from 'remark-gfm' +// remark wikilinks does not have any type declarations +//@ts-expect-error +import remarkWikiLinks from 'remark-wiki-link' +import remarkMath from 'remark-math' +import remarkFrontMatter from 'remark-frontmatter' +import remarkExtractFrontMatter from 'remark-extract-frontmatter' +// remark sectionize does not have any type declarations +//@ts-expect-error +import remarkSectionize from 'remark-sectionize' +import remarkRehype from 'remark-rehype' + import { PreviewLink } from '../components/Sidebar/Link' -import { NodeByCite, NodeById } from '../pages' +import { LinksByNodeId, NodeByCite, NodeById, normalizeLinkEnds } from '../pages' import React, { createContext, ReactNode, useMemo } from 'react' import { OrgImage } from '../components/Sidebar/OrgImage' import { Section } from '../components/Sidebar/Section' import { NoteContext } from './NoteContext' +import { OrgRoamLink, OrgRoamNode } from '../api' export interface ProcessedOrgProps { nodeById: NodeById - previewNode: any + previewNode: OrgRoamNode setPreviewNode: any previewText: any nodeByCite: NodeByCite @@ -29,6 +43,7 @@ export interface ProcessedOrgProps { openContextMenu: any outline: boolean collapse: boolean + linksByNodeId: LinksByNodeId } export const ProcessedOrg = (props: ProcessedOrgProps) => { @@ -42,52 +57,111 @@ export const ProcessedOrg = (props: ProcessedOrgProps) => { openContextMenu, outline, collapse, + linksByNodeId, } = props + console.log(linksByNodeId) + console.log(previewNode) + if (!previewNode || !linksByNodeId) { + return null + } - const processor = unified() + const orgProcessor = unified() .use(uniorgParse) .use(extractKeywords) .use(attachments) .use(uniorgSlug) .use(uniorg2rehype, { useSections: true }) - //.data('settings', { fragment: true }) - // .use(highlight) - .use(katex) - .use(rehype2react, { - createElement: React.createElement, - // eslint-disable-next-line react/display-name - components: { - a: ({ children, href }) => { - return ( - <PreviewLink - nodeByCite={nodeByCite} - setSidebarHighlightedNode={setSidebarHighlightedNode} - href={`${href as string}`} - nodeById={nodeById} - setPreviewNode={setPreviewNode} - openContextMenu={openContextMenu} - outline={outline} - > + + const nodesInNote = + linksByNodeId[previewNode?.id!]?.reduce((acc: NodeById, link: OrgRoamLink) => { + const links = normalizeLinkEnds(link) + const relevantLink = links.filter((l) => l !== previewNode.id).join('') + return { + ...acc, + [relevantLink]: nodeById[relevantLink], + } + }, {}) || {} + + const linkEntries = Object.entries(nodesInNote) + const wikiLinkResolver = (wikiLink: string): string[] => { + const entry = linkEntries.find((idNodeArray) => { + console.log(idNodeArray) + console.log(wikiLink) + return idNodeArray?.[1]?.title === wikiLink + }) + const id = entry?.[0] ?? '' + return [id] + } + + const wikiLinkProcessor = (wikiLink: string): string => { + console.log(wikiLink) + return `id:${wikiLink}` + } + + const mdProcessor = unified() + .use(remarkParse) + .use(remarkFrontMatter, ['yaml']) + .use(remarkExtractFrontMatter) + .use(remarkWikiLinks, { + permaLinks: Object.keys(nodesInNote), + pageResolver: wikiLinkResolver, + hrefTemplate: wikiLinkProcessor, + }) + .use(remarkSectionize) + .use(remarkMath) + .use(remarkGFM) + .use(remarkRehype) + //.data('settings', { fragment: true }) + // .use(highlight) + + const isMarkdown = previewNode?.file?.slice(-3) === '.md' + const baseProcessor = isMarkdown ? mdProcessor : orgProcessor + + const processor = useMemo( + () => + baseProcessor.use(katex).use(rehype2react, { + createElement: React.createElement, + // eslint-disable-next-line react/display-name + components: { + a: ({ children, href }) => { + return ( + <PreviewLink + nodeByCite={nodeByCite} + setSidebarHighlightedNode={setSidebarHighlightedNode} + href={`${href as string}`} + nodeById={nodeById} + linksByNodeId={linksByNodeId} + setPreviewNode={setPreviewNode} + openContextMenu={openContextMenu} + outline={outline} + previewNode={previewNode} + isWiki={isMarkdown} + > + {children} + </PreviewLink> + ) + }, + img: ({ src }) => { + return <OrgImage src={src as string} file={previewNode?.file} /> + }, + section: ({ children, className }) => ( + <Section {...{ outline, collapse }} className={className as string}> {children} - </PreviewLink> - ) - }, - img: ({ src }) => { - return <OrgImage src={src as string} file={previewNode?.file} /> - }, - section: ({ children, className }) => ( - <Section {...{ outline, collapse }} className={className as string}> - {children} - </Section> - ), - p: ({ children }) => { - return <p lang="en">{children as ReactNode}</p> + </Section> + ), + p: ({ children }) => { + return <p lang="en">{children as ReactNode}</p> + }, }, - }, - }) + }), + [previewNode?.id], + ) const text = useMemo(() => processor.processSync(previewText).result, [previewText]) return ( <NoteContext.Provider value={{ collapse, outline }}>{text as ReactNode}</NoteContext.Provider> ) } +function useCallBack(arg0: () => unified.Processor<unified.Settings>) { + throw new Error('Function not implemented.') +} diff --git a/util/uniorg.tsx b/util/uniorg.tsx index d0251c0..7ffd3b8 100644 --- a/util/uniorg.tsx +++ b/util/uniorg.tsx @@ -1,6 +1,6 @@ import React, { useEffect, useMemo, useState } from 'react' -import { OrgRoamNode } from '../api' -import { NodeByCite, NodeById } from '../pages/index' +import { OrgRoamLink, OrgRoamNode } from '../api' +import { LinksByNodeId, NodeByCite, NodeById } from '../pages/index' import { ProcessedOrg } from './processOrg' export interface UniOrgProps { @@ -12,6 +12,7 @@ export interface UniOrgProps { openContextMenu: any outline: boolean collapse: boolean + linksByNodeId: LinksByNodeId } export const UniOrg = (props: UniOrgProps) => { @@ -24,6 +25,7 @@ export const UniOrg = (props: UniOrgProps) => { setPreviewNode, outline, collapse, + linksByNodeId, } = props const [previewText, setPreviewText] = useState('') @@ -52,7 +54,7 @@ export const UniOrg = (props: UniOrgProps) => { return ( <> - {previewNode?.id && ( + {previewText && previewNode && ( <ProcessedOrg {...{ nodeById, @@ -64,6 +66,7 @@ export const UniOrg = (props: UniOrgProps) => { openContextMenu, outline, collapse, + linksByNodeId, }} /> )} |