Skip to content

Commit d85134f

Browse files
committed
fix(mobile): handle mixed iOS drops once
1 parent 9aa97f8 commit d85134f

1 file changed

Lines changed: 11 additions & 9 deletions

File tree

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

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -505,11 +505,7 @@ public final class T3ComposerEditorView: ExpoView, UITextViewDelegate, UITextDro
505505
_ textDroppableView: UIView & UITextDroppable,
506506
proposalForDrop drop: UITextDropRequest
507507
) -> UITextDropProposal {
508-
let items = drop.dropSession.items
509-
let containsOnlyImages = !items.isEmpty && items.allSatisfy {
510-
$0.itemProvider.canLoadObject(ofClass: UIImage.self)
511-
}
512-
guard containsOnlyImages else {
508+
guard droppedImageProviders(in: drop) != nil else {
513509
return drop.suggestedProposal
514510
}
515511

@@ -525,15 +521,21 @@ public final class T3ComposerEditorView: ExpoView, UITextViewDelegate, UITextDro
525521
_ textDroppableView: UIView & UITextDroppable,
526522
willPerformDrop drop: UITextDropRequest
527523
) {
528-
let imageProviders = drop.dropSession.items
529-
.map(\.itemProvider)
530-
.filter { $0.canLoadObject(ofClass: UIImage.self) }
531-
guard !imageProviders.isEmpty else {
524+
guard let imageProviders = droppedImageProviders(in: drop) else {
532525
return
533526
}
534527
textView.loadImages(from: imageProviders)
535528
}
536529

530+
private func droppedImageProviders(in drop: UITextDropRequest) -> [NSItemProvider]? {
531+
let providers = drop.dropSession.items.map(\.itemProvider)
532+
guard !providers.isEmpty,
533+
providers.allSatisfy({ $0.canLoadObject(ofClass: UIImage.self) }) else {
534+
return nil
535+
}
536+
return providers
537+
}
538+
537539
public func textViewDidBeginEditing(_ textView: UITextView) {
538540
onComposerFocus()
539541
}

0 commit comments

Comments
 (0)