@apollohg/react-native-prose-editor 0.5.7 → 0.5.9

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

@@ -339,7 +339,7 @@ class EditorEditText @JvmOverloads constructor(
         val resolvedTypeface = resolvePlaceholderTypeface(textStyle)
 
         return TextPaint(paint).apply {
-            color = currentHintTextColor
+            color = theme?.placeholderColor ?: currentHintTextColor
             textSize = resolvedTextSize
             typeface = resolvedTypeface
         }

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

@@ -304,6 +304,7 @@ data class EditorTheme(
     val mentions: EditorMentionTheme? = null,
     val links: EditorLinkTheme? = null,
     val toolbar: EditorToolbarTheme? = null,
+    val placeholderColor: Int? = null,
     val backgroundColor: Int? = null,
     val borderRadius: Float? = null,
     val contentInsets: EditorContentInsets? = null
@@ -335,6 +336,7 @@ data class EditorTheme(
                 mentions = EditorMentionTheme.fromJson(root.optJSONObject("mentions")),
                 links = EditorLinkTheme.fromJson(root.optJSONObject("links")),
                 toolbar = EditorToolbarTheme.fromJson(root.optJSONObject("toolbar")),
+                placeholderColor = parseColor(root.optNullableString("placeholderColor")),
                 backgroundColor = parseColor(root.optNullableString("backgroundColor")),
                 borderRadius = root.optNullableFloat("borderRadius"),
                 contentInsets = EditorContentInsets.fromJson(root.optJSONObject("contentInsets"))
@@ -360,6 +362,10 @@ private fun parseColor(raw: String?): Int? {
     val value = raw?.trim()?.lowercase() ?: return null
     if (value.isEmpty()) return null
 
+    when (value) {
+        "clear", "transparent" -> return Color.TRANSPARENT
+    }
+
     parseCssHexColor(value)?.let { return it }
 
     try {

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

@@ -405,8 +405,19 @@ class NativeEditorExpoView(
             return false
         }
         val toolbarFrame = toolbarFrameInWindow
-        if (toolbarFrame != null && toolbarFrame.contains(event.rawX, event.rawY)) {
-            return false
+        if (toolbarFrame != null) {
+            // toolbarFrame is in DP (from React Native's measureInWindow),
+            // but rawX/rawY are in pixels — convert before comparing.
+            val density = resources.displayMetrics.density
+            val frameInPx = RectF(
+                toolbarFrame.left * density,
+                toolbarFrame.top * density,
+                toolbarFrame.right * density,
+                toolbarFrame.bottom * density
+            )
+            if (frameInPx.contains(event.rawX, event.rawY)) {
+                return false
+            }
         }
         val rect = Rect()
         richTextView.editorEditText.getGlobalVisibleRect(rect)

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

@@ -54,6 +54,7 @@ class RichTextEditorView @JvmOverloads constructor(
     private var baseBackgroundColor: Int = Color.WHITE
     private var viewportBottomInsetPx: Int = 0
     internal var appliedCornerRadiusPx: Float = 0f
+    internal var appliedBackgroundColorForTesting: Int = Color.WHITE
 
     /** Binds or unbinds the Rust editor instance. */
     var editorId: Long = 0
@@ -251,13 +252,15 @@ class RichTextEditorView @JvmOverloads constructor(
 
     private fun updateScrollContainerAppearance() {
         val cornerRadiusPx = (theme?.borderRadius ?: 0f) * resources.displayMetrics.density
+        val backgroundColor = theme?.backgroundColor ?: baseBackgroundColor
         editorViewport.background = GradientDrawable().apply {
             cornerRadius = cornerRadiusPx
-            setColor(theme?.backgroundColor ?: baseBackgroundColor)
+            setColor(backgroundColor)
         }
         editorViewport.clipToOutline = cornerRadiusPx > 0f
         editorScrollView.setBackgroundColor(Color.TRANSPARENT)
         appliedCornerRadiusPx = cornerRadiusPx
+        appliedBackgroundColorForTesting = backgroundColor
     }
 
     private fun updateScrollContainerInsets() {

package/dist/EditorTheme.d.ts

@@ -96,6 +96,7 @@ export interface EditorTheme {
     mentions?: EditorMentionTheme;
     links?: EditorLinkTheme;
     toolbar?: EditorToolbarTheme;
+    placeholderColor?: string;
     backgroundColor?: string;
     borderRadius?: number;
     contentInsets?: EditorContentInsets;

package/ios/EditorTheme.swift

@@ -299,6 +299,7 @@ struct EditorTheme {
     var mentions: EditorMentionTheme?
     var links: EditorLinkTheme?
     var toolbar: EditorToolbarTheme?
+    var placeholderColor: UIColor?
     var backgroundColor: UIColor?
     var borderRadius: CGFloat?
     var contentInsets: EditorContentInsets?
@@ -345,6 +346,7 @@ struct EditorTheme {
         if let toolbar = dictionary["toolbar"] as? [String: Any] {
             self.toolbar = EditorToolbarTheme(dictionary: toolbar)
         }
+        placeholderColor = EditorTheme.color(from: dictionary["placeholderColor"])
         backgroundColor = EditorTheme.color(from: dictionary["backgroundColor"])
         borderRadius = EditorTheme.cgFloat(dictionary["borderRadius"])
         if let contentInsets = dictionary["contentInsets"] as? [String: Any] {

package/ios/NativeEditorExpoView.swift

@@ -1576,6 +1576,46 @@ final class EditorAccessoryToolbarView: UIInputView {
     }
 }
 
+/// Keeps iOS keyboard integrations on the inputAccessoryView path when the
+/// visible toolbar is rendered outside the native keyboard accessory.
+final class EditorAccessoryPlaceholderView: UIView {
+    override init(frame: CGRect) {
+        super.init(
+            frame: CGRect(
+                x: frame.origin.x,
+                y: frame.origin.y,
+                width: frame.width,
+                height: 0
+            )
+        )
+        commonInit()
+    }
+
+    required init?(coder: NSCoder) {
+        return nil
+    }
+
+    override var intrinsicContentSize: CGSize {
+        CGSize(width: UIView.noIntrinsicMetric, height: 0)
+    }
+
+    override func sizeThatFits(_ size: CGSize) -> CGSize {
+        CGSize(width: size.width, height: 0)
+    }
+
+    override func point(inside point: CGPoint, with event: UIEvent?) -> Bool {
+        false
+    }
+
+    private func commonInit() {
+        frame.size.height = 0
+        backgroundColor = .clear
+        isOpaque = false
+        isUserInteractionEnabled = false
+        autoresizingMask = [.flexibleWidth]
+    }
+}
+
 class NativeEditorExpoView: ExpoView, EditorTextViewDelegate, UIGestureRecognizerDelegate {
 
     // MARK: - Subviews
@@ -1585,6 +1625,7 @@ class NativeEditorExpoView: ExpoView, EditorTextViewDelegate, UIGestureRecognize
         frame: .zero,
         inputViewStyle: .keyboard
     )
+    private let accessoryPlaceholder = EditorAccessoryPlaceholderView(frame: .zero)
     private var toolbarFrameInWindow: CGRect?
     private var didApplyAutoFocus = false
     private var toolbarState = NativeToolbarState.empty
@@ -2269,14 +2310,33 @@ class NativeEditorExpoView: ExpoView, EditorTextViewDelegate, UIGestureRecognize
     func triggerMentionSuggestionTapForTesting(at index: Int) {
         accessoryToolbar.triggerMentionSuggestionTapForTesting(at: index)
     }
+
+    func inputAccessoryViewForTesting() -> UIView? {
+        richTextView.textView.inputAccessoryView
+    }
+
+    func isUsingAccessoryToolbarForTesting() -> Bool {
+        richTextView.textView.inputAccessoryView === accessoryToolbar
+    }
+
+    func isUsingAccessoryPlaceholderForTesting() -> Bool {
+        richTextView.textView.inputAccessoryView === accessoryPlaceholder
+    }
+
     private func updateAccessoryToolbarVisibility() {
         refreshSystemAssistantToolbarIfNeeded()
-        let nextAccessoryView: UIView? = showsToolbar &&
+        let nextAccessoryView: UIView?
+        if showsToolbar &&
             toolbarPlacement == "keyboard" &&
             richTextView.textView.isEditable &&
             !shouldUseSystemAssistantToolbar
-            ? accessoryToolbar
-            : nil
+        {
+            nextAccessoryView = accessoryToolbar
+        } else if richTextView.textView.isEditable && !shouldUseSystemAssistantToolbar {
+            nextAccessoryView = accessoryPlaceholder
+        } else {
+            nextAccessoryView = nil
+        }
         if richTextView.textView.inputAccessoryView !== nextAccessoryView {
             richTextView.textView.inputAccessoryView = nextAccessoryView
             if richTextView.textView.isFirstResponder {

package/ios/RichTextEditorView.swift

@@ -865,6 +865,7 @@ final class EditorTextView: UITextView, UITextViewDelegate, UIGestureRecognizerD
         didSet {
             renderAppearanceRevision &+= 1
             placeholderLabel.font = resolvedDefaultFont()
+            placeholderLabel.textColor = theme?.placeholderColor ?? .placeholderText
             backgroundColor = theme?.backgroundColor ?? baseBackgroundColor
             if let contentInsets = theme?.contentInsets {
                 textContainerInset = UIEdgeInsets(
@@ -1049,7 +1050,7 @@ final class EditorTextView: UITextView, UITextViewDelegate, UIGestureRecognizerD
         // Register as the text storage delegate so we can detect unauthorized
         // mutations (reconciliation fallback).
         textStorage.delegate = self
-        delegate = self
+        ensureInternalTextViewDelegate()
         addGestureRecognizer(imageSelectionTapRecognizer)
         installImageSelectionTapDependencies()
 
@@ -1160,6 +1161,10 @@ final class EditorTextView: UITextView, UITextViewDelegate, UIGestureRecognizerD
     override func becomeFirstResponder() -> Bool {
         let didBecomeFirstResponder = super.becomeFirstResponder()
         if didBecomeFirstResponder {
+            ensureInternalTextViewDelegate()
+            DispatchQueue.main.async { [weak self] in
+                self?.ensureInternalTextViewDelegate()
+            }
             _ = normalizeSelectionForEmptyBlockAutocapitalizationIfNeeded()
             refreshTypingAttributesForSelection()
         }
@@ -1339,6 +1344,10 @@ final class EditorTextView: UITextView, UITextViewDelegate, UIGestureRecognizerD
         lastApplyUpdateTraceForTesting
     }
 
+    func isUsingInternalTextViewDelegateForTesting() -> Bool {
+        (delegate as AnyObject?) === (self as AnyObject)
+    }
+
     func blockquoteStripeRectsForTesting() -> [CGRect] {
         editorLayoutManager.blockquoteStripeRectsForTesting(in: textStorage)
     }
@@ -1532,6 +1541,7 @@ final class EditorTextView: UITextView, UITextViewDelegate, UIGestureRecognizerD
     ///   - id: The editor ID from `editor_create()`.
     ///   - initialHTML: Optional HTML to set as initial content.
     func bindEditor(id: UInt64, initialHTML: String? = nil) {
+        ensureInternalTextViewDelegate()
         editorId = id
 
         if let html = initialHTML, !html.isEmpty {
@@ -1560,6 +1570,7 @@ final class EditorTextView: UITextView, UITextViewDelegate, UIGestureRecognizerD
     /// Instead of calling `super.insertText()` (which would modify the
     /// underlying text storage directly), we route through Rust.
     override func insertText(_ text: String) {
+        ensureInternalTextViewDelegate()
         guard !isApplyingRustState else {
             super.insertText(text)
             return
@@ -1643,6 +1654,7 @@ final class EditorTextView: UITextView, UITextViewDelegate, UIGestureRecognizerD
     /// If there's a range selection, delete the range. If it's a cursor,
     /// delete the character (grapheme cluster) before the cursor.
     override func deleteBackward() {
+        ensureInternalTextViewDelegate()
         guard !isApplyingRustState else {
             super.deleteBackward()
             return
@@ -1836,6 +1848,7 @@ final class EditorTextView: UITextView, UITextViewDelegate, UIGestureRecognizerD
     ///
     /// We route the replacement through Rust to keep the document model in sync.
     override func replace(_ range: UITextRange, withText text: String) {
+        ensureInternalTextViewDelegate()
         guard !isApplyingRustState else {
             super.replace(range, withText: text)
             return
@@ -1870,6 +1883,7 @@ final class EditorTextView: UITextView, UITextViewDelegate, UIGestureRecognizerD
     /// UITextView display the composing text normally (with its underline
     /// decoration). The text is NOT sent to Rust during composition.
     override func setMarkedText(_ markedText: String?, selectedRange: NSRange) {
+        ensureInternalTextViewDelegate()
         isComposing = true
         Self.inputLog.debug(
             "[setMarkedText] marked=\(self.preview(markedText ?? ""), privacy: .public) nsRange=\(selectedRange.location),\(selectedRange.length) selection=\(self.selectionSummary(), privacy: .public)"
@@ -1885,6 +1899,7 @@ final class EditorTextView: UITextView, UITextViewDelegate, UIGestureRecognizerD
     /// replace the marked text with the final text in the text storage,
     /// but we intercept at a higher level.
     override func unmarkText() {
+        ensureInternalTextViewDelegate()
         // Capture the finalized composed text before UIKit clears it.
         composedText = markedTextRange.flatMap { text(in: $0) }
 
@@ -1918,6 +1933,7 @@ final class EditorTextView: UITextView, UITextViewDelegate, UIGestureRecognizerD
     /// Attempts to extract HTML from the pasteboard first (for rich text paste),
     /// falling back to plain text.
     override func paste(_ sender: Any?) {
+        ensureInternalTextViewDelegate()
         guard editorId != 0 else {
             super.paste(sender)
             return
@@ -1976,6 +1992,7 @@ final class EditorTextView: UITextView, UITextViewDelegate, UIGestureRecognizerD
     /// internally during tap handling and word-boundary resolution.
     func textViewDidChangeSelection(_ textView: UITextView) {
         guard textView === self else { return }
+        ensureInternalTextViewDelegate()
         guard !isApplyingRustState else { return }
         if normalizeSelectionForEmptyBlockAutocapitalizationIfNeeded() {
             return
@@ -2028,6 +2045,14 @@ final class EditorTextView: UITextView, UITextViewDelegate, UIGestureRecognizerD
         interceptedInputDepth > 0
     }
 
+    private func ensureInternalTextViewDelegate() {
+        // Some keyboard integrations replace UITextView's private delegate ivar
+        // directly. The editor must own delegate callbacks so external observers
+        // cannot inspect transient TextKit state during Rust-driven edits.
+        guard (delegate as AnyObject?) !== (self as AnyObject) else { return }
+        delegate = self
+    }
+
     private func performInterceptedInput(_ action: () -> Void) {
         interceptedInputDepth += 1
         Self.inputLog.debug(
@@ -3235,12 +3260,11 @@ final class EditorTextView: UITextView, UITextViewDelegate, UIGestureRecognizerD
         var stringMutationNanos: UInt64 = 0
         var attributeMutationNanos: UInt64 = 0
         let previousTextStorageDelegate = textStorage.delegate
-        let previousTextViewDelegate = delegate
         textStorage.delegate = nil
         delegate = nil
         defer {
             textStorage.delegate = previousTextStorageDelegate
-            delegate = previousTextViewDelegate
+            ensureInternalTextViewDelegate()
         }
         if let replaceRange {
             if shouldUseSmallPatchTextMutation {
@@ -3809,6 +3833,7 @@ final class EditorTextView: UITextView, UITextViewDelegate, UIGestureRecognizerD
     ///
     /// - Parameter updateJSON: The JSON string from editor_insert_text, etc.
     func applyUpdateJSON(_ updateJSON: String, notifyDelegate: Bool = true) {
+        ensureInternalTextViewDelegate()
         let totalStartedAt = DispatchTime.now().uptimeNanoseconds
         let parseStartedAt = totalStartedAt
         guard let data = updateJSON.data(using: .utf8),
@@ -3995,6 +4020,7 @@ final class EditorTextView: UITextView, UITextViewDelegate, UIGestureRecognizerD
     /// Used for initial content loading (set_html / set_json return render
     /// elements directly, not wrapped in an EditorUpdate).
     func applyRenderJSON(_ renderJSON: String) {
+        ensureInternalTextViewDelegate()
         Self.updateLog.debug(
             "[applyRenderJSON.begin] before=\(self.textSnapshotSummary(), privacy: .public)"
         )
@@ -4030,7 +4056,11 @@ final class EditorTextView: UITextView, UITextViewDelegate, UIGestureRecognizerD
 
         let totalStartedAt = DispatchTime.now().uptimeNanoseconds
         isApplyingRustState = true
-        defer { isApplyingRustState = false }
+        delegate = nil
+        defer {
+            ensureInternalTextViewDelegate()
+            isApplyingRustState = false
+        }
 
         switch type {
         case "text":

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@apollohg/react-native-prose-editor",
-    "version": "0.5.7",
+    "version": "0.5.9",
     "description": "Native rich text editor with Rust core for React Native",
     "license": "Apache-2.0",
     "homepage": "https://github.com/apollohg/react-native-prose-editor",