Skip to content

fix: maxTagTextLength should not cut label content #675

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 1 commit into from
Nov 19, 2021
Merged

fix: maxTagTextLength should not cut label content #675

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 4 additions & 5 deletions src/Selector/MultipleSelector.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@ const SelectSelector: React.FC<SelectorProps> = (props) => {
// ===================== Render ======================
// >>> Render Selector Node. Includes Item & Rest
function defaultRenderSelector(
title: React.ReactNode,
content: React.ReactNode,
itemDisabled: boolean,
closable?: boolean,
Expand All @@ -103,9 +104,7 @@ const SelectSelector: React.FC<SelectorProps> = (props) => {
[`${selectionPrefixCls}-item-disabled`]: itemDisabled,
})}
title={
typeof content === 'string' || typeof content === 'number'
? content.toString()
: undefined
typeof title === 'string' || typeof title === 'number' ? title.toString() : undefined
}
>
<span className={`${selectionPrefixCls}-item-content`}>{content}</span>
Expand Down Expand Up @@ -170,7 +169,7 @@ const SelectSelector: React.FC<SelectorProps> = (props) => {

return typeof tagRender === 'function'
? customizeRenderSelector(value, displayLabel, itemDisabled, closable, onClose)
: defaultRenderSelector(displayLabel, itemDisabled, closable, onClose);
: defaultRenderSelector(label, displayLabel, itemDisabled, closable, onClose);
}

function renderRest(omittedValues: DisplayLabelValueType[]) {
Expand All @@ -179,7 +178,7 @@ const SelectSelector: React.FC<SelectorProps> = (props) => {
? maxTagPlaceholder(omittedValues)
: maxTagPlaceholder;

return defaultRenderSelector(content, false);
return defaultRenderSelector(content, content, false);
}

// >>> Input Node
Expand Down
4 changes: 2 additions & 2 deletions tests/__snapshots__/Multiple.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,7 @@ exports[`Select.Multiple render truncates values by maxTagTextLength 1`] = `
>
<span
class="rc-select-selection-item"
title="On..."
title="One"
>
<span
class="rc-select-selection-item-content"
Expand All @@ -327,7 +327,7 @@ exports[`Select.Multiple render truncates values by maxTagTextLength 1`] = `
>
<span
class="rc-select-selection-item"
title="Tw..."
title="Two"
>
<span
class="rc-select-selection-item-content"
Expand Down
4 changes: 2 additions & 2 deletions tests/__snapshots__/Tags.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -519,7 +519,7 @@ exports[`Select.Tags render truncates values by maxTagTextLength 1`] = `
>
<span
class="rc-select-selection-item"
title="On..."
title="One"
>
<span
class="rc-select-selection-item-content"
Expand All @@ -546,7 +546,7 @@ exports[`Select.Tags render truncates values by maxTagTextLength 1`] = `
>
<span
class="rc-select-selection-item"
title="Tw..."
title="Two"
>
<span
class="rc-select-selection-item-content"
Expand Down