Skip to content
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

fix: move featured tool catalog to tooltip + make scrollable for smaller viewports #509

Merged
merged 2 commits into from
Sep 13, 2024
Merged

fix: move featured tool catalog to tooltip + make scrollable for smaller viewports #509

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
734f812
fix: move featured tool catalog to tooltip + make scrollable for smal…
ryanhopperlowe Sep 12, 2024
c5b888b
fix: prevent threads container from shrinking with viewport
ryanhopperlowe Sep 13, 2024
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
4 changes: 2 additions & 2 deletions app/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ function RunFile() {
<Chat
showAssistantName
classNames={{
chatBar: 'w-full mx-auto lg:w-3/4 2xl:w-1/2',
messages: 'w-full mx-auto lg:w-3/4 2xl:w-1/2',
chatBar: 'w-full mx-auto xl:w-3/4 2xl:w-1/2',
messages: 'w-full mx-auto xl:w-3/4 2xl:w-1/2',
}}
/>
</div>
Expand Down
2 changes: 1 addition & 1 deletion components/chat.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ const Chat: React.FC<ScriptProps> = ({
) : (
<>
{showAssistantName && scriptDisplayName && (
<div className="sticky top-0 p-4 z-50 bg-background">
<div className="sticky top-0 p-4 z-10 bg-background">
<h1 className="text-3xl font-medium truncate">
{scriptDisplayName ?? ''}
</h1>
Expand Down
1 change: 0 additions & 1 deletion components/chat/chatBar/CatalogListBox.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,6 @@ export const CatalogListBox = forwardRef<ToolCatalogRef, CatalogListboxProps>(

return (
<Listbox
className="relative overflow-y-auto"
aria-label={'catalog'}
variant={'flat'}
disallowEmptySelection
Expand Down
42 changes: 29 additions & 13 deletions components/chat/chatBar/commands.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,13 @@ import { ToolActionChatMessage } from '@/components/shared/tools/ToolActionChatM
import { UrlToolModal } from '@/components/shared/tools/UrlToolModal';
import { ChatContext } from '@/contexts/chat';
import { useAsync } from '@/hooks/useFetch';
import { Card, Listbox, ListboxItem, useDisclosure } from '@nextui-org/react';
import {
Card,
Listbox,
ListboxItem,
Tooltip,
useDisclosure,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this used?

} from '@nextui-org/react';
import React, {
forwardRef,
useContext,
Expand Down Expand Up @@ -311,18 +317,28 @@ export default forwardRef<ChatCommandsRef, CommandsProps>(
return (
<div className="relative w-full h-3/4 command-options">
<Upload isOpen={uploadOpen} setIsOpen={setUploadOpen} />
{isCatalogOpen && (
<Card className="absolute bottom-14 p-4" ref={catalogClickOutsideRef}>
<CatalogListBox
ref={toolcatalogRef}
query={text}
loading={loadingTool}
equippedTools={tools}
onAddTool={addTool.execute}
onUncapturedKeyDown={() => inputElement?.focus()}
/>
</Card>
)}

<Tooltip
isOpen={isCatalogOpen}
placement="top-start"
content={
<div
className="max-h-[80vh] overflow-auto"
ref={catalogClickOutsideRef}
>
<CatalogListBox
ref={toolcatalogRef}
query={text}
loading={loadingTool}
equippedTools={tools}
onAddTool={addTool.execute}
onUncapturedKeyDown={() => inputElement?.focus()}
/>
</div>
}
>
<div />
</Tooltip>

<UrlToolModal
isOpen={urlToolModal.isOpen}
Expand Down
9 changes: 5 additions & 4 deletions components/chat/messages.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import type { CallFrame } from '@gptscript-ai/gptscript';
import Calls from './messages/calls';
import { GoIssueReopened } from 'react-icons/go';
import { defaultUrlTransform } from 'react-markdown';
import clsx from 'clsx';

export enum MessageType {
Alert,
Expand Down Expand Up @@ -73,13 +74,13 @@ const Message = React.memo(
closeDelay={0.5}
>
<Avatar
showFallback
name={abbreviate(message.name || 'System')}
className="w-[40px] cursor-default"
classNames={{
base: `bg-white p-6 text-sm border dark:border-none dark:bg-zinc-900 ${
message.error && 'border-danger dark:border-danger'
}`,
base: clsx(
`bg-white p-6 text-sm border dark:border-none dark:bg-zinc-900`,
{ 'border-danger dark:border-danger': !!message.error }
),
name: `text-lg text-default-600`,
}}
/>
Expand Down
3 changes: 2 additions & 1 deletion components/edit/configure/imports.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,8 +164,9 @@ const Imports: React.FC<ImportsProps> = ({
)}
<div className={`flex flex-col gap-2`}>
<Tooltip
placement="right"
content={
<div ref={clickOutsideRef}>
<div ref={clickOutsideRef} className="max-h-[80vh] overflow-auto">
<CatalogListBox
equippedTools={tools || []}
onAddTool={(tool) => {
Expand Down
2 changes: 1 addition & 1 deletion components/threads.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ const Threads: React.FC<ThreadsProps> = ({ onOpenExplore }: ThreadsProps) => {
return (
<div
className={clsx(
`relative border-r-1 dark:border-r-zinc-800 flex flex-col transition-all duration-300 ease-in-out`,
`relative border-r-1 dark:border-r-zinc-800 flex flex-col transition-all duration-300 ease-in-out shrink-0`,
{
'w-[80px]': isCollapsed,
'w-[350px]': !isCollapsed,
Expand Down
Loading