Skip to content

feat(ui-text-input,ui-select): add forcePlaceholder prop to TextInput #2643

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

Open
HerrTopi wants to merge 1 commit into
base: master
Choose a base branch
from
+140 −126
Open

feat(ui-text-input,ui-select): add forcePlaceholder prop to TextInput #2643

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
251 changes: 126 additions & 125 deletions packages/ui-select/src/Select/v2/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,18 +111,18 @@ const MemoedOption = memo(
(prevProps, nextProps) => {
return (
prevProps.selectOption.props.isHighlighted ===
nextProps.selectOption.props.isHighlighted &&
nextProps.selectOption.props.isHighlighted &&
prevProps.selectOption.props.isSelected ===
nextProps.selectOption.props.isSelected &&
nextProps.selectOption.props.isSelected &&
prevProps.selectOption.props.isDisabled ===
nextProps.selectOption.props.isDisabled &&
nextProps.selectOption.props.isDisabled &&
prevProps.selectOption.props.children ===
nextProps.selectOption.props.children &&
nextProps.selectOption.props.children &&
prevProps.selectOption.props.id === nextProps.selectOption.props.id &&
prevProps.selectOption.props.renderBeforeLabel ===
nextProps.selectOption.props.renderBeforeLabel &&
nextProps.selectOption.props.renderBeforeLabel &&
prevProps.selectOption.props.renderAfterLabel ===
nextProps.selectOption.props.renderAfterLabel &&

@matyasf matyasf Jul 20, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The formatting was broken in this commit: cda547a#diff-86c34ad67bd876370225bf0df1e248d809d3ac768f41267d08d576d0ef2d0ec1

This is just a revert (and makes the whole thing a pain to read!)

nextProps.selectOption.props.renderAfterLabel &&
prevProps.children === nextProps.children
)
}
Expand Down Expand Up @@ -334,59 +334,59 @@ class Select extends Component<SelectProps> {

return this.interaction === 'enabled'
? {
onRequestShowOptions: (event) => {
onRequestShowOptions?.(event)
const selectedOptionId = this.selectedOptionId
onRequestShowOptions: (event) => {
onRequestShowOptions?.(event)
const selectedOptionId = this.selectedOptionId

if (selectedOptionId && !Array.isArray(selectedOptionId)) {
// highlight selected option on show
this.highlightOption(event, selectedOptionId)
}
},
onRequestHideOptions: (event) => {
onRequestHideOptions?.(event)
},
onRequestHighlightOption: (
event,
{ id, direction }: { id?: string; direction?: number }
) => {
if (!isShowingOptions) return

const highlightedOptionId = this.highlightedOptionId
// if id exists, use that
let highlightId = this._optionIds.indexOf(id!) > -1 ? id : undefined
if (!highlightId) {
if (!highlightedOptionId) {
// nothing highlighted yet, highlight first option
highlightId = this._optionIds[0]
} else {
// find next id based on direction
const index = this._optionIds.indexOf(highlightedOptionId)
highlightId =
index > -1 ? this._optionIds[index + direction!] : undefined
if (selectedOptionId && !Array.isArray(selectedOptionId)) {
// highlight selected option on show
this.highlightOption(event, selectedOptionId)
}
}
if (highlightId) {
// only highlight if id exists as a valid option
this.highlightOption(event, highlightId)
}
},
onRequestHighlightFirstOption: (event) => {
this.highlightOption(event, this._optionIds[0])
},
onRequestHighlightLastOption: (event) => {
this.highlightOption(
},
onRequestHideOptions: (event) => {
onRequestHideOptions?.(event)
},
onRequestHighlightOption: (
event,
this._optionIds[this._optionIds.length - 1]
)
},
onRequestSelectOption: (event, { id }) => {
if (id && this._optionIds.indexOf(id) !== -1) {
// only select if id exists as a valid option
onRequestSelectOption?.(event, { id })
{ id, direction }: { id?: string; direction?: number }
) => {
if (!isShowingOptions) return

const highlightedOptionId = this.highlightedOptionId
// if id exists, use that
let highlightId = this._optionIds.indexOf(id!) > -1 ? id : undefined
if (!highlightId) {
if (!highlightedOptionId) {
// nothing highlighted yet, highlight first option
highlightId = this._optionIds[0]
} else {
// find next id based on direction
const index = this._optionIds.indexOf(highlightedOptionId)
highlightId =
index > -1 ? this._optionIds[index + direction!] : undefined
}
}
if (highlightId) {
// only highlight if id exists as a valid option
this.highlightOption(event, highlightId)
}
},
onRequestHighlightFirstOption: (event) => {
this.highlightOption(event, this._optionIds[0])
},
onRequestHighlightLastOption: (event) => {
this.highlightOption(
event,
this._optionIds[this._optionIds.length - 1]
)
},
onRequestSelectOption: (event, { id }) => {
if (id && this._optionIds.indexOf(id) !== -1) {
// only select if id exists as a valid option
onRequestSelectOption?.(event, { id })
}
}
}
}
: {}
}

Expand All @@ -413,12 +413,12 @@ class Select extends Component<SelectProps> {
return typeof renderOptionLabel === 'function' &&
!renderOptionLabel?.prototype?.isReactComponent
? (renderOptionLabel as any).bind(null, {
id,
isDisabled,
isSelected,
isHighlighted,
children
})
id,
isDisabled,
isSelected,
isHighlighted,
children
})
: (renderOptionLabel as React.ReactNode)
}

Expand Down Expand Up @@ -532,18 +532,18 @@ class Select extends Component<SelectProps> {

const viewProps: Partial<ViewProps> = isShowingOptions
? {
display: 'block',
overflowY: 'auto',
maxHeight:
optionsMaxHeight ||
this._optionHeight * visibleOptionsCount! -
// in Chrome, we need to prevent scrolling when the bottom area of last item is hovered
(utils.isChromium() ? this.SCROLL_TOLERANCE : 0),
maxWidth: optionsMaxWidth || this.width,
background: 'primary',
elementRef: (node: Element | null) => (this._listView = node),
borderRadius: 'inherit'
}
display: 'block',
overflowY: 'auto',
maxHeight:
optionsMaxHeight ||
this._optionHeight * visibleOptionsCount! -
// in Chrome, we need to prevent scrolling when the bottom area of last item is hovered
(utils.isChromium() ? this.SCROLL_TOLERANCE : 0),
maxWidth: optionsMaxWidth || this.width,
background: 'primary',
elementRef: (node: Element | null) => (this._listView = node),
borderRadius: 'inherit'
}
: { maxHeight: 0 }

return (
Expand All @@ -553,30 +553,30 @@ class Select extends Component<SelectProps> {
>
{isShowingOptions
? Children.map(children as SelectChildren, (child, index) => {
if (!child || !matchComponentTypes(child, [Group, Option])) {
return // ignore invalid children
}
if (matchComponentTypes<OptionChild>(child, [Option])) {
lastWasGroup = false
return this.renderOption(child, {
getOptionProps,
getDisabledOptionProps
})
}
if (matchComponentTypes<GroupChild>(child, [Group])) {
const afterGroup = lastWasGroup
lastWasGroup = true
return this.renderGroup(child, {
getOptionProps,
getDisabledOptionProps,
// for rendering separators appropriately
isFirstChild: index === 0,
isLastChild: index === Children.count(children) - 1,
afterGroup
})
}
return
})
if (!child || !matchComponentTypes(child, [Group, Option])) {
return // ignore invalid children
}
if (matchComponentTypes<OptionChild>(child, [Option])) {
lastWasGroup = false
return this.renderOption(child, {
getOptionProps,
getDisabledOptionProps
})
}
if (matchComponentTypes<GroupChild>(child, [Group])) {
const afterGroup = lastWasGroup
lastWasGroup = true
return this.renderGroup(child, {
getOptionProps,
getDisabledOptionProps,
// for rendering separators appropriately
isFirstChild: index === 0,
isLastChild: index === Children.count(children) - 1,
afterGroup
})
}
return
})
: null}
</Options>
</View>
Expand Down Expand Up @@ -615,8 +615,8 @@ class Select extends Component<SelectProps> {
return position === 'before'
? option.props.renderBeforeLabel
: option.props.renderAfterLabel
? option.props.renderAfterLabel
: this.renderIcon()
? option.props.renderAfterLabel
: this.renderIcon()
}
}
} else {
Expand All @@ -625,8 +625,8 @@ class Select extends Component<SelectProps> {
return position === 'before'
? child.props.renderBeforeLabel
: child.props.renderAfterLabel
? child.props.renderAfterLabel
: this.renderIcon()
? child.props.renderAfterLabel
: this.renderIcon()
}
}
}
Expand Down Expand Up @@ -723,26 +723,26 @@ class Select extends Component<SelectProps> {
// popup buttons rather than comboboxes.
const overrideProps: Partial<TextInputProps> = !isEditable
? {
// We need role="combobox" for the 'open list' button shortcut to work
// with desktop screenreaders.
// But desktop Safari with Voiceover does not support proper combobox
// handling, a 'button' role is set as a workaround.
// See https://bugs.webkit.org/show_bug.cgi?id=236881
// Also on iOS Chrome with role='combobox' it announces unnecessarily
// that its 'read-only' and that this is a 'textfield', see INSTUI-4500
role:
utils.isSafari() ||
// We need role="combobox" for the 'open list' button shortcut to work
// with desktop screenreaders.
// But desktop Safari with Voiceover does not support proper combobox
// handling, a 'button' role is set as a workaround.
// See https://bugs.webkit.org/show_bug.cgi?id=236881
// Also on iOS Chrome with role='combobox' it announces unnecessarily
// that its 'read-only' and that this is a 'textfield', see INSTUI-4500
role:
utils.isSafari() ||
utils.isAndroidOrIOS() ||
(interaction === 'disabled' && utils.isChromium())
? 'button'
: 'combobox',
title: inputValue,
'aria-autocomplete': undefined,
'aria-readonly': true
}
? 'button'
: 'combobox',
title: inputValue,
'aria-autocomplete': undefined,
'aria-readonly': true
}
: interaction === 'disabled' && utils.isChromium()
? { role: 'button' }
: {}
? { role: 'button' }
: {}

