Fix: updating y-doc

apps/server/src/modules/content/content.service.ts

@@ -7,7 +7,8 @@ import { PrismaService } from 'nestjs-prisma';
 import { LoggerService } from 'modules/logger/logger.service';
 import { isValidAuthentication } from 'modules/sync/sync.utils';
 import { TasksService } from 'modules/tasks/tasks.service';
-import { yXmlFragmentToProsemirrorJSON } from 'y-prosemirror';
+import { prosemirrorJSONToYXmlFragment } from 'y-prosemirror';
+import { getSchema } from '@sigma/editor-extensions';
 @Injectable()
 export class ContentService implements OnModuleInit {
   private readonly logger: LoggerService = new LoggerService('ContentGateway');
@@ -78,8 +79,43 @@ export class ContentService implements OnModuleInit {
 
     await docConnection.transact((doc) => {
       const editorState = doc.getXmlFragment('default');
+      // const tiptapJSON = yXmlFragmentToProsemirrorJSON(editorState);
 
-      console.log(editorState.toString());
+      const newJSON = {
+        type: 'doc',
+        content: [
+          {
+            type: 'paragraph',
+            content: [
+              {
+                type: 'text',
+                text: 'asd',
+              },
+            ],
+          },
+          {
+            type: 'paragraph',
+          },
+          {
+            type: 'heading',
+            attrs: {
+              level: 1,
+            },
+            content: [
+              {
+                type: 'text',
+                text: 'working',
+              },
+            ],
+          },
+          {
+            type: 'paragraph',
+            content: [],
+          },
+        ],
+      };
+
+      prosemirrorJSONToYXmlFragment(getSchema(), newJSON, editorState);
     });
   }
 }

apps/webapp/common/editor/editor-extensions.ts

