Skip to content

Commit 8d3d149

Browse files
fix(mobile): every terminal screen hears a keyboard show, not just the first
1 parent 0e39d71 commit 8d3d149

2 files changed

Lines changed: 36 additions & 20 deletions

File tree

‎apps/mobile/src/features/terminal/terminalKeyboardShowing.test.ts‎

Lines changed: 32 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -23,29 +23,44 @@ function emit(name: string) {
2323
// Android's syncKeyboardPosition repairs a nonanimated IME inset change with
2424
// keyboardDidHide then keyboardDidShow, and no will-events.
2525
it("keeps the accessory through Android's did-only repair and starts a new show after it", () => {
26-
const onChange = vi.fn();
27-
const unsubscribe = subscribeKeyboardShowing(onChange);
28-
const trace = ["keyboardWillShow", "keyboardDidShow", "keyboardDidHide", "keyboardDidShow"].map(
29-
(name) => {
30-
emit(name);
31-
return getKeyboardShowEpoch();
32-
},
33-
);
34-
emit("keyboardWillHide");
26+
// Two mounted terminal screens, each reading the snapshot when notified.
27+
const seen = [0, 0];
28+
const unsubscribes = seen.map((_, index) => {
29+
seen[index] = getKeyboardShowEpoch();
30+
return subscribeKeyboardShowing(() => {
31+
seen[index] = getKeyboardShowEpoch();
32+
});
33+
});
34+
const trace = [
35+
"keyboardWillShow",
36+
"keyboardDidShow",
37+
"keyboardDidHide",
38+
"keyboardDidShow",
39+
"keyboardWillHide",
40+
"keyboardWillShow",
41+
].map((name) => {
42+
emit(name);
43+
return {
44+
epoch: getKeyboardShowEpoch(),
45+
inSync: seen.every((s) => s === getKeyboardShowEpoch()),
46+
};
47+
});
3548

36-
const [shown, settled, repairHidden, repairShown] = trace;
49+
const [shown, settled, repairHidden, repairShown, hidden, reshown] = trace.map((t) => t.epoch);
3750
expect({
38-
neverHidden: trace.every((epoch) => epoch !== 0),
51+
neverHiddenByRepair: [shown, settled, repairHidden, repairShown].every((epoch) => epoch !== 0),
3952
sameShow: settled === shown && repairHidden === shown,
4053
newShow: repairShown !== shown,
41-
hiddenAfterWillHide: getKeyboardShowEpoch(),
42-
notified: onChange.mock.calls.length,
54+
hidden,
55+
newShowAfterHide: reshown !== 0 && reshown !== repairShown,
56+
subscribersInSync: trace.every((t) => t.inSync),
4357
}).toEqual({
44-
neverHidden: true,
58+
neverHiddenByRepair: true,
4559
sameShow: true,
4660
newShow: true,
47-
hiddenAfterWillHide: 0,
48-
notified: 3,
61+
hidden: 0,
62+
newShowAfterHide: true,
63+
subscribersInSync: true,
4964
});
50-
unsubscribe();
65+
for (const unsubscribe of unsubscribes) unsubscribe();
5166
});

‎apps/mobile/src/features/terminal/terminalKeyboardShowing.ts‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,10 @@ export function subscribeKeyboardShowing(onChange: () => void) {
1414
const show = () => {
1515
const repaired = hiddenWithoutWillHide;
1616
hiddenWithoutWillHide = false;
17-
if (keyboardShowing && !repaired) return;
18-
keyboardShowing = true;
19-
showEpoch += 1;
17+
if (!keyboardShowing || repaired) {
18+
keyboardShowing = true;
19+
showEpoch += 1;
20+
}
2021
onChange();
2122
};
2223
const willShow = KeyboardEvents.addListener("keyboardWillShow", show);

0 commit comments

Comments
 (0)