Skip to content
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

chore: make sl/tp rectangles clickable #628

Merged
merged 2 commits into from
Jun 4, 2024
Merged

chore: make sl/tp rectangles clickable #628

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
848328b
make triggers cell clickable
moo-onthelawn Jun 4, 2024
3aef7c3
fix styling
moo-onthelawn Jun 4, 2024
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
40 changes: 22 additions & 18 deletions src/views/tables/PositionsTable/PositionsTriggersCell.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,14 +90,14 @@ export const PositionsTriggersCell = ({
};

const viewOrdersButton = (
<$Button
<$ViewOrdersButton
action={ButtonAction.Navigation}
size={ButtonSize.XSmall}
onClick={onViewOrders ?? undefined}
>
{stringGetter({ key: STRING_KEYS.VIEW_ORDERS })}
<$ArrowIcon iconName={IconName.Arrow} />
</$Button>
</$ViewOrdersButton>
);

const renderOutput = ({ label, orders }: { label: string; orders: SubaccountOrder[] }) => {
Expand All @@ -107,9 +107,14 @@ export const PositionsTriggersCell = ({
liquidationWarningSide?: Nullable<AbacusPositionSides>;
} = {}) => {
const styledLabel = (
<$Label warning={liquidationWarningSide != null} hasOrders={orders.length > 0}>
<$TriggerButton
action={ButtonAction.Primary}
onClick={openTriggersDialog}
warning={liquidationWarningSide != null}
hasOrders={orders.length > 0}
>
{label}
</$Label>
</$TriggerButton>
);
return liquidationWarningSide ? (
<WithHovercard
Expand Down Expand Up @@ -228,30 +233,29 @@ const $Row = styled.span`
--item-height: 1.25rem;
`;

const $Label = styled.div<{ warning?: boolean; hasOrders: boolean }>`
align-items: center;
border: solid var(--border-width) var(--color-border);
border-radius: 0.5em;
display: flex;
font: var(--font-tiny-book);
height: var(--item-height);
padding: 0 0.25rem;
const $TriggerButton = styled(Button)<{ warning?: boolean; hasOrders: boolean }>`
--button-backgroundColor: transparent;
--button-border: solid var(--border-width) var(--color-border);
--button-font: var(--font-tiny-book);
--button-height: var(--item-height);
--button-padding: 0 0.25rem;
--button-textColor: var(--color-text-0);

${({ warning }) =>
warning &&
css`
background-color: var(--color-warning);
color: var(--color-black);
--button-textColor: var(--color-black);
--button-backgroundColor: var(--color-warning);
`}

${({ hasOrders }) =>
hasOrders
? css`
color: var(--color-text-1);
background-color: var(--color-layer-4);
--button-textColor: var(--color-text-1);
--button-backgroundColor: var(--color-layer-4);
`
: css`
color: var(--color-text-0);
--button-hover-textColor: var(--color-text-1);
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

did this because otherwise the hover is very faint (brightness filter doesn't do that much) and not very discoverable.

`}
`;

Expand All @@ -267,7 +271,7 @@ const $Output = styled(Output)<{ value: number | null }>`
`}
`;

const $Button = styled(Button)`
const $ViewOrdersButton = styled(Button)`
--button-height: var(--item-height);
--button-padding: 0;
--button-textColor: var(--color-text-1);
Expand Down
Loading