Skip to content

Commit b9ced88

Browse files
committed
perf(mobile): retain unchanged fonts on foreground refresh
1 parent 2d882e7 commit b9ced88

3 files changed

Lines changed: 119 additions & 26 deletions

File tree

‎apps/mobile/src/features/settings/appearance/AppearancePreferencesProvider.tsx‎

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ import {
2525
import { mobilePreferencesAtom, updateMobilePreferencesAtom } from "../../../state/preferences";
2626
import {
2727
normalizeFontSelections,
28+
reconcileInstalledFonts,
2829
normalizeReplyEmphasisWeights,
2930
resolveReplyEmphasis,
3031
type ReplyEmphasisWeight,
@@ -179,20 +180,28 @@ export function AppearancePreferencesProvider(props: { readonly children: ReactN
179180
useEffect(() => {
180181
let cancelled = false;
181182
let generation = 0;
183+
const updateUnavailableFonts = (missing: readonly string[]) => {
184+
setUnavailableFonts((previous) =>
185+
previous.length === missing.length &&
186+
previous.every((name, index) => name === missing[index])
187+
? previous
188+
: missing,
189+
);
190+
};
182191
const refresh = () => {
183192
generation = generation + 1;
184193
const request = generation;
185194
void resolveInstalledFonts(selectedFontNames)
186195
.then((resolved) => {
187196
if (cancelled || request !== generation) return;
188197
const available = new Map(resolved.map((font) => [font.name, font]));
189-
setInstalledFonts(available);
190-
setUnavailableFonts(selectedFontNames.filter((name) => !available.has(name)));
198+
setInstalledFonts((previous) => reconcileInstalledFonts(previous, available));
199+
updateUnavailableFonts(selectedFontNames.filter((name) => !available.has(name)));
191200
})
192201
.catch(() => {
193202
if (cancelled || request !== generation) return;
194-
setInstalledFonts(new Map());
195-
setUnavailableFonts(selectedFontNames);
203+
setInstalledFonts((previous) => (previous.size ? new Map() : previous));
204+
updateUnavailableFonts(selectedFontNames);
196205
});
197206
};
198207
refresh();

‎apps/mobile/src/lib/mobileFonts.test.ts‎

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import { describe, expect, it } from "vite-plus/test";
22
import {
33
DEFAULT_FONT_SELECTIONS,
44
normalizeFontSelections,
5+
reconcileInstalledFonts,
56
normalizeReplyEmphasisWeights,
67
resolveReplyEmphasis,
78
resolveMobileFonts,
@@ -118,3 +119,62 @@ describe("reply emphasis", () => {
118119
expect(resolveReplyEmphasis(serif, saved["SecondSerif-Regular"])).toBe("ExampleSerif-Semibold");
119120
});
120121
});
122+
123+
describe("font refresh identity", () => {
124+
it("keeps the map and font references when native descriptors are unchanged or reordered", () => {
125+
const second = { ...serif, name: "Other-Regular", regular: "Other-Regular" };
126+
const current = new Map([
127+
[serif.name, serif],
128+
[second.name, second],
129+
]);
130+
const refreshed = new Map([
131+
[second.name, { ...second }],
132+
[serif.name, { ...serif, emphasisFaces: { ...serif.emphasisFaces } }],
133+
]);
134+
expect(reconcileInstalledFonts(current, refreshed)).toBe(current);
135+
});
136+
137+
it("applies changed faces and removals while keeping unrelated font references", () => {
138+
const second = { ...serif, name: "Other-Regular", regular: "Other-Regular" };
139+
const current = new Map([
140+
[serif.name, serif],
141+
[second.name, second],
142+
]);
143+
const changed = {
144+
...serif,
145+
emphasisFaces: { ...serif.emphasisFaces, "600": "Replacement-Semibold" },
146+
};
147+
const next = reconcileInstalledFonts(
148+
current,
149+
new Map([
150+
[serif.name, changed],
151+
[second.name, { ...second }],
152+
]),
153+
);
154+
expect(next).not.toBe(current);
155+
expect(next.get(serif.name)?.emphasisFaces?.["600"]).toBe("Replacement-Semibold");
156+
expect(next.get(second.name)).toBe(second);
157+
expect(current.get(serif.name)?.emphasisFaces?.["600"]).toBe("ExampleSerif-Semibold");
158+
const removed = reconcileInstalledFonts(next, new Map([[second.name, second]]));
159+
expect(removed.has(serif.name)).toBe(false);
160+
const empty = reconcileInstalledFonts(removed, new Map());
161+
expect(empty.size).toBe(0);
162+
expect(reconcileInstalledFonts(empty, new Map())).toBe(empty);
163+
});
164+
165+
it.each(["ios", "android"])(
166+
"reuses built-in family objects across unrelated %s font refreshes",
167+
(platform) => {
168+
const selections = {
169+
interface: "system",
170+
reply: "serif",
171+
composer: "monospace",
172+
code: "monospace",
173+
};
174+
const before = resolveMobileFonts(selections, new Map(), platform);
175+
const after = resolveMobileFonts(selections, new Map([[serif.name, serif]]), platform);
176+
for (const role of ["interface", "reply", "composer", "code"] as const)
177+
expect(after[role]).toBe(before[role]);
178+
},
179+
);
180+
});

‎apps/mobile/src/lib/mobileFonts.ts‎

Lines changed: 46 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,51 @@ export const BUILT_IN_FONT_OPTIONS = [
2626
{ id: "monospace", label: "Monospace" },
2727
] as const;
2828

29+
const BUILT_IN_FAMILIES = {
30+
ios: {
31+
system: { regular: "System", medium: "System", bold: "System" },
32+
serif: {
33+
regular: "Georgia",
34+
medium: "Georgia",
35+
bold: "Georgia-Bold",
36+
emphasisFaces: { "700": "Georgia-Bold" },
37+
},
38+
mono: {
39+
regular: "Menlo-Regular",
40+
medium: "Menlo-Regular",
41+
bold: "Menlo-Bold",
42+
emphasisFaces: { "700": "Menlo-Bold" },
43+
},
44+
},
45+
android: {
46+
system: { regular: "sans-serif", medium: "sans-serif-medium", bold: "sans-serif" },
47+
serif: { regular: "serif", medium: "serif", bold: "serif" },
48+
mono: { regular: "monospace", medium: "monospace", bold: "monospace" },
49+
},
50+
} as const;
51+
52+
export function reconcileInstalledFonts(
53+
previous: ReadonlyMap<string, InstalledMobileFont>,
54+
available: ReadonlyMap<string, InstalledMobileFont>,
55+
): ReadonlyMap<string, InstalledMobileFont> {
56+
let changed = previous.size !== available.size;
57+
const next = new Map<string, InstalledMobileFont>();
58+
for (const [name, font] of available) {
59+
const prior = previous.get(name);
60+
const same =
61+
prior &&
62+
(["name", "label", "regular", "medium", "bold"] as const).every(
63+
(key) => prior[key] === font[key],
64+
) &&
65+
REPLY_EMPHASIS_OPTIONS.every(
66+
({ id }) => prior.emphasisFaces?.[id] === font.emphasisFaces?.[id],
67+
);
68+
if (!same) changed = true;
69+
next.set(name, same ? prior : font);
70+
}
71+
return changed ? next : previous;
72+
}
73+
2974
export function normalizeFontSelections(value: unknown): MobileFontSelections {
3075
const record =
3176
typeof value === "object" && value !== null ? (value as Record<string, unknown>) : {};
@@ -51,28 +96,7 @@ export function resolveMobileFonts(
5196
platform: string,
5297
): Readonly<Record<MobileFontRole, MobileFontFamily>> {
5398
const defaults = FONT_FAMILIES;
54-
const system =
55-
platform === "ios"
56-
? { regular: "System", medium: "System", bold: "System" }
57-
: { regular: "sans-serif", medium: "sans-serif-medium", bold: "sans-serif" };
58-
const serif =
59-
platform === "ios"
60-
? {
61-
regular: "Georgia",
62-
medium: "Georgia",
63-
bold: "Georgia-Bold",
64-
emphasisFaces: { "700": "Georgia-Bold" },
65-
}
66-
: { regular: "serif", medium: "serif", bold: "serif" };
67-
const mono =
68-
platform === "ios"
69-
? {
70-
regular: "Menlo-Regular",
71-
medium: "Menlo-Regular",
72-
bold: "Menlo-Bold",
73-
emphasisFaces: { "700": "Menlo-Bold" },
74-
}
75-
: { regular: "monospace", medium: "monospace", bold: "monospace" };
99+
const { system, serif, mono } = BUILT_IN_FAMILIES[platform === "ios" ? "ios" : "android"];
76100
const resolve = (selection: string, fallback: MobileFontFamily): MobileFontFamily => {
77101
if (selection === "system") return system;
78102
if (selection === "serif") return serif;

0 commit comments

Comments
 (0)