expo-paste-input 0.1.9 → 0.1.10

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

@@ -1,2 +1,2 @@
-5
+6
 0

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

@@ -184,52 +184,56 @@ class ExpoPasteInputView(context: Context, appContext: AppContext) : ExpoView(co
         originalInsertionActionModeCallback = editText.customInsertionActionModeCallback
       }
       
-      // Set up a custom ActionMode.Callback to intercept paste from context menu
-      // This is the most reliable way to intercept paste before the toast appears
-      val callback = object : ActionMode.Callback {
+      // Set up custom callbacks to intercept paste from both selection and insertion menus.
+      customSelectionActionModeCallback = createActionModeCallback(
+        editText = editText,
+        originalCallback = originalSelectionActionModeCallback
+      )
+      editText.customSelectionActionModeCallback = customSelectionActionModeCallback
+
+      if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+        customInsertionActionModeCallback = createActionModeCallback(
+          editText = editText,
+          originalCallback = originalInsertionActionModeCallback
+        )
+        editText.customInsertionActionModeCallback = customInsertionActionModeCallback
+      }
+      
+    } catch (e: Exception) {
+      // If ActionMode.Callback approach fails, we'll rely on OnReceiveContentListener
+      // which should still work but may show the toast briefly
+    }
+  }
+
+  private fun createActionModeCallback(
+    editText: EditText,
+    originalCallback: ActionMode.Callback?
+  ): ActionMode.Callback {
+    return object : ActionMode.Callback {
         override fun onCreateActionMode(mode: ActionMode?, menu: android.view.Menu?): Boolean {
           // Delegate to original callback if it exists
-          return getOriginalActionModeCallback()?.onCreateActionMode(mode, menu) ?: true
+          return originalCallback?.onCreateActionMode(mode, menu) ?: true
         }
         
         override fun onPrepareActionMode(mode: ActionMode?, menu: android.view.Menu?): Boolean {
           // Delegate to original callback if it exists
-          return getOriginalActionModeCallback()?.onPrepareActionMode(mode, menu) ?: false
+          return originalCallback?.onPrepareActionMode(mode, menu) ?: false
         }
         
         override fun onActionItemClicked(mode: ActionMode?, item: android.view.MenuItem?): Boolean {
           if (item?.itemId == android.R.id.paste) {
-            return handlePasteFromActionMode(editText, mode, item, getOriginalActionModeCallback())
+            return handlePasteFromActionMode(editText, mode, item, originalCallback)
           }
           
           // For other actions, delegate to original callback or return false
-          return getOriginalActionModeCallback()?.onActionItemClicked(mode, item) ?: false
+          return originalCallback?.onActionItemClicked(mode, item) ?: false
         }
         
         override fun onDestroyActionMode(mode: ActionMode?) {
           // Delegate to original callback if it exists
-          getOriginalActionModeCallback()?.onDestroyActionMode(mode)
+          originalCallback?.onDestroyActionMode(mode)
         }
       }
-      
-      customSelectionActionModeCallback = callback
-      editText.customSelectionActionModeCallback = customSelectionActionModeCallback
-
-      if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-        customInsertionActionModeCallback = callback
-        editText.customInsertionActionModeCallback = customInsertionActionModeCallback
-      }
-      
-    } catch (e: Exception) {
-      // If ActionMode.Callback approach fails, we'll rely on OnReceiveContentListener
-      // which should still work but may show the toast briefly
-    }
-  }
-
-  private fun getOriginalActionModeCallback(): ActionMode.Callback? {
-    // Cursor/insertion menu and selection menu can use different callbacks.
-    // Prefer insertion callback first for insertion-mode paste.
-    return originalInsertionActionModeCallback ?: originalSelectionActionModeCallback
   }
   
   private fun handlePasteFromActionMode(
@@ -298,6 +302,8 @@ class ExpoPasteInputView(context: Context, appContext: AppContext) : ExpoView(co
           } else {
             imageUris.add(uri)
           }
+        } else if (isLikelyGifUri(uri)) {
+          gifUris.add(uri)
         } else if (isLikelyImageUri(uri)) {
           imageUris.add(uri)
         }
