From 9cdbc08d5405a900fd399cc39516aa516c37eb04 Mon Sep 17 00:00:00 2001 From: Marco Ciampini Date: Thu, 2 Sep 2021 12:09:35 +0200 Subject: [PATCH 1/2] Components: fix passing empty initial value in `CustomSelectControl` --- packages/components/src/custom-select-control/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/components/src/custom-select-control/index.js b/packages/components/src/custom-select-control/index.js index c78c7f715e8689..7eb7c88411499c 100644 --- a/packages/components/src/custom-select-control/index.js +++ b/packages/components/src/custom-select-control/index.js @@ -75,7 +75,7 @@ export default function CustomSelectControl( { items, itemToString, onSelectedItemChange, - selectedItem: _selectedItem, + ...( _selectedItem ? { selectedItem: _selectedItem } : undefined ), stateReducer, } ); From 497621e8a3684fcd0b83b0210c9bbc177baa22eb Mon Sep 17 00:00:00 2001 From: Marco Ciampini Date: Thu, 2 Sep 2021 12:16:55 +0200 Subject: [PATCH 2/2] More strict check, to allow for more falsey values --- packages/components/src/custom-select-control/index.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/components/src/custom-select-control/index.js b/packages/components/src/custom-select-control/index.js index 7eb7c88411499c..b1498938ab8bf4 100644 --- a/packages/components/src/custom-select-control/index.js +++ b/packages/components/src/custom-select-control/index.js @@ -75,7 +75,9 @@ export default function CustomSelectControl( { items, itemToString, onSelectedItemChange, - ...( _selectedItem ? { selectedItem: _selectedItem } : undefined ), + ...( typeof _selectedItem !== 'undefined' && _selectedItem !== null + ? { selectedItem: _selectedItem } + : undefined ), stateReducer, } );