@inseefr/lunatic 2.7.12 → 2.7.14

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

@@ -73,7 +73,11 @@ var BlockForLoop = exports.BlockForLoop = (0, _commons.createCustomizableLunatic
     return null;
   }
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
-    children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_declarations.DeclarationsBeforeText, {
+    children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_commons.Label, {
+      htmlFor: id,
+      id: "label-".concat(id),
+      children: label
+    }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_declarations.DeclarationsBeforeText, {
       declarations: declarations,
       id: id
     }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_declarations.DeclarationsAfterText, {
@@ -96,7 +100,7 @@ var BlockForLoop = exports.BlockForLoop = (0, _commons.createCustomizableLunatic
       children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_loopButton.LoopButton, {
         onClick: addRow,
         disabled: nbRows === max,
-        children: label || _i18n["default"].DEFAULT_BUTTON_ADD
+        children: _i18n["default"].DEFAULT_BUTTON_ADD
       }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_loopButton.LoopButton, {
         onClick: removeRow,
         disabled: nbRows === 1,

package/lib/components/loop/roster-for-loop/__snapshots__/roster-for-loop.spec.tsx.snap

@@ -2,6 +2,13 @@
 
 exports[`RosterForLoop > renders the right number of columns 1`] = `
 <div>
+  <label
+    class="lunatic-label"
+    for="table"
+    id="label-table"
+  >
+    Ceci est un test
+  </label>
   <table
     class="lunatic-table"
     id="table-table"
@@ -77,7 +84,7 @@ exports[`RosterForLoop > renders the right number of columns 1`] = `
   <input
     class="button-lunatic"
     type="button"
-    value="Ceci est un test"
+    value="Add row"
   />
   <input
     class="button-lunatic"

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

@@ -18,7 +18,7 @@ var _lunaticComponents = require("../../lunatic-components");
 var _constant = require("../constant");
 var _errors = require("../../commons/components/errors/errors");
 var _jsxRuntime = require("react/jsx-runtime");
-var _excluded = ["value", "lines", "handleChange", "declarations", "label", "headers", "iterations", "id", "getComponents"];
+var _excluded = ["value", "lines", "handleChange", "declarations", "header", "iterations", "id", "getComponents", "label"];
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
@@ -44,11 +44,11 @@ var RosterForLoop = exports.RosterForLoop = (0, _commons.createCustomizableLunat
     lines = props.lines,
     handleChange = props.handleChange,
     declarations = props.declarations,
-    label = props.label,
-    headers = props.headers,
+    header = props.header,
     iterations = props.iterations,
     id = props.id,
     getComponents = props.getComponents,
+    label = props.label,
     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;
@@ -85,7 +85,11 @@ var RosterForLoop = exports.RosterForLoop = (0, _commons.createCustomizableLunat
   }
   var cols = 0;
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
-    children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_declarations.DeclarationsBeforeText, {
+    children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_commons.Label, {
+      htmlFor: id,
+      id: "label-".concat(id),
+      children: label
+    }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_declarations.DeclarationsBeforeText, {
       declarations: declarations,
       id: id
     }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_declarations.DeclarationsAfterText, {
@@ -94,7 +98,7 @@ var RosterForLoop = exports.RosterForLoop = (0, _commons.createCustomizableLunat
     }), /*#__PURE__*/(0, _jsxRuntime.jsxs)(_htmlTable.Table, {
       id: id,
       children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_tableHeader.TableHeader, {
-        header: headers,
+        header: header,
         id: id
       }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_htmlTable.Tbody, {
         id: id,
@@ -111,6 +115,7 @@ var RosterForLoop = exports.RosterForLoop = (0, _commons.createCustomizableLunat
               children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_lunaticComponents.LunaticComponents, {
                 blocklist: _constant.blockedInLoopComponents,
                 components: components,
+                memo: true,
                 componentProps: function componentProps(c) {
                   return _objectSpread(_objectSpread(_objectSpread({}, otherProps), c), {}, {
                     id: "".concat(c.id, "-").concat(n)
@@ -146,7 +151,7 @@ var RosterForLoop = exports.RosterForLoop = (0, _commons.createCustomizableLunat
       children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_loopButton.LoopButton, {
         onClick: addRow,
         disabled: nbRows === max,
-        children: label || _i18n["default"].DEFAULT_BUTTON_ADD
+        children: _i18n["default"].DEFAULT_BUTTON_ADD
       }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_loopButton.LoopButton, {
         onClick: removeRow,
         disabled: nbRows === min,

package/lib/components/lunatic-components.js

@@ -26,6 +26,7 @@ function LunaticComponents(_ref) {
     autoFocusKey = _ref.autoFocusKey,
     componentProps = _ref.componentProps,
     blocklist = _ref.blocklist,
+    memo = _ref.memo,
     _ref$wrapper = _ref.wrapper,
     wrapper = _ref$wrapper === void 0 ? function (_ref2) {
       var children = _ref2.children;
@@ -58,7 +59,7 @@ function LunaticComponents(_ref) {
         var _props = _objectSpread(_objectSpread({}, component), componentProps === null || componentProps === void 0 ? void 0 : componentProps(component));
         return /*#__PURE__*/(0, _jsxRuntime.jsx)(_react.Fragment, {
           children: wrapper(_objectSpread({
-            children: /*#__PURE__*/(0, _jsxRuntime.jsx)(LunaticComponent, _objectSpread({}, _props)),
+            children: memo ? /*#__PURE__*/(0, _jsxRuntime.jsx)(LunaticComponentMemo, _objectSpread({}, _props)) : /*#__PURE__*/(0, _jsxRuntime.jsx)(LunaticComponent, _objectSpread({}, _props)),
             index: k
           }, _props))
         }, computeId(component, k));
@@ -92,6 +93,7 @@ function LunaticComponent(props) {
   var Component = lunaticComponents[props.componentType];
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(Component, _objectSpread({}, props));
 }
+var LunaticComponentMemo = /*#__PURE__*/(0, _react.memo)(LunaticComponent);
 function computeId(component, fallback) {
   if ('id' in component && typeof component.id === 'string') {
     return component.id;

package/lib/src/components/loop/block-for-loop.d.ts

@@ -15,7 +15,7 @@ export declare const BlockForLoop: import("react").ComponentType<import("../type
         deps?: string[] | undefined;
     } | undefined) => T;
     value: Record<string, unknown[]>;
-    headers?: {
+    header?: {
         label: import("react").ReactNode;
     }[] | undefined;
     paginatedLoop?: boolean | undefined;

package/lib/src/components/loop/roster-for-loop/roster-for-loop.d.ts

@@ -16,7 +16,7 @@ export declare const RosterForLoop: import("react").ComponentType<import("../../
         deps?: string[] | undefined;
     } | undefined) => T;
     value: Record<string, unknown[]>;
-    headers?: {
+    header?: {
         label: import("react").ReactNode;
     }[] | undefined;
     paginatedLoop?: boolean | undefined;

package/lib/src/components/lunatic-components.d.ts

@@ -5,6 +5,7 @@ type Props<T extends FilledLunaticComponentProps, V = undefined> = {
         label: string;
         [key: string]: unknown;
     })[];
+    memo?: boolean;
     autoFocusKey?: string;
     componentProps?: (component: FilledLunaticComponentProps) => V;
     blocklist?: string[];
@@ -15,7 +16,7 @@ type Props<T extends FilledLunaticComponentProps, V = undefined> = {
 /**
  * Entry point for orchestrators, this component display the list of fields
  */
-export declare function LunaticComponents<T extends FilledLunaticComponentProps, V = undefined>({ components, autoFocusKey, componentProps, blocklist, wrapper, }: Props<T, V>): import("react/jsx-runtime").JSX.Element;
+export declare function LunaticComponents<T extends FilledLunaticComponentProps, V = undefined>({ components, autoFocusKey, componentProps, blocklist, memo, wrapper, }: Props<T, V>): import("react/jsx-runtime").JSX.Element;
 export declare function hasLabel(component: unknown): component is {
     label: ReactNode;
 } & FilledLunaticComponentProps;

package/lib/src/components/type.d.ts

@@ -98,7 +98,7 @@ type ComponentPropsByType = {
         getComponents: (n: number) => FilledLunaticComponentProps[];
         executeExpression: LunaticState['executeExpression'];
         value: Record<string, unknown[]>;
-        headers?: Array<{
+        header?: Array<{
             label: ReactNode;
         }>;
         paginatedLoop?: boolean;
@@ -112,7 +112,7 @@ type ComponentPropsByType = {
         getComponents: (n: number) => FilledLunaticComponentProps[];
         executeExpression: LunaticState['executeExpression'];
         value: Record<string, unknown[]>;
-        headers?: Array<{
+        header?: Array<{
             label: ReactNode;
         }>;
         paginatedLoop?: boolean;

package/lib/src/use-lunatic/reducer/commons/index.d.ts

@@ -1,3 +1,2 @@
 export { default as resizeArrayVariable } from './resize-array-variable';
-export { isLoopComponent } from './is-loop-component';
 export * from './validate-condition-filter';

package/lib/src/use-lunatic/use-lunatic.d.ts

@@ -72,7 +72,7 @@ declare function useLunatic(source: LunaticSource, data: LunaticData | undefined
                     deps?: string[] | undefined;
                 } | undefined) => T;
                 value: Record<string, unknown[]>;
-                headers?: {
+                header?: {
                     label: import("react").ReactNode;
                 }[] | undefined;
                 paginatedLoop?: boolean | undefined;
@@ -90,7 +90,7 @@ declare function useLunatic(source: LunaticSource, data: LunaticData | undefined
                     deps?: string[] | undefined;
                 } | undefined) => T;
                 value: Record<string, unknown[]>;
-                headers?: {
+                header?: {
                     label: import("react").ReactNode;
                 }[] | undefined;
                 paginatedLoop?: boolean | undefined;
@@ -320,7 +320,7 @@ declare function useLunatic(source: LunaticSource, data: LunaticData | undefined
                     deps?: string[] | undefined;
                 } | undefined) => T;
                 value: Record<string, unknown[]>;
-                headers?: {
+                header?: {
                     label: import("react").ReactNode;
                 }[] | undefined;
                 paginatedLoop?: boolean | undefined;
@@ -338,7 +338,7 @@ declare function useLunatic(source: LunaticSource, data: LunaticData | undefined
                     deps?: string[] | undefined;
                 } | undefined) => T;
                 value: Record<string, unknown[]>;
-                headers?: {
+                header?: {
                     label: import("react").ReactNode;
                 }[] | undefined;
                 paginatedLoop?: boolean | undefined;

package/lib/stories/behaviour/performance/performance.stories.js

@@ -0,0 +1,47 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = exports.Default = void 0;
+var _react = _interopRequireDefault(require("react"));
+var _orchestrator = _interopRequireDefault(require("../../utils/orchestrator"));
+var _source = _interopRequireDefault(require("./source.json"));
+var _lunatic = require("../../../../tests/utils/lunatic");
+var _array = require("../../../utils/array");
+var _jsxRuntime = require("react/jsx-runtime");
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
+var stories = {
+  title: 'Behaviour/Performance',
+  component: _orchestrator["default"]
+};
+var _default = exports["default"] = stories;
+var Template = function Template(args) {
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_orchestrator["default"], _objectSpread({}, args));
+};
+var Default = exports.Default = Template.bind({});
+Default.args = {
+  id: 'performance-default',
+  pagination: true,
+  source: _source["default"],
+  data: (0, _lunatic.generateData)({
+    PRENOM: (0, _array.times)(200, function (k) {
+      return "John".concat(k);
+    }),
+    NOM: (0, _array.times)(200, function (k) {
+      return "Doe".concat(k);
+    }),
+    AGE: (0, _array.times)(200, function (k) {
+      return k + 1;
+    }),
+    BIRTHDAY: (0, _array.times)(200, function (k) {
+      return "2".concat(k.toString().padStart(3, '0'), "-01-01");
+    })
+  })
+};

package/lib/stories/behaviour/performance/source.json

@@ -0,0 +1,172 @@
+{
+	"maxPage": "3",
+	"components": [
+		{
+			"id": "seq",
+			"componentType": "Sequence",
+			"label": {
+				"value": "\"Description des individus de votre logement\"",
+				"type": "VTL|MD"
+			},
+			"conditionFilter": { "value": "true", "type": "VTL" },
+			"page": "1"
+		},
+		{
+			"id": "loop-prenom",
+			"componentType": "RosterForLoop",
+			"header": [
+				{ "headerCell": true, "label": "Prénom" },
+				{ "headerCell": true, "label": "Nom" },
+				{ "headerCell": true, "label": "Date de naissance" },
+				{ "headerCell": true, "label": "Age" }
+			],
+			"label": { "value": "\"Ajouter un individu\"", "type": "VTL|MD" },
+			"conditionFilter": { "value": "true", "type": "VTL" },
+			"bindingDependencies": ["PRENOM", "AGE"],
+			"lines": {
+				"min": { "value": 1, "type": "VTL" },
+				"max": { "value": 250, "type": "VTL" }
+			},
+			"page": "1",
+			"components": [
+				{
+					"componentType": "Input",
+					"conditionFilter": { "value": "true", "type": "VTL" },
+					"maxLength": 30,
+					"bindingDependencies": ["PRENOM"],
+					"id": "prenom",
+					"response": {
+						"name": "PRENOM"
+					}
+				},
+				{
+					"componentType": "Input",
+					"conditionFilter": { "value": "true", "type": "VTL" },
+					"maxLength": 30,
+					"bindingDependencies": ["NOM"],
+					"id": "nom",
+					"response": {
+						"name": "NOM"
+					}
+				},
+				{
+					"componentType": "Datepicker",
+					"conditionFilter": { "value": "true", "type": "VTL" },
+					"maxLength": 30,
+					"bindingDependencies": ["BIRTHDAY"],
+					"id": "birthday",
+					"dateFormat": "YYYY-MM-DD",
+					"response": {
+						"name": "BIRTHDAY"
+					}
+				},
+				{
+					"componentType": "Input",
+					"conditionFilter": { "value": "true", "type": "VTL" },
+					"maxLength": 30,
+					"bindingDependencies": ["AGE"],
+					"id": "age",
+					"response": {
+						"name": "AGE"
+					}
+				}
+			]
+		},
+		{
+			"id": "loop",
+			"componentType": "Loop",
+
+			"loopDependencies": ["PRENOM"],
+			"iterations": { "value": "count(PRENOM)", "type": "VTL" },
+			"page": "2",
+			"maxPage": "1",
+			"depth": 1,
+			"paginatedLoop": true,
+			"conditionFilter": {
+				"value": "true",
+				"type": "VTL"
+			},
+			"components": [
+				{
+					"id": "age",
+					"label": {
+						"value": "PRENOM || \", quel est vôtre âge ?\"",
+						"type": "VTL"
+					},
+					"conditionFilter": {
+						"value": "true",
+						"type": "VTL"
+					},
+					"page": "2.1",
+					"componentType": "InputNumber",
+					"min": 0,
+					"max": 120,
+					"decimals": 0,
+					"response": { "name": "AGE" }
+				}
+			]
+		},
+		{
+			"id": "seq-end",
+			"componentType": "Sequence",
+			"label": {
+				"value": "\"End\"",
+				"type": "VTL|MD"
+			},
+			"conditionFilter": { "value": "true", "type": "VTL" },
+			"page": "3"
+		}
+	],
+	"resizing": {
+		"PRENOM": {
+			"size": "count(PRENOM)",
+			"variables": ["AGE"]
+		}
+	},
+	"variables": [
+		{
+			"variableType": "COLLECTED",
+			"name": "PRENOM",
+			"values": {
+				"PREVIOUS": [null],
+				"COLLECTED": [null],
+				"FORCED": [null],
+				"EDITED": [null],
+				"INPUTED": [null]
+			}
+		},
+		{
+			"variableType": "COLLECTED",
+			"name": "NOM",
+			"values": {
+				"PREVIOUS": [null],
+				"COLLECTED": [null],
+				"FORCED": [null],
+				"EDITED": [null],
+				"INPUTED": [null]
+			}
+		},
+		{
+			"variableType": "COLLECTED",
+			"name": "BIRTHDAY",
+			"values": {
+				"PREVIOUS": [null],
+				"COLLECTED": [null],
+				"FORCED": [null],
+				"EDITED": [null],
+				"INPUTED": [null]
+			}
+		},
+		{
+			"variableType": "COLLECTED",
+			"name": "AGE",
+			"values": {
+				"PREVIOUS": [null],
+				"COLLECTED": [null],
+				"FORCED": [null],
+				"EDITED": [null],
+				"INPUTED": [null]
+			}
+		}
+	]
+}

package/lib/stories/loop/source-with-header.json

@@ -14,7 +14,7 @@
 		{
 			"id": "loop-prenom",
 			"componentType": "RosterForLoop",
-			"headers": [
+			"header": [
 				{ "headerCell": true, "label": "Prénom" },
 				{ "headerCell": true, "label": "Age" }
 			],

package/lib/stories/utils/orchestrator.js

@@ -204,7 +204,8 @@ function OrchestratorForStories(_ref3) {
     overview = _lunatic$useLunatic.overview,
     compileControls = _lunatic$useLunatic.compileControls,
     getData = _lunatic$useLunatic.getData,
-    Provider = _lunatic$useLunatic.Provider;
+    Provider = _lunatic$useLunatic.Provider,
+    hasPageResponse = _lunatic$useLunatic.hasPageResponse;
   var components = getComponents();
   var lastReachedPage = pager.lastReachedPage;
   var _useState3 = (0, _react.useState)({}),
@@ -286,6 +287,17 @@ function OrchestratorForStories(_ref3) {
           maxPage: maxPage,
           getData: getData,
           pager: pager
+        }), /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
+          className: "story-pager",
+          children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("h3", {
+            children: "Misc"
+          }), /*#__PURE__*/(0, _jsxRuntime.jsx)("ul", {
+            children: /*#__PURE__*/(0, _jsxRuntime.jsxs)("li", {
+              children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("strong", {
+                children: "pageHasResponse:"
+              }), ' ', JSON.stringify(hasPageResponse())]
+            })
+          })]
         }), showOverview && /*#__PURE__*/(0, _jsxRuntime.jsx)(_overview.Overview, {
           overview: overview,
           goToPage: goToPage

package/lib/stories/utils/referentiel.js

@@ -21,15 +21,15 @@ var getReferentiel = exports.getReferentiel = /*#__PURE__*/function () {
             return r.json();
           }));
         case 4:
-          return _context.abrupt("return", fetch('https://inseefr.github.io/Lunatic/storybook/naf-rev2.json').then(function (r) {
+          return _context.abrupt("return", fetch('/naf-rev2.json').then(function (r) {
             return r.json();
           }));
         case 5:
-          return _context.abrupt("return", fetch('https://inseefr.github.io/Lunatic/storybook/communes-2019.json').then(function (r) {
+          return _context.abrupt("return", fetch('/communes-2019.json').then(function (r) {
             return r.json();
           }));
         case 6:
-          throw new Error("Unkonw r\xE9f\xE9rentiel ".concat(name));
+          throw new Error("Unknown r\xE9f\xE9rentiel ".concat(name));
         case 7:
         case "end":
           return _context.stop();

package/lib/use-lunatic/commons/compile-controls.js

@@ -1,11 +1,9 @@
 "use strict";
 
-function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.compileControls = compileControls;
-var _commons = require("../reducer/commons");
 var _replaceComponentSequence = require("../replace-component-sequence");
 var _typeSource = require("../type-source");
 var _fillComponentExpressions = _interopRequireDefault(require("./fill-components/fill-component-expressions"));
@@ -13,6 +11,7 @@ var _getComponentsFromState = _interopRequireDefault(require("./get-components-f
 var _checkRoundaboutControl = require("../reducer/controls/check-roundabout-control");
 var _checkBaseControl = require("../reducer/controls/check-base-control");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
@@ -21,6 +20,10 @@ function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input ==
 function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it["return"] != null) it["return"](); } finally { if (didErr) throw err; } } }; }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+var isLoopComponent = function isLoopComponent(component) {
+  return ['Loop', 'RosterForLoop'].includes(component.componentType);
+};
+
 /**
  * Check if components of the current page have errors, and return a map of error (indexed by component ID)
  */
@@ -33,6 +36,7 @@ function checkComponents(state, components) {
       var component = _step.value;
       var controls = component.controls,
         id = component.id;
+
       // The component has global level controls
       if (Array.isArray(controls)) {
         var componentErrors = checkControls(controls.filter(function (c) {
@@ -44,7 +48,7 @@ function checkComponents(state, components) {
       }
 
       // For loop, inspect children
-      if ((0, _commons.isLoopComponent)(component)) {
+      if (isLoopComponent(component)) {
         var _component$controls;
         var rowControls = (_component$controls = component.controls) === null || _component$controls === void 0 ? void 0 : _component$controls.filter(function (c) {
           return c.type === _typeSource.ControlTypeEnum.row;
@@ -92,7 +96,7 @@ function checkControls(controls, executeExpression, pager) {
  * Figure out the number of iterations of a component
  */
 function computeIterations(component, executeExpression) {
-  if ('iterations' in component) {
+  if ('iterations' in component && component.iterations && _typeof(component.iterations) === 'object' && 'value' in component.iterations) {
     return executeExpression(component.iterations.value);
   }
   if ('response' in component) {
@@ -127,7 +131,9 @@ function checkComponentInLoop(state, component, errors) {
       nbIterations: iterations
     });
     // The component is filtered on this iteration, skip it
-    if (component.conditionFilter && !state.executeExpression(component.conditionFilter.value, iterationPager)) {
+    if (
+    // conditionFilter can be the interpreted expression, or the object representing the expression
+    _typeof(component.conditionFilter) == 'object' && !state.executeExpression(component.conditionFilter.value, iterationPager) || component.conditionFilter === false) {
       continue;
     }
     var componentErrors = checkControls(component.controls, state.executeExpression, iterationPager);

package/lib/use-lunatic/commons/fill-components/fill-component-expressions.js

@@ -24,7 +24,7 @@ var VTL_ATTRIBUTES = ['label', 'options.label', 'responses.label', 'hierarchy.la
 // Disable controls compilation
 // 'controls.control',
 // 'controls.errorMessage',
-'controls.iterations', 'lines.min', 'lines.max', 'xAxisIterations', 'yAxisIterations', 'conditionFilter', 'headers.label', 'header.label', 'disabled', 'readOnly'];
+'controls.iterations', 'lines.min', 'lines.max', 'xAxisIterations', 'yAxisIterations', 'conditionFilter', 'header.label', 'disabled', 'readOnly'];
 
 // Utility type to replace all expression from an object into a translated version
 

package/lib/use-lunatic/commons/fill-components/fill-specific-expression.js

@@ -59,11 +59,7 @@ function fillChildComponentsWithIteration(component, state) {
   return _objectSpread(_objectSpread({}, component), {}, {
     getComponents: function getComponents(iteration) {
       return (0, _fillComponents["default"])(component.components, _objectSpread(_objectSpread({}, state), {}, {
-        handleChange: function handleChange(response, value) {
-          state.handleChange(response, value, {
-            iteration: [iteration]
-          });
-        },
+        handleChange: createChangeHandlerForIteration(state.handleChange, iteration),
         pager: _objectSpread(_objectSpread({}, state.pager), {}, {
           iteration: iteration,
           subPage: 0 // Fake a subpage to simulate an iteration
@@ -73,6 +69,27 @@ function fillChildComponentsWithIteration(component, state) {
   });
 }
 
+// Create change handler memoized for every iteration
+var changeHandler = null;
+var changeHandlerMap = new Map();
+function createChangeHandlerForIteration(handleChange, iteration) {
+  if (handleChange !== changeHandler) {
+    changeHandler = handleChange;
+    changeHandlerMap.clear();
+  }
+  var handler = changeHandlerMap.get(iteration);
+  if (handler) {
+    return handler;
+  }
+  handler = function handler(response, value) {
+    handleChange(response, value, {
+      iteration: [iteration]
+    });
+  };
+  changeHandlerMap.set(iteration, handler);
+  return handler;
+}
+
 /**
  * For pairwise, inject a method to retrieve component at a specific iteration combination
  */

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

@@ -260,6 +260,11 @@ var LunaticVariable = /*#__PURE__*/function () {
 
       // Calculate bindings first to refresh "updatedAt" on calculated dependencies
       var bindings = this.getDependenciesValues(iteration);
+      // A variable without binding is a primitive (string, boolean...)
+      // it yields the same results for every iteration, so we can ignore iteration
+      if (Object.keys(bindings).length === 0) {
+        iteration = undefined;
+      }
       if (!this.isOutdated(iteration)) {
         return this.getSavedValue(iteration);
       }
@@ -387,8 +392,13 @@ var LunaticVariable = /*#__PURE__*/function () {
       var _this4 = this,
         _this$calculatedAt$ge;
       var dependenciesUpdatedAt = Math.max.apply(Math, [0].concat(_toConsumableArray(this.getDependencies().map(function (dep) {
-        var _this4$dictionary$get, _this4$dictionary;
-        return (_this4$dictionary$get = (_this4$dictionary = _this4.dictionary) === null || _this4$dictionary === void 0 || (_this4$dictionary = _this4$dictionary.get(dep)) === null || _this4$dictionary === void 0 ? void 0 : _this4$dictionary.updatedAt.get(iteration === null || iteration === void 0 ? void 0 : iteration.join('.'))) !== null && _this4$dictionary$get !== void 0 ? _this4$dictionary$get : 0;
+        var _ref2, _this4$dictionary$get, _this4$dictionary, _this4$dictionary2;
+        return (// Check when a value at the same iteration was calculated
+          (_ref2 = (_this4$dictionary$get = (_this4$dictionary = _this4.dictionary) === null || _this4$dictionary === void 0 || (_this4$dictionary = _this4$dictionary.get(dep)) === null || _this4$dictionary === void 0 ? void 0 : _this4$dictionary.updatedAt.get(iteration === null || iteration === void 0 ? void 0 : iteration.join('.'))) !== null && _this4$dictionary$get !== void 0 ? _this4$dictionary$get : // For aggregated value (max / min) look the global updatedAt time
+          (_this4$dictionary2 = _this4.dictionary) === null || _this4$dictionary2 === void 0 || (_this4$dictionary2 = _this4$dictionary2.get(dep)) === null || _this4$dictionary2 === void 0 ? void 0 : _this4$dictionary2.updatedAt.get(undefined)) !== null && _ref2 !== void 0 ? _ref2 :
+          // Otherwise this is a static value that never changes
+          0
+        );
       }))));
       return dependenciesUpdatedAt > ((_this$calculatedAt$ge = this.calculatedAt.get(iteration === null || iteration === void 0 ? void 0 : iteration.join('.'))) !== null && _this$calculatedAt$ge !== void 0 ? _this$calculatedAt$ge : -1);
     }

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

@@ -199,6 +199,29 @@ var _lunaticVariablesStore = require("./lunatic-variables-store");
       });
       (0, _vitest.expect)(variables.get('FULLNAME')).toEqual(['John 1', 'Jane 2']);
     });
+    (0, _vitest.it)('should handle aggregate functions', function () {
+      variables.set('AGE', [1, 2, 3]);
+      variables.setCalculated('MAXAGE', 'max(AGE)');
+      variables.setCalculated('AGE_AND_MAX', 'AGE + MAXAGE', {
+        shapeFrom: 'AGE'
+      });
+      (0, _vitest.expect)(variables.get('AGE_AND_MAX', [0])).toEqual(4);
+      variables.set('AGE', 12, {
+        iteration: [1]
+      });
+      (0, _vitest.expect)(variables.get('AGE', [1])).toEqual(12);
+      (0, _vitest.expect)(variables.get('AGE_AND_MAX', [0])).toEqual(13);
+    });
+    (0, _vitest.it)('should handle primitive value', function () {
+      variables.run('"hello"', {
+        iteration: [0]
+      });
+      variables.run('"hello"', {
+        iteration: [1]
+      });
+      (0, _vitest.expect)(variables.run('"hello"')).toEqual('hello');
+      (0, _vitest.expect)(variables.interpretCount).toBe(1);
+    });
   });
   (0, _vitest.describe)('resizing', function () {
     (0, _vitest.it)('should resize variables', function () {

package/lib/use-lunatic/hooks/use-page-has-response.js

@@ -19,8 +19,8 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
  */
 function usePageHasResponse(components, executeExpression) {
   return (0, _react.useCallback)(function () {
-    if (!Array.isArray(components)) {
-      return false;
+    if (!Array.isArray(components) || components.length === 0) {
+      return true;
     }
     var _iterator = _createForOfIteratorHelper(components),
       _step;
@@ -28,9 +28,16 @@ function usePageHasResponse(components, executeExpression) {
       for (_iterator.s(); !(_step = _iterator.n()).done;) {
         var component = _step.value;
         // Some components are considered as "filled" by default
-        if (['PairwiseLinks', 'Roundabout'].includes(component.componentType)) {
+        // We assume they are not in the same page has other components
+        if (['PairwiseLinks', 'Roundabout', 'Sequence', 'Subsequence'].includes(component.componentType)) {
           return true;
         }
+
+        // We have a missing response for this component
+        if ('missingResponse' in component && component.missingResponse && component.missingResponse.value) {
+          return true;
+        }
+
         // For Table, we have to extract components from its body and apply isSubComponentsEmpty function
         if (component.componentType === 'Table') {
           // Body is array for array (row), each "cell" could be an Label or Component, so we filter array.
@@ -47,6 +54,7 @@ function usePageHasResponse(components, executeExpression) {
         if ('value' in component && !isEmpty(component.value)) {
           return true;
         }
+
         // For rosterForLoop we need to inspect child components
         if ('components' in component && Array.isArray(component.components) && !isSubComponentsEmpty(component.components, executeExpression)) {
           return true;

package/lib/use-lunatic/reducer/commons/index.js

@@ -4,15 +4,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 var _exportNames = {
-  resizeArrayVariable: true,
-  isLoopComponent: true
+  resizeArrayVariable: true
 };
-Object.defineProperty(exports, "isLoopComponent", {
-  enumerable: true,
-  get: function get() {
-    return _isLoopComponent.isLoopComponent;
-  }
-});
 Object.defineProperty(exports, "resizeArrayVariable", {
   enumerable: true,
   get: function get() {
@@ -20,7 +13,6 @@ Object.defineProperty(exports, "resizeArrayVariable", {
   }
 });
 var _resizeArrayVariable = _interopRequireDefault(require("./resize-array-variable"));
-var _isLoopComponent = require("./is-loop-component");
 var _validateConditionFilter = require("./validate-condition-filter");
 Object.keys(_validateConditionFilter).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;

package/package.json

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

package/lib/src/use-lunatic/reducer/commons/is-loop-component.d.ts

@@ -1,10 +0,0 @@
-import type { LunaticComponentDefinition } from '../../type';
-export declare const isLoopComponent: (component: LunaticComponentDefinition) => component is (import("../../type-source").ComponentTypeBase & import("../../type-source").ComponentRosterForLoopType & {
-    componentType: "CheckboxOne" | "ConfirmationModal" | "Sequence" | "Subsequence" | "RosterForLoop" | "Loop" | "Table" | "InputNumber" | "Datepicker" | "CheckboxGroup" | "CheckboxBoolean" | "Radio" | "FilterDescription" | "Dropdown" | "PairwiseLinks" | "Roundabout" | "Suggester" | "Input" | "Textarea" | "ComponentSet" | "QuestionExplication";
-} & {
-    componentType: 'Loop' | 'RosterForLoop';
-}) | (import("../../type-source").ComponentTypeBase & import("../../type-source").ComponentLoopType & {
-    componentType: "CheckboxOne" | "ConfirmationModal" | "Sequence" | "Subsequence" | "RosterForLoop" | "Loop" | "Table" | "InputNumber" | "Datepicker" | "CheckboxGroup" | "CheckboxBoolean" | "Radio" | "FilterDescription" | "Dropdown" | "PairwiseLinks" | "Roundabout" | "Suggester" | "Input" | "Textarea" | "ComponentSet" | "QuestionExplication";
-} & {
-    componentType: 'Loop' | 'RosterForLoop';
-});

package/lib/use-lunatic/reducer/commons/is-loop-component.js

@@ -1,9 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.isLoopComponent = void 0;
-var isLoopComponent = exports.isLoopComponent = function isLoopComponent(component) {
-  return ['Loop', 'RosterForLoop'].includes(component.componentType);
-};