diff --git a/apps/demo/src/Views/Ui/components/FormWidgets/CountryPicker.tsx b/apps/demo/src/Views/Ui/components/FormWidgets/CountryPicker.tsx index 9b544bcf0..d3a6f02ce 100644 --- a/apps/demo/src/Views/Ui/components/FormWidgets/CountryPicker.tsx +++ b/apps/demo/src/Views/Ui/components/FormWidgets/CountryPicker.tsx @@ -434,7 +434,7 @@ const selectedLocale = i18n.language; favorites={["NP", "US", "GB"]} label={t("countryPicker.labels.single")} locale={locale} - name="countryPickerFav" + name="favoriteCountry" placeholder={t("countryPicker.placeholders.single")} value={favoriteValue} onChange={(value: string) => setFavoriteValue(value)} diff --git a/apps/demo/src/Views/Ui/components/FormWidgets/CurrencyPicker.tsx b/apps/demo/src/Views/Ui/components/FormWidgets/CurrencyPicker.tsx index d0fe7d489..bc36f48c0 100644 --- a/apps/demo/src/Views/Ui/components/FormWidgets/CurrencyPicker.tsx +++ b/apps/demo/src/Views/Ui/components/FormWidgets/CurrencyPicker.tsx @@ -63,7 +63,7 @@ export const CurrencyPickerDemo = () => {
setSingleSelectCurrencyValue(value)} @@ -100,7 +100,7 @@ const [singleSelectCurrencyValue, setSingleSelectCurrencyValue] = useState diff --git a/apps/demo/src/Views/Ui/components/FormWidgets/Select.tsx b/apps/demo/src/Views/Ui/components/FormWidgets/Select.tsx index f01e7818d..dc94f1257 100644 --- a/apps/demo/src/Views/Ui/components/FormWidgets/Select.tsx +++ b/apps/demo/src/Views/Ui/components/FormWidgets/Select.tsx @@ -368,7 +368,7 @@ const [singleSelectValue, setSingleSelectValue] = useState("");
(""); label={t("select.roleSelectLabel")} labelKey="name" loading={loading} - name="select" + name="serverSelect" noOptionsMessage={t("select.noRoleOptions")} options={rolesOptions} serverSearchHelperText={t("select.serverSearchHelper")} @@ -656,7 +656,7 @@ const fetchRoles = async (searchInput: string) => {
("");
([])
({ }} disabled={disabled} defaultValue={searchInput} + name={name} tabIndex={-1} /> ) : ( @@ -726,7 +727,12 @@ export const Select = ({ return (
- {label && } + {label && + (!disabled && !disableSearch ? ( + + ) : ( + {label} + ))}
{renderSelect()} diff --git a/packages/ui/src/assets/css/form-widgets/field.css b/packages/ui/src/assets/css/form-widgets/field.css index c83dd1ebc..ec84dd6b4 100644 --- a/packages/ui/src/assets/css/form-widgets/field.css +++ b/packages/ui/src/assets/css/form-widgets/field.css @@ -7,7 +7,8 @@ width: 100%; } -.field > label { +.field > label, +.field > .label { font-weight: 500; }