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

Feat: added clear button for asset input #1027

Merged
merged 7 commits into from
Aug 19, 2022
Merged

Feat: added clear button for asset input #1027

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
1fb05a6
feat(AssetInput): added clear button for asset input
MatthewCYLau Aug 15, 2022
6dbf71c
feat(AssetInput): update position for clear button
MatthewCYLau Aug 16, 2022
62e58c4
feat(AssetInput): use correct icon components; fine-tuned styling
MatthewCYLau Aug 16, 2022
f693094
feat(AssetInput): removed size variable from IconButton
MatthewCYLau Aug 17, 2022
8e48a2c
fix(AssetInput): updated condition to disable clear button
MatthewCYLau Aug 17, 2022
b4ad9ca
feat(AssetInput): updated hover color styling for clear button
MatthewCYLau Aug 18, 2022
c229c58
feat(AssetInput): add text-overflow ellipsis style to input
MatthewCYLau Aug 18, 2022
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
24 changes: 24 additions & 0 deletions src/components/transactions/AssetInput.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import { Trans } from '@lingui/macro';
import {
Box,
Button,
IconButton,
FormControl,
InputBase,
ListItemText,
Expand All @@ -10,6 +11,7 @@ import {
SelectChangeEvent,
Typography,
} from '@mui/material';
import { XCircleIcon } from '@heroicons/react/solid';
import React, { ReactNode } from 'react';
import NumberFormat, { NumberFormatProps } from 'react-number-format';

Expand Down Expand Up @@ -138,6 +140,9 @@ export const AssetInput = <T extends Asset = Asset>({
lineHeight: '28,01px',
padding: 0,
height: '28px',
textOverflow: 'ellipsis',
whiteSpace: 'nowrap',
overflow: 'hidden',
},
}}
// eslint-disable-next-line
Expand All @@ -146,6 +151,25 @@ export const AssetInput = <T extends Asset = Asset>({

{!onSelect || assets.length === 1 ? (
<Box sx={{ display: 'inline-flex', alignItems: 'center' }}>
{value !== '' && (
<IconButton
sx={{
minWidth: 0,
p: 0,
left: 8,
color: 'text.muted',
'&:hover': {
color: 'text.secondary',
},
}}
onClick={() => {
onChange && onChange('');
}}
disabled={disabled}
>
<XCircleIcon height={16} />
</IconButton>
)}
<TokenIcon
aToken={asset.aToken}
symbol={asset.iconSymbol || asset.symbol}
Expand Down