Skip to content

Commit 1d0a86a

Browse files
Prune acknowledged native composer events
- Drop acknowledged composer snapshots after render - Add coverage for long backlogs and retained newer events - Tighten echo detection to scan newest snapshots first
1 parent 22ca1f8 commit 1d0a86a

3 files changed

Lines changed: 55 additions & 11 deletions

File tree

‎apps/mobile/src/native/T3ComposerEditor.ios.tsx‎

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ import { useThemeColor } from "../lib/useThemeColor";
1919
import {
2020
acknowledgeComposerNativeEvent,
2121
isComposerNativeEcho,
22+
pruneAcknowledgedComposerNativeEvents,
2223
resolveComposerControlledEventCount,
2324
type ComposerNativeEventSnapshot,
2425
} from "./composerEditorRevision";
@@ -157,14 +158,16 @@ export function ComposerEditor({
157158
nativeEventSnapshotsRef.current,
158159
)
159160
: mostRecentEventCount;
161+
const acknowledgesLatestNativeEvent = isComposerNativeEcho(
162+
props.value,
163+
selection ?? null,
164+
mostRecentEventCount,
165+
nativeEventSnapshotsRef.current,
166+
);
160167
const isNativeEcho =
161168
includesNativeEvent &&
162-
isComposerNativeEcho(
163-
props.value,
164-
selection ?? null,
165-
controlledEventCount,
166-
nativeEventSnapshotsRef.current,
167-
);
169+
controlledEventCount === mostRecentEventCount &&
170+
acknowledgesLatestNativeEvent;
168171
const controlledDocumentJson = JSON.stringify({
169172
value: props.value,
170173
selection: isNativeEcho ? null : (selection ?? null),
@@ -175,6 +178,13 @@ export function ComposerEditor({
175178
useEffect(() => {
176179
previousRenderedEventSequenceRef.current = nativeEventSequence;
177180
}, [nativeEventSequence]);
181+
useEffect(() => {
182+
if (!acknowledgesLatestNativeEvent) return;
183+
nativeEventSnapshotsRef.current = pruneAcknowledgedComposerNativeEvents(
184+
nativeEventSnapshotsRef.current,
185+
mostRecentEventCount,
186+
);
187+
}, [acknowledgesLatestNativeEvent, mostRecentEventCount]);
178188
const acceptNativeEvent = useCallback(
179189
(eventCount: number, value: string, nextSelection: ComposerEditorSelection) => {
180190
const acknowledgedEventCount = acknowledgeComposerNativeEvent(

‎apps/mobile/src/native/composerEditorRevision.test.ts‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import { describe, expect, it } from "@effect/vitest";
33
import {
44
acknowledgeComposerNativeEvent,
55
isComposerNativeEcho,
6+
pruneAcknowledgedComposerNativeEvents,
67
resolveComposerControlledEventCount,
78
} from "./composerEditorRevision";
89

@@ -85,3 +86,24 @@ describe("resolveComposerControlledEventCount", () => {
8586
expect(resolveComposerControlledEventCount("ab", null, 4, snapshots)).toBe(4);
8687
});
8788
});
89+
90+
describe("pruneAcknowledgedComposerNativeEvents", () => {
91+
it("releases an arbitrarily long acknowledged backlog without a fixed-size cliff", () => {
92+
const snapshots = Array.from({ length: 1_000 }, (_, eventCount) => ({
93+
eventCount,
94+
value: `value-${eventCount}`,
95+
selection: { start: eventCount, end: eventCount },
96+
}));
97+
98+
expect(pruneAcknowledgedComposerNativeEvents(snapshots, 999)).toEqual([]);
99+
});
100+
101+
it("retains native events that arrive after the acknowledged render", () => {
102+
const snapshots = [
103+
{ eventCount: 40, value: "a", selection: { start: 1, end: 1 } },
104+
{ eventCount: 41, value: "ab", selection: { start: 2, end: 2 } },
105+
];
106+
107+
expect(pruneAcknowledgedComposerNativeEvents(snapshots, 40)).toEqual([snapshots[1]]);
108+
});
109+
});

‎apps/mobile/src/native/composerEditorRevision.ts‎

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -55,12 +55,24 @@ export function isComposerNativeEcho(
5555
eventCount: number,
5656
snapshots: ReadonlyArray<ComposerNativeEventSnapshot>,
5757
): boolean {
58-
return snapshots.some(
59-
(snapshot) =>
58+
for (let index = snapshots.length - 1; index >= 0; index -= 1) {
59+
const snapshot = snapshots[index];
60+
if (
61+
snapshot !== undefined &&
6062
snapshot.eventCount === eventCount &&
6163
snapshot.value === value &&
6264
(selection === null ||
63-
(snapshot.selection?.start === selection.start &&
64-
snapshot.selection.end === selection.end)),
65-
);
65+
(snapshot.selection?.start === selection.start && snapshot.selection.end === selection.end))
66+
) {
67+
return true;
68+
}
69+
}
70+
return false;
71+
}
72+
73+
export function pruneAcknowledgedComposerNativeEvents(
74+
snapshots: ReadonlyArray<ComposerNativeEventSnapshot>,
75+
acknowledgedEventCount: number,
76+
): ComposerNativeEventSnapshot[] {
77+
return snapshots.filter((snapshot) => snapshot.eventCount > acknowledgedEventCount);
6678
}

0 commit comments

Comments
 (0)