@inseefr/lunatic 3.7.2-rc.0 → 3.7.2
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.
- package/esm/type.source.d.ts +1 -0
- package/esm/use-lunatic/hooks/use-loop-variables.d.ts +2 -2
- package/esm/use-lunatic/hooks/use-loop-variables.js +4 -4
- package/esm/use-lunatic/hooks/use-loop-variables.js.map +1 -1
- package/esm/use-lunatic/type.d.ts +2 -0
- package/esm/use-lunatic/use-lunatic.js +1 -0
- package/esm/use-lunatic/use-lunatic.js.map +1 -1
- package/package.json +1 -1
- package/src/stories/roundabout/source.json +1 -0
- package/src/type.source.ts +1 -0
- package/src/use-lunatic/hooks/use-loop-variables.ts +10 -5
- package/src/use-lunatic/type.ts +2 -0
- package/src/use-lunatic/use-lunatic.test.ts +119 -0
- package/src/use-lunatic/use-lunatic.ts +5 -0
- package/tsconfig.build.tsbuildinfo +1 -1
- package/type.source.d.ts +1 -0
- package/use-lunatic/hooks/use-loop-variables.d.ts +2 -2
- package/use-lunatic/hooks/use-loop-variables.js +4 -4
- package/use-lunatic/hooks/use-loop-variables.js.map +1 -1
- package/use-lunatic/type.d.ts +2 -0
- package/use-lunatic/use-lunatic.js +1 -0
- package/use-lunatic/use-lunatic.js.map +1 -1
package/type.source.d.ts
CHANGED
|
@@ -22,6 +22,7 @@ export type ComponentSequenceDefinition = ComponentDefinitionBase & {
|
|
|
22
22
|
};
|
|
23
23
|
export type ComponentRoundaboutDefinition = ComponentDefinitionBase & {
|
|
24
24
|
componentType: 'Roundabout';
|
|
25
|
+
loopDependencies?: string[];
|
|
25
26
|
iterations: VTLScalarExpression;
|
|
26
27
|
locked: boolean;
|
|
27
28
|
progressVariable: string;
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import type { LunaticReducerState } from '../type';
|
|
2
2
|
/**
|
|
3
|
-
* Extract the list of variables used for the current loop.
|
|
3
|
+
* Extract the list of variables used for the current loop or roundabout.
|
|
4
4
|
*/
|
|
5
|
-
export declare function useLoopVariables(pager: LunaticReducerState['pager'], pages: LunaticReducerState['pages']): string[];
|
|
5
|
+
export declare function useLoopVariables(pager: LunaticReducerState['pager'], pages: LunaticReducerState['pages'], loopType?: 'Loop' | 'Roundabout'): string[];
|
|
@@ -3,9 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.useLoopVariables = useLoopVariables;
|
|
4
4
|
const react_1 = require("react");
|
|
5
5
|
/**
|
|
6
|
-
* Extract the list of variables used for the current loop.
|
|
6
|
+
* Extract the list of variables used for the current loop or roundabout.
|
|
7
7
|
*/
|
|
8
|
-
function useLoopVariables(pager, pages) {
|
|
8
|
+
function useLoopVariables(pager, pages, loopType = 'Loop') {
|
|
9
9
|
const { iteration, page } = pager;
|
|
10
10
|
const inIteration = iteration !== undefined;
|
|
11
11
|
return (0, react_1.useMemo)(() => {
|
|
@@ -13,8 +13,8 @@ function useLoopVariables(pager, pages) {
|
|
|
13
13
|
return [];
|
|
14
14
|
}
|
|
15
15
|
// Find the loop to extract the dependencies
|
|
16
|
-
const loop = pages[page]?.components.find((c) => c.componentType ===
|
|
16
|
+
const loop = pages[page]?.components.find((c) => c.componentType === loopType);
|
|
17
17
|
return loop?.loopDependencies ?? [];
|
|
18
|
-
}, [
|
|
18
|
+
}, [inIteration, pages, page, loopType]);
|
|
19
19
|
}
|
|
20
20
|
//# sourceMappingURL=use-loop-variables.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"use-loop-variables.js","sourceRoot":"","sources":["../../src/use-lunatic/hooks/use-loop-variables.ts"],"names":[],"mappings":";;AAMA,
|
|
1
|
+
{"version":3,"file":"use-loop-variables.js","sourceRoot":"","sources":["../../src/use-lunatic/hooks/use-loop-variables.ts"],"names":[],"mappings":";;AAMA,4CAqBC;AA1BD,iCAAgC;AAEhC;;GAEG;AACH,SAAgB,gBAAgB,CAC/B,KAAmC,EACnC,KAAmC,EACnC,WAAkC,MAAM;IAExC,MAAM,EAAE,SAAS,EAAE,IAAI,EAAE,GAAG,KAAK,CAAC;IAClC,MAAM,WAAW,GAAG,SAAS,KAAK,SAAS,CAAC;IAC5C,OAAO,IAAA,eAAO,EAAC,GAAG,EAAE;QACnB,IAAI,CAAC,WAAW,EAAE,CAAC;YAClB,OAAO,EAAE,CAAC;QACX,CAAC;QACD,4CAA4C;QAC5C,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC,EAAE,UAAU,CAAC,IAAI,CACxC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,aAAa,KAAK,QAAQ,CAIxB,CAAC;QAEb,OAAO,IAAI,EAAE,gBAAgB,IAAI,EAAE,CAAC;IACrC,CAAC,EAAE,CAAC,WAAW,EAAE,KAAK,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC;AAC1C,CAAC"}
|
package/use-lunatic/type.d.ts
CHANGED
|
@@ -226,6 +226,8 @@ export type LunaticState = {
|
|
|
226
226
|
isInLoop: boolean;
|
|
227
227
|
/** Current loop's variables. */
|
|
228
228
|
loopVariables: string[];
|
|
229
|
+
/** Current roundabout loop's variables. */
|
|
230
|
+
roundaboutLoopVariables: string[];
|
|
229
231
|
/** Whether or not we're on the survey first page. */
|
|
230
232
|
isFirstPage: boolean;
|
|
231
233
|
/** Whether or not we're on the survey last page (we reached `maxPage`). */
|
|
@@ -152,6 +152,7 @@ argOptions = empty) {
|
|
|
152
152
|
isInLoop: state.isInLoop,
|
|
153
153
|
overview: (0, useOverview_1.useOverview)(state, [pageTag]),
|
|
154
154
|
loopVariables: (0, use_loop_variables_1.useLoopVariables)(state.pager, state.pages),
|
|
155
|
+
roundaboutLoopVariables: (0, use_loop_variables_1.useLoopVariables)(state.pager, state.pages, 'Roundabout'),
|
|
155
156
|
// Methods
|
|
156
157
|
getComponents,
|
|
157
158
|
goPreviousPage,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"use-lunatic.js","sourceRoot":"","sources":["../src/use-lunatic/use-lunatic.ts"],"names":[],"mappings":";;;;;AAyEA,
|
|
1
|
+
{"version":3,"file":"use-lunatic.js","sourceRoot":"","sources":["../src/use-lunatic/use-lunatic.ts"],"names":[],"mappings":"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"}
|