The best way to control Claude Code, Codex and more from any computer or phone
Mirrored from https://github.com/Camo67/t3code.git
Synced Nov 22, 19:30 UTC
fix(mobile): the iOS composer reopens where you left a long draft (#23096)
Co-authored-by: Vishal <vishalprashantdoshi@gmail.com> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> Co-authored-by: PR Batch Tester <agent@local.test> Co-authored-by: Vishal Doshi <vdoshi96@users.noreply.github.com>
shivam committed
Oct 22, 2026 at 09:54 UTC
efa5381246675a337269a2a8843e98d02f2bc442
1 file changed
+88
-2
apps/mobile/modules/t3-composer-editor/ios/T3ComposerEditorView.swift
+88
-2
@@ -13,7 +13,7 @@ private struct ComposerTokenPayload: Decodable {
13
let end: Int
14
}
15
16
-private struct ComposerSelectionPayload: Decodable {
16
+private struct ComposerSelectionPayload: Decodable, Equatable {
17
let start: Int
18
let end: Int
19
}
@@ -449,6 +449,9 @@ public final class T3ComposerEditorView: ExpoView, UITextViewDelegate, UITextDro
449
private var tokensNeedRebuild = false
450
private var chipsNeedMeasuredWidth = false
451
private var hasDeferredForcedRebuild = false
452
+ private var pendingContentOffset: CGPoint?
453
+ private var needsSelectionReveal = false
454
+ private var selectionBeforeFocusingTap: (selection: ComposerSelectionPayload, value: String)?
455
456
let onComposerChange = EventDispatcher()
457
let onComposerSelectionChange = EventDispatcher()
@@ -520,6 +523,12 @@ public final class T3ComposerEditorView: ExpoView, UITextViewDelegate, UITextDro
523
@objc private func openContext(_ recognizer: UITapGestureRecognizer) {
524
guard let (index, attachment) = contextAttachment(at: recognizer.location(in: textView)) else {
525
textView.becomeFirstResponder()
526
+ if selectionBeforeFocusingTap != nil {
527
+ // UIKit places the caret from its own tap recognizer during this same touch.
528
+ DispatchQueue.main.async { [weak self] in
529
+ self?.restoreSelectionBeforeFocusingTap()
530
+ }
531
+ }
532
return
533
}
534
openContext(index: index, attachment: attachment)
@@ -558,7 +567,11 @@ public final class T3ComposerEditorView: ExpoView, UITextViewDelegate, UITextDro
567
}
568
569
public func gestureRecognizer(_ gestureRecognizer: UIGestureRecognizer, shouldReceive touch: UITouch) -> Bool {
561
- true
570
+ // The collapsed editor only shows the draft's first line, so a tap that expands an
571
+ // overflowing draft returns to the caret it was left at instead of moving it there.
572
+ let collapsedOverflow = !textView.isFirstResponder && !textView.isScrollEnabled && draftOverflowsBounds()
573
+ selectionBeforeFocusingTap = collapsedOverflow ? (sourceSelection(), value) : nil
574
+ return true
575
}
576
577
public func gestureRecognizer(_ gestureRecognizer: UIGestureRecognizer, shouldRecognizeSimultaneouslyWith otherGestureRecognizer: UIGestureRecognizer) -> Bool {
@@ -583,11 +596,27 @@ public final class T3ComposerEditorView: ExpoView, UITextViewDelegate, UITextDro
596
597
public override func layoutSubviews() {
598
super.layoutSubviews()
599
+ let previousSize = textView.bounds.size
600
textView.frame = bounds
601
if chipsNeedMeasuredWidth, bounds.width > 0 {
602
chipsNeedMeasuredWidth = false
603
applyControlledDocument(force: true)
604
}
605
+ if textView.isScrollEnabled, bounds.width > 0, bounds.height > 0 {
606
+ textView.layoutIfNeeded()
607
+ if let offset = pendingContentOffset {
608
+ let minY = -textView.adjustedContentInset.top
609
+ let maxY = max(minY, textView.contentSize.height - bounds.height + textView.adjustedContentInset.bottom)
610
+ textView.setContentOffset(CGPoint(x: offset.x, y: min(maxY, max(minY, offset.y))), animated: false)
611
+ pendingContentOffset = nil
612
+ }
613
+ if needsSelectionReveal || (previousSize != bounds.size && textView.isFirstResponder) {
614
+ needsSelectionReveal = false
615
+ if let selection = textView.selectedTextRange {
616
+ textView.scrollRectToVisible(textView.caretRect(for: selection.end), animated: false)
617
+ }
618
+ }
619
+ }
620
let placeholderX = textView.textContainerInset.left + textView.textContainer.lineFragmentPadding
621
let placeholderY = textView.textContainerInset.top
622
let placeholderWidth = max(
@@ -632,10 +661,12 @@ public final class T3ComposerEditorView: ExpoView, UITextViewDelegate, UITextDro
661
tokens = decode([ComposerTokenPayload].self, from: document.tokensJson) ?? []
662
tokensNeedRebuild = true
663
}
664
+ let previousSelection = sourceSelection()
665
value = document.value
666
requestedSelection = document.selection
667
applyControlledDocument(force: tokensNeedRebuild)
668
applyRequestedSelection()
669
+ cancelFocusingTapRestoreIfSelectionMoved(from: previousSelection)
670
if tokensMatchCurrentValue() {
671
tokensNeedRebuild = false
672
}
@@ -694,7 +725,16 @@ public final class T3ComposerEditorView: ExpoView, UITextViewDelegate, UITextDro
725
}
726
727
func setScrollEnabled(_ scrollEnabled: Bool) {
728
+ guard textView.isScrollEnabled != scrollEnabled else { return }
729
+ if !scrollEnabled {
730
+ // Disabling scrolling discards UITextView's offset. Restore it after
731
+ // expansion has laid out the text, regardless of prop update order.
732
+ pendingContentOffset = pendingContentOffset ?? textView.contentOffset
733
+ }
734
textView.isScrollEnabled = scrollEnabled
735
+ if scrollEnabled {
736
+ revealSelectionAfterLayout()
737
+ }
738
}
739
740
func setAutoFocus(_ autoFocus: Bool) {
@@ -738,8 +778,10 @@ public final class T3ComposerEditorView: ExpoView, UITextViewDelegate, UITextDro
778
}
779
780
func setSelection(start: Int, end: Int) {
781
+ let previousSelection = sourceSelection()
782
requestedSelection = ComposerSelectionPayload(start: start, end: end)
783
applyRequestedSelection()
784
+ cancelFocusingTapRestoreIfSelectionMoved(from: previousSelection)
785
}
786
787
public func textViewDidChange(_ textView: UITextView) {
@@ -811,6 +853,7 @@ public final class T3ComposerEditorView: ExpoView, UITextViewDelegate, UITextDro
853
}
854
855
public func textViewDidBeginEditing(_ textView: UITextView) {
856
+ revealSelectionAfterLayout()
857
onComposerFocus()
858
}
859
@@ -836,6 +879,9 @@ public final class T3ComposerEditorView: ExpoView, UITextViewDelegate, UITextDro
879
hasDeferredForcedRebuild = false
880
881
let previousSelection = sourceSelection()
882
+ if textView.isScrollEnabled {
883
+ pendingContentOffset = pendingContentOffset ?? textView.contentOffset
884
+ }
885
isApplyingControlledValue = true
886
textView.attributedText = makeAttributedDocument()
887
let targetSelection = requestedSelection ?? previousSelection
@@ -843,6 +889,11 @@ public final class T3ComposerEditorView: ExpoView, UITextViewDelegate, UITextDro
889
textView.selectedRange = displayRange(for: targetSelection)
890
restoreBaseTypingAttributes()
891
isApplyingControlledValue = false
892
+ if currentSource != value || previousSelection.start != targetSelection.start || previousSelection.end != targetSelection.end {
893
+ revealSelectionAfterLayout()
894
+ } else {
895
+ setNeedsLayout()
896
+ }
897
updatePlaceholderVisibility()
898
emitContentSizeIfNeeded()
899
}
@@ -1053,6 +1104,7 @@ public final class T3ComposerEditorView: ExpoView, UITextViewDelegate, UITextDro
1104
return
1105
}
1106
value = textView.serializedText()
1107
+ revealSelectionAfterLayout()
1108
let selection = sourceSelection()
1109
nativeEventCount += 1
1110
onComposerChange([
@@ -1122,6 +1174,40 @@ public final class T3ComposerEditorView: ExpoView, UITextViewDelegate, UITextDro
1174
isApplyingControlledValue = true
1175
textView.selectedRange = nextRange
1176
isApplyingControlledValue = false
1177
+ revealSelectionAfterLayout()
1178
+ }
1179
+
1180
+ private func restoreSelectionBeforeFocusingTap() {
1181
+ guard let snapshot = selectionBeforeFocusingTap else {
1182
+ return
1183
+ }
1184
+ selectionBeforeFocusingTap = nil
1185
+ // A draft that changed during the touch, such as a transcript landing, owns the caret now.
1186
+ guard textView.isFirstResponder, textView.markedTextRange == nil, value == snapshot.value else {
1187
+ return
1188
+ }
1189
+ let range = displayRange(for: snapshot.selection)
1190
+ guard !NSEqualRanges(range, textView.selectedRange) else {
1191
+ return
1192
+ }
1193
+ textView.selectedRange = range
1194
+ revealSelectionAfterLayout()
1195
+ }
1196
+
1197
+ private func cancelFocusingTapRestoreIfSelectionMoved(from previousSelection: ComposerSelectionPayload) {
1198
+ if sourceSelection() != previousSelection {
1199
+ selectionBeforeFocusingTap = nil
1200
+ }
1201
+ }
1202
+
1203
+ private func draftOverflowsBounds() -> Bool {
1204
+ let size = textView.sizeThatFits(CGSize(width: textView.bounds.width, height: .greatestFiniteMagnitude))
1205
+ return size.height > textView.bounds.height + 1
1206
+ }
1207
+
1208
+ private func revealSelectionAfterLayout() {
1209
+ needsSelectionReveal = true
1210
+ setNeedsLayout()
1211
}
1212
1213
private func updatePlaceholderVisibility() {