@apollohg/react-native-prose-editor 0.2.0 → 0.3.0

package/ios/Generated_editor_core.swift

@@ -649,12 +649,14 @@ public func editorCoreVersion() -> String  {
 /**
  * Create a new editor from a JSON config object.
  *
- * Config fields (all optional — empty object `{}` creates a default editor):
+ * Config fields (all optional):
  * - `"schema"`: custom schema definition (see `Schema::from_json`)
  * - `"maxLength"`: maximum document length in characters
  * - `"readOnly"`: if `true`, rejects non-API mutations
  * - `"inputFilter"`: regex pattern; only matching characters are inserted
+ * - `"allowBase64Images"`: if `true`, parses `<img src="data:image/...">` as image nodes
  *
+ * An empty object creates a default editor.
  * Falls back to the default Tiptap schema when `"schema"` is absent or invalid.
  */
 public func editorCreate(configJson: String) -> UInt64  {
@@ -945,6 +947,19 @@ public func editorReplaceTextScalar(id: UInt64, scalarFrom: UInt32, scalarTo: UI
     )
 })
 }
+/**
+ * Resize an image node at a document position. Returns an update JSON string.
+ */
+public func editorResizeImageAtDocPos(id: UInt64, docPos: UInt32, width: UInt32, height: UInt32) -> String  {
+    return try!  FfiConverterString.lift(try! rustCall() {
+    uniffi_editor_core_fn_func_editor_resize_image_at_doc_pos(
+        FfiConverterUInt64.lower(id),
+        FfiConverterUInt32.lower(docPos),
+        FfiConverterUInt32.lower(width),
+        FfiConverterUInt32.lower(height),$0
+    )
+})
+}
 /**
  * Convert a rendered-text scalar offset to a document position.
  */
