Add extract text from image feature to clipboard preview

Maccy/Clipboard.swift

@@ -70,48 +70,52 @@ class Clipboard {
     checkForChangesInPasteboard()
   }
 
-  @MainActor
-  func copy(_ item: HistoryItem?, removeFormatting: Bool = false) {
-    guard let item else { return }
-
-    pasteboard.clearContents()
-    var contents = item.contents
-
-    if removeFormatting {
-      contents = clearFormatting(contents)
-    }
+    @MainActor
+    func copy(_ item: HistoryItem?, removeFormatting: Bool = false) {
+      guard let item else { return }
+
+      pasteboard.clearContents()
+      // Special handling for images with text when removeFormatting is true
+      if removeFormatting && item.image != nil && !item.title.isEmpty {
+        // For images with text recognition, just paste the title as plain tex
+        pasteboard.setString(item.title, forType: .string)
+      } else {
+        // Regular handling for other content types
+        var contents = item.contents
+        if removeFormatting {
+          contents = clearFormatting(contents)
+        }
 
-    for content in contents {
-      guard content.type != NSPasteboard.PasteboardType.fileURL.rawValue else { continue }
-      pasteboard.setData(content.value, forType: NSPasteboard.PasteboardType(content.type))
-    }
+        for content in contents {
+          guard content.type != NSPasteboard.PasteboardType.fileURL.rawValue else { continue }
+          pasteboard.setData(content.value, forType: NSPasteboard.PasteboardType(content.type))
+        }
 
-    // Use writeObjects for file URLs so that multiple files that are copied actually work.
-    // Only do this for file URLs because it causes an issue with some other data types (like formatted text)
-    // where the item is pasted more than once.
-    let fileURLItems: [NSPasteboardItem] = contents.compactMap { item in
-      guard item.type == NSPasteboard.PasteboardType.fileURL.rawValue else { return nil }
-      guard let value = item.value else { return nil }
-      let pasteItem = NSPasteboardItem()
-      pasteItem.setData(value, forType: NSPasteboard.PasteboardType(item.type))
-      return pasteItem
-    }
-    pasteboard.writeObjects(fileURLItems)
+        // Use writeObjects for file URLs so that multiple files that are copied actually work.
+        // Only do this for file URLs because it causes an issue with some other data types (like formatted text)
+        // where the item is pasted more than once.
+        let fileURLItems: [NSPasteboardItem] = contents.compactMap { item in
+          guard item.type == NSPasteboard.PasteboardType.fileURL.rawValue else { return nil }
+          guard let value = item.value else { return nil }
+          let pasteItem = NSPasteboardItem()
+          pasteItem.setData(value, forType: NSPasteboard.PasteboardType(item.type))
+          return pasteItem
+        }
+        pasteboard.writeObjects(fileURLItems)
+      }
 
-    pasteboard.setString("", forType: .fromMaccy)
-    pasteboard.setString(item.application ?? "", forType: .source)
-    sync()
+      pasteboard.setString("", forType: .fromMaccy)
+      pasteboard.setString(item.application ?? "", forType: .source)
+      sync()
 
-    Task {
-      Notifier.notify(body: item.title, sound: .knock)
-      checkForChangesInPasteboard()
+      Task {
+        Notifier.notify(body: item.title, sound: .knock)
+        checkForChangesInPasteboard()
+      }
     }
-  }
 
-  // Based on https://github.com/Clipy/Clipy/blob/develop/Clipy/Sources/Services/PasteService.swift.
   func paste() {
     Accessibility.check()
-
     // Add flag that left/right modifier key has been pressed.
     // See https://github.com/TermiT/Flycut/pull/18 for details.
     let cmdFlag = CGEventFlags(rawValue: UInt64(KeyChord.pasteKeyModifiers.rawValue) | 0x000008)

Maccy/Views/KeyHandlingView.swift

@@ -100,7 +100,17 @@ struct KeyHandlingView<Content: View>: View {
           appState.history.togglePin(appState.history.selectedItem)
           return .handled
         case .selectCurrentItem:
-          appState.select()
+          if let event = NSApp.currentEvent,
+             let selectedItem = appState.history.selectedItem?.item,
+             event.modifierFlags.contains(.option),
+             event.modifierFlags.contains(.shift) {
+            // Option+Shift+Enter: paste without formatting
+            Clipboard.shared.copy(selectedItem, removeFormatting: true)
+            appState.popup.close()
+            Clipboard.shared.paste()
+          } else {
+            appState.select()
+          }
           return .handled
         case .close:
           appState.popup.close()

Maccy/Views/PreviewItemView.swift

@@ -2,9 +2,7 @@ import KeyboardShortcuts
 import SwiftUI
 
 struct PreviewItemView: View {
-  weak var item: HistoryItemDecorator?
-
-  var body: some View {
+  var item: HistoryItemDecorator
     if let item = item {
       VStack(alignment: .leading, spacing: 0) {
         if let image = item.previewImage {