Always show settings dropdown

This commit is contained in:
Gregory Schier
2023-11-22 09:39:30 -08:00
parent 24bd90745e
commit 08a1223482
2 changed files with 4 additions and 23 deletions

View File

@@ -8,13 +8,9 @@ import { useUpdateMode } from '../hooks/useUpdateMode';
import type { DropdownProps, DropdownRef } from './core/Dropdown'; import type { DropdownProps, DropdownRef } from './core/Dropdown';
import { Dropdown } from './core/Dropdown'; import { Dropdown } from './core/Dropdown';
import { Icon } from './core/Icon'; import { Icon } from './core/Icon';
import { IconButton } from './core/IconButton';
interface Props { export function SettingsDropdown() {
requestId: string | null;
children: DropdownProps['children'];
}
export function SettingsDropdown({ requestId, children }: Props) {
const importData = useImportData(); const importData = useImportData();
const exportData = useExportData(); const exportData = useExportData();
const { appearance, toggleAppearance } = useTheme(); const { appearance, toggleAppearance } = useTheme();
@@ -22,10 +18,6 @@ export function SettingsDropdown({ requestId, children }: Props) {
const [updateMode, setUpdateMode] = useUpdateMode(); const [updateMode, setUpdateMode] = useUpdateMode();
const dropdownRef = useRef<DropdownRef>(null); const dropdownRef = useRef<DropdownRef>(null);
if (requestId == null) {
return null;
}
return ( return (
<Dropdown <Dropdown
ref={dropdownRef} ref={dropdownRef}
@@ -63,7 +55,7 @@ export function SettingsDropdown({ requestId, children }: Props) {
}, },
]} ]}
> >
{children} <IconButton size="sm" title="Request Options" icon="gear" className="pointer-events-auto" />
</Dropdown> </Dropdown>
); );
} }

View File

@@ -1,8 +1,6 @@
import classNames from 'classnames'; import classNames from 'classnames';
import React, { memo } from 'react'; import React, { memo } from 'react';
import { useActiveRequest } from '../hooks/useActiveRequest';
import { Icon } from './core/Icon'; import { Icon } from './core/Icon';
import { IconButton } from './core/IconButton';
import { HStack } from './core/Stacks'; import { HStack } from './core/Stacks';
import { EnvironmentActionsDropdown } from './EnvironmentActionsDropdown'; import { EnvironmentActionsDropdown } from './EnvironmentActionsDropdown';
import { RecentRequestsDropdown } from './RecentRequestsDropdown'; import { RecentRequestsDropdown } from './RecentRequestsDropdown';
@@ -15,8 +13,6 @@ interface Props {
} }
export const WorkspaceHeader = memo(function WorkspaceHeader({ className }: Props) { export const WorkspaceHeader = memo(function WorkspaceHeader({ className }: Props) {
const activeRequest = useActiveRequest();
return ( return (
<HStack <HStack
space={2} space={2}
@@ -36,14 +32,7 @@ export const WorkspaceHeader = memo(function WorkspaceHeader({ className }: Prop
<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">
<SettingsDropdown requestId={activeRequest?.id ?? null}> <SettingsDropdown />
<IconButton
size="sm"
title="Request Options"
icon="gear"
className="pointer-events-auto"
/>
</SettingsDropdown>
</div> </div>
</HStack> </HStack>
); );