@inseefr/lunatic 3.6.5 → 3.6.7

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 (69) hide show
  1. package/README.md +25 -0
  2. package/components/CheckboxGroup/CustomCheckboxGroup.d.ts +1 -1
  3. package/components/CheckboxGroup/CustomCheckboxGroup.js.map +1 -1
  4. package/components/Loop/Loop.d.ts +1 -1
  5. package/components/Loop/Loop.js +5 -27
  6. package/components/Loop/Loop.js.map +1 -1
  7. package/components/Loop/utils.d.ts +8 -0
  8. package/components/Loop/utils.js +65 -0
  9. package/components/Loop/utils.js.map +1 -0
  10. package/components/RosterForLoop/RosterForLoop.js +4 -27
  11. package/components/RosterForLoop/RosterForLoop.js.map +1 -1
  12. package/components/Roundabout/CustomRoundabout.js +2 -2
  13. package/components/Roundabout/CustomRoundabout.js.map +1 -1
  14. package/components/Roundabout/roundabout.spec.js +22 -0
  15. package/components/Roundabout/roundabout.spec.js.map +1 -1
  16. package/components/shared/Checkbox/CheckboxOption.d.ts +4 -2
  17. package/components/shared/Checkbox/CheckboxOption.js.map +1 -1
  18. package/components/shared/Radio/RadioGroup.d.ts +1 -1
  19. package/components/shared/Radio/RadioGroup.js.map +1 -1
  20. package/esm/components/CheckboxGroup/CustomCheckboxGroup.d.ts +1 -1
  21. package/esm/components/CheckboxGroup/CustomCheckboxGroup.js.map +1 -1
  22. package/esm/components/Loop/Loop.d.ts +1 -1
  23. package/esm/components/Loop/Loop.js +5 -28
  24. package/esm/components/Loop/Loop.js.map +1 -1
  25. package/esm/components/Loop/utils.d.ts +8 -0
  26. package/esm/components/Loop/utils.js +62 -0
  27. package/esm/components/Loop/utils.js.map +1 -0
  28. package/esm/components/RosterForLoop/RosterForLoop.js +5 -29
  29. package/esm/components/RosterForLoop/RosterForLoop.js.map +1 -1
  30. package/esm/components/Roundabout/CustomRoundabout.js +2 -2
  31. package/esm/components/Roundabout/CustomRoundabout.js.map +1 -1
  32. package/esm/components/Roundabout/roundabout.spec.js +22 -0
  33. package/esm/components/Roundabout/roundabout.spec.js.map +1 -1
  34. package/esm/components/shared/Checkbox/CheckboxOption.d.ts +4 -2
  35. package/esm/components/shared/Checkbox/CheckboxOption.js.map +1 -1
  36. package/esm/components/shared/Radio/RadioGroup.d.ts +1 -1
  37. package/esm/components/shared/Radio/RadioGroup.js.map +1 -1
  38. package/esm/use-lunatic/commons/compile-controls.js +33 -7
  39. package/esm/use-lunatic/commons/compile-controls.js.map +1 -1
  40. package/esm/use-lunatic/props/propIterations.js +12 -1
  41. package/esm/use-lunatic/props/propIterations.js.map +1 -1
  42. package/esm/use-lunatic/reducer/controls/check-base-control.js.map +1 -1
  43. package/package.json +16 -3
  44. package/src/components/CheckboxGroup/CustomCheckboxGroup.tsx +1 -0
  45. package/src/components/Loop/Loop.tsx +6 -35
  46. package/src/components/Loop/utils.test.ts +39 -0
  47. package/src/components/Loop/utils.ts +73 -0
  48. package/src/components/RosterForLoop/RosterForLoop.tsx +3 -33
  49. package/src/components/Roundabout/CustomRoundabout.tsx +11 -1
  50. package/src/components/Roundabout/roundabout.spec.tsx +38 -0
  51. package/src/components/shared/Checkbox/CheckboxOption.tsx +3 -2
  52. package/src/components/shared/Radio/RadioGroup.tsx +1 -0
  53. package/src/stories/behaviour/controls/controls.stories.tsx +12 -3
  54. package/src/stories/behaviour/controls/data-standalone-loop.json +17 -0
  55. package/src/stories/behaviour/controls/source-standalone-loop.json +5503 -0
  56. package/src/stories/loop/source-paginated.json +1 -1
  57. package/src/stories/roundabout/roundabout.stories.tsx +13 -0
  58. package/src/stories/roundabout/sourceWithControl.json +613 -0
  59. package/src/use-lunatic/commons/compile-controls.ts +60 -11
  60. package/src/use-lunatic/props/propIterations.ts +30 -15
  61. package/src/use-lunatic/reducer/controls/check-base-control.ts +0 -1
  62. package/src/use-lunatic/use-lunatic-bug.test.ts +42 -0
  63. package/tsconfig.build.tsbuildinfo +1 -1
  64. package/use-lunatic/commons/compile-controls.js +31 -7
  65. package/use-lunatic/commons/compile-controls.js.map +1 -1
  66. package/use-lunatic/props/propIterations.js +12 -1
  67. package/use-lunatic/props/propIterations.js.map +1 -1
  68. package/use-lunatic/reducer/controls/check-base-control.js.map +1 -1
  69. /package/src/stories/behaviour/controls/{source-loop.json → source-roster-for-loop.json} +0 -0
@@ -1,47 +1,23 @@
1
1
  import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
2
- import { Fragment, useCallback, useState } from 'react';
2
+ import { Fragment } from 'react';
3
3
  import { Table, Tbody, Td, Tr, TableHeader } from '../shared/Table';
4
4
  import { times } from '../../utils/array';
5
5
  import { LunaticComponents } from '../LunaticComponents';
6
6
  import { blockedInLoopComponents } from '../Loop/constant';
7
7
  import { ComponentErrors, getComponentErrors, } from '../shared/ComponentErrors/ComponentErrors';
8
8
  import { CustomLoop } from '../Loop/Loop';
9
- const DEFAULT_MIN_ROWS = 1;
10
- const DEFAULT_MAX_ROWS = 12;
9
+ import { useLoopUtils } from '../Loop/utils';
11
10
  /**
12
11
  * Loop displayed as a table
13
12
  */
