Skip to content

Commit

Permalink
Showing 9 changed files with 26 additions and 8 deletions.
Original file line number Diff line number Diff line change
@@ -24,6 +24,5 @@ export const StyledDropdownMenuItem = styled.div<{ disabled: boolean }>`
disabled &&
css`
cursor: not-allowed;
background-color: ${({ theme }) => theme.colors.blue};
`}
`;
Original file line number Diff line number Diff line change
@@ -4,9 +4,11 @@ import { DropdownMenuWrapper } from "./styled";
import { DropdownMenuItem } from "./components";

import { type DropdownMenuProps } from "../types";
import { DropdownMenuInner, StyledDropdownMenuItem } from "./components/dropdown-menu-item/styled";

export const DropdownMenu: React.FC<DropdownMenuProps> = ({
onClick,
onClose,
value,
options,
isMultiple,
@@ -16,6 +18,14 @@ export const DropdownMenu: React.FC<DropdownMenuProps> = ({
}) => {
return (
<DropdownMenuWrapper {...props}>
<StyledDropdownMenuItem disabled={false} key={"close"} onClick={onClose}>
<DropdownMenuInner
className="flex"
style={{ justifyContent: "end", margin: "0", padding: "0" }}
>
<div className="med-pixel-text">X</div>
</DropdownMenuInner>
</StyledDropdownMenuItem>
{options.map((option, index) => {
const { title } = option;

Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@ import { Box } from "@containers";

export const DropdownMenuWrapper = styled(Box)`
max-height: 300px;
border-radius: inherit;
border-radius: 3px;
overflow: auto;
background-color: ${({ theme }) => theme.colors.econiaBlue};
`;
Original file line number Diff line number Diff line change
@@ -57,6 +57,10 @@ const MultipleSelect: React.FC<MultipleSelectProps> = ({
}
};

const onClose = () => {
setVisible(false);
};

const onApplyCLick = () => {
setVisible(false);
setValue(selectedOptions);
@@ -68,6 +72,7 @@ const MultipleSelect: React.FC<MultipleSelectProps> = ({
<DropdownComponent
options={options}
onClick={onDropdownMenuClick}
onClose={onClose}
isMultiple
values={selectedOptions}
onHover={onHover}
Original file line number Diff line number Diff line change
@@ -28,12 +28,12 @@ export const Select: React.FC<SelectProps> = ({
});

return (
<DropdownSelectWrapper ref={targetRef} onMouseEnter={replay} {...wrapperProps}>
<DropdownSelectWrapper onMouseEnter={replay} {...wrapperProps}>
<FlexGap gap="8px" ellipsis>
<Text className={"med-pixel-text"} color="darkGray">
{"{"}
</Text>
<Text className={"med-pixel-text"} {...placeholderProps} ellipsis>
<Text ref={targetRef} className={"med-pixel-text"} {...placeholderProps} ellipsis>
{t(placeholder)}
</Text>

Original file line number Diff line number Diff line change
@@ -42,6 +42,7 @@ const SingleSelect: React.FC<SingleSelectProps> = ({
options={options}
value={value}
onClick={onDropdownMenuClick}
onClose={onDropdownMenuClose}
onHover={onHover}
{...dropdownWrapperProps}
/>,
@@ -52,6 +53,10 @@ const SingleSelect: React.FC<SingleSelectProps> = ({
}
);

function onDropdownMenuClose() {
setVisible(false);
}

function onDropdownMenuClick(option: Option) {
setVisible(false);
setValue(option);
3 changes: 0 additions & 3 deletions src/typescript/frontend/src/components/selects/theme.ts
Original file line number Diff line number Diff line change
@@ -10,8 +10,5 @@ export const getTooltipStyles = (theme: DefaultTheme) => {
borderRadius: "inherit",
maxWidth: "100%",
},
arrow: {
display: "none",
},
};
};
3 changes: 2 additions & 1 deletion src/typescript/frontend/src/components/selects/types.ts
Original file line number Diff line number Diff line change
@@ -44,10 +44,11 @@ export interface DropdownMenuProps extends Omit<BoxProps, "onClick"> {
isMultiple?: boolean;
values?: Option[];
onClick: (option: Option) => void;
onClose: () => void;
onHover: (value: Option) => void;
}

export interface DropdownMenuItemProps extends Omit<DropdownMenuProps, "options"> {
export interface DropdownMenuItemProps extends Omit<Omit<DropdownMenuProps, "options">, "onClose"> {
index: number;
option: Option;
title: string;
1 change: 1 addition & 0 deletions src/typescript/frontend/src/hooks/use-tooltip/index.tsx
Original file line number Diff line number Diff line change
@@ -49,6 +49,7 @@ const useTooltip = (content: React.ReactNode, options?: TooltipOptions) => {
{ name: "offset", options: { offset: tooltipOffset } },
{ name: "preventOverflow", options: { padding: tooltipPadding } },
],
strategy: "fixed",
});

const tooltip = (

0 comments on commit b1a2bad

Please sign in to comment.