Skip to content

AI-native knowledge base & Evernote/Obsidian alternative with instant sync & native MCP. Free on Cloudflare or self-hosted via Docker.

fix(ios): use shared TipTap merge-divider and gallery nodes

tianma-if9d4d496823e0
diff --git a/apps/ios/EditorSource/src/document-nodes.test.mjs b/apps/ios/EditorSource/src/document-nodes.test.mjs
new file mode 100644
index 00000000..3f04c419
--- /dev/null
+++ b/apps/ios/EditorSource/src/document-nodes.test.mjs
@@ -0,0 +1,84 @@
+import { describe, expect, test } from "bun:test";
+import { getSchema } from "@tiptap/core";
+import Image from "@tiptap/extension-image";
+import { Markdown, MarkdownManager } from "@tiptap/markdown";
+import StarterKit from "@tiptap/starter-kit";
+import {
+ docToMarkdown,
+ IMAGE_GALLERY_NODE_TYPE,
+ markdownToDoc,
+ MERGE_DIVIDER_MARKDOWN_MARKER,
+ MERGE_DIVIDER_NODE_TYPE,
+ MergeDivider as SharedMergeDivider,
+} from "@edgeever/shared";
+import { createIosImageGallery, ImageGallery, MergeDivider } from "./document-nodes.ts";
+
+const galleryDoc = {
+ type: "doc",
+ content: [{
+ type: IMAGE_GALLERY_NODE_TYPE,
+ attrs: { layout: "2" },
+ content: [
+ { type: "image", attrs: { src: "/one.png", alt: "one" } },
+ { type: "image", attrs: { src: "/two.png", alt: "two" } },
+ ],
+ }],
+};
+
+const iosMarkdownManager = new MarkdownManager({
+ extensions: [
+ StarterKit.configure({ codeBlock: false, link: false }),
+ Image,
+ MergeDivider,
+ createIosImageGallery(() => "en-US"),
+ Markdown.configure({
+ markedOptions: { gfm: true },
+ }),
+ ],
+});
+
+describe("iOS document nodes share the web schema", () => {
+ test("uses the shared MergeDivider implementation", () => {
+ expect(MergeDivider).toBe(SharedMergeDivider);
+ });
+
+ test("native ImageGallery.extend keeps the shared node name and gallery layout", () => {
+ const iosGallery = createIosImageGallery(() => "zh-CN");
+ expect(iosGallery.name).toBe(IMAGE_GALLERY_NODE_TYPE);
+
+ const sharedSchema = getSchema([StarterKit, Image, MergeDivider, ImageGallery]);
+ const iosSchema = getSchema([StarterKit, Image, MergeDivider, iosGallery]);
+ expect(iosSchema.nodeFromJSON(galleryDoc).toJSON()).toEqual(sharedSchema.nodeFromJSON(galleryDoc).toJSON());
+ expect(iosSchema.nodeFromJSON(galleryDoc).firstChild.attrs.layout).toBe("2");
+ });
+
+ test("parses merge-divider Markdown the same as the web codec", () => {
+ const markdown = `alpha\n\n${MERGE_DIVIDER_MARKDOWN_MARKER}\n\n---\n\nbeta`;
+ const webDoc = markdownToDoc(markdown);
+ const iosDoc = iosMarkdownManager.parse(markdown);
+
+ expect(webDoc.content.map((node) => node.type)).toEqual([
+ "paragraph",
+ MERGE_DIVIDER_NODE_TYPE,
+ "paragraph",
+ ]);
+ expect(iosDoc.content.map((node) => node.type)).toEqual(webDoc.content.map((node) => node.type));
+ expect(docToMarkdown(iosDoc)).toBe(docToMarkdown(webDoc));
+ });
+
+ test("round-trips gallery JSON layout and matches the web Markdown projection", () => {
+ const iosDoc = iosMarkdownManager.parse(iosMarkdownManager.serialize(galleryDoc));
+ const persisted = getSchema([StarterKit, Image, MergeDivider, createIosImageGallery(() => "en-US")])
+ .nodeFromJSON(galleryDoc)
+ .toJSON();
+
+ expect(docToMarkdown(galleryDoc)).toBe("![one](/one.png)\n\n![two](/two.png)");
+ expect(iosMarkdownManager.serialize(galleryDoc).trim()).toBe(docToMarkdown(galleryDoc));
+ expect(iosDoc.content.every((node) => node.type === "image" || node.type === "paragraph")).toBe(true);
+ expect(persisted.content[0]).toMatchObject({
+ type: IMAGE_GALLERY_NODE_TYPE,
+ attrs: { layout: "2" },
+ });
+ expect(persisted.content[0].content.map((node) => node.attrs.src)).toEqual(["/one.png", "/two.png"]);
+ });
+});
diff --git a/apps/ios/EditorSource/src/document-nodes.ts b/apps/ios/EditorSource/src/document-nodes.ts
new file mode 100644
index 00000000..ba87481c
--- /dev/null
+++ b/apps/ios/EditorSource/src/document-nodes.ts
@@ -0,0 +1,12 @@
+import { ImageGallery, MergeDivider } from "@edgeever/shared";
+import { createNativeImageGalleryView } from "@edgeever/shared/native-image-gallery";
+
+export { ImageGallery, MergeDivider };
+
+/** Same schema as shared `ImageGallery`; only the native node view differs. */
+export const createIosImageGallery = (getLocale: () => string) =>
+ ImageGallery.extend({
+ addNodeView() {
+ return createNativeImageGalleryView(getLocale);
+ },
+ });
diff --git a/apps/ios/EditorSource/src/main.ts b/apps/ios/EditorSource/src/main.ts
index 8886c485..eabb0aec 100644
--- a/apps/ios/EditorSource/src/main.ts
+++ b/apps/ios/EditorSource/src/main.ts
@@ -1,7 +1,7 @@
import "./styles.css";
import "katex/dist/katex.min.css";
import { Graph } from "@antv/x6";
-import { Editor, mergeAttributes, Node } from "@tiptap/core";
+import { Editor } from "@tiptap/core";
import StarterKit from "@tiptap/starter-kit";
import Image from "@tiptap/extension-image";
import { TaskItem, TaskList } from "@tiptap/extension-list";
@@ -45,7 +45,8 @@ import {
generateCardCss,
} from "@edgeever/shared/note-image-card";
import { createEdgeEverMathematics } from "./mathematics";
-import { createImageInsertTransaction, createNativeImageGalleryView, groupUploadedImages, NATIVE_IMAGE_GALLERY_CSS } from "@edgeever/shared/native-image-gallery";
+import { createIosImageGallery, MergeDivider } from "./document-nodes";
+import { createImageInsertTransaction, groupUploadedImages, NATIVE_IMAGE_GALLERY_CSS } from "@edgeever/shared/native-image-gallery";
const galleryStyle = document.createElement("style");
galleryStyle.textContent = NATIVE_IMAGE_GALLERY_CSS;
@@ -53,92 +54,6 @@ document.head.append(galleryStyle);
Graph.registerConnector(MIND_MAP_CONNECTOR_NAME, mindMapConnector, true);
-/** Keep in sync with packages/shared MergeDivider (iOS bundle cannot import monorepo shared). */
-const MERGE_DIVIDER_MARKDOWN_MARKER = "<!-- edgeever:merge-divider -->";
-const MERGE_DIVIDER_TOKENIZER =
- /^<!--\s*edgeever:merge-divider\s*-->\s*(?:\n+---[ \t]*(?:\n+|$)|(?:\n+|$))/;
-
-const MergeDivider = Node.create({
- name: "edgeeverMergeDivider",
- group: "block",
- atom: true,
- selectable: true,
- draggable: true,
- parseHTML() {
- return [{ tag: "hr[data-edgeever-merge-divider]" }];
- },
- renderHTML({ HTMLAttributes }) {
- return [
- "hr",
- mergeAttributes(HTMLAttributes, {
- "data-edgeever-merge-divider": "true",
- class: "edgeever-merge-divider",
- }),
- ];
- },
- renderMarkdown() {
- return `${MERGE_DIVIDER_MARKDOWN_MARKER}\n\n---`;
- },
- parseMarkdown(_token, helpers) {
- return helpers.createNode("edgeeverMergeDivider");
- },
- markdownTokenizer: {
- name: "edgeeverMergeDivider",
- level: "block",
- start(source: string) {
- return source.indexOf(MERGE_DIVIDER_MARKDOWN_MARKER);
- },
- tokenize(source: string) {
- const match = MERGE_DIVIDER_TOKENIZER.exec(source);
- if (!match) return undefined;
- return {
- type: "edgeeverMergeDivider",
- raw: match[0],
- text: "",
- };
- },
- },
-});
-
-/** Keep in sync with packages/shared ImageGallery to avoid duplicate TipTap runtime types. */
-const ImageGallery = Node.create({
- name: "edgeeverImageGallery",
- group: "block",
- content: "image+",
- defining: true,
- isolating: true,
- addNodeView() { return createNativeImageGalleryView(() => locale); },
- addAttributes() {
- return {
- layout: {
- default: "auto",
- parseHTML: (element: HTMLElement) => {
- const layout = element.getAttribute("data-image-gallery-layout");
- return layout === "1" || layout === "2" || layout === "3" ? layout : "auto";
- },
- renderHTML: (attributes: { layout?: unknown }) => ({
- "data-image-gallery-layout": attributes.layout === "1" || attributes.layout === "2" || attributes.layout === "3"
- ? attributes.layout
- : "auto",
- }),
- },
- };
- },
- parseHTML() {
- return [{ tag: "div[data-edgeever-image-gallery]" }];
- },
- renderHTML({ node, HTMLAttributes }) {
- return [
- "div",
- mergeAttributes(HTMLAttributes, {
- "data-edgeever-image-gallery": "true",
- "data-image-count": String(node.childCount),
- }),
- 0,
- ];
- },
-});
-
type BridgeMessage =
| { type: "ready"; startupMs: number }
| { type: "change"; contentMarkdown: string; contentJson: string }
@@ -843,7 +758,7 @@ function buildExtensions(placeholder: string) {
CodeBlock.configure({
languageClassPrefix: "language-",
}),
- ImageGallery,
+ createIosImageGallery(() => locale),
createEdgeEverImageExtension(),
TableKit.configure({
table: { resizable: false },