Skip to content

Commit 89dfbf9

Browse files
committed
fix(mobile): let image drops reach the iOS composer
Accept image-only item providers in canPaste so UIKit can forward them to the existing text-drop delegate. Keep default handling for other providers and reject drops when the input is locked.
1 parent 5b35402 commit 89dfbf9

3 files changed

Lines changed: 66 additions & 0 deletions

File tree

‎apps/mobile/modules/t3-composer-editor/ios/T3ComposerEditorView.swift‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -195,6 +195,16 @@ private final class ComposerTextView: UITextView {
195195
return super.canPerformAction(action, withSender: sender)
196196
}
197197

198+
override func canPaste(_ itemProviders: [NSItemProvider]) -> Bool {
199+
guard isEditable, !isReadOnly else { return false }
200+
// UIKit checks canPaste before forwarding a drag to UITextDropDelegate.
201+
if !itemProviders.isEmpty,
202+
itemProviders.allSatisfy({ $0.canLoadObject(ofClass: UIImage.self) }) {
203+
return true
204+
}
205+
return super.canPaste(itemProviders)
206+
}
207+
198208
override func paste(_ sender: Any?) {
199209
guard !isReadOnly else {
200210
return
Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
import UniformTypeIdentifiers
2+
3+
private func check(_ passed: Bool, _ message: String) {
4+
if !passed {
5+
FileHandle.standardError.write(Data((message + "\n").utf8))
6+
exit(1)
7+
}
8+
}
9+
10+
private let editor = ComposerTextView()
11+
private let image = UIGraphicsImageRenderer(size: CGSize(width: 8, height: 8)).image { context in
12+
UIColor.red.setFill()
13+
context.fill(CGRect(x: 0, y: 0, width: 8, height: 8))
14+
}
15+
private let imageProvider = NSItemProvider(object: image)
16+
private let pngProvider = NSItemProvider(item: image.pngData()! as NSData, typeIdentifier: UTType.png.identifier)
17+
private let textProvider = NSItemProvider(object: "plain text" as NSString)
18+
private let fileProvider = NSItemProvider(item: Data("file".utf8) as NSData, typeIdentifier: UTType.data.identifier)
19+
20+
check(editor.canPaste([imageProvider]), "An image drag must reach the composer's UITextDropDelegate")
21+
check(editor.canPaste([pngProvider]), "A PNG representation must reach the image drop handler")
22+
check(editor.canPaste([imageProvider, pngProvider]), "A multi-image drag must be accepted")
23+
24+
private let defaultEditor = UITextView()
25+
for providers in [[textProvider], [], [fileProvider], [imageProvider, textProvider], [imageProvider, fileProvider]] {
26+
check(editor.canPaste(providers) == defaultEditor.canPaste(providers), "Non-image-only sessions must retain UIKit behavior")
27+
}
28+
29+
editor.isReadOnly = true
30+
check(!editor.canPaste([imageProvider]), "A read-only composer must reject image drops")
31+
editor.isReadOnly = false
32+
editor.isEditable = false
33+
check(!editor.canPaste([imageProvider]), "A noneditable composer must reject image drops")
34+
editor.isEditable = true
35+
check(editor.canPaste([imageProvider]), "An unlocked composer must accept image drops again")
36+
print("Composer image-drop eligibility checks passed")
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
#!/bin/bash
2+
set -euo pipefail
3+
module_dir=$(cd "$(dirname "$0")/.." && pwd)
4+
sdk=$(xcrun --sdk macosx --show-sdk-path)
5+
output=$(mktemp -d)
6+
trap 'rm -rf "$output"' EXIT
7+
# Compile the real UITextView and clipboard helpers without the Expo bridge.
8+
python3 - "$module_dir" "$output/main.swift" <<'PYTHON'
9+
import sys
10+
from pathlib import Path
11+
module = Path(sys.argv[1])
12+
editor = (module / "ios/T3ComposerEditorView.swift").read_text().split("public final class T3ComposerEditorView:")[0]
13+
clipboard = (module / "ios/T3ComposerEditorModule.swift").read_text().split('@ExpoModule("T3ComposerEditor")')[0]
14+
source = (editor + "\n" + clipboard).replace("import ExpoModulesCore\n", "")
15+
Path(sys.argv[2]).write_text(source + "\n" + (module / "tests/ios/main.swift").read_text())
16+
PYTHON
17+
xcrun swiftc -target "$(uname -m)-apple-ios16.4-macabi" -sdk "$sdk" \
18+
-F "$sdk/System/iOSSupport/System/Library/Frameworks" \
19+
"$output/main.swift" -o "$output/composer-tests"
20+
"$output/composer-tests"

0 commit comments

Comments
 (0)