Skip to content

Added custom tooltip to FileInput #1982

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 8 commits into from
Jul 16, 2024
Merged

Added custom tooltip to FileInput #1982

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
a7c3d23
Added DxcTooltip to file input component
Mil4n0r May 9, 2024
1b04e16
Fixed duplicate error message
Mil4n0r May 9, 2024
cae325e
Added the aria-label to the button
Mil4n0r May 9, 2024
740e181
Merge branch 'master' of github.com:dxc-technology/halstack-react int…
Mil4n0r Jul 11, 2024
0fb56cc
Adding ActionIcon to FileItem
Mil4n0r Jul 16, 2024
7fa638f
Merge branch 'master' into Mil4n0r/tooltip-fileitem
Mil4n0r Jul 16, 2024
93ee216
Removed dead code
Mil4n0r Jul 16, 2024
e12976e
Merge branch 'Mil4n0r/tooltip-fileitem' of github.com:dxc-technology/…
Mil4n0r Jul 16, 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
47 changes: 7 additions & 40 deletions packages/lib/src/file-input/FileItem.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ import useTheme from "../useTheme";
import useTranslatedLabels from "../useTranslatedLabels";
import { FileItemProps } from "./types";
import DxcIcon from "../icon/Icon";
import DxcTooltip from "../tooltip/Tooltip";
import DxcActionIcon from "../action-icon/ActionIcon";

const FileItem = ({
fileName = "",
Expand Down Expand Up @@ -44,17 +46,12 @@ const FileItem = ({
<DxcIcon icon="filled_error" />
</ErrorIcon>
)}
<DeleteFileAction
onClick={() => {
onDelete(fileName);
}}
type="button"
title={translatedLabels.fileInput.deleteFileActionTitle}
aria-label={translatedLabels.fileInput.deleteFileActionTitle}
<DxcActionIcon
onClick={() => onDelete(fileName)}
icon="close"
tabIndex={tabIndex}
>
<DxcIcon icon="close" />
</DeleteFileAction>
title={translatedLabels.fileInput.deleteFileActionTitle}
/>
</DxcFlex>
{error && !singleFileMode && (
<ErrorMessage role="alert" aria-live="assertive">
Expand Down Expand Up @@ -145,36 +142,6 @@ const ErrorIcon = styled.span`
color: #d0011b;
`;

const DeleteFileAction = styled.button`
display: flex;
flex-wrap: wrap;
align-content: center;
justify-content: center;
height: 24px;
width: 24px;
font-size: 1rem;
font-family: ${(props) => props.theme.fontFamily};
border: 1px solid transparent;
border-radius: 2px;
background-color: transparent;
box-shadow: 0 0 0 2px transparent;
padding: 3px;
cursor: pointer;
color: ${(props) => props.theme.deleteFileItemColor};
font-size: 18px;
&:hover {
background-color: ${(props) => props.theme.hoverDeleteFileItemBackgroundColor};
}
&:focus,
&:focus-visible {
outline: none;
box-shadow: 0 0 0 2px ${(props) => props.theme.focusDeleteFileItemBorderColor};
}
&:active {
background-color: ${(props) => props.theme.activeDeleteFileItemBackgroundColor};
}
`;

const ErrorMessage = styled.span`
color: ${(props) => props.theme.errorMessageFontColor};
font-family: ${(props) => props.theme.errorMessageFontFamily};
Expand Down