npm - @inseefr/lunatic - Versions diffs - 3.0.0-rc.12 → 3.0.0-rc.13 - Mend

@inseefr/lunatic 3.0.0-rc.12 → 3.0.0-rc.13

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (48) hide show

package/lib/src/use-lunatic/commons/fill-components/fill-specific-expression.d.ts CHANGED Viewed

@@ -32,7 +32,7 @@ declare function fillSpecificExpressions(component: DeepTranslateExpression<Luna
     iterations: import("react").ReactNode;
     locked: boolean;
 } | {
-    components: import("./fill-components").FilledLunaticComponentProps<"Sequence" | "Subsequence" | "RosterForLoop" | "Loop" | "Table" | "InputNumber" | "Datepicker" | "CheckboxGroup" | "CheckboxBoolean" | "Radio" | "FilterDescription" | "Dropdown" | "PairwiseLinks" | "Roundabout" | "Suggester" | "Input" | "Textarea" | "CheckboxOne" | "Question">[];
+    components: import("./fill-components").FilledLunaticComponentProps<"Sequence" | "Subsequence" | "RosterForLoop" | "Loop" | "Table" | "InputNumber" | "Datepicker" | "Duration" | "CheckboxGroup" | "CheckboxBoolean" | "Radio" | "FilterDescription" | "Dropdown" | "PairwiseLinks" | "Roundabout" | "Suggester" | "Input" | "Textarea" | "CheckboxOne" | "Question">[];
     label: import("react").ReactNode;
     description: import("react").ReactNode;
     declarations?: import("../../type-source").DeclarationType[] | undefined;
@@ -56,7 +56,7 @@ declare function fillSpecificExpressions(component: DeepTranslateExpression<Luna
     page: string;
     componentType: "Question";
 } | {
-    getComponents: (iteration: number) => import("./fill-components").FilledLunaticComponentProps<"Sequence" | "Subsequence" | "RosterForLoop" | "Loop" | "Table" | "InputNumber" | "Datepicker" | "CheckboxGroup" | "CheckboxBoolean" | "Radio" | "FilterDescription" | "Dropdown" | "PairwiseLinks" | "Roundabout" | "Suggester" | "Input" | "Textarea" | "CheckboxOne" | "Question">[];
+    getComponents: (iteration: number) => import("./fill-components").FilledLunaticComponentProps<"Sequence" | "Subsequence" | "RosterForLoop" | "Loop" | "Table" | "InputNumber" | "Datepicker" | "Duration" | "CheckboxGroup" | "CheckboxBoolean" | "Radio" | "FilterDescription" | "Dropdown" | "PairwiseLinks" | "Roundabout" | "Suggester" | "Input" | "Textarea" | "CheckboxOne" | "Question">[];
     label: import("react").ReactNode;
     description?: import("react").ReactNode;
     declarations?: import("../../type-source").DeclarationType[] | undefined;
@@ -98,7 +98,7 @@ declare function fillSpecificExpressions(component: DeepTranslateExpression<Luna
     positioning: "HORIZONTAL";
     value?: Record<string, unknown[]> | undefined;
 } | {
-    getComponents: (iteration: number) => import("./fill-components").FilledLunaticComponentProps<"Sequence" | "Subsequence" | "RosterForLoop" | "Loop" | "Table" | "InputNumber" | "Datepicker" | "CheckboxGroup" | "CheckboxBoolean" | "Radio" | "FilterDescription" | "Dropdown" | "PairwiseLinks" | "Roundabout" | "Suggester" | "Input" | "Textarea" | "CheckboxOne" | "Question">[];
+    getComponents: (iteration: number) => import("./fill-components").FilledLunaticComponentProps<"Sequence" | "Subsequence" | "RosterForLoop" | "Loop" | "Table" | "InputNumber" | "Datepicker" | "Duration" | "CheckboxGroup" | "CheckboxBoolean" | "Radio" | "FilterDescription" | "Dropdown" | "PairwiseLinks" | "Roundabout" | "Suggester" | "Input" | "Textarea" | "CheckboxOne" | "Question">[];
     label: import("react").ReactNode;
     description?: import("react").ReactNode;
     declarations?: import("../../type-source").DeclarationType[] | undefined;
@@ -129,7 +129,7 @@ declare function fillSpecificExpressions(component: DeepTranslateExpression<Luna
     iterations: import("react").ReactNode;
     value?: Record<string, unknown[]> | undefined;
 } | {
-    getComponents: (iteration: number) => import("./fill-components").FilledLunaticComponentProps<"Sequence" | "Subsequence" | "RosterForLoop" | "Loop" | "Table" | "InputNumber" | "Datepicker" | "CheckboxGroup" | "CheckboxBoolean" | "Radio" | "FilterDescription" | "Dropdown" | "PairwiseLinks" | "Roundabout" | "Suggester" | "Input" | "Textarea" | "CheckboxOne" | "Question">[];
+    getComponents: (iteration: number) => import("./fill-components").FilledLunaticComponentProps<"Sequence" | "Subsequence" | "RosterForLoop" | "Loop" | "Table" | "InputNumber" | "Datepicker" | "Duration" | "CheckboxGroup" | "CheckboxBoolean" | "Radio" | "FilterDescription" | "Dropdown" | "PairwiseLinks" | "Roundabout" | "Suggester" | "Input" | "Textarea" | "CheckboxOne" | "Question">[];
     label: import("react").ReactNode;
     description?: import("react").ReactNode;
     declarations?: import("../../type-source").DeclarationType[] | undefined;
@@ -162,7 +162,7 @@ declare function fillSpecificExpressions(component: DeepTranslateExpression<Luna
     };
     value?: Record<string, unknown[]> | undefined;
 } | {
-    getComponents: (x: number, y: number) => import("./fill-components").FilledLunaticComponentProps<"Sequence" | "Subsequence" | "RosterForLoop" | "Loop" | "Table" | "InputNumber" | "Datepicker" | "CheckboxGroup" | "CheckboxBoolean" | "Radio" | "FilterDescription" | "Dropdown" | "PairwiseLinks" | "Roundabout" | "Suggester" | "Input" | "Textarea" | "CheckboxOne" | "Question">[];
+    getComponents: (x: number, y: number) => import("./fill-components").FilledLunaticComponentProps<"Sequence" | "Subsequence" | "RosterForLoop" | "Loop" | "Table" | "InputNumber" | "Datepicker" | "Duration" | "CheckboxGroup" | "CheckboxBoolean" | "Radio" | "FilterDescription" | "Dropdown" | "PairwiseLinks" | "Roundabout" | "Suggester" | "Input" | "Textarea" | "CheckboxOne" | "Question">[];
     description?: import("react").ReactNode;
     declarations?: import("../../type-source").DeclarationType[] | undefined;
     conditionFilter?: import("react").ReactNode;
@@ -457,6 +457,35 @@ declare function fillSpecificExpressions(component: DeepTranslateExpression<Luna
         max?: string | undefined;
     } & import("./fill-management").FilledProps & import("./fill-component-value").FilledProps & import("./fill-missing-response").FilledProps & import("./fill-from-state").FilledProps & import("./fill-pagination").FilledProps & {
         conditionFilter?: boolean | undefined;
+    }) | ({
+        label: import("react").ReactNode;
+        description?: import("react").ReactNode;
+        declarations?: import("../../type-source").DeclarationType[] | undefined;
+        conditionFilter?: import("react").ReactNode;
+        controls?: import("../../type-source").ControlType[] | undefined;
+        id: string;
+        bindingDependencies?: string[] | undefined;
+        hierarchy?: {
+            sequence: {
+                label: import("react").ReactNode;
+                id: string;
+                page: string;
+            };
+            subSequence?: {
+                label: import("react").ReactNode;
+                id: string;
+                page: string;
+            } | undefined;
+        } | undefined;
+        mandatory?: boolean | undefined;
+        page: string;
+        componentType: "Duration";
+        format: "PnYnM" | "PTnHnM";
+        response: {
+            name: string;
+        };
+    } & import("./fill-management").FilledProps & import("./fill-component-value").FilledProps & import("./fill-missing-response").FilledProps & import("./fill-from-state").FilledProps & import("./fill-pagination").FilledProps & {
+        conditionFilter?: boolean | undefined;
     }) | ({
         label: import("react").ReactNode;
         description?: import("react").ReactNode;
@@ -951,6 +980,33 @@ declare function fillSpecificExpressions(component: DeepTranslateExpression<Luna
     };
     min?: string | undefined;
     max?: string | undefined;
+} | {
+    label: import("react").ReactNode;
+    description?: import("react").ReactNode;
+    declarations?: import("../../type-source").DeclarationType[] | undefined;
+    conditionFilter?: import("react").ReactNode;
+    controls?: import("../../type-source").ControlType[] | undefined;
+    id: string;
+    bindingDependencies?: string[] | undefined;
+    hierarchy?: {
+        sequence: {
+            label: import("react").ReactNode;
+            id: string;
+            page: string;
+        };
+        subSequence?: {
+            label: import("react").ReactNode;
+            id: string;
+            page: string;
+        } | undefined;
+    } | undefined;
+    mandatory?: boolean | undefined;
+    page: string;
+    componentType: "Duration";
+    format: "PnYnM" | "PTnHnM";
+    response: {
+        name: string;
+    };
 } | {
     label: import("react").ReactNode;
     description?: import("react").ReactNode;

package/lib/src/use-lunatic/commons/is-First-last-page.js CHANGED Viewed

@@ -1,6 +1,6 @@
 function isFirstLastPage(pager) {
     const { page, maxPage } = pager;
-    const isFirstPage = page === '1';
+    const isFirstPage = page === 1;
     const isLastPage = page === maxPage;
     return { isFirstPage, isLastPage };
 }

package/lib/src/use-lunatic/commons/is-First-last-page.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"is-First-last-page.js","sourceRoot":"","sources":["../../../../src/use-lunatic/commons/is-First-last-page.ts"],"names":[],"mappings":"AAEA,SAAS,eAAe,CAAC,KAA4B;IACpD,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,KAAK,CAAC;IAChC,MAAM,WAAW,GAAG,IAAI,KAAK,~~GAAG~~,CAAC;~~IACjC~~,MAAM,UAAU,GAAG,IAAI,KAAK,OAAO,CAAC;IACpC,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,CAAC;AACpC,CAAC;AAED,eAAe,eAAe,CAAC"}
1	+ {"version":3,"file":"is-First-last-page.js","sourceRoot":"","sources":["../../../../src/use-lunatic/commons/is-First-last-page.ts"],"names":[],"mappings":"AAEA,SAAS,eAAe,CAAC,KAA4B;IACpD,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,KAAK,CAAC;IAChC,MAAM,WAAW,GAAG,IAAI,KAAK,CAAC,CAAC;IAC/B,MAAM,UAAU,GAAG,IAAI,KAAK,OAAO,CAAC;IACpC,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,CAAC;AACpC,CAAC;AAED,eAAe,eAAe,CAAC"}

package/lib/src/use-lunatic/commons/page-navigation.js CHANGED Viewed

@@ -10,11 +10,11 @@ const resetIteration = {
 export function getNextPager(pager, parent) {
     // Increment the page or subPage
     let [page, subPage] = pager.subPage !== undefined
-        ? [parseInt(pager.page, 10), pager.subPage + 1]
-        : [parseInt(pager.page, 10) + 1, undefined];
+        ? [pager.page, pager.subPage + 1]
+        : [pager.page + 1, undefined];
     let iteration = pager.iteration;
     // We reached the end of the questionnaire
-    if (page > parseInt(pager.maxPage, 10)) {
+    if (page > pager.maxPage) {
         return pager;
     }
     // We reached the end of the sequence
@@ -24,7 +24,7 @@ export function getNextPager(pager, parent) {
     if (isEndSequence && moveUpOnEnd) {
         return {
             ...pager,
-            page: page.toString(),
+            page: page,
             ...resetIteration,
         };
     }
@@ -39,13 +39,13 @@ export function getNextPager(pager, parent) {
         iteration >= pager.nbIterations) {
         return getNextPager({
             ...pager,
-            page: page.toString(),
+            page: page,
             ...resetIteration,
         }, parent);
     }
     return {
         ...pager,
-        page: page.toString(),
+        page: page,
         subPage,
         iteration,
     };
@@ -53,8 +53,8 @@ export function getNextPager(pager, parent) {
 export function getPrevPager(pager, parent) {
     // Decrement the page or subPage
     let [page, subPage] = pager.subPage !== undefined
-        ? [parseInt(pager.page, 10), pager.subPage - 1]
-        : [parseInt(pager.page, 10) - 1, undefined];
+        ? [pager.page, pager.subPage - 1]
+        : [pager.page - 1, undefined];
     let iteration = pager.iteration;
     const moveUpOnStart = parent === 'Roundabout' && pager.nbIterations && pager.nbIterations > 1;
     // We reached the start of the questionnaire
@@ -67,7 +67,7 @@ export function getPrevPager(pager, parent) {
         if (moveUpOnStart) {
             return {
                 ...pager,
-                page: page.toString(),
+                page: page,
                 ...resetIteration,
             };
         }
@@ -79,13 +79,13 @@ export function getPrevPager(pager, parent) {
     if (isStartSequence) {
         return getPrevPager({
             ...pager,
-            page: page.toString(),
+            page: page,
             ...resetIteration,
         }, parent);
     }
     return {
         ...pager,
-        page: page.toString(),
+        page: page,
         subPage,
         iteration,
     };

package/lib/src/use-lunatic/commons/page-navigation.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"page-navigation.js","sourceRoot":"","sources":["../../../../src/use-lunatic/commons/page-navigation.ts"],"names":[],"mappings":"AAGA,MAAM,cAAc,GAAG;IACtB,OAAO,EAAE,SAAS;IAClB,UAAU,EAAE,SAAS;IACrB,SAAS,EAAE,SAAS;IACpB,YAAY,EAAE,SAAS;CACvB,CAAC;AAEF;;GAEG;AACH,MAAM,UAAU,YAAY,CAC3B,KAA4B,EAC5B,MAA6B;IAE7B,gCAAgC;IAChC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,GAClB,KAAK,CAAC,OAAO,KAAK,SAAS;QAC1B,CAAC,CAAC,CAAC,~~QAAQ,CAAC,~~KAAK,CAAC,IAAI,EAAE,~~EAAE,CAAC,EAAE,~~KAAK,CAAC,OAAO,GAAG,CAAC,CAAC;~~QAC/C~~,CAAC,CAAC,CAAC,~~QAAQ,CAAC,~~KAAK,CAAC,IAAI,~~EAAE,EAAE,CAAC,~~GAAG,CAAC,EAAE,SAAS,CAAC,CAAC;~~IAC9C~~,IAAI,SAAS,GAAG,KAAK,CAAC,SAAS,CAAC;IAEhC,0CAA0C;IAC1C,IAAI,IAAI,GAAG,~~QAAQ,CAAC,~~KAAK,CAAC,OAAO,EAAE,~~EAAE,~~CAAC~~,EAAE,CAAC~~;~~QACxC~~,OAAO,KAAK,CAAC;IACd,CAAC;IAED,qCAAqC;IACrC,MAAM,aAAa,GAClB,OAAO,IAAI,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,OAAO,IAAI,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,KAAK,CAAC;IACnE,MAAM,WAAW,GAChB,MAAM,KAAK,YAAY,IAAI,KAAK,CAAC,YAAY,IAAI,KAAK,CAAC,YAAY,GAAG,CAAC,CAAC;IACzE,4EAA4E;IAC5E,IAAI,aAAa,IAAI,WAAW,EAAE,CAAC;QAClC,OAAO;YACN,GAAG,KAAK;YACR,IAAI,EAAE,IAAI~~,CAAC,QAAQ,EAAE~~;~~YACrB~~,GAAG,cAAc;SACjB,CAAC;IACH,CAAC;IAED,2CAA2C;IAC3C,IAAI,aAAa,IAAI,SAAS,KAAK,SAAS,EAAE,CAAC;QAC9C,OAAO,GAAG,CAAC,CAAC;QACZ,SAAS,EAAE,CAAC;IACb,CAAC;IACD,8CAA8C;IAC9C,IACC,SAAS,KAAK,SAAS;QACvB,KAAK,CAAC,YAAY;QAClB,SAAS,IAAI,KAAK,CAAC,YAAY,EAC9B,CAAC;QACF,OAAO,YAAY,CAClB;YACC,GAAG,KAAK;YACR,IAAI,EAAE,IAAI~~,CAAC,QAAQ,EAAE~~;~~YACrB~~,GAAG,cAAc;SACjB,EACD,MAAM,CACN,CAAC;IACH,CAAC;IACD,OAAO;QACN,GAAG,KAAK;QACR,IAAI,EAAE,IAAI~~,CAAC,QAAQ,EAAE~~;~~QACrB~~,OAAO;QACP,SAAS;KACT,CAAC;AACH,CAAC;AAED,MAAM,UAAU,YAAY,CAC3B,KAA4B,EAC5B,MAA6B;IAE7B,gCAAgC;IAChC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,GAClB,KAAK,CAAC,OAAO,KAAK,SAAS;QAC1B,CAAC,CAAC,CAAC,~~QAAQ,CAAC,~~KAAK,CAAC,IAAI,EAAE,~~EAAE,CAAC,EAAE,~~KAAK,CAAC,OAAO,GAAG,CAAC,CAAC;~~QAC/C~~,CAAC,CAAC,CAAC,~~QAAQ,CAAC,~~KAAK,CAAC,IAAI,~~EAAE,EAAE,CAAC,~~GAAG,CAAC,EAAE,SAAS,CAAC,CAAC;~~IAC9C~~,IAAI,SAAS,GAAG,KAAK,CAAC,SAAS,CAAC;IAChC,MAAM,aAAa,GAClB,MAAM,KAAK,YAAY,IAAI,KAAK,CAAC,YAAY,IAAI,KAAK,CAAC,YAAY,GAAG,CAAC,CAAC;IAEzE,4CAA4C;IAC5C,IAAI,IAAI,IAAI,CAAC,EAAE,CAAC;QACf,OAAO,KAAK,CAAC;IACd,CAAC;IAED,gDAAgD;IAChD,IAAI,OAAO,KAAK,SAAS,IAAI,KAAK,CAAC,UAAU,KAAK,SAAS,IAAI,OAAO,GAAG,CAAC,EAAE,CAAC;QAC5E,wDAAwD;QACxD,IAAI,aAAa,EAAE,CAAC;YACnB,OAAO;gBACN,GAAG,KAAK;gBACR,IAAI,EAAE,IAAI~~,CAAC,QAAQ,EAAE~~;~~gBACrB~~,GAAG,cAAc;aACjB,CAAC;QACH,CAAC;QACD,OAAO,GAAG,KAAK,CAAC,UAAU,GAAG,CAAC,CAAC;QAC/B,SAAS,GAAG,CAAC,SAAS,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC;IAClC,CAAC;IAED,MAAM,eAAe,GAAG,SAAS,KAAK,SAAS,IAAI,SAAS,GAAG,CAAC,CAAC;IAEjE,4DAA4D;IAC5D,IAAI,eAAe,EAAE,CAAC;QACrB,OAAO,YAAY,CAClB;YACC,GAAG,KAAK;YACR,IAAI,EAAE,IAAI~~,CAAC,QAAQ,EAAE~~;~~YACrB~~,GAAG,cAAc;SACjB,EACD,MAAM,CACN,CAAC;IACH,CAAC;IAED,OAAO;QACN,GAAG,KAAK;QACR,IAAI,EAAE,IAAI~~,CAAC,QAAQ,EAAE~~;~~QACrB~~,OAAO;QACP,SAAS;KACT,CAAC;AACH,CAAC"}
1	+ {"version":3,"file":"page-navigation.js","sourceRoot":"","sources":["../../../../src/use-lunatic/commons/page-navigation.ts"],"names":[],"mappings":"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"}

package/lib/src/use-lunatic/commons/page-navigation.spec.js CHANGED Viewed

@@ -3,8 +3,8 @@ import { getNextPager, getPrevPager } from './page-navigation';
 describe('page-navigation', () => {
     describe('getNextPager', () => {
         const base = {
-            page: '2',
-            maxPage: '3',
+            page: 2,
+            maxPage: 3,
             subPage: 0,
             nbSubPages: 3,
             iteration: 0,
@@ -39,35 +39,35 @@ describe('page-navigation', () => {
             expect(getNextPager(pager)).toEqual({
                 ...pager,
                 ...reset,
-                page: '3',
+                page: 3,
             });
             expect(getNextPager(pager, 'Roundabout')).toEqual({
                 ...pager,
                 ...reset,
-                page: '2',
+                page: 2,
             });
         });
         it('should navigate on simple page without iteration', () => {
             const pager = {
-                page: '1',
-                maxPage: '3',
+                page: 1,
+                maxPage: 3,
                 iteration: undefined,
             };
-            expect(getNextPager(pager).page).toEqual('2');
+            expect(getNextPager(pager).page).toEqual(2);
         });
         it('should stop at the last page', () => {
             const pager = {
-                page: '3',
-                maxPage: '3',
+                page: 3,
+                maxPage: 3,
                 iteration: undefined,
             };
-            expect(getNextPager(pager).page).toEqual('3');
+            expect(getNextPager(pager).page).toEqual(3);
         });
     });
     describe('getPrevPager', () => {
         const base = {
-            page: '2',
-            maxPage: '3',
+            page: 2,
+            maxPage: 3,
             subPage: 2,
             nbSubPages: 3,
             iteration: 1,
@@ -102,34 +102,34 @@ describe('page-navigation', () => {
             expect(getPrevPager(pager)).toEqual({
                 ...pager,
                 ...reset,
-                page: '1',
+                page: 1,
             });
             expect(getPrevPager(pager, 'Roundabout')).toEqual({
                 ...pager,
                 ...reset,
-                page: '2',
+                page: 2,
             });
             expect(getPrevPager({ ...pager, iteration: 1 }, 'Roundabout')).toEqual({
                 ...pager,
                 ...reset,
-                page: '2',
+                page: 2,
             });
         });
         it('should navigate on simple page without iteration', () => {
             const pager = {
-                page: '2',
-                maxPage: '3',
+                page: 2,
+                maxPage: 3,
                 iteration: undefined,
             };
-            expect(getPrevPager(pager).page).toEqual('1');
+            expect(getPrevPager(pager).page).toEqual(1);
         });
         it('should stop at the first page', () => {
             const pager = {
-                page: '1',
-                maxPage: '3',
+                page: 1,
+                maxPage: 3,
                 iteration: undefined,
             };
-            expect(getPrevPager(pager).page).toEqual('1');
+            expect(getPrevPager(pager).page).toEqual(1);
         });
     });
 });

package/lib/src/use-lunatic/commons/page-navigation.spec.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"page-navigation.spec.js","sourceRoot":"","sources":["../../../../src/use-lunatic/commons/page-navigation.spec.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAG/D,QAAQ,CAAC,iBAAiB,EAAE,GAAG,EAAE;IAChC,QAAQ,CAAC,cAAc,EAAE,GAAG,EAAE;QAC7B,MAAM,IAAI,GAAG;YACZ,IAAI,EAAE,~~GAAG~~;~~YACT~~,OAAO,EAAE,~~GAAG~~;~~YACZ~~,OAAO,EAAE,CAAC;YACV,UAAU,EAAE,CAAC;YACb,SAAS,EAAE,CAAC;YACZ,YAAY,EAAE,CAAC;SACiB,CAAC;QAElC,EAAE,CAAC,mCAAmC,EAAE,GAAG,EAAE;YAC5C,MAAM,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC;gBAClC,GAAG,IAAI;gBACP,OAAO,EAAE,CAAC;aACV,CAAC,CAAC;QACJ,CAAC,CAAC,CAAC;QACH,EAAE,CAAC,qDAAqD,EAAE,GAAG,EAAE;YAC9D,MAAM,KAAK,GAAG;gBACb,GAAG,IAAI;gBACP,OAAO,EAAE,CAAC;aACV,CAAC;YACF,MAAM,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;YAC/C,MAAM,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;QAClD,CAAC,CAAC,CAAC;QACH,EAAE,CAAC,0DAA0D,EAAE,GAAG,EAAE;YACnE,MAAM,KAAK,GAAG;gBACb,GAAG,IAAI;gBACP,OAAO,EAAE,CAAC;gBACV,SAAS,EAAE,CAAC;aACZ,CAAC;YACF,MAAM,KAAK,GAAG;gBACb,OAAO,EAAE,SAAS;gBAClB,UAAU,EAAE,SAAS;gBACrB,SAAS,EAAE,SAAS;gBACpB,YAAY,EAAE,SAAS;aACvB,CAAC;YACF,MAAM,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC;gBACnC,GAAG,KAAK;gBACR,GAAG,KAAK;gBACR,IAAI,EAAE,~~GAAG~~;~~aACT~~,CAAC,CAAC;YACH,MAAM,CAAC,YAAY,CAAC,KAAK,EAAE,YAAY,CAAC,CAAC,CAAC,OAAO,CAAC;gBACjD,GAAG,KAAK;gBACR,GAAG,KAAK;gBACR,IAAI,EAAE,~~GAAG~~;~~aACT~~,CAAC,CAAC;QACJ,CAAC,CAAC,CAAC;QACH,EAAE,CAAC,kDAAkD,EAAE,GAAG,EAAE;YAC3D,MAAM,KAAK,GAAG;gBACb,IAAI,EAAE,~~GAAG~~;~~gBACT~~,OAAO,EAAE,~~GAAG~~;~~gBACZ~~,SAAS,EAAE,SAAS;aACpB,CAAC;YACF,MAAM,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,~~GAAG~~,CAAC,CAAC;~~QAC/C~~,CAAC,CAAC,CAAC;QACH,EAAE,CAAC,8BAA8B,EAAE,GAAG,EAAE;YACvC,MAAM,KAAK,GAAG;gBACb,IAAI,EAAE,~~GAAG~~;~~gBACT~~,OAAO,EAAE,~~GAAG~~;~~gBACZ~~,SAAS,EAAE,SAAS;aACpB,CAAC;YACF,MAAM,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,~~GAAG~~,CAAC,CAAC;~~QAC/C~~,CAAC,CAAC,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,cAAc,EAAE,GAAG,EAAE;QAC7B,MAAM,IAAI,GAAG;YACZ,IAAI,EAAE,~~GAAG~~;~~YACT~~,OAAO,EAAE,~~GAAG~~;~~YACZ~~,OAAO,EAAE,CAAC;YACV,UAAU,EAAE,CAAC;YACb,SAAS,EAAE,CAAC;YACZ,YAAY,EAAE,CAAC;SACiB,CAAC;QAElC,EAAE,CAAC,mCAAmC,EAAE,GAAG,EAAE;YAC5C,MAAM,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC;gBAClC,GAAG,IAAI;gBACP,OAAO,EAAE,CAAC;aACV,CAAC,CAAC;QACJ,CAAC,CAAC,CAAC;QACH,EAAE,CAAC,uDAAuD,EAAE,GAAG,EAAE;YAChE,MAAM,KAAK,GAAG;gBACb,GAAG,IAAI;gBACP,OAAO,EAAE,CAAC;aACV,CAAC;YACF,MAAM,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;YAC/C,MAAM,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;QAClD,CAAC,CAAC,CAAC;QACH,EAAE,CAAC,4DAA4D,EAAE,GAAG,EAAE;YACrE,MAAM,KAAK,GAAG;gBACb,GAAG,IAAI;gBACP,OAAO,EAAE,CAAC;gBACV,SAAS,EAAE,CAAC;aACZ,CAAC;YACF,MAAM,KAAK,GAAG;gBACb,OAAO,EAAE,SAAS;gBAClB,UAAU,EAAE,SAAS;gBACrB,SAAS,EAAE,SAAS;gBACpB,YAAY,EAAE,SAAS;aACvB,CAAC;YACF,MAAM,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC;gBACnC,GAAG,KAAK;gBACR,GAAG,KAAK;gBACR,IAAI,EAAE,~~GAAG~~;~~aACT~~,CAAC,CAAC;YACH,MAAM,CAAC,YAAY,CAAC,KAAK,EAAE,YAAY,CAAC,CAAC,CAAC,OAAO,CAAC;gBACjD,GAAG,KAAK;gBACR,GAAG,KAAK;gBACR,IAAI,EAAE,~~GAAG~~;~~aACT~~,CAAC,CAAC;YACH,MAAM,CAAC,YAAY,CAAC,EAAE,GAAG,KAAK,EAAE,SAAS,EAAE,CAAC,EAAE,EAAE,YAAY,CAAC,CAAC,CAAC,OAAO,CAAC;gBACtE,GAAG,KAAK;gBACR,GAAG,KAAK;gBACR,IAAI,EAAE,~~GAAG~~;~~aACT~~,CAAC,CAAC;QACJ,CAAC,CAAC,CAAC;QACH,EAAE,CAAC,kDAAkD,EAAE,GAAG,EAAE;YAC3D,MAAM,KAAK,GAAG;gBACb,IAAI,EAAE,~~GAAG~~;~~gBACT~~,OAAO,EAAE,~~GAAG~~;~~gBACZ~~,SAAS,EAAE,SAAS;aACpB,CAAC;YACF,MAAM,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,~~GAAG~~,CAAC,CAAC;~~QAC/C~~,CAAC,CAAC,CAAC;QACH,EAAE,CAAC,+BAA+B,EAAE,GAAG,EAAE;YACxC,MAAM,KAAK,GAAG;gBACb,IAAI,EAAE,~~GAAG~~;~~gBACT~~,OAAO,EAAE,~~GAAG~~;~~gBACZ~~,SAAS,EAAE,SAAS;aACpB,CAAC;YACF,MAAM,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,~~GAAG~~,CAAC,CAAC;~~QAC/C~~,CAAC,CAAC,CAAC;IACJ,CAAC,CAAC,CAAC;AACJ,CAAC,CAAC,CAAC"}
1	+ {"version":3,"file":"page-navigation.spec.js","sourceRoot":"","sources":["../../../../src/use-lunatic/commons/page-navigation.spec.ts"],"names":[],"mappings":"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"}

package/lib/src/use-lunatic/commons/page-tag.d.ts CHANGED Viewed

@@ -1,12 +1,16 @@
-import type { LunaticState } from '../type';
+import type { LunaticState, PageTag } from '../type';
 /**
  * Generate page name from the pager
  */
-export declare function getPageTag(pager: LunaticState['pager']): string;
-export declare function getPagerFromPageTag(pageTag?: string): {
-    page: string;
+export declare function getPageTag(pager: LunaticState['pager']): PageTag;
+export declare function getPagerFromPageTag(pageTag?: string | number): {
+    page: number;
+    subPage?: undefined;
+    iteration?: undefined;
+} | {
+    page: number;
     subPage: number;
     iteration: number;
 } | null;
 export declare function isNewReachedPage(pager: LunaticState['pager']): boolean;
-export declare function getNewReachedPage(pager: LunaticState['pager']): string | undefined;
+export declare function getNewReachedPage(pager: LunaticState['pager']): PageTag | undefined;

package/lib/src/use-lunatic/commons/page-tag.js CHANGED Viewed

@@ -8,15 +8,21 @@ export function getPageTag(pager) {
     }
     return `${page}`;
 }
-export function getPagerFromPageTag(pageTag = '1') {
+export function getPagerFromPageTag(pageTag = 1) {
+    if (typeof pageTag === 'number') {
+        return { page: pageTag };
+    }
     const pattern = /(?<page>\d+)\.?(?<subPagePlusUn>\d+)?#?(?<iterationPlusUn>\d+)?/g;
-    const match = [...pageTag?.matchAll(pattern)];
+    const match = [...pageTag?.toString().matchAll(pattern)];
     if (match.length === 0) {
         return null;
     }
     const [{ groups: { page, subPagePlusUn, iterationPlusUn }, },] = match;
+    if (!subPagePlusUn) {
+        return { page: parseInt(page, 10) };
+    }
     return {
-        page,
+        page: parseInt(page, 10),
         subPage: parseInt(subPagePlusUn, 10) - 1,
         iteration: parseInt(iterationPlusUn, 10) - 1,
     };
@@ -27,15 +33,16 @@ export function isNewReachedPage(pager) {
     if (!reachedPager) {
         return false;
     }
-    return (Number.parseInt(page) > Number.parseInt(reachedPager.page.toString()) ||
-        (Number.parseInt(page) === Number.parseInt(reachedPager.page.toString()) &&
-            Number.parseInt(subPage?.toString() ?? '-1') >
-                Number.parseInt(reachedPager.subPage.toString()) &&
-            Number.parseInt(iteration?.toString() ?? '-1') ===
-                Number.parseInt(reachedPager.iteration.toString())) ||
-        (Number.parseInt(page) === Number.parseInt(reachedPager.page.toString()) &&
-            Number.parseInt(iteration?.toString() ?? '-1') >
-                Number.parseInt(reachedPager.iteration.toString())));
+    if (page > reachedPager.page) {
+        return true;
+    }
+    if ((subPage ?? 0) > (reachedPager.subPage ?? 0)) {
+        return true;
+    }
+    if ((iteration ?? 0) > (reachedPager.iteration ?? 0)) {
+        return true;
+    }
+    return false;
 }
 export function getNewReachedPage(pager) {
     return isNewReachedPage(pager) ? getPageTag(pager) : pager.lastReachedPage;

package/lib/src/use-lunatic/commons/page-tag.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"page-tag.js","sourceRoot":"","sources":["../../../../src/use-lunatic/commons/page-tag.ts"],"names":[],"mappings":"AAEA;;GAEG;AACH,MAAM,UAAU,UAAU,CAAC,KAA4B;IACtD,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,SAAS,EAAE,GAAG,KAAK,CAAC;IAC3C,IAAI,OAAO,KAAK,SAAS,IAAI,SAAS,KAAK,SAAS,EAAE,CAAC;QACtD,OAAO,GAAG,IAAI,IAAI,OAAO,GAAG,CAAC,IAAI,SAAS,GAAG,CAAC,EAAE,CAAC;IAClD,CAAC;IAED,OAAO,GAAG,IAAI,EAAE,CAAC;AAClB,CAAC;AAED,MAAM,UAAU,mBAAmB,CAAC,~~UAAkB~~,~~GAAG~~;~~IACxD~~,MAAM,OAAO,GACZ,kEAAkE,CAAC;IACpE,MAAM,KAAK,GAAG,CAAC,GAAI,OAAO,EAAE,QAAQ,CAAC,OAAO,CAAS,~~CAUhD~~,CAAC;IACN,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACxB,OAAO,IAAI,CAAC;IACb,CAAC;IACD,MAAM,CACL,EACC,MAAM,EAAE,EAAE,IAAI,EAAE,aAAa,EAAE,eAAe,EAAE,GAChD,EACD,GAAG,KAAK,CAAC;IACV,OAAO;QACN,IAAI;~~QACJ~~,OAAO,EAAE,QAAQ,CAAC,aAAa,EAAE,EAAE,CAAC,GAAG,CAAC;QACxC,SAAS,EAAE,QAAQ,CAAC,eAAe,EAAE,EAAE,CAAC,GAAG,CAAC;KAC5C,CAAC;AACH,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,KAA4B;IAC5D,MAAM,EAAE,eAAe,EAAE,IAAI,EAAE,OAAO,EAAE,SAAS,EAAE,GAAG,KAAK,CAAC;IAC5D,MAAM,YAAY,GAAG,mBAAmB,CAAC,eAAe,IAAI,GAAG,CAAC,CAAC;IAEjE,IAAI,CAAC,YAAY,EAAE,CAAC;QACnB,OAAO,KAAK,CAAC;IACd,CAAC;IAED,~~OAAO~~,~~CACN,MAAM,CAAC,QAAQ,CAAC,~~IAAI,~~CAAC,~~GAAG,~~MAAM,CAAC,QAAQ,CAAC,~~YAAY,CAAC,IAAI,~~CAAC,QAAQ,~~EAAE,CAAC;~~QACrE~~,~~CAAC~~,~~MAAM~~,CAAC,~~QAAQ,~~CAAC,IAAI,CAAC,~~KAAK~~,~~MAAM,CAAC,QAAQ,CAAC,YAAY,CAAC,~~IAAI,CAAC,~~QAAQ,EAAE,~~CAAC~~;YACvE~~,~~MAAM~~,CAAC,~~QAAQ~~,CAAC,OAAO,~~EAAE,QAAQ,EAAE,~~IAAI,~~IAAI,~~CAAC~~;gBAC3C~~,~~MAAM,~~CAAC,~~QAAQ~~,CAAC,~~YAAY,CAAC,~~OAAO,~~CAAC~~,~~QAAQ,EAAE,~~CAAC;~~YACjD~~,~~MAAM,~~CAAC,~~QAAQ~~,CAAC,SAAS,~~EAAE,QAAQ,EAAE,~~IAAI,~~IAAI,~~CAAC~~;gBAC7C~~,~~MAAM,~~CAAC,~~QAAQ~~,CAAC,YAAY,CAAC,SAAS,~~CAAC,QAAQ,EAAE,CAAC,CAAC;QACrD,CAAC,MAAM,CAAC,QAAQ,CAAC,~~IAAI,CAAC,~~KAAK,MAAM,~~CAAC,~~QAAQ,CAAC,YAAY,CAAC,IAAI,CAAC,QAAQ,~~EAAE,CAAC;~~YACvE~~,~~MAAM~~,~~CAAC,QAAQ,CAAC,SAAS,EAAE,QAAQ,EAAE,~~IAAI,~~IAAI,~~CAAC;~~gBAC7C~~,~~MAAM,~~CAAC,~~QAAQ~~,~~CAAC~~,~~YAAY,~~CAAC~~,SAAS,CAAC,QAAQ,EAAE,CAAC,CAAC,CACrD,CAAC~~;~~AACH~~,CAAC;AAED,MAAM,UAAU,iBAAiB,~~CAAC~~,KAA4B;~~IAC7D~~,OAAO,gBAAgB,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,eAAe,CAAC;AAC5E,CAAC"}
1	+ {"version":3,"file":"page-tag.js","sourceRoot":"","sources":["../../../../src/use-lunatic/commons/page-tag.ts"],"names":[],"mappings":"AAEA;;GAEG;AACH,MAAM,UAAU,UAAU,CAAC,KAA4B;IACtD,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,SAAS,EAAE,GAAG,KAAK,CAAC;IAC3C,IAAI,OAAO,KAAK,SAAS,IAAI,SAAS,KAAK,SAAS,EAAE,CAAC;QACtD,OAAO,GAAG,IAAI,IAAI,OAAO,GAAG,CAAC,IAAI,SAAS,GAAG,CAAC,EAAE,CAAC;IAClD,CAAC;IAED,OAAO,GAAG,IAAI,EAAE,CAAC;AAClB,CAAC;AAED,MAAM,UAAU,mBAAmB,CAAC,UAA2B,CAAC;IAC/D,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE,CAAC;QACjC,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC;IAC1B,CAAC;IACD,MAAM,OAAO,GACZ,kEAAkE,CAAC;IACpE,MAAM,KAAK,GAAG,CAAC,GAAI,OAAO,EAAE,QAAQ,EAAE,CAAC,QAAQ,CAAC,OAAO,CAAS,CAU3D,CAAC;IACN,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACxB,OAAO,IAAI,CAAC;IACb,CAAC;IACD,MAAM,CACL,EACC,MAAM,EAAE,EAAE,IAAI,EAAE,aAAa,EAAE,eAAe,EAAE,GAChD,EACD,GAAG,KAAK,CAAC;IACV,IAAI,CAAC,aAAa,EAAE,CAAC;QACpB,OAAO,EAAE,IAAI,EAAE,QAAQ,CAAC,IAAI,EAAE,EAAE,CAAC,EAAE,CAAC;IACrC,CAAC;IACD,OAAO;QACN,IAAI,EAAE,QAAQ,CAAC,IAAI,EAAE,EAAE,CAAC;QACxB,OAAO,EAAE,QAAQ,CAAC,aAAa,EAAE,EAAE,CAAC,GAAG,CAAC;QACxC,SAAS,EAAE,QAAQ,CAAC,eAAe,EAAE,EAAE,CAAC,GAAG,CAAC;KAC5C,CAAC;AACH,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,KAA4B;IAC5D,MAAM,EAAE,eAAe,EAAE,IAAI,EAAE,OAAO,EAAE,SAAS,EAAE,GAAG,KAAK,CAAC;IAC5D,MAAM,YAAY,GAAG,mBAAmB,CAAC,eAAe,IAAI,GAAG,CAAC,CAAC;IAEjE,IAAI,CAAC,YAAY,EAAE,CAAC;QACnB,OAAO,KAAK,CAAC;IACd,CAAC;IAED,IAAI,IAAI,GAAG,YAAY,CAAC,IAAI,EAAE,CAAC;QAC9B,OAAO,IAAI,CAAC;IACb,CAAC;IAED,IAAI,CAAC,OAAO,IAAI,CAAC,CAAC,GAAG,CAAC,YAAY,CAAC,OAAO,IAAI,CAAC,CAAC,EAAE,CAAC;QAClD,OAAO,IAAI,CAAC;IACb,CAAC;IAED,IAAI,CAAC,SAAS,IAAI,CAAC,CAAC,GAAG,CAAC,YAAY,CAAC,SAAS,IAAI,CAAC,CAAC,EAAE,CAAC;QACtD,OAAO,IAAI,CAAC;IACb,CAAC;IAED,OAAO,KAAK,CAAC;AACd,CAAC;AAED,MAAM,UAAU,iBAAiB,CAChC,KAA4B;IAE5B,OAAO,gBAAgB,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,eAAe,CAAC;AAC5E,CAAC"}

package/lib/src/use-lunatic/commons/page-tag.spec.d.ts ADDED Viewed

	@@ -0,0 +1 @@
1	+ export {};

package/lib/src/use-lunatic/commons/page-tag.spec.js ADDED Viewed

@@ -0,0 +1,19 @@
+import { describe, it, expect } from 'vitest';
+import { getPagerFromPageTag } from './page-tag';
+describe('page-tag', () => {
+    describe('getPagerFromPageTag', () => {
+        it('should handle simple page', () => {
+            expect(getPagerFromPageTag('2')).toEqual({
+                page: 2,
+            });
+        });
+        it('should handle page with iteration', () => {
+            expect(getPagerFromPageTag('2.1#3')).toEqual({
+                page: 2,
+                subPage: 0,
+                iteration: 2,
+            });
+        });
+    });
+});
+//# sourceMappingURL=page-tag.spec.js.map

package/lib/src/use-lunatic/commons/page-tag.spec.js.map ADDED Viewed

@@ -0,0 +1 @@

+ {"version":3,"file":"page-tag.spec.js","sourceRoot":"","sources":["../../../../src/use-lunatic/commons/page-tag.spec.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC9C,OAAO,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAC;AAEjD,QAAQ,CAAC,UAAU,EAAE,GAAG,EAAE;IACzB,QAAQ,CAAC,qBAAqB,EAAE,GAAG,EAAE;QACpC,EAAE,CAAC,2BAA2B,EAAE,GAAG,EAAE;YACpC,MAAM,CAAC,mBAAmB,CAAC,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC;gBACxC,IAAI,EAAE,CAAC;aACP,CAAC,CAAC;QACJ,CAAC,CAAC,CAAC;QACH,EAAE,CAAC,mCAAmC,EAAE,GAAG,EAAE;YAC5C,MAAM,CAAC,mBAAmB,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC;gBAC5C,IAAI,EAAE,CAAC;gBACP,OAAO,EAAE,CAAC;gBACV,SAAS,EAAE,CAAC;aACZ,CAAC,CAAC;QACJ,CAAC,CAAC,CAAC;IACJ,CAAC,CAAC,CAAC;AACJ,CAAC,CAAC,CAAC"}

package/lib/src/use-lunatic/commons/page.d.ts CHANGED Viewed

@@ -1,5 +1,5 @@
 import type { LunaticState } from '../type';
-export declare function getPageId({ subPage, page, }: Pick<LunaticState['pager'], 'page' | 'subPage'>): string;
+export declare function getPageId({ subPage, page, }: Pick<LunaticState['pager'], 'page' | 'subPage'>): string | number;
 /**
  * Converts a page number (3.1.2) to an array of numbers [3, 1, 2]
  */

package/lib/src/use-lunatic/commons/use-components-from-state.d.ts CHANGED Viewed

@@ -1,3 +1,3 @@
 import type { LunaticState } from '../type';
-declare function useComponentsFromState(state: LunaticState): import("./fill-components/fill-components").FilledLunaticComponentProps<"Sequence" | "Subsequence" | "RosterForLoop" | "Loop" | "Table" | "InputNumber" | "Datepicker" | "CheckboxGroup" | "CheckboxBoolean" | "Radio" | "FilterDescription" | "Dropdown" | "PairwiseLinks" | "Roundabout" | "Suggester" | "Input" | "Textarea" | "CheckboxOne" | "Question">[];
+declare function useComponentsFromState(state: LunaticState): import("./fill-components/fill-components").FilledLunaticComponentProps<"Sequence" | "Subsequence" | "RosterForLoop" | "Loop" | "Table" | "InputNumber" | "Datepicker" | "Duration" | "CheckboxGroup" | "CheckboxBoolean" | "Radio" | "FilterDescription" | "Dropdown" | "PairwiseLinks" | "Roundabout" | "Suggester" | "Input" | "Textarea" | "CheckboxOne" | "Question">[];
 export default useComponentsFromState;

package/lib/src/use-lunatic/initial-state.js CHANGED Viewed

@@ -18,8 +18,8 @@ const INITIAL_STATE = {
     resizing: {},
     overview: [],
     pager: {
-        page: '1',
-        maxPage: '1',
+        page: 1,
+        maxPage: 1,
         subPage: undefined,
         nbSubPages: undefined,
         iteration: undefined,

package/lib/src/use-lunatic/initial-state.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"initial-state.js","sourceRoot":"","sources":["../../../src/use-lunatic/initial-state.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,GAAG,EAAE,MAAM,oBAAoB,CAAC;AAEpD,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,EAAE,qBAAqB,EAAE,MAAM,6CAA6C,CAAC;AACpF,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAEzC,MAAM,aAAa,GAAiB;IACnC,SAAS,EAAE,CAAC;IACZ,iDAAiD;IACjD,SAAS,EAAE,SAAS,EAAE,CAAC,CAAC,CAAE,IAAY,CAAC,CAAC,CAAC,IAAI,qBAAqB,EAAE;IACpE,KAAK,EAAE,EAAE;IACT,QAAQ,EAAE,KAAK;IACf,WAAW,EAAE,KAAK;IAClB,UAAU,EAAE,KAAK;IACjB,QAAQ,EAAE,CAAC,GAAG,CAAC;IACf,WAAW,EAAE,CAAC,SAAS,CAAC;IACxB,UAAU,EAAE,SAAS;IACrB,QAAQ,EAAE,EAAE;IACZ,YAAY,EAAE,EAAE;IAChB,QAAQ,EAAE,EAAE;IACZ,QAAQ,EAAE,EAAE;IACZ,KAAK,EAAE;QACN,IAAI,EAAE,~~GAAG~~;~~QACT~~,OAAO,EAAE,~~GAAG~~;~~QACZ~~,OAAO,EAAE,SAAS;QAClB,UAAU,EAAE,SAAS;QACrB,SAAS,EAAE,SAAS;QACpB,gBAAgB,EAAE,SAAS;QAC3B,YAAY,EAAE,SAAS;KACvB;IACD,OAAO,EAAE,KAAK;IACd,8BAA8B;IAC9B,cAAc,EAAE,GAAG,EAAE,GAAE,CAAC;IACxB,iBAAiB,EAAE,CAAC,GAAG,EAAE,GAAE,CAAC,CAAsC;IAClE,YAAY,EAAE,GAAG,EAAE,GAAE,CAAC;IACtB,QAAQ,EAAE,GAAG,EAAE,CAAC,SAAS;IACzB,UAAU,EAAE,GAAG,EAAE,GAAE,CAAC;IACpB,cAAc,EAAE,GAAG,EAAE,GAAE,CAAC;IACxB,cAAc,EAAE,KAAK;IACrB,kBAAkB,EAAE,CAAC,IAAY,EAAE,EAAE,CAAC,CAAC;QACtC,MAAM,EAAE,eAAe,CAAC,MAAM;QAC9B,SAAS,EAAE,CAAC;KACZ,CAAC;IACF,eAAe,EAAE,SAAS;CAC1B,CAAC;AAEF,eAAe,aAAa,CAAC"}
1	+ {"version":3,"file":"initial-state.js","sourceRoot":"","sources":["../../../src/use-lunatic/initial-state.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,GAAG,EAAE,MAAM,oBAAoB,CAAC;AAEpD,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,EAAE,qBAAqB,EAAE,MAAM,6CAA6C,CAAC;AACpF,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAEzC,MAAM,aAAa,GAAiB;IACnC,SAAS,EAAE,CAAC;IACZ,iDAAiD;IACjD,SAAS,EAAE,SAAS,EAAE,CAAC,CAAC,CAAE,IAAY,CAAC,CAAC,CAAC,IAAI,qBAAqB,EAAE;IACpE,KAAK,EAAE,EAAE;IACT,QAAQ,EAAE,KAAK;IACf,WAAW,EAAE,KAAK;IAClB,UAAU,EAAE,KAAK;IACjB,QAAQ,EAAE,CAAC,GAAG,CAAC;IACf,WAAW,EAAE,CAAC,SAAS,CAAC;IACxB,UAAU,EAAE,SAAS;IACrB,QAAQ,EAAE,EAAE;IACZ,YAAY,EAAE,EAAE;IAChB,QAAQ,EAAE,EAAE;IACZ,QAAQ,EAAE,EAAE;IACZ,KAAK,EAAE;QACN,IAAI,EAAE,CAAC;QACP,OAAO,EAAE,CAAC;QACV,OAAO,EAAE,SAAS;QAClB,UAAU,EAAE,SAAS;QACrB,SAAS,EAAE,SAAS;QACpB,gBAAgB,EAAE,SAAS;QAC3B,YAAY,EAAE,SAAS;KACvB;IACD,OAAO,EAAE,KAAK;IACd,8BAA8B;IAC9B,cAAc,EAAE,GAAG,EAAE,GAAE,CAAC;IACxB,iBAAiB,EAAE,CAAC,GAAG,EAAE,GAAE,CAAC,CAAsC;IAClE,YAAY,EAAE,GAAG,EAAE,GAAE,CAAC;IACtB,QAAQ,EAAE,GAAG,EAAE,CAAC,SAAS;IACzB,UAAU,EAAE,GAAG,EAAE,GAAE,CAAC;IACpB,cAAc,EAAE,GAAG,EAAE,GAAE,CAAC;IACxB,cAAc,EAAE,KAAK;IACrB,kBAAkB,EAAE,CAAC,IAAY,EAAE,EAAE,CAAC,CAAC;QACtC,MAAM,EAAE,eAAe,CAAC,MAAM;QAC9B,SAAS,EAAE,CAAC;KACZ,CAAC;IACF,eAAe,EAAE,SAAS;CAC1B,CAAC;AAEF,eAAe,aAAa,CAAC"}

package/lib/src/use-lunatic/reducer/commons/auto-explore-loop.js CHANGED Viewed

@@ -13,7 +13,7 @@ export function autoExploreLoop(state, direction = 'forward') {
     const goInsideSubpage = (subPages, nbIteration) => {
         const maxSubPage = subPages.length;
         const firstSubPage = pageStringToNumbers(subPages[isForward ? 0 : maxSubPage - 1]);
-        newPager.page = firstSubPage[0].toString();
+        newPager.page = firstSubPage[0];
         newPager.subPage = firstSubPage[1] - 1; // Subpage starts at 0
         newPager.nbSubPages = maxSubPage;
         newPager.nbIterations = nbIteration;

package/lib/src/use-lunatic/reducer/commons/auto-explore-loop.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"auto-explore-loop.js","sourceRoot":"","sources":["../../../../../src/use-lunatic/reducer/commons/auto-explore-loop.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAEpE;;GAEG;AACH,MAAM,UAAU,eAAe,CAC9B,KAAmB,EACnB,YAAoC,SAAS;IAE7C,MAAM,QAAQ,GAAG;QAChB,GAAG,KAAK,CAAC,KAAK;KACd,CAAC;IACF,MAAM,MAAM,GAAG,SAAS,CAAC,QAAQ,CAAC,CAAC;IACnC,IAAI,IAAI,GAAG,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IAC/B,IAAI,eAAe,GAAG,KAAK,CAAC;IAC5B,MAAM,SAAS,GAAG,SAAS,KAAK,SAAS,CAAC;IAE1C,MAAM,eAAe,GAAG,CAAC,QAAkB,EAAE,WAAmB,EAAE,EAAE;QACnE,MAAM,UAAU,GAAG,QAAQ,CAAC,MAAM,CAAC;QACnC,MAAM,YAAY,GAAG,mBAAmB,CACvC,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,UAAU,GAAG,CAAC,CAAC,CACxC,CAAC;QACF,QAAQ,CAAC,IAAI,GAAG,YAAY,CAAC,CAAC,CAAC,CAAC~~,QAAQ,EAAE,CAAC~~;~~QAC3C~~,QAAQ,CAAC,OAAO,GAAG,YAAY,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,sBAAsB;QAC9D,QAAQ,CAAC,UAAU,GAAG,UAAU,CAAC;QACjC,QAAQ,CAAC,YAAY,GAAG,WAAW,CAAC;QACpC,QAAQ,CAAC,SAAS,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,YAAY,GAAG,CAAC,CAAC;QAC/D,eAAe,GAAG,IAAI,CAAC;IACxB,CAAC,CAAC;IAEF,qBAAqB;IACrB,IAAI,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC9D,eAAe,CACd,IAAI,CAAC,QAAQ,EACb,KAAK,CAAC,iBAAiB,CAAS,IAAI,CAAC,UAAU,CAAC,CAChD,CAAC;IACH,CAAC;IAED,yFAAyF;IACzF,IACC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,aAAa,KAAK,YAAY;QACjD,IAAI,CAAC,QAAQ;QACb,IAAI,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,EACvB,CAAC;QACF,MAAM,YAAY,GAAG,KAAK,CAAC,iBAAiB,CAAS,IAAI,CAAC,UAAU,CAAC,CAAC;QACtE,IAAI,YAAY,KAAK,CAAC,EAAE,CAAC;YACxB,eAAe,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC;QACnC,CAAC;IACF,CAAC;IAED,gDAAgD;IAChD,IAAI,CAAC,eAAe,EAAE,CAAC;QACtB,OAAO,KAAK,CAAC;IACd,CAAC;IAED,OAAO;QACN,GAAG,KAAK;QACR,QAAQ,EAAE,QAAQ,CAAC,YAAY,KAAK,SAAS;QAC7C,KAAK,EAAE,QAAQ;KACf,CAAC;AACH,CAAC"}
1	+ {"version":3,"file":"auto-explore-loop.js","sourceRoot":"","sources":["../../../../../src/use-lunatic/reducer/commons/auto-explore-loop.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAEpE;;GAEG;AACH,MAAM,UAAU,eAAe,CAC9B,KAAmB,EACnB,YAAoC,SAAS;IAE7C,MAAM,QAAQ,GAAG;QAChB,GAAG,KAAK,CAAC,KAAK;KACd,CAAC;IACF,MAAM,MAAM,GAAG,SAAS,CAAC,QAAQ,CAAC,CAAC;IACnC,IAAI,IAAI,GAAG,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IAC/B,IAAI,eAAe,GAAG,KAAK,CAAC;IAC5B,MAAM,SAAS,GAAG,SAAS,KAAK,SAAS,CAAC;IAE1C,MAAM,eAAe,GAAG,CAAC,QAAkB,EAAE,WAAmB,EAAE,EAAE;QACnE,MAAM,UAAU,GAAG,QAAQ,CAAC,MAAM,CAAC;QACnC,MAAM,YAAY,GAAG,mBAAmB,CACvC,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,UAAU,GAAG,CAAC,CAAC,CACxC,CAAC;QACF,QAAQ,CAAC,IAAI,GAAG,YAAY,CAAC,CAAC,CAAC,CAAC;QAChC,QAAQ,CAAC,OAAO,GAAG,YAAY,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,sBAAsB;QAC9D,QAAQ,CAAC,UAAU,GAAG,UAAU,CAAC;QACjC,QAAQ,CAAC,YAAY,GAAG,WAAW,CAAC;QACpC,QAAQ,CAAC,SAAS,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,YAAY,GAAG,CAAC,CAAC;QAC/D,eAAe,GAAG,IAAI,CAAC;IACxB,CAAC,CAAC;IAEF,qBAAqB;IACrB,IAAI,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC9D,eAAe,CACd,IAAI,CAAC,QAAQ,EACb,KAAK,CAAC,iBAAiB,CAAS,IAAI,CAAC,UAAU,CAAC,CAChD,CAAC;IACH,CAAC;IAED,yFAAyF;IACzF,IACC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,aAAa,KAAK,YAAY;QACjD,IAAI,CAAC,QAAQ;QACb,IAAI,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,EACvB,CAAC;QACF,MAAM,YAAY,GAAG,KAAK,CAAC,iBAAiB,CAAS,IAAI,CAAC,UAAU,CAAC,CAAC;QACtE,IAAI,YAAY,KAAK,CAAC,EAAE,CAAC;YACxB,eAAe,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC;QACnC,CAAC;IACF,CAAC;IAED,gDAAgD;IAChD,IAAI,CAAC,eAAe,EAAE,CAAC;QACtB,OAAO,KAAK,CAAC;IACd,CAAC;IAED,OAAO;QACN,GAAG,KAAK;QACR,QAAQ,EAAE,QAAQ,CAAC,YAAY,KAAK,SAAS;QAC7C,KAAK,EAAE,QAAQ;KACf,CAAC;AACH,CAAC"}

package/lib/src/use-lunatic/reducer/overview/overview-on-change.js CHANGED Viewed

@@ -1,4 +1,4 @@
-const isPageReached = (page, lastReachedPage) => parseInt(page, 10) <= parseInt(lastReachedPage, 10);
+const isPageReached = (page, lastReachedPage) => page.toString() <= lastReachedPage;
 export const overviewOnChange = (state) => {
     // The breadcrumb was not initialized, do nothing
     if (state.overview.length === 0) {
@@ -7,7 +7,7 @@ export const overviewOnChange = (state) => {
     const { overview, pager: { page, lastReachedPage }, executeExpression, } = state;
     const updatedOverview = overview.map((overviewEntry) => {
         // page avant la page courante : pas de changement de state possible
-        if (parseInt(overviewEntry.page, 10) < parseInt(page, 10)) {
+        if (parseInt(overviewEntry.page, 10) < page) {
             if (!overviewEntry.reached) {
                 return {
                     ...overviewEntry,

package/lib/src/use-lunatic/reducer/overview/overview-on-change.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"overview-on-change.js","sourceRoot":"","sources":["../../../../../src/use-lunatic/reducer/overview/overview-on-change.ts"],"names":[],"mappings":"AAEA,MAAM,aAAa,GAAG,CAAC,IAAY,EAAE,~~eAAuB~~,EAAE,EAAE,~~CAC/D~~,~~QAAQ~~,CAAC,~~IAAI~~,EAAE,~~EAAE,CAAC,~~IAAI,~~QAAQ,CAAC,~~eAAe,~~EAAE,EAAE,~~CAAC~~,CAAC~~;~~AAErD~~,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,KAAmB,EAAgB,EAAE;IACrE,iDAAiD;IACjD,IAAI,KAAK,CAAC,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACjC,OAAO,KAAK,CAAC;IACd,CAAC;IAED,MAAM,EACL,QAAQ,EACR,KAAK,EAAE,EAAE,IAAI,EAAE,eAAe,EAAE,EAChC,iBAAiB,GACjB,GAAG,KAAK,CAAC;IAEV,MAAM,eAAe,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,aAAa,EAAE,EAAE;QACtD,oEAAoE;QACpE,IAAI,QAAQ,CAAC,aAAa,CAAC,IAAI,EAAE,EAAE,CAAC,GAAG,~~QAAQ,CAAC,~~IAAI,EAAE,~~EAAE,~~CAAC~~,EAAE,CAAC~~;~~YAC3D~~,IAAI,CAAC,aAAa,CAAC,OAAO,EAAE,CAAC;gBAC5B,OAAO;oBACN,GAAG,aAAa;oBAChB,OAAO,EAAE,aAAa,CAAC,aAAa,CAAC,IAAI,EAAE,eAAe,IAAI,GAAG,CAAC;iBAClE,CAAC;YACH,CAAC;YACD,OAAO,aAAa,CAAC;QACtB,CAAC;QACD,OAAO;YACN,GAAG,aAAa;YAChB,OAAO,EAAE,aAAa,CAAC,aAAa,CAAC,IAAI,EAAE,eAAe,IAAI,GAAG,CAAC;YAClE,OAAO,EACN,iBAAiB,CAAC,aAAa,CAAC,eAAe,EAAE;gBAChD,IAAI,EAAE,aAAa,CAAC,eAAe,EAAE,mBAAmB;aACxD,CAAC,IAAI,KAAK;YACZ,cAAc,EAAE,iBAAiB,CAAC,aAAa,CAAC,KAAK,CAAC;SACtD,CAAC;IACH,CAAC,CAAoC,CAAC;IACtC,OAAO,EAAE,GAAG,KAAK,EAAE,QAAQ,EAAE,eAAe,EAAE,CAAC;AAChD,CAAC,CAAC"}
1	+ {"version":3,"file":"overview-on-change.js","sourceRoot":"","sources":["../../../../../src/use-lunatic/reducer/overview/overview-on-change.ts"],"names":[],"mappings":"AAEA,MAAM,aAAa,GAAG,CAAC,IAAY,EAAE,eAAwB,EAAE,EAAE,CAChE,IAAI,CAAC,QAAQ,EAAE,IAAI,eAAe,CAAC;AAEpC,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,KAAmB,EAAgB,EAAE;IACrE,iDAAiD;IACjD,IAAI,KAAK,CAAC,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACjC,OAAO,KAAK,CAAC;IACd,CAAC;IAED,MAAM,EACL,QAAQ,EACR,KAAK,EAAE,EAAE,IAAI,EAAE,eAAe,EAAE,EAChC,iBAAiB,GACjB,GAAG,KAAK,CAAC;IAEV,MAAM,eAAe,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,aAAa,EAAE,EAAE;QACtD,oEAAoE;QACpE,IAAI,QAAQ,CAAC,aAAa,CAAC,IAAI,EAAE,EAAE,CAAC,GAAG,IAAI,EAAE,CAAC;YAC7C,IAAI,CAAC,aAAa,CAAC,OAAO,EAAE,CAAC;gBAC5B,OAAO;oBACN,GAAG,aAAa;oBAChB,OAAO,EAAE,aAAa,CAAC,aAAa,CAAC,IAAI,EAAE,eAAe,IAAI,GAAG,CAAC;iBAClE,CAAC;YACH,CAAC;YACD,OAAO,aAAa,CAAC;QACtB,CAAC;QACD,OAAO;YACN,GAAG,aAAa;YAChB,OAAO,EAAE,aAAa,CAAC,aAAa,CAAC,IAAI,EAAE,eAAe,IAAI,GAAG,CAAC;YAClE,OAAO,EACN,iBAAiB,CAAC,aAAa,CAAC,eAAe,EAAE;gBAChD,IAAI,EAAE,aAAa,CAAC,eAAe,EAAE,mBAAmB;aACxD,CAAC,IAAI,KAAK;YACZ,cAAc,EAAE,iBAAiB,CAAC,aAAa,CAAC,KAAK,CAAC;SACtD,CAAC;IACH,CAAC,CAAoC,CAAC;IACtC,OAAO,EAAE,GAAG,KAAK,EAAE,QAAQ,EAAE,eAAe,EAAE,CAAC;AAChD,CAAC,CAAC"}

package/lib/src/use-lunatic/reducer/overview/overview-on-init.d.ts CHANGED Viewed

@@ -55,10 +55,10 @@ export declare function reduceOverviewOnInit(state: LunaticState, action: Action
         };
     };
     pager: {
-        lastReachedPage?: string | undefined;
-        maxPage: string;
+        lastReachedPage?: import("../../type").PageTag | undefined;
+        maxPage: number;
         nbSubPages?: number | undefined;
-        page: string;
+        page: number;
         subPage?: number | undefined;
         iteration?: number | undefined;
         nbIterations?: number | undefined;
@@ -92,7 +92,7 @@ export declare function reduceOverviewOnInit(state: LunaticState, action: Action
     shortcut?: boolean | undefined;
     management?: boolean | undefined;
     goToPage: (page: {
-        page: string;
+        page: number | import("../../type").PageTag;
         iteration?: number | undefined;
         nbIterations?: number | undefined;
         subPage?: number | undefined;

package/lib/src/use-lunatic/reducer/overview/overview-on-init.js CHANGED Viewed

@@ -4,7 +4,7 @@ const isSequence = (sourceComponent) => sourceComponent.components.length > 0 &&
 const isSequenceSamePage = (sourceComponent, page) => sourceComponent.components[0].hierarchy?.sequence.page === page;
 const isSubsequenceSamePage = (sourceComponent, page) => sourceComponent.components[0].hierarchy?.subSequence !== undefined &&
     sourceComponent.components[0].hierarchy?.subSequence.page === page;
-const isPageReached = (page, lastReachedPage) => parseInt(page, 10) <= parseInt(lastReachedPage, 10);
+const isPageReached = (page, lastReachedPage) => page <= lastReachedPage;
 function getOverview(state) {
     const { pages, executeExpression, pager } = state;
     // prevent misordered pages by extracting forbidden pages

package/lib/src/use-lunatic/reducer/overview/overview-on-init.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"overview-on-init.js","sourceRoot":"","sources":["../../../../../src/use-lunatic/reducer/overview/overview-on-init.ts"],"names":[],"mappings":"AAKA,OAAO,EAAmB,MAAM,eAAe,CAAC;AAIhD,MAAM,UAAU,GAAG,CAAC,eAAqB,EAAE,EAAE,CAC5C,eAAe,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC;IACrC,WAAW,IAAI,eAAe,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;AAE9C,MAAM,kBAAkB,GAAG,CAAC,eAAqB,EAAE,IAAY,EAAE,EAAE,CAClE,eAAe,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,SAAS,EAAE,QAAQ,CAAC,IAAI,KAAK,IAAI,CAAC;AAEjE,MAAM,qBAAqB,GAAG,CAAC,eAAqB,EAAE,IAAY,EAAE,EAAE,CACrE,eAAe,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,SAAS,EAAE,WAAW,KAAK,SAAS;IAClE,eAAe,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,SAAS,EAAE,WAAW,CAAC,IAAI,KAAK,IAAI,CAAC;AAEpE,MAAM,aAAa,GAAG,CAAC,IAAY,EAAE,eAAuB,EAAE,EAAE,CAC/D,~~QAAQ,CAAC,~~IAAI,~~EAAE,EAAE,CAAC,~~IAAI,~~QAAQ,CAAC,~~eAAe,~~EAAE,EAAE,~~CAAC~~,CAAC~~;~~AAErD~~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"}
1	+ {"version":3,"file":"overview-on-init.js","sourceRoot":"","sources":["../../../../../src/use-lunatic/reducer/overview/overview-on-init.ts"],"names":[],"mappings":"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"}