expo-paste-input 0.1.14 → 0.2.0

package/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/counters.tab

@@ -1,2 +1,2 @@
-7
+10
 0

package/android/src/main/java/expo/modules/pasteinput/ExpoPasteInputView.kt

@@ -11,7 +11,6 @@ import android.view.View
 import android.view.ViewGroup
 import android.view.ActionMode
 import android.widget.EditText
-import kotlin.math.max
 import androidx.core.view.ContentInfoCompat
 import androidx.core.view.OnReceiveContentListener
 import androidx.core.view.ViewCompat
@@ -61,91 +60,45 @@ class ExpoPasteInputView(context: Context, appContext: AppContext) : ExpoView(co
     })
   }
 
-  /**
-   * Ensure this wrapper behaves like a normal container in React Native layouts.
-   *
-   * Without an explicit measure/layout pass-through, some parent layouts can end up
-   * treating this view as having near-zero height, collapsing the wrapped EditText.
-   */
   override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
-    var maxChildWidth = 0
-    var maxChildHeight = 0
-    var childState = 0
+    // Let the wrapper resolve its own size first, then size children to the
+    // resolved content box so wrapped RN inputs can fill like a normal container.
+    super.onMeasure(widthMeasureSpec, heightMeasureSpec)
+
+    val availableWidth = (measuredWidth - paddingLeft - paddingRight).coerceAtLeast(0)
+    val availableHeight = (measuredHeight - paddingTop - paddingBottom).coerceAtLeast(0)
+
+    val childWidthSpec = MeasureSpec.makeMeasureSpec(availableWidth, MeasureSpec.EXACTLY)
+    val childHeightSpec = MeasureSpec.makeMeasureSpec(availableHeight, MeasureSpec.EXACTLY)
 
     for (i in 0 until childCount) {
       val child = getChildAt(i)
-      if (child.visibility == View.GONE) continue
-
-      val lp = child.layoutParams
-      if (lp is MarginLayoutParams) {
-        measureChildWithMargins(child, widthMeasureSpec, 0, heightMeasureSpec, 0)
-        maxChildWidth = max(maxChildWidth, child.measuredWidth + lp.leftMargin + lp.rightMargin)
-        maxChildHeight = max(maxChildHeight, child.measuredHeight + lp.topMargin + lp.bottomMargin)
-      } else {
-        measureChild(child, widthMeasureSpec, heightMeasureSpec)
-        maxChildWidth = max(maxChildWidth, child.measuredWidth)
-        maxChildHeight = max(maxChildHeight, child.measuredHeight)
+      if (child.visibility != View.GONE) {
+        child.measure(childWidthSpec, childHeightSpec)
       }
-
-      childState = View.combineMeasuredStates(childState, child.measuredState)
     }
-
-    maxChildWidth += paddingLeft + paddingRight
-    maxChildHeight += paddingTop + paddingBottom
-
-    val measuredWidth = View.resolveSizeAndState(maxChildWidth, widthMeasureSpec, childState)
-    val measuredHeight =
-      View.resolveSizeAndState(maxChildHeight, heightMeasureSpec, childState shl View.MEASURED_HEIGHT_STATE_SHIFT)
-
-    setMeasuredDimension(measuredWidth, measuredHeight)
   }
 
   override fun onLayout(changed: Boolean, l: Int, t: Int, r: Int, b: Int) {
-    val parentLeft = paddingLeft
-    val parentTop = paddingTop
-    val parentRight = r - l - paddingRight
+    val left = paddingLeft
+    val top = paddingTop
+    val right = (r - l - paddingRight).coerceAtLeast(left)
+    val bottom = (b - t - paddingBottom).coerceAtLeast(top)
 
     for (i in 0 until childCount) {
       val child = getChildAt(i)
-      if (child.visibility == View.GONE) continue
-
-      val lp = child.layoutParams
-      val left: Int
-      val top: Int
-      val right: Int
-      val bottom: Int
-
-      if (lp is MarginLayoutParams) {
-        left = parentLeft + lp.leftMargin
-        top = parentTop + lp.topMargin
-        right = (parentRight - lp.rightMargin).coerceAtLeast(left)
-        bottom = (top + child.measuredHeight).coerceAtMost(b - t - paddingBottom - lp.bottomMargin)
-      } else {
-        left = parentLeft
-        top = parentTop
-        right = parentRight.coerceAtLeast(left)
-        bottom = (top + child.measuredHeight).coerceAtMost(b - t - paddingBottom)
+      if (child.visibility != View.GONE) {
+        child.layout(left, top, right, bottom)
       }
-
-      child.layout(left, top, right, bottom)
     }
   }
-  
-  // Pass through all touch events to children - never intercept
-  override fun onInterceptTouchEvent(ev: android.view.MotionEvent?): Boolean {
-    return false
-  }
-  
-  override fun onTouchEvent(event: android.view.MotionEvent?): Boolean {
-    return false
-  }
-  
-  override fun dispatchTouchEvent(ev: android.view.MotionEvent?): Boolean {
-    return super.dispatchTouchEvent(ev)
-  }
-  
+
   override fun onViewAdded(child: View?) {
     super.onViewAdded(child)
+    // Let default container sizing recalculate after RN inserts a child.
+    requestLayout()
+    invalidate()
+
     // Re-scan for text input when a new child is added
     if (!isMonitoring) {
       startMonitoring()

package/ios/ExpoPasteInputView.swift

@@ -511,14 +511,17 @@ class ExpoPasteInputView: ExpoView {
     var attachmentRanges: [NSRange] = []
     var mediaPayloads: [MediaPayload] = []
 
+    // Only track ranges for attachments we successfully extract a real payload
+    // from. Attachments without a payload (e.g. iOS dictation placeholders)
+    // are left alone — sanitizing them would delete characters the system
+    // manages itself, and emitting "unsupported" would raise a spurious error.
     attributedText.enumerateAttribute(.attachment, in: NSRange(location: 0, length: attributedText.length), options: []) { value, range, _ in
       guard let attachment = value as? NSTextAttachment else {
         return
       }
 
-      attachmentRanges.append(range)
-
       if let payload = self.extractMediaPayload(from: attachment, textView: textView, range: range) {
+        attachmentRanges.append(range)
         mediaPayloads.append(payload)
       }
     }
@@ -529,9 +532,8 @@ class ExpoPasteInputView: ExpoView {
           return
         }
 
-        attachmentRanges.append(range)
-
         if let payload = self.extractMediaPayload(from: adaptiveGlyph) {
+          attachmentRanges.append(range)
           mediaPayloads.append(payload)
         }
       }
@@ -539,17 +541,12 @@ class ExpoPasteInputView: ExpoView {
 
     attachmentRanges = uniqueRanges(attachmentRanges)
 
-    guard !attachmentRanges.isEmpty else {
+    guard !mediaPayloads.isEmpty else {
       return
     }
 
     sanitizeAttachments(in: textView, ranges: attachmentRanges)
 
-    guard !mediaPayloads.isEmpty else {
-      handleUnsupportedPaste()
-      return
-    }
-
     emitImagesAsync(for: mediaPayloads)
   }
 
@@ -651,6 +648,11 @@ class ExpoPasteInputView: ExpoView {
   }
 
   private func extractMediaPayload(from attachment: NSTextAttachment, textView: UITextView, range: NSRange) -> MediaPayload? {
+    // Only accept attachments that carry real image payloads. We intentionally
+    // do not fall back to `image(forBounds:)` or rendering the text view's
+    // hierarchy, because system-inserted attachments (e.g. the iOS dictation
+    // placeholder) draw themselves via those paths and would cause us to
+    // emit a screenshot of the composer as a "pasted image".
     if let fileWrapperData = attachment.fileWrapper?.regularFileContents,
        let payload = extractMediaPayload(fromData: fileWrapperData) {
       return payload
@@ -667,20 +669,6 @@ class ExpoPasteInputView: ExpoView {
       return .image(image)
     }
 
-    let attachmentBounds = attachment.bounds.size.width > 0 && attachment.bounds.size.height > 0
-      ? attachment.bounds
-      : CGRect(origin: .zero, size: CGSize(width: 128, height: 128))
-
-    if let image = attachment.image(forBounds: attachmentBounds, textContainer: textView.textContainer, characterIndex: range.location),
-       image.size.width > 0,
-       image.size.height > 0 {
-      return .image(image)
-    }
-
-    if let renderedImage = renderTextAttachment(in: textView, range: range) {
-      return .image(renderedImage)
-    }
-
     return nil
   }
 
@@ -701,47 +689,6 @@ class ExpoPasteInputView: ExpoView {
     return .imageData(data)
   }
 
-  private func renderTextAttachment(in textView: UITextView, range: NSRange) -> UIImage? {
-    let glyphRange = textView.layoutManager.glyphRange(forCharacterRange: range, actualCharacterRange: nil)
-    var rect = textView.layoutManager.boundingRect(forGlyphRange: glyphRange, in: textView.textContainer)
-
-    rect.origin.x += textView.textContainerInset.left - textView.contentOffset.x
-    rect.origin.y += textView.textContainerInset.top - textView.contentOffset.y
-    rect = rect.integral
-
-    guard rect.width > 1, rect.height > 1 else {
-      return nil
-    }
-
-    let format = UIGraphicsImageRendererFormat.default()
-    format.scale = textView.window?.screen.scale ?? UIScreen.main.scale
-    format.opaque = false
-
-    let image = UIGraphicsImageRenderer(size: rect.size, format: format).image { _ in
-      let drawRect = CGRect(
-        origin: CGPoint(x: -rect.origin.x, y: -rect.origin.y),
-        size: textView.bounds.size
-      )
-
-      if textView.window != nil {
-        textView.drawHierarchy(in: drawRect, afterScreenUpdates: false)
-      } else {
-        guard let context = UIGraphicsGetCurrentContext() else {
-          return
-        }
-
-        context.translateBy(x: -rect.origin.x, y: -rect.origin.y)
-        textView.layer.render(in: context)
-      }
-    }
-
-    guard image.size.width > 0, image.size.height > 0 else {
-      return nil
-    }
-
-    return image
-  }
-
   @available(iOS 18.0, *)
   private func handleAdaptiveImageGlyphInsertion(_ adaptiveGlyph: NSAdaptiveImageGlyph) -> Bool {
     guard let payload = extractMediaPayload(from: adaptiveGlyph) else {
@@ -910,32 +857,32 @@ class ExpoPasteInputView: ExpoView {
     return headerBytes == gif87aSignature || headerBytes == gif89aSignature
   }
   
-  /// Safely creates a UIImage from data, validating it first to prevent ImageIO errors
-  private func safeCreateImage(from data: Data) -> UIImage? {
-    guard data.count > 0 else { return nil }
-    
-    // Use ImageIO to validate the data before creating UIImage
-    // This prevents ImageIO errors from corrupted or invalid image data
-    guard let imageSource = CGImageSourceCreateWithData(data as CFData, nil) else {
-      return nil
-    }
-    
-    // Check if the image source has at least one image
-    guard CGImageSourceGetCount(imageSource) > 0 else {
-      return nil
-    }
-    
-    // Create UIImage from the original data so imageOrientation from metadata is preserved.
-    guard let image = UIImage(data: data) else {
-      return nil
+  private func inferredImageFileExtension(from imageSource: CGImageSource, fallbackData data: Data) -> String {
+    if let type = CGImageSourceGetType(imageSource) as String? {
+      switch type {
+      case "public.png":
+        return "png"
+      case "public.jpeg":
+        return "jpg"
+      case "public.gif":
+        return "gif"
+      case "public.webp", "org.webmproject.webp":
+        return "webp"
+      case "public.heic":
+        return "heic"
+      case "public.heif":
+        return "heif"
+      case "public.tiff":
+        return "tiff"
+      default:
+        break
+      }
     }
-    
-    // Validate the image has valid dimensions
-    guard image.size.width > 0 && image.size.height > 0 else {
-      return nil
+
+    if isGIFData(data) {
+      return "gif"
     }
-    
-    return image
+    return "png"
   }
   
   private func processTextPaste() {
@@ -1016,11 +963,22 @@ class ExpoPasteInputView: ExpoView {
   }
 
   private func writeTemporaryImageData(_ data: Data) -> String? {
-    guard let image = safeCreateImage(from: data) else {
+    guard let imageSource = CGImageSourceCreateWithData(data as CFData, nil),
+          CGImageSourceGetCount(imageSource) > 0 else {
       return nil
     }
 
-    return writeTemporaryImage(image)
+    let fileExtension = inferredImageFileExtension(from: imageSource, fallbackData: data)
+    let fileURL = FileManager.default.temporaryDirectory
+      .appendingPathComponent(UUID().uuidString)
+      .appendingPathExtension(fileExtension)
+
+    do {
+      try data.write(to: fileURL)
+      return fileURL.absoluteString
+    } catch {
+      return nil
+    }
   }
 
   private func writeTemporaryImage(_ image: UIImage) -> String? {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-paste-input",
-  "version": "0.1.14",
+  "version": "0.2.0",
   "description": "A wrapper around React Native TextInput to paste images and GIFs from the clipboard (iOS, Android, Web)",
   "main": "build/index.js",
   "types": "build/index.d.ts",