Merge branch '1.8' into 1

silverstripe · May 11, 2021 · 15258b2 · 15258b2
2 parents 1ba4255 + 4793b9f
commit 15258b2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/client/dist/js/bundle.js b/client/dist/js/bundle.js
diff --git a/client/src/components/TreeDropdownField/TreeDropdownField.js b/client/src/components/TreeDropdownField/TreeDropdownField.js
@@ -701,9 +701,7 @@ class TreeDropdownField extends Component {
 
 // Hack! Temporary fix until we can do a proper upgrade of react-select to >= 2.0.
 // eslint-disable-next-line func-names
-Select.prototype.componentDidUpdate = function (oldProps, oldState) {
-  const nextProps = this.props;
-
+Select.prototype.componentWillReceiveProps = function (nextProps) {
   function handleRequired(value, multi) {
     if (!value) {
       return true;
@@ -717,13 +715,13 @@ Select.prototype.componentDidUpdate = function (oldProps, oldState) {
     this.setState({
       required: handleRequired(valueArray[0], nextProps.multi)
     });
-  } else if (oldProps.required) {
+  } else if (this.props.required) {
     // Used to be required but it's not any more
     this.setState({ required: false });
   }
   // Array comparison in react-select is broken.
-  const [current, next] = [oldProps.value, nextProps.value].map(JSON.stringify);
-  if (oldState.inputValue && current !== next && nextProps.onSelectResetsInput) {
+  const [current, next] = [this.props.value, nextProps.value].map(JSON.stringify);
+  if (this.state.inputValue && current !== next && nextProps.onSelectResetsInput) {
     this.setState({ inputValue: this.handleInputValueChange('') });
   }
 };