@inseefr/lunatic 2.6.4 → 2.6.5

package/lib/components/radio/html/radio-option.js

@@ -4,14 +4,16 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = void 0;
-var _react = require("react");
 var _classnames = _interopRequireDefault(require("classnames"));
-var _commons = require("../../commons");
-var _icons = require("../../commons/icons");
+var _react = require("react");
 var _reactKeyboardEventHandler = _interopRequireDefault(require("react-keyboard-event-handler"));
 var _function = require("../../../utils/function");
+var _commons = require("../../commons");
+var _icons = require("../../commons/icons");
 var _jsxRuntime = require("react/jsx-runtime");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
+/* eslint-disable jsx-a11y/role-supports-aria-props */
+
 function RadioOption(_ref) {
   var checked = _ref.checked,
     _ref$onClick = _ref.onClick,

package/lib/src/use-lunatic/reducer/reduce-handle-change/reduce-resizing.d.ts

@@ -1,4 +1,4 @@
-import type { LunaticState } from '../../type';
 import { type ActionHandleChange } from '../../actions';
+import type { LunaticState } from '../../type';
 declare function reduceResizing(state: LunaticState, action: ActionHandleChange): LunaticState;
 export default reduceResizing;

package/lib/stories/behaviour/resizing/{test.stories.js → resizing.stories.js}

@@ -3,10 +3,11 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports["default"] = exports.Default = void 0;
+exports["default"] = exports.ResizingWithCleaning = exports.Default = void 0;
 var _react = _interopRequireDefault(require("react"));
 var _orchestrator = _interopRequireDefault(require("../../utils/orchestrator"));
 var _source = _interopRequireDefault(require("./source.json"));
+var _sourceResizingCleaning = _interopRequireDefault(require("./source-resizing-cleaning.json"));
 var _defaultArgTypes = _interopRequireDefault(require("../../utils/default-arg-types"));
 var _jsxRuntime = require("react/jsx-runtime");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -81,4 +82,11 @@ exports.Default = Default;
 Default.args = {
   id: 'resizing-default',
   pagination: true
+};
+var ResizingWithCleaning = Template.bind({});
+exports.ResizingWithCleaning = ResizingWithCleaning;
+ResizingWithCleaning.args = {
+  id: 'resizing-with-cleaning',
+  source: _sourceResizingCleaning["default"],
+  pagination: true
 };

package/lib/stories/behaviour/resizing/source-resizing-cleaning.json

@@ -0,0 +1,171 @@
+{
+	"id": "lfrzny8b",
+	"modele": "RP",
+	"enoCoreVersion": "2.4.1",
+	"lunaticModelVersion": "2.3.1",
+	"generatingDate": "28-03-2023 12:57:35",
+	"missing": false,
+	"pagination": "question",
+	"maxPage": "2",
+	"label": {
+		"value": "\"Resizing with cleaning\"",
+		"type": "VTL|MD"
+	},
+	"components": [
+		{
+			"page": "1",
+			"id": "lfwih8tj-habitants",
+			"componentType": "InputNumber",
+			"mandatory": false,
+			"min": 0,
+			"max": 25,
+			"label": {
+				"value": "\"Nombre d'habitant(s) \"",
+				"type": "VTL"
+			},
+			"declarations": [
+				{
+					"id": "kb9hi4j0-krnoclfe",
+					"declarationType": "HELP",
+					"position": "DETACHABLE",
+					"label": {
+						"value": "\"Changing this value should both clean and resize 'PRENOMS'\"",
+						"type": "VTL|MD"
+					}
+				}
+			],
+			"controls": [
+				{
+					"id": "lfwih8tj-habitants-CI-0",
+					"typeOfControl": "CONSISTENCY",
+					"criticality": "ERROR",
+					"control": {
+						"value": "not(isnull(NB))",
+						"type": "VTL"
+					},
+					"errorMessage": {
+						"value": "\"Veuillez entrer un nombre d'habitant(s)\"",
+						"type": "VTL"
+					}
+				},
+				{
+					"id": "lfwih8tj-habitants-CI-1",
+					"typeOfControl": "CONSISTENCY",
+					"criticality": "ERROR",
+					"control": {
+						"value": "isnull(NB) or NB >= 0",
+						"type": "VTL"
+					},
+					"errorMessage": {
+						"value": "\"Veuillez entrer un nombre d'habitant(s) valide\"",
+						"type": "VTL"
+					}
+				}
+			],
+			"conditionFilter": {
+				"value": "true",
+				"type": "VTL"
+			},
+			"response": {
+				"name": "NB"
+			}
+		},
+		{
+			"id": "lfwg2ny2-list-habitants",
+			"componentType": "Loop",
+			"loopDependencies": ["NB"],
+			"iterations": {
+				"value": "NB",
+				"type": "VTL"
+			},
+			"page": "2",
+			"maxPage": "4",
+			"depth": 1,
+			"paginatedLoop": true,
+			"conditionFilter": {
+				"value": "NB >= 1",
+				"type": "VTL"
+			},
+			"components": [
+				{
+					"id": "lfwg2ny2-prenoms",
+					"label": {
+						"value": "\"Prénom \"",
+						"type": "VTL"
+					},
+					"conditionFilter": {
+						"value": "true",
+						"type": "VTL"
+					},
+					"controls": [
+						{
+							"id": "lfwg2ny2-prenoms-CI-0",
+							"typeOfControl": "CONSISTENCY",
+							"criticality": "ERROR",
+							"control": {
+								"value": "not(nvl(PRENOMS, \"\") = \"\")",
+								"type": "VTL"
+							},
+							"errorMessage": {
+								"value": "\"Veuillez entrer un prénom\"",
+								"type": "VTL"
+							}
+						},
+						{
+							"id": "lfwg2ny2-prenoms-CI-1",
+							"typeOfControl": "CONSISTENCY",
+							"criticality": "ERROR",
+							"control": {
+								"value": "not(match_characters(PRENOMS, \"^[-'a-zA-ZÀ-ÿœ$*\\s]+$\") = false)",
+								"type": "VTL"
+							},
+							"errorMessage": {
+								"value": "\"Votre prénom ne peut pas comporter de chiffres ou caractères spéciaux.\"",
+								"type": "VTL"
+							}
+						}
+					],
+					"componentType": "Input",
+					"response": {
+						"name": "PRENOMS"
+					}
+				}
+			]
+		}
+	],
+	"variables": [
+		{
+			"variableType": "COLLECTED",
+			"name": "PRENOMS",
+			"values": {
+				"PREVIOUS": [null],
+				"COLLECTED": [null],
+				"FORCED": [null],
+				"EDITED": [null],
+				"INPUTED": [null]
+			}
+		},
+		{
+			"variableType": "COLLECTED",
+			"name": "NB",
+			"values": {
+				"PREVIOUS": null,
+				"COLLECTED": null,
+				"FORCED": null,
+				"EDITED": null,
+				"INPUTED": null
+			}
+		}
+	],
+	"cleaning": {
+		"NB": {
+			"PRENOMS": "false"
+		}
+	},
+	"resizing": {
+		"NB": {
+			"size": "cast(NB, integer)",
+			"variables": ["PRENOMS"]
+		}
+	}
+}

package/lib/stories/component-set/data-loop.json

@@ -1,6 +1,6 @@
 {
 	"COLLECTED": {
-		"PRENOMS": {
+		"PRENOM": {
 			"EDITED": [null],
 			"FORCED": [null],
 			"INPUTED": [null],

package/lib/use-lunatic/reducer/reduce-handle-change/reduce-handle-change.js

@@ -107,7 +107,7 @@ function updateBindings(state, action) {
   ub(name, value);
   return state;
 }
-var reducers = (0, _compose["default"])(updateVariables, updateBindings, _reduceResizing["default"], _reduceMissing["default"], _reduceCleaning["default"]);
+var reducers = (0, _compose["default"])(updateVariables, updateBindings, _reduceMissing["default"], _reduceCleaning["default"], _reduceResizing["default"]);
 function reduceHandleChange(state, action) {
   return reducers(state, action);
 }

package/lib/use-lunatic/reducer/reduce-handle-change/reduce-resizing.js

@@ -18,9 +18,6 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 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); }
-function refillValue(size, precSize, value) {
-  return (0, _commons2.resizeArrayVariable)(value, size, null);
-}
 function reduceResizingVariables(_ref) {
   var size = _ref.size,
     variableArray = _ref.variableArray,
@@ -30,12 +27,15 @@ function reduceResizingVariables(_ref) {
   if (size === undefined) {
     return {};
   }
-  var sizeValue = executeExpression((0, _commons.getCompatibleVTLExpression)(size));
+  var newSize = executeExpression((0, _commons.getCompatibleVTLExpression)(size));
   return variableArray.reduce(function (acc, v) {
     if (v in variables) {
       var value = variables[v].value;
-      var precSize = Array.isArray(value) ? value.length : 0;
-      var newValue = refillValue(sizeValue, precSize, value);
+      var newValue = (0, _commons2.resizeArrayVariable)(value, newSize, null);
+      // Variable had the right size, do nothing
+      if (newValue === value) {
+        return acc;
+      }
       updateBindings(v, newValue);
       return _objectSpread(_objectSpread({}, acc), {}, _defineProperty({}, v, _objectSpread(_objectSpread({}, variables[v]), {}, {
         value: newValue
@@ -66,6 +66,10 @@ function reduceResizingLinksVariables(_ref2) {
       var newValue = (0, _commons2.resizeArrayVariable)(value.map(function (i) {
         return (0, _commons2.resizeArrayVariable)(i, ySize, null);
       }), xSize, new Array(ySize).fill(null));
+      // Variable had the right size, do nothing
+      if (newValue === value) {
+        return acc;
+      }
       updateBindings(v, newValue);
       return _objectSpread(_objectSpread({}, acc), {}, _defineProperty({}, v, _objectSpread(_objectSpread({}, variables[v]), {}, {
         value: newValue

package/lib/use-lunatic/use-lunatic.test.js

@@ -8,8 +8,15 @@ var _source2 = _interopRequireDefault(require("../stories/questionnaires/logemen
 var _source3 = _interopRequireDefault(require("../stories/questionnaires/simpsons/source.json"));
 var _source4 = _interopRequireDefault(require("../stories/component-set/source.json"));
 var _source5 = _interopRequireDefault(require("../stories/behaviour/cleaning/source.json"));
+var _sourceResizingCleaning = _interopRequireDefault(require("../stories/behaviour/resizing/source-resizing-cleaning.json"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
+function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+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 _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+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; }
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 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; }
@@ -200,12 +207,38 @@ var dataFromObject = function dataFromObject(o) {
       (0, _vitest.expect)(spy.mock.calls[2][1]).toEqual('US');
     });
   });
+  (0, _vitest.describe)('resizing', function () {
+    var expectValueForResponse = function expectValueForResponse(spy, responseName, expectedValue) {
+      (0, _vitest.expect)(spy).toHaveBeenCalled();
+      var lastChangeCall = _toConsumableArray(spy.mock.calls).reverse().find(function (args) {
+        return args[0].name === responseName;
+      });
+      (0, _vitest.expect)(lastChangeCall[1], 'onChange should have been called with the right value').toEqual(expectedValue);
+    };
+    (0, _vitest.it)('should resize after cleaning', function () {
+      var spy = _vitest.vi.fn();
+      var _renderHook11 = (0, _reactHooks.renderHook)(function () {
+          return (0, _useLunatic["default"])(_sourceResizingCleaning["default"], undefined, {
+            onChange: spy
+          });
+        }),
+        result = _renderHook11.result;
+      result.current.onChange({
+        name: 'NB'
+      }, 3);
+      expectValueForResponse(spy, 'PRENOMS', [null, null, null]);
+      result.current.onChange({
+        name: 'NB'
+      }, 2);
+      expectValueForResponse(spy, 'PRENOMS', [null, null]);
+    });
+  });
   (0, _vitest.describe)('getComponents()', function () {
     (0, _vitest.describe)('componentSet', function () {
-      var _renderHook11 = (0, _reactHooks.renderHook)(function () {
+      var _renderHook12 = (0, _reactHooks.renderHook)(function () {
           return (0, _useLunatic["default"])(_source4["default"], undefined, {});
         }),
-        result = _renderHook11.result;
+        result = _renderHook12.result;
       var getComponents = function getComponents() {
         return result.current.getComponents();
       };

package/package.json

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