Skip to content

Commit 896c0e1

Browse files
Merge remote-tracking branch 'origin/main' into fix/issue-22748
2 parents 9362d8b + 3b95e78 commit 896c0e1

84 files changed

Lines changed: 3081 additions & 351 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

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

Lines changed: 88 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ private struct ComposerTokenPayload: Decodable {
1313
let end: Int
1414
}
1515

16-
private struct ComposerSelectionPayload: Decodable {
16+
private struct ComposerSelectionPayload: Decodable, Equatable {
1717
let start: Int
1818
let end: Int
1919
}
@@ -449,6 +449,9 @@ public final class T3ComposerEditorView: ExpoView, UITextViewDelegate, UITextDro
449449
private var tokensNeedRebuild = false
450450
private var chipsNeedMeasuredWidth = false
451451
private var hasDeferredForcedRebuild = false
452+
private var pendingContentOffset: CGPoint?
453+
private var needsSelectionReveal = false
454+
private var selectionBeforeFocusingTap: (selection: ComposerSelectionPayload, value: String)?
452455

453456
let onComposerChange = EventDispatcher()
454457
let onComposerSelectionChange = EventDispatcher()
@@ -520,6 +523,12 @@ public final class T3ComposerEditorView: ExpoView, UITextViewDelegate, UITextDro
520523
@objc private func openContext(_ recognizer: UITapGestureRecognizer) {
521524
guard let (index, attachment) = contextAttachment(at: recognizer.location(in: textView)) else {
522525
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+
}
523532
return
524533
}
525534
openContext(index: index, attachment: attachment)
@@ -558,7 +567,11 @@ public final class T3ComposerEditorView: ExpoView, UITextViewDelegate, UITextDro
558567
}
559568

560569
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
562575
}
563576

564577
public func gestureRecognizer(_ gestureRecognizer: UIGestureRecognizer, shouldRecognizeSimultaneouslyWith otherGestureRecognizer: UIGestureRecognizer) -> Bool {
@@ -583,11 +596,27 @@ public final class T3ComposerEditorView: ExpoView, UITextViewDelegate, UITextDro
583596

584597
public override func layoutSubviews() {
585598
super.layoutSubviews()
599+
let previousSize = textView.bounds.size
586600
textView.frame = bounds
587601
if chipsNeedMeasuredWidth, bounds.width > 0 {
588602
chipsNeedMeasuredWidth = false
589603
applyControlledDocument(force: true)
590604
}
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+
}
591620
let placeholderX = textView.textContainerInset.left + textView.textContainer.lineFragmentPadding
592621
let placeholderY = textView.textContainerInset.top
593622
let placeholderWidth = max(
@@ -632,10 +661,12 @@ public final class T3ComposerEditorView: ExpoView, UITextViewDelegate, UITextDro
632661
tokens = decode([ComposerTokenPayload].self, from: document.tokensJson) ?? []
633662
tokensNeedRebuild = true
634663
}
664+
let previousSelection = sourceSelection()
635665
value = document.value
636666
requestedSelection = document.selection
637667
applyControlledDocument(force: tokensNeedRebuild)
638668
applyRequestedSelection()
669+
cancelFocusingTapRestoreIfSelectionMoved(from: previousSelection)
639670
if tokensMatchCurrentValue() {
640671
tokensNeedRebuild = false
641672
}
@@ -694,7 +725,16 @@ public final class T3ComposerEditorView: ExpoView, UITextViewDelegate, UITextDro
694725
}
695726

696727
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+
}
697734
textView.isScrollEnabled = scrollEnabled
735+
if scrollEnabled {
736+
revealSelectionAfterLayout()
737+
}
698738
}
699739

700740
func setAutoFocus(_ autoFocus: Bool) {
@@ -738,8 +778,10 @@ public final class T3ComposerEditorView: ExpoView, UITextViewDelegate, UITextDro
738778
}
739779

740780
func setSelection(start: Int, end: Int) {
781+
let previousSelection = sourceSelection()
741782
requestedSelection = ComposerSelectionPayload(start: start, end: end)
742783
applyRequestedSelection()
784+
cancelFocusingTapRestoreIfSelectionMoved(from: previousSelection)
743785
}
744786

