@bpmn-io/form-js-editor 0.13.1 → 0.14.1

package/dist/index.es.js

@@ -7513,7 +7513,7 @@ function Label(props) {
     id,
     label: 'Label',
     setValue,
-    validate: validateFactory(getValue())
+    validate: validateFactory(getValue(), entry => entry.label)
   });
 }
 function Value$1(props) {
@@ -7539,7 +7539,7 @@ function Value$1(props) {
     id,
     label: 'Value',
     setValue,
-    validate: validateFactory(getValue())
+    validate: validateFactory(getValue(), entry => entry.value)
   });
 }
 
@@ -7781,13 +7781,13 @@ function StaticValuesSourceEntry(props) {
   const addEntry = e => {
     e.stopPropagation();
     const index = values.length + 1;
-    const entry = getIndexedEntry(index);
+    const entry = getIndexedEntry(index, values);
     editField(field, VALUES_SOURCES_PATHS[VALUES_SOURCES.STATIC], arrayAdd(values, values.length, entry));
   };
   const removeEntry = entry => {
     editField(field, VALUES_SOURCES_PATHS[VALUES_SOURCES.STATIC], without(values, entry));
   };
-  const validateFactory = key => {
+  const validateFactory = (key, getValue) => {
     return value => {
       if (value === key) {
         return;
@@ -7795,7 +7795,7 @@ function StaticValuesSourceEntry(props) {
       if (isUndefined(value) || !value.length) {
         return 'Must not be empty.';
       }
-      const isValueAssigned = values.find(entry => entry.value === value);
+      const isValueAssigned = values.find(entry => getValue(entry) === value);
       if (isValueAssigned) {
         return 'Must be unique.';
       }
@@ -7826,17 +7826,23 @@ function StaticValuesSourceEntry(props) {
 
 // helper
 
-function getIndexedEntry(index) {
+function getIndexedEntry(index, values) {
   const entry = {
     label: 'Value',
     value: 'value'
   };
+  while (labelOrValueIsAlreadyAssignedForIndex(index, values)) {
+    index++;
+  }
   if (index > 1) {
     entry.label += ` ${index}`;
     entry.value += `${index}`;
   }
   return entry;
 }
+function labelOrValueIsAlreadyAssignedForIndex(index, values) {
+  return values.some(existingEntry => existingEntry.label === `Value ${index}` || existingEntry.value === `value${index}`);
+}
 
 function AdornerEntry(props) {
   const {
@@ -8065,7 +8071,7 @@ function ValidationGroup(field, editField) {
   } = field;
   const validate = get(field, ['validate'], {});
   const isCustomValidation = [undefined, VALIDATION_TYPE_OPTIONS.custom.value].includes(validate.validationType);
-  if (!(INPUTS.includes(type) && type !== 'checkbox' && type !== 'checklist' && type !== 'taglist')) {
+  if (!INPUTS.includes(type)) {
     return null;
   }
   const onChange = key => {
@@ -8337,12 +8343,13 @@ function CustomValuesGroup(field, editField) {
   }
   const addEntry = event => {
     event.stopPropagation();
-    const index = Object.keys(properties).length + 1;
-    const key = `key${index}`,
-      value = 'value';
+    let index = Object.keys(properties).length + 1;
+    while (`key${index}` in properties) {
+      index++;
+    }
     editField(field, ['properties'], {
       ...properties,
-      [key]: value
+      [`key${index}`]: 'value'
     });
   };
   const validateFactory = key => {