Skip to content
Snippets Groups Projects

merge dev into master

Merged Sandra Westerhoff requested to merge dev into master
4 files
+ 226
6
Compare changes
  • Side-by-side
  • Inline

Files

@@ -136,6 +136,7 @@ export const useFixedValues = (
@@ -136,6 +136,7 @@ export const useFixedValues = (
nodeName: string,
nodeName: string,
) => {
) => {
const currentFixedValueObject = getClonedFixedValueObject(nodeName);
const currentFixedValueObject = getClonedFixedValueObject(nodeName);
 
setIndividualFixedValue(
setIndividualFixedValue(
currentFixedValueObject,
currentFixedValueObject,
InvisibleFixedValue,
InvisibleFixedValue,
@@ -151,16 +152,27 @@ export const useFixedValues = (
@@ -151,16 +152,27 @@ export const useFixedValues = (
DefaultFixedValue,
DefaultFixedValue,
fixedFixedValue,
fixedFixedValue,
);
);
setIndividualFixedValue(
currentFixedValueObject,
if (
DefaultFixedValue,
defaultFixedValue.length === 0 &&
defaultFixedValue,
fixedFixedValue.length === 0 &&
);
values.value.every((entry) => entry.value === '')
 
) {
 
currentFixedValueObject[DefaultFixedValue] = [];
 
} else {
 
setIndividualFixedValue(
 
currentFixedValueObject,
 
DefaultFixedValue,
 
defaultFixedValue,
 
);
 
}
 
removeIndividualFixedValue(
removeIndividualFixedValue(
currentFixedValueObject,
currentFixedValueObject,
FixedFixedValue,
FixedFixedValue,
defaultFixedValue,
defaultFixedValue,
);
);
 
inputFixedValues(currentFixedValueObject, nodeName);
inputFixedValues(currentFixedValueObject, nodeName);
};
};
Loading