Thanks to visit codestin.com
Credit goes to github.com

Skip to content

fix(site/src): use default combobox dropdown surface (#28613) #28669

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

Closed
github-actions wants to merge 1 commit into from
+14 −21
Closed

fix(site/src): use default combobox dropdown surface (#28613) #28669

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 8 additions & 6 deletions site/src/components/Combobox/Combobox.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,21 +114,23 @@ export const ComboboxContent = ({
<PopoverContent
ref={ref}
className={cn(
"w-auto bg-surface-secondary border-surface-quaternary overflow-y-auto text-sm",
"w-auto border-border-default overflow-y-auto text-sm",
className,
)}
{...props}
>
<Command className="bg-surface-secondary" shouldFilter={shouldFilter}>
{children}
</Command>
<Command shouldFilter={shouldFilter}>{children}</Command>
</PopoverContent>
);
};

export const ComboboxInput = CommandInput;

export const ComboboxList = CommandList;
export const ComboboxList: React.FC<
React.ComponentPropsWithRef<typeof CommandList>
> = ({ className, ...props }) => {
return <CommandList className={cn("p-2", className)} {...props} />;
};

export const ComboboxItem = ({
children,
Expand All @@ -143,7 +145,7 @@ export const ComboboxItem = ({
return (
<CommandItem
value={value}
className={cn(className, "rounded-none")}
className={className}
onSelect={(itemValue) => {
setOpen(false);
// Toggle behavior: selecting the same value deselects it.
Expand Down
9 changes: 2 additions & 7 deletions site/src/components/Filter/SelectFilter.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,16 +75,11 @@ export const SelectFilter: FC<SelectFilterProps> = ({
shouldFilter={false}
>
{selectFilterSearch}
<ComboboxList
className={cn(
!selectFilterSearch && "border-t-0",
"border-surface-quaternary",
)}
>
<ComboboxList className={cn(!selectFilterSearch && "border-t-0")}>
{options !== undefined ? (
options.map((option) => (
<ComboboxItem
className="px-4 data-[selected=true]:bg-surface-tertiary font-normal gap-4"
className="px-4 font-normal gap-4"
key={option.value}
value={option.value}
keywords={[option.label]}
Expand Down
6 changes: 1 addition & 5 deletions site/src/modules/workspaces/WorkspaceMoreActions/ChangeWorkspaceVersionDialog.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ import type { SelectFilterOption } from "#/components/Filter/SelectFilter";
import { FormFields } from "#/components/Form/Form";
import { Loader } from "#/components/Loader/Loader";
import { TemplateUpdateMessage } from "#/modules/templates/TemplateUpdateMessage";
import { cn } from "#/utils/cn";
import { createDayString } from "#/utils/createDayString";

type ChangeWorkspaceVersionDialogProps = {
Expand Down Expand Up @@ -115,10 +114,7 @@ export const ChangeWorkspaceVersionDialog: FC<
key={option.id}
value={option.id}
keywords={[option.name]}
className={cn(
"px-3 py-2 font-normal",
"data-[selected=true]:bg-surface-tertiary",
)}
className="px-3 py-2 font-normal"
>
<AvatarData
avatar={
Expand Down
6 changes: 3 additions & 3 deletions site/src/pages/WorkspacesPage/WorkspacesButton.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ export const WorkspacesButton: FC<WorkspacesButtonProps> = ({
</ComboboxTrigger>
<ComboboxContent
align="end"
className="w-[320px] max-w-[320px] overflow-hidden bg-surface-secondary border-surface-quaternary"
className="w-[320px] max-w-[320px] overflow-hidden"
>
<ComboboxInput
placeholder="Type/select a workspace template"
Expand All @@ -90,7 +90,7 @@ export const WorkspacesButton: FC<WorkspacesButtonProps> = ({
key={template.id}
value={template.id}
keywords={[template.display_name, template.name]}
className="px-4 data-[selected=true]:bg-surface-tertiary font-normal gap-3 [&>svg:last-child]:hidden"
className="px-4 font-normal gap-3 [&>svg:last-child]:hidden"
>
<Avatar
variant="icon"
Expand Down Expand Up @@ -124,7 +124,7 @@ export const WorkspacesButton: FC<WorkspacesButtonProps> = ({
<div className="shrink-0 border-0 border-t border-solid border-border py-1">
<RouterLink
to="/templates"
className="flex items-center gap-3 px-4 py-2 text-sm text-content-link no-underline outline-none hover:bg-surface-tertiary hover:no-underline focus:bg-surface-tertiary"
className="flex items-center gap-3 rounded-sm px-4 py-2 text-sm text-content-link no-underline outline-none hover:bg-surface-secondary hover:no-underline focus:bg-surface-secondary"
>
<ExternalLinkIcon className="size-icon-xs" />
<span>See all templates</span>
Expand Down
Loading