@@ -323,12 +329,16 @@ class ExpoPasteInputView(context: Context, appContext: AppContext) : ExpoView(co
     return fileName.endsWith(".png") ||
       fileName.endsWith(".jpg") ||
       fileName.endsWith(".jpeg") ||
-      fileName.endsWith(".gif") ||
       fileName.endsWith(".webp") ||
       fileName.endsWith(".heic") ||
       fileName.endsWith(".heif")
   }
 
+  private fun isLikelyGifUri(uri: Uri): Boolean {
+    val fileName = uri.lastPathSegment?.lowercase() ?: return false
+    return fileName.endsWith(".gif")
+  }
+
   private fun markSuppressOnReceiveContent() {
     suppressOnReceiveContentUntilMs = SystemClock.elapsedRealtime() + 500L
   }
@@ -404,12 +414,18 @@ class ExpoPasteInputView(context: Context, appContext: AppContext) : ExpoView(co
           
           // Save to cache directory
           val cacheDir = context.cacheDir
+          val usePng = bitmap.hasAlpha()
+          val fileExtension = if (usePng) "png" else "jpg"
           // Use UUID-like approach for better uniqueness: timestamp + counter
-          val fileName = "${System.currentTimeMillis()}_${filePaths.size}.jpg"
+          val fileName = "${System.currentTimeMillis()}_${filePaths.size}.$fileExtension"
           val file = File(cacheDir, fileName)
           
           FileOutputStream(file).use { outputStream ->
-            bitmap.compress(Bitmap.CompressFormat.JPEG, 80, outputStream)
+            if (usePng) {
+              bitmap.compress(Bitmap.CompressFormat.PNG, 100, outputStream)
+            } else {
+              bitmap.compress(Bitmap.CompressFormat.JPEG, 80, outputStream)
+            }
             outputStream.flush()
           }
           

package/ios/ExpoPasteInputView.swift

@@ -151,10 +151,12 @@ class ExpoPasteInputView: ExpoView {
              let wrapper = weakWrapper.value {
             // Only process if this is our wrapped text input
             if action == #selector(UIResponderStandardEditActions.paste(_:)) {
-              let pasteboard = UIPasteboard.general
-              if pasteboard.hasStrings || wrapper.hasSupportedImageContent(in: pasteboard) {
-                return true
-              }
+              // IMPORTANT:
+              // Do not read UIPasteboard content here. iOS may show the
+              // "App would like to paste" privacy prompt on menu-open checks.
+              // We allow paste action visibility and read the pasteboard only
+              // when the user explicitly taps Paste in `paste(_:)`.
+              return true
             }
           }
           
@@ -607,41 +609,6 @@ class ExpoPasteInputView: ExpoView {
     stopMonitoring()
   }
 
-  private func hasSupportedImageContent(in pasteboard: UIPasteboard) -> Bool {
-    if pasteboard.hasImages {
-      return true
-    }
-
-    if hasPasteboardData(forAnyTypeIn: gifTypes.union(webpTypes), pasteboard: pasteboard) {
-      return true
-    }
-
-    for item in pasteboard.items {
-      for (key, value) in item {
-        let lowercasedKey = key.lowercased()
-        let isImageLikeType = lowercasedKey.contains("image") ||
-          lowercasedKey.contains("png") ||
-          lowercasedKey.contains("jpeg") ||
-          lowercasedKey.contains("jpg") ||
-          lowercasedKey.contains("tiff") ||
-          lowercasedKey.contains("heic") ||
-          lowercasedKey.contains("heif") ||
-          lowercasedKey.contains("gif") ||
-          lowercasedKey.contains("webp")
-
-        if isImageLikeType && (value is Data || value is UIImage) {
-          return true
-        }
-
-        if value is UIImage {
-          return true
-        }
-      }
-    }
-
-    return false
-  }
-
   private func hasPasteboardData(forAnyTypeIn types: Set<String>, pasteboard: UIPasteboard) -> Bool {
     for type in types {
       if let data = pasteboard.data(forPasteboardType: type), !data.isEmpty {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-paste-input",
-  "version": "0.1.9",
+  "version": "0.1.10",
   "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",