Skip to content

Commit 8b97125

Browse files
committed
fix(mobile): picking a model shows its remembered options before saving
1 parent 4ee6bfd commit 8b97125

4 files changed

Lines changed: 42 additions & 5 deletions

File tree

‎apps/mobile/src/features/threads/ThreadComposer.tsx‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -677,6 +677,7 @@ export const ThreadComposer = memo(function ThreadComposer(props: ThreadComposer
677677
reportedModelSelection: props.reportedModelSelection,
678678
onSelectModel: (option) =>
679679
props.onUpdateModelSelection(withRememberedModelOptions(option.selection)),
680+
restoreSelection: withRememberedModelOptions,
680681
optionDescriptors: providerOptionDescriptors,
681682
onUpdateOptionSelections: (options) => {
682683
rememberModelOptions(

‎apps/mobile/src/features/threads/ThreadSettingsSheet.tsx‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,10 @@ import type { ModelOption, ProviderGroup } from "../../lib/modelOptions";
5555
import { applyProviderOptionSelection } from "../../lib/providerOptions";
5656
import { resolveProviderOptionDescriptors } from "../../lib/providerOptions";
5757
import { useUniwindTheme } from "../../lib/useUniwindTheme";
58-
import { rememberModelOptions } from "../../state/use-model-option-memory";
58+
import {
59+
rememberModelOptions,
60+
withRememberedModelOptions,
61+
} from "../../state/use-model-option-memory";
5962
import {
6063
NativeHeaderToolbar,
6164
NativeStackScreenOptions,
@@ -247,6 +250,8 @@ type ThreadSettingsSessionProps = {
247250
readonly selectedModel: ModelSelection | null;
248251
readonly reportedModelSelection?: ModelSelection | null;
249252
readonly onSelectModel: (option: ModelOption) => void;
253+
/** Completes a picked model's selection as Save will, so staged option rows preview it. */
254+
readonly restoreSelection?: (selection: ModelSelection) => ModelSelection;
250255
readonly optionDescriptors: ReadonlyArray<ProviderOptionDescriptor>;
251256
readonly onUpdateOptionSelections: (selections: ReadonlyArray<ProviderOptionSelection>) => void;
252257
readonly runtimeMode: RuntimeMode;
@@ -464,10 +469,11 @@ function ThreadSettingsSessionProvider(
464469
current,
465470
pressed: option,
466471
pressedIsApplied: isApplied(option),
472+
restoreSelection: props.restoreSelection,
467473
}),
468474
);
469475
},
470-
[isApplied],
476+
[isApplied, props.restoreSelection],
471477
);
472478

473479
const value = useMemo<ThreadSettingsSessionValue>(
@@ -1435,6 +1441,7 @@ export function NewTaskThreadSettingsRouteScreen() {
14351441
providerGroups={flow.providerGroups}
14361442
selectedModel={flow.selectedModel}
14371443
onSelectModel={(option) => flow.setSelectedModelKey(option.key, option.selection.options)}
1444+
restoreSelection={withRememberedModelOptions}
14381445
optionDescriptors={optionDescriptors}
14391446
onUpdateOptionSelections={flow.setSelectedModelOptions}
14401447
runtimeMode={flow.runtimeMode}

‎apps/mobile/src/features/threads/thread-settings-sheet-state.test.ts‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,10 +128,30 @@ describe("thread settings sheet state", () => {
128128
current: pending,
129129
pressed: modelOption("gpt-next"),
130130
pressedIsApplied: false,
131+
restoreSelection: (selection) => ({
132+
...selection,
133+
options: [{ id: "effort", value: "low" }],
134+
}),
131135
}),
132136
).toBe(pending);
133137
});
134138

139+
it("stages a newly pressed model with the options Save would restore", () => {
140+
const remembered = [
141+
{ id: "effort", value: "high" },
142+
{ id: "serviceTier", value: "fast" },
143+
];
144+
145+
expect(
146+
pendingModelAfterPress({
147+
current: modelOption("gpt-next"),
148+
pressed: modelOption("gpt-other"),
149+
pressedIsApplied: false,
150+
restoreSelection: (selection) => ({ ...selection, options: remembered }),
151+
})?.selection.options,
152+
).toEqual(remembered);
153+
});
154+
135155
it("stages a different model", () => {
136156
const pressed = modelOption("gpt-other");
137157

‎apps/mobile/src/features/threads/thread-settings-sheet-state.ts‎

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import type { ModelOption, ProviderGroup } from "../../lib/modelOptions";
2-
import type { ProviderInstanceId } from "@t3tools/contracts";
2+
import type { ModelSelection, ProviderInstanceId } from "@t3tools/contracts";
33

44
export type ModelFavorite = {
55
readonly provider: ProviderInstanceId;
@@ -53,16 +53,25 @@ export function modelMatchesCatalogQuery(input: {
5353
].some((value) => value.toLocaleLowerCase().includes(query));
5454
}
5555

56-
/** Preserve staged provider options when the highlighted model is tapped again. */
56+
/**
57+
* Stage a newly pressed model with the options Save would apply, and preserve
58+
* staged provider options when the highlighted model is tapped again.
59+
*/
5760
export function pendingModelAfterPress(input: {
5861
readonly current: ModelOption | null;
5962
readonly pressed: ModelOption;
6063
readonly pressedIsApplied: boolean;
64+
readonly restoreSelection?: (selection: ModelSelection) => ModelSelection;
6165
}): ModelOption | null {
6266
if (input.pressedIsApplied) {
6367
return null;
6468
}
65-
return input.current?.key === input.pressed.key ? input.current : input.pressed;
69+
if (input.current?.key === input.pressed.key) {
70+
return input.current;
71+
}
72+
return input.restoreSelection
73+
? { ...input.pressed, selection: input.restoreSelection(input.pressed.selection) }
74+
: input.pressed;
6675
}
6776

6877
/** A model can disappear while the picker is open. */

0 commit comments

Comments
 (0)