Merge pull request #208 from org-roam/fix/106

Author: tefkah

.github/workflows/cd.yml

@@ -49,9 +49,9 @@ jobs:
           git config --global url."https://github.com/".insteadOf ssh://[email protected]/
           git config --global url."https://".insteadOf git://
           git config --global url."https://".insteadOf ssh://
-          npm install
-          npm run build
-          npm run export
+          yarn install
+          yarn run build
+          yarn run export
       - name: '[Add GitHub Sponsors to Readme]'
         uses: JamesIves/[email protected]
         with:

.github/workflows/ci.yml

@@ -7,6 +7,7 @@ on:
     branches:
       - '**'
       - '!main'
+  workflow_dispatch:
 defaults:
   run:
     shell: 'bash'
@@ -51,8 +52,8 @@ jobs:
           git config --global url."https://github.com/".insteadOf ssh://[email protected]/
           git config --global url."https://".insteadOf git://
           git config --global url."https://".insteadOf ssh://
-          npm install
-          npm run build
-          npm run export
+          yarn install
+          yarn run build
+          yarn run export
 ...
 # End of ci.yml

components/Sidebar/Backlinks.tsx

@@ -8,7 +8,7 @@ import React from 'react'
 import { ProcessedOrg } from '../../util/processOrg'
 
 export interface BacklinksProps {
-  previewNode: any
+  previewNode: NodeObject | OrgRoamNode
   setPreviewNode: any
   nodeById: NodeById
   linksByNodeId: LinksByNodeId
@@ -37,7 +37,7 @@ export const Backlinks = (props: BacklinksProps) => {
     macros,
     attachDir,
   } = props
-  const links = linksByNodeId[previewNode?.id] ?? []
+  const links = linksByNodeId[(previewNode as OrgRoamNode)?.id] ?? []
 
   const backLinks = links
     .filter((link: LinkObject) => {

components/Sidebar/Link.tsx

@@ -152,7 +152,7 @@ export const PreviewLink = (props: LinkProps) => {
   const extraNoteStyle = outline ? outlineNoteStyle : viewerNoteStyle
   console.log(previewNode)
   const getText = () => {
-    fetch(`http://localhost:35901/file/${file}`)
+    fetch(`http://localhost:35901/node/${id}`)
       .then((res) => {
         return res.text()
       })

org-roam-ui.el

@@ -276,32 +276,33 @@ TODO: Be able to delete individual nodes."
   (org-roam-ui-follow-mode -1)
   (message "Connection with org-roam-ui closed."))
 
-(defun org-roam-ui--send-text (id ws)
-  "Send the text from org-node ID through the websocket WS."
+(defun org-roam-ui--get-text (id)
+  "Retrieve the text from org-node ID."
   (let*
       ((node (org-roam-populate (org-roam-node-create
                                  :id id)))
-       (file (org-roam-node-file node))
-       (text))
+       (file (org-roam-node-file node)))
     (org-roam-with-temp-buffer
         file
-      (setq text
-            (buffer-substring-no-properties (buffer-end -1) (buffer-end 1)))
-      text)
+      (when (> (org-roam-node-level node) 0)
+        ;; Heading nodes have level 1 and greater.
+        (goto-char (org-roam-node-point node))
+        (org-narrow-to-element))
+      (buffer-substring-no-properties (buffer-end -1) (buffer-end 1)))))
+
+(defun org-roam-ui--send-text (id ws)
+  "Send the text from org-node ID through the websocket WS."
+  (let ((text (org-roam-ui--get-text id)))
     (websocket-send-text ws
                          (json-encode
                           `((type . "orgText")
                             (data . ,text))))))
 
-(defservlet* file/:file text/plain ()
-  "Servlet for accessing file contents of org-roam files.
-
-Just sends the complete content of org-roam files rather than the specific
-node, as it's much faster to do that on the UI side."
-  (insert-file-contents-literally (org-link-decode file))
+(defservlet* node/:id text/plain ()
+  "Servlet for accessing node content."
+  (insert (org-roam-ui--get-text (org-link-decode id)))
   (httpd-send-header t "text/plain" 200 :Access-Control-Allow-Origin "*"))
 
-
 (defservlet* img/:file text/plain ()
   "Servlet for accessing images found in org-roam files."
   (progn

package.json

@@ -28,6 +28,7 @@
     "es6-tween": "^5.5.11",
     "framer-motion": "^4",
     "hast-to-hyperscript": "^9.0.1",
+    "hast-util-to-string": "1",
     "hastscript": "^6.0.0",
     "jlouvain.js": "^1.0.0",
     "next": "^11.1.0",

tsconfig.json

@@ -12,7 +12,8 @@
     "moduleResolution": "node",
     "resolveJsonModule": true,
     "isolatedModules": true,
-    "jsx": "preserve"
+    "jsx": "preserve",
+    "incremental": true
   },
   "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx"],
   "exclude": ["node_modules"]

util/processOrg.tsx

@@ -33,6 +33,10 @@ import { Section } from '../components/Sidebar/Section'
 import { NoteContext } from './NoteContext'
 import { OrgRoamLink, OrgRoamNode } from '../api'
 
+// @ts-expect-error non-ESM unified means no types
+import { toString } from 'hast-util-to-string'
+import { Box } from '@chakra-ui/react'
+
 export interface ProcessedOrgProps {
   nodeById: NodeById
   previewNode: OrgRoamNode
@@ -63,6 +67,7 @@ export const ProcessedOrg = (props: ProcessedOrgProps) => {
     macros,
     attachDir,
   } = props
+
   if (!previewNode || !linksByNodeId) {
     return null
   }
@@ -96,7 +101,6 @@ export const ProcessedOrg = (props: ProcessedOrgProps) => {
   }
 
   const wikiLinkProcessor = (wikiLink: string): string => {
-    console.log(wikiLink)
     return `id:${wikiLink}`
   }
 
@@ -160,11 +164,18 @@ export const ProcessedOrg = (props: ProcessedOrgProps) => {
             img: ({ src }) => {
               return <OrgImage src={src as string} file={previewNode?.file} />
             },
-            section: ({ children, className }) => (
-              <Section {...{ outline, collapse }} className={className as string}>
-                {children}
-              </Section>
-            ),
+            section: ({ children, className }) => {
+              console.log(className)
+              console.log(previewNode.level)
+              if (className && (className as string).slice(-1) === `${previewNode.level}`) {
+                return <Box>{(children as React.ReactElement[]).slice(1)}</Box>
+              }
+              return (
+                <Section {...{ outline, collapse }} className={className as string}>
+                  {children}
+                </Section>
+              )
+            },
             p: ({ children }) => {
               return <p lang="en">{children as ReactNode}</p>
             },
@@ -178,6 +189,3 @@ export const ProcessedOrg = (props: ProcessedOrgProps) => {
     <NoteContext.Provider value={{ collapse, outline }}>{text as ReactNode}</NoteContext.Provider>
   )
 }
-function useCallBack(arg0: () => unified.Processor<unified.Settings>) {
-  throw new Error('Function not implemented.')
-}

util/uniorg.tsx

@@ -34,9 +34,9 @@ export const UniOrg = (props: UniOrgProps) => {
 
   const [previewText, setPreviewText] = useState('')
 
-  const file = encodeURIComponent(encodeURIComponent(previewNode.file))
+  const id = encodeURIComponent(encodeURIComponent(previewNode.id))
   useEffect(() => {
-    fetch(`http://localhost:35901/file/${file}`)
+    fetch(`http://localhost:35901/node/${id}`)
       .then((res) => {
         return res.text()
       })