@inseefr/lunatic 3.6.15 → 3.7.1-rc.0

package/use-lunatic/commons/get-components-from-state.d.ts

@@ -1,5 +1,12 @@
 import type { LunaticComponentDefinition, LunaticReducerState } from '../type';
 /**
- * Extract the list of components to display for the current page
+ *
+ * @param state
+ * @param ignoreAutoSubPages : (default: `false`), For pagination, during computation of next page, we check if there is component on a page
+ * before exploring inside Loop, so we have to return only the Loop component (and not it's child)
+ * So if we are computing page (during next or previous action), we have to return only Loop component
+ * During process of computing page, we reached Loop by the root (with subpage or iteration undefined)
+ * So if you're computing pages, set it to `true`
+ * @returns the list of components to display for the current page
  */
-export declare function getComponentsFromState(state: Pick<LunaticReducerState, 'pager' | 'pages' | 'isInLoop'>): LunaticComponentDefinition[];
+export declare function getComponentsFromState(state: Pick<LunaticReducerState, 'pager' | 'pages' | 'isInLoop'>, ignoreAutoSubPages?: boolean): LunaticComponentDefinition[];

package/use-lunatic/commons/get-components-from-state.js

@@ -2,15 +2,24 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getComponentsFromState = getComponentsFromState;
 /**
- * Extract the list of components to display for the current page
+ *
+ * @param state
+ * @param ignoreAutoSubPages : (default: `false`), For pagination, during computation of next page, we check if there is component on a page
+ * before exploring inside Loop, so we have to return only the Loop component (and not it's child)
+ * So if we are computing page (during next or previous action), we have to return only Loop component
+ * During process of computing page, we reached Loop by the root (with subpage or iteration undefined)
+ * So if you're computing pages, set it to `true`
+ * @returns the list of components to display for the current page
  */
