Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { forwardRef, useEffect, useMemo, useState } from "react";

import { type JSONContent, TiptapEditor } from "@hypr/tiptap/editor";
import NoteEditor from "@hypr/tiptap/editor";
import { EMPTY_TIPTAP_DOC } from "@hypr/tiptap/shared";
import { EMPTY_TIPTAP_DOC, isValidTiptapContent } from "@hypr/tiptap/shared";

import * as main from "../../../../../../store/tinybase/main";

Expand All @@ -19,7 +19,12 @@ export const EnhancedEditor = forwardRef<
const value = store.getCell("enhanced_notes", enhancedNoteId, "content");
if (value && typeof value === "string" && value.trim()) {
try {
setInitialContent(JSON.parse(value));
const parsed = JSON.parse(value);
if (isValidTiptapContent(parsed)) {
setInitialContent(parsed);
} else {
setInitialContent(EMPTY_TIPTAP_DOC);
}
} catch {
setInitialContent(EMPTY_TIPTAP_DOC);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import NoteEditor, {
} from "@hypr/tiptap/editor";
import {
EMPTY_TIPTAP_DOC,
isValidTiptapContent,
type PlaceholderFunction,
} from "@hypr/tiptap/shared";

Expand All @@ -25,7 +26,12 @@ export const RawEditor = forwardRef<
const value = store.getCell("sessions", sessionId, "raw_md");
if (value && typeof value === "string" && value.trim()) {
try {
setInitialContent(JSON.parse(value));
const parsed = JSON.parse(value);
if (isValidTiptapContent(parsed)) {
setInitialContent(parsed);
} else {
setInitialContent(EMPTY_TIPTAP_DOC);
}
} catch {
setInitialContent(EMPTY_TIPTAP_DOC);
}
Expand Down
8 changes: 5 additions & 3 deletions packages/tiptap/src/editor/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,9 @@ const Editor = forwardRef<{ editor: TiptapEditor | null }, EditorProps>(
{
extensions,
editable,
content: initialContent || shared.EMPTY_TIPTAP_DOC,
content: shared.isValidTiptapContent(initialContent)
? initialContent
: shared.EMPTY_TIPTAP_DOC,
onCreate: ({ editor }) => {
editor.view.dom.setAttribute("spellcheck", "false");
editor.view.dom.setAttribute("autocomplete", "off");
Expand Down Expand Up @@ -129,15 +131,15 @@ const Editor = forwardRef<{ editor: TiptapEditor | null }, EditorProps>(
previousContentRef.current = initialContent;
if (setContentFromOutside) {
const { from, to } = editor.state.selection;
if (initialContent) {
if (shared.isValidTiptapContent(initialContent)) {
editor.commands.markNewContent();
}

if (from > 0 && to > 0 && from < editor.state.doc.content.size) {
editor.commands.setTextSelection({ from, to });
}
} else if (!editor.isFocused) {
if (initialContent) {
if (shared.isValidTiptapContent(initialContent)) {
editor.commands.setContent(initialContent, {
parseOptions: { preserveWhitespace: "full" },
});
Expand Down
9 changes: 9 additions & 0 deletions packages/tiptap/src/shared/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,15 @@ import { getExtensions } from "./extensions";

export const EMPTY_TIPTAP_DOC: JSONContent = { type: "doc", content: [] };

export function isValidTiptapContent(content: unknown): content is JSONContent {
if (!content || typeof content !== "object") {
return false;
}

const obj = content as Record<string, unknown>;
return obj.type === "doc" && Array.isArray(obj.content);
}

const turndown = new TurndownService({ headingStyle: "atx" });

turndown.addRule("p", {
Expand Down
Loading