fix problem with stall suggestions from previous field

elastic · Feb 12, 2020 · 6bf86a3 · 6bf86a3
1 parent b02dbab
commit 6bf86a3
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 10 deletions.
diff --git a/...gacy/plugins/maps/public/layers/styles/vector/components/color/color_stops_categorical.js b/...gacy/plugins/maps/public/layers/styles/vector/components/color/color_stops_categorical.js
@@ -58,6 +58,7 @@ export const ColorStopsCategorical = ({
 
     return (
       <StopInput
+        key={field.getName()} // force new component instance when field changes
         field={field}
         getValueSuggestions={getValueSuggestions}
         value={stopValue}

diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/stop_input.js b/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/stop_input.js
@@ -23,11 +23,6 @@ export class StopInput extends Component {
 
   componentDidMount() {
     this._isMounted = true;
-    this._prevFieldName = undefined;
-    this._loadFieldDataType();
-  }
-
-  componentDidUpdate() {
     this._loadFieldDataType();
   }
 
@@ -37,11 +32,6 @@ export class StopInput extends Component {
   }
 
   async _loadFieldDataType() {
-    if (this.props.field.getName() === this._prevFieldName) {
-      return;
-    }
-
-    this._prevFieldName = this.props.field.getName();
     const fieldDataType = await this.props.field.getDataType();
     if (this._isMounted) {
       this.setState({ fieldDataType });

diff --git a/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/symbol/icon_stops.js b/x-pack/legacy/plugins/maps/public/layers/styles/vector/components/symbol/icon_stops.js
@@ -100,6 +100,7 @@ export function IconStops({
         />
       ) : (
         <StopInput
+          key={field.getName()} // force new component instance when field changes
           field={field}
           getValueSuggestions={getValueSuggestions}
           value={stop}