delete incompatible props

add unit test for legend rendering more tests
thomasneirynck · Jan 13, 2020 · 599b1a4 · 599b1a4
1 parent ea9ea14
commit 599b1a4
Show file tree

Hide file tree

Showing 4 changed files with 414 additions and 39 deletions.
diff --git a/...ck/legacy/plugins/maps/public/layers/styles/vector/components/color/dynamic_color_form.js b/...ck/legacy/plugins/maps/public/layers/styles/vector/components/color/dynamic_color_form.js
@@ -64,11 +64,23 @@ export class DynamicColorForm extends React.Component {
     let colorSelect;
     if (styleOptions.field && styleOptions.field.name) {
       const onColorChange = colorOptions => {
+        const oldStyleOptions = { ...styleOptions };
+
+        if (oldStyleOptions.type === !colorOptions.type) {
+          delete oldStyleOptions.type;
+          if (colorOptions.type === COLOR_MAP_TYPE.ORDINAL) {
+            delete oldStyleOptions.useCustomColorPalette;
+            delete oldStyleOptions.customColorPalette;
+          } else {
+            delete oldStyleOptions.useCustomColorRamp;
+            delete oldStyleOptions.customColorRamp;
+          }
+        }
+
         const newOptions = {
-          ...styleOptions,
+          ...oldStyleOptions,
           ...colorOptions,
         };
-
         onDynamicStyleChange(styleProperty.getStyleName(), newOptions);
       };
       if (this.state.colorMapType === COLOR_MAP_TYPE.ORDINAL) {

diff --git a/.../public/layers/styles/vector/properties/__snapshots__/dynamic_color_property.test.js.snap b/.../public/layers/styles/vector/properties/__snapshots__/dynamic_color_property.test.js.snap