From 23d7df66d9d6d4d582e08c935380b5e94edf3039 Mon Sep 17 00:00:00 2001 From: Aurora Scharff Date: Fri, 27 Sep 2024 14:04:34 +0200 Subject: [PATCH 1/4] Fix dropdown font sizes and add "no results" for autocompletes --- packages/css/src/formElements/autocomplete/autocomplete.css | 6 ++++++ .../formElements/multiautocomplete/multiautocomplete.css | 6 ++++++ packages/css/src/formElements/multiselect/multiselect.css | 1 + packages/css/src/formElements/select/select.css | 1 + packages/react/src/formElements/MdAutocomplete.tsx | 5 +++++ packages/react/src/formElements/MdMultiAutocomplete.tsx | 5 +++++ 6 files changed, 24 insertions(+) diff --git a/packages/css/src/formElements/autocomplete/autocomplete.css b/packages/css/src/formElements/autocomplete/autocomplete.css index ab208516..42a8a399 100644 --- a/packages/css/src/formElements/autocomplete/autocomplete.css +++ b/packages/css/src/formElements/autocomplete/autocomplete.css @@ -144,6 +144,7 @@ display: flex; align-items: center; font-family: 'Open sans'; + font-size: 1em; border: 0; background-color: #fff; width: 100%; @@ -177,6 +178,11 @@ color: var(--mdPrimaryColor); } +.md-autocomplete__dropdown-no-results { + padding: 1em; + font-style: italic; +} + /* Open state */ .md-autocomplete--open .md-autocomplete__input { border-left: 2px solid var(--mdPrimaryColor); diff --git a/packages/css/src/formElements/multiautocomplete/multiautocomplete.css b/packages/css/src/formElements/multiautocomplete/multiautocomplete.css index ff22d6a9..de3ea57b 100644 --- a/packages/css/src/formElements/multiautocomplete/multiautocomplete.css +++ b/packages/css/src/formElements/multiautocomplete/multiautocomplete.css @@ -162,6 +162,7 @@ align-items: center; font-family: 'Open sans'; border: 0; + font-size: 1em; background-color: #fff; width: 100%; text-align: left; @@ -194,6 +195,11 @@ color: var(--mdPrimaryColor); } +.md-autocomplete__dropdown-no-results { + padding: 1em; + font-style: italic; +} + .md-multiautocomplete__chips { display: flex; margin-top: 0.7em; diff --git a/packages/css/src/formElements/multiselect/multiselect.css b/packages/css/src/formElements/multiselect/multiselect.css index 5600ab09..aecc28cd 100644 --- a/packages/css/src/formElements/multiselect/multiselect.css +++ b/packages/css/src/formElements/multiselect/multiselect.css @@ -122,6 +122,7 @@ display: flex; align-items: center; font-family: 'Open sans'; + font-size: 1em; border: 0; background-color: #fff; text-align: left; diff --git a/packages/css/src/formElements/select/select.css b/packages/css/src/formElements/select/select.css index 31254944..bc4fc6a2 100644 --- a/packages/css/src/formElements/select/select.css +++ b/packages/css/src/formElements/select/select.css @@ -124,6 +124,7 @@ font-family: 'Open sans'; border: 0; background-color: #fff; + font-size: 1em; width: 100%; text-align: left; padding: 0.9em; diff --git a/packages/react/src/formElements/MdAutocomplete.tsx b/packages/react/src/formElements/MdAutocomplete.tsx index 55740feb..e04cdc1a 100644 --- a/packages/react/src/formElements/MdAutocomplete.tsx +++ b/packages/react/src/formElements/MdAutocomplete.tsx @@ -30,6 +30,7 @@ export interface MdAutocompleteProps extends React.InputHTMLAttributes( dropdownHeight, numberOfElementsShown = null, className, + noResultsText = 'Ingen resultat funnet', onSelectOption, ...otherProps }, @@ -265,6 +267,9 @@ const MdAutocomplete = React.forwardRef( ); })} + {displayedOptionsSliced.length === 0 && ( +
{noResultsText}
+ )} )} diff --git a/packages/react/src/formElements/MdMultiAutocomplete.tsx b/packages/react/src/formElements/MdMultiAutocomplete.tsx index ba15b72d..7154f1e0 100644 --- a/packages/react/src/formElements/MdMultiAutocomplete.tsx +++ b/packages/react/src/formElements/MdMultiAutocomplete.tsx @@ -29,6 +29,7 @@ export interface MdMultiAutocompleteProps extends React.InputHTMLAttributes ); })} + {displayedOptionsSliced.length === 0 && ( +
{noResultsText}
+ )} )} From a11cda3e14dc22ab56e3e5a44feb9d7035ec2243 Mon Sep 17 00:00:00 2001 From: Aurora Scharff Date: Fri, 27 Sep 2024 14:44:06 +0200 Subject: [PATCH 2/4] Update font size --- packages/css/src/formElements/autocomplete/autocomplete.css | 2 +- .../src/formElements/multiautocomplete/multiautocomplete.css | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/css/src/formElements/autocomplete/autocomplete.css b/packages/css/src/formElements/autocomplete/autocomplete.css index 42a8a399..0b34c2d7 100644 --- a/packages/css/src/formElements/autocomplete/autocomplete.css +++ b/packages/css/src/formElements/autocomplete/autocomplete.css @@ -179,7 +179,7 @@ } .md-autocomplete__dropdown-no-results { - padding: 1em; + padding: 0.9em; font-style: italic; } diff --git a/packages/css/src/formElements/multiautocomplete/multiautocomplete.css b/packages/css/src/formElements/multiautocomplete/multiautocomplete.css index de3ea57b..08559f3a 100644 --- a/packages/css/src/formElements/multiautocomplete/multiautocomplete.css +++ b/packages/css/src/formElements/multiautocomplete/multiautocomplete.css @@ -196,7 +196,7 @@ } .md-autocomplete__dropdown-no-results { - padding: 1em; + padding: 0.9em; font-style: italic; } From 2cac211595c14da8888fb8668bbacd01c8cd79c5 Mon Sep 17 00:00:00 2001 From: Aurora Scharff Date: Sat, 28 Sep 2024 17:31:22 +0200 Subject: [PATCH 3/4] add background color to no-results --- packages/css/src/formElements/autocomplete/autocomplete.css | 1 + .../css/src/formElements/multiautocomplete/multiautocomplete.css | 1 + 2 files changed, 2 insertions(+) diff --git a/packages/css/src/formElements/autocomplete/autocomplete.css b/packages/css/src/formElements/autocomplete/autocomplete.css index 0b34c2d7..b5f2edd4 100644 --- a/packages/css/src/formElements/autocomplete/autocomplete.css +++ b/packages/css/src/formElements/autocomplete/autocomplete.css @@ -180,6 +180,7 @@ .md-autocomplete__dropdown-no-results { padding: 0.9em; + background-color: #fff; font-style: italic; } diff --git a/packages/css/src/formElements/multiautocomplete/multiautocomplete.css b/packages/css/src/formElements/multiautocomplete/multiautocomplete.css index 08559f3a..715b6490 100644 --- a/packages/css/src/formElements/multiautocomplete/multiautocomplete.css +++ b/packages/css/src/formElements/multiautocomplete/multiautocomplete.css @@ -197,6 +197,7 @@ .md-autocomplete__dropdown-no-results { padding: 0.9em; + background-color: #fff; font-style: italic; } From 89a10cbd1e0c8e3a2e53aa14084012db1cb74162 Mon Sep 17 00:00:00 2001 From: Aurora Scharff Date: Sun, 29 Sep 2024 15:12:21 +0200 Subject: [PATCH 4/4] fix css --- .../src/formElements/multiautocomplete/multiautocomplete.css | 2 +- packages/react/src/formElements/MdMultiAutocomplete.tsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/css/src/formElements/multiautocomplete/multiautocomplete.css b/packages/css/src/formElements/multiautocomplete/multiautocomplete.css index 715b6490..fdf0ab64 100644 --- a/packages/css/src/formElements/multiautocomplete/multiautocomplete.css +++ b/packages/css/src/formElements/multiautocomplete/multiautocomplete.css @@ -195,7 +195,7 @@ color: var(--mdPrimaryColor); } -.md-autocomplete__dropdown-no-results { +.md-multiautocomplete__dropdown-no-results { padding: 0.9em; background-color: #fff; font-style: italic; diff --git a/packages/react/src/formElements/MdMultiAutocomplete.tsx b/packages/react/src/formElements/MdMultiAutocomplete.tsx index 7154f1e0..efc5a8e7 100644 --- a/packages/react/src/formElements/MdMultiAutocomplete.tsx +++ b/packages/react/src/formElements/MdMultiAutocomplete.tsx @@ -292,7 +292,7 @@ const MdMultiAutocomplete = React.forwardRef{noResultsText} +
{noResultsText}
)} )}