Change

JedWatson · Dec 18, 2020 · ffb4740 · ffb4740
1 parent fcdeb2b
commit ffb4740
Showing 1 changed file with 13 additions and 3 deletions.
diff --git a/packages/react-select/src/Select.js b/packages/react-select/src/Select.js
@@ -685,10 +685,15 @@ export default class Select extends Component<Props, State> {
     const { isMulti } = this.props;
     const { selectValue } = this.state;
     const candidate = this.getOptionValue(removedValue);
-    const newValue = selectValue.filter(
+    const filteredValue = selectValue.filter(
       i => this.getOptionValue(i) !== candidate
     );
-    this.onChange(isMulti ? newValue : null, {
+    const newValue = isMulti
+      ? filteredValue
+      : filteredValue.length > 0
+      ? filteredValue[0]
+      : null;
+    this.onChange(newValue, {
       action: 'remove-value',
       removedValue,
     });
@@ -708,7 +713,12 @@ export default class Select extends Component<Props, State> {
     const { isMulti } = this.props;
     const { selectValue } = this.state;
     const lastSelectedValue = selectValue[selectValue.length - 1];
-    const newValue = selectValue.slice(0, selectValue.length - 1);
+    const slicedValue = selectValue.slice(0, selectValue.length - 1);
+    const newValue = isMulti
+      ? slicedValue
+      : slicedValue.length > 0
+      ? slicedValue[0]
+      : null;
     this.announceAriaLiveSelection({
       event: 'pop-value',
       context: {