@@ -16,11 +16,9 @@ import {
 import { datePageExtension } from './date-page-extension';
 import { fileExtension } from './file-extension';
 import { imageExtension } from './image-extension';
-import { default as ListItem } from './list-item';
+import { LinkTaskExtension } from './link-task';
 import { taskExtension } from './task-extension';
 import { tasksExtension } from './tasks';
-import trailingNode from './trailing-node';
-import { LinkTaskExtension } from './link-task';
 
 // create a lowlight instance with all languages loaded
 const lowlight = createLowlight(all);
@@ -68,7 +66,11 @@ const starterKit = StarterKit.configure({
       class: cx('list-decimal list-outside pl-6 leading-1 my-1'),
     },
   },
-  listItem: false,
+  listItem: {
+    HTMLAttributes: {
+      class: cx('leading-normal'),
+    },
+  },
   blockquote: {
     HTMLAttributes: {
       class: cx('border-l-4 border-gray-400 dark:border-gray-500'),
@@ -135,7 +137,6 @@ export const defaultExtensions = [
   tiptapLink,
   horizontalRule,
   heading,
-  ListItem,
   AIHighlight,
   fileExtension,
   imageExtension,
@@ -145,7 +146,6 @@ export const defaultExtensions = [
   tasksExtension,
   CustomKeymap,
   LinkTaskExtension,
-  trailingNode,
   CodeBlockLowlight.configure({
     lowlight,
   }),

apps/webapp/modules/my-day/day-editor.tsx

@@ -20,8 +20,6 @@ import type { PageType } from 'common/types';
 import { useCreatePageMutation } from 'services/pages';
 
 import { useContextStore } from 'store/global-context-provider';
-import { Editor as EditorT } from '@tiptap/core';
-import { addTasksSectionIfNotFound } from './utils';
 
 interface DayEditorProps {
   date: Date;
@@ -35,10 +33,8 @@ interface EditorWithPageProps {
 export const EditorWithPage = observer(
   ({ page, date }: EditorWithPageProps) => {
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    const [provider, setProvider] =
-      React.useState<HocuspocusProvider>(undefined);
+    const [_, setProvider] = React.useState<HocuspocusProvider>(undefined);
     const [doc, setDoc] = React.useState(undefined);
-    const [editor, setEditor] = React.useState(undefined);
 
     React.useEffect(() => {
       initPageSocket();
@@ -67,9 +63,6 @@ export const EditorWithPage = observer(
     };
 
     const onDescriptionChange = () => {};
-    const onCreate = (editor: EditorT) => {
-      setEditor(editor);
-    };
 
     if (page && doc) {
       return (
@@ -83,7 +76,6 @@ export const EditorWithPage = observer(
                 document: doc,
               }),
             ]}
-            onCreate={onCreate}
             className="min-h-[calc(100vh_-_65vh)] my-1"
             placeholder="Write notes..."
           >

packages/editor-extensions/package.json

@@ -48,6 +48,8 @@
     "@tiptap/extension-horizontal-rule": "^2.11.5",
     "@tiptap/extension-image": "^2.11.5",
     "@tiptap/extension-link": "^2.11.5",
+    "@tiptap/extension-placeholder": "^2.11.5",
+    "@tiptap/extension-highlight": "^2.11.5",
     "@tiptap/extension-list-item": "^2.11.5",
     "@tiptap/extension-mention": "^2.10.3",
     "@tiptap/extension-ordered-list": "^2.11.5",
@@ -56,10 +58,12 @@
     "@tiptap/extension-task-list": "^2.11.5",
     "@tiptap/extension-text": "^2.11.5",
     "@tiptap/extension-underline": "^2.11.5",
+    "@tiptap/extension-list-keymap": "2.11.5",
     "@tiptap/html": "^2.10.3",
     "@tiptap/react": "^2.5.4",
     "add": "^2.0.6",
     "lowlight": "^3.3.0",
+    "novel": "^0.5.0",
     "pnpm": "^10.3.0"
   },
   "exports": {

packages/editor-extensions/src/editor-extensions.ts

@@ -1,15 +1,26 @@
-import CodeBlockLowlight from '@tiptap/extension-code-block-lowlight';
-import StarterKit from '@tiptap/starter-kit';
 import { datePageExtension } from './date-page-extension';
 import { fileExtension } from './file-extension';
 import { imageExtension } from './image-extension';
 import { taskExtension } from './task-extension';
+import StarterKit from '@tiptap/starter-kit';
+import Link from '@tiptap/extension-link';
+import Placeholder from '@tiptap/extension-placeholder';
+import Highlight from '@tiptap/extension-highlight';
+import ListKeymap from '@tiptap/extension-list-keymap';
+import { tasksExtension } from './tasks-extension';
+import { getSchema as fetchSchema } from '@tiptap/core';
 
 export const defaultExtensions = [
   fileExtension,
   imageExtension,
   taskExtension,
+  tasksExtension,
   datePageExtension,
-  CodeBlockLowlight,
   StarterKit,
+  Link,
+  Placeholder,
+  Highlight,
+  ListKeymap,
 ];
+
+export const getSchema = () => fetchSchema(defaultExtensions);

packages/editor-extensions/src/task-extension.ts

@@ -1,8 +1,9 @@
 import { mergeAttributes, Node } from '@tiptap/core';
 
+/// Copy of webapp/common/editor/task-extension
 export const taskExtension = Node.create({
   priority: 51,
-  name: 'taskExtension',
+  name: 'task',
   group: 'inline',
   inline: true,
 
@@ -11,18 +12,21 @@ export const taskExtension = Node.create({
       id: {
         default: undefined,
       },
+      number: {
+        default: undefined,
+      },
     };
   },
 
   parseHTML() {
     return [
       {
-        tag: 'task-extension',
+        tag: 'task',
       },
     ];
   },
 
   renderHTML({ HTMLAttributes }) {
-    return ['task-extension', mergeAttributes(HTMLAttributes)];
+    return ['task', mergeAttributes(HTMLAttributes)];
   },
 });

packages/editor-extensions/src/tasks-extension.ts

@@ -0,0 +1,19 @@
+import { mergeAttributes, Node } from '@tiptap/core';
+
+export const tasksExtension = Node.create({
+  name: 'tasksExtension',
+  group: 'block',
+  content: 'block+',
+
+  parseHTML() {
+    return [
+      {
+        tag: 'tasks-extension',
+      },
+    ];
+  },
+
+  renderHTML({ HTMLAttributes }) {
+    return ['tasks-extension', mergeAttributes(HTMLAttributes)];
+  },
+});