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

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

@@ -42,6 +42,7 @@ import uniffi.editor_core.editorSetNodeSelection
 import uniffi.editor_core.editorSetSelection
 import uniffi.editor_core.editorSplitBlock
 import uniffi.editor_core.editorToggleTaskItemCheckedAtSelectionScalar
+import uniffi.editor_core.editorUpdateNodeAttrs
 
 internal data class SelectedImageGeometry(val docPos: Int, val rect: RectF)
 
@@ -696,10 +697,6 @@ class NativeBlockEditorSurface(context: Context) : ScrollView(context) {
             orientation = LinearLayout.HORIZONTAL
             isBaselineAligned = false
         }
-        row.addView(
-            markerView(node, parentListType, index),
-            LinearLayout.LayoutParams((24 * density).toInt(), (24 * density).toInt())
-        )
         val content = LinearLayout(context).apply {
             orientation = LinearLayout.VERTICAL
             setPadding((8 * density).toInt(), 0, 0, 0)
@@ -711,12 +708,26 @@ class NativeBlockEditorSurface(context: Context) : ScrollView(context) {
         if (content.childCount == 0) {
             content.addView(textBlockView(node, depth + 1))
         }
+        val marker = if (parentListType == "toggleList" || parentListType == "toggle_list") {
+            val open = node.optJSONObject("attrs")?.optBoolean("open", true) ?: true
+            setToggleContent(content, open)
+            toggleMarkerView(node, content, open)
+        } else {
+            markerView(node, parentListType, index)
+        }
+        row.addView(
+            marker,
+            LinearLayout.LayoutParams((24 * density).toInt(), (24 * density).toInt())
+        )
         row.addView(content, LinearLayout.LayoutParams(0, ViewGroup.LayoutParams.WRAP_CONTENT, 1f))
         return row
     }
 
     private fun blockContainerView(node: JSONObject, depth: Int, path: List<Int>): View {
         val density = resources.displayMetrics.density
+        if (node.optString("nodeType") == "callout") {
+            return calloutView(node, depth, path)
+        }
         if (node.optString("nodeType") == "blockquote") {
             val row = LinearLayout(context).apply {
                 orientation = LinearLayout.HORIZONTAL
@@ -755,6 +766,86 @@ class NativeBlockEditorSurface(context: Context) : ScrollView(context) {
         return container
     }
 
+    private fun calloutView(node: JSONObject, depth: Int, path: List<Int>): View {
+        val density = resources.displayMetrics.density
+        val tone = node.optJSONObject("attrs")?.optString("tone", "info") ?: "info"
+        val accent = when (tone) {
+            "success" -> 0xFF16A34A.toInt()
+            "warning" -> 0xFFD97706.toInt()
+            "danger" -> 0xFFDC2626.toInt()
+            else -> 0xFF2563EB.toInt()
+        }
+        val container = LinearLayout(context).apply {
+            orientation = LinearLayout.VERTICAL
+            val padding = (12 * density).toInt()
+            setPadding(padding, padding, padding, padding)
+            background = roundedDrawable(
+                Color.argb(24, Color.red(accent), Color.green(accent), Color.blue(accent)),
+                Color.argb(140, Color.red(accent), Color.green(accent), Color.blue(accent)),
+                1f,
+                10f
+            )
+        }
+        container.addView(TextView(context).apply {
+            text = tone.replaceFirstChar { it.uppercase() }
+            setTextColor(accent)
+            setTextSize(TypedValue.COMPLEX_UNIT_SP, 12f)
+            setTypeface(typeface, Typeface.BOLD)
+            isClickable = this@NativeBlockEditorSurface.isEditable
+            setOnClickListener { cycleCalloutTone(node) }
+        })
+        val children = node.optJSONArray("children")
+        for (index in 0 until (children?.length() ?: 0)) {
+            children?.optJSONObject(index)?.let { container.addView(viewForNode(it, depth + 1, path + index)) }
+        }
+        return container
+    }
+
+    private fun toggleMarkerView(node: JSONObject, content: LinearLayout, initiallyOpen: Boolean): View =
+        TextView(context).apply {
+            var open = initiallyOpen
+            text = if (open) "⌄" else "›"
+            contentDescription = if (open) "Collapse toggle item" else "Expand toggle item"
+            gravity = android.view.Gravity.CENTER
+            setTextColor(currentTheme?.list?.markerColor ?: baseTextColor)
+            setTextSize(TypedValue.COMPLEX_UNIT_SP, 18f)
+            setTypeface(typeface, Typeface.BOLD)
+            setOnClickListener {
+                open = !open
+                text = if (open) "⌄" else "›"
+                contentDescription = if (open) "Collapse toggle item" else "Expand toggle item"
+                setToggleContent(content, open)
+                if (isEditable) updateNodeAttrs(node, JSONObject().put("open", open))
+            }
+        }
+
+    private fun setToggleContent(content: LinearLayout, open: Boolean) {
+        for (index in 1 until content.childCount) {
+            content.getChildAt(index).visibility = if (open) View.VISIBLE else View.GONE
+        }
+    }
+
+    private fun cycleCalloutTone(node: JSONObject) {
+        if (!isEditable) return
+        val tones = listOf("info", "success", "warning", "danger")
+        val current = node.optJSONObject("attrs")?.optString("tone", "info") ?: "info"
+        val next = tones[(tones.indexOf(current).coerceAtLeast(0) + 1) % tones.size]
+        updateNodeAttrs(node, JSONObject().put("tone", next))
+    }
+
+    private fun updateNodeAttrs(node: JSONObject, patch: JSONObject) {
+        if (currentEditorId == 0L) return
+        val attrs = JSONObject(node.optJSONObject("attrs")?.toString() ?: "{}")
+        patch.keys().forEach { key -> attrs.put(key, patch.get(key)) }
+        val updateJSON = editorUpdateNodeAttrs(
+            currentEditorId.toULong(),
+            node.optInt("docPos", 0).toUInt(),
+            attrs.toString()
+        )
+        applyUpdateJSON(updateJSON, currentEditorId)
+        onAppliedUpdate?.invoke(updateJSON)
+    }
+
     private fun tableView(node: JSONObject, path: List<Int>): View {
         val tableId = nextTableId++
         val table = LinearLayout(context).apply {

package/ios/Generated_editor_core.swift

@@ -1323,6 +1323,18 @@ public func editorUnwrapFromListAtSelectionScalar(id: UInt64, scalarAnchor: UInt
     )
 })
 }
+/**
+ * Replace a node's attributes at its document position.
+ */
+public func editorUpdateNodeAttrs(id: UInt64, pos: UInt32, attrsJson: String) -> String  {
+    return try!  FfiConverterString.lift(try! rustCall() {
+    uniffi_editor_core_fn_func_editor_update_node_attrs(
+        FfiConverterUInt64.lower(id),
+        FfiConverterUInt32.lower(pos),
+        FfiConverterString.lower(attrsJson),$0
+    )
+})
+}
 /**
  * Wrap the current selection in a list. Returns an update JSON string.
  */
@@ -1582,6 +1594,9 @@ private let initializationResult: InitializationResult = {
     if (uniffi_editor_core_checksum_func_editor_unwrap_from_list_at_selection_scalar() != 57899) {
         return InitializationResult.apiChecksumMismatch
     }
+    if (uniffi_editor_core_checksum_func_editor_update_node_attrs() != 14684) {
+        return InitializationResult.apiChecksumMismatch
+    }
     if (uniffi_editor_core_checksum_func_editor_wrap_in_list() != 32846) {
         return InitializationResult.apiChecksumMismatch
     }

package/ios/NativeBlockEditorSurface.swift

@@ -785,8 +785,6 @@ final class NativeBlockEditorSurface: UIScrollView, UITextViewDelegate, UIGestur
         row.alignment = .top
         row.spacing = 8
 
-        row.addArrangedSubview(markerView(for: node, parentListType: parentListType, index: index))
-
         let content = UIStackView()
         content.axis = .vertical
         content.spacing = 4
@@ -796,11 +794,20 @@ final class NativeBlockEditorSurface: UIScrollView, UITextViewDelegate, UIGestur
         if content.arrangedSubviews.isEmpty {
             content.addArrangedSubview(textBlockView(for: node, depth: depth + 1))
         }
+        if parentListType == "toggleList" || parentListType == "toggle_list" {
+            row.addArrangedSubview(toggleMarkerView(for: node, content: content))
+            setToggleContent(content, open: boolAttr(node, "open") ?? true)
+        } else {
+            row.addArrangedSubview(markerView(for: node, parentListType: parentListType, index: index))
+        }
         row.addArrangedSubview(content)
         return row
     }
 
     private func blockContainerView(for node: [String: Any], depth: Int, path: [Int]) -> UIView {
+        if (node["nodeType"] as? String) == "callout" {
+            return calloutView(for: node, depth: depth, path: path)
+        }
         let container = UIStackView()
         container.axis = .vertical
         container.spacing = 4
@@ -834,6 +841,96 @@ final class NativeBlockEditorSurface: UIScrollView, UITextViewDelegate, UIGestur
         return container
     }
 
+    private func calloutView(for node: [String: Any], depth: Int, path: [Int]) -> UIView {
+        let tone = stringAttr(node, "tone") ?? "info"
+        let accent: UIColor = switch tone {
+        case "success": .systemGreen
+        case "warning": .systemOrange
+        case "danger": .systemRed
+        default: .systemBlue
+        }
+        let container = UIStackView()
+        container.axis = .vertical
+        container.spacing = 8
+        container.layoutMargins = UIEdgeInsets(top: 12, left: 12, bottom: 12, right: 12)
+        container.isLayoutMarginsRelativeArrangement = true
+        container.backgroundColor = accent.withAlphaComponent(0.1)
+        container.layer.borderColor = accent.withAlphaComponent(0.55).cgColor
+        container.layer.borderWidth = 1
+        container.layer.cornerRadius = 10
+
+        let toneButton = UIButton(type: .system)
+        toneButton.setTitle(tone.capitalized, for: .normal)
+        toneButton.setTitleColor(accent, for: .normal)
+        toneButton.titleLabel?.font = .systemFont(ofSize: 12, weight: .semibold)
+        toneButton.contentHorizontalAlignment = .leading
+        toneButton.isEnabled = isEditable
+        toneButton.addAction(UIAction { [weak self] _ in
+            self?.cycleCalloutTone(node)
+        }, for: .touchUpInside)
+        container.addArrangedSubview(toneButton)
+
+        for (index, child) in (node["children"] as? [[String: Any]] ?? []).enumerated() {
+            container.addArrangedSubview(view(for: child, depth: depth + 1, path: path + [index]))
+        }
+        return container
+    }
+
+    private func toggleMarkerView(for node: [String: Any], content: UIStackView) -> UIView {
+        let open = boolAttr(node, "open") ?? true
+        let button = UIButton(type: .system)
+        button.setTitle(open ? "⌄" : "›", for: .normal)
+        button.titleLabel?.font = .systemFont(ofSize: 18, weight: .semibold)
+        button.accessibilityLabel = open ? "Collapse toggle item" : "Expand toggle item"
+        button.addAction(UIAction { [weak self, weak button, weak content] _ in
+            guard let self, let button, let content else { return }
+            let nextOpen = button.title(for: .normal) != "⌄"
+            button.setTitle(nextOpen ? "⌄" : "›", for: .normal)
+            button.accessibilityLabel = nextOpen ? "Collapse toggle item" : "Expand toggle item"
+            self.setToggleContent(content, open: nextOpen)
+            if self.isEditable {
+                self.updateNodeAttrs(node, patch: ["open": nextOpen])
+            }
+        }, for: .touchUpInside)
+        let wrapper = UIView()
+        wrapper.widthAnchor.constraint(equalToConstant: 24).isActive = true
+        wrapper.heightAnchor.constraint(equalToConstant: 24).isActive = true
+        button.translatesAutoresizingMaskIntoConstraints = false
+        wrapper.addSubview(button)
+        NSLayoutConstraint.activate([
+            button.centerXAnchor.constraint(equalTo: wrapper.centerXAnchor),
+            button.centerYAnchor.constraint(equalTo: wrapper.centerYAnchor),
+        ])
+        return wrapper
+    }
+
+    private func setToggleContent(_ content: UIStackView, open: Bool) {
+        for (index, child) in content.arrangedSubviews.enumerated() where index > 0 {
+            child.isHidden = !open
+        }
+    }
+
+    private func cycleCalloutTone(_ node: [String: Any]) {
+        guard isEditable else { return }
+        let tones = ["info", "success", "warning", "danger"]
+        let current = stringAttr(node, "tone") ?? "info"
+        let next = tones[((tones.firstIndex(of: current) ?? 0) + 1) % tones.count]
+        updateNodeAttrs(node, patch: ["tone": next])
+    }
+
+    private func updateNodeAttrs(_ node: [String: Any], patch: [String: Any]) {
+        guard currentEditorId != 0 else { return }
+        var attrs = node["attrs"] as? [String: Any] ?? [:]
+        attrs.merge(patch) { _, next in next }
+        guard let data = try? JSONSerialization.data(withJSONObject: attrs),
+              let json = String(data: data, encoding: .utf8)
+        else { return }
+        let pos = (node["docPos"] as? NSNumber)?.uint32Value ?? 0
+        let updateJSON = editorUpdateNodeAttrs(id: currentEditorId, pos: pos, attrsJson: json)
+        applyUpdateJSON(updateJSON, editorId: currentEditorId)
+        onAppliedUpdate?(updateJSON)
+    }
+
     func blockquoteStripeRectsForTesting() -> [CGRect] {
         layoutIfNeeded()
         return descendants(of: self)
@@ -1549,6 +1646,10 @@ final class NativeBlockEditorSurface: UIScrollView, UITextViewDelegate, UIGestur
         return attrs[key] as? Bool
     }
 
+    private func stringAttr(_ node: [String: Any], _ key: String) -> String? {
+        (node["attrs"] as? [String: Any])?[key] as? String
+    }
+
     private func isCodeBlock(_ node: [String: Any]) -> Bool {
         let nodeType = node["nodeType"] as? String
         return nodeType == "codeBlock" || nodeType == "code_block"

package/ios/editor_coreFFI/editor_coreFFI.h

@@ -617,6 +617,11 @@ RustBuffer uniffi_editor_core_fn_func_editor_unwrap_from_list(uint64_t id, RustC
 RustBuffer uniffi_editor_core_fn_func_editor_unwrap_from_list_at_selection_scalar(uint64_t id, uint32_t scalar_anchor, uint32_t scalar_head, RustCallStatus *_Nonnull out_status
 );
 #endif
+#ifndef UNIFFI_FFIDEF_UNIFFI_EDITOR_CORE_FN_FUNC_EDITOR_UPDATE_NODE_ATTRS
+#define UNIFFI_FFIDEF_UNIFFI_EDITOR_CORE_FN_FUNC_EDITOR_UPDATE_NODE_ATTRS
+RustBuffer uniffi_editor_core_fn_func_editor_update_node_attrs(uint64_t id, uint32_t pos, RustBuffer attrs_json, RustCallStatus *_Nonnull out_status
+);
+#endif
 #ifndef UNIFFI_FFIDEF_UNIFFI_EDITOR_CORE_FN_FUNC_EDITOR_WRAP_IN_LIST
 #define UNIFFI_FFIDEF_UNIFFI_EDITOR_CORE_FN_FUNC_EDITOR_WRAP_IN_LIST
 RustBuffer uniffi_editor_core_fn_func_editor_wrap_in_list(uint64_t id, RustBuffer list_type, RustCallStatus *_Nonnull out_status
@@ -1343,6 +1348,12 @@ uint16_t uniffi_editor_core_checksum_func_editor_unwrap_from_list(void
 #define UNIFFI_FFIDEF_UNIFFI_EDITOR_CORE_CHECKSUM_FUNC_EDITOR_UNWRAP_FROM_LIST_AT_SELECTION_SCALAR
 uint16_t uniffi_editor_core_checksum_func_editor_unwrap_from_list_at_selection_scalar(void
 
+);
+#endif
+#ifndef UNIFFI_FFIDEF_UNIFFI_EDITOR_CORE_CHECKSUM_FUNC_EDITOR_UPDATE_NODE_ATTRS
+#define UNIFFI_FFIDEF_UNIFFI_EDITOR_CORE_CHECKSUM_FUNC_EDITOR_UPDATE_NODE_ATTRS
+uint16_t uniffi_editor_core_checksum_func_editor_update_node_attrs(void
+
 );
 #endif
 #ifndef UNIFFI_FFIDEF_UNIFFI_EDITOR_CORE_CHECKSUM_FUNC_EDITOR_WRAP_IN_LIST

package/package.json

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

package/rust/bindings/kotlin/uniffi/editor_core/editor_core.kt

@@ -911,6 +911,8 @@ internal interface IntegrityCheckingUniffiLib : Library {
 
     fun uniffi_editor_core_checksum_func_editor_unwrap_from_list_at_selection_scalar(): Short
 
+    fun uniffi_editor_core_checksum_func_editor_update_node_attrs(): Short
+
     fun uniffi_editor_core_checksum_func_editor_wrap_in_list(): Short
 
     fun uniffi_editor_core_checksum_func_editor_wrap_in_list_at_selection_scalar(): Short
@@ -1398,6 +1400,13 @@ internal interface UniffiLib : Library {
         uniffi_out_err: UniffiRustCallStatus,
     ): RustBuffer.ByValue
 
+    fun uniffi_editor_core_fn_func_editor_update_node_attrs(
+        `id`: Long,
+        `pos`: Int,
+        `attrsJson`: RustBuffer.ByValue,
+        uniffi_out_err: UniffiRustCallStatus,
+    ): RustBuffer.ByValue
+
     fun uniffi_editor_core_fn_func_editor_wrap_in_list(
         `id`: Long,
         `listType`: RustBuffer.ByValue,
@@ -1860,6 +1869,9 @@ private fun uniffiCheckApiChecksums(lib: IntegrityCheckingUniffiLib) {
     if (lib.uniffi_editor_core_checksum_func_editor_unwrap_from_list_at_selection_scalar() != 57899.toShort()) {
         throw RuntimeException("UniFFI API checksum mismatch: try cleaning and rebuilding your project")
     }
+    if (lib.uniffi_editor_core_checksum_func_editor_update_node_attrs() != 14684.toShort()) {
+        throw RuntimeException("UniFFI API checksum mismatch: try cleaning and rebuilding your project")
+    }
     if (lib.uniffi_editor_core_checksum_func_editor_wrap_in_list() != 32846.toShort()) {
         throw RuntimeException("UniFFI API checksum mismatch: try cleaning and rebuilding your project")
     }
@@ -3212,6 +3224,25 @@ fun `editorUnwrapFromListAtSelectionScalar`(
         },
     )
 
+/**
+ * Replace a node's attributes at its document position.
+ */
+fun `editorUpdateNodeAttrs`(
+    `id`: kotlin.ULong,
+    `pos`: kotlin.UInt,
+    `attrsJson`: kotlin.String,
+): kotlin.String =
+    FfiConverterString.lift(
+        uniffiRustCall { _status ->
+            UniffiLib.INSTANCE.uniffi_editor_core_fn_func_editor_update_node_attrs(
+                FfiConverterULong.lower(`id`),
+                FfiConverterUInt.lower(`pos`),
+                FfiConverterString.lower(`attrsJson`),
+                _status,
+            )
+        },
+    )
+
 /**
  * Wrap the current selection in a list. Returns an update JSON string.
  */