Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion apps/mobile/src/components/ComposerToolbar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ export function ComposerInlineControl(props: {
readonly icon?: ComponentProps<typeof SymbolView>["name"];
readonly iconNode?: ReactNode;
readonly label: string;
readonly maxWidth?: number;
readonly maxWidth?: ViewStyle["maxWidth"];
readonly onPress?: () => void;
readonly selected?: boolean;
readonly static?: boolean;
Expand Down
35 changes: 18 additions & 17 deletions apps/mobile/src/features/threads/NewTaskDraftScreen.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ import {
ComposerActionButton,
ComposerInlineControl,
ComposerToolbarRow,
ComposerToolbarScroller,
} from "../../components/ComposerToolbar";
import { AndroidScreenHeader } from "../../components/AndroidScreenHeader";
import { ComposerAttachmentButton } from "../../components/ComposerAttachmentButton";
Expand Down Expand Up @@ -1345,21 +1344,23 @@ export function NewTaskDraftScreen(props: {
onPickMedia={handlePickMedia}
onPickFiles={handlePickFiles}
/>
<ComposerToolbarScroller align="end" contentPaddingRight={0} fadeSurface="sheet">
<ComposerInlineControl
accessibilityLabel="Model and reasoning settings"
disabled={isComposerInteractionLocked}
emphasized
iconNode={
<ProviderIcon
provider={flow.selectedModelOption?.providerDriver}
size={16}
/>
}
label={flow.selectedModelOption?.label ?? "Choose model"}
maxWidth={152}
onPress={settingsSheetPresentation.open}
/>
<View className="min-w-0 flex-1 flex-row items-center justify-end gap-2">
<View className="min-w-0 shrink">
<ComposerInlineControl
accessibilityLabel="Model and reasoning settings"
disabled={isComposerInteractionLocked}
emphasized
iconNode={
<ProviderIcon
provider={flow.selectedModelOption?.providerDriver}
size={16}
/>
}
label={flow.selectedModelOption?.label ?? "Choose model"}
maxWidth="100%"
onPress={settingsSheetPresentation.open}
/>
</View>
{flow.planModeEnabled ? (
<ComposerInlineControl
accessibilityHint={`Switches to ${flow.interactionMode === "plan" ? "Build" : "Plan"} mode`}
Expand All @@ -1380,7 +1381,7 @@ export function NewTaskDraftScreen(props: {
showChevron={false}
/>
) : null}
</ComposerToolbarScroller>
</View>
</>
)}
<ComposerDictationPrimaryAction
Expand Down
4 changes: 2 additions & 2 deletions apps/mobile/src/features/threads/ThreadComposer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -780,15 +780,15 @@ export const ThreadComposer = memo(function ThreadComposer(props: ThreadComposer
onPickMedia={props.onPickDraftMedia}
onPickFiles={props.onPickDraftFiles}
/>
<View className="min-w-0 shrink" style={{ maxWidth: 152 }}>
<View className="min-w-0 shrink">
<ComposerInlineControl
accessibilityLabel="Model and reasoning settings"
emphasized
iconNode={
<ProviderIcon provider={currentModelOption?.providerDriver} size={16} />
}
label={currentModelOption?.label ?? currentModelSelection.model}
maxWidth={152}
maxWidth="100%"
onPress={openSettings}
/>
</View>
Expand Down
1 change: 0 additions & 1 deletion apps/web/src/components/chat/ChatComposer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4146,7 +4146,6 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
) : null}
<ProviderModelPicker
isComposerOwned
compact={composerControlsCompact}
disabled={providerCatalogPending}
activeInstanceId={
providerCatalogPending
Expand Down
5 changes: 2 additions & 3 deletions apps/web/src/components/chat/ProviderModelPicker.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ export const ProviderModelPicker = memo(function ProviderModelPicker(props: {
activeProviderIconClassName?: string;
instanceIndicatorBackground?: string;
size?: ComposerControlSize;
compact?: boolean;
isComposerOwned?: boolean;
disabled?: boolean;
terminalOpen?: boolean;
Expand Down Expand Up @@ -171,8 +170,8 @@ export const ProviderModelPicker = memo(function ProviderModelPicker(props: {
size={size}
data-chat-provider-model-picker="true"
className={cn(
"min-w-0 justify-between whitespace-nowrap",
props.compact ? "max-w-42 shrink-0" : "max-w-48 shrink sm:max-w-56",
"min-w-0 shrink justify-between whitespace-nowrap",
!props.isComposerOwned && "max-w-48 sm:max-w-56",
props.triggerClassName,
)}
disabled={props.disabled}
Expand Down
Loading