@inseefr/lunatic 2.0.6-v2 → 2.0.7-v2

package/lib/use-lunatic/commons/page-tag.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.getNewReachedPage = getNewReachedPage;
 exports.getPageTag = getPageTag;
+exports.getPagerFromPageTag = getPagerFromPageTag;
 exports.isNewReachedPage = isNewReachedPage;
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
@@ -36,6 +37,9 @@ function getPagerFromPageTag(pageTag) {
     iterationPlusUn: 3
   });
   var match = _toConsumableArray(pageTag.matchAll(pattern));
+  if (match.length === 0) {
+    return null;
+  }
   var _match = _slicedToArray(match, 1),
     _match$0$groups = _match[0].groups,
     page = _match$0$groups.page,

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

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports["default"] = void 0;
 var _commons = require("./commons");
+var _commons2 = require("../commons");
 var _validateControls = require("./validate-controls");
 var _reduceGoNextPage = _interopRequireDefault(require("./reduce-go-next-page"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -17,7 +18,7 @@ function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input ==
 function validateChange(state) {
   var pager = state.pager,
     errors = state.errors;
-  var currentErrors = errors !== undefined ? errors[(0, _commons.getPageTag)(pager)] : undefined;
+  var currentErrors = errors !== undefined ? errors[(0, _commons2.getPageTag)(pager)] : undefined;
   var updatedState = _objectSpread(_objectSpread({}, state), {}, {
     currentErrors: currentErrors
   });

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

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports["default"] = void 0;
 var _commons = require("../commons");
+var _pageTag = require("../commons/page-tag");
 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 _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
@@ -125,7 +126,7 @@ function createVariables(source, data) {
 }
 /* */
 
-function checkInLoop(state) {
+function checkInLoop(state, initialPager) {
   var pager = state.pager,
     pages = state.pages,
     executeExpression = state.executeExpression;
@@ -138,12 +139,13 @@ function checkInLoop(state) {
       loopDependencies = _pages$page.loopDependencies;
     if (isLoop) {
       return _objectSpread(_objectSpread({}, state), {}, {
+        isInLoop: true,
         pager: _objectSpread(_objectSpread({}, pager), {}, {
-          subPage: 0,
+          subPage: initialPager.subPage || 0,
           nbSubPages: subPages.length,
-          iteration: 0,
+          iteration: initialPager.iteration || 0,
           nbIterations: executeExpression(iterations, {
-            iteration: 0,
+            iteration: undefined,
             bindingDependencies: loopDependencies
           })
         })
@@ -179,8 +181,14 @@ function reduceOnInit(state, action) {
       missingBlock = _source$missingBlock === void 0 ? {} : _source$missingBlock,
       _source$resizing = source.resizing,
       resizing = _source$resizing === void 0 ? {} : _source$resizing;
+    var initialPager = (0, _pageTag.getPagerFromPageTag)(initialPage);
+    if (!initialPager) {
+      initialPager = {
+        page: 1
+      };
+    }
     var pager = {
-      page: initialPage,
+      page: initialPager.page,
       maxPage: maxPage,
       subPage: undefined,
       nbSubPages: undefined,
@@ -209,7 +217,7 @@ function reduceOnInit(state, action) {
       management: management,
       savingType: savingType,
       activeControls: activeControls
-    }));
+    }), initialPager);
   }
   return state;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@inseefr/lunatic",
-	"version": "2.0.6-v2",
+	"version": "2.0.7-v2",
 	"workersVersion": "0.2.4-experimental",
 	"description": "Library of questionnaire components",
 	"repository": {