// backdoor to autocomplete attr to work around chrome autofill issues
if (passthroughProps['autoComplete']) {
Expand Down Expand Up @@ -789,8 +789,8 @@ class Select extends Component<SelectProps> {
typeof onInputChange === 'function'
? onInputChange
: inputValue
? () => { }
: undefined,
? () => {}
: undefined,

onFocus,
onBlur: utils.createChainedFunction(onBlur, onRequestHideOptions),
Expand All @@ -799,15 +799,16 @@ class Select extends Component<SelectProps> {
// suppressHydrationWarning is needed because `role` depends on the browser type
return (
<TextInput
forcePlaceholder
{...triggerProps}
{...getInputProps(inputProps)}
suppressHydrationWarning
{...(interaction === 'enabled' &&
!isEditable && {
themeOverride: (componentTheme) => ({
backgroundReadonlyColor: componentTheme.backgroundColor
})
})}
themeOverride: (componentTheme) => ({
backgroundReadonlyColor: componentTheme.backgroundColor
})
})}
/>
)
}
Expand Down Expand Up @@ -864,8 +865,8 @@ class Select extends Component<SelectProps> {
mountNode !== undefined
? mountNode
: utils.isAndroidOrIOS()
? this.ref
: undefined
? this.ref
: undefined
}
positionTarget={this._inputContainer}
isShowingContent={isShowingOptions}
Expand Down
8 changes: 7 additions & 1 deletion packages/ui-text-input/src/TextInput/v2/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ class TextInput extends Component<TextInputProps> {
// Leave interaction default undefined so that `disabled` and `readOnly` can also be supplied
interaction: undefined,
isRequired: false,
forcePlaceholder: false,
display: 'block',
shouldNotWrap: false,
size: 'medium',
Expand Down Expand Up @@ -219,6 +220,7 @@ class TextInput extends Component<TextInputProps> {
value,
defaultValue,
isRequired,
forcePlaceholder,
onFocus,
...rest
} = this.props
Expand All @@ -238,7 +240,11 @@ class TextInput extends Component<TextInputProps> {
css={this.props.styles?.textInput}
defaultValue={defaultValue}
value={value}
placeholder={interaction === 'enabled' ? placeholder : undefined}
placeholder={
forcePlaceholder || interaction === 'enabled'
? placeholder
: undefined
}
ref={this.handleInputRef}
type={type}
id={this.id}
Expand Down
Loading
Loading