Skip to content

fix: dropdown button in Renku 2.0 #3465

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

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

fix: dropdown button in Renku 2.0 #3465

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
64 changes: 41 additions & 23 deletions client/src/components/buttons/Button.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ function ButtonWithMenu(props: ButtonWithMenuProps) {
);
}

interface BButtonWithMenuV2Props {
interface ButtonWithMenuV2Props {
children?: React.ReactNode;
className?: string;
color?: string;
Expand All @@ -135,33 +135,51 @@ export function ButtonWithMenuV2({
id,
preventPropagation,
size,
}: BButtonWithMenuV2Props) {
}: ButtonWithMenuV2Props) {
// ! Temporary workaround to quickly implement a design solution -- to be removed ASAP #3250
const additionalProps = preventPropagation
? { onClick: (e: React.MouseEvent) => e.stopPropagation() }
: {};
return (
<UncontrolledDropdown
{...additionalProps}
className={cx(className)}
color={color ?? "primary"}
direction={direction ?? "down"}
disabled={disabled}
group
id={id}
size={size ?? "md"}
>
{defaultButton}
<DropdownToggle
caret
className={cx("border-start-0", "dropdown-toggle-split")}
data-bs-toggle="dropdown"
color={color ?? "primary"}
data-cy="button-with-menu-dropdown"
disabled={disabled}
/>
<DropdownMenu end>{children}</DropdownMenu>
</UncontrolledDropdown>
<>
<div className={cx("d-flex", "flex-row", "gap-2")}>
{/* Bootstrap split button dropdown */}
<ButtonGroup>
{defaultButton}
<DropdownToggle
caret
className={cx("border-start-0", "dropdown-toggle-split")}
data-bs-toggle="dropdown"
color={color ?? "primary"}
data-cy="button-with-menu-dropdown"
disabled={disabled}
/>
<DropdownMenu end>{children}</DropdownMenu>
</ButtonGroup>

<UncontrolledDropdown
{...additionalProps}
className={cx(className)}
color={color ?? "primary"}
direction={direction ?? "down"}
disabled={disabled}
group
id={id}
size={size ?? "md"}
>
{defaultButton}
<DropdownToggle
caret
className={cx("border-start-0", "dropdown-toggle-split")}
data-bs-toggle="dropdown"
color={color ?? "primary"}
data-cy="button-with-menu-dropdown"
disabled={disabled}
/>
<DropdownMenu end>{children}</DropdownMenu>
</UncontrolledDropdown>
</div>
</>
);
}

Expand Down
Loading