@octane-xplat/tiptap 0.9.0 → 0.11.0

package/dist/native/index3.js

@@ -1,14 +1,17 @@
 import { ensureJSONBridge, htmlToJSON, jsonBridgeReady, jsonToHTML } from "./index2.js";
-import { defineUniversalComponent, hookSlots, universalComponent, universalPlan, universalProps, universalValue, useCallback, useEffect, useRef } from "@nativescript-community/octane";
+import { defineUniversalComponent, hookSlots, universalComponent, universalPlan, universalProps, universalValue, useCallback, useEffect, useImperativeHandle, useRef, useState } from "@nativescript-community/octane";
 import { RichTextEditor, supported } from "@octane-xplat/richtext";
 //#region src/TiptapEditor.tsrx
-var _hs$ = /* @__PURE__ */ hookSlots(6);
+var _hs$ = /* @__PURE__ */ hookSlots(9);
 var _h$0 = /* @__PURE__ */ Symbol(_hs$);
 var _h$1 = /* @__PURE__ */ Symbol(_hs$ + 1);
 var _h$2 = /* @__PURE__ */ Symbol(_hs$ + 2);
 var _h$3 = /* @__PURE__ */ Symbol(_hs$ + 3);
 var _h$4 = /* @__PURE__ */ Symbol(_hs$ + 4);
 var _h$5 = /* @__PURE__ */ Symbol(_hs$ + 5);
