Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion packages/lib/src/action-icon/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ type Props = {
/**
* Value for the HTML properties title and aria-label.
*/
title: string;
title?: string;
/**
* Material Symbol name or SVG element as the icon that will be placed next to the label.
*/
Expand Down
4 changes: 2 additions & 2 deletions packages/lib/src/chip/Chip.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ const DxcChip = ({
icon={prefixIcon}
onClick={onClickPrefix}
tabIndex={tabIndex}
title="Prefix Action"
title={!disabled ? "Prefix Action" : undefined}
/>
) : (
<IconContainer disabled={disabled}>
Expand All @@ -86,7 +86,7 @@ const DxcChip = ({
icon={suffixIcon}
onClick={onClickSuffix}
tabIndex={tabIndex}
title="Suffix Action"
title={!disabled ? "Suffix Action" : undefined}
/>
) : (
<IconContainer disabled={disabled}>
Expand Down
10 changes: 5 additions & 5 deletions packages/lib/src/select/Select.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import {
import styled from "@emotion/styled";
import { spaces } from "../common/variables";
import DxcIcon from "../icon/Icon";
import { Tooltip, TooltipWrapper } from "../tooltip/Tooltip";
import { TooltipWrapper } from "../tooltip/Tooltip";
import { HalstackLanguageContext } from "../HalstackContext";
import useWidth from "../utils/useWidth";
import Listbox from "./Listbox";
Expand Down Expand Up @@ -524,7 +524,7 @@ const DxcSelect = forwardRef<RefType, SelectPropsType>(
{multiple && Array.isArray(selectedOption) && selectedOption.length > 0 && (
<SelectionIndicator disabled={disabled}>
<SelectionNumber disabled={disabled}>{selectedOption.length}</SelectionNumber>
<Tooltip label={translatedLabels.select.actionClearSelectionTitle}>
<TooltipWrapper condition={!disabled} label={translatedLabels.select.actionClearSelectionTitle}>
<ClearOptionsAction
aria-label={translatedLabels.select.actionClearSelectionTitle}
disabled={disabled}
Expand All @@ -537,7 +537,7 @@ const DxcSelect = forwardRef<RefType, SelectPropsType>(
>
<DxcIcon icon="clear" />
</ClearOptionsAction>
</Tooltip>
</TooltipWrapper>
</SelectionIndicator>
)}
<TooltipWrapper condition={hasTooltip} label={getSelectedOptionLabel(placeholder, selectedOption)}>
Expand Down Expand Up @@ -580,14 +580,14 @@ const DxcSelect = forwardRef<RefType, SelectPropsType>(
</TooltipWrapper>
<DxcFlex alignItems="center">
{searchable && searchValue.length > 0 && (
<Tooltip label={translatedLabels.select.actionClearSelectionTitle}>
<TooltipWrapper condition={!disabled} label={translatedLabels.select.actionClearSelectionTitle}>
<DxcActionIcon
icon="clear"
onClick={handleClearSearchActionOnClick}
tabIndex={-1}
title={translatedLabels.select.actionClearSearchTitle}
/>
</Tooltip>
</TooltipWrapper>
)}
<DxcIcon icon={isOpen ? "keyboard_arrow_up" : "keyboard_arrow_down"} />
</DxcFlex>
Expand Down