SHARED(Frontend): Fix broken native select components

Opetushallitus · Oct 7, 2024 · 9be24ea · 9be24ea
1 parent edf928b
commit 9be24ea
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 6 deletions.
diff --git a/frontend/packages/shared/CHANGELOG.MD b/frontend/packages/shared/CHANGELOG.MD
@@ -9,6 +9,11 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Released]
 
+## [1.11.4] - 2024-10-07
+
+### Fixed
+- Fixed bug introduced in v.1.11.1: NativeSelect and NativeSelectWithLabel didn't display chosen value correctly
+
 ## [1.11.3] - 2024-09-18
 
 ### Added

diff --git a/frontend/packages/shared/package.json b/frontend/packages/shared/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opetushallitus/kieli-ja-kaantajatutkinnot.shared",
-  "version": "1.11.3",
+  "version": "1.11.4",
   "description": "Shared Frontend Package",
   "exports": {
     "./components": "./src/components/index.tsx",

diff --git a/frontend/packages/shared/src/components/ComboBox/ComboBox.tsx b/frontend/packages/shared/src/components/ComboBox/ComboBox.tsx
@@ -96,7 +96,7 @@ const NativeSelectOrComboBox = ({
       values,
       helperText,
       showError,
-      value: rest.value || '',
+      value: rest.value || undefined,
       disabled: rest.disabled,
       'data-testid': rest['data-testid'],
       variant: 'outlined',

diff --git a/frontend/packages/shared/src/components/LanguageSelect/LanguageSelect.tsx b/frontend/packages/shared/src/components/LanguageSelect/LanguageSelect.tsx
@@ -78,7 +78,7 @@ export const LanguageSelect = ({
     const nativeSelectProps: CustomNativeSelectProps = {
       placeholder: rest.label || '',
       values: sortedOptions,
-      value: value || '',
+      value: value || undefined,
       helperText,
       showError,
       'data-testid': rest['data-testid'],

diff --git a/frontend/packages/shared/src/components/NativeSelect/NativeSelect.tsx b/frontend/packages/shared/src/components/NativeSelect/NativeSelect.tsx
@@ -11,12 +11,12 @@ import { ComboBoxOption } from '../../interfaces';
 import { Text } from '../Text/Text';
 
 export interface CustomNativeSelectProps
-  extends BaseSelectProps<ComboBoxOption> {
+  extends Omit<BaseSelectProps<string>, 'value'> {
   'data-testid'?: string;
   helperText?: string;
   showError?: boolean;
   placeholder: string;
-  value: '' | ComboBoxOption | undefined;
+  value: ComboBoxOption | undefined;
   values: Array<ComboBoxOption>;
 }
 
@@ -27,7 +27,7 @@ const CustomSelect = ({
   ...rest
 }: CustomNativeSelectProps) => {
   const options = [{ label: placeholder, value: '' }, ...values];
-  const inputValue = value && value.value ? value : '';
+  const inputValue = value && value.value ? value.value : '';
 
   return (
     <Select variant={Variant.Outlined} value={inputValue} {...rest} native>