@inseefr/lunatic 2.7.16 → 2.7.18

package/lib/components/loop/roster-for-loop/roster-for-loop.js

@@ -52,7 +52,7 @@ var RosterForLoop = exports.RosterForLoop = (0, _commons.createCustomizableLunat
     otherProps = _objectWithoutProperties(props, _excluded);
   var min = (lines === null || lines === void 0 ? void 0 : lines.min) || DEFAULT_MIN_ROWS;
   var max = (lines === null || lines === void 0 ? void 0 : lines.max) || DEFAULT_MAX_ROWS;
-  var _useState = (0, _react.useState)(iterations),
+  var _useState = (0, _react.useState)(Math.max(min, iterations)),
     _useState2 = _slicedToArray(_useState, 2),
     nbRows = _useState2[0],
     setNbRows = _useState2[1];

package/lib/src/utils/array.d.ts

@@ -22,3 +22,7 @@ export declare function firstValueItem<T = unknown>(items: T | T[]): T | undefin
  * - subArray([1, 2, 3]) // [[1], [1, 2], [1, 2, 3]]
  */
 export declare function subArrays<T = unknown>(items: T[] | T): T[][];
+/**
+ * Calculates the depth of an array
+ */
+export declare function depth(arr: unknown, base?: number): number;

package/lib/stories/loop/source-roster.json

@@ -92,22 +92,22 @@
 			"variableType": "COLLECTED",
 			"name": "PRENOM",
 			"values": {
-				"PREVIOUS": [null],
-				"COLLECTED": [null],
-				"FORCED": [null],
-				"EDITED": [null],
-				"INPUTED": [null]
+				"PREVIOUS": [],
+				"COLLECTED": [],
+				"FORCED": [],
+				"EDITED": [],
+				"INPUTED": []
 			}
 		},
 		{
 			"variableType": "COLLECTED",
 			"name": "AGE",
 			"values": {
-				"PREVIOUS": [null],
-				"COLLECTED": [null],
-				"FORCED": [null],
-				"EDITED": [null],
-				"INPUTED": [null]
+				"PREVIOUS": [],
+				"COLLECTED": [],
+				"FORCED": [],
+				"EDITED": [],
+				"INPUTED": []
 			}
 		}
 	]

package/lib/use-lunatic/commons/variables/behaviours/cleaning-behaviour.js

@@ -4,6 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.cleaningBehaviour = cleaningBehaviour;
+var _array = require("../../../../utils/array");
 /**
  * Cleaning behaviour for the store
  * When a variable changes, other variables can be reset
@@ -32,8 +33,12 @@ function cleaningBehaviour(store, cleaning) {
         if (skipCleaning) {
           continue;
         }
-        store.set(variableName, getValueAtIteration(initialValues[variableName], iteration), {
-          iteration: iteration
+
+        // Variable may be top level, so we need to deduce expected iteration
+        var variableDepth = (0, _array.depth)(initialValues[variableName]);
+        var variableIteration = variableDepth === 0 ? undefined : iteration === null || iteration === void 0 ? void 0 : iteration.slice(0, (0, _array.depth)(initialValues[variableName]));
+        store.set(variableName, getValueAtIteration(initialValues[variableName], variableIteration), {
+          iteration: variableIteration
         });
       } catch (e) {
         // If we have an error, skip this cleaning

package/lib/use-lunatic/commons/variables/lunatic-variables-store.spec.js

@@ -287,6 +287,8 @@ var _lunaticVariablesStore = require("./lunatic-variables-store");
         READY: {
           PRENOM: 'READY'
         }
+      }, {
+        PRENOM: [null]
       });
       variables.set('READY', false, {
         iteration: [1]
@@ -308,6 +310,21 @@ var _lunaticVariablesStore = require("./lunatic-variables-store");
       });
       (0, _vitest.expect)(variables.get('PRENOM')).toEqual(['John', null, 'Marc']);
     });
+    (0, _vitest.it)('should clean root variables even when in an iteration', function () {
+      variables.set('PRENOM', 'John');
+      variables.set('READY', [true, true, true]);
+      (0, _cleaningBehaviour.cleaningBehaviour)(variables, {
+        READY: {
+          PRENOM: 'READY'
+        }
+      }, {
+        PRENOM: null
+      });
+      variables.set('READY', false, {
+        iteration: [1]
+      });
+      (0, _vitest.expect)(variables.get('PRENOM')).toEqual(null);
+    });
   });
   (0, _vitest.describe)('missing', function () {
     (0, _vitest.beforeEach)(function () {

package/lib/utils/array.js

@@ -3,6 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.depth = depth;
 exports.firstValueItem = firstValueItem;
 exports.getAtIndex = getAtIndex;
 exports.resizeArray = resizeArray;
@@ -115,4 +116,15 @@ function subArrays(items) {
     arrays.push(items.slice(0, i));
   }
   return arrays;
+}
+
+/**
+ * Calculates the depth of an array
+ */
+function depth(arr) {
+  var base = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
+  if (!Array.isArray(arr)) {
+    return base;
+  }
+  return depth(arr[0], base + 1);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@inseefr/lunatic",
-	"version": "2.7.16",
+	"version": "2.7.18",
 	"workersVersion": "0.3.0",
 	"description": "Library of questionnaire components",
 	"repository": {