@apollohg/react-native-rich-text-editor 2.0.1 → 2.0.3

package/ios/RenderBridge+Attachments.swift

@@ -101,7 +101,6 @@ final class AtomBlockAttachment: NSTextAttachment {
 final class BlockImageAttachment: NSTextAttachment {
     var styleBox: EditorStyleBox?
     let source: String
-    let placeholderTint: UIColor
     private weak var loadOwner: RenderImageLoadOwner?
     private var loadReceipt: RenderImageLoadOwner.ImageLoadReceipt?
     var preferredWidth: CGFloat?
@@ -110,12 +109,10 @@ final class BlockImageAttachment: NSTextAttachment {
 
     init(
         source: String,
-        placeholderTint: UIColor,
         preferredWidth: CGFloat?,
         preferredHeight: CGFloat?
     ) {
         self.source = source
-        self.placeholderTint = placeholderTint
         self.preferredWidth = preferredWidth
         self.preferredHeight = preferredHeight
         self.loadOwner = RenderImageLoadOwner.current
@@ -131,15 +128,6 @@ final class BlockImageAttachment: NSTextAttachment {
         loadReceipt?.cancel()
     }
 
-    func setPreferredSize(width: CGFloat, height: CGFloat) {
-        preferredWidth = width
-        preferredHeight = height
-    }
-
-    func previewImage() -> UIImage? {
-        loadedImage ?? image
-    }
-
     override func attachmentBounds(
         for textContainer: NSTextContainer?,
         proposedLineFragment lineFrag: CGRect,
@@ -193,9 +181,6 @@ final class BlockImageAttachment: NSTextAttachment {
                 renderer.cgContext.clip(to: imageBounds.inset(by: styleBox.inset))
                 if let loadedImage {
                     loadedImage.draw(in: styleBox.imageRect(loadedImage.size, in: imageBounds))
-                } else {
-                    let iconBounds = imageBounds.insetBy(dx: imageBounds.width * 0.35, dy: imageBounds.height * 0.35)
-                    UIImage(systemName: "photo")?.withTintColor(placeholderTint, renderingMode: .alwaysOriginal).draw(in: iconBounds)
                 }
             }
         }
@@ -206,20 +191,6 @@ final class BlockImageAttachment: NSTextAttachment {
             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)
-            }
         }
     }
 

package/ios/RichTextEditorView.swift

@@ -684,10 +684,6 @@ final class RichTextEditorView: UIView {
         imageTapOverlayView.handleTapForTesting(convert(point, to: imageTapOverlayView))
     }
 
-    func imageResizePreviewHasImageForTesting() -> Bool {
-        imageResizeOverlayView.previewHasImageForTesting
-    }
-
     func refreshSelectionVisualStateForTesting() {
         textView.refreshSelectionVisualState()
     }
@@ -708,6 +704,10 @@ final class RichTextEditorView: UIView {
         imageResizeOverlayView.simulatePreviewResizeForTesting(width: width, height: height)
     }
 
+    func previewImageResizeDragForTesting(corner: ImageResizeOverlayView.Corner, translation: CGPoint) {
+        imageResizeOverlayView.simulatePreviewDragForTesting(corner: corner, translation: translation)
+    }
+
     func commitPreviewResizeForTesting() {
         imageResizeOverlayView.commitPreviewResizeForTesting()
     }
@@ -803,14 +803,6 @@ final class RichTextEditorView: UIView {
         textView.setImageResizePreviewActive(active)
     }
 
-    func imagePreviewForResize(docPos: UInt32) -> UIImage? {
-        textView.imagePreviewForDocPos(docPos)
-    }
-
-    func imageResizePreviewBackgroundColor() -> UIColor {
-        textView.backgroundColor ?? .systemBackground
-    }
-
     func maximumImageWidthForResizeGesture() -> CGFloat {
         textView.maximumRenderableImageWidth()
     }

package/ios/Viewer/CoreTextProseLayoutEngine+AttributedText.swift

@@ -79,8 +79,9 @@ extension CoreTextProseLayoutEngine {
                 let labelWidth = CGFloat(CTLineGetTypographicBounds(labelLine, &labelAscent, &labelDescent, &labelLeading))
                 let requestedHeight = EditorTheme.cgFloat(appearance.attributes[editorInlineLineHeightAttribute]) ?? 0
                 let extra = max(0, requestedHeight - labelAscent - max(labelDescent, 2)) / 2
+                let paddedWidth = labelWidth + appearance.padding.left + appearance.padding.right
                 let metrics = PreparedAtomMetrics(
-                    width: max(paint.font.lineHeight, labelWidth + appearance.padding.left + appearance.padding.right),
+                    width: nodeType == "mention" ? paddedWidth : max(paint.font.lineHeight, paddedWidth),
                     ascent: labelAscent + extra + appearance.padding.top,
                     descent: max(labelDescent, 2) + extra + appearance.padding.bottom
                 )
@@ -388,7 +389,7 @@ extension CoreTextProseLayoutEngine {
                 var boxValues = values
                 boxValues["backgroundColor"] = values["backgroundColor"] ?? "#007aff1f"
                 let box = EditorStyleBox(boxValues)
-                return PreparedAtomAppearance(styleBox: box, attributes: coreTextAttributes(styled), background: box.color("backgroundColor") ?? .clear, borderColor: nil, borderWidth: 0, radius: 0, padding: UIEdgeInsets(top: 4, left: 6, bottom: 4, right: 6).adding(box.inset))
+                return PreparedAtomAppearance(styleBox: box, attributes: coreTextAttributes(styled), background: box.color("backgroundColor") ?? .clear, borderColor: nil, borderWidth: 0, radius: 0, padding: box.mentionInsets)
             }
             return PreparedAtomAppearance(
                 attributes: attributes,

package/ios/editor_coreFFI/editor_coreFFI.h

@@ -392,6 +392,11 @@ RustBuffer uniffi_editor_core_fn_func_editor_v2_destroy(RustBuffer editor_id, Ru
 RustBuffer uniffi_editor_core_fn_func_editor_v2_doc_to_scalar(RustBuffer editor_id, uint32_t doc_pos, RustCallStatus *_Nonnull out_status
 );
 #endif
+#ifndef UNIFFI_FFIDEF_UNIFFI_EDITOR_CORE_FN_FUNC_EDITOR_V2_GET_CLIPBOARD
+#define UNIFFI_FFIDEF_UNIFFI_EDITOR_CORE_FN_FUNC_EDITOR_V2_GET_CLIPBOARD
+RustBuffer uniffi_editor_core_fn_func_editor_v2_get_clipboard(RustBuffer editor_id, RustCallStatus *_Nonnull out_status
+);
+#endif
 #ifndef UNIFFI_FFIDEF_UNIFFI_EDITOR_CORE_FN_FUNC_EDITOR_V2_GET_CONTENT_SNAPSHOT
 #define UNIFFI_FFIDEF_UNIFFI_EDITOR_CORE_FN_FUNC_EDITOR_V2_GET_CONTENT_SNAPSHOT
 RustBuffer uniffi_editor_core_fn_func_editor_v2_get_content_snapshot(RustBuffer editor_id, RustCallStatus *_Nonnull out_status
@@ -875,6 +880,12 @@ uint16_t uniffi_editor_core_checksum_func_editor_v2_destroy(void
 #define UNIFFI_FFIDEF_UNIFFI_EDITOR_CORE_CHECKSUM_FUNC_EDITOR_V2_DOC_TO_SCALAR
 uint16_t uniffi_editor_core_checksum_func_editor_v2_doc_to_scalar(void
 
+);
+#endif
+#ifndef UNIFFI_FFIDEF_UNIFFI_EDITOR_CORE_CHECKSUM_FUNC_EDITOR_V2_GET_CLIPBOARD
+#define UNIFFI_FFIDEF_UNIFFI_EDITOR_CORE_CHECKSUM_FUNC_EDITOR_V2_GET_CLIPBOARD
+uint16_t uniffi_editor_core_checksum_func_editor_v2_get_clipboard(void
+
 );
 #endif
 #ifndef UNIFFI_FFIDEF_UNIFFI_EDITOR_CORE_CHECKSUM_FUNC_EDITOR_V2_GET_CONTENT_SNAPSHOT

package/package.json

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

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

@@ -797,6 +797,8 @@ internal interface UniffiForeignFutureCompleteVoid : com.sun.jna.Callback {
 
 
 
+
+
 
 
 
@@ -855,6 +857,8 @@ fun uniffi_editor_core_checksum_func_editor_v2_destroy(
 ): Short
 fun uniffi_editor_core_checksum_func_editor_v2_doc_to_scalar(
 ): Short
+fun uniffi_editor_core_checksum_func_editor_v2_get_clipboard(
+): Short
 fun uniffi_editor_core_checksum_func_editor_v2_get_content_snapshot(
 ): Short
 fun uniffi_editor_core_checksum_func_editor_v2_get_document_html(
@@ -1006,6 +1010,8 @@ fun uniffi_editor_core_fn_func_editor_v2_destroy(`editorId`: RustBuffer.ByValue,
 ): RustBuffer.ByValue
 fun uniffi_editor_core_fn_func_editor_v2_doc_to_scalar(`editorId`: RustBuffer.ByValue,`docPos`: Int,uniffi_out_err: UniffiRustCallStatus,
 ): RustBuffer.ByValue
+fun uniffi_editor_core_fn_func_editor_v2_get_clipboard(`editorId`: RustBuffer.ByValue,uniffi_out_err: UniffiRustCallStatus,
+): RustBuffer.ByValue
 fun uniffi_editor_core_fn_func_editor_v2_get_content_snapshot(`editorId`: RustBuffer.ByValue,uniffi_out_err: UniffiRustCallStatus,
 ): RustBuffer.ByValue
 fun uniffi_editor_core_fn_func_editor_v2_get_document_html(`editorId`: RustBuffer.ByValue,uniffi_out_err: UniffiRustCallStatus,
@@ -1226,6 +1232,9 @@ private fun uniffiCheckApiChecksums(lib: IntegrityCheckingUniffiLib) {
     if (lib.uniffi_editor_core_checksum_func_editor_v2_doc_to_scalar() != 62503.toShort()) {
         throw RuntimeException("UniFFI API checksum mismatch: try cleaning and rebuilding your project")
     }
+    if (lib.uniffi_editor_core_checksum_func_editor_v2_get_clipboard() != 3214.toShort()) {
+        throw RuntimeException("UniFFI API checksum mismatch: try cleaning and rebuilding your project")
+    }
     if (lib.uniffi_editor_core_checksum_func_editor_v2_get_content_snapshot() != 21323.toShort()) {
         throw RuntimeException("UniFFI API checksum mismatch: try cleaning and rebuilding your project")
     }
@@ -2992,6 +3001,15 @@ public object FfiConverterSequenceTypeFfiViewerElement: FfiConverterRustBuffer<L
     )
     }
 
+ fun `editorV2GetClipboard`(`editorId`: kotlin.String): FfiJsonResult {
+            return FfiConverterTypeFfiJsonResult.lift(
+    uniffiRustCall() { _status ->
+    UniffiLib.INSTANCE.uniffi_editor_core_fn_func_editor_v2_get_clipboard(
+        FfiConverterString.lower(`editorId`),_status)
+}
+    )
+    }
+
  fun `editorV2GetContentSnapshot`(`editorId`: kotlin.String): FfiJsonResult {
             return FfiConverterTypeFfiJsonResult.lift(
     uniffiRustCall() { _status ->

package/src/EditorStyleSheetNormalization.ts

@@ -70,7 +70,7 @@ const fields: Record<keyof EditorStyleMap, readonly string[]> = {
     italic: inline,
     underline: inline,
     strike: inline,
-    mention: [ ...inline, ...border ],
+    mention: [ ...inline, ...border, ...spacing('padding') ],
     placeholder: typography,
 };
 

package/src/EditorStyleSheetTypes.ts

@@ -113,7 +113,7 @@ export interface EditorHorizontalRuleStyle extends EditorBorderStyle, EditorMarg
     height?: number;
 }
 
-export interface EditorMentionStyle extends EditorInlineStyle, EditorBorderStyle {}
+export interface EditorMentionStyle extends EditorInlineStyle, EditorBorderStyle, EditorPaddingStyle {}
 
 export interface EditorStyleMap {
     content: EditorSurfaceStyle;

package/src/NativeRichTextEditor.tsx

@@ -2,6 +2,7 @@ export {
     type RichTextEditorHeightBehavior,
     type RichTextEditorToolbarPlacement,
     type RichTextEditorValueJSONUpdateMode,
+    type RichTextEditorPasteMode,
     type RichTextEditorAutoCapitalize,
     type RichTextEditorKeyboardType,
     type RichTextEditorAndroidInputOptions,

package/src/RichTextEditorNativeTypes.tsx

@@ -6,6 +6,7 @@ import { type ReactNode } from 'react';
 import { type NativeSyntheticEvent, type StyleProp, type ViewStyle } from 'react-native';
 import { type DocumentJSON, type NativeEditorDocumentHandle } from './NativeEditorBridge';
 import {
+    type RichTextEditorPasteMode,
     type RichTextEditorAutoCapitalize,
     type RichTextEditorKeyboardType,
     type RichTextEditorToolbarPlacement,
@@ -32,6 +33,7 @@ export interface NativeEditorViewProps {
     editorId: string;
     placeholder?: string;
     editable: boolean;
+    pasteMode: RichTextEditorPasteMode;
     autoFocus: boolean;
     autoCapitalize?: RichTextEditorAutoCapitalize;
     autoCorrect?: boolean;

package/src/RichTextEditorTypes.tsx

@@ -37,6 +37,9 @@ export type RichTextEditorToolbarPlacement = 'keyboard' | 'inline';
  */
 export type RichTextEditorValueJSONUpdateMode = 'replace' | 'reset';
 
+/** Controls native clipboard paste. Plain text keeps destination typing marks. */
+export type RichTextEditorPasteMode = 'rich' | 'plainText' | 'disabled';
+
 /** Native keyboard auto-capitalization behavior. */
 export type RichTextEditorAutoCapitalize = 'none' | 'sentences' | 'words' | 'characters';
 
@@ -137,6 +140,8 @@ export interface RichTextEditorProps {
     placeholder?: string;
     /** Whether the editor is editable. Defaults to true. When false, every mutation ref method rejects with MUTATION_REJECTED; selection and controlled content still flow. */
     editable?: boolean;
+    /** Clipboard paste policy. Defaults to rich; updates apply immediately. */
+    pasteMode?: RichTextEditorPasteMode;
     /** Whether to auto-focus on mount. */
     autoFocus?: boolean;
     /** Controls native keyboard auto-capitalization. Defaults to sentences. */

package/src/index.ts

@@ -6,6 +6,7 @@ export {
     type RichTextEditorHeightBehavior,
     type RichTextEditorToolbarPlacement,
     type RichTextEditorValueJSONUpdateMode,
+    type RichTextEditorPasteMode,
     type RichTextEditorAutoCapitalize,
     type RichTextEditorKeyboardType,
     type RichTextEditorAndroidInputOptions,

package/src/useRichTextEditorPresentation.tsx

@@ -73,6 +73,7 @@ export function useRichTextEditorPresentation(
         | 'accessibilityHint'
         | 'placeholder'
         | 'autoFocus'
+        | 'pasteMode'
         | 'autoCapitalize'
         | 'autoCorrect'
         | 'keyboardType'
@@ -157,6 +158,7 @@ export function useRichTextEditorPresentation(
         accessibilityHint,
         placeholder,
         autoFocus,
+        pasteMode,
         autoCapitalize,
         autoCorrect,
         keyboardType,
@@ -492,6 +494,7 @@ export function useRichTextEditorPresentation(
                 placeholder={placeholder}
                 editable={editable}
                 autoFocus={autoFocus}
+                pasteMode={pasteMode}
                 autoCapitalize={autoCapitalize}
                 autoCorrect={autoCorrect}
                 keyboardType={keyboardType}

package/src/useRichTextEditorState.tsx

@@ -1,3 +1,4 @@
+import type { StyleProp, ViewStyle } from 'react-native';
 import {
     DEFAULT_EDITOR_TOOLBAR_ITEMS,
     setActiveEditorToolbarFrameOwnerForEditor,
@@ -48,6 +49,7 @@ export function useRichTextEditorState(
         valueJSONUpdateMode = 'replace',
         placeholder,
         editable = true,
+        pasteMode = 'rich',
         autoFocus = false,
         autoCapitalize,
         autoCorrect,
@@ -636,8 +638,8 @@ export function useRichTextEditorState(
         toolbarItems,
         toolbarPlacement,
         showToolbar,
-        containerStyle,
-        style,
+        containerStyle: containerStyle as StyleProp<ViewStyle>,
+        style: style as StyleProp<ViewStyle>,
         autoGrowHeight,
         pushedUpdate,
         registeredToolbarFrames,
@@ -647,6 +649,7 @@ export function useRichTextEditorState(
         accessibilityHint,
         placeholder,
         autoFocus,
+        pasteMode,
         autoCapitalize,
         autoCorrect,
         keyboardType,