+var _h$6 = /* @__PURE__ */ Symbol(_hs$ + 6);
+var _h$7 = /* @__PURE__ */ Symbol(_hs$ + 7);
+var _h$8 = /* @__PURE__ */ Symbol(_hs$ + 8);
 var __octaneUniversalPlan0 = universalPlan("nativescript", {
 	"kind": "slot",
 	"slot": 0
@@ -16,20 +19,34 @@ var __octaneUniversalPlan0 = universalPlan("nativescript", {
 var supported$1 = supported;
 var TiptapEditor = defineUniversalComponent("nativescript", function TiptapEditor(props) {
 	const inner = useRef(null, _h$0);
-	const jsonReady = useRef(false, _h$1);
-	const lastJSON = useRef(void 0, _h$2);
+	const [exposedHandle, setHandle] = useState(null, _h$1);
+	useImperativeHandle(props.ref, () => exposedHandle, [exposedHandle], _h$2);
+	const lastJSON = useRef(void 0, _h$3);
+	const appliedHost = useRef(null, _h$4);
+	const desiredDoc = useRef(void 0, _h$5);
+	const applyDoc = () => {
+		const host = inner.current;
+		const doc = desiredDoc.current;
+		if (!host || doc === void 0 || !jsonBridgeReady()) return;
+		const stamp = JSON.stringify(doc);
+		if (stamp === lastJSON.current && appliedHost.current === host) return;
+		const html = jsonToHTML(doc);
+		if (html != null) {
+			lastJSON.current = stamp;
+			appliedHost.current = host;
+			host.setHTML(html);
+		}
+	};
 	const bindHost = useCallback((h) => {
 		inner.current = h;
-		props.bind?.({
+		if (h) queueMicrotask(applyDoc);
+		setHandle((previous) => previous?.native === h?.native ? previous : h ? {
 			getHTML: () => h.getHTML(),
 			setHTML: (html) => h.setHTML(html),
 			getJSON: () => jsonBridgeReady() ? htmlToJSON(h.getHTML()) : null,
 			setJSON: (doc) => {
-				const html = jsonBridgeReady() ? jsonToHTML(doc) : null;
-				if (html != null) {
-					lastJSON.current = JSON.stringify(doc);
-					h.setHTML(html);
-				}
+				desiredDoc.current = doc;
+				applyDoc();
 			},
 			apply: (format) => h.apply(format),
 			linkTo: (url, anchor) => h.linkTo(url, anchor),
@@ -41,29 +58,30 @@ var TiptapEditor = defineUniversalComponent("nativescript", function TiptapEdito
 			blur: () => h.blur(),
 			isFocused: () => h.isFocused(),
 			native: h.native
-		});
-	}, [], _h$3);
+		} : null);
+	}, [], _h$6);
 	useEffect(() => {
+		let alive = true;
 		ensureJSONBridge().then((ok) => {
-			jsonReady.current = ok;
+			if (!alive) return;
 			props.onJSONReady?.(ok);
+			applyDoc();
 		});
-	}, [], _h$4);
+		return () => {
+			alive = false;
+		};
+	}, [], _h$7);
 	useEffect(() => {
-		if (!props.json || !jsonBridgeReady() || !inner.current) return;
-		const stamp = JSON.stringify(props.json);
-		if (stamp === lastJSON.current) return;
-		const html = jsonToHTML(props.json);
-		if (html != null) {
-			lastJSON.current = stamp;
-			inner.current.setHTML(html);
-		}
-	}, [props.json], _h$5);
+		if (!props.json) return;
+		desiredDoc.current = props.json;
+		applyDoc();
+	}, [props.json], _h$8);
 	const emitJSON = () => {
 		if (!inner.current || !jsonBridgeReady()) return;
 		const doc = htmlToJSON(inner.current.getHTML());
 		if (doc) {
 			lastJSON.current = JSON.stringify(doc);
+			appliedHost.current = inner.current;
 			props.onJSONChange?.(doc);
 		}
 	};
@@ -106,7 +124,10 @@ var TiptapEditor = defineUniversalComponent("nativescript", function TiptapEdito
 		[
 			"set",
 			"onReady",
-			props.onReady
+			() => {
+				applyDoc();
+				props.onReady?.();
+			}
 		],
 		[
 			"set",
@@ -133,7 +154,7 @@ var TiptapEditor = defineUniversalComponent("nativescript", function TiptapEdito
 		],
 		[
 			"set",
-			"bind",
+			"ref",
 			bindHost
 		],
 		[

package/dist/native/octane-client-build.json

@@ -1,6 +1,6 @@
 {
   "version": 1,
-  "buildId": "02534c50-4097-48da-93e0-5e219c2d5b5c",
+  "buildId": "17348370-95cd-416a-8890-a13f83eea059",
   "mode": "production",
   "capabilities": {
     "independentHydration": false

package/dist/web/index2.js

@@ -1,11 +1,11 @@
-import { __s, bag3, clone, componentSlot, hookSlots, setStyle, template, useEffect, useRef, withSlot } from "octane";
-import { updateFreshClassName } from "octane/internal/client";
+import { __s, bag3, clone, componentSlot, hookSlots, setStyle, template, useEffect, useImperativeHandle, useRef, withSlot } from "octane";
+import { compilerMemoRegion, hookMemoCreate, hookMemoEqual, hookMemoPublish2, updateFreshClassName } from "octane/internal/client";
 import { EditorContent, useEditor } from "@octanejs/tiptap";
 import StarterKit from "@tiptap/starter-kit";
 //#region src/TiptapEditor.web.tsrx
 var _t$0 = /* @__PURE__ */ template("<div></div>");
-var _hs$ = /* @__PURE__ */ hookSlots(8);
-var _h$3 = /* @__PURE__ */ Symbol(_hs$ + 3);
+var _hs$ = /* @__PURE__ */ hookSlots(10);
+var _h$5 = /* @__PURE__ */ Symbol(_hs$ + 5);
 var supported = true;
 var COMMAND = {
 	bold: (c) => c.toggleBold(),
@@ -26,18 +26,6 @@ var COMMAND = {
 	heading5: (c) => c.toggleHeading({ level: 5 }),
 	heading6: (c) => c.toggleHeading({ level: 6 })
 };
-var IS_ACTIVE = {
-	bold: (e) => e.isActive("bold"),
-	italic: (e) => e.isActive("italic"),
-	underline: (e) => e.isActive("underline"),
-	strikethrough: (e) => e.isActive("strike"),
-	code: (e) => e.isActive("code"),
-	blockquote: (e) => e.isActive("blockquote"),
-	bulletList: (e) => e.isActive("bulletList"),
-	orderedList: (e) => e.isActive("orderedList"),
-	codeBlock: (e) => e.isActive("codeBlock"),
-	link: (e) => e.isActive("link")
-};
 var ACTIVE_OF = [
 	["bold", "bold"],
 	["italic", "italic"],
@@ -86,13 +74,25 @@ function activeFormats(editor) {
 	for (const [name, kind, attrs] of ACTIVE_OF) if (editor.isActive(kind, attrs)) out.push(name);
 	return out;
 }
+function resolveExtensions(web) {
+	const extras = web?.extensions ?? [];
+	if (web?.starterKit === false || extras.some((ext) => ext?.name === "starterKit")) return extras;
+	return [web?.starterKit ? StarterKit.configure(web.starterKit) : StarterKit, ...extras];
+}
 var TiptapEditor = /* @__PURE__ */ __s(function TiptapEditor(props, __s, __extra) {
+	const __memoRegion = compilerMemoRegion(__s, _hs$ + 0);
+	let __hk = __memoRegion.hooks;
+	if (__hk === void 0) __memoRegion.hooks = __hk = hookMemoCreate(4);
+	let __hkd0, __hkd1;
 	const lastEmitted = useRef(void 0, _hs$ + 0);
 	const lastJSON = useRef(void 0, _hs$ + 1);
-	const bound = useRef(void 0, _hs$ + 2);
-	const editor = withSlot(_h$3, useEditor, {
-		extensions: [StarterKit],
-		content: props.value ?? props.json ?? "",
+	const lastHTMLInput = useRef(JSON.stringify([props.json !== void 0, props.value]), _hs$ + 2);
+	const lastJSONInput = useRef(JSON.stringify(props.json), _hs$ + 3);
+	const bound = useRef(void 0, _hs$ + 4);
+	const extensions = (__hkd0 = props.web?.extensions, __hkd1 = props.web?.starterKit, __hk[0] !== true || !hookMemoEqual(__hk[1], __hkd0) || !hookMemoEqual(__hk[2], __hkd1) ? hookMemoPublish2(__hk, 0, resolveExtensions(props.web), __hkd0, __hkd1) : __hk[3]);
+	const editor = withSlot(_h$5, useEditor, {
+		extensions,
+		content: props.json ?? props.value ?? "",
 		editable: props.editable !== false,
 		autofocus: props.autofocus ?? false,
 		onCreate: () => props.onReady?.(),
@@ -113,21 +113,32 @@ var TiptapEditor = /* @__PURE__ */ __s(function TiptapEditor(props, __s, __extra
 		})
 	});
 	useEffect(() => {
-		if (!editor || props.value === void 0) return;
+		if (!editor) return;
+		const stamp = JSON.stringify([props.json !== void 0, props.value]);
+		if (stamp === lastHTMLInput.current) return;
+		lastHTMLInput.current = stamp;
+		if (props.value === void 0 || props.json !== void 0) return;
 		if (props.value === lastEmitted.current) return;
 		editor.commands.setContent(props.value);
-	}, [editor, props.value], _hs$ + 4);
+	}, [
+		editor,
+		props.value,
+		props.json
+	], _hs$ + 6);
 	useEffect(() => {
-		if (!editor || props.json === void 0) return;
-		if (JSON.stringify(props.json) === lastJSON.current) return;
+		if (!editor) return;
+		const stamp = JSON.stringify(props.json);
+		if (stamp === lastJSONInput.current) return;
+		lastJSONInput.current = stamp;
+		if (props.json === void 0 || stamp === lastJSON.current) return;
 		editor.commands.setContent(props.json);
-	}, [editor, props.json], _hs$ + 5);
+	}, [editor, props.json], _hs$ + 7);
 	useEffect(() => {
 		if (!editor) return;
 		editor.setEditable(props.editable !== false);
-	}, [editor, props.editable], _hs$ + 6);
-	useEffect(() => {
-		if (!editor || bound.current?.native === editor) return;
+	}, [editor, props.editable], _hs$ + 8);
+	useImperativeHandle(props.ref, () => {
+		if (!editor) return null;
 		const e = editor;
 		bound.current = {
 			getHTML: () => e.getHTML(),
@@ -150,7 +161,7 @@ var TiptapEditor = /* @__PURE__ */ __s(function TiptapEditor(props, __s, __extra
 				else e.chain().focus().extendMarkRange("link").setLink({ href: url }).run();
 			},
 			removeLink: () => e.chain().focus().unsetLink().run(),
-			isActive: (format) => IS_ACTIVE[format]?.(e) ?? false,
+			isActive: (format) => activeFormats(e).includes(format),
 			undo: () => e.commands.undo(),
 			redo: () => e.commands.redo(),
 			focus: () => e.commands.focus(),
@@ -158,8 +169,8 @@ var TiptapEditor = /* @__PURE__ */ __s(function TiptapEditor(props, __s, __extra
 			isFocused: () => e.isFocused,
 			native: e
 		};
-		props.bind?.(bound.current);
-	}, [editor], _hs$ + 7);
+		return bound.current;
+	}, [editor], _hs$ + 9);
 	if (__s.block.pending && !__s.block.crossRenderUpdate) return;
 	let _b = __s.slots[0];
 	if (_b === void 0) {
@@ -176,7 +187,7 @@ var TiptapEditor = /* @__PURE__ */ __s(function TiptapEditor(props, __s, __extra
 			_b.c = _v;
 		}
 	}
-	componentSlot(__s, 1, _b.b, EditorContent, { "editor": editor }, void 0, void 0, 2, void 0, void 0, "c:077f1c5f");
+	componentSlot(__s, 1, _b.b, EditorContent, { "editor": editor }, void 0, void 0, 2, void 0, void 0, "c:95ead9de");
 });
 //#endregion
 export { TiptapEditor, supported };

package/dist/web/octane-client-build.json

@@ -1,6 +1,6 @@
 {
   "version": 1,
-  "buildId": "877d10c5-3430-4ba4-9762-2bd655451b3d",
+  "buildId": "1f4559d1-3518-4733-bde1-7ae4be559663",
   "mode": "production",
   "capabilities": {
     "independentHydration": false

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@octane-xplat/tiptap",
-  "version": "0.9.0",
-  "description": "Unified rich-text editor facade for Octane xplat — @octanejs/tiptap on web, @octane-xplat/richtext (Aztec) + tiptap doc model on native",
+  "version": "0.11.0",
+  "description": "Unified rich-text editor facade for Octane xplat — live tiptap on web/AppKit, Aztec + tiptap document model on Android",
   "keywords": [
     "cross-platform",
     "editor",
@@ -29,7 +29,7 @@
   "exports": {
     ".": {
       "macos": {
-        "types": "./types/index.d.ts",
+        "types": "./types/index.macos.d.ts",
         "default": "./src/index.macos.ts"
       },
       "web": {
@@ -48,7 +48,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@octane-xplat/richtext": "0.9.0",
+    "@octane-xplat/richtext": "0.11.0",
     "@octanejs/tiptap": "0.0.51",
     "@tiptap/core": "3.28.0",
     "@tiptap/pm": "3.28.0",
@@ -59,10 +59,12 @@
   "devDependencies": {
     "@nativescript-community/octane": "0.2.4",
     "@nativescript/core": "9.1.2",
+    "@octane-xplat/macos-renderer": "0.11.0",
     "@octanejs/vite-plugin": "0.1.61",
     "octane": "0.6.3",
     "typescript": "5.9.3",
-    "vite": "8.3.0"
+    "vite": "8.3.0",
+    "vitest": "5.0.1"
   },
   "peerDependencies": {
     "@nativescript-community/octane": ">=0.2.1 <1",
@@ -87,6 +89,7 @@
     }
   },
   "scripts": {
-    "build": "vite build && vite build --mode native && tsc -p tsconfig.types.json && node ../../scripts/check-native-dist.mjs"
+    "build": "vite build && vite build --mode native && tsc -p tsconfig.types.json && node ../../scripts/check-native-dist.mjs && node ../richtext/build-browser.mjs",
+    "test:native": "vitest run --config vitest.native.config.mts"
   }
 }

package/src/Editor.macos.tsx

@@ -0,0 +1,9 @@
+/** @jsxImportSource @octane-xplat/macos-renderer */
+import type { TiptapEditorProps } from './types'
+import browser from '../dist/macos/browser.js'
+import { NativeEditor } from '@octane-xplat/richtext/macos-host'
+
+/** AppKit mounts the local editor engine in WKWebView. */
+export function TiptapEditor(props: TiptapEditorProps) {
+	return <NativeEditor {...props} browser={browser} />
+}

package/src/TiptapEditor.mobile.test.ts

@@ -0,0 +1,229 @@
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import {
+	createObjectContainer,
+	createObjectDriver,
+	createUniversalRoot,
+	flushUniversalSync,
+} from 'octane/universal/native'
+
+import type { TiptapJSON } from './types'
+
+// Controlled fake for the lazy JSON bridge — the real module's dynamic
+// imports aren't needed to test facade timing. `resolved`/`ready` model the
+// bridge settling; docs carry `html` so conversions stay deterministic.
+const bridge = vi.hoisted(() => ({
+	ready: false,
+	resolved: undefined as boolean | undefined,
+	waiters: [] as Array<(ok: boolean) => void>,
+}))
+
+vi.mock('./json-bridge', () => ({
+	ensureJSONBridge: () =>
+		bridge.resolved !== undefined
+			? Promise.resolve(bridge.resolved)
+			: new Promise<boolean>((resolve) => bridge.waiters.push(resolve)),
+	jsonBridgeReady: () => bridge.ready,
+	jsonToHTML: (doc: any) =>
+		doc && typeof doc === 'object' && typeof doc.html === 'string' ? doc.html : null,
+	htmlToJSON: (html: string) => ({ type: 'doc', html }),
+}))
+
+vi.mock('@octane-xplat/richtext', async () => {
+	return await import('../tests/fake-richtext.fixture.mobile.tsrx')
+})
+
+import { TiptapEditor } from './TiptapEditor.tsrx'
+import { hosts, resetFakeRichtext, setDefer } from '../tests/fake-richtext.fixture.mobile.tsrx'
+
+const docA = { type: 'doc', html: '<p>alpha</p>' } as unknown as TiptapJSON
+const docB = { type: 'doc', html: '<p>bravo</p>' } as unknown as TiptapJSON
+
+const roots: ReturnType<typeof createUniversalRoot>[] = []
+
+function mount(props: any) {
+	const container = createObjectContainer('nativescript')
+	const root = createUniversalRoot(container, createObjectDriver('nativescript'))
+	roots.push(root)
+	let handle: any = null
+	root.render(TiptapEditor, {
+		...props,
+		ref: (next: any) => {
+			handle = next
+		},
+	})
+
+	return {
+		root,
+		container,
+		get handle() {
+			return handle
+		},
+	}
+}
+
+function settleBridge(ok: boolean) {
+	bridge.ready = ok
+	bridge.resolved = ok
+	for (const resolve of bridge.waiters.splice(0)) {
+		resolve(ok)
+	}
+}
+
+async function settle() {
+	for (let i = 0; i < 12; i++) {
+		await Promise.resolve()
+	}
+
+	flushUniversalSync(() => {})
+}
+
+beforeEach(() => {
+	bridge.ready = false
+	bridge.resolved = undefined
+	bridge.waiters.length = 0
+	resetFakeRichtext()
+})
+
+afterEach(() => {
+	for (const root of roots.splice(0)) {
+		root.unmount()
+	}
+})
+
+describe('TiptapEditor native JSON readiness', () => {
+	it('applies an initial props.json once when the bridge settles after mount', async () => {
+		const onJSONReady = vi.fn()
+		mount({ json: docA, onJSONReady })
+		await settle()
+		expect(hosts[0].setCalls).toEqual([])
+
+		settleBridge(true)
+		await settle()
+		expect(onJSONReady).toHaveBeenCalledWith(true)
+		expect(hosts[0].html).toBe('<p>alpha</p>')
+		expect(hosts[0].setCalls).toEqual(['<p>alpha</p>'])
+	})
+
+	it('applies an initial props.json when the host readies after the bridge', async () => {
+		bridge.ready = true
+		bridge.resolved = true
+		setDefer(true)
+		mount({ json: docA })
+		await settle()
+		expect(hosts[0].setCalls).toEqual([])
+
+		hosts[0].ready()
+		await settle()
+		expect(hosts[0].html).toBe('<p>alpha</p>')
+		expect(hosts[0].setCalls).toEqual(['<p>alpha</p>'])
+	})
+
+	it('applies an initial props.json once when host and bridge are both late', async () => {
+		setDefer(true)
+		mount({ json: docA })
+		await settle()
+		hosts[0].ready()
+		await settle()
+		expect(hosts[0].setCalls).toEqual([])
+
+		settleBridge(true)
+		await settle()
+		expect(hosts[0].setCalls).toEqual(['<p>alpha</p>'])
+	})
+
+	it('keeps json precedence over value once readiness lands', async () => {
+		mount({ value: '<p>value</p>', json: docA })
+		await settle()
+		settleBridge(true)
+		await settle()
+		expect(hosts[0].html).toBe('<p>alpha</p>')
+	})
+
+	it('applies later props.json updates and skips identical docs', async () => {
+		const view = mount({ json: docA })
+		settleBridge(true)
+		await settle()
+		expect(hosts[0].setCalls).toEqual(['<p>alpha</p>'])
+
+		view.root.render(TiptapEditor, { json: docB } as any)
+		await settle()
+		expect(hosts[0].setCalls).toEqual(['<p>alpha</p>', '<p>bravo</p>'])
+
+		view.root.render(TiptapEditor, { json: docB } as any)
+		await settle()
+		expect(hosts[0].setCalls).toEqual(['<p>alpha</p>', '<p>bravo</p>'])
+	})
+
+	it('does not push a doc the editor itself emitted back at it', async () => {
+		const onJSONChange = vi.fn()
+		const view = mount({ onJSONChange })
+		settleBridge(true)
+		await settle()
+
+		const rig = hosts[0]
+		rig.html = '<p>typed</p>'
+		// The leaf calls props.onChange(html); the facade wraps it to emit JSON.
+		rig.props.onChange('<p>typed</p>')
+		await settle()
+		const emitted = onJSONChange.mock.calls[0][0]
+		expect(emitted).toEqual({ type: 'doc', html: '<p>typed</p>' })
+
+		view.root.render(TiptapEditor, { json: emitted, onJSONChange } as any)
+		await settle()
+		expect(rig.setCalls).toEqual([])
+	})
+
+	it('defers an imperative setJSON issued before the bridge settles', async () => {
+		const view = mount({})
+		await settle()
+		expect(view.handle).not.toBeNull()
+
+		view.handle.setJSON(docB)
+		expect(hosts[0].setCalls).toEqual([])
+		settleBridge(true)
+		await settle()
+		expect(hosts[0].setCalls).toEqual(['<p>bravo</p>'])
+	})
+
+	it('re-applies the current doc when the host rebinds', async () => {
+		mount({ json: docA })
+		settleBridge(true)
+		await settle()
+		expect(hosts[0].setCalls).toEqual(['<p>alpha</p>'])
+
+		hosts[0].rebind()
+		await settle()
+		expect(hosts[0].html).toBe('<p>alpha</p>')
+		expect(hosts[0].setCalls).toEqual(['<p>alpha</p>'])
+	})
+
+	it('ignores a bridge that settles after unmount', async () => {
+		const onJSONReady = vi.fn()
+		const view = mount({ json: docA, onJSONReady })
+		await settle()
+		view.root.unmount()
+
+		settleBridge(true)
+		await settle()
+		expect(onJSONReady).not.toHaveBeenCalled()
+		expect(hosts[0].setCalls).toEqual([])
+	})
+
+	it('reports bridge failure through onJSONReady without touching the host', async () => {
+		const onJSONReady = vi.fn()
+		const view = mount({ json: docA, onJSONReady })
+		await settle()
+		settleBridge(false)
+		await settle()
+		expect(onJSONReady).toHaveBeenCalledWith(false)
+		expect(hosts[0].setCalls).toEqual([])
+		expect(view.handle.getJSON()).toBeNull()
+	})
+
+	it('drops a doc the converter rejects instead of writing null HTML', async () => {
+		mount({ json: { type: 'doc', content: [{ type: 'mystery' }] } as any })
+		settleBridge(true)
+		await settle()
+		expect(hosts[0].setCalls).toEqual([])
+	})
+})