Skip to content

Minor fixes 1003 #1529

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
duckduckhero merged 3 commits into from
Oct 3, 2025
Merged

Minor fixes 1003 #1529

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ec4abb3
very minor fixes
duckduckhero Oct 3, 2025
6d15aa0
dprint
duckduckhero Oct 3, 2025
3d5b473
Merge branch 'main' of https://github.com/fastrepl/hyprnote into mino…
duckduckhero Oct 3, 2025
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
65 changes: 31 additions & 34 deletions apps/desktop/src/components/editor-area/note-header/sub-headers/enhanced-note-sub-header.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,13 +39,27 @@ export function EnhancedNoteSubHeader({
const templatesQuery = useQuery({
queryKey: ["templates"],
queryFn: () =>
TemplateService.getAllTemplates().then((templates) =>
templates.map((template) => {
TemplateService.getAllTemplates().then((templates) => {
const sortedTemplates = templates.sort((a, b) => {
const aIsBuiltin = a.tags?.includes("builtin") || false;
const bIsBuiltin = b.tags?.includes("builtin") || false;

if (aIsBuiltin === bIsBuiltin) {
return 0;
}
return aIsBuiltin ? 1 : -1; // custom templates come first
});

return sortedTemplates.map((template) => {
const title = template.title || "Untitled";
const truncatedTitle = title.length > 30 ? title.substring(0, 30) + "..." : title;
return { id: template.id, title: truncatedTitle, fullTitle: template.title || "" };
})
),
return {
id: template.id,
title: truncatedTitle,
fullTitle: template.title || "",
};
});
}),
refetchOnWindowFocus: true,
});

Expand All @@ -57,6 +71,13 @@ export function EnhancedNoteSubHeader({
},
});

const handleTemplateDropdownChange = (open: boolean) => {
setIsTemplateDropdownOpen(open);
if (open) {
templatesQuery.refetch();
}
};

const handleRegenerateOrCancel = () => {
if (isEnhancing) {
// Cancel the enhancement
Expand All @@ -79,11 +100,11 @@ export function EnhancedNoteSubHeader({
const actualTemplateId = templateId === "auto" ? null : templateId;
onEnhance({ triggerType: "template", templateId: actualTemplateId });
}
setIsTemplateDropdownOpen(false);
handleTemplateDropdownChange(false);
};

const handleAddTemplate = async () => {
setIsTemplateDropdownOpen(false);
handleTemplateDropdownChange(false);
try {
await windowsCommands.windowShow({ type: "settings" });
await windowsCommands.windowNavigate({ type: "settings" }, "/app/settings?tab=templates");
Expand Down Expand Up @@ -144,37 +165,13 @@ export function EnhancedNoteSubHeader({
<div className="flex items-center justify-end px-8 pt-2 pb-0.5">
{/* Regenerate button */}
<div className="flex items-center gap-2">
{
/* Share button
<Popover open={isShareDropdownOpen} onOpenChange={handleShareOpenChange}>
<PopoverTrigger asChild>
<Button
variant="outline"
size="sm"
className="text-xs h-6 px-3 hover:bg-neutral-100"
>
<Share2 size={14} className="mr-1.5" />
Share
</Button>
</PopoverTrigger>
<PopoverContent
className="w-80 p-3 focus:outline-none focus:ring-0 focus:ring-offset-0"
align="end"
sideOffset={4}
>
<SharePopoverContent />
</PopoverContent>
</Popover>
*/
}

{/* Regenerate button with template dropdown */}
<Popover open={isTemplateDropdownOpen} onOpenChange={setIsTemplateDropdownOpen}>
<Popover open={isTemplateDropdownOpen} onOpenChange={handleTemplateDropdownChange}>
<PopoverTrigger asChild>
<Button
variant="outline"
size="sm"
onClick={isEnhancing ? handleRegenerateOrCancel : () => setIsTemplateDropdownOpen(true)}
onClick={isEnhancing ? handleRegenerateOrCancel : () => handleTemplateDropdownChange(true)}
onMouseEnter={() => setIsHovered(true)}
onMouseLeave={() => setIsHovered(false)}
disabled={false}
Expand Down Expand Up @@ -269,7 +266,7 @@ export function EnhancedNoteSubHeader({
<span className="truncate">No Template (Default)</span>
</div>

{/* Custom templates */}
{/* Templates */}
{templatesQuery.data && templatesQuery.data.length > 0 && (
<>
<div className="my-1 border-t border-neutral-200"></div>
Expand Down
6 changes: 3 additions & 3 deletions apps/desktop/src/components/right-panel/components/chat/chat-input.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -505,11 +505,11 @@ export function ChatInput(
{/* Bottom area stays fixed */}
<div className="flex items-center justify-between pt-2 pb-2 px-3 flex-shrink-0">
<button
className="text-xs text-neutral-500 hover:text-neutral-700 transition-colors cursor-pointer flex items-center gap-1"
className="text-xs text-neutral-500 hover:text-neutral-700 transition-colors cursor-pointer flex items-center gap-1 min-w-0"
onClick={() => setIsModelModalOpen(true)}
>
<BrainIcon className="h-3 w-3" />
{getCurrentModelName()}
<BrainIcon className="h-3 w-3 flex-shrink-0" />
<span className="truncate max-w-[120px]">{getCurrentModelName()}</span>
</button>

<Button
Expand Down
Loading