Skip to content
Open
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
5 changes: 3 additions & 2 deletions components/lib/dropdown/Dropdown.js
Original file line number Diff line number Diff line change
Expand Up @@ -1100,7 +1100,8 @@ export const Dropdown = React.memo(
return <input {...inputProps} />;
}

const content = props.valueTemplate ? ObjectUtils.getJSXElement(props.valueTemplate, selectedOption, props) : label || props.placeholder || props.emptyMessage || <>&nbsp;</>;
const templateValue = selectedOption || props.value;
const content = props.valueTemplate ? ObjectUtils.getJSXElement(props.valueTemplate, templateValue, props) : label || props.placeholder || props.emptyMessage || <>&nbsp;</>;
const inputProps = mergeProps(
{
ref: inputRef,
Expand All @@ -1121,7 +1122,7 @@ export const Dropdown = React.memo(
};

const createClearIcon = () => {
if (props.value != null && props.showClear && !props.disabled && !ObjectUtils.isEmpty(props.options)) {
if (props.value != null && props.showClear && !props.disabled) {
const clearIconProps = mergeProps(
{
className: cx('clearIcon'),
Expand Down
2 changes: 1 addition & 1 deletion components/lib/dropdown/DropdownBase.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ const classes = {
? 'p-dropdown-label p-inputtext'
: classNames('p-dropdown-label p-inputtext', {
'p-placeholder': label === null && props.placeholder,
'p-dropdown-label-empty': label === null && !props.placeholder
'p-dropdown-label-empty': label === null && !props.placeholder && !props.value
}),
trigger: 'p-dropdown-trigger',
emptyMessage: 'p-dropdown-empty-message',
Expand Down
Loading