From ae3f79f4ad173347b54293d58f499f79a5f30dde Mon Sep 17 00:00:00 2001
From: orangemug <info@orangemug.co.uk>
Date: Wed, 9 Sep 2020 15:55:20 +0100
Subject: [PATCH] Attempt to correctly upgrade old-style filter functions to
 expressions.

---
 src/components/FilterEditor.jsx | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/components/FilterEditor.jsx b/src/components/FilterEditor.jsx
index d99d8a9f..77f9b0d7 100644
--- a/src/components/FilterEditor.jsx
+++ b/src/components/FilterEditor.jsx
@@ -2,8 +2,9 @@ import React from 'react'
 import PropTypes from 'prop-types'
 import { combiningFilterOps } from '../libs/filterops.js'
 import {mdiTableRowPlusAfter} from '@mdi/js';
+import {isEqual} from 'lodash';
 
-import {latest, validate, migrate} from '@mapbox/mapbox-gl-style-spec'
+import {latest, validate, migrate, convertFilter} from '@mapbox/mapbox-gl-style-spec'
 import InputSelect from './InputSelect'
 import Block from './Block'
 import SingleFilterEditor from './SingleFilterEditor'
@@ -155,7 +156,11 @@ export default class FilterEditor extends React.Component {
 
   static getDerivedStateFromProps (props, currentState) {
     const {filter} = props;
-    const displaySimpleFilter = checkIfSimpleFilter(combiningFilter(props));
+    const tempFilter = combiningFilter(props);
+    const expression = convertFilter(tempFilter);
+
+    // If we convert a filter that is an expression to an expression it'll remain the same in value
+    const displaySimpleFilter = !isEqual(expression, tempFilter);
 
     // Upgrade but never downgrade
     if (!displaySimpleFilter && currentState.displaySimpleFilter === true) {