Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
SSHOC
sshoc-marketplace-frontend
Commits
b28e850e
Commit
b28e850e
authored
Mar 10, 2021
by
Stefan Probst
Browse files
fix: fix empty collection placeholder in combobox
parent
784b2426
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/elements/ComboBox/ComboBox.tsx
View file @
b28e850e
...
...
@@ -84,7 +84,9 @@ export function ComboBox<T extends object>(
const
placeholder
=
props
.
allowsEmptyCollection
===
true
?
props
.
emptyCollectionPlaceholder
??
'
No results
'
?
props
.
isLoading
===
true
?
'
Loading...
'
:
props
.
emptyCollectionPlaceholder
??
'
No results
'
:
undefined
/**
...
...
@@ -220,7 +222,7 @@ export function ComboBox<T extends object>(
menuProps
=
{
listBoxProps
}
state
=
{
state
}
isDisabled
=
{
props
.
isDisabled
}
isLoading
=
{
props
.
isLoading
}
//
isLoading={props.isLoading}
placeholder
=
{
placeholder
}
shouldFocusWrap
=
{
props
.
shouldFocusWrap
}
variant
=
{
props
.
variant
}
...
...
src/elements/ListBoxBase/ListBoxBase.tsx
View file @
b28e850e
...
...
@@ -51,7 +51,8 @@ export function ListBoxBase<T extends object>(
'
py-2 max-h-64 border border-gray-300 rounded overflow-x-hidden overflow-y-auto flex flex-col bg-white focus:outline-none
'
,
variant
===
'
search
'
?
''
:
''
,
),
placeholder
:
'
italic
'
,
placeholder
:
'
font-body font-normal text-ui-base px-4 py-2 cursor-default select-none italic
'
,
loading
:
'
inline-flex items-center justify-center py-2 text-secondary-600
'
,
spinner
:
'
w-4 h-4
'
,
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment