Fix default value for icon-image categorization

Terralego · Jul 11, 2023 · a59bfde · a59bfde
1 parent 862ff42
commit a59bfde
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/src/modules/RA/DataLayer/components/tabs/StyleTab/Style/CategorizeValue.js b/src/modules/RA/DataLayer/components/tabs/StyleTab/Style/CategorizeValue.js
@@ -60,6 +60,7 @@ const CategorizeValue = ({
   getValuesOfProperty,
   Component,
   defaultValueGenerator,
+  hasDefaultValue,
 }) => {
   const translate = useTranslate();
   const mountedRef = React.useRef(true);
@@ -86,7 +87,8 @@ const CategorizeValue = ({
   React.useEffect(() => {
     const getValueList = async () => {
       setTooManyValues(false);
-      const result = await getValuesOfProperty(field);
+      const resultRaw = await getValuesOfProperty(field);
+      const result = hasDefaultValue ? [null, ...resultRaw] : resultRaw;
 
       if (!mountedRef.current) return;
 
@@ -122,6 +124,7 @@ const CategorizeValue = ({
     setValueList,
     valueList,
     valuesLoaded,
+    hasDefaultValue,
   ]);
 
   const onSortEnd = ({ oldIndex, newIndex }) => {

diff --git a/src/modules/RA/DataLayer/components/tabs/StyleTab/Style/IconStyleField.js b/src/modules/RA/DataLayer/components/tabs/StyleTab/Style/IconStyleField.js
@@ -115,6 +115,7 @@ const IconStyleField = ({
                         getValuesOfProperty={getValuesOfProperty}
                         Component={Component}
                         defaultValueGenerator={genDefaultValue}
+                        hasDefaultValue
                       />
                     </Condition>
                   </>