Skip to content

fix: use strict null/undefined check for display value in single select #1205

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
zombieJ merged 1 commit into from
Feb 12, 2026
+12 −4
Merged

fix: use strict null/undefined check for display value in single select #1205

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: 5 additions & 4 deletions src/SelectInput/Content/SingleContent.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ const SingleContent = React.forwardRef<HTMLInputElement, SharedContentProps>(

const combobox = mode === 'combobox';
const displayValue = displayValues[0];
const hasDisplayValue = displayValue !== null && displayValue !== undefined;

// Implement the same logic as the old SingleSelector
const mergedSearchValue = React.useMemo(() => {
Expand All @@ -34,7 +35,7 @@ const SingleContent = React.forwardRef<HTMLInputElement, SharedContentProps>(
let style: React.CSSProperties | undefined;
let titleValue: string | undefined;

if (displayValue && selectContext?.flattenOptions) {
if (hasDisplayValue && selectContext?.flattenOptions) {
const option = selectContext.flattenOptions.find((opt) => opt.value === displayValue.value);
if (option?.data) {
className = option.data.className;
Expand All @@ -43,7 +44,7 @@ const SingleContent = React.forwardRef<HTMLInputElement, SharedContentProps>(
}
}

if (displayValue && !titleValue) {
if (hasDisplayValue && !titleValue) {
titleValue = getTitle(displayValue);
}

Expand All @@ -64,7 +65,7 @@ const SingleContent = React.forwardRef<HTMLInputElement, SharedContentProps>(

// ========================== Render ==========================
// Render value
const renderValue = displayValue ? (
const renderValue = hasDisplayValue ? (
hasOptionStyle ? (
<div
className={clsx(`${prefixCls}-content-value`, optionClassName)}
Expand All @@ -88,7 +89,7 @@ const SingleContent = React.forwardRef<HTMLInputElement, SharedContentProps>(
<div
className={clsx(
`${prefixCls}-content`,
displayValue && `${prefixCls}-content-has-value`,
hasDisplayValue && `${prefixCls}-content-has-value`,
mergedSearchValue && `${prefixCls}-content-has-search-value`,
hasOptionStyle && `${prefixCls}-content-has-option-style`,
classNames?.content,
Expand Down
7 changes: 7 additions & 0 deletions tests/placeholder.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,4 +40,11 @@ describe('Select placeholder', () => {
});
expect(container.querySelector('.rc-select-placeholder').textContent).toBe('placeholder');
});

it('should have content-has-value class when value is empty string', () => {
const { container } = render(
<Select value="" placeholder="placeholder" options={[{ value: '', label: '' }]} />,
);
expect(container.querySelector('.rc-select-content-has-value')).toBeTruthy();
});
});
Loading