Skip to content

[Patch] Fix #402 Dropdown additional space #406

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 1 commit into from
Oct 21, 2021
Merged

[Patch] Fix #402 Dropdown additional space #406

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
34 changes: 33 additions & 1 deletion app/src/pages/Dropdown.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,12 +92,23 @@ const twitterSVG = () => {
</svg>
);
};
const more_hor = () => (
<svg
xmlns="http://www.w3.org/2000/svg"
height="24px"
viewBox="0 0 24 24"
width="24px"
fill="currentColor"
>
<path d="M0 0h24v24H0V0z" fill="none" />
<path d="M6 10c-1.1 0-2 .9-2 2s.9 2 2 2 2-.9 2-2-.9-2-2-2zm12 0c-1.1 0-2 .9-2 2s.9 2 2 2 2-.9 2-2-.9-2-2-2zm-6 0c-1.1 0-2 .9-2 2s.9 2 2 2 2-.9 2-2-.9-2-2-2z" />
</svg>
);

function App() {
const selectOption = () => {
console.log("selected");
};

const optionsWithoutIcon = [
{
value: 1,
Expand Down Expand Up @@ -278,6 +289,27 @@ function App() {
margin="medium"
></DxcDropdown>
</div>
<h4>Icon without caret and label</h4>
<div>
<DxcDropdown
options={optionsWithoutIcon}
onSelectOption={(option) => console.log(option)}
caretHidden={true}
icon={more_hor}
margin="small"
></DxcDropdown>
</div>
<h4>Icon & Label</h4>
<div>
<DxcDropdown
options={optionsWithoutIcon}
onSelectOption={(option) => console.log(option)}
caretHidden={true}
label="Icon & Label"
icon={more_hor}
margin="small"
></DxcDropdown>
</div>
<div>
<h4>Custom Dropdown</h4>
<div className="test-case" id="custom-colors">
Expand Down
17 changes: 5 additions & 12 deletions lib/src/dropdown/Dropdown.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,13 +111,8 @@ const DxcDropdown = ({
{label}
</DropdownTriggerLabel>
</DropdownTriggerContainer>
<CaretIconContainer disabled={disabled}>
{caretHidden !== true &&
(anchorEl === null ? (
<DownArrowIcon caretHidden={caretHidden} margin={margin} />
) : (
<UpArrowIcon caretHidden={caretHidden} margin={margin} />
))}
<CaretIconContainer caretHidden={caretHidden} disabled={disabled}>
{!caretHidden && (anchorEl === null ? <DownArrowIcon /> : <UpArrowIcon />)}
</CaretIconContainer>
</DropdownTrigger>
<DXCMenu
Expand Down Expand Up @@ -386,15 +381,13 @@ const ListIconContainer = styled.div`
`;

const CaretIconContainer = styled.div`
display: ${(props) => (props.caretHidden === true ? "none" : "inline-flex")};
width: ${(props) => props.theme.caretIconSize};
height: ${(props) => props.theme.caretIconSize};
display: ${(props) => (props.caretHidden ? "none" : "inline-flex")};
margin-left: ${(props) => props.theme.caretIconSpacing};
color: ${(props) => (props.disabled ? props.theme.disabledColor : props.theme.caretIconColor)};

svg {
height: 100%;
width: 100%;
width: ${(props) => props.theme.caretIconSize};
height: ${(props) => props.theme.caretIconSize};
}
`;

Expand Down