14
13
  export const RosterForLoop = (props) => {
15
- var _a, _b;
16
- const { value: valueMap, lines, errors, handleChanges,
14
+ const { min, max, nbRows, addRow, removeRow } = useLoopUtils(props);
15
+ const { errors,
17
16
  // eslint-disable-next-line @typescript-eslint/no-unused-vars
18
- declarations, header, iterations, id, getComponents,
17
+ declarations, header, id, getComponents,
19
18
  // eslint-disable-next-line @typescript-eslint/no-unused-vars
20
19
  label, ...otherProps // These props will be passed down to the child components
21
20
  } = props;
22
- const min = (_a = lines === null || lines === void 0 ? void 0 : lines.min) !== null && _a !== void 0 ? _a : DEFAULT_MIN_ROWS;
23
- const max = (_b = lines === null || lines === void 0 ? void 0 : lines.max) !== null && _b !== void 0 ? _b : DEFAULT_MAX_ROWS;
24
- const [nbRows, setNbRows] = useState(Math.max(min, iterations));
25
- const addRow = useCallback(() => {
26
- if (nbRows < max) {
27
- setNbRows(nbRows + 1);
28
- }
29
- }, [max, nbRows]);
30
- const removeRow = useCallback(() => {
31
- if (nbRows <= min) {
32
- return;
33
- }
34
- const newNbRows = nbRows - 1;
35
- setNbRows(newNbRows);
36
- // Downsize all variables by 1
37
- const newResponses = Object.entries(valueMap).map(([k, v]) => {
38
- return {
39
- name: k,
40
- value: v === null || v === void 0 ? void 0 : v.filter((_, i) => i < newNbRows),
41
- };
42
- });
43
- handleChanges(newResponses);
44
- }, [nbRows, min, valueMap, handleChanges]);
45
21
  if (nbRows === 0) {
46
22
  return null;
47
23
  }
@@ -1 +1 @@
1
- {"version":3,"file":"RosterForLoop.js","sourceRoot":"","sources":["../../../src/components/RosterForLoop/RosterForLoop.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"RosterForLoop.js","sourceRoot":"","sources":["../../../src/components/RosterForLoop/RosterForLoop.tsx"],"names":[],"mappings":"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"}
@@ -8,8 +8,8 @@ import { LabelDescription } from '../shared/LabelDescription';
8
8
  function RoundaboutItem({ label, progress, description, onClick, disabled, iteration, locked, errors, }) {
9
9
  return (_jsxs("section", { className: "lunatic-roundabout__item", children: [_jsxs("div", { children: [label && (_jsx("label", { className: "lunatic-roundabout__label", htmlFor: `action${iteration}`, children: label })), description && (_jsx("div", { className: "lunatic-roundabout__description", children: description }))] }), !disabled && (_jsx(Button, { id: `action${iteration}`, className: classnames('lunatic-roundabout__button', getButtonClass(progress)), onClick: onClick, disabled: locked && progress === 1, children: getButtonLabel(progress) })), _jsx(ComponentErrors, { errors: errors })] }));
10
10
  }
11
- export const CustomRoundabout = slottableComponent('Roundabout', ({ declarations, description, id, items, goToIteration, label, locked }) => {
12
- return (_jsxs("div", { className: "lunatic-roundabout", children: [_jsx("div", { id: `roundabout-${id}`, className: "lunatic-roundabout__label", children: label }), _jsx(LabelDescription, { value: description }), _jsx(Declarations, { type: "AFTER_QUESTION_TEXT", declarations: declarations, id: id }), _jsx("div", { className: "lunatic-roundabout__items", children: items.map((item, k) => (_jsx(RoundaboutItem, { iteration: k, ...item, errors: item.errors, onClick: () => goToIteration(k), locked: locked }, k))) })] }));
11
+ export const CustomRoundabout = slottableComponent('Roundabout', ({ declarations, description, id, items, goToIteration, label, locked, errors, }) => {
12
+ return (_jsxs("div", { className: "lunatic-roundabout", children: [_jsx("div", { id: `roundabout-${id}`, className: "lunatic-roundabout__label", children: label }), _jsx(LabelDescription, { value: description }), _jsx(Declarations, { type: "AFTER_QUESTION_TEXT", declarations: declarations, id: id }), _jsx(ComponentErrors, { errors: errors }), _jsx("div", { className: "lunatic-roundabout__items", children: items.map((item, k) => (_jsx(RoundaboutItem, { iteration: k, ...item, errors: item.errors, onClick: () => goToIteration(k), locked: locked }, k))) })] }));
13
13
  });
14
14
  function getButtonLabel(progress) {
15
15
  if (progress === 1) {
@@ -1 +1 @@
1
- {"version":3,"file":"CustomRoundabout.js","sourceRoot":"","sources":["../../../src/components/Roundabout/CustomRoundabout.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,kCAAkC,CAAC;AAGtE,OAAO,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAC;AACjD,OAAO,UAAU,MAAM,YAAY,CAAC;AACpC,OAAO,EAAE,eAAe,EAAE,MAAM,2CAA2C,CAAC;AAG5E,OAAO,EAAE,YAAY,EAAE,MAAM,qCAAqC,CAAC;AACnE,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAS9D,SAAS,cAAc,CAAC,EACvB,KAAK,EACL,QAAQ,EACR,WAAW,EACX,OAAO,EACP,QAAQ,EACR,SAAS,EACT,MAAM,EACN,MAAM,GACK;IACX,OAAO,CACN,mBAAS,SAAS,EAAC,0BAA0B,aAC5C,0BACE,KAAK,IAAI,CACT,gBACC,SAAS,EAAC,2BAA2B,EACrC,OAAO,EAAE,SAAS,SAAS,EAAE,YAE5B,KAAK,GACC,CACR,EACA,WAAW,IAAI,CACf,cAAK,SAAS,EAAC,iCAAiC,YAAE,WAAW,GAAO,CACpE,IACI,EACL,CAAC,QAAQ,IAAI,CACb,KAAC,MAAM,IACN,EAAE,EAAE,SAAS,SAAS,EAAE,EACxB,SAAS,EAAE,UAAU,CACpB,4BAA4B,EAC5B,cAAc,CAAC,QAAQ,CAAC,CACxB,EACD,OAAO,EAAE,OAAO,EAChB,QAAQ,EAAE,MAAM,IAAI,QAAQ,KAAK,CAAC,YAEjC,cAAc,CAAC,QAAQ,CAAC,GACjB,CACT,EACD,KAAC,eAAe,IAAC,MAAM,EAAE,MAAM,GAAI,IAC1B,CACV,CAAC;AACH,CAAC;AAiBD,MAAM,CAAC,MAAM,gBAAgB,GAAG,kBAAkB,CACjD,YAAY,EACZ,CAAC,EAAE,YAAY,EAAE,WAAW,EAAE,EAAE,EAAE,KAAK,EAAE,aAAa,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE;IAC1E,OAAO,CACN,eAAK,SAAS,EAAC,oBAAoB,aAClC,cAAK,EAAE,EAAE,cAAc,EAAE,EAAE,EAAE,SAAS,EAAC,2BAA2B,YAChE,KAAK,GACD,EACN,KAAC,gBAAgB,IAAC,KAAK,EAAE,WAAW,GAAI,EACxC,KAAC,YAAY,IACZ,IAAI,EAAC,qBAAqB,EAC1B,YAAY,EAAE,YAAY,EAC1B,EAAE,EAAE,EAAE,GACL,EACF,cAAK,SAAS,EAAC,2BAA2B,YACxC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC,EAAE,EAAE,CAAC,CACvB,KAAC,cAAc,IAEd,SAAS,EAAE,CAAC,KACR,IAAI,EACR,MAAM,EAAE,IAAI,CAAC,MAAM,EACnB,OAAO,EAAE,GAAG,EAAE,CAAC,aAAa,CAAC,CAAC,CAAC,EAC/B,MAAM,EAAE,MAAM,IALT,CAAC,CAML,CACF,CAAC,GACG,IACD,CACN,CAAC;AACH,CAAC,CACD,CAAC;AAEF,SAAS,cAAc,CAAC,QAAgB;IACvC,IAAI,QAAQ,KAAK,CAAC,EAAE,CAAC;QACpB,OAAO,UAAU,CAAC;IACnB,CAAC;IACD,IAAI,QAAQ,KAAK,CAAC,EAAE,CAAC;QACpB,OAAO,UAAU,CAAC;IACnB,CAAC;IACD,OAAO,WAAW,CAAC;AACpB,CAAC;AAED,SAAS,cAAc,CAAC,QAAgB;IACvC,IAAI,QAAQ,KAAK,CAAC,EAAE,CAAC;QACpB,OAAO,sCAAsC,CAAC;IAC/C,CAAC;IACD,IAAI,QAAQ,KAAK,CAAC,EAAE,CAAC;QACpB,OAAO,qCAAqC,CAAC;IAC9C,CAAC;IACD,OAAO,IAAI,CAAC;AACb,CAAC"}
1
+ {"version":3,"file":"CustomRoundabout.js","sourceRoot":"","sources":["../../../src/components/Roundabout/CustomRoundabout.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,kCAAkC,CAAC;AAGtE,OAAO,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAC;AACjD,OAAO,UAAU,MAAM,YAAY,CAAC;AACpC,OAAO,EAAE,eAAe,EAAE,MAAM,2CAA2C,CAAC;AAG5E,OAAO,EAAE,YAAY,EAAE,MAAM,qCAAqC,CAAC;AACnE,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAS9D,SAAS,cAAc,CAAC,EACvB,KAAK,EACL,QAAQ,EACR,WAAW,EACX,OAAO,EACP,QAAQ,EACR,SAAS,EACT,MAAM,EACN,MAAM,GACK;IACX,OAAO,CACN,mBAAS,SAAS,EAAC,0BAA0B,aAC5C,0BACE,KAAK,IAAI,CACT,gBACC,SAAS,EAAC,2BAA2B,EACrC,OAAO,EAAE,SAAS,SAAS,EAAE,YAE5B,KAAK,GACC,CACR,EACA,WAAW,IAAI,CACf,cAAK,SAAS,EAAC,iCAAiC,YAAE,WAAW,GAAO,CACpE,IACI,EACL,CAAC,QAAQ,IAAI,CACb,KAAC,MAAM,IACN,EAAE,EAAE,SAAS,SAAS,EAAE,EACxB,SAAS,EAAE,UAAU,CACpB,4BAA4B,EAC5B,cAAc,CAAC,QAAQ,CAAC,CACxB,EACD,OAAO,EAAE,OAAO,EAChB,QAAQ,EAAE,MAAM,IAAI,QAAQ,KAAK,CAAC,YAEjC,cAAc,CAAC,QAAQ,CAAC,GACjB,CACT,EACD,KAAC,eAAe,IAAC,MAAM,EAAE,MAAM,GAAI,IAC1B,CACV,CAAC;AACH,CAAC;AAiBD,MAAM,CAAC,MAAM,gBAAgB,GAAG,kBAAkB,CACjD,YAAY,EACZ,CAAC,EACA,YAAY,EACZ,WAAW,EACX,EAAE,EACF,KAAK,EACL,aAAa,EACb,KAAK,EACL,MAAM,EACN,MAAM,GACN,EAAE,EAAE;IACJ,OAAO,CACN,eAAK,SAAS,EAAC,oBAAoB,aAClC,cAAK,EAAE,EAAE,cAAc,EAAE,EAAE,EAAE,SAAS,EAAC,2BAA2B,YAChE,KAAK,GACD,EACN,KAAC,gBAAgB,IAAC,KAAK,EAAE,WAAW,GAAI,EACxC,KAAC,YAAY,IACZ,IAAI,EAAC,qBAAqB,EAC1B,YAAY,EAAE,YAAY,EAC1B,EAAE,EAAE,EAAE,GACL,EACF,KAAC,eAAe,IAAC,MAAM,EAAE,MAAM,GAAI,EACnC,cAAK,SAAS,EAAC,2BAA2B,YACxC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC,EAAE,EAAE,CAAC,CACvB,KAAC,cAAc,IAEd,SAAS,EAAE,CAAC,KACR,IAAI,EACR,MAAM,EAAE,IAAI,CAAC,MAAM,EACnB,OAAO,EAAE,GAAG,EAAE,CAAC,aAAa,CAAC,CAAC,CAAC,EAC/B,MAAM,EAAE,MAAM,IALT,CAAC,CAML,CACF,CAAC,GACG,IACD,CACN,CAAC;AACH,CAAC,CACD,CAAC;AAEF,SAAS,cAAc,CAAC,QAAgB;IACvC,IAAI,QAAQ,KAAK,CAAC,EAAE,CAAC;QACpB,OAAO,UAAU,CAAC;IACnB,CAAC;IACD,IAAI,QAAQ,KAAK,CAAC,EAAE,CAAC;QACpB,OAAO,UAAU,CAAC;IACnB,CAAC;IACD,OAAO,WAAW,CAAC;AACpB,CAAC;AAED,SAAS,cAAc,CAAC,QAAgB;IACvC,IAAI,QAAQ,KAAK,CAAC,EAAE,CAAC;QACpB,OAAO,sCAAsC,CAAC;IAC/C,CAAC;IACD,IAAI,QAAQ,KAAK,CAAC,EAAE,CAAC;QACpB,OAAO,qCAAqC,CAAC;IAC9C,CAAC;IACD,OAAO,IAAI,CAAC;AACb,CAAC"}
@@ -2,6 +2,10 @@ import { jsx as _jsx } from "react/jsx-runtime";
2
2
  import { render, fireEvent } from '@testing-library/react';
3
3
  import { CustomRoundabout } from './CustomRoundabout';
4
4
  import { describe, it, expect, vi, afterEach } from 'vitest';
5
+ import { ComponentErrors } from '../shared/ComponentErrors/ComponentErrors';
6
+ vi.mock('../shared/ComponentErrors/ComponentErrors', () => ({
7
+ ComponentErrors: vi.fn(),
8
+ }));
5
9
  describe('Roundabout', () => {
6
10
  const mockGoToIteration = vi.fn();
7
11
  afterEach(() => {
@@ -45,5 +49,23 @@ describe('Roundabout', () => {
45
49
  const completeButton = getByText('Complété');
46
50
  expect(completeButton).toBeDisabled();
47
51
  });
52
+ it('displays roundabout errors', () => {
53
+ const errors = [
54
+ {
55
+ id: 'error1',
56
+ errorMessage: 'Error 1 message',
57
+ criticality: 'ERROR',
58
+ typeOfControl: 'CONSISTENCY',
59
+ },
60
+ {
61
+ id: 'error2',
62
+ errorMessage: 'Error 2 message',
63
+ criticality: 'WARN',
64
+ typeOfControl: 'CONSISTENCY',
65
+ },
66
+ ];
67
+ render(_jsx(CustomRoundabout, { id: "r1", items: items, goToIteration: mockGoToIteration, locked: true, errors: errors }));
68
+ expect(ComponentErrors).toHaveBeenCalledWith(expect.objectContaining({ errors }), expect.anything());
69
+ });
48
70
  });
49
71
  //# sourceMappingURL=roundabout.spec.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"roundabout.spec.js","sourceRoot":"","sources":["../../../src/components/Roundabout/roundabout.spec.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"roundabout.spec.js","sourceRoot":"","sources":["../../../src/components/Roundabout/roundabout.spec.tsx"],"names":[],"mappings":"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"}
@@ -1,6 +1,6 @@
1
1
  import { type ReactNode } from 'react';
2
2
  import type { LunaticBaseProps } from '../../type';
3
- export type CheckboxOptionProps = {
3
+ type CheckboxOptionProps = {
4
4
  disabled?: boolean;
5
5
  readOnly?: boolean;
6
6
  checked?: boolean;
@@ -16,5 +16,7 @@ export type CheckboxOptionProps = {
16
16
  detailMaxLength?: number;
17
17
  detailValue?: string | null;
18
18
  onDetailChange?: (value: string) => void;
19
+ shouldBeFiltered?: boolean;
19
20
  };
20
- export declare const CheckboxOption: import("react").ComponentType<CheckboxOptionProps>;
21
+ export declare const CheckboxOption: import("react").ComponentType<Readonly<CheckboxOptionProps>>;
22
+ export {};
@@ -1 +1 @@
1
- {"version":3,"file":"CheckboxOption.js","sourceRoot":"","sources":["../../../../src/components/shared/Checkbox/CheckboxOption.tsx"],"names":[],"mappings":";AAEA,OAAO,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAC/D,OAAO,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AACvC,OAAO,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AAC/D,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAoBhD,SAAS,qBAAqB,CAAC,EAC9B,QAAQ,EACR,QAAQ,EACR,OAAO,EACP,EAAE,EACF,OAAO,EACP,KAAK,EACL,WAAW,EACX,qBAAqB,EACrB,WAAW,EACX,eAAe,EACf,WAAW,EACX,cAAc,EACd,YAAY,EACZ,QAAQ,EACR,OAAO,GACc;IACrB,MAAM,SAAS,GAAG,CAAC,QAAQ,IAAI,CAAC,QAAQ,CAAC;IACzC,MAAM,SAAS,GAAG,CAAC,CAAC,cAAc,CAAC;IACnC,MAAM,mBAAmB,GAAG,OAAO,CAAC,QAAQ,IAAI,YAAY,IAAI,SAAS,CAAC,CAAC;IAC3E,MAAM,aAAa,GAAG,GAAG,EAAE;QAC1B,IAAI,SAAS,EAAE,CAAC;YACf,OAAO,CAAC,CAAC,OAAO,CAAC,CAAC;QACnB,CAAC;IACF,CAAC,CAAC;IAEF,MAAM,aAAa,GAAyC,CAAC,CAAC,EAAE,EAAE;QACjE,IAAI,CAAC,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;YACxB,aAAa,EAAE,CAAC;QACjB,CAAC;IACF,CAAC,CAAC;IAEF,MAAM,OAAO,GAAG,SAAS,EAAE,EAAE,CAAC;IAE9B,cAAc,CACb,YAAY,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,EAAE,EAClC,CAAC,CAAC,EAAE,EAAE;QACL,CAAC,CAAC,cAAc,EAAE,CAAC;QACnB,aAAa,EAAE,CAAC;IACjB,CAAC,EACD,mBAAmB,CACnB,CAAC;IAEF,OAAO,CACN,8BACC,eACC,EAAE,EAAE,EAAE,EACN,IAAI,EAAC,UAAU,kBACD,OAAO,mBACN,QAAQ,mBACR,QAAQ,EACvB,SAAS,EAAC,wBAAwB,kBACpB,OAAO,EACrB,QAAQ,EAAE,CAAC,EACX,OAAO,EAAE,aAAa,EACtB,SAAS,EAAE,aAAa,qBACP,OAAO,aAExB,cAAK,SAAS,EAAC,8BAA8B,YAC3C,OAAO,IAAI,CACX,cACC,KAAK,EAAC,4BAA4B,EAClC,IAAI,EAAC,MAAM,EACX,OAAO,EAAC,WAAW,YAEnB,eACC,CAAC,EAAC,2CAA2C,EAC7C,IAAI,EAAC,cAAc,GAClB,GACG,CACN,GACI,EACN,MAAC,KAAK,IAAC,EAAE,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE,EAAE,WAAW,EAAE,WAAW,aACvD,YAAY,IAAI,CAChB,eAAM,SAAS,EAAC,eAAe,YAAE,YAAY,CAAC,WAAW,EAAE,GAAQ,CACnE,EAAE,GAAG,EACL,KAAK,IACC,IACH,EACL,SAAS,IAAI,CAAC,OAAO,IAAI,qBAAqB,CAAC,IAAI,CACnD,KAAC,WAAW,IACX,EAAE,EAAC,UAAU,EACb,KAAK,EAAE,WAAW,aAAX,WAAW,cAAX,WAAW,GAAI,YAAY,EAClC,KAAK,EAAE,OAAO,WAAW,KAAK,QAAQ,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,EACzD,SAAS,EAAE,eAAe,EAC1B,QAAQ,EAAE,cAAc,EACxB,QAAQ,EAAE,QAAQ,EAClB,SAAS,SACR,CACF,IACC,CACH,CAAC;AACH,CAAC;AAED,MAAM,CAAC,MAAM,cAAc,GAAG,kBAAkB,CAC/C,gBAAgB,EAChB,qBAAqB,CACrB,CAAC"}
1
+ {"version":3,"file":"CheckboxOption.js","sourceRoot":"","sources":["../../../../src/components/shared/Checkbox/CheckboxOption.tsx"],"names":[],"mappings":";AAEA,OAAO,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAC/D,OAAO,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AACvC,OAAO,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AAC/D,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAqBhD,SAAS,qBAAqB,CAAC,EAC9B,QAAQ,EACR,QAAQ,EACR,OAAO,EACP,EAAE,EACF,OAAO,EACP,KAAK,EACL,WAAW,EACX,qBAAqB,EACrB,WAAW,EACX,eAAe,EACf,WAAW,EACX,cAAc,EACd,YAAY,EACZ,QAAQ,EACR,OAAO,GACwB;IAC/B,MAAM,SAAS,GAAG,CAAC,QAAQ,IAAI,CAAC,QAAQ,CAAC;IACzC,MAAM,SAAS,GAAG,CAAC,CAAC,cAAc,CAAC;IACnC,MAAM,mBAAmB,GAAG,OAAO,CAAC,QAAQ,IAAI,YAAY,IAAI,SAAS,CAAC,CAAC;IAC3E,MAAM,aAAa,GAAG,GAAG,EAAE;QAC1B,IAAI,SAAS,EAAE,CAAC;YACf,OAAO,CAAC,CAAC,OAAO,CAAC,CAAC;QACnB,CAAC;IACF,CAAC,CAAC;IAEF,MAAM,aAAa,GAAyC,CAAC,CAAC,EAAE,EAAE;QACjE,IAAI,CAAC,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;YACxB,aAAa,EAAE,CAAC;QACjB,CAAC;IACF,CAAC,CAAC;IAEF,MAAM,OAAO,GAAG,SAAS,EAAE,EAAE,CAAC;IAE9B,cAAc,CACb,YAAY,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,EAAE,EAClC,CAAC,CAAC,EAAE,EAAE;QACL,CAAC,CAAC,cAAc,EAAE,CAAC;QACnB,aAAa,EAAE,CAAC;IACjB,CAAC,EACD,mBAAmB,CACnB,CAAC;IAEF,OAAO,CACN,8BACC,eACC,EAAE,EAAE,EAAE,EACN,IAAI,EAAC,UAAU,kBACD,OAAO,mBACN,QAAQ,mBACR,QAAQ,EACvB,SAAS,EAAC,wBAAwB,kBACpB,OAAO,EACrB,QAAQ,EAAE,CAAC,EACX,OAAO,EAAE,aAAa,EACtB,SAAS,EAAE,aAAa,qBACP,OAAO,aAExB,cAAK,SAAS,EAAC,8BAA8B,YAC3C,OAAO,IAAI,CACX,cACC,KAAK,EAAC,4BAA4B,EAClC,IAAI,EAAC,MAAM,EACX,OAAO,EAAC,WAAW,YAEnB,eACC,CAAC,EAAC,2CAA2C,EAC7C,IAAI,EAAC,cAAc,GAClB,GACG,CACN,GACI,EACN,MAAC,KAAK,IAAC,EAAE,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE,EAAE,WAAW,EAAE,WAAW,aACvD,YAAY,IAAI,CAChB,eAAM,SAAS,EAAC,eAAe,YAAE,YAAY,CAAC,WAAW,EAAE,GAAQ,CACnE,EAAE,GAAG,EACL,KAAK,IACC,IACH,EACL,SAAS,IAAI,CAAC,OAAO,IAAI,qBAAqB,CAAC,IAAI,CACnD,KAAC,WAAW,IACX,EAAE,EAAC,UAAU,EACb,KAAK,EAAE,WAAW,aAAX,WAAW,cAAX,WAAW,GAAI,YAAY,EAClC,KAAK,EAAE,OAAO,WAAW,KAAK,QAAQ,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,EACzD,SAAS,EAAE,eAAe,EAC1B,QAAQ,EAAE,cAAc,EACxB,QAAQ,EAAE,QAAQ,EAClB,SAAS,SACR,CACF,IACC,CACH,CAAC;AACH,CAAC;AAED,MAAM,CAAC,MAAM,cAAc,GAAG,kBAAkB,CAC/C,gBAAgB,EAChB,qBAAqB,CACrB,CAAC"}
@@ -1,6 +1,6 @@
1
1
  import type { LunaticError } from '../../../use-lunatic/type';
2
2
  import type { LunaticComponentProps } from '../../type';
3
- export type RadioGroupProps = Pick<LunaticComponentProps<'Radio'>, 'id' | 'options' | 'value' | 'checkboxStyle' | 'label' | 'shortcut' | 'className' | 'disabled' | 'readOnly' | 'description' | 'declarations' | 'orientation' | 'detailAlwaysDisplayed'> & {
3
+ export type RadioGroupProps = Pick<LunaticComponentProps<'Radio'>, 'id' | 'options' | 'value' | 'checkboxStyle' | 'label' | 'shortcut' | 'className' | 'disabled' | 'readOnly' | 'description' | 'declarations' | 'orientation' | 'detailAlwaysDisplayed' | 'shouldBeFiltered'> & {
4
4
  errors?: LunaticError[];
5
5
  clearable?: boolean;
6
6
  };
@@ -1 +1 @@
1
- {"version":3,"file":"RadioGroup.js","sourceRoot":"","sources":["../../../../src/components/shared/Radio/RadioGroup.tsx"],"names":[],"mappings":";;AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAChD,OAAO,EAAE,eAAe,EAAE,MAAM,oCAAoC,CAAC;AACrE,OAAO,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAC/D,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAC5D,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAE,sBAAsB,EAAE,MAAM,uCAAuC,CAAC;AAE/E,OAAO,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAuB5D;;GAEG;AACH,SAAS,iBAAiB,CAAC,EAC1B,OAAO,EACP,KAAK,EACL,EAAE,EACF,KAAK,EACL,WAAW,EACX,aAAa,GAAG,KAAK,EACrB,MAAM,EACN,SAAS,EACT,QAAQ,EACR,QAAQ,EACR,QAAQ,EACR,YAAY,EACZ,WAAW,EACX,qBAAqB,GACJ;IACjB,MAAM,SAAS,GAAG,sBAAsB,CAAC,OAAO,CAAC,CAAC;IAClD,MAAM,QAAQ,GAAG,OAAO,CAAC,MAAM,CAAC;IAChC,OAAO,CACN,MAAC,QAAQ,IAAC,SAAS,EAAE,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,WAAW,EAAE,WAAW,aACtE,KAAC,YAAY,IAAC,IAAI,EAAC,qBAAqB,EAAC,YAAY,EAAE,YAAY,GAAI,EACvE,cAAK,SAAS,EAAE,0CAA0C,WAAW,EAAE,YACrE,OAAO,CAAC,GAAG,CAAC,UAAU,MAAM,EAAE,KAAK;oBACnC,MAAM,OAAO,GAAG,iBAAiB,EAAE,IAAI,MAAM,CAAC,KAAK,EAAE,CAAC;oBACtD,MAAM,YAAY,GAAG,cAAc,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;oBACrD,OAAO,CACN,eAAC,WAAW,OACP,MAAM,EACV,GAAG,EAAE,OAAO,EACZ,EAAE,EAAE,OAAO,EACX,KAAK,EAAE,KAAK,EACZ,OAAO,EAAE,KAAK,KAAK,MAAM,CAAC,KAAK,EAC/B,qBAAqB,EAAE,qBAAqB,EAC5C,SAAS,EAAE,SAAS,EACpB,aAAa,EAAE,aAAa,EAC5B,YAAY,EAAE,QAAQ,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,SAAS,EACjD,QAAQ,EAAE,QAAQ,EAClB,QAAQ,EAAE,QAAQ,EAClB,QAAQ,EAAE,QAAQ,EAClB,OAAO,EAAE,CAAC,CAAC,MAAM,GAChB,CACF,CAAC;gBACH,CAAC,CAAC,GACG,EACN,KAAC,eAAe,IAAC,MAAM,EAAE,MAAM,GAAI,IACzB,CACX,CAAC;AACH,CAAC;AAED,MAAM,CAAC,MAAM,UAAU,GAAG,kBAAkB,CAAC,YAAY,EAAE,iBAAiB,CAAC,CAAC"}
1
+ {"version":3,"file":"RadioGroup.js","sourceRoot":"","sources":["../../../../src/components/shared/Radio/RadioGroup.tsx"],"names":[],"mappings":";;AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAChD,OAAO,EAAE,eAAe,EAAE,MAAM,oCAAoC,CAAC;AACrE,OAAO,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAC/D,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAC5D,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAE,sBAAsB,EAAE,MAAM,uCAAuC,CAAC;AAE/E,OAAO,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAwB5D;;GAEG;AACH,SAAS,iBAAiB,CAAC,EAC1B,OAAO,EACP,KAAK,EACL,EAAE,EACF,KAAK,EACL,WAAW,EACX,aAAa,GAAG,KAAK,EACrB,MAAM,EACN,SAAS,EACT,QAAQ,EACR,QAAQ,EACR,QAAQ,EACR,YAAY,EACZ,WAAW,EACX,qBAAqB,GACJ;IACjB,MAAM,SAAS,GAAG,sBAAsB,CAAC,OAAO,CAAC,CAAC;IAClD,MAAM,QAAQ,GAAG,OAAO,CAAC,MAAM,CAAC;IAChC,OAAO,CACN,MAAC,QAAQ,IAAC,SAAS,EAAE,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,WAAW,EAAE,WAAW,aACtE,KAAC,YAAY,IAAC,IAAI,EAAC,qBAAqB,EAAC,YAAY,EAAE,YAAY,GAAI,EACvE,cAAK,SAAS,EAAE,0CAA0C,WAAW,EAAE,YACrE,OAAO,CAAC,GAAG,CAAC,UAAU,MAAM,EAAE,KAAK;oBACnC,MAAM,OAAO,GAAG,iBAAiB,EAAE,IAAI,MAAM,CAAC,KAAK,EAAE,CAAC;oBACtD,MAAM,YAAY,GAAG,cAAc,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;oBACrD,OAAO,CACN,eAAC,WAAW,OACP,MAAM,EACV,GAAG,EAAE,OAAO,EACZ,EAAE,EAAE,OAAO,EACX,KAAK,EAAE,KAAK,EACZ,OAAO,EAAE,KAAK,KAAK,MAAM,CAAC,KAAK,EAC/B,qBAAqB,EAAE,qBAAqB,EAC5C,SAAS,EAAE,SAAS,EACpB,aAAa,EAAE,aAAa,EAC5B,YAAY,EAAE,QAAQ,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,SAAS,EACjD,QAAQ,EAAE,QAAQ,EAClB,QAAQ,EAAE,QAAQ,EAClB,QAAQ,EAAE,QAAQ,EAClB,OAAO,EAAE,CAAC,CAAC,MAAM,GAChB,CACF,CAAC;gBACH,CAAC,CAAC,GACG,EACN,KAAC,eAAe,IAAC,MAAM,EAAE,MAAM,GAAI,IACzB,CACX,CAAC;AACH,CAAC;AAED,MAAM,CAAC,MAAM,UAAU,GAAG,kBAAkB,CAAC,YAAY,EAAE,iBAAiB,CAAC,CAAC"}
@@ -2,8 +2,17 @@ import { fillComponentExpressions, } from './fill-components/fill-component-expr
2
2
  import { checkRoundaboutControl } from '../reducer/controls/check-roundabout-control';
3
3
  import { checkBaseControl } from '../reducer/controls/check-base-control';
4
4
  import { getComponentsFromState } from './get-components-from-state';
5
+ /**
6
+ * Check if the component is a Loop or a RosterForLoop
7
+ */
5
8
  const isLoopComponent = (component) => {
6
- return ['Loop', 'RosterForLoop', 'Roundabout'].includes(component.componentType);
9
+ return ['Loop', 'RosterForLoop'].includes(component.componentType);
10
+ };
11
+ /**
12
+ * Check if the component is a Roundabout
13
+ */
14
+ const isRoundaboutComponent = (component) => {
15
+ return component.componentType === 'Roundabout';
7
16
  };
8
17
  const isQuestionComponent = (component) => {
9
18
  return 'Question' === component.componentType;
@@ -22,7 +31,10 @@ function checkComponents(state, components, currentErrors) {
22
31
  errors[component.id] = componentErrors;
23
32
  }
24
33
  }
25
- // For loop, inspect children
34
+ // For Loop and RosterForLoop, inspect iterations for row controls
35
+ if (isRoundaboutComponent(component))
36
+ errors = checkRoundabout(state, component, errors);
37
+ // For Loop and RosterForLoop, inspect children
26
38
  if (isLoopComponent(component))
27
39
  errors = checkLoop(state, component, errors);
28
40
  // For Question, loop over children
@@ -31,6 +43,14 @@ function checkComponents(state, components, currentErrors) {
31
43
  }
32
44
  return errors;
33
45
  }
46
+ function checkRoundabout(state, component, errors) {
47
+ var _a;
48
+ const rowControls = (_a = component.controls) === null || _a === void 0 ? void 0 : _a.filter((c) => c.type === 'ROW');
49
+ if (rowControls === null || rowControls === void 0 ? void 0 : rowControls.length) {
50
+ errors = checkComponentInLoop(state, { ...component, controls: rowControls }, errors);
51
+ }
52
+ return errors;
53
+ }
34
54
  function checkLoop(state, component, errors) {
35
55
  var _a;
36
56
  const rowControls = (_a = component.controls) === null || _a === void 0 ? void 0 : _a.filter((c) => c.type === 'ROW');
@@ -45,12 +65,10 @@ function checkLoop(state, component, errors) {
45
65
  function checkControls(controls, executeExpression, pager) {
46
66
  return controls
47
67
  .map((control) => {
48
- switch (control.type) {
49
- case 'roundabout':
50
- return checkRoundaboutControl(control, executeExpression);
51
- default:
52
- return checkBaseControl(control, executeExpression, pager);
68
+ if (control.type === 'roundabout') {
69
+ return checkRoundaboutControl(control, executeExpression);
53
70
  }
71
+ return checkBaseControl(control, executeExpression, pager);
54
72
  })
55
73
  .filter((error) => error !== undefined);
56
74
  }
@@ -84,6 +102,7 @@ function computeIterations(component, executeExpression) {
84
102
  * Errors are returned using a map of id suffixed with the iteration index (ex: {prenom-1: [], prenom-3: []})
85
103
  */
86
104
  function checkComponentInLoop(state, component, errors) {
105
+ var _a;
87
106
  // For Question, loop over children
88
107
  if (component.componentType === 'Question') {
89
108
  for (const child of component.components) {
@@ -108,6 +127,13 @@ function checkComponentInLoop(state, component, errors) {
108
127
  if (!('controls' in component) || !component.controls) {
109
128
  continue;
110
129
  }
130
+ // For Roundabout, we don't check controls for iterations that are disabled
131
+ if (component.componentType === 'Roundabout' && component.item.disabled) {
132
+ const isIterationDisabled = state.executeExpression({ value: (_a = component.item.disabled) === null || _a === void 0 ? void 0 : _a.value, type: 'VTL' }, iterationPager);
133
+ if (isIterationDisabled) {
134
+ continue;
135
+ }
136
+ }
111
137
  // The component is filtered on this iteration, skip it
112
138
  if (
113
139
  // conditionFilter can be the interpreted expression, or the object representing the expression
@@ -1 +1 @@
1
- {"version":3,"file":"compile-controls.js","sourceRoot":"","sources":["../../../src/use-lunatic/commons/compile-controls.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"compile-controls.js","sourceRoot":"","sources":["../../../src/use-lunatic/commons/compile-controls.ts"],"names":[],"mappings":"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"}
@@ -12,7 +12,7 @@ export function getIterationsProp(definition, state) {
12
12
  }
13
13
  // Iterations expression is not present on the component definition
14
14
  // infer it from the value of child components
15
- return definition.components.reduce((acc, component) => {
15
+ return getFlatComponentsInLoop(definition).reduce((acc, component) => {
16
16
  if (!hasResponse(component)) {
17
17
  return acc;
18
18
  }
@@ -23,4 +23,15 @@ export function getIterationsProp(definition, state) {
23
23
  return acc;
24
24
  }, 0);
25
25
  }
26
+ function getFlatComponentsInLoop(definition) {
27
+ if (definition.componentType !== 'RosterForLoop' &&
28
+ definition.componentType !== 'Loop') {
29
+ return [definition];
30
+ }
31
+ return definition.components.reduce((acc, component) => {
32
+ if (component.componentType === 'Question')
33
+ return [...acc, ...component.components];
34
+ return [...acc, component];
35
+ }, []);
36
+ }
26
37
  //# sourceMappingURL=propIterations.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"propIterations.js","sourceRoot":"","sources":["../../../src/use-lunatic/props/propIterations.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AACxD,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAGnD,MAAM,UAAU,iBAAiB,CAChC,UAAsC,EACtC,KAIC;IAED,IAAI,YAAY,IAAI,UAAU,IAAI,UAAU,CAAC,UAAU,EAAE,CAAC;QACzD,OAAO,QAAQ,CACd,KAAK,CAAC,iBAAiB,CAAC,UAAU,CAAC,UAAU,EAAE;YAC9C,SAAS,EAAE,KAAK,CAAC,KAAK,CAAC,SAAS;SAChC,CAAC,CACF,CAAC;IACH,CAAC;IAED,IACC,UAAU,CAAC,aAAa,KAAK,eAAe;QAC5C,UAAU,CAAC,aAAa,KAAK,MAAM,EAClC,CAAC;QACF,OAAO,SAAS,CAAC;IAClB,CAAC;IAED,mEAAmE;IACnE,8CAA8C;IAC9C,OAAQ,UAAU,CAAC,UAA2C,CAAC,MAAM,CACpE,CAAC,GAAG,EAAE,SAAS,EAAE,EAAE;QAClB,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,EAAE,CAAC;YAC7B,OAAO,GAAG,CAAC;QACZ,CAAC;QACD,MAAM,KAAK,GAAG,KAAK,CAAC,SAAS,CAAC,GAAG,CAChC,SAAS,CAAC,QAAQ,CAAC,IAAI,EACvB,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CACrE,CAAC;QACF,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,MAAM,GAAG,GAAG,EAAE,CAAC;YAChD,OAAO,KAAK,CAAC,MAAM,CAAC;QACrB,CAAC;QACD,OAAO,GAAG,CAAC;IACZ,CAAC,EACD,CAAC,CACD,CAAC;AACH,CAAC"}
1
+ {"version":3,"file":"propIterations.js","sourceRoot":"","sources":["../../../src/use-lunatic/props/propIterations.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AACxD,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAGnD,MAAM,UAAU,iBAAiB,CAChC,UAAsC,EACtC,KAIC;IAED,IAAI,YAAY,IAAI,UAAU,IAAI,UAAU,CAAC,UAAU,EAAE,CAAC;QACzD,OAAO,QAAQ,CACd,KAAK,CAAC,iBAAiB,CAAC,UAAU,CAAC,UAAU,EAAE;YAC9C,SAAS,EAAE,KAAK,CAAC,KAAK,CAAC,SAAS;SAChC,CAAC,CACF,CAAC;IACH,CAAC;IAED,IACC,UAAU,CAAC,aAAa,KAAK,eAAe;QAC5C,UAAU,CAAC,aAAa,KAAK,MAAM,EAClC,CAAC;QACF,OAAO,SAAS,CAAC;IAClB,CAAC;IAED,mEAAmE;IACnE,8CAA8C;IAE9C,OAAO,uBAAuB,CAAC,UAAU,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,SAAS,EAAE,EAAE;QACpE,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,EAAE,CAAC;YAC7B,OAAO,GAAG,CAAC;QACZ,CAAC;QACD,MAAM,KAAK,GAAG,KAAK,CAAC,SAAS,CAAC,GAAG,CAChC,SAAS,CAAC,QAAQ,CAAC,IAAI,EACvB,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CACrE,CAAC;QACF,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,MAAM,GAAG,GAAG,EAAE,CAAC;YAChD,OAAO,KAAK,CAAC,MAAM,CAAC;QACrB,CAAC;QACD,OAAO,GAAG,CAAC;IACZ,CAAC,EAAE,CAAC,CAAC,CAAC;AACP,CAAC;AAED,SAAS,uBAAuB,CAC/B,UAAsC;IAEtC,IACC,UAAU,CAAC,aAAa,KAAK,eAAe;QAC5C,UAAU,CAAC,aAAa,KAAK,MAAM,EAClC,CAAC;QACF,OAAO,CAAC,UAAU,CAAC,CAAC;IACrB,CAAC;IAED,OAAO,UAAU,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,SAAS,EAAE,EAAE;QACtD,IAAI,SAAS,CAAC,aAAa,KAAK,UAAU;YACzC,OAAO,CAAC,GAAG,GAAG,EAAE,GAAG,SAAS,CAAC,UAAU,CAAC,CAAC;QAC1C,OAAO,CAAC,GAAG,GAAG,EAAE,SAAS,CAAC,CAAC;IAC5B,CAAC,EAAE,EAAkC,CAAC,CAAC;AACxC,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"check-base-control.js","sourceRoot":"","sources":["../../../../src/use-lunatic/reducer/controls/check-base-control.ts"],"names":[],"mappings":"AAOA,MAAM,UAAU,gBAAgB,CAC/B,WAA2B,EAC3B,iBAA2D,EAC3D,KAAmC;IAEnC,MAAM,EAAE,SAAS,EAAE,eAAe,EAAE,GAAG,KAAK,CAAC;IAC7C,MAAM,EAAE,WAAW,EAAE,YAAY,EAAE,EAAE,EAAE,aAAa,EAAE,OAAO,EAAE,GAAG,WAAW,CAAC;IAE9E,uEAAuE;IACvE,IAAI,CAAC,OAAO,EAAE,CAAC;QACd,OAAO,SAAS,CAAC;IAClB,CAAC;IAED,MAAM,MAAM,GAAG,iBAAiB,CAAC,OAAO,EAAE;QACzC,SAAS,EAAE,eAAe,aAAf,eAAe,cAAf,eAAe,GAAI,SAAS;KACvC,CAAC,CAAC;IAEH,IAAI,CAAC;QACJ;;;;;WAKG;QACH,IAAI,MAAM;YAAE,OAAO,SAAS,CAAC;QAE7B,MAAM,KAAK,GAAG,iBAAiB,CAAY,YAAY,EAAE;YACxD,SAAS;SACT,CAAC,CAAC;QACH,OAAO;YACN,WAAW;YACX,YAAY,EAAE,KAAK;YACnB,EAAE;YACF,aAAa;SACb,CAAC;IACH,CAAC;IAAC,WAAM,CAAC;QACR,OAAO,CAAC,IAAI,CAAC,+BAA+B,OAAO,CAAC,KAAK,EAAE,CAAC,CAAC;QAC7D,OAAO,SAAS,CAAC;IAClB,CAAC;AACF,CAAC"}
1
+ {"version":3,"file":"check-base-control.js","sourceRoot":"","sources":["../../../../src/use-lunatic/reducer/controls/check-base-control.ts"],"names":[],"mappings":"AAOA,MAAM,UAAU,gBAAgB,CAC/B,WAA2B,EAC3B,iBAA2D,EAC3D,KAAmC;IAEnC,MAAM,EAAE,SAAS,EAAE,eAAe,EAAE,GAAG,KAAK,CAAC;IAC7C,MAAM,EAAE,WAAW,EAAE,YAAY,EAAE,EAAE,EAAE,aAAa,EAAE,OAAO,EAAE,GAAG,WAAW,CAAC;IAE9E,uEAAuE;IACvE,IAAI,CAAC,OAAO,EAAE,CAAC;QACd,OAAO,SAAS,CAAC;IAClB,CAAC;IAED,MAAM,MAAM,GAAG,iBAAiB,CAAC,OAAO,EAAE;QACzC,SAAS,EAAE,eAAe,aAAf,eAAe,cAAf,eAAe,GAAI,SAAS;KACvC,CAAC,CAAC;IACH,IAAI,CAAC;QACJ;;;;;WAKG;QACH,IAAI,MAAM;YAAE,OAAO,SAAS,CAAC;QAE7B,MAAM,KAAK,GAAG,iBAAiB,CAAY,YAAY,EAAE;YACxD,SAAS;SACT,CAAC,CAAC;QACH,OAAO;YACN,WAAW;YACX,YAAY,EAAE,KAAK;YACnB,EAAE;YACF,aAAa;SACb,CAAC;IACH,CAAC;IAAC,WAAM,CAAC;QACR,OAAO,CAAC,IAAI,CAAC,+BAA+B,OAAO,CAAC,KAAK,EAAE,CAAC,CAAC;QAC7D,OAAO,SAAS,CAAC;IAClB,CAAC;AACF,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@inseefr/lunatic",
3
- "version": "3.6.5",
3
+ "version": "3.6.7",
4
4
  "description": "Library of questionnaire components",
5
5
  "repository": {
6
6
  "type": "git",
@@ -70,6 +70,8 @@
70
70
  "src/components/Loop/Loop.spec.tsx",
71
71
  "src/components/Loop/Loop.tsx",
72
72
  "src/components/Loop/constant.ts",
73
+ "src/components/Loop/utils.test.ts",
74
+ "src/components/Loop/utils.ts",
73
75
  "src/components/LunaticComponents.tsx",
74
76
  "src/components/PairwiseLinks/PairwiseLinks.tsx",
75
77
  "src/components/Question/Question.tsx",
@@ -238,11 +240,13 @@
238
240
  "src/stories/behaviour/cleaning/source-loop.json",
239
241
  "src/stories/behaviour/cleaning/source.json",
240
242
  "src/stories/behaviour/controls/controls.stories.tsx",
243
+ "src/stories/behaviour/controls/data-standalone-loop.json",
241
244
  "src/stories/behaviour/controls/source-boucles-n.json",
242
- "src/stories/behaviour/controls/source-loop.json",
245
+ "src/stories/behaviour/controls/source-roster-for-loop.json",
243
246
  "src/stories/behaviour/controls/source-roundabout.json",
244
247
  "src/stories/behaviour/controls/source-simple-numeric.json",
245
248
  "src/stories/behaviour/controls/source-simple.json",
249
+ "src/stories/behaviour/controls/source-standalone-loop.json",
246
250
  "src/stories/behaviour/disabled/disabled.stories.tsx",
247
251
  "src/stories/behaviour/disabled/source.json",
248
252
  "src/stories/behaviour/filter/filter.stories.tsx",
@@ -314,6 +318,7 @@
314
318
  "src/stories/radio/sourceHorizontal.json",
315
319
  "src/stories/roundabout/roundabout.stories.tsx",
316
320
  "src/stories/roundabout/source.json",
321
+ "src/stories/roundabout/sourceWithControl.json",
317
322
  "src/stories/sequence/sequence.stories.tsx",
318
323
  "src/stories/sequence/source-declarations.json",
319
324
  "src/stories/sequence/source.json",
@@ -410,6 +415,7 @@
410
415
  "src/use-lunatic/reducer/reducer.ts",
411
416
  "src/use-lunatic/reducer/reducerInitializer.tsx",
412
417
  "src/use-lunatic/type.ts",
418
+ "src/use-lunatic/use-lunatic-bug.test.ts",
413
419
  "src/use-lunatic/use-lunatic.test.ts",
414
420
  "src/use-lunatic/use-lunatic.ts",
415
421
  "src/utils/array.spec.ts",
@@ -534,6 +540,9 @@
534
540
  "components/Loop/constant.d.ts",
535
541
  "components/Loop/constant.js",
536
542
  "components/Loop/constant.js.map",
543
+ "components/Loop/utils.d.ts",
544
+ "components/Loop/utils.js",
545
+ "components/Loop/utils.js.map",
537
546
  "components/LunaticComponents.d.ts",
538
547
  "components/LunaticComponents.js",
539
548
  "components/LunaticComponents.js.map",
@@ -957,6 +966,9 @@
957
966
  "esm/components/Loop/constant.d.ts",
958
967
  "esm/components/Loop/constant.js",
959
968
  "esm/components/Loop/constant.js.map",
969
+ "esm/components/Loop/utils.d.ts",
970
+ "esm/components/Loop/utils.js",
971
+ "esm/components/Loop/utils.js.map",
960
972
  "esm/components/LunaticComponents.d.ts",
961
973
  "esm/components/LunaticComponents.js",
962
974
  "esm/components/LunaticComponents.js.map",
@@ -1975,7 +1987,8 @@
1975
1987
  },
1976
1988
  "devDependencies": {
1977
1989
  "@eslint/js": "^9.9.0",
1978
- "@playwright/test": "^1.46.0",
1990
+ "@playwright/browser-chromium": "^1.51.1",
1991
+ "@playwright/test": "^1.52.0",
1979
1992
  "@storybook/addon-a11y": "^8.2.9",
1980
1993
  "@storybook/addon-essentials": "^8.2.9",
1981
1994
  "@storybook/addon-interactions": "^8.2.9",
@@ -19,6 +19,7 @@ type Props = Pick<
19
19
  | 'options'
20
20
  | 'orientation'
21
21
  | 'detailAlwaysDisplayed'
22
+ | 'shouldBeFiltered'
22
23
  > & {
23
24
  errors?: LunaticError[];
24
25
  };
@@ -1,4 +1,4 @@
1
- import { type PropsWithChildren, useCallback, useState } from 'react';
1
+ import { type PropsWithChildren } from 'react';
2
2
  import D from '../../i18n';
3
3
  import { times } from '../../utils/array';
4
4
  import { LunaticComponents } from '../LunaticComponents';
@@ -13,45 +13,16 @@ import {
13
13
  getComponentErrors,
14
14
  } from '../shared/ComponentErrors/ComponentErrors';
15
15
  import type { LunaticError } from '../../use-lunatic/type';
16
+ import { useLoopUtils } from './utils';
16
17
 
17
18
  /**
18
19
  * Loop without specific markup (stack of subcomponents)
19
20
  */
20
- export function Loop({
21
- lines,
22
- iterations,
23
- value,
24
- handleChanges,
25
- getComponents,
26
- errors,
27
- ...props
28
- }: LunaticComponentProps<'Loop'>) {
29
- const min = lines?.min ?? 0;
30
- const max = lines?.max ?? Infinity;
31
- const [nbRows, setNbRows] = useState(() => {
32
- return Math.max(iterations, min);
33
- });
34
- const addRow = useCallback(() => {
35
- if (nbRows < max) {
36
- setNbRows(nbRows + 1);
37
- }
38
- }, [max, nbRows]);
39
- const removeRow = useCallback(() => {
40
- if (nbRows > 1) {
41
- const newNbRows = nbRows - 1;
42
- setNbRows(newNbRows);
43
- // Downsize all variables by 1
44
- const newResponses = Object.entries(value).map(([k, v]) => {
45
- return {
46
- name: k,
47
- value: v?.filter((_, i) => i < newNbRows),
48
- };
49
- });
50
- handleChanges(newResponses);
51
- }
52
- }, [nbRows, handleChanges, value]);
21
+ export function Loop(props: LunaticComponentProps<'Loop'>) {
22
+ const { min, max, nbRows, addRow, removeRow } = useLoopUtils(props);
23
+ const { getComponents, errors } = props;
53
24
 
54
- if (nbRows <= 0) {
25
+ if (nbRows === 0) {
55
26
  return null;
56
27
  }
57
28
 
@@ -0,0 +1,39 @@
1
+ import { renderHook } from '@testing-library/react';
2
+ import { describe, expect, it, vi } from 'vitest';
3
+ import { useLoopUtils } from './utils';
4
+
5
+ describe('useLoopUtils()', () => {
6
+ it('should handleChange where values have not the right size', () => {
7
+ const mockHandleChange = vi.fn();
8
+
9
+ renderHook(() =>
10
+ useLoopUtils({
11
+ handleChanges: mockHandleChange,
12
+ iterations: 5,
13
+ lines: { min: 2, max: 10 },
14
+ value: { NAME: ['John', 'Doe'], AGE: [10, 20] },
15
+ })
16
+ );
17
+
18
+ expect(mockHandleChange).toHaveBeenCalledOnce();
19
+ expect(mockHandleChange).toHaveBeenCalledWith([
20
+ { name: 'NAME', value: ['John', 'Doe', null, null, null] },
21
+ { name: 'AGE', value: [10, 20, null, null, null] },
22
+ ]);
23
+ });
24
+
25
+ it('should NOT handleChange where values have the right size', () => {
26
+ const mockHandleChange = vi.fn();
27
+
28
+ renderHook(() =>
29
+ useLoopUtils({
30
+ handleChanges: mockHandleChange,
31
+ iterations: 2,
32
+ lines: { min: 2, max: 10 },
33
+ value: { NAME: ['John', 'Doe'], AGE: [10, 20] },
34
+ })
35
+ );
36
+
37
+ expect(mockHandleChange).toHaveBeenCalledTimes(0);
38
+ });
39
+ });
@@ -0,0 +1,73 @@
1
+ import { useCallback, useEffect, useState } from 'react';
2
+ import { LunaticComponentProps } from '../type';
3
+ import { resizeArrayVariable } from '../../use-lunatic/reducer/commons';
4
+
5
+ const DEFAULT_MIN_ROWS = 1;
6
+ const DEFAULT_MAX_ROWS = 12;
7
+
8
+ export const useLoopUtils = (
9
+ props: Pick<
10
+ LunaticComponentProps<'RosterForLoop'> | LunaticComponentProps<'Loop'>,
11
+ 'lines' | 'iterations' | 'value' | 'handleChanges'
12
+ >
13
+ ) => {
14
+ const { lines, iterations, value: valueMap, handleChanges } = props;
15
+ const min = lines?.min ?? DEFAULT_MIN_ROWS;
16
+ const max = lines?.max ?? DEFAULT_MAX_ROWS;
17
+ const [nbRows, setNbRows] = useState(
18
+ Math.max(min, iterations ?? DEFAULT_MIN_ROWS)
19
+ );
20
+
21
+ /**
22
+ * For Loop & rosterForLoop,
23
+ * Value can be inconsistent i.e the value has not the right size
24
+ * The function add null values to the end of value (array), only when component is mount
25
+ *
26
+ * This the case when size of value is defined by VTL (but the value is not triggered by change)
27
+ * - ex: external variable indicate the size of variable
28
+ * - ex: min != max
29
+ *
30
+ * Improvment: do some kind of dynamic resizing and remove this useEffect.
31
+ * Variables must be consistent in variable-store.
32
+ */
33
+ useEffect(() => {
34
+ const initialResponses = Object.entries(valueMap)
35
+ .filter(([, v]) => (v?.length ?? 0) < nbRows)
36
+ .map(([k, v]) => ({
37
+ name: k,
38
+ value: resizeArrayVariable(v, nbRows, null),
39
+ }));
40
+ if (initialResponses.length > 0) handleChanges(initialResponses);
41
+ // eslint-disable-next-line react-hooks/exhaustive-deps
42
+ }, []);
43
+
44
+ const addRow = useCallback(() => {
45
+ if (nbRows < max) {
46
+ const newNbRows = nbRows + 1;
47
+ setNbRows(newNbRows);
48
+ const newResponses = Object.entries(valueMap).map(([k, v]) => ({
49
+ name: k,
50
+ value: resizeArrayVariable(v, newNbRows, null),
51
+ }));
52
+ handleChanges(newResponses);
53
+ }
54
+ }, [max, nbRows, valueMap, handleChanges]);
55
+
56
+ const removeRow = useCallback(() => {
57
+ if (nbRows <= min) {
58
+ return;
59
+ }
60
+ const newNbRows = nbRows - 1;
61
+ setNbRows(newNbRows);
62
+ // Downsize all variables by 1
63
+ const newResponses = Object.entries(valueMap).map(([k, v]) => {
64
+ return {
65
+ name: k,
66
+ value: v?.filter((_, i) => i < newNbRows),
67
+ };
68
+ });
69
+ handleChanges(newResponses);
70
+ }, [nbRows, min, valueMap, handleChanges]);
71
+
72
+ return { min, max, nbRows, addRow, removeRow };
73
+ };