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

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/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@apollohg/react-native-rich-text-editor",
-    "version": "2.0.1",
+    "version": "2.0.2",
     "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/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;