745787
public func textViewDidChange(_ textView: UITextView) {
@@ -811,6 +853,7 @@ public final class T3ComposerEditorView: ExpoView, UITextViewDelegate, UITextDro
811853
}
812854

813855
public func textViewDidBeginEditing(_ textView: UITextView) {
856+
revealSelectionAfterLayout()
814857
onComposerFocus()
815858
}
816859

@@ -836,13 +879,21 @@ public final class T3ComposerEditorView: ExpoView, UITextViewDelegate, UITextDro
836879
hasDeferredForcedRebuild = false
837880

838881
let previousSelection = sourceSelection()
882+
if textView.isScrollEnabled {
883+
pendingContentOffset = pendingContentOffset ?? textView.contentOffset
884+
}
839885
isApplyingControlledValue = true
840886
textView.attributedText = makeAttributedDocument()
841887
let targetSelection = requestedSelection ?? previousSelection
842888
requestedSelection = nil
843889
textView.selectedRange = displayRange(for: targetSelection)
844890
restoreBaseTypingAttributes()
845891
isApplyingControlledValue = false
892+
if currentSource != value || previousSelection.start != targetSelection.start || previousSelection.end != targetSelection.end {
893+
revealSelectionAfterLayout()
894+
} else {
895+
setNeedsLayout()
896+
}
846897
updatePlaceholderVisibility()
847898
emitContentSizeIfNeeded()
848899
}
@@ -1053,6 +1104,7 @@ public final class T3ComposerEditorView: ExpoView, UITextViewDelegate, UITextDro
10531104
return
10541105
}
10551106
value = textView.serializedText()
1107+
revealSelectionAfterLayout()
10561108
let selection = sourceSelection()
10571109
nativeEventCount += 1
10581110
onComposerChange([
@@ -1122,6 +1174,40 @@ public final class T3ComposerEditorView: ExpoView, UITextViewDelegate, UITextDro
11221174
isApplyingControlledValue = true
11231175
textView.selectedRange = nextRange
11241176
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()
11251211
}
11261212

11271213
private func updatePlaceholderVisibility() {

‎apps/mobile/src/Stack.tsx‎

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1059,18 +1059,34 @@ export const RootStack = RootStackConfig.with(function AdaptiveRootStack({ Navig
10591059
const nativeMetrics = useNativeLayoutMetrics();
10601060
const usesSplitView = deriveLayout({ width, height, nativeMetrics }).usesSplitView;
10611061
const usesWorkspaceFlowScreens = Platform.OS === "android" || usesSplitView;
1062+
const flowPresentations = useRef(new Map<string, boolean>());
10621063

10631064
return (
10641065
<Navigator
10651066
screenLayout={(props) => <GuardedScreenLayout {...props} />}
1067+
screenListeners={{
1068+
state: ({ data }) => {
1069+
const keys = new Set(data.state.routes.map((route) => route.key));
1070+
for (const key of flowPresentations.current.keys()) {
1071+
if (!keys.has(key)) flowPresentations.current.delete(key);
1072+
}
1073+
},
1074+
}}
10661075
screenOptions={({ route }) => {
10671076
if (route.name !== "SettingsSheet" && route.name !== "NewTaskSheet") {
10681077
return Platform.OS === "android"
10691078
? { animation: androidWorkspaceDestinationAnimation(route.name, usesSplitView) }
10701079
: {};
10711080
}
10721081

1073-
return usesWorkspaceFlowScreens
1082+
// Moving an open flow between a sheet and a split column remounts its nested
1083+
// navigator. Keep its presentation until dismissal so folding preserves the draft.
1084+
let usesCard = flowPresentations.current.get(route.key);
1085+
if (usesCard === undefined) {
1086+
usesCard = usesWorkspaceFlowScreens;
1087+
flowPresentations.current.set(route.key, usesCard);
1088+
}
1089+
return usesCard
10741090
? { presentation: "card" }
10751091
: {
10761092
presentation: "formSheet",

‎apps/mobile/src/features/home/HomeScreen.tsx‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -593,6 +593,11 @@ export function HomeScreen(props: HomeScreenProps) {
593593
showTrailingDivider={item.showTrailingDivider}
594594
onSelectPendingTask={props.onSelectPendingTask}
595595
onDeletePendingTask={props.onDeletePendingTask}
596+
fullSwipeWidth={fullSwipeWidth}
597+
onSwipeableClose={handleSwipeableClose}
598+
onSwipeableWillOpen={handleSwipeableWillOpen}
599+
simultaneousSwipeGesture={homeScrollGesture}
600+
activationKey={item.key}
596601
/>
597602
);
598603
}

‎apps/mobile/src/features/home/thread-swipe-actions.tsx‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ interface ThreadSwipeAction {
6262
readonly accessibilityLabel: string;
6363
readonly icon: ComponentProps<typeof SymbolView>["name"];
6464
readonly label: string;
65+
readonly destructive?: boolean;
6566
readonly menu?: {
6667
readonly actions: MenuAction[];
6768
readonly onPressAction: NonNullable<ComponentProps<typeof Menu>["onPressAction"]>;
@@ -726,7 +727,7 @@ export function ThreadSwipeActions(props: {
726727
<SwipeActionButton
727728
accessibilityLabel={props.primaryAction.accessibilityLabel}
728729
actionsWidth={actionsWidth}
729-
tone="primary"
730+
tone={props.primaryAction.destructive === true ? "danger" : "primary"}
730731
compact={props.compact}
731732
entryRange={
732733
secondaryAction === null

‎apps/mobile/src/features/home/usePendingTaskListActions.ts‎

Lines changed: 37 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,13 @@ import { useCallback } from "react";
55
import { removeThreadOutboxMessage } from "../../state/thread-outbox-removal";
66
import { clearComposerDraftContent } from "../../state/use-composer-drafts";
77
import type { PendingNewTask } from "../../state/use-pending-new-tasks";
8-
import { releaseEditingQueuedMessage } from "../../state/use-thread-outbox";
8+
import { appAtomRegistry } from "../../state/atom-registry";
9+
import {
10+
editingQueuedMessageIdsAtom,
11+
holdEditingQueuedMessage,
12+
releaseEditingQueuedMessage,
13+
} from "../../state/use-thread-outbox";
14+
import { withThreadDismissal } from "./thread-dismissal";
915

1016
export function usePendingTaskListActions(): {
1117
readonly openPendingTask: (pendingTask: PendingNewTask) => void;
@@ -37,10 +43,15 @@ export function usePendingTaskListActions(): {
3743
text: "Discard",
3844
style: "destructive",
3945
onPress: () => {
40-
clearComposerDraftContent(pendingTask.draftKey, {
41-
clearModelSelection: true,
42-
clearWorkspaceSelection: true,
43-
});
46+
void withThreadDismissal(
47+
pendingTask.key,
48+
async () =>
49+
clearComposerDraftContent(pendingTask.draftKey, {
50+
clearModelSelection: true,
51+
clearWorkspaceSelection: true,
52+
}),
53+
() => true,
54+
);
4455
},
4556
},
4657
]);
@@ -55,12 +66,28 @@ export function usePendingTaskListActions(): {
5566
text: "Delete",
5667
style: "destructive",
5768
onPress: () => {
58-
// Release the edit lock only after removal succeeds, and only if
59-
// it is held for THIS task — clearing it up front (or for another
60-
// task) would let the drain deliver a mid-edit payload.
61-
void removeThreadOutboxMessage(pendingTask.message)
62-
.then(() => releaseEditingQueuedMessage(pendingTask.message.messageId))
69+
// The row animates out before removal runs, so hold delivery from
70+
// confirmation on: a reconnect must not send a task being deleted.
71+
// The hold is shared with the editor, which could release it
72+
// mid-animation, so a task open in the editor is removed at once
73+
// and keeps its hold unless removal succeeds.
74+
const messageId = pendingTask.message.messageId;
75+
const heldByEditor = appAtomRegistry.get(editingQueuedMessageIdsAtom)[messageId];
76+
holdEditingQueuedMessage(messageId);
77+
const releaseUnlessEditing = () => {
78+
if (!heldByEditor) releaseEditingQueuedMessage(messageId);
79+
};
80+
const remove = () => removeThreadOutboxMessage(pendingTask.message);
81+
void (
82+
heldByEditor
83+
? remove()
84+
: withThreadDismissal(pendingTask.key, remove, (removed) => removed)
85+
)
86+
.then((removed) =>
87+
removed ? releaseEditingQueuedMessage(messageId) : releaseUnlessEditing(),
88+
)
6389
.catch((error) => {
90+
releaseUnlessEditing();
6491
Dialog.alert(
6592
"Could not delete pending task",
6693
error instanceof Error ? error.message : "The pending task could not be removed.",

‎apps/mobile/src/features/home/useThreadListActions.ts‎

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -456,10 +456,15 @@ export function useThreadListActions(): {
456456
// Pinning clears snooze, so older Settled or Snoozed undos would fight this pin.
457457
ThreadUndo.invalidate("settle", scopedThreadKey(thread.environmentId, thread.id));
458458
ThreadUndo.invalidate("snooze", scopedThreadKey(thread.environmentId, thread.id));
459-
const result = await pinMutation({
460-
environmentId: thread.environmentId,
461-
input: { threadId: thread.id, ...(orderKey !== undefined ? { orderKey } : {}) },
462-
});
459+
const result = await withThreadDismissal(
460+
scopedThreadKey(thread.environmentId, thread.id),
461+
() =>
462+
pinMutation({
463+
environmentId: thread.environmentId,
464+
input: { threadId: thread.id, ...(orderKey !== undefined ? { orderKey } : {}) },
465+
}),
466+
(result) => result._tag === "Success",
467+
);
463468
if (result._tag === "Failure") {
464469
const error = Cause.squash(result.cause);
465470
Dialog.alert(
@@ -484,10 +489,15 @@ export function useThreadListActions(): {
484489
selectionHaptic();
485490
const plan = ThreadUndo.planThreadUndo("unpin", thread);
486491
const claim = ThreadUndo.begin("pin", scopedThreadKey(thread.environmentId, thread.id));
487-
const result = await unpinMutation({
488-
environmentId: thread.environmentId,
489-
input: { threadId: thread.id },
490-
});
492+
const result = await withThreadDismissal(
493+
scopedThreadKey(thread.environmentId, thread.id),
494+
() =>
495+
unpinMutation({
496+
environmentId: thread.environmentId,
497+
input: { threadId: thread.id },
498+
}),
499+
(result) => result._tag === "Success",
500+
);
491501
if (result._tag === "Failure") {
492502
claim.finish();
493503
const error = Cause.squash(result.cause);

‎apps/mobile/src/features/layout/WorkspaceEmptyDetail.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ export function WorkspaceEmptyDetail(props: {
6565
className="mt-2 flex-row items-center gap-2 rounded-full bg-primary px-5 py-3 active:opacity-70"
6666
onPress={props.onStartNewTask}
6767
>
68-
<Text className="text-base font-t3-bold text-primary-foreground">New Task</Text>
68+
<Text className="text-base font-t3-bold text-primary-foreground">New thread</Text>
6969
</Pressable>
7070
)
7171
) : null}

‎apps/mobile/src/features/layout/createWorkspaceStackNavigator.ios.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -282,8 +282,8 @@ function WorkspaceColumns(
282282
<WorkspaceEmptyDetail
283283
tab={selectedTab}
284284
onStartNewTask={
285-
// The detail bar or a visible sidebar already carries compose.
286-
detailCompose || panes.primarySidebarVisible ? undefined : openNewTask
285+
// Duo provides compose in the detail bar; iPad uses the empty-state action.
286+
detailCompose ? undefined : openNewTask
287287
}
288288
/>
289289
</ColumnContent>

0 commit comments

Comments
 (0)