@openeditor/react-native-prose-editor 0.0.11 → 0.0.12

package/android/src/main/java/com/apollohg/editor/NativeBlockEditorSurface.kt

@@ -47,6 +47,7 @@ import uniffi.editor_core.editorUpdateNodeAttrs
 internal data class SelectedImageGeometry(val docPos: Int, val rect: RectF)
 
 class NativeBlockEditorSurface(context: Context) : ScrollView(context) {
+    var onPageOpen: ((String, String, String?, String?) -> Unit)? = null
     var isScrollingEnabled: Boolean = true
 
     internal var geometryRevision: Long = 0
@@ -617,6 +618,9 @@ class NativeBlockEditorSurface(context: Context) : ScrollView(context) {
     internal fun tableFillColorsForTesting(): List<Int> = tableCells.map { it.baseFillColor }
 
     private fun viewForNode(node: JSONObject, depth: Int, path: List<Int>): View {
+        if (node.optString("nodeType") == "page") {
+            return pageView(node, depth).also { nodeViews[path] = it }
+        }
         val rendered = when (node.optString("kind")) {
             "list" -> listView(node, depth, path)
             "listItem" -> listItemView(node, 0, null, depth, path)
@@ -920,6 +924,42 @@ class NativeBlockEditorSurface(context: Context) : ScrollView(context) {
         return TextLeaf(context).also { configureTextLeaf(it, node) }
     }
 
+    private fun pageView(node: JSONObject, depth: Int): View {
+        val density = resources.displayMetrics.density
+        val attrs = node.optJSONObject("attrs")
+        val row = LinearLayout(context).apply {
+            orientation = LinearLayout.HORIZONTAL
+            gravity = android.view.Gravity.CENTER_VERTICAL
+            val horizontal = (6 * density).toInt()
+            val vertical = (5 * density).toInt()
+            setPadding(horizontal + (depth * 8 * density).toInt(), vertical, horizontal, vertical)
+        }
+        row.addView(TextView(context).apply {
+            text = attrs?.optString("icon", "📄") ?: "📄"
+            setTextSize(TypedValue.COMPLEX_UNIT_SP, 18f)
+        }, LinearLayout.LayoutParams((28 * density).toInt(), ViewGroup.LayoutParams.WRAP_CONTENT))
+        val title = textBlockView(node, depth) as TextLeaf
+        title.setTypeface(title.typeface, Typeface.BOLD)
+        row.addView(title, LinearLayout.LayoutParams(0, ViewGroup.LayoutParams.WRAP_CONTENT, 1f))
+        row.addView(TextView(context).apply {
+            text = "→"
+            contentDescription = "Open page"
+            gravity = android.view.Gravity.CENTER
+            setTextSize(TypedValue.COMPLEX_UNIT_SP, 18f)
+            setTypeface(typeface, Typeface.BOLD)
+            setOnClickListener {
+                val pageId = attrs?.optString("pageId").orEmpty()
+                if (pageId.isNotEmpty()) onPageOpen?.invoke(
+                    pageId,
+                    title.text?.toString().orEmpty().ifEmpty { "Untitled" },
+                    attrs?.optString("icon")?.takeIf(String::isNotEmpty),
+                    attrs?.optString("href")?.takeIf(String::isNotEmpty),
+                )
+            }
+        }, LinearLayout.LayoutParams((40 * density).toInt(), (40 * density).toInt()))
+        return row
+    }
+
     private fun configureTextLeaf(leaf: TextLeaf, node: JSONObject) {
         val rendered = attributedInlineContent(node)
         val hadFocus = leaf.hasFocus()

package/android/src/main/java/com/apollohg/editor/NativeEditorExpoView.kt

@@ -727,6 +727,12 @@ class NativeEditorExpoView(
         addView(richTextView, LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT))
         richTextView.onSelectionChange = ::onSelectionChanged
         richTextView.onEditorUpdate = ::onEditorUpdate
+        richTextView.onPageOpen = { pageId, title, icon, href ->
+            val event = mutableMapOf<String, Any>("type" to "pageOpen", "pageId" to pageId, "title" to title)
+            icon?.let { event["icon"] = it }
+            href?.let { event["href"] = it }
+            emitAddonEvent(mapOf("eventJson" to JSONObject(event).toString()))
+        }
         richTextView.onBeforeDetachedFromWindow = {
             prepareForDetachFromWindow()
         }

package/android/src/main/java/com/apollohg/editor/RichTextEditorView.kt

@@ -38,6 +38,7 @@ class RichTextEditorView @JvmOverloads constructor(
     var onSelectionChange: ((Int, Int) -> Unit)? = null
     var onEditorUpdate: ((String) -> Unit)? = null
     var onFocusChange: ((Boolean) -> Unit)? = null
+    var onPageOpen: ((String, String, String?, String?) -> Unit)? = null
 
     var editorId: Long
         get() = currentEditorId
@@ -60,6 +61,7 @@ class RichTextEditorView @JvmOverloads constructor(
         blockSurface.onSelectionChange = { anchor, head -> onSelectionChange?.invoke(anchor, head) }
         blockSurface.onEditorUpdate = { update -> onEditorUpdate?.invoke(update) }
         blockSurface.onFocusChange = { focused -> onFocusChange?.invoke(focused) }
+        blockSurface.onPageOpen = { pageId, title, icon, href -> onPageOpen?.invoke(pageId, title, icon, href) }
         updateAppearance()
     }
 

package/dist/NativeRichTextEditor.d.ts

@@ -81,6 +81,13 @@ export interface NativeRichTextEditorProps {
     onRequestLink?: (context: LinkRequestContext) => void;
     /** Called when a toolbar image item is pressed so the host can choose an image source. */
     onRequestImage?: (context: ImageRequestContext) => void;
+    /** Called when the disclosure control on a Page block is pressed. */
+    onOpenPage?: (page: {
+        pageId: string;
+        title: string;
+        icon?: string | null;
+        href?: string | null;
+    }) => void;
     /** Whether plain URLs typed or pasted into the editor should be converted into link marks automatically. */
     autoDetectLinks?: boolean;
     /** Whether `data:image/...` sources are accepted for image insertion and HTML parsing. */

package/dist/NativeRichTextEditor.js

@@ -559,7 +559,7 @@ function doesLiveMentionQueryConflictWithNativeSelectRequest(request, currentQue
         currentQuery.range.anchor !== request.range.anchor ||
         currentQuery.range.head !== request.range.head);
 }
-exports.NativeRichTextEditor = (0, react_1.forwardRef)(function NativeRichTextEditor({ initialContent, initialJSON, value, valueJSON, valueJSONRevision, valueJSONUpdateMode = 'replace', preserveSelectionOnValueJSONReset = false, selectionOnValueJSONReset, schema, placeholder, editable = true, maxLength, autoFocus = false, autoCapitalize, autoCorrect, keyboardType, keyboardAppearance, heightBehavior = 'autoGrow', showToolbar = true, toolbarPlacement = 'keyboard', toolbarItems = EditorToolbar_1.DEFAULT_EDITOR_TOOLBAR_ITEMS, onToolbarAction, onRequestLink, onRequestImage, autoDetectLinks = false, onContentChange, onContentChangeJSON, onSelectionChange, onActiveStateChange, onHistoryStateChange, onFocus, onBlur, style, containerStyle, theme, addons, remoteSelections, allowBase64Images = false, allowImageResizing = true, }, ref) {
+exports.NativeRichTextEditor = (0, react_1.forwardRef)(function NativeRichTextEditor({ initialContent, initialJSON, value, valueJSON, valueJSONRevision, valueJSONUpdateMode = 'replace', preserveSelectionOnValueJSONReset = false, selectionOnValueJSONReset, schema, placeholder, editable = true, maxLength, autoFocus = false, autoCapitalize, autoCorrect, keyboardType, keyboardAppearance, heightBehavior = 'autoGrow', showToolbar = true, toolbarPlacement = 'keyboard', toolbarItems = EditorToolbar_1.DEFAULT_EDITOR_TOOLBAR_ITEMS, onToolbarAction, onRequestLink, onRequestImage, onOpenPage, autoDetectLinks = false, onContentChange, onContentChangeJSON, onSelectionChange, onActiveStateChange, onHistoryStateChange, onFocus, onBlur, style, containerStyle, theme, addons, remoteSelections, allowBase64Images = false, allowImageResizing = true, }, ref) {
     const bridgeRef = (0, react_1.useRef)(null);
     const nativeViewRef = (0, react_1.useRef)(null);
     const [isReady, setIsReady] = (0, react_1.useState)(false);
@@ -2054,6 +2054,15 @@ exports.NativeRichTextEditor = (0, react_1.forwardRef)(function NativeRichTextEd
         }
         if (!parsed)
             return;
+        if (parsed.type === 'pageOpen') {
+            onOpenPage?.({
+                pageId: parsed.pageId,
+                title: parsed.title,
+                icon: parsed.icon,
+                href: parsed.href,
+            });
+            return;
+        }
         let parsedDocumentVersion = typeof parsed.documentVersion === 'number' ? parsed.documentVersion : undefined;
         if (typeof parsedDocumentVersion !== 'number' &&
             parsed.type === 'mentionsSelectRequest' &&
@@ -2169,6 +2178,7 @@ exports.NativeRichTextEditor = (0, react_1.forwardRef)(function NativeRichTextEd
         resolveMentionInsertionAttrs,
         runAndApplyWithCommandRetry,
         setMentionQueryEventState,
+        onOpenPage,
         syncPreflightUpdateFromNativeEvent,
     ]);
     (0, react_1.useImperativeHandle)(ref, () => ({

package/dist/addons.d.ts

@@ -65,6 +65,12 @@ export interface SerializedEditorAddons {
     mentions?: SerializedMentionsAddonConfig;
 }
 export type EditorAddonEvent = {
+    type: 'pageOpen';
+    pageId: string;
+    title: string;
+    icon?: string | null;
+    href?: string | null;
+} | {
     type: 'mentionsQueryChange';
     query: string;
     trigger: string;

package/ios/NativeBlockEditorSurface.swift

@@ -1,6 +1,7 @@
 import UIKit
 
 final class NativeBlockEditorSurface: UIScrollView, UITextViewDelegate, UIGestureRecognizerDelegate {
+    var onPageOpen: ((String, String, String?, String?) -> Void)?
     private final class TextLeafView: UITextView {
         struct PositionSegment {
             let range: NSRange
@@ -696,6 +697,11 @@ final class NativeBlockEditorSurface: UIScrollView, UITextViewDelegate, UIGestur
     }
 
     private func view(for node: [String: Any], depth: Int, path: [Int]) -> UIView {
+        if node["nodeType"] as? String == "page" {
+            let rendered = pageView(for: node, depth: depth)
+            nodeViews[path] = rendered
+            return rendered
+        }
         let rendered: UIView = switch node["kind"] as? String {
         case "list":
             listView(for: node, depth: depth, path: path)
@@ -1046,6 +1052,42 @@ final class NativeBlockEditorSurface: UIScrollView, UITextViewDelegate, UIGestur
         return leaf
     }
 
+    private func pageView(for node: [String: Any], depth: Int) -> UIView {
+        let row = UIStackView()
+        row.axis = .horizontal
+        row.alignment = .center
+        row.spacing = 8
+        row.layoutMargins = UIEdgeInsets(top: 5, left: CGFloat(depth) * 8 + 6, bottom: 5, right: 6)
+        row.isLayoutMarginsRelativeArrangement = true
+        row.layer.cornerRadius = 8
+
+        let icon = UILabel()
+        icon.text = stringAttr(node, "icon") ?? "📄"
+        icon.font = .systemFont(ofSize: 18)
+        icon.setContentHuggingPriority(.required, for: .horizontal)
+        row.addArrangedSubview(icon)
+
+        let title = textBlockView(for: node, depth: depth)
+        if let leaf = title as? UITextView {
+            leaf.font = .systemFont(ofSize: 16, weight: .semibold)
+            leaf.textColor = baseTextColor
+        }
+        row.addArrangedSubview(title)
+
+        let open = UIButton(type: .system)
+        open.setTitle("→", for: .normal)
+        open.titleLabel?.font = .systemFont(ofSize: 18, weight: .semibold)
+        open.accessibilityLabel = "Open page"
+        open.setContentHuggingPriority(.required, for: .horizontal)
+        open.addAction(UIAction { [weak self, weak title] _ in
+            guard let pageId = self?.stringAttr(node, "pageId"), !pageId.isEmpty else { return }
+            let pageTitle = (title as? UITextView)?.text ?? "Untitled"
+            self?.onPageOpen?(pageId, pageTitle, self?.stringAttr(node, "icon"), self?.stringAttr(node, "href"))
+        }, for: .touchUpInside)
+        row.addArrangedSubview(open)
+        return row
+    }
+
     private func configureTextLeaf(_ leaf: TextLeafView, for node: [String: Any]) {
         let wasFirstResponder = leaf.isFirstResponder
         let previousSelection = leaf.selectedRange

package/ios/NativeEditorExpoView.swift

@@ -2101,6 +2101,14 @@ class NativeEditorExpoView: ExpoView, UIGestureRecognizerDelegate {
             if focused { self?.handleTextDidBeginEditing() }
             else { self?.handleTextDidEndEditing() }
         }
+        richTextView.onPageOpen = { [weak self] pageId, title, icon, href in
+            var event: [String: Any] = ["type": "pageOpen", "pageId": pageId, "title": title]
+            if let icon { event["icon"] = icon }
+            if let href { event["href"] = href }
+            guard let data = try? JSONSerialization.data(withJSONObject: event),
+                  let json = String(data: data, encoding: .utf8) else { return }
+            self?.onAddonEvent(["eventJson": json])
+        }
         configureAccessoryToolbar()
 
         addSubview(richTextView)

package/ios/RichTextEditorView.swift

@@ -646,6 +646,7 @@ final class RichTextEditorView: UIView {
     var onSelectionChange: ((UInt32, UInt32) -> Void)?
     var onEditorUpdate: ((String) -> Void)?
     var onFocusChange: ((Bool) -> Void)?
+    var onPageOpen: ((String, String, String?, String?) -> Void)?
     private var lastAutoGrowWidth: CGFloat = 0
     private var cachedAutoGrowMeasuredHeight: CGFloat = 0
     private var remoteSelections: [RemoteSelectionDecoration] = []
@@ -760,6 +761,9 @@ final class RichTextEditorView: UIView {
         blockSurface.onFocusChange = { [weak self] focused in
             self?.onFocusChange?(focused)
         }
+        blockSurface.onPageOpen = { [weak self] pageId, title, icon, href in
+            self?.onPageOpen?(pageId, title, icon, href)
+        }
         blockSurface.onContentHeightMayChange = { [weak self] measuredHeight in
             guard let self, self.heightBehavior == .autoGrow else { return }
             self.cachedAutoGrowMeasuredHeight = measuredHeight

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openeditor/react-native-prose-editor",
-  "version": "0.0.11",
+  "version": "0.0.12",
   "description": "OpenEditor-owned native rich text editor engine for React Native",
   "license": "Apache-2.0",
   "homepage": "https://github.com/EasyLink-HQ/openeditor",