Skip to content

Adjust styling of disabled dropdowns to make their state clearer #2779

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
merged 3 commits into from
Sep 5, 2023
Merged

Adjust styling of disabled dropdowns to make their state clearer #2779

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9af0239
Show a dash when dropdown is disabled
robertbrignull Sep 4, 2023
c316d52
Set opacity to 40% when disabled
robertbrignull Sep 4, 2023
074f3fb
Move dropdown arrow away from the right-hand edge
robertbrignull Sep 4, 2023
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
28 changes: 17 additions & 11 deletions extensions/ql-vscode/src/view/common/Dropdown.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,17 @@ import * as React from "react";
import { ChangeEvent } from "react";
import { styled } from "styled-components";

const StyledDropdown = styled.select`
const DISABLED_VALUE = "-";

const StyledDropdown = styled.select<{ disabled?: boolean }>`
width: 100%;
height: calc(var(--input-height) * 1px);
background: var(--vscode-dropdown-background);
color: var(--vscode-foreground);
border: none;
border-width: 0 5px 0 0;
padding: 2px 6px 2px 8px;
opacity: ${(props) =>
props.disabled ? "var(--disabled-opacity)" : "inherit"};
`;

type Props = {
Expand All @@ -31,18 +35,20 @@ type Props = {
export function Dropdown({ value, options, disabled, onChange }: Props) {
return (
<StyledDropdown
value={disabled ? undefined : value}
value={disabled ? DISABLED_VALUE : value}
disabled={disabled}
onChange={onChange}
>
{!disabled && (
<>
{options.map((option) => (
<option key={option.value} value={option.value}>
{option.label}
</option>
))}
</>
{disabled ? (
<option key={DISABLED_VALUE} value={DISABLED_VALUE}>
{DISABLED_VALUE}
</option>
) : (
options.map((option) => (
<option key={option.value} value={option.value}>
{option.label}
</option>
))
)}
</StyledDropdown>
);
Expand Down