@inseefr/lunatic 0.4.14-v2 → 0.4.17-v2

package/lib/components/checkbox/checkbox-boolean/lunatic-checkbox-boolean.js

@@ -38,7 +38,7 @@ LunaticCheckboxBoolean.defaultProps = {
 };
 
 var _default = (0, _commons.createLunaticComponent)(LunaticCheckboxBoolean, {
-  fieldset: true,
+  fieldset: false,
   inputId: 'lunatic-checkbox-boolean'
 });
 

package/lib/components/checkbox/checkbox-group/lunatic-checkbox-group.js

@@ -32,7 +32,7 @@ function LunaticCheckboxGroup(_ref) {
 }
 
 var _default = (0, _commons.createLunaticComponent)(LunaticCheckboxGroup, {
-  fieldset: true,
+  fieldset: false,
   inputId: 'lunatic-checkbox-group'
 });
 

package/lib/components/commons/components/combo-box/combo-box.scss

@@ -38,7 +38,6 @@
 			min-height: 30px;
 			min-width: 260px;
 			width: 100%;
-			height: 100%;
 			.lunatic-combo-box-content {
 				.lunatic-combo-box-selection {
 					border-radius: 5px;
@@ -172,8 +171,6 @@
 					}
 
 					width: 100%;
-					height: 100%;
-					/* */
 				}
 
 				.lunatic-combo-box-selected {
@@ -182,7 +179,6 @@
 					white-space: nowrap;
 					overflow-x: hidden;
 					width: 100%;
-					height: 100%;
 					display: none;
 					&.displayed {
 						display: block;

package/lib/components/input-number/input-number.js

@@ -22,7 +22,8 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
 function InputNumber(_ref) {
-  var value = _ref.value,
+  var id = _ref.id,
+      value = _ref.value,
       onChange = _ref.onChange,
       disabled = _ref.disabled,
       readOnly = _ref.readOnly,
@@ -31,7 +32,6 @@ function InputNumber(_ref) {
       max = _ref.max,
       step = _ref.step,
       unit = _ref.unit;
-  var valueEffective = value !== null && value !== void 0 ? value : NaN;
   var handleChange = (0, _react.useCallback)(function (e) {
     var val = e.target.valueAsNumber;
     onChange(isNaN(val) ? null : val);
@@ -39,13 +39,14 @@ function InputNumber(_ref) {
   return /*#__PURE__*/_react["default"].createElement("div", {
     className: "lunatic-input-number-container"
   }, /*#__PURE__*/_react["default"].createElement("input", {
+    id: id,
     className: (0, _classnames["default"])('lunatic-input-number', {
       disabled: disabled,
       readOnly: readOnly
     }),
     type: "number",
     onChange: handleChange,
-    value: valueEffective,
+    value: value !== null && value !== void 0 ? value : '',
     labelledby: labelId,
     readOnly: readOnly,
     disabled: disabled,

package/lib/components/radio/lunatic-radio-group.js

@@ -36,7 +36,8 @@ function LunaticRadioGroup(props) {
 }
 
 var _default = (0, _commons.createLunaticComponent)(LunaticRadioGroup, {
-  fieldset: true,
+  // set it to true if you want to display a fieldset + legend on a component
+  fieldset: false,
   inputId: 'lunatic-radio-group'
 });
 

package/lib/components/radio/radio.scss

@@ -60,4 +60,5 @@
 
 .lunatic-radio-group-option {
 	display: flex;
+	align-items: center;
 }

package/lib/components/table/components/table.scss

@@ -8,6 +8,7 @@
 		th {
 			border: 0.15em solid var(--color-primary-dark);
 			padding: 0.2em;
+			font-size: 13px;
 		}
 		& td {
 			.field,

package/lib/stories/questionnaires-test/test-dylan.json

@@ -1,9 +1,5 @@
 {
-	"cleaning": {
-		"NB_MAJEUR": { "TEXTE": "(NB_MAJEUR > 0)" },
-		"IND_MAJEUR": { "TEXTE": "(NB_MAJEUR > 0)" },
-		"AGE": { "TEXTE": "(NB_MAJEUR > 0)" }
-	},
+	"cleaning": {},
 	"variables": [
 		{
 			"variableType": "COLLECTED",
@@ -60,17 +56,6 @@
 			},
 			"name": "DIVERS"
 		},
-		{
-			"variableType": "COLLECTED",
-			"values": {
-				"COLLECTED": null,
-				"EDITED": null,
-				"INPUTED": null,
-				"FORCED": null,
-				"PREVIOUS": null
-			},
-			"name": "TEXTE"
-		},
 		{
 			"variableType": "CALCULATED",
 			"expression": { "type": "VTL", "value": "true" },
@@ -87,18 +72,7 @@
 		{
 			"variableType": "CALCULATED",
 			"bindingDependencies": ["AGE"],
-			"expression": { "type": "VTL", "value": "cast(AGE,integer)" },
-			"name": "AGE_NUM",
-			"inFilter": "false",
-			"shapeFrom": "PRENOM"
-		},
-		{
-			"variableType": "CALCULATED",
-			"bindingDependencies": ["AGE"],
-			"expression": {
-				"type": "VTL",
-				"value": "if nvl(AGE,0)> 17 then 1 else 0"
-			},
+			"expression": { "type": "VTL", "value": "if AGE > 17 then 1 else 0" },
 			"name": "IND_MAJEUR",
 			"inFilter": "false",
 			"shapeFrom": "PRENOM"
@@ -116,40 +90,34 @@
 			"name": "FILTER_RESULT_DIVERS",
 			"inFilter": "false"
 		},
-		{
-			"variableType": "CALCULATED",
-			"bindingDependencies": ["NB_MAJEUR"],
-			"expression": { "type": "VTL", "value": "(NB_MAJEUR > 0)" },
-			"name": "FILTER_RESULT_TEXTE",
-			"inFilter": "false"
-		},
-		{
-			"variableType": "CALCULATED",
-			"bindingDependencies": ["AGE_NUM", "AGE"],
-			"expression": { "type": "VTL", "value": "sum(AGE_NUM)" },
-			"name": "SUM_AGE_NUM",
-			"inFilter": "false"
-		},
 		{
 			"variableType": "CALCULATED",
 			"bindingDependencies": ["IND_MAJEUR", "AGE"],
 			"expression": { "type": "VTL", "value": "sum(IND_MAJEUR)" },
-			"name": "NB_MAJEUR",
-			"inFilter": "true"
+			"name": "SUM_MAJEUR",
+			"inFilter": "false"
 		},
 		{
 			"variableType": "CALCULATED",
-			"bindingDependencies": ["AGE_NUM", "AGE"],
-			"expression": { "type": "VTL", "value": "min(AGE_NUM)" },
+			"bindingDependencies": ["AGE"],
+			"expression": { "type": "VTL", "value": "min(AGE)" },
 			"name": "MIN_AGE",
 			"inFilter": "false"
 		},
 		{
 			"variableType": "CALCULATED",
 			"bindingDependencies": ["AGE"],
-			"expression": { "type": "VTL", "value": "sum(cast(AGE,integer))" },
+			"expression": { "type": "VTL", "value": "sum(AGE)" },
 			"name": "SUM_AGE",
 			"inFilter": "false"
+		},
+		{
+			"variableType": "CALCULATED",
+			"bindingDependencies": ["AGE"],
+			"expression": { "type": "VTL", "value": "cast(AGE,number)" },
+			"name": "AGE_NUM",
+			"inFilter": "false",
+			"shapeFrom": "PRENOM"
 		}
 	],
 	"components": [
@@ -174,8 +142,9 @@
 					"criticality": "ERROR",
 					"errorMessage": {
 						"type": "VTL|MD",
-						"value": "La valeur doit être comprise entre 0 et 10."
+						"value": "\" La valeur doit être comprise entre 0 et 10.\""
 					},
+					"typeOfControl": "FORMAT",
 					"control": {
 						"type": "VTL",
 						"value": "not(not(isnull(NB)) and (0>NB or 10<NB)))"
@@ -186,8 +155,9 @@
 					"criticality": "ERROR",
 					"errorMessage": {
 						"type": "VTL|MD",
-						"value": "Le nombre doit comporter au maximum 0 chiffre(s) après la virgule."
+						"value": "\"Le nombre doit comporter au maximum 0 chiffre(s) après la virgule.\""
 					},
+					"typeOfControl": "FORMAT",
 					"control": {
 						"type": "VTL",
 						"value": "not(not(isnull(NB)) and trunc(NB,0)<>NB)"
@@ -242,6 +212,30 @@
 				{
 					"componentType": "Input",
 					"bindingDependencies": ["PRENOM", "NB"],
+					"controls": [
+						{
+							"bindingDependencies": ["PRENOM"],
+							"criticality": "WARN",
+							"errorMessage": {
+								"type": "VTL|MD",
+								"value": "\"Prenom est vide ?\""
+							},
+							"typeOfControl": "CONSISTENCY",
+							"control": { "type": "VTL", "value": "not(isnull(PRENOM))" },
+							"id": "ksyjvi40-CI-0"
+						},
+						{
+							"bindingDependencies": ["PRENOM"],
+							"criticality": "WARN",
+							"errorMessage": {
+								"type": "VTL|MD",
+								"value": "\"Prénom vaut A\""
+							},
+							"typeOfControl": "CONSISTENCY",
+							"control": { "type": "VTL", "value": "not(PRENOM = \"A\")" },
+							"id": "ksyjvi40-CI-1"
+						}
+					],
 					"response": { "name": "PRENOM" },
 					"hierarchy": {
 						"sequence": {
@@ -260,7 +254,18 @@
 					"page": "3",
 					"label": { "type": "VTL|MD", "value": "\"➡ 2. \" || \"prénom\"" },
 					"mandatory": false,
-					"maxLength": 249
+					"maxLength": 249,
+					"declarations": [
+						{
+							"declarationType": "HELP",
+							"id": "ksyjvi40-l7uj49ok",
+							"label": {
+								"type": "VTL|MD",
+								"value": "\"Tester Prénom vide et Prénom = A\""
+							},
+							"position": "AFTER_QUESTION_TEXT"
+						}
+					]
 				}
 			],
 			"bindingDependencies": ["NB", "PRENOM"],
@@ -326,8 +331,9 @@
 							"criticality": "ERROR",
 							"errorMessage": {
 								"type": "VTL|MD",
-								"value": "La valeur doit être comprise entre 0 et 100."
+								"value": "\" La valeur doit être comprise entre 0 et 100.\""
 							},
+							"typeOfControl": "FORMAT",
 							"control": {
 								"type": "VTL",
 								"value": "not(not(isnull(AGE)) and (0>AGE or 100<AGE)))"
@@ -338,13 +344,22 @@
 							"criticality": "ERROR",
 							"errorMessage": {
 								"type": "VTL|MD",
-								"value": "Le nombre doit comporter au maximum 0 chiffre(s) après la virgule."
+								"value": "\"Le nombre doit comporter au maximum 0 chiffre(s) après la virgule.\""
 							},
+							"typeOfControl": "FORMAT",
 							"control": {
 								"type": "VTL",
 								"value": "not(not(isnull(AGE)) and trunc(AGE,0)<>AGE)"
 							},
 							"id": "ksyke448-formatDec"
+						},
+						{
+							"bindingDependencies": ["AGE"],
+							"criticality": "WARN",
+							"errorMessage": { "type": "VTL|MD", "value": "\"Age est vide\"" },
+							"typeOfControl": "CONSISTENCY",
+							"control": { "type": "VTL", "value": "not(isnull(AGE))" },
+							"id": "ksyke448-CI-0"
 						}
 					],
 					"max": 100,
@@ -363,7 +378,7 @@
 					"conditionFilter": { "type": "VTL", "value": "true" },
 					"label": {
 						"type": "VTL|MD",
-						"value": "\"➡ 3. \" || \"Q3 Age de l’individu : \" || PRENOM"
+						"value": "\"➡ 3. \" || \"Age de l’individu : \" || PRENOM"
 					},
 					"mandatory": false,
 					"declarations": [
@@ -372,7 +387,7 @@
 							"id": "ksyke448-ktwsl4qu",
 							"label": {
 								"type": "VTL|MD",
-								"value": "\"AGE_NUM vaut : \" || cast(AGE_NUM,string)"
+								"value": "\"AGE vaut : \" || cast(AGE,string)"
 							},
 							"position": "AFTER_QUESTION_TEXT"
 						},
@@ -387,15 +402,15 @@
 						},
 						{
 							"declarationType": "HELP",
-							"id": "ksyke448-l7pyavuk",
+							"id": "ksyke448-l7uk2nvc",
 							"label": {
 								"type": "VTL|MD",
-								"value": "\"AGE vaut : \" || cast(AGE,string)"
+								"value": "\"AGE NUM :\" || cast(AGE_NUM,string)"
 							},
 							"position": "AFTER_QUESTION_TEXT"
 						}
 					],
-					"bindingDependencies": ["AGE_NUM", "IND_MAJEUR", "AGE", "PRENOM"],
+					"bindingDependencies": ["AGE", "IND_MAJEUR", "AGE_NUM", "PRENOM"],
 					"min": 0,
 					"response": { "name": "AGE" },
 					"decimals": 0,
@@ -403,7 +418,7 @@
 					"page": "5.1"
 				}
 			],
-			"bindingDependencies": ["AGE_NUM", "IND_MAJEUR", "AGE", "PRENOM"],
+			"bindingDependencies": ["AGE", "IND_MAJEUR", "AGE_NUM", "PRENOM"],
 			"depth": 1,
 			"hierarchy": {
 				"sequence": {
@@ -420,7 +435,7 @@
 		},
 		{
 			"componentType": "Subsequence",
-			"bindingDependencies": ["SUM_AGE_NUM", "MIN_AGE", "SUM_AGE", "AGE"],
+			"bindingDependencies": ["SUM_AGE", "MIN_AGE", "SUM_MAJEUR"],
 			"goToPage": "6",
 			"hierarchy": {
 				"sequence": {
@@ -431,26 +446,20 @@
 				"subSequence": {
 					"id": "ku2pnlmr",
 					"page": "6",
-					"label": {
-						"type": "VTL|MD",
-						"value": "\"Affichage de qq var\" || cast(AGE,string)"
-					}
+					"label": { "type": "VTL|MD", "value": "\"Affichage de qq var\"" }
 				}
 			},
 			"conditionFilter": { "type": "VTL", "value": "true" },
 			"id": "ku2pnlmr",
 			"page": "6",
-			"label": {
-				"type": "VTL|MD",
-				"value": "\"Affichage de qq var\" || cast(AGE,string)"
-			},
+			"label": { "type": "VTL|MD", "value": "\"Affichage de qq var\"" },
 			"declarations": [
 				{
 					"declarationType": "HELP",
 					"id": "ku2pnlmr-kze7f245",
 					"label": {
 						"type": "VTL|MD",
-						"value": "\"Affichage de la somme des ages : \" || cast(SUM_AGE_NUM,string)"
+						"value": "\"Affichage de la somme des ages : \" || cast(SUM_AGE,string)"
 					},
 					"position": "AFTER_QUESTION_TEXT"
 				},
@@ -465,10 +474,10 @@
 				},
 				{
 					"declarationType": "HELP",
-					"id": "ku2pnlmr-l7g27qfm",
+					"id": "ku2pnlmr-l7t4dzz2",
 					"label": {
 						"type": "VTL|MD",
-						"value": "\"Affichage de la somme sans passer par intermédiaire : \" || cast(SUM_AGE,string)"
+						"value": "\"Affichage du nb de majeurs : \" || cast(SUM_MAJEUR,string)"
 					},
 					"position": "AFTER_QUESTION_TEXT"
 				}
@@ -487,10 +496,7 @@
 				"subSequence": {
 					"id": "ku2pnlmr",
 					"page": "6",
-					"label": {
-						"type": "VTL|MD",
-						"value": "\"Affichage de qq var\" || cast(AGE,string)"
-					}
+					"label": { "type": "VTL|MD", "value": "\"Affichage de qq var\"" }
 				}
 			},
 			"conditionFilter": { "type": "VTL", "value": "true" },
@@ -500,86 +506,18 @@
 			"mandatory": false,
 			"maxLength": 249
 		},
-		{
-			"componentType": "Subsequence",
-			"bindingDependencies": ["NB_MAJEUR"],
-			"goToPage": "8",
-			"hierarchy": {
-				"sequence": {
-					"id": "ksyniqzx",
-					"page": "4",
-					"label": { "type": "VTL|MD", "value": "\"II - \" || \"S1\"" }
-				},
-				"subSequence": {
-					"id": "ku2pqil5",
-					"page": "8",
-					"label": {
-						"type": "VTL|MD",
-						"value": "\"Affichage de la question suivante si au moins 1 majeur. Pour info : nb de majeurs calculé = \" || cast(NB_MAJEUR,string)"
-					}
-				}
-			},
-			"conditionFilter": { "type": "VTL", "value": "true" },
-			"id": "ku2pqil5",
-			"page": "8",
-			"label": {
-				"type": "VTL|MD",
-				"value": "\"Affichage de la question suivante si au moins 1 majeur. Pour info : nb de majeurs calculé = \" || cast(NB_MAJEUR,string)"
-			},
-			"declarations": [
-				{
-					"declarationType": "HELP",
-					"id": "ku2pqil5-kze7d4ia",
-					"label": {
-						"type": "VTL|MD",
-						"value": "Affichage de cette sous séquence systématique. Affichage question qui suit si au moins 1 majeur"
-					},
-					"position": "AFTER_QUESTION_TEXT"
-				}
-			]
-		},
-		{
-			"componentType": "Input",
-			"bindingDependencies": ["TEXTE"],
-			"response": { "name": "TEXTE" },
-			"hierarchy": {
-				"sequence": {
-					"id": "ksyniqzx",
-					"page": "4",
-					"label": { "type": "VTL|MD", "value": "\"II - \" || \"S1\"" }
-				},
-				"subSequence": {
-					"id": "ku2pqil5",
-					"page": "8",
-					"label": {
-						"type": "VTL|MD",
-						"value": "\"Affichage de la question suivante si au moins 1 majeur. Pour info : nb de majeurs calculé = \" || cast(NB_MAJEUR,string)"
-					}
-				}
-			},
-			"conditionFilter": {
-				"bindingDependencies": ["NB_MAJEUR", "IND_MAJEUR", "AGE"],
-				"type": "VTL",
-				"value": "(NB_MAJEUR > 0)"
-			},
-			"id": "ktwvc5zc",
-			"page": "9",
-			"label": { "type": "VTL|MD", "value": "\"➡ 5. \" || \"Texte\"" },
-			"mandatory": false,
-			"maxLength": 249
-		},
 		{
 			"componentType": "Sequence",
 			"hierarchy": {
 				"sequence": {
 					"id": "COMMENT-SEQ",
-					"page": "10",
+					"page": "8",
 					"label": { "type": "VTL|MD", "value": "\"Commentaire\"" }
 				}
 			},
 			"conditionFilter": { "type": "VTL", "value": "true" },
 			"id": "COMMENT-SEQ",
-			"page": "10",
+			"page": "8",
 			"label": { "type": "VTL|MD", "value": "\"Commentaire\"" }
 		},
 		{
@@ -589,13 +527,13 @@
 			"hierarchy": {
 				"sequence": {
 					"id": "COMMENT-SEQ",
-					"page": "10",
+					"page": "8",
 					"label": { "type": "VTL|MD", "value": "\"Commentaire\"" }
 				}
 			},
 			"conditionFilter": { "type": "VTL", "value": "true" },
 			"id": "COMMENT-QUESTION",
-			"page": "11",
+			"page": "9",
 			"label": {
 				"type": "VTL|MD",
 				"value": "\"Avez-vous des remarques concernant l'enquête ou des commentaires ?\""
@@ -608,13 +546,13 @@
 	"resizing": { "NB": { "variables": ["PRENOM", "AGE"], "size": "NB" } },
 	"label": {
 		"type": "VTL|MD",
-		"value": "QNONREG test sur sum, min dans une boucle, nb majeurs et filtre"
+		"value": "BUG sur sum, min dans une boucle et sur controle prénom"
 	},
-	"lunaticModelVersion": "2.2.13",
+	"lunaticModelVersion": "2.2.14-rc",
 	"modele": "TESTSURSUM",
-	"enoCoreVersion": "2.3.10",
-	"generatingDate": "06-09-2022 08:41:23",
+	"enoCoreVersion": "2.3.10-controls-type",
+	"generatingDate": "09-09-2022 14:06:53",
 	"missing": false,
-	"id": "kt32raif",
-	"maxPage": "11"
+	"id": "l7t51pzu",
+	"maxPage": "9"
 }

package/lib/stories/questionnaires-test/test.stories.js

@@ -53,6 +53,10 @@ var stories = {
       },
       control: 'boolean',
       defaultValue: false
+    },
+    activeControls: {
+      control: 'boolean',
+      defaultValue: true
     }
   })
 };

package/lib/use-lunatic/commons/execute-expression/create-execute-expression.js

@@ -145,6 +145,27 @@ function createExecuteExpression(variables, features) {
       }
     });
   }
+  /**
+   *
+   * @param {*} variables
+   */
+
+
+  function resetLoopBindings(variables) {
+    Object.entries(bindings).forEach(function (_ref5) {
+      var _ref6 = _slicedToArray(_ref5, 2),
+          k = _ref6[0],
+          v = _ref6[1];
+
+      var _variables$k2 = variables[k],
+          type = _variables$k2.type,
+          value = _variables$k2.value;
+
+      if (type === _constants.COLLECTED && Array.isArray(value) && !Array.isArray(v)) {
+        bindings[k] = value;
+      }
+    });
+  }
 
   function getVariablesAndCach(expression) {
     if (tokensMap.has(expression)) {
@@ -186,9 +207,9 @@ function createExecuteExpression(variables, features) {
     return {};
   }
 
-  function resolveUseContext(name, _ref5) {
-    var iteration = _ref5.iteration,
-        linksIterations = _ref5.linksIterations;
+  function resolveUseContext(name, _ref7) {
+    var iteration = _ref7.iteration,
+        linksIterations = _ref7.linksIterations;
     var value = bindings[name];
 
     if ([_constants.X_AXIS, _constants.Y_AXIS].includes(name) && linksIterations !== undefined) {
@@ -218,13 +239,13 @@ function createExecuteExpression(variables, features) {
     return (0, _vtl["default"])(value);
   }
 
-  function fillVariablesValues(map, _ref6) {
-    var iteration = _ref6.iteration,
-        linksIterations = _ref6.linksIterations;
-    return Object.entries(map).reduce(function (sub, _ref7) {
-      var _ref8 = _slicedToArray(_ref7, 2),
-          name = _ref8[0],
-          _ = _ref8[1];
+  function fillVariablesValues(map, _ref8) {
+    var iteration = _ref8.iteration,
+        linksIterations = _ref8.linksIterations;
+    return Object.entries(map).reduce(function (sub, _ref9) {
+      var _ref10 = _slicedToArray(_ref9, 2),
+          name = _ref10[0],
+          _ = _ref10[1];
 
       return _objectSpread(_objectSpread({}, sub), {}, _defineProperty({}, name, resolveUseContext(name, {
         iteration: iteration,
@@ -280,7 +301,7 @@ function createExecuteExpression(variables, features) {
     return memoized;
   }
 
-  return [execute, updateBindings, setLoopBindings];
+  return [execute, updateBindings, setLoopBindings, resetLoopBindings];
 }
 
 var _default = createExecuteExpression;

package/lib/use-lunatic/reducer/reduce-go-next-page.js

@@ -158,8 +158,9 @@ function reduceGoNextPage(state) {
   var pages = state.pages,
       isInLoop = state.isInLoop,
       pager = state.pager,
+      variables = state.variables,
       setLoopBindings = state.setLoopBindings,
-      variables = state.variables;
+      resetLoopBindings = state.resetLoopBindings;
   var iteration = pager.iteration,
       nbIterations = pager.nbIterations,
       subPage = pager.subPage,
@@ -171,6 +172,7 @@ function reduceGoNextPage(state) {
   }
 
   if (isInLoop && subPage === nbSubPages - 1 && iteration < nbIterations - 1) {
+    // New iteration, update loop bindings
     setLoopBindings(variables, iteration + 1);
     return validateChange(reduceNextIteration(state));
   }
@@ -181,6 +183,11 @@ function reduceGoNextPage(state) {
       iterations = _pages$next.iterations,
       loopDependencies = _pages$next.loopDependencies;
 
+  if (isInLoop && !isLoop) {
+    //End of the loop, we reset bindings
+    resetLoopBindings(variables);
+  }
+
   if (next === page) {
     // TODO on devrait jamais en arriver là !
     console.log("next === page, we shoudn't be there");

package/lib/use-lunatic/reducer/reduce-on-init.js

@@ -204,10 +204,11 @@ function reduceOnInit(state, action) {
     var variables = createVariables(source, data); // map des variables
 
     var _createExecuteExpress = (0, _commons.createExecuteExpression)(variables, features),
-        _createExecuteExpress2 = _slicedToArray(_createExecuteExpress, 3),
+        _createExecuteExpress2 = _slicedToArray(_createExecuteExpress, 4),
         executeExpression = _createExecuteExpress2[0],
         updateBindings = _createExecuteExpress2[1],
-        setLoopBindings = _createExecuteExpress2[2];
+        setLoopBindings = _createExecuteExpress2[2],
+        resetLoopBindings = _createExecuteExpress2[3];
 
     var pages = (0, _commons.checkLoops)((0, _commons.createMapPages)(source));
     var maxPage = source.maxPage,
@@ -243,6 +244,7 @@ function reduceOnInit(state, action) {
       executeExpression: executeExpression,
       updateBindings: updateBindings,
       setLoopBindings: setLoopBindings,
+      resetLoopBindings: resetLoopBindings,
       handleChange: handleChange,
       preferences: preferences,
       management: management,

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@inseefr/lunatic",
-	"version": "0.4.14-v2",
+	"version": "0.4.17-v2",
 	"workersVersion": "0.2.4-experimental",
 	"description": "Library of questionnaire components",
 	"repository": {
@@ -60,6 +60,7 @@
 		"prop-types": "^15.7.2",
 		"react-keyboard-event-handler": "^1.5.4",
 		"react-markdown": "^8.0.3",
+		"react-number-format": "^5.0.0-beta.4",
 		"react-tooltip": "^4.2.15",
 		"remove-accents": "^0.4.2",
 		"sass": "^1.32.2",