@@ -1235,7 +1250,7 @@ private let initializationResult: InitializationResult = {
     if (uniffi_editor_core_checksum_func_editor_core_version() != 41638) {
         return InitializationResult.apiChecksumMismatch
     }
-    if (uniffi_editor_core_checksum_func_editor_create() != 23908) {
+    if (uniffi_editor_core_checksum_func_editor_create() != 19812) {
         return InitializationResult.apiChecksumMismatch
     }
     if (uniffi_editor_core_checksum_func_editor_delete_and_split_scalar() != 13764) {
@@ -1313,6 +1328,9 @@ private let initializationResult: InitializationResult = {
     if (uniffi_editor_core_checksum_func_editor_replace_text_scalar() != 45475) {
         return InitializationResult.apiChecksumMismatch
     }
+    if (uniffi_editor_core_checksum_func_editor_resize_image_at_doc_pos() != 36353) {
+        return InitializationResult.apiChecksumMismatch
+    }
     if (uniffi_editor_core_checksum_func_editor_scalar_to_doc() != 40126) {
         return InitializationResult.apiChecksumMismatch
     }

package/ios/NativeEditorExpoView.swift

@@ -1,6 +1,5 @@
 import ExpoModulesCore
 import UIKit
-import os
 
 private struct NativeToolbarState {
     let marks: [String: Bool]
@@ -92,6 +91,7 @@ private enum ToolbarDefaultIconId: String {
     case underline
     case strike
     case link
+    case image
     case blockquote
     case bulletList
     case orderedList
@@ -125,6 +125,7 @@ private struct NativeToolbarIcon {
         .underline: "underline",
         .strike: "strikethrough",
         .link: "link",
+        .image: "photo",
         .blockquote: "text.quote",
         .bulletList: "list.bullet",
         .orderedList: "list.number",
@@ -142,6 +143,7 @@ private struct NativeToolbarIcon {
         .underline: "U",
         .strike: "S",
         .link: "🔗",
+        .image: "🖼",
         .blockquote: "❝",
         .bulletList: "•≡",
         .orderedList: "1.",
@@ -484,9 +486,11 @@ final class EditorAccessoryToolbarView: UIInputView {
         resolvedAppearance == .native
     }
     var usesUIGlassEffectForTesting: Bool {
+#if compiler(>=6.2)
         if #available(iOS 26.0, *) {
             return blurView.effect is UIGlassEffect
         }
+#endif
         return false
     }
     var chromeBorderWidthForTesting: CGFloat {
@@ -508,11 +512,13 @@ final class EditorAccessoryToolbarView: UIInputView {
         activeNativeToolbarScrollViewForTesting.contentOffset.x = offsetX
     }
     var selectedButtonCountForTesting: Int {
+#if compiler(>=6.2)
         if #available(iOS 26.0, *) {
             if usesNativeBarToolbar {
                 return barButtonBindings.filter { $0.button.style == .prominent }.count
             }
         }
+#endif
         return buttonBindings.filter(\.button.isSelected).count
     }
     func mentionButtonAtForTesting(_ index: Int) -> MentionSuggestionChipButton? {
@@ -602,6 +608,7 @@ final class EditorAccessoryToolbarView: UIInputView {
         if #available(iOS 13.0, *) {
             chromeView.layer.cornerCurve = .continuous
         }
+        #if compiler(>=6.2)
         if #available(iOS 26.0, *) {
             let cornerConfig: UICornerConfiguration = usesNativeAppearance
                 ? .capsule(maximumRadius: 24)
@@ -610,6 +617,7 @@ final class EditorAccessoryToolbarView: UIInputView {
             blurView.cornerConfiguration = cornerConfig
             glassTintView.cornerConfiguration = cornerConfig
         }
+        #endif
         chromeView.clipsToBounds = (usesNativeAppearance && !hasFloatingGlassButtons && !usesBarToolbar) || resolvedBorderRadius > 0
         chromeView.layer.shadowOpacity = usesNativeAppearance && !hasFloatingGlassButtons && !usesBarToolbar ? 0.08 : 0
         chromeView.layer.shadowRadius = usesNativeAppearance && !hasFloatingGlassButtons && !usesBarToolbar ? 10 : 0
@@ -682,6 +690,7 @@ final class EditorAccessoryToolbarView: UIInputView {
             updateButtonAppearance(binding.button, item: binding.item, enabled: buttonState.enabled, active: buttonState.active)
         }
 
+        #if compiler(>=6.2)
         if #available(iOS 26.0, *), usesNativeBarToolbar {
             for binding in barButtonBindings {
                 let state = buttonState(for: binding.item, state: currentState)
@@ -690,6 +699,17 @@ final class EditorAccessoryToolbarView: UIInputView {
                 binding.button.style = state.active ? .prominent : .plain
             }
         }
+        #endif
+    }
+
+    var firstButtonAlphaForTesting: CGFloat {
+        buttonBindings.first?.button.alpha ?? 0
+    }
+    var firstButtonTintColorForTesting: UIColor? {
+        buttonBindings.first?.button.tintColor
+    }
+    var firstButtonTintAdjustmentModeForTesting: UIView.TintAdjustmentMode {
+        buttonBindings.first?.button.tintAdjustmentMode ?? .automatic
     }
 
     func applyBoldStateForTesting(active: Bool, enabled: Bool) {
@@ -869,11 +889,15 @@ final class EditorAccessoryToolbarView: UIInputView {
             stackView.addArrangedSubview(button)
         }
 
+        #if compiler(>=6.2)
         if #available(iOS 26.0, *) {
             nativeToolbarView.setItems(makeNativeToolbarItems(from: compactItems), animated: false)
         } else {
             nativeToolbarView.setItems([], animated: false)
         }
+        #else
+        nativeToolbarView.setItems([], animated: false)
+        #endif
 
         updateNativeToolbarMetricsIfNeeded()
         apply(theme: theme)
@@ -881,6 +905,7 @@ final class EditorAccessoryToolbarView: UIInputView {
     }
 
     private func updateNativeToolbarMetricsIfNeeded() {
+#if compiler(>=6.2)
         guard #available(iOS 26.0, *), usesNativeBarToolbar else {
             nativeToolbarWidthConstraint?.constant = Self.baseHeight
             nativeToolbarDidInitializeScrollPosition = false
@@ -932,8 +957,13 @@ final class EditorAccessoryToolbarView: UIInputView {
                 animated: false
             )
         }
+#else
+        nativeToolbarWidthConstraint?.constant = Self.baseHeight
+        nativeToolbarDidInitializeScrollPosition = false
+#endif
     }
 
+#if compiler(>=6.2)
     @available(iOS 26.0, *)
     private func makeNativeToolbarItems(from compactItems: [NativeToolbarItem]) -> [UIBarButtonItem] {
         var toolbarItems: [UIBarButtonItem] = []
@@ -977,9 +1007,12 @@ final class EditorAccessoryToolbarView: UIInputView {
         barButtonItem.isEnabled = enabled
         barButtonItem.isSelected = active
         barButtonItem.style = active ? .prominent : .plain
+
+        barButtonItem.sharesBackground = true
         barButtonItem.hidesSharedBackground = active
         return barButtonItem
     }
+#endif
 
     private func makeButton(item: NativeToolbarItem) -> UIButton {
         let button = UIButton(type: .system)
@@ -1106,6 +1139,7 @@ final class EditorAccessoryToolbarView: UIInputView {
         enabled: Bool,
         active: Bool
     ) {
+        #if compiler(>=6.2)
         if #available(iOS 26.0, *), usesFloatingGlassButtons {
             var configuration = active
                 ? UIButton.Configuration.prominentGlass()
@@ -1135,11 +1169,12 @@ final class EditorAccessoryToolbarView: UIInputView {
             button.alpha = enabled ? 1 : 0.45
             return
         }
+        #endif
 
         if resolvedAppearance == .native {
-            button.tintColor = nil
-            button.alpha = enabled ? 1 : 0.45
-            button.tintAdjustmentMode = enabled ? .automatic : .dimmed
+            button.tintColor = enabled ? nil : .systemGray
+            button.tintAdjustmentMode = enabled ? .automatic : .normal
+            button.alpha = 1
             button.backgroundColor = active
                 ? UIColor.white.withAlphaComponent(0.18)
                 : .clear
@@ -1200,12 +1235,14 @@ final class EditorAccessoryToolbarView: UIInputView {
     }
 
     private func resolvedBlurEffect() -> UIVisualEffect {
+#if compiler(>=6.2)
         if #available(iOS 26.0, *) {
             let effect = UIGlassEffect(style: .regular)
             effect.isInteractive = true
             effect.tintColor = resolvedGlassEffectTintColor
             return effect
         }
+#endif
         if #available(iOS 13.0, *) {
             return UIBlurEffect(style: .systemUltraThinMaterial)
         }
@@ -1268,11 +1305,6 @@ final class EditorAccessoryToolbarView: UIInputView {
 
 class NativeEditorExpoView: ExpoView, EditorTextViewDelegate, UIGestureRecognizerDelegate {
 
-    private static let updateLog = Logger(
-        subsystem: "com.apollohg.prose-editor",
-        category: "view-command"
-    )
-
     // MARK: - Subviews
 
     let richTextView: RichTextEditorView
@@ -1461,6 +1493,10 @@ class NativeEditorExpoView: ExpoView, EditorTextViewDelegate, UIGestureRecognize
         }
     }
 
+    func setAllowImageResizing(_ allowImageResizing: Bool) {
+        richTextView.allowImageResizing = allowImageResizing
+    }
+
     private func emitContentHeightIfNeeded(force: Bool = false) {
         guard heightBehavior == .autoGrow else { return }
         let contentHeight = ceil(richTextView.intrinsicContentSize.height)
@@ -1513,13 +1549,9 @@ class NativeEditorExpoView: ExpoView, EditorTextViewDelegate, UIGestureRecognize
     /// Apply an editor update from JS. Sets the echo-suppression flag so the
     /// resulting delegate callback is NOT re-dispatched back to JS.
     func applyEditorUpdate(_ updateJson: String) {
-        Self.updateLog.debug("[applyEditorUpdate.begin] bytes=\(updateJson.utf8.count)")
         isApplyingJSUpdate = true
         richTextView.textView.applyUpdateJSON(updateJson)
         isApplyingJSUpdate = false
-        Self.updateLog.debug(
-            "[applyEditorUpdate.end] textState=\(self.richTextView.textView.textStorage.string.count)"
-        )
     }
 
     // MARK: - Focus Commands
@@ -1536,12 +1568,14 @@ class NativeEditorExpoView: ExpoView, EditorTextViewDelegate, UIGestureRecognize
 
     @objc private func textViewDidBeginEditing(_ notification: Notification) {
         installOutsideTapRecognizerIfNeeded()
+        richTextView.textView.refreshSelectionVisualState()
         refreshMentionQuery()
         onFocusChange(["isFocused": true])
     }
 
     @objc private func textViewDidEndEditing(_ notification: Notification) {
         uninstallOutsideTapRecognizer()
+        richTextView.textView.refreshSelectionVisualState()
         clearMentionQueryStateAndHidePopover()
         onFocusChange(["isFocused": false])
     }
@@ -1577,10 +1611,12 @@ class NativeEditorExpoView: ExpoView, EditorTextViewDelegate, UIGestureRecognize
     func gestureRecognizer(_ gestureRecognizer: UIGestureRecognizer, shouldReceive touch: UITouch) -> Bool {
         guard gestureRecognizer === outsideTapGestureRecognizer else { return true }
         guard let tapWindow = gestureWindow ?? window else { return true }
-        return shouldHandleOutsideTap(
-            locationInWindow: touch.location(in: tapWindow),
+        let locationInWindow = touch.location(in: tapWindow)
+        let result = shouldHandleOutsideTap(
+            locationInWindow: locationInWindow,
             touchedView: touch.view
         )
+        return result
     }
 
     private func shouldHandleOutsideTap(
@@ -1624,7 +1660,6 @@ class NativeEditorExpoView: ExpoView, EditorTextViewDelegate, UIGestureRecognize
         refreshMentionQuery()
         richTextView.refreshRemoteSelections()
         guard !isApplyingJSUpdate else { return }
-        Self.updateLog.debug("[didReceiveUpdate] bytes=\(updateJSON.utf8.count)")
         onEditorUpdate(["updateJson": updateJSON])
     }
 

package/ios/NativeEditorModule.swift

@@ -302,6 +302,9 @@ public class NativeEditorModule: Module {
             Prop("heightBehavior") { (view: NativeEditorExpoView, heightBehavior: String) in
                 view.setHeightBehavior(heightBehavior)
             }
+            Prop("allowImageResizing") { (view: NativeEditorExpoView, allowImageResizing: Bool) in
+                view.setAllowImageResizing(allowImageResizing)
+            }
             Prop("themeJson") { (view: NativeEditorExpoView, themeJson: String?) in
                 view.setThemeJson(themeJson)
             }

package/ios/RenderBridge.swift

@@ -1,5 +1,16 @@
 import UIKit
 
+extension Notification.Name {
+    static let editorImageAttachmentDidLoad = Notification.Name(
+        "com.apollohg.editor.imageAttachmentDidLoad"
+    )
+}
+
+private enum RenderImageCache {
+    static let cache = NSCache<NSString, UIImage>()
+    static let queue = DispatchQueue(label: "com.apollohg.editor.image-loader", qos: .userInitiated)
+}
+
 // MARK: - Constants
 
 /// Custom NSAttributedString attribute keys for editor metadata.
@@ -188,12 +199,14 @@ final class RenderBridge {
             case "voidInline":
                 let nodeType = element["nodeType"] as? String ?? ""
                 let docPos = jsonUInt32(element["docPos"])
+                let attrs = element["attrs"] as? [String: Any] ?? [:]
                 if nodeType == "hardBreak" {
                     overrideTrailingParagraphSpacing(in: result, paragraphSpacing: 0)
                 }
                 let attrStr = attributedStringForVoidInline(
                     nodeType: nodeType,
                     docPos: docPos,
+                    attrs: attrs,
                     baseFont: baseFont,
                     textColor: textColor,
                     blockStack: blockStack,
@@ -204,6 +217,7 @@ final class RenderBridge {
             case "voidBlock":
                 let nodeType = element["nodeType"] as? String ?? ""
                 let docPos = jsonUInt32(element["docPos"])
+                let attrs = element["attrs"] as? [String: Any] ?? [:]
 
                 // Add inter-block newline if not the first block.
                 if !isFirstBlock {
@@ -225,6 +239,7 @@ final class RenderBridge {
                 let attrStr = attributedStringForVoidBlock(
                     nodeType: nodeType,
                     docPos: docPos,
+                    elementAttrs: attrs,
                     baseFont: baseFont,
                     textColor: textColor,
                     theme: theme
@@ -467,6 +482,7 @@ final class RenderBridge {
     private static func attributedStringForVoidInline(
         nodeType: String,
         docPos: UInt32,
+        attrs _: [String: Any],
         baseFont: UIFont,
         textColor: UIColor,
         blockStack: [BlockContext],
@@ -511,6 +527,7 @@ final class RenderBridge {
     private static func attributedStringForVoidBlock(
         nodeType: String,
         docPos: UInt32,
+        elementAttrs: [String: Any],
         baseFont: UIFont,
         textColor: UIColor,
         theme: EditorTheme?
@@ -532,6 +549,25 @@ final class RenderBridge {
             let range = NSRange(location: 0, length: attrStr.length)
             attrStr.addAttributes(attrs, range: range)
             return attrStr
+        case "image":
+            guard let source = (elementAttrs["src"] as? String)?.trimmingCharacters(in: .whitespacesAndNewlines),
+                  !source.isEmpty
+            else {
+                return NSAttributedString(
+                    string: LayoutConstants.objectReplacementCharacter,
+                    attributes: attrs
+                )
+            }
+            let attachment = BlockImageAttachment(
+                source: source,
+                placeholderTint: textColor,
+                preferredWidth: jsonCGFloat(elementAttrs["width"]),
+                preferredHeight: jsonCGFloat(elementAttrs["height"])
+            )
+            let attrStr = NSMutableAttributedString(attachment: attachment)
+            let range = NSRange(location: 0, length: attrStr.length)
+            attrStr.addAttributes(attrs, range: range)
+            return attrStr
         default:
             // Unknown void block: render as object replacement character.
             return NSAttributedString(
@@ -698,6 +734,21 @@ final class RenderBridge {
         return 0
     }
 
+    /// Extract a positive `CGFloat` from a JSON value produced by `JSONSerialization`.
+    static func jsonCGFloat(_ value: Any?) -> CGFloat? {
+        if let number = value as? NSNumber {
+            let resolved = CGFloat(truncating: number)
+            return resolved > 0 ? resolved : nil
+        }
+        if let string = value as? String,
+           let resolved = Double(string.trimmingCharacters(in: .whitespacesAndNewlines)),
+           resolved > 0
+        {
+            return CGFloat(resolved)
+        }
+        return nil
+    }
+
     private static func defaultAttributes(
         baseFont: UIFont,
         textColor: UIColor
@@ -1003,3 +1054,160 @@ final class HorizontalRuleAttachment: NSTextAttachment {
         }
     }
 }
+
+final class BlockImageAttachment: NSTextAttachment {
+    private let source: String
+    private let placeholderTint: UIColor
+    private var preferredWidth: CGFloat?
+    private var preferredHeight: CGFloat?
+    private var loadedImage: UIImage?
+
+    init(
+        source: String,
+        placeholderTint: UIColor,
+        preferredWidth: CGFloat?,
+        preferredHeight: CGFloat?
+    ) {
+        self.source = source
+        self.placeholderTint = placeholderTint
+        self.preferredWidth = preferredWidth
+        self.preferredHeight = preferredHeight
+        super.init(data: nil, ofType: nil)
+        loadImageIfNeeded()
+    }
+
+    required init?(coder: NSCoder) {
+        return nil
+    }
+
+    func setPreferredSize(width: CGFloat, height: CGFloat) {
+        preferredWidth = width
+        preferredHeight = height
+    }
+
+    func previewImage() -> UIImage? {
+        loadedImage ?? image
+    }
+
+    override func attachmentBounds(
+        for textContainer: NSTextContainer?,
+        proposedLineFragment lineFrag: CGRect,
+        glyphPosition position: CGPoint,
+        characterIndex charIndex: Int
+    ) -> CGRect {
+        let lineFragmentWidth = lineFrag.width.isFinite ? lineFrag.width : 0
+        let containerWidth = textContainer.map {
+            max(0, $0.size.width - ($0.lineFragmentPadding * 2))
+        } ?? 0
+        let widthCandidates = [lineFragmentWidth, containerWidth].filter { $0.isFinite && $0 > 0 }
+        let maxWidth = max(160, widthCandidates.min() ?? 160)
+        let fallbackAspectRatio = loadedImage.flatMap { image -> CGFloat? in
+            let imageSize = image.size
+            guard imageSize.width > 0, imageSize.height > 0 else { return nil }
+            return imageSize.height / imageSize.width
+        } ?? 0.56
+
+        var resolvedWidth = preferredWidth
+        var resolvedHeight = preferredHeight
+
+        if resolvedWidth == nil, resolvedHeight == nil, let loadedImage {
+            let imageSize = loadedImage.size
+            if imageSize.width > 0, imageSize.height > 0 {
+                resolvedWidth = imageSize.width
+                resolvedHeight = imageSize.height
+            }
+        } else if resolvedWidth == nil, let resolvedHeight {
+            resolvedWidth = resolvedHeight / fallbackAspectRatio
+        } else if resolvedHeight == nil, let resolvedWidth {
+            resolvedHeight = resolvedWidth * fallbackAspectRatio
+        }
+
+        let width = max(1, resolvedWidth ?? maxWidth)
+        let height = max(1, resolvedHeight ?? min(180, maxWidth * fallbackAspectRatio))
+        let scale = min(1, maxWidth / width)
+        return CGRect(x: 0, y: 0, width: width * scale, height: height * scale)
+    }
+
+    override func image(
+        forBounds imageBounds: CGRect,
+        textContainer: NSTextContainer?,
+        characterIndex charIndex: Int
+    ) -> UIImage? {
+        if let loadedImage {
+            return loadedImage
+        }
+
+        let renderer = UIGraphicsImageRenderer(bounds: imageBounds)
+        return renderer.image { _ in
+            let path = UIBezierPath(roundedRect: imageBounds, cornerRadius: 12)
+            UIColor.secondarySystemFill.setFill()
+            path.fill()
+
+            let iconSize = min(imageBounds.width, imageBounds.height) * 0.28
+            let iconOrigin = CGPoint(
+                x: imageBounds.midX - (iconSize / 2),
+                y: imageBounds.midY - (iconSize / 2)
+            )
+            let iconRect = CGRect(origin: iconOrigin, size: CGSize(width: iconSize, height: iconSize))
+
+            if #available(iOS 13.0, *) {
+                let config = UIImage.SymbolConfiguration(pointSize: iconSize, weight: .medium)
+                let icon = UIImage(systemName: "photo", withConfiguration: config)?
+                    .withTintColor(placeholderTint.withAlphaComponent(0.7), renderingMode: .alwaysOriginal)
+                icon?.draw(in: iconRect)
+            }
+        }
+    }
+
+    private func loadImageIfNeeded() {
+        if let cached = RenderImageCache.cache.object(forKey: source as NSString) {
+            loadedImage = cached
+            image = cached
+            return
+        }
+
+        if let inlineData = Self.decodeDataURL(source),
+           let image = UIImage(data: inlineData)
+        {
+            RenderImageCache.cache.setObject(image, forKey: source as NSString)
+            loadedImage = image
+            self.image = image
+            return
+        }
+
+        guard let url = URL(string: source) else { return }
+        RenderImageCache.queue.async { [weak self] in
+            guard let self else { return }
+            let data: Data?
+            if url.isFileURL {
+                data = try? Data(contentsOf: url)
+            } else {
+                data = try? Data(contentsOf: url)
+            }
+            guard let data,
+                  let image = UIImage(data: data)
+            else {
+                return
+            }
+            RenderImageCache.cache.setObject(image, forKey: self.source as NSString)
+            DispatchQueue.main.async {
+                self.loadedImage = image
+                self.image = image
+                NotificationCenter.default.post(name: .editorImageAttachmentDidLoad, object: self)
+            }
+        }
+    }
+
+    private static func decodeDataURL(_ source: String) -> Data? {
+        let trimmed = source.trimmingCharacters(in: .whitespacesAndNewlines)
+        guard trimmed.lowercased().hasPrefix("data:image/"),
+              let commaIndex = trimmed.firstIndex(of: ",")
+        else {
+            return nil
+        }
+        let metadata = String(trimmed[..<commaIndex]).lowercased()
+        let payload = String(trimmed[trimmed.index(after: commaIndex)...])
+        guard metadata.contains(";base64") else { return nil }
+        return Data(base64Encoded: payload, options: [.ignoreUnknownCharacters])
+    }
+}