@inseefr/lunatic 3.13.5-rc.4 → 3.13.6-rc-fix-multimode.1
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/components/shared/MDLabel/MDLabel.js +2 -1
- package/components/shared/MDLabel/MDLabel.js.map +1 -1
- package/esm/components/shared/MDLabel/MDLabel.js +2 -1
- package/esm/components/shared/MDLabel/MDLabel.js.map +1 -1
- package/esm/hooks/useMultimode.js +21 -10
- package/esm/hooks/useMultimode.js.map +1 -1
- package/esm/utils/getArticulationState.js +7 -6
- package/esm/utils/getArticulationState.js.map +1 -1
- package/hooks/useMultimode.js +20 -8
- package/hooks/useMultimode.js.map +1 -1
- package/package.json +2 -2
- package/src/components/shared/MDLabel/MDLabel.tsx +2 -2
- package/src/hooks/useMultimode.ts +27 -13
- package/src/utils/getArticulationState.ts +10 -8
- package/tsconfig.build.tsbuildinfo +1 -1
- package/utils/getArticulationState.js +7 -6
- package/utils/getArticulationState.js.map +1 -1
|
@@ -5,6 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.MDLabel = MDLabel;
|
|
7
7
|
const jsx_runtime_1 = require("react/jsx-runtime");
|
|
8
|
+
const react_1 = require("react");
|
|
8
9
|
const react_markdown_1 = __importDefault(require("react-markdown"));
|
|
9
10
|
const MarkdownLink_1 = require("./MarkdownLink");
|
|
10
11
|
const remark_breaks_1 = __importDefault(require("remark-breaks"));
|
|
@@ -12,7 +13,7 @@ const remark_emoji_1 = __importDefault(require("remark-emoji"));
|
|
|
12
13
|
function MDLabel({ expression, MarkdownLinkOverride }) {
|
|
13
14
|
const hasParagraphs = /\n\n/.test(expression);
|
|
14
15
|
const components = {
|
|
15
|
-
p: hasParagraphs ? 'p' :
|
|
16
|
+
p: hasParagraphs ? 'p' : react_1.Fragment,
|
|
16
17
|
br: 'br',
|
|
17
18
|
a: (props) => ((0, jsx_runtime_1.jsx)(MarkdownA, { ...props, MarkdownLinkComponent: MarkdownLinkOverride ?? MarkdownLink_1.MarkdownLink })),
|
|
18
19
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MDLabel.js","sourceRoot":"","sources":["../../../src/components/shared/MDLabel/MDLabel.tsx"],"names":[],"mappings":";;;;;AAWA,0BAoBC;;
|
|
1
|
+
{"version":3,"file":"MDLabel.js","sourceRoot":"","sources":["../../../src/components/shared/MDLabel/MDLabel.tsx"],"names":[],"mappings":";;;;;AAWA,0BAoBC;;AA/BD,iCAAyD;AACzD,oEAA2D;AAC3D,iDAA8C;AAC9C,kEAAyC;AACzC,gEAAiC;AAOjC,SAAgB,OAAO,CAAC,EAAE,UAAU,EAAE,oBAAoB,EAAS;IAClE,MAAM,aAAa,GAAG,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IAC9C,MAAM,UAAU,GAAG;QAClB,CAAC,EAAE,aAAa,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,gBAAQ;QACjC,EAAE,EAAE,IAAI;QACR,CAAC,EAAE,CAAC,KAAqB,EAAE,EAAE,CAAC,CAC7B,uBAAC,SAAS,OACL,KAAK,EACT,qBAAqB,EAAE,oBAAoB,IAAI,2BAAY,GAC1D,CACF;KACsB,CAAC;IACzB,OAAO,CACN,uBAAC,wBAAQ,IACR,UAAU,EAAE,UAAU,EACtB,aAAa,EAAE,CAAC,CAAC,sBAAK,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC,EAAE,uBAAY,CAAC,YAE3D,UAAU,GACD,CACX,CAAC;AACH,CAAC;AAQD,MAAM,SAAS,GAAG,CAAC,EAClB,KAAK,EACL,IAAI,EACJ,QAAQ,EACR,qBAAqB,GAKpB,EAAE,EAAE;IACL,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,CAAC,uBAAC,OAAO,IAAC,UAAU,EAAE,KAAK,GAAI,CAAC,CAAC,CAAC,IAAI,CAAC;IAC9D,OAAO,CACN,uBAAC,qBAAqB,IAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,YACjD,QAAQ,GACc,CACxB,CAAC;AACH,CAAC,CAAC"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { jsx as _jsx } from "react/jsx-runtime";
|
|
2
|
+
import { Fragment } from 'react';
|
|
2
3
|
import Markdown from 'react-markdown';
|
|
3
4
|
import { MarkdownLink } from './MarkdownLink';
|
|
4
5
|
import remarkBreaks from 'remark-breaks';
|
|
@@ -6,7 +7,7 @@ import emoji from 'remark-emoji';
|
|
|
6
7
|
export function MDLabel({ expression, MarkdownLinkOverride }) {
|
|
7
8
|
const hasParagraphs = /\n\n/.test(expression);
|
|
8
9
|
const components = {
|
|
9
|
-
p: hasParagraphs ? 'p' :
|
|
10
|
+
p: hasParagraphs ? 'p' : Fragment,
|
|
10
11
|
br: 'br',
|
|
11
12
|
a: (props) => (_jsx(MarkdownA, { ...props, MarkdownLinkComponent: MarkdownLinkOverride !== null && MarkdownLinkOverride !== void 0 ? MarkdownLinkOverride : MarkdownLink })),
|
|
12
13
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MDLabel.js","sourceRoot":"","sources":["../../../../src/components/shared/MDLabel/MDLabel.tsx"],"names":[],"mappings":";
|
|
1
|
+
{"version":3,"file":"MDLabel.js","sourceRoot":"","sources":["../../../../src/components/shared/MDLabel/MDLabel.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,QAAQ,EAA0B,MAAM,OAAO,CAAC;AACzD,OAAO,QAA6B,MAAM,gBAAgB,CAAC;AAC3D,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,YAAY,MAAM,eAAe,CAAC;AACzC,OAAO,KAAK,MAAM,cAAc,CAAC;AAOjC,MAAM,UAAU,OAAO,CAAC,EAAE,UAAU,EAAE,oBAAoB,EAAS;IAClE,MAAM,aAAa,GAAG,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IAC9C,MAAM,UAAU,GAAG;QAClB,CAAC,EAAE,aAAa,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,QAAQ;QACjC,EAAE,EAAE,IAAI;QACR,CAAC,EAAE,CAAC,KAAqB,EAAE,EAAE,CAAC,CAC7B,KAAC,SAAS,OACL,KAAK,EACT,qBAAqB,EAAE,oBAAoB,aAApB,oBAAoB,cAApB,oBAAoB,GAAI,YAAY,GAC1D,CACF;KACsB,CAAC;IACzB,OAAO,CACN,KAAC,QAAQ,IACR,UAAU,EAAE,UAAU,EACtB,aAAa,EAAE,CAAC,CAAC,KAAK,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC,EAAE,YAAY,CAAC,YAE3D,UAAU,GACD,CACX,CAAC;AACH,CAAC;AAQD,MAAM,SAAS,GAAG,CAAC,EAClB,KAAK,EACL,IAAI,EACJ,QAAQ,EACR,qBAAqB,GAKpB,EAAE,EAAE;IACL,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,CAAC,KAAC,OAAO,IAAC,UAAU,EAAE,KAAK,GAAI,CAAC,CAAC,CAAC,IAAI,CAAC;IAC9D,OAAO,CACN,KAAC,qBAAqB,IAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,YACjD,QAAQ,GACc,CACxB,CAAC;AACH,CAAC,CAAC"}
|
|
@@ -45,26 +45,37 @@ import { forceInt } from '../utils/number';
|
|
|
45
45
|
*/
|
|
46
46
|
export function useMultimode(source, store) {
|
|
47
47
|
const getMultimode = useCallback(() => {
|
|
48
|
-
var _a;
|
|
48
|
+
var _a, _b, _c, _d, _e, _f;
|
|
49
49
|
if (!source.multimode) {
|
|
50
50
|
return {};
|
|
51
51
|
}
|
|
52
|
-
|
|
52
|
+
// Initialize rules to empty objects if they do not exist
|
|
53
|
+
const questionnaireRules = ((_a = source.multimode.questionnaire) === null || _a === void 0 ? void 0 : _a.rules) || {};
|
|
54
|
+
const leafRules = ((_b = source.multimode.leaf) === null || _b === void 0 ? void 0 : _b.rules) || {};
|
|
55
|
+
// If neither has rules, return an empty object
|
|
56
|
+
if (Object.keys(questionnaireRules).length === 0 && Object.keys(leafRules).length === 0) {
|
|
57
|
+
return {};
|
|
58
|
+
}
|
|
59
|
+
// Get unique rule keys
|
|
53
60
|
const keys = new Set([
|
|
54
|
-
...Object.keys(
|
|
55
|
-
...Object.keys(
|
|
61
|
+
...Object.keys(questionnaireRules),
|
|
62
|
+
...Object.keys(leafRules),
|
|
56
63
|
]);
|
|
57
|
-
|
|
64
|
+
// Handle the case where leaf.source exists to retrieve iterations
|
|
65
|
+
let iterations = 0;
|
|
66
|
+
if ((_c = source.multimode.leaf) === null || _c === void 0 ? void 0 : _c.source) {
|
|
67
|
+
const roundabout = findComponentById(source.components, source.multimode.leaf.source);
|
|
68
|
+
iterations = forceInt((_f = store.run((_e = (_d = roundabout === null || roundabout === void 0 ? void 0 : roundabout.iterations) === null || _d === void 0 ? void 0 : _d.value) !== null && _e !== void 0 ? _e : '')) !== null && _f !== void 0 ? _f : 0);
|
|
69
|
+
}
|
|
58
70
|
return Object.fromEntries(Array.from(keys).map((key) => {
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
const questionnaireExpression = (_a = source.multimode) === null || _a === void 0 ? void 0 : _a.questionnaire.rules[key];
|
|
71
|
+
// Check the rule at the questionnaire level
|
|
72
|
+
const questionnaireExpression = questionnaireRules[key];
|
|
62
73
|
if (questionnaireExpression &&
|
|
63
74
|
store.run(questionnaireExpression.value)) {
|
|
64
75
|
return [key, true];
|
|
65
76
|
}
|
|
66
|
-
|
|
67
|
-
|
|
77
|
+
// Check the rule at the leaf level
|
|
78
|
+
const leafExpression = leafRules[key];
|
|
68
79
|
if (!leafExpression) {
|
|
69
80
|
return [key, false];
|
|
70
81
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useMultimode.js","sourceRoot":"","sources":["../../src/hooks/useMultimode.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,OAAO,CAAC;AACpC,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAClE,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAE3C;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAyCG;AACH,MAAM,UAAU,YAAY,CAC3B,MAAqB,EACrB,KAA4B;IAE5B,MAAM,YAAY,GAAG,WAAW,CAAC,GAAG,EAAE;;QACrC,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE,CAAC;YACvB,OAAO,EAAE,CAAC;QACX,CAAC;QAED,MAAM,
|
|
1
|
+
{"version":3,"file":"useMultimode.js","sourceRoot":"","sources":["../../src/hooks/useMultimode.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,6 +2,7 @@ import { reducerInitializer } from '../use-lunatic/reducer/reducerInitializer';
|
|
|
2
2
|
import { times } from './array';
|
|
3
3
|
import { forceInt } from './number';
|
|
4
4
|
import { isRoundaboutComponent } from '../use-lunatic/commons/component';
|
|
5
|
+
import { castNumber } from './cast';
|
|
5
6
|
export var ArticulationState;
|
|
6
7
|
(function (ArticulationState) {
|
|
7
8
|
ArticulationState[ArticulationState["COMPLETED"] = 1] = "COMPLETED";
|
|
@@ -42,17 +43,17 @@ export var ArticulationState;
|
|
|
42
43
|
export function getArticulationState(source, data) {
|
|
43
44
|
var _a;
|
|
44
45
|
const roundabout = findComponentById(source.components, source.articulation.source);
|
|
45
|
-
const { variables } = reducerInitializer({ source, data });
|
|
46
|
-
const iterations = forceInt(variables.run((_a = roundabout === null || roundabout === void 0 ? void 0 : roundabout.iterations.value) !== null && _a !== void 0 ? _a : '0'));
|
|
47
|
-
const rows = times(iterations, (k) => source.articulation.items.map((item) => ({
|
|
48
|
-
label: item.label,
|
|
49
|
-
value: variables.run(item.value, { iteration: [k] }),
|
|
50
|
-
})));
|
|
51
46
|
if (!roundabout) {
|
|
52
47
|
return {
|
|
53
48
|
items: [],
|
|
54
49
|
};
|
|
55
50
|
}
|
|
51
|
+
const { variables } = reducerInitializer({ source, data });
|
|
52
|
+
const iterations = castNumber(variables.run((_a = roundabout.iterations.value) !== null && _a !== void 0 ? _a : '0'));
|
|
53
|
+
const rows = times(iterations, (k) => source.articulation.items.map((item) => ({
|
|
54
|
+
label: item.label,
|
|
55
|
+
value: variables.run(item.value, { iteration: [k] }),
|
|
56
|
+
})));
|
|
56
57
|
return {
|
|
57
58
|
items: rows.map((row, k) => {
|
|
58
59
|
var _a;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getArticulationState.js","sourceRoot":"","sources":["../../src/utils/getArticulationState.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,kBAAkB,EAAE,MAAM,2CAA2C,CAAC;AAE/E,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAChC,OAAO,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AACpC,OAAO,EAAE,qBAAqB,EAAE,MAAM,kCAAkC,CAAC;
|
|
1
|
+
{"version":3,"file":"getArticulationState.js","sourceRoot":"","sources":["../../src/utils/getArticulationState.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,kBAAkB,EAAE,MAAM,2CAA2C,CAAC;AAE/E,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAChC,OAAO,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AACpC,OAAO,EAAE,qBAAqB,EAAE,MAAM,kCAAkC,CAAC;AACzE,OAAO,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AAEpC,MAAM,CAAN,IAAY,iBAIX;AAJD,WAAY,iBAAiB;IAC5B,mEAAa,CAAA;IACb,+DAAW,CAAA;IACX,wEAAgB,CAAA;AACjB,CAAC,EAJW,iBAAiB,KAAjB,iBAAiB,QAI5B;AAqBD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8BG;AACH,MAAM,UAAU,oBAAoB,CACnC,MAAsD,EACtD,IAAiB;;IAEjB,MAAM,UAAU,GAAG,iBAAiB,CACnC,MAAM,CAAC,UAAU,EACjB,MAAM,CAAC,YAAY,CAAC,MAAM,CAC1B,CAAC;IAEF,IAAI,CAAC,UAAU,EAAE,CAAC;QACjB,OAAO;YACN,KAAK,EAAE,EAAE;SACT,CAAC;IACH,CAAC;IAED,MAAM,EAAE,SAAS,EAAE,GAAG,kBAAkB,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC;IAC3D,MAAM,UAAU,GAAG,UAAU,CAC5B,SAAS,CAAC,GAAG,CAAC,MAAA,UAAU,CAAC,UAAU,CAAC,KAAK,mCAAI,GAAG,CAAC,CACjD,CAAC;IAEF,MAAM,IAAI,GAAG,KAAK,CAAC,UAAU,EAAE,CAAC,CAAC,EAAE,EAAE,CACpC,MAAM,CAAC,YAAY,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;QACxC,KAAK,EAAE,IAAI,CAAC,KAAK;QACjB,KAAK,EAAE,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,EAAE,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC,EAAE,CAAc;KACjE,CAAC,CAAC,CACH,CAAC;IAEF,OAAO;QACN,KAAK,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE;;YAAC,OAAA,CAAC;gBAC5B,KAAK,EAAE,GAAG;gBACV,QAAQ,EAAE,QAAQ,CACjB,MAAA,SAAS,CAAC,GAAG,CAAC,UAAU,CAAC,gBAAgB,EAAE,CAAC,CAAC,CAAC,CAAC,mCAC9C,iBAAiB,CAAC,WAAW,CAC9B;gBACD,IAAI,EAAE,CAAC,UAAU,CAAC,IAAI;oBACrB,CAAC,CAAC,GAAG,UAAU,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,EAAE;oBACjC,CAAC,CAAC,GAAG,CAAY;aAClB,CAAC,CAAA;SAAA,CAAC;KACH,CAAC;AACH,CAAC;AAED,MAAM,UAAU,iBAAiB,CAChC,UAAiC,EACjC,EAAU;IAEV,KAAK,MAAM,CAAC,IAAI,UAAU,EAAE,CAAC;QAC5B,IAAI,IAAI,IAAI,CAAC,IAAI,CAAC,CAAC,EAAE,KAAK,EAAE,IAAI,qBAAqB,CAAC,CAAC,CAAC,EAAE,CAAC;YAC1D,OAAO,CAAC,CAAC;QACV,CAAC;QACD,IAAI,YAAY,IAAI,CAAC,EAAE,CAAC;YACvB,MAAM,KAAK,GAAG,iBAAiB,CAAC,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;YAClD,IAAI,KAAK,EAAE,CAAC;gBACX,OAAO,KAAK,CAAC;YACd,CAAC;QACF,CAAC;IACF,CAAC;IACD,OAAO,IAAI,CAAC;AACb,CAAC"}
|
package/hooks/useMultimode.js
CHANGED
|
@@ -51,21 +51,33 @@ function useMultimode(source, store) {
|
|
|
51
51
|
if (!source.multimode) {
|
|
52
52
|
return {};
|
|
53
53
|
}
|
|
54
|
-
|
|
54
|
+
// Initialize rules to empty objects if they do not exist
|
|
55
|
+
const questionnaireRules = source.multimode.questionnaire?.rules || {};
|
|
56
|
+
const leafRules = source.multimode.leaf?.rules || {};
|
|
57
|
+
// If neither has rules, return an empty object
|
|
58
|
+
if (Object.keys(questionnaireRules).length === 0 && Object.keys(leafRules).length === 0) {
|
|
59
|
+
return {};
|
|
60
|
+
}
|
|
61
|
+
// Get unique rule keys
|
|
55
62
|
const keys = new Set([
|
|
56
|
-
...Object.keys(
|
|
57
|
-
...Object.keys(
|
|
63
|
+
...Object.keys(questionnaireRules),
|
|
64
|
+
...Object.keys(leafRules),
|
|
58
65
|
]);
|
|
59
|
-
|
|
66
|
+
// Handle the case where leaf.source exists to retrieve iterations
|
|
67
|
+
let iterations = 0;
|
|
68
|
+
if (source.multimode.leaf?.source) {
|
|
69
|
+
const roundabout = (0, getArticulationState_1.findComponentById)(source.components, source.multimode.leaf.source);
|
|
70
|
+
iterations = (0, number_1.forceInt)(store.run(roundabout?.iterations?.value ?? '') ?? 0);
|
|
71
|
+
}
|
|
60
72
|
return Object.fromEntries(Array.from(keys).map((key) => {
|
|
61
|
-
// Check the
|
|
62
|
-
const questionnaireExpression =
|
|
73
|
+
// Check the rule at the questionnaire level
|
|
74
|
+
const questionnaireExpression = questionnaireRules[key];
|
|
63
75
|
if (questionnaireExpression &&
|
|
64
76
|
store.run(questionnaireExpression.value)) {
|
|
65
77
|
return [key, true];
|
|
66
78
|
}
|
|
67
|
-
|
|
68
|
-
|
|
79
|
+
// Check the rule at the leaf level
|
|
80
|
+
const leafExpression = leafRules[key];
|
|
69
81
|
if (!leafExpression) {
|
|
70
82
|
return [key, false];
|
|
71
83
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useMultimode.js","sourceRoot":"","sources":["../src/hooks/useMultimode.ts"],"names":[],"mappings":";;AAgDA,
|
|
1
|
+
{"version":3,"file":"useMultimode.js","sourceRoot":"","sources":["../src/hooks/useMultimode.ts"],"names":[],"mappings":";;AAgDA,oCAmEC;AAjHD,iCAAoC;AACpC,wEAAkE;AAClE,4CAA2C;AAE3C;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAyCG;AACH,SAAgB,YAAY,CAC3B,MAAqB,EACrB,KAA4B;IAE5B,MAAM,YAAY,GAAG,IAAA,mBAAW,EAAC,GAAG,EAAE;QACrC,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE,CAAC;YACvB,OAAO,EAAE,CAAC;QACX,CAAC;QAED,yDAAyD;QACzD,MAAM,kBAAkB,GAAG,MAAM,CAAC,SAAS,CAAC,aAAa,EAAE,KAAK,IAAI,EAAE,CAAC;QACvE,MAAM,SAAS,GAAG,MAAM,CAAC,SAAS,CAAC,IAAI,EAAE,KAAK,IAAI,EAAE,CAAC;QAErD,+CAA+C;QAC/C,IAAI,MAAM,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC,MAAM,KAAK,CAAC,IAAI,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACzF,OAAO,EAAE,CAAC;QACX,CAAC;QAED,uBAAuB;QACvB,MAAM,IAAI,GAAG,IAAI,GAAG,CAAC;YACpB,GAAG,MAAM,CAAC,IAAI,CAAC,kBAAkB,CAAC;YAClC,GAAG,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC;SACzB,CAAC,CAAC;QAEH,kEAAkE;QAClE,IAAI,UAAU,GAAG,CAAC,CAAC;QACnB,IAAI,MAAM,CAAC,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,CAAC;YACnC,MAAM,UAAU,GAAG,IAAA,wCAAiB,EACnC,MAAM,CAAC,UAAU,EACjB,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,CAC5B,CAAC;YACF,UAAU,GAAG,IAAA,iBAAQ,EACpB,KAAK,CAAC,GAAG,CAAC,UAAU,EAAE,UAAU,EAAE,KAAK,IAAI,EAAE,CAAC,IAAI,CAAC,CACnD,CAAC;QACH,CAAC;QAED,OAAO,MAAM,CAAC,WAAW,CACxB,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;YAC5B,4CAA4C;YAC5C,MAAM,uBAAuB,GAAG,kBAAkB,CAAC,GAAG,CAAC,CAAC;YACxD,IACC,uBAAuB;gBACvB,KAAK,CAAC,GAAG,CAAC,uBAAuB,CAAC,KAAK,CAAC,EACvC,CAAC;gBACF,OAAO,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;YACpB,CAAC;YAED,mCAAmC;YACnC,MAAM,cAAc,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC;YACtC,IAAI,CAAC,cAAc,EAAE,CAAC;gBACrB,OAAO,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;YACrB,CAAC;YAED,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,UAAU,EAAE,CAAC,EAAE,EAAE,CAAC;gBACrC,IAAI,KAAK,CAAC,GAAG,CAAC,cAAc,CAAC,KAAK,EAAE,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC;oBACzD,OAAO,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;gBACpB,CAAC;YACF,CAAC;YAED,OAAO,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;QACrB,CAAC,CAAC,CACF,CAAC;IACH,CAAC,EAAE,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC,CAAC;IAEpB,OAAO;QACN,YAAY;KACZ,CAAC;AACH,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@inseefr/lunatic",
|
|
3
|
-
"version": "3.13.
|
|
3
|
+
"version": "3.13.6-rc-fix-multimode.1",
|
|
4
4
|
"description": "Library of questionnaire components",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -2112,4 +2112,4 @@
|
|
|
2112
2112
|
"node": "20.16.0",
|
|
2113
2113
|
"pnpm": "9.15.0"
|
|
2114
2114
|
}
|
|
2115
|
-
}
|
|
2115
|
+
}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { type PropsWithChildren } from 'react';
|
|
1
|
+
import { Fragment, type PropsWithChildren } from 'react';
|
|
2
2
|
import Markdown, { type Components } from 'react-markdown';
|
|
3
3
|
import { MarkdownLink } from './MarkdownLink';
|
|
4
4
|
import remarkBreaks from 'remark-breaks';
|
|
@@ -12,7 +12,7 @@ type Props = {
|
|
|
12
12
|
export function MDLabel({ expression, MarkdownLinkOverride }: Props) {
|
|
13
13
|
const hasParagraphs = /\n\n/.test(expression);
|
|
14
14
|
const components = {
|
|
15
|
-
p: hasParagraphs ? 'p' :
|
|
15
|
+
p: hasParagraphs ? 'p' : Fragment,
|
|
16
16
|
br: 'br',
|
|
17
17
|
a: (props: MarkdownAProps) => (
|
|
18
18
|
<MarkdownA
|
|
@@ -55,22 +55,37 @@ export function useMultimode(
|
|
|
55
55
|
return {};
|
|
56
56
|
}
|
|
57
57
|
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
58
|
+
// Initialize rules to empty objects if they do not exist
|
|
59
|
+
const questionnaireRules = source.multimode.questionnaire?.rules || {};
|
|
60
|
+
const leafRules = source.multimode.leaf?.rules || {};
|
|
61
|
+
|
|
62
|
+
// If neither has rules, return an empty object
|
|
63
|
+
if (Object.keys(questionnaireRules).length === 0 && Object.keys(leafRules).length === 0) {
|
|
64
|
+
return {};
|
|
65
|
+
}
|
|
62
66
|
|
|
67
|
+
// Get unique rule keys
|
|
63
68
|
const keys = new Set([
|
|
64
|
-
...Object.keys(
|
|
65
|
-
...Object.keys(
|
|
69
|
+
...Object.keys(questionnaireRules),
|
|
70
|
+
...Object.keys(leafRules),
|
|
66
71
|
]);
|
|
67
|
-
|
|
72
|
+
|
|
73
|
+
// Handle the case where leaf.source exists to retrieve iterations
|
|
74
|
+
let iterations = 0;
|
|
75
|
+
if (source.multimode.leaf?.source) {
|
|
76
|
+
const roundabout = findComponentById(
|
|
77
|
+
source.components,
|
|
78
|
+
source.multimode.leaf.source
|
|
79
|
+
);
|
|
80
|
+
iterations = forceInt(
|
|
81
|
+
store.run(roundabout?.iterations?.value ?? '') ?? 0
|
|
82
|
+
);
|
|
83
|
+
}
|
|
68
84
|
|
|
69
85
|
return Object.fromEntries(
|
|
70
86
|
Array.from(keys).map((key) => {
|
|
71
|
-
// Check the
|
|
72
|
-
const questionnaireExpression =
|
|
73
|
-
source.multimode?.questionnaire.rules[key];
|
|
87
|
+
// Check the rule at the questionnaire level
|
|
88
|
+
const questionnaireExpression = questionnaireRules[key];
|
|
74
89
|
if (
|
|
75
90
|
questionnaireExpression &&
|
|
76
91
|
store.run(questionnaireExpression.value)
|
|
@@ -78,9 +93,8 @@ export function useMultimode(
|
|
|
78
93
|
return [key, true];
|
|
79
94
|
}
|
|
80
95
|
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
// There is no expression for the leaf
|
|
96
|
+
// Check the rule at the leaf level
|
|
97
|
+
const leafExpression = leafRules[key];
|
|
84
98
|
if (!leafExpression) {
|
|
85
99
|
return [key, false];
|
|
86
100
|
}
|
|
@@ -9,6 +9,7 @@ import { type ReactNode } from 'react';
|
|
|
9
9
|
import { times } from './array';
|
|
10
10
|
import { forceInt } from './number';
|
|
11
11
|
import { isRoundaboutComponent } from '../use-lunatic/commons/component';
|
|
12
|
+
import { castNumber } from './cast';
|
|
12
13
|
|
|
13
14
|
export enum ArticulationState {
|
|
14
15
|
COMPLETED = 1,
|
|
@@ -74,9 +75,16 @@ export function getArticulationState(
|
|
|
74
75
|
source.components,
|
|
75
76
|
source.articulation.source
|
|
76
77
|
);
|
|
78
|
+
|
|
79
|
+
if (!roundabout) {
|
|
80
|
+
return {
|
|
81
|
+
items: [],
|
|
82
|
+
};
|
|
83
|
+
}
|
|
84
|
+
|
|
77
85
|
const { variables } = reducerInitializer({ source, data });
|
|
78
|
-
const iterations =
|
|
79
|
-
variables.run(roundabout
|
|
86
|
+
const iterations = castNumber(
|
|
87
|
+
variables.run(roundabout.iterations.value ?? '0')
|
|
80
88
|
);
|
|
81
89
|
|
|
82
90
|
const rows = times(iterations, (k) =>
|
|
@@ -86,12 +94,6 @@ export function getArticulationState(
|
|
|
86
94
|
}))
|
|
87
95
|
);
|
|
88
96
|
|
|
89
|
-
if (!roundabout) {
|
|
90
|
-
return {
|
|
91
|
-
items: [],
|
|
92
|
-
};
|
|
93
|
-
}
|
|
94
|
-
|
|
95
97
|
return {
|
|
96
98
|
items: rows.map((row, k) => ({
|
|
97
99
|
cells: row,
|