-function getComponentsFromState(state) {
+function getComponentsFromState(state, ignoreAutoSubPages = false) {
     const { pager, pages, isInLoop } = state;
     const { page, subPage } = pager;
     if (page && pages && page in pages) {
         const current = pages[page];
         if (isInLoop && current.subPages) {
             const { subPages } = current;
+            if (ignoreAutoSubPages && subPage === undefined)
+                return current.components;
             const stepName = subPages[subPage ?? '0'];
             if (stepName in pages) {
                 return pages[stepName].components;

package/use-lunatic/commons/get-components-from-state.js.map

@@ -1 +1 @@
-{"version":3,"file":"get-components-from-state.js","sourceRoot":"","sources":["../../src/use-lunatic/commons/get-components-from-state.ts"],"names":[],"mappings":";;AAKA,wDAmBC;AAtBD;;GAEG;AACH,SAAgB,sBAAsB,CACrC,KAAgE;IAEhE,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,GAAG,KAAK,CAAC;IACzC,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,KAAK,CAAC;IAChC,IAAI,IAAI,IAAI,KAAK,IAAI,IAAI,IAAI,KAAK,EAAE,CAAC;QACpC,MAAM,OAAO,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC;QAC5B,IAAI,QAAQ,IAAI,OAAO,CAAC,QAAQ,EAAE,CAAC;YAClC,MAAM,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC;YAC7B,MAAM,QAAQ,GAAG,QAAQ,CAAC,OAAO,IAAI,GAAG,CAAC,CAAC;YAC1C,IAAI,QAAQ,IAAI,KAAK,EAAE,CAAC;gBACvB,OAAO,KAAK,CAAC,QAAQ,CAAC,CAAC,UAAU,CAAC;YACnC,CAAC;QACF,CAAC;aAAM,CAAC;YACP,OAAO,OAAO,CAAC,UAAU,CAAC;QAC3B,CAAC;IACF,CAAC;IAED,OAAO,EAAE,CAAC;AACX,CAAC"}
+{"version":3,"file":"get-components-from-state.js","sourceRoot":"","sources":["../../src/use-lunatic/commons/get-components-from-state.ts"],"names":[],"mappings":";;AAYA,wDAsBC;AAhCD;;;;;;;;;GASG;AACH,SAAgB,sBAAsB,CACrC,KAAgE,EAChE,kBAAkB,GAAG,KAAK;IAE1B,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,GAAG,KAAK,CAAC;IACzC,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,KAAK,CAAC;IAChC,IAAI,IAAI,IAAI,KAAK,IAAI,IAAI,IAAI,KAAK,EAAE,CAAC;QACpC,MAAM,OAAO,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC;QAC5B,IAAI,QAAQ,IAAI,OAAO,CAAC,QAAQ,EAAE,CAAC;YAClC,MAAM,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC;YAC7B,IAAI,kBAAkB,IAAI,OAAO,KAAK,SAAS;gBAC9C,OAAO,OAAO,CAAC,UAAU,CAAC;YAC3B,MAAM,QAAQ,GAAG,QAAQ,CAAC,OAAO,IAAI,GAAG,CAAC,CAAC;YAC1C,IAAI,QAAQ,IAAI,KAAK,EAAE,CAAC;gBACvB,OAAO,KAAK,CAAC,QAAQ,CAAC,CAAC,UAAU,CAAC;YACnC,CAAC;QACF,CAAC;aAAM,CAAC;YACP,OAAO,OAAO,CAAC,UAAU,CAAC;QAC3B,CAAC;IACF,CAAC;IAED,OAAO,EAAE,CAAC;AACX,CAAC"}

package/use-lunatic/commons/page.js

@@ -27,7 +27,7 @@ function pageStringToNumbers(page) {
 function isPageEmpty(state) {
     const { executeExpression, pager, options } = state;
     const { iteration } = pager;
-    const components = (0, get_components_from_state_1.getComponentsFromState)(state);
+    const components = (0, get_components_from_state_1.getComponentsFromState)(state, true);
     const visibleComponents = components.filter((component) => {
         if (options.disableFilters) {
             return true;

package/use-lunatic/commons/page.js.map

@@ -1 +1 @@
-{"version":3,"file":"page.js","sourceRoot":"","sources":["../../src/use-lunatic/commons/page.ts"],"names":[],"mappings":";;;;;AAIA,8BAQC;AAKD,kDAEC;AAMD,kCAkCC;AA1DD,2EAAqE;AACrE,0FAAgE;AAEhE,SAAgB,SAAS,CAAC,EACzB,OAAO,EACP,IAAI,GACoD;IACxD,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;QAC3B,OAAO,IAAI,CAAC;IACb,CAAC;IACD,OAAO,GAAG,IAAI,IAAI,OAAO,GAAG,CAAC,EAAE,CAAC;AACjC,CAAC;AAED;;GAEG;AACH,SAAgB,mBAAmB,CAAC,IAAY;IAC/C,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,QAAQ,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;AACpD,CAAC;AAED;;;GAGG;AACH,SAAgB,WAAW,CAAC,KAA0B;IACrD,MAAM,EAAE,iBAAiB,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,KAAK,CAAC;IACpD,MAAM,EAAE,SAAS,EAAE,GAAG,KAAK,CAAC;IAC5B,MAAM,UAAU,GAAG,IAAA,kDAAsB,EAAC,KAAK,CAAC,CAAC;IACjD,MAAM,iBAAiB,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC,SAAS,EAAE,EAAE;QACzD,IAAI,OAAO,CAAC,cAAc,EAAE,CAAC;YAC5B,OAAO,IAAI,CAAC;QACb,CAAC;QAED,kFAAkF;QAClF,IAAI,eAAe,IAAI,SAAS,IAAI,SAAS,CAAC,aAAa,EAAE,CAAC;YAC7D,MAAM,UAAU,GAAG,KAAK,CAAC,iBAAiB,CAAS,SAAS,CAAC,UAAU,CAAC,CAAC;YACzE,IAAI,CAAC,UAAU,EAAE,CAAC;gBACjB,OAAO,KAAK,CAAC;YACd,CAAC;QACF,CAAC;QAED,kCAAkC;QAClC,IAAI,iBAAiB,IAAI,SAAS,IAAI,SAAS,CAAC,eAAe,EAAE,CAAC;YACjE,OAAO,IAAA,kCAAsB,EAC5B,SAAS,CAAC,eAAe,EACzB,iBAAiB,EACjB,SAAS,CACT,CAAC;QACH,CAAC;QACD,OAAO,IAAI,CAAC;IACb,CAAC,CAAC,CAAC;IAEH,6CAA6C;IAC7C,IAAI,iBAAiB,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACpC,OAAO,IAAI,CAAC;IACb,CAAC;IAED,OAAO,KAAK,CAAC;AACd,CAAC"}
+{"version":3,"file":"page.js","sourceRoot":"","sources":["../../src/use-lunatic/commons/page.ts"],"names":[],"mappings":";;;;;AAIA,8BAQC;AAKD,kDAEC;AAMD,kCAkCC;AA1DD,2EAAqE;AACrE,0FAAgE;AAEhE,SAAgB,SAAS,CAAC,EACzB,OAAO,EACP,IAAI,GACoD;IACxD,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;QAC3B,OAAO,IAAI,CAAC;IACb,CAAC;IACD,OAAO,GAAG,IAAI,IAAI,OAAO,GAAG,CAAC,EAAE,CAAC;AACjC,CAAC;AAED;;GAEG;AACH,SAAgB,mBAAmB,CAAC,IAAY;IAC/C,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,QAAQ,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;AACpD,CAAC;AAED;;;GAGG;AACH,SAAgB,WAAW,CAAC,KAA0B;IACrD,MAAM,EAAE,iBAAiB,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,KAAK,CAAC;IACpD,MAAM,EAAE,SAAS,EAAE,GAAG,KAAK,CAAC;IAC5B,MAAM,UAAU,GAAG,IAAA,kDAAsB,EAAC,KAAK,EAAE,IAAI,CAAC,CAAC;IACvD,MAAM,iBAAiB,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC,SAAS,EAAE,EAAE;QACzD,IAAI,OAAO,CAAC,cAAc,EAAE,CAAC;YAC5B,OAAO,IAAI,CAAC;QACb,CAAC;QAED,kFAAkF;QAClF,IAAI,eAAe,IAAI,SAAS,IAAI,SAAS,CAAC,aAAa,EAAE,CAAC;YAC7D,MAAM,UAAU,GAAG,KAAK,CAAC,iBAAiB,CAAS,SAAS,CAAC,UAAU,CAAC,CAAC;YACzE,IAAI,CAAC,UAAU,EAAE,CAAC;gBACjB,OAAO,KAAK,CAAC;YACd,CAAC;QACF,CAAC;QAED,kCAAkC;QAClC,IAAI,iBAAiB,IAAI,SAAS,IAAI,SAAS,CAAC,eAAe,EAAE,CAAC;YACjE,OAAO,IAAA,kCAAsB,EAC5B,SAAS,CAAC,eAAe,EACzB,iBAAiB,EACjB,SAAS,CACT,CAAC;QACH,CAAC;QACD,OAAO,IAAI,CAAC;IACb,CAAC,CAAC,CAAC;IAEH,6CAA6C;IAC7C,IAAI,iBAAiB,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACpC,OAAO,IAAI,CAAC;IACb,CAAC;IAED,OAAO,KAAK,CAAC;AACd,CAAC"}