Open-source and local-first Slack and Notion alternative that puts you in control of your data
TypeScript chatchat-applicationcrdteditorelectronknowledge-baselocal-firstnotionnotion-alternativerealtime-collaborationself-hostedslacksqliteteam-collaborationwikiyjs
Add folder node in editor
Hakan Shehuecbb92baa6ab
diff --git a/desktop/src/renderer/components/documents/document-editor.tsx b/desktop/src/renderer/components/documents/document-editor.tsxindex 09d6cc5d..101b21ee 100644--- a/desktop/src/renderer/components/documents/document-editor.tsx+++ b/desktop/src/renderer/components/documents/document-editor.tsx@@ -14,11 +14,13 @@ import {DividerCommand,TodoCommand,PageCommand,+ FolderCommand,} from '@/renderer/editor/commands';import {IdExtension,DocumentNode,PageNode,+ FolderNode,TextNode,ParagraphNode,Heading1Node,@@ -90,6 +92,7 @@ export const DocumentEditor = ({IdExtension,DocumentNode,PageNode,+ FolderNode,TextNode,ParagraphNode,Heading1Node,@@ -125,6 +128,7 @@ export const DocumentEditor = ({OrderedListCommand,DividerCommand,TodoCommand,+ FolderCommand,],context: {documentId,diff --git a/desktop/src/renderer/editor/commands/folder.tsx b/desktop/src/renderer/editor/commands/folder.tsxnew file mode 100644index 00000000..3394d376--- /dev/null+++ b/desktop/src/renderer/editor/commands/folder.tsx@@ -0,0 +1,41 @@+import { EditorCommand } from '@/types/editor';+import { NodeTypes } from '@/lib/constants';++export const FolderCommand: EditorCommand = {+ key: 'folder',+ name: 'Folder',+ description: 'Insert a nested folder',+ keywords: ['folder'],+ icon: 'folder-line',+ disabled: false,+ async handler({ editor, range, context }) {+ if (context == null) {+ return;+ }++ const { userId, documentId } = context;+ const output = await window.neuron.executeMutation({+ type: 'folder_create',+ name: 'Untitled',+ userId,+ parentId: documentId,+ generateIndex: false,+ });++ if (!output.id) {+ return;+ }++ editor+ .chain()+ .focus()+ .deleteRange(range)+ .insertContent({+ type: NodeTypes.Folder,+ attrs: {+ id: output.id,+ },+ })+ .run();+ },+};diff --git a/desktop/src/renderer/editor/commands/index.tsx b/desktop/src/renderer/editor/commands/index.tsxindex 2f4865d6..e2d32f05 100644--- a/desktop/src/renderer/editor/commands/index.tsx+++ b/desktop/src/renderer/editor/commands/index.tsx@@ -9,6 +9,7 @@ import { OrderedListCommand } from '@/renderer/editor/commands/ordered-list';import { ParagraphCommand } from '@/renderer/editor/commands/paragraph';import { TodoCommand } from '@/renderer/editor/commands/todo';import { PageCommand } from '@/renderer/editor/commands/page';+import { FolderCommand } from '@/renderer/editor/commands/folder';import { EditorCommand, EditorCommandProps } from '@/types/editor';export type { EditorCommand, EditorCommandProps };@@ -25,4 +26,5 @@ export {DividerCommand,TodoCommand,PageCommand,+ FolderCommand,};diff --git a/desktop/src/renderer/editor/commands/page.tsx b/desktop/src/renderer/editor/commands/page.tsxindex 8f9f6633..06de3164 100644--- a/desktop/src/renderer/editor/commands/page.tsx+++ b/desktop/src/renderer/editor/commands/page.tsx@@ -1,7 +1,7 @@import { EditorCommand } from '@/types/editor';import { NodeTypes } from '@/lib/constants';-const PageCommand: EditorCommand = {+export const PageCommand: EditorCommand = {key: 'page',name: 'Page',description: 'Insert a nested page',@@ -39,5 +39,3 @@ const PageCommand: EditorCommand = {.run();},};--export { PageCommand };diff --git a/desktop/src/renderer/editor/extensions/folder.tsx b/desktop/src/renderer/editor/extensions/folder.tsxnew file mode 100644index 00000000..d912fbc8--- /dev/null+++ b/desktop/src/renderer/editor/extensions/folder.tsx@@ -0,0 +1,26 @@+import { mergeAttributes, Node } from '@tiptap/core';+import { ReactNodeViewRenderer } from '@tiptap/react';+import { FolderNodeView } from '@/renderer/editor/views';++export const FolderNode = Node.create({+ name: 'folder',+ group: 'block',+ atom: true,+ defining: true,+ draggable: true,+ addAttributes() {+ return {+ id: {+ default: null,+ },+ };+ },+ renderHTML({ HTMLAttributes }) {+ return ['folder', mergeAttributes(HTMLAttributes)];+ },+ addNodeView() {+ return ReactNodeViewRenderer(FolderNodeView, {+ as: 'folder',+ });+ },+});diff --git a/desktop/src/renderer/editor/extensions/index.tsx b/desktop/src/renderer/editor/extensions/index.tsxindex 701d9cd1..59208325 100644--- a/desktop/src/renderer/editor/extensions/index.tsx+++ b/desktop/src/renderer/editor/extensions/index.tsx@@ -31,6 +31,7 @@ import { TaskItemNode } from '@/renderer/editor/extensions/task-item';import { TaskListNode } from '@/renderer/editor/extensions/task-list';import { TrailingNode } from '@/renderer/editor/extensions/trailing-node';import { PageNode } from '@/renderer/editor/extensions/page';+import { FolderNode } from '@/renderer/editor/extensions/folder';export {IdExtension,@@ -65,4 +66,5 @@ export {UnderlineMark,DropcursorExtension,PageNode,+ FolderNode,};diff --git a/desktop/src/renderer/editor/extensions/page.tsx b/desktop/src/renderer/editor/extensions/page.tsxindex ecac011a..6be47c97 100644--- a/desktop/src/renderer/editor/extensions/page.tsx+++ b/desktop/src/renderer/editor/extensions/page.tsx@@ -13,12 +13,6 @@ const PageNode = Node.create({id: {default: null,},- name: {- default: null,- },- avatar: {- default: null,- },};},renderHTML({ HTMLAttributes }) {diff --git a/desktop/src/renderer/editor/views/folder.tsx b/desktop/src/renderer/editor/views/folder.tsxnew file mode 100644index 00000000..63c13ead--- /dev/null+++ b/desktop/src/renderer/editor/views/folder.tsx@@ -0,0 +1,39 @@+import React from 'react';+import { type NodeViewProps } from '@tiptap/core';+import { NodeViewWrapper } from '@tiptap/react';+import { Avatar } from '@/renderer/components/avatars/avatar';+import { useWorkspace } from '@/renderer/contexts/workspace';+import { useQuery } from '@/renderer/hooks/use-query';++export const FolderNodeView = ({ node }: NodeViewProps) => {+ const workspace = useWorkspace();++ const id = node.attrs.id;+ const { data } = useQuery({+ type: 'node_get',+ nodeId: id,+ userId: workspace.userId,+ });++ if (!id) {+ return null;+ }++ const name = data?.attributes.name ?? 'Unnamed';+ const avatar = data?.attributes.avatar;++ return (+ <NodeViewWrapper+ data-id={node.attrs.id}+ className="my-0.5 flex h-12 w-full cursor-pointer flex-row items-center gap-1 rounded-md bg-gray-50 p-2 hover:bg-gray-100"+ onClick={() => {+ workspace.navigateToNode(id);+ }}+ >+ <Avatar size="small" id={id} name={name} avatar={avatar} />+ <div role="presentation" className="flex-grow">+ {name}+ </div>+ </NodeViewWrapper>+ );+};diff --git a/desktop/src/renderer/editor/views/index.tsx b/desktop/src/renderer/editor/views/index.tsxindex edfba40e..c39d1b46 100644--- a/desktop/src/renderer/editor/views/index.tsx+++ b/desktop/src/renderer/editor/views/index.tsx@@ -1,4 +1,5 @@import { CodeBlockNodeView } from '@/renderer/editor/views/code-block';import { PageNodeView } from '@/renderer/editor/views/page';+import { FolderNodeView } from '@/renderer/editor/views/folder';-export { CodeBlockNodeView, PageNodeView };+export { CodeBlockNodeView, PageNodeView, FolderNodeView };diff --git a/desktop/src/renderer/editor/views/page.tsx b/desktop/src/renderer/editor/views/page.tsxindex 5d081450..a8c3f96b 100644--- a/desktop/src/renderer/editor/views/page.tsx+++ b/desktop/src/renderer/editor/views/page.tsx@@ -7,6 +7,7 @@ import { useQuery } from '@/renderer/hooks/use-query';export const PageNodeView = ({ node }: NodeViewProps) => {const workspace = useWorkspace();+const id = node.attrs.id;const { data } = useQuery({type: 'node_get',