@apollohg/react-native-prose-editor 0.5.2 → 0.5.4

package/ios/EditorCore.xcframework/Info.plist

@@ -8,32 +8,32 @@
 			<key>BinaryPath</key>
 			<string>libeditor_core.a</string>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64</string>
+			<string>ios-arm64_x86_64-simulator</string>
 			<key>LibraryPath</key>
 			<string>libeditor_core.a</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
+				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
+			<key>SupportedPlatformVariant</key>
+			<string>simulator</string>
 		</dict>
 		<dict>
 			<key>BinaryPath</key>
 			<string>libeditor_core.a</string>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64_x86_64-simulator</string>
+			<string>ios-arm64</string>
 			<key>LibraryPath</key>
 			<string>libeditor_core.a</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
-				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
-			<key>SupportedPlatformVariant</key>
-			<string>simulator</string>
 		</dict>
 	</array>
 	<key>CFBundlePackageType</key>

package/ios/EditorTheme.swift

@@ -80,12 +80,14 @@ struct EditorTextStyle {
 
 struct EditorListTheme {
     var indent: CGFloat?
+    var baseIndentMultiplier: CGFloat?
     var itemSpacing: CGFloat?
     var markerColor: UIColor?
     var markerScale: CGFloat?
 
     init(dictionary: [String: Any]) {
         indent = EditorTheme.cgFloat(dictionary["indent"])
+        baseIndentMultiplier = EditorTheme.cgFloat(dictionary["baseIndentMultiplier"])
         itemSpacing = EditorTheme.cgFloat(dictionary["itemSpacing"])
         markerColor = EditorTheme.color(from: dictionary["markerColor"])
         markerScale = EditorTheme.cgFloat(dictionary["markerScale"])
@@ -194,6 +196,8 @@ struct EditorToolbarTheme {
     var borderColor: UIColor?
     var borderWidth: CGFloat?
     var borderRadius: CGFloat?
+    var marginTop: CGFloat?
+    var showTopBorder: Bool?
     var keyboardOffset: CGFloat?
     var horizontalInset: CGFloat?
     var separatorColor: UIColor?
@@ -209,6 +213,8 @@ struct EditorToolbarTheme {
         borderColor = EditorTheme.color(from: dictionary["borderColor"])
         borderWidth = EditorTheme.cgFloat(dictionary["borderWidth"])
         borderRadius = EditorTheme.cgFloat(dictionary["borderRadius"])
+        marginTop = EditorTheme.cgFloat(dictionary["marginTop"])
+        showTopBorder = dictionary["showTopBorder"] as? Bool
         keyboardOffset = EditorTheme.cgFloat(dictionary["keyboardOffset"])
         horizontalInset = EditorTheme.cgFloat(dictionary["horizontalInset"])
         separatorColor = EditorTheme.color(from: dictionary["separatorColor"])

package/ios/NativeEditorModule.swift

@@ -268,6 +268,13 @@ public class NativeEditorModule: Module {
             }
             return editorSetJson(id: editorId, json: json)
         }
+        Function("renderDocumentHtml") { (configJson: String, html: String) -> String in
+            let editorId = editorCreate(configJson: configJson)
+            defer {
+                editorDestroy(id: editorId)
+            }
+            return editorSetHtml(id: editorId, html: html)
+        }
         Function("editorReplaceHtml") { (id: Int, html: String) -> String in
             editorReplaceHtml(id: UInt64(id), html: html)
         }
@@ -375,7 +382,7 @@ public class NativeEditorModule: Module {
 
         View(NativeProseViewerExpoView.self) {
             ViewName("NativeProseViewer")
-            Events("onContentHeightChange", "onPressMention")
+            Events("onContentHeightChange", "onPressLink", "onPressMention")
 
             Prop("renderJson") { (view: NativeProseViewerExpoView, renderJson: String?) in
                 view.setRenderJson(renderJson)
@@ -383,6 +390,16 @@ public class NativeEditorModule: Module {
             Prop("themeJson") { (view: NativeProseViewerExpoView, themeJson: String?) in
                 view.setThemeJson(themeJson)
             }
+            Prop("collapsesWhenEmpty") {
+                (view: NativeProseViewerExpoView, collapsesWhenEmpty: Bool?) in
+                view.setCollapsesWhenEmpty(collapsesWhenEmpty)
+            }
+            Prop("enableLinkTaps") { (view: NativeProseViewerExpoView, enableLinkTaps: Bool?) in
+                view.setEnableLinkTaps(enableLinkTaps)
+            }
+            Prop("interceptLinkTaps") { (view: NativeProseViewerExpoView, interceptLinkTaps: Bool?) in
+                view.setInterceptLinkTaps(interceptLinkTaps)
+            }
         }
     }
 }

package/ios/NativeProseViewerExpoView.swift

@@ -3,6 +3,7 @@ import UIKit
 
 final class NativeProseViewerExpoView: ExpoView {
     let onContentHeightChange = EventDispatcher()
+    let onPressLink = EventDispatcher()
     let onPressMention = EventDispatcher()
 
     private let textView = EditorTextView(frame: .zero, textContainer: nil)
@@ -11,11 +12,15 @@ final class NativeProseViewerExpoView: ExpoView {
     private var lastEmittedContentHeight: CGFloat = 0
     private var lastMeasuredWidth: CGFloat = 0
     private var allowContentHeightShrink = true
+    private var collapsesWhenEmpty = true
+    private var isCollapsedEmptyContent = false
+    private var enableLinkTaps = true
+    private var interceptLinkTaps = false
 
-    private lazy var mentionTapRecognizer: UITapGestureRecognizer = {
+    private lazy var interactiveTapRecognizer: UITapGestureRecognizer = {
         let recognizer = UITapGestureRecognizer(
             target: self,
-            action: #selector(handleMentionTap(_:))
+            action: #selector(handleInteractiveTap(_:))
         )
         recognizer.cancelsTouchesInView = false
         return recognizer
@@ -36,10 +41,28 @@ final class NativeProseViewerExpoView: ExpoView {
         textView.onHeightMayChange = { [weak self] measuredHeight in
             self?.emitContentHeightIfNeeded(measuredHeight: measuredHeight, force: true)
         }
-        textView.addGestureRecognizer(mentionTapRecognizer)
+        textView.addGestureRecognizer(interactiveTapRecognizer)
         addSubview(textView)
     }
 
+    func setEnableLinkTaps(_ enabled: Bool?) {
+        enableLinkTaps = enabled ?? true
+    }
+
+    func setInterceptLinkTaps(_ intercept: Bool?) {
+        interceptLinkTaps = intercept ?? false
+    }
+
+    func setCollapsesWhenEmpty(_ collapses: Bool?) {
+        let nextValue = collapses ?? true
+        guard collapsesWhenEmpty != nextValue else { return }
+        collapsesWhenEmpty = nextValue
+        allowContentHeightShrink = true
+        updateCollapsedEmptyState()
+        setNeedsLayout()
+        emitContentHeightIfNeeded(force: true)
+    }
+
     func setRenderJson(_ renderJson: String?) {
         guard lastRenderJSON != renderJson else { return }
         lastRenderJSON = renderJson
@@ -60,6 +83,9 @@ final class NativeProseViewerExpoView: ExpoView {
     }
 
     override var intrinsicContentSize: CGSize {
+        if isCollapsedEmptyContent {
+            return CGSize(width: UIView.noIntrinsicMetric, height: 0)
+        }
         guard lastEmittedContentHeight > 0 else {
             return CGSize(width: UIView.noIntrinsicMetric, height: UIView.noIntrinsicMetric)
         }
@@ -68,8 +94,13 @@ final class NativeProseViewerExpoView: ExpoView {
 
     override func layoutSubviews() {
         super.layoutSubviews()
-        textView.frame = bounds
-        textView.updateAutoGrowHostHeight(bounds.height)
+        if isCollapsedEmptyContent {
+            textView.frame = CGRect(x: 0, y: 0, width: bounds.width, height: 0)
+            textView.updateAutoGrowHostHeight(0)
+        } else {
+            textView.frame = bounds
+            textView.updateAutoGrowHostHeight(bounds.height)
+        }
 
         let currentWidth = ceil(bounds.width)
         guard abs(currentWidth - lastMeasuredWidth) > 0.5 else { return }
@@ -78,21 +109,36 @@ final class NativeProseViewerExpoView: ExpoView {
     }
 
     private func applyRenderJSON() {
+        updateCollapsedEmptyState()
         textView.applyRenderJSON(lastRenderJSON ?? "[]")
+        textView.isHidden = isCollapsedEmptyContent
+        invalidateIntrinsicContentSize()
+        setNeedsLayout()
         emitContentHeightIfNeeded(force: true)
     }
 
+    private func updateCollapsedEmptyState() {
+        isCollapsedEmptyContent = collapsesWhenEmpty
+            && Self.renderJsonContainsOnlyEmptyParagraphs(lastRenderJSON ?? "[]")
+        textView.isHidden = isCollapsedEmptyContent
+    }
+
     private func emitContentHeightIfNeeded(
         measuredHeight: CGFloat? = nil,
         force: Bool = false
     ) {
-        let resolvedWidth = bounds.width > 0
-            ? bounds.width
-            : (superview?.bounds.width ?? UIScreen.main.bounds.width)
-        let fittedHeight = measuredHeight
-            ?? textView.measuredAutoGrowHeightForTesting(width: resolvedWidth)
-        let contentHeight = ceil(fittedHeight)
-        guard contentHeight > 0 else { return }
+        let contentHeight: CGFloat
+        if isCollapsedEmptyContent {
+            contentHeight = 0
+        } else {
+            let resolvedWidth = bounds.width > 0
+                ? bounds.width
+                : (superview?.bounds.width ?? UIScreen.main.bounds.width)
+            let fittedHeight = measuredHeight
+                ?? textView.measuredAutoGrowHeightForTesting(width: resolvedWidth)
+            contentHeight = ceil(fittedHeight)
+            guard contentHeight > 0 else { return }
+        }
         guard allowContentHeightShrink || contentHeight >= lastEmittedContentHeight else { return }
         allowContentHeightShrink = false
         guard force || abs(contentHeight - lastEmittedContentHeight) > 0.5 else { return }
@@ -101,20 +147,32 @@ final class NativeProseViewerExpoView: ExpoView {
         onContentHeightChange(["contentHeight": contentHeight])
     }
 
-    @objc private func handleMentionTap(_ recognizer: UITapGestureRecognizer) {
-        guard recognizer.state == .ended,
-              let mention = mentionHit(at: recognizer.location(in: textView))
-        else {
+    @objc private func handleInteractiveTap(_ recognizer: UITapGestureRecognizer) {
+        guard recognizer.state == .ended else {
+            return
+        }
+
+        let location = recognizer.location(in: textView)
+        if enableLinkTaps, let link = linkHit(at: location) {
+            if interceptLinkTaps {
+                onPressLink([
+                    "href": link.href,
+                    "text": link.text,
+                ])
+            } else {
+                openLink(link.href)
+            }
             return
         }
 
+        guard let mention = mentionHit(at: location) else { return }
         onPressMention([
             "docPos": mention.docPos,
             "label": mention.label,
         ])
     }
 
-    private func mentionHit(at location: CGPoint) -> (docPos: Int, label: String)? {
+    private func characterIndex(at location: CGPoint) -> Int? {
         let textStorage = textView.textStorage
         guard textStorage.length > 0 else { return nil }
 
@@ -133,6 +191,26 @@ final class NativeProseViewerExpoView: ExpoView {
         guard glyphIndex < layoutManager.numberOfGlyphs else { return nil }
         let characterIndex = layoutManager.characterIndexForGlyph(at: glyphIndex)
         guard characterIndex < textStorage.length else { return nil }
+        return characterIndex
+    }
+
+    private func linkHit(at location: CGPoint) -> (href: String, text: String)? {
+        let textStorage = textView.textStorage
+        guard let characterIndex = characterIndex(at: location) else { return nil }
+
+        var effectiveRange = NSRange(location: 0, length: 0)
+        let attrs = textStorage.attributes(at: characterIndex, effectiveRange: &effectiveRange)
+        guard let href = attrs[RenderBridgeAttributes.linkHref] as? String, !href.isEmpty else {
+            return nil
+        }
+
+        let text = (textStorage.string as NSString).substring(with: effectiveRange)
+        return (href: href, text: text)
+    }
+
+    private func mentionHit(at location: CGPoint) -> (docPos: Int, label: String)? {
+        let textStorage = textView.textStorage
+        guard let characterIndex = characterIndex(at: location) else { return nil }
 
         var effectiveRange = NSRange(location: 0, length: 0)
         let attrs = textStorage.attributes(at: characterIndex, effectiveRange: &effectiveRange)
@@ -146,4 +224,61 @@ final class NativeProseViewerExpoView: ExpoView {
         let label = (textStorage.string as NSString).substring(with: effectiveRange)
         return (docPos: docPos, label: label)
     }
+
+    private func openLink(_ href: String) {
+        guard let url = URL(string: href) else { return }
+        UIApplication.shared.open(url, options: [:], completionHandler: nil)
+    }
+
+    static func renderJsonContainsOnlyEmptyParagraphs(_ renderJson: String) -> Bool {
+        guard let data = renderJson.data(using: .utf8),
+              let elements = try? JSONSerialization.jsonObject(with: data) as? [[String: Any]]
+        else {
+            return false
+        }
+
+        if elements.isEmpty {
+            return true
+        }
+
+        var hasParagraph = false
+        var paragraphIsOpen = false
+
+        for element in elements {
+            guard let type = element["type"] as? String else {
+                return false
+            }
+
+            switch type {
+            case "blockStart":
+                guard !paragraphIsOpen,
+                      element["nodeType"] as? String == "paragraph",
+                      (element["depth"] as? NSNumber)?.intValue == 0
+                else {
+                    return false
+                }
+                paragraphIsOpen = true
+                hasParagraph = true
+
+            case "textRun":
+                guard paragraphIsOpen,
+                      let text = element["text"] as? String,
+                      text.allSatisfy({ $0 == "\u{200B}" })
+                else {
+                    return false
+                }
+
+            case "blockEnd":
+                guard paragraphIsOpen else {
+                    return false
+                }
+                paragraphIsOpen = false
+
+            default:
+                return false
+            }
+        }
+
+        return hasParagraph && !paragraphIsOpen
+    }
 }

package/ios/RenderBridge.swift

@@ -107,6 +107,9 @@ enum RenderBridgeAttributes {
     /// Marks synthetic zero-width placeholders used only for UIKit layout.
     static let syntheticPlaceholder = NSAttributedString.Key("com.apollohg.editor.syntheticPlaceholder")
 
+    /// Stores the link href for visually styled link text without enabling UITextView's default link interaction.
+    static let linkHref = NSAttributedString.Key("com.apollohg.editor.linkHref")
+
     /// Stores the owning top-level document child index for partial native patching.
     static let topLevelChildIndex = NSAttributedString.Key("com.apollohg.editor.topLevelChildIndex")
 }
@@ -564,11 +567,11 @@ final class RenderBridge {
         var traits: UIFontDescriptor.SymbolicTraits = []
         var useMonospace = false
         for mark in marks {
+            let markObject = mark as? [String: Any]
             let markType: String
             if let markName = mark as? String {
                 markType = markName
-            } else if let markObject = mark as? [String: Any],
-                      let resolvedType = markObject["type"] as? String {
+            } else if let resolvedType = markObject?["type"] as? String {
                 markType = resolvedType
             } else {
                 continue
@@ -588,6 +591,9 @@ final class RenderBridge {
             case "link":
                 attrs[.underlineStyle] = NSUnderlineStyle.single.rawValue
                 attrs[.foregroundColor] = UIColor.systemBlue
+                if let href = markObject?["href"] as? String, !href.isEmpty {
+                    attrs[RenderBridgeAttributes.linkHref] = href
+                }
             default:
                 break
             }
@@ -841,8 +847,13 @@ final class RenderBridge {
             (theme?.blockquote?.markerGap ?? LayoutConstants.blockquoteMarkerGap)
                 + (theme?.blockquote?.borderWidth ?? LayoutConstants.blockquoteBorderWidth)
         )
+        let listBaseIndentMultiplier = max(theme?.list?.baseIndentMultiplier ?? 1, 0)
+        let listBaseIndentAdjustment = context.listContext != nil
+            ? ((listBaseIndentMultiplier - 1) * indentPerDepth)
+            : 0
         let baseIndent = (CGFloat(context.depth) * indentPerDepth)
             - (quoteDepth * indentPerDepth)
+            + listBaseIndentAdjustment
             + (quoteDepth * quoteIndent)
 
         if context.listContext != nil {

package/package.json

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