mirror of
https://github.com/mountain-loop/yaak.git
synced 2026-04-25 10:18:31 +02:00
Dropdown keys and pointer events
This commit is contained in:
@@ -49,6 +49,7 @@ export function RecentRequestsDropdown() {
|
|||||||
if (request === undefined) continue;
|
if (request === undefined) continue;
|
||||||
|
|
||||||
recentRequestItems.push({
|
recentRequestItems.push({
|
||||||
|
key: request.id,
|
||||||
label: request.name,
|
label: request.name,
|
||||||
leftSlot: <CountBadge className="!ml-0 px-0 w-5" count={recentRequestItems.length + 1} />,
|
leftSlot: <CountBadge className="!ml-0 px-0 w-5" count={recentRequestItems.length + 1} />,
|
||||||
onSelect: () => {
|
onSelect: () => {
|
||||||
@@ -71,8 +72,9 @@ export function RecentRequestsDropdown() {
|
|||||||
return (
|
return (
|
||||||
<Dropdown ref={dropdownRef} items={items}>
|
<Dropdown ref={dropdownRef} items={items}>
|
||||||
<Button
|
<Button
|
||||||
|
disabled={activeRequest === null}
|
||||||
size="sm"
|
size="sm"
|
||||||
className="pointer-events-auto flex-[2] text-center text-gray-800 text-sm truncate pointer-events-none"
|
className="flex-[2] text-center text-gray-800 text-sm truncate pointer-events-none"
|
||||||
>
|
>
|
||||||
{activeRequest?.name ?? <span className="text-gray-400">No Request</span>}
|
{activeRequest?.name ?? <span className="text-gray-400">No Request</span>}
|
||||||
</Button>
|
</Button>
|
||||||
|
|||||||
@@ -34,12 +34,14 @@ export function RequestActionsDropdown({ requestId, children }: Props) {
|
|||||||
ref={dropdownRef}
|
ref={dropdownRef}
|
||||||
items={[
|
items={[
|
||||||
{
|
{
|
||||||
|
key: 'duplicate',
|
||||||
label: 'Duplicate',
|
label: 'Duplicate',
|
||||||
onSelect: duplicateRequest.mutate,
|
onSelect: duplicateRequest.mutate,
|
||||||
leftSlot: <Icon icon="copy" />,
|
leftSlot: <Icon icon="copy" />,
|
||||||
rightSlot: <HotKey modifier="Meta" keyName="D" />,
|
rightSlot: <HotKey modifier="Meta" keyName="D" />,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
key: 'delete',
|
||||||
label: 'Delete',
|
label: 'Delete',
|
||||||
onSelect: deleteRequest.mutate,
|
onSelect: deleteRequest.mutate,
|
||||||
variant: 'danger',
|
variant: 'danger',
|
||||||
@@ -47,6 +49,7 @@ export function RequestActionsDropdown({ requestId, children }: Props) {
|
|||||||
},
|
},
|
||||||
{ type: 'separator', label: 'Yaak Settings' },
|
{ type: 'separator', label: 'Yaak Settings' },
|
||||||
{
|
{
|
||||||
|
key: 'appearance',
|
||||||
label: appearance === 'dark' ? 'Light Theme' : 'Dark Theme',
|
label: appearance === 'dark' ? 'Light Theme' : 'Dark Theme',
|
||||||
onSelect: toggleAppearance,
|
onSelect: toggleAppearance,
|
||||||
leftSlot: <Icon icon={appearance === 'dark' ? 'sun' : 'moon'} />,
|
leftSlot: <Icon icon={appearance === 'dark' ? 'sun' : 'moon'} />,
|
||||||
|
|||||||
@@ -131,11 +131,13 @@ export const ResponsePane = memo(function ResponsePane({ style, className }: Pro
|
|||||||
<Dropdown
|
<Dropdown
|
||||||
items={[
|
items={[
|
||||||
{
|
{
|
||||||
|
key: 'clear-single',
|
||||||
label: 'Clear Response',
|
label: 'Clear Response',
|
||||||
onSelect: deleteResponse.mutate,
|
onSelect: deleteResponse.mutate,
|
||||||
disabled: responses.length === 0,
|
disabled: responses.length === 0,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
key: 'clear-all',
|
||||||
label: `Clear ${responses.length} ${pluralize('Response', responses.length)}`,
|
label: `Clear ${responses.length} ${pluralize('Response', responses.length)}`,
|
||||||
onSelect: deleteAllResponses.mutate,
|
onSelect: deleteAllResponses.mutate,
|
||||||
hidden: responses.length <= 1,
|
hidden: responses.length <= 1,
|
||||||
@@ -143,6 +145,7 @@ export const ResponsePane = memo(function ResponsePane({ style, className }: Pro
|
|||||||
},
|
},
|
||||||
{ type: 'separator', label: 'History' },
|
{ type: 'separator', label: 'History' },
|
||||||
...responses.slice(0, 10).map((r) => ({
|
...responses.slice(0, 10).map((r) => ({
|
||||||
|
key: r.id,
|
||||||
label: (
|
label: (
|
||||||
<HStack space={2}>
|
<HStack space={2}>
|
||||||
<StatusTag className="text-xs" response={r} />
|
<StatusTag className="text-xs" response={r} />
|
||||||
|
|||||||
@@ -29,6 +29,7 @@ export const WorkspaceActionsDropdown = memo(function WorkspaceDropdown({ classN
|
|||||||
|
|
||||||
const items: DropdownItem[] = useMemo(() => {
|
const items: DropdownItem[] = useMemo(() => {
|
||||||
const workspaceItems = workspaces.map((w) => ({
|
const workspaceItems = workspaces.map((w) => ({
|
||||||
|
key: w.id,
|
||||||
label: w.name,
|
label: w.name,
|
||||||
leftSlot: activeWorkspaceId === w.id ? <Icon icon="check" /> : <Icon icon="empty" />,
|
leftSlot: activeWorkspaceId === w.id ? <Icon icon="check" /> : <Icon icon="empty" />,
|
||||||
onSelect: () => {
|
onSelect: () => {
|
||||||
@@ -51,6 +52,7 @@ export const WorkspaceActionsDropdown = memo(function WorkspaceDropdown({ classN
|
|||||||
return [
|
return [
|
||||||
...activeWorkspaceItems,
|
...activeWorkspaceItems,
|
||||||
{
|
{
|
||||||
|
key: 'rename',
|
||||||
label: 'Rename',
|
label: 'Rename',
|
||||||
leftSlot: <Icon icon="pencil" />,
|
leftSlot: <Icon icon="pencil" />,
|
||||||
onSelect: async () => {
|
onSelect: async () => {
|
||||||
@@ -69,6 +71,7 @@ export const WorkspaceActionsDropdown = memo(function WorkspaceDropdown({ classN
|
|||||||
},
|
},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
key: 'delete',
|
||||||
label: 'Delete',
|
label: 'Delete',
|
||||||
leftSlot: <Icon icon="trash" />,
|
leftSlot: <Icon icon="trash" />,
|
||||||
onSelect: deleteWorkspace.mutate,
|
onSelect: deleteWorkspace.mutate,
|
||||||
@@ -76,6 +79,7 @@ export const WorkspaceActionsDropdown = memo(function WorkspaceDropdown({ classN
|
|||||||
},
|
},
|
||||||
{ type: 'separator' },
|
{ type: 'separator' },
|
||||||
{
|
{
|
||||||
|
key: 'create-workspace',
|
||||||
label: 'Create Workspace',
|
label: 'Create Workspace',
|
||||||
leftSlot: <Icon icon="plus" />,
|
leftSlot: <Icon icon="plus" />,
|
||||||
onSelect: async () => {
|
onSelect: async () => {
|
||||||
|
|||||||
@@ -25,7 +25,7 @@ export const WorkspaceHeader = memo(function WorkspaceHeader({ className }: Prop
|
|||||||
<SidebarActions />
|
<SidebarActions />
|
||||||
<WorkspaceActionsDropdown className="pointer-events-auto" />
|
<WorkspaceActionsDropdown className="pointer-events-auto" />
|
||||||
</HStack>
|
</HStack>
|
||||||
<div>
|
<div className="pointer-events-none">
|
||||||
<RecentRequestsDropdown />
|
<RecentRequestsDropdown />
|
||||||
</div>
|
</div>
|
||||||
<div className="flex-1 flex justify-end -mr-2 pointer-events-none">
|
<div className="flex-1 flex justify-end -mr-2 pointer-events-none">
|
||||||
|
|||||||
@@ -39,6 +39,7 @@ const _Button = forwardRef<any, ButtonProps>(function Button(
|
|||||||
type = 'button',
|
type = 'button',
|
||||||
justify = 'center',
|
justify = 'center',
|
||||||
size = 'md',
|
size = 'md',
|
||||||
|
disabled,
|
||||||
...props
|
...props
|
||||||
}: ButtonProps,
|
}: ButtonProps,
|
||||||
ref,
|
ref,
|
||||||
@@ -50,6 +51,7 @@ const _Button = forwardRef<any, ButtonProps>(function Button(
|
|||||||
'outline-none whitespace-nowrap',
|
'outline-none whitespace-nowrap',
|
||||||
'focus-visible-or-class:ring',
|
'focus-visible-or-class:ring',
|
||||||
'rounded-md flex items-center',
|
'rounded-md flex items-center',
|
||||||
|
disabled ? 'pointer-events-none' : 'pointer-events-auto',
|
||||||
colorStyles[color || 'default'],
|
colorStyles[color || 'default'],
|
||||||
justify === 'start' && 'justify-start',
|
justify === 'start' && 'justify-start',
|
||||||
justify === 'center' && 'justify-center',
|
justify === 'center' && 'justify-center',
|
||||||
@@ -57,7 +59,7 @@ const _Button = forwardRef<any, ButtonProps>(function Button(
|
|||||||
size === 'sm' && 'h-sm px-2.5 text-sm',
|
size === 'sm' && 'h-sm px-2.5 text-sm',
|
||||||
size === 'xs' && 'h-xs px-2 text-sm',
|
size === 'xs' && 'h-xs px-2 text-sm',
|
||||||
),
|
),
|
||||||
[color, size, justify, className],
|
[className, disabled, color, justify, size],
|
||||||
);
|
);
|
||||||
|
|
||||||
if (typeof to === 'string') {
|
if (typeof to === 'string') {
|
||||||
@@ -69,7 +71,7 @@ const _Button = forwardRef<any, ButtonProps>(function Button(
|
|||||||
);
|
);
|
||||||
} else {
|
} else {
|
||||||
return (
|
return (
|
||||||
<button ref={ref} type={type} className={classes} {...props}>
|
<button ref={ref} type={type} className={classes} disabled={disabled} {...props}>
|
||||||
{isLoading && <Icon icon="update" size={size} className="animate-spin mr-1" />}
|
{isLoading && <Icon icon="update" size={size} className="animate-spin mr-1" />}
|
||||||
{children}
|
{children}
|
||||||
{forDropdown && <Icon icon="chevronDown" size={size} className="ml-1 -mr-1" />}
|
{forDropdown && <Icon icon="chevronDown" size={size} className="ml-1 -mr-1" />}
|
||||||
|
|||||||
@@ -25,6 +25,7 @@ export type DropdownItemSeparator = {
|
|||||||
|
|
||||||
export type DropdownItem =
|
export type DropdownItem =
|
||||||
| {
|
| {
|
||||||
|
key: string;
|
||||||
type?: 'default';
|
type?: 'default';
|
||||||
label: ReactNode;
|
label: ReactNode;
|
||||||
variant?: 'danger';
|
variant?: 'danger';
|
||||||
@@ -306,7 +307,7 @@ const Menu = forwardRef<Omit<DropdownRef, 'open' | 'isOpen' | 'toggle'>, MenuPro
|
|||||||
focused={i === selectedIndex}
|
focused={i === selectedIndex}
|
||||||
onFocus={handleFocus}
|
onFocus={handleFocus}
|
||||||
onSelect={handleSelect}
|
onSelect={handleSelect}
|
||||||
key={i + item.label}
|
key={item.key}
|
||||||
item={item}
|
item={item}
|
||||||
/>
|
/>
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -32,6 +32,7 @@ export function RadioDropdown<T = string | null>({
|
|||||||
return item;
|
return item;
|
||||||
} else {
|
} else {
|
||||||
return {
|
return {
|
||||||
|
key: item.label,
|
||||||
label: item.label,
|
label: item.label,
|
||||||
shortLabel: item.shortLabel,
|
shortLabel: item.shortLabel,
|
||||||
onSelect: () => onChange(item.value),
|
onSelect: () => onChange(item.value),
|
||||||
|
|||||||
Reference in New Issue
Block a user