@inseefr/lunatic 3.13.3 → 3.13.5-rc.3

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 (53) hide show
  1. package/components/PairwiseLinks/PairwiseLinks.js +3 -0
  2. package/components/PairwiseLinks/PairwiseLinks.js.map +1 -1
  3. package/components/Suggester/CustomSuggester.d.ts +1 -0
  4. package/components/Suggester/CustomSuggester.js +2 -2
  5. package/components/Suggester/CustomSuggester.js.map +1 -1
  6. package/components/Suggester/CustomSuggester.spec.d.ts +1 -0
  7. package/components/Suggester/CustomSuggester.spec.js +32 -0
  8. package/components/Suggester/CustomSuggester.spec.js.map +1 -0
  9. package/components/Suggester/Suggester.d.ts +1 -1
  10. package/components/Suggester/Suggester.js +2 -2
  11. package/components/Suggester/Suggester.js.map +1 -1
  12. package/components/shared/Combobox/Combobox.js +2 -2
  13. package/components/shared/Combobox/Combobox.js.map +1 -1
  14. package/components/shared/Combobox/ComboboxType.d.ts +1 -0
  15. package/components/shared/Combobox/Selection/ComboboxInput.d.ts +1 -0
  16. package/components/shared/Combobox/Selection/ComboboxInput.js +2 -2
  17. package/components/shared/Combobox/Selection/ComboboxInput.js.map +1 -1
  18. package/components/shared/Combobox/Selection/ComboboxSelection.d.ts +1 -1
  19. package/components/shared/Combobox/Selection/ComboboxSelection.js +3 -3
  20. package/components/shared/Combobox/Selection/ComboboxSelection.js.map +1 -1
  21. package/esm/components/PairwiseLinks/PairwiseLinks.js +3 -0
  22. package/esm/components/PairwiseLinks/PairwiseLinks.js.map +1 -1
  23. package/esm/components/Suggester/CustomSuggester.d.ts +1 -0
  24. package/esm/components/Suggester/CustomSuggester.js +2 -2
  25. package/esm/components/Suggester/CustomSuggester.js.map +1 -1
  26. package/esm/components/Suggester/CustomSuggester.spec.d.ts +1 -0
  27. package/esm/components/Suggester/CustomSuggester.spec.js +30 -0
  28. package/esm/components/Suggester/CustomSuggester.spec.js.map +1 -0
  29. package/esm/components/Suggester/Suggester.d.ts +1 -1
  30. package/esm/components/Suggester/Suggester.js +2 -2
  31. package/esm/components/Suggester/Suggester.js.map +1 -1
  32. package/esm/components/shared/Combobox/Combobox.js +2 -2
  33. package/esm/components/shared/Combobox/Combobox.js.map +1 -1
  34. package/esm/components/shared/Combobox/ComboboxType.d.ts +1 -0
  35. package/esm/components/shared/Combobox/Selection/ComboboxInput.d.ts +1 -0
  36. package/esm/components/shared/Combobox/Selection/ComboboxInput.js +2 -2
  37. package/esm/components/shared/Combobox/Selection/ComboboxInput.js.map +1 -1
  38. package/esm/components/shared/Combobox/Selection/ComboboxSelection.d.ts +1 -1
  39. package/esm/components/shared/Combobox/Selection/ComboboxSelection.js +3 -3
  40. package/esm/components/shared/Combobox/Selection/ComboboxSelection.js.map +1 -1
  41. package/package.json +11 -3
  42. package/src/components/Dropdown/__snapshots__/Dropdown.spec.tsx.snap +0 -2
  43. package/src/components/PairwiseLinks/PairwiseLinks.tsx +2 -0
  44. package/src/components/Suggester/CustomSuggester.spec.tsx +32 -0
  45. package/src/components/Suggester/CustomSuggester.tsx +3 -0
  46. package/src/components/Suggester/Suggester.tsx +2 -0
  47. package/src/components/shared/Combobox/Combobox.tsx +2 -0
  48. package/src/components/shared/Combobox/ComboboxType.ts +1 -0
  49. package/src/components/shared/Combobox/Selection/ComboboxInput.tsx +4 -0
  50. package/src/components/shared/Combobox/Selection/ComboboxSelection.tsx +3 -2
  51. package/src/components/shared/Combobox/Selection/__snapshots__/ComboboxSelection.spec.tsx.snap +0 -4
  52. package/src/stories/utils/OrchestratorData.tsx +7 -1
  53. package/tsconfig.build.tsbuildinfo +1 -1
@@ -1 +1 @@
1
- {"version":3,"file":"ComboboxSelection.js","sourceRoot":"","sources":["../../../../../src/components/shared/Combobox/Selection/ComboboxSelection.tsx"],"names":[],"mappings":";AAAA,OAAO,UAAU,MAAM,YAAY,CAAC;AACpC,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AAClE,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAIhD;;;GAGG;AACH,MAAM,UAAU,iBAAiB,CAAC,EACjC,aAAa,EACb,WAAW,EACX,MAAM,EACN,QAAQ,EACR,QAAQ,EACR,QAAQ,EACR,OAAO,EACP,QAAQ,EACR,aAAa,EACb,OAAO,EACP,QAAQ,EACR,OAAO,EACP,EAAE,EACF,eAAe,EACf,OAAO,GACiB;IACxB,MAAM,SAAS,GAAG,CAAC,QAAQ,IAAI,CAAC,QAAQ,CAAC;IACzC,MAAM,cAAc,GACnB,aAAa,KAAK,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IAClE,MAAM,uBAAuB,GAAG,aAAa,aAAb,aAAa,cAAb,aAAa,GAAI,sBAAsB,CAAC;IAExE,OAAO,CACN,cACC,EAAE,EAAE,EAAE,EACN,SAAS,EAAE,UAAU,CACpB,GAAG,eAAe,aAAf,eAAe,cAAf,eAAe,GAAI,SAAS,sBAAsB,EACrD;YACC,OAAO;YACP,QAAQ;SACR,CACD,EACD,IAAI,EAAC,UAAU,mBACA,MAAM,mBACP,SAAS,mBACR,QAAQ,uBACL,MAAM,eACb,EAAE,qBACI,OAAO,YAEvB,SAAS,CAAC,CAAC,CAAC,CACZ,KAAC,uBAAuB,IACvB,MAAM,EAAE,cAAc,EACtB,WAAW,EAAE,WAAW,EACxB,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,QAAQ,EAClB,QAAQ,EAAE,QAAQ,GACjB,CACF,CAAC,CAAC,CAAC,CACH,KAAC,aAAa,IACb,OAAO,EAAE,OAAO,EAChB,EAAE,EAAE,kBAAkB,EAAE,EAAE,EAC1B,SAAS,EAAC,yBAAyB,EACnC,QAAQ,EAAE,CAAC,CAAgC,EAAE,EAAE,WAC9C,OAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAG,MAAA,CAAC,CAAC,MAAM,CAAC,KAAK,mCAAI,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,CAAA,EAAA,EAEjD,KAAK,EAAE,MAAM,EACb,WAAW,EAAE,WAAW,EACxB,QAAQ,EAAE,QAAQ,EAClB,QAAQ,EAAE,QAAQ,EAClB,OAAO,EAAE,OAAO,EAChB,UAAU,EAAE,OAAO,GAClB,CACF,GACI,CACN,CAAC;AACH,CAAC"}
1
+ {"version":3,"file":"ComboboxSelection.js","sourceRoot":"","sources":["../../../../../src/components/shared/Combobox/Selection/ComboboxSelection.tsx"],"names":[],"mappings":";AAAA,OAAO,UAAU,MAAM,YAAY,CAAC;AACpC,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AAClE,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAIhD;;;GAGG;AACH,MAAM,UAAU,iBAAiB,CAAC,EACjC,aAAa,EACb,WAAW,EACX,MAAM,EACN,QAAQ,EACR,QAAQ,EACR,QAAQ,EACR,OAAO,EACP,QAAQ,EACR,aAAa,EACb,OAAO,EACP,QAAQ,EACR,OAAO,EACP,EAAE,EACF,eAAe,EACf,OAAO,EACP,QAAQ,GACgB;IACxB,MAAM,SAAS,GAAG,CAAC,QAAQ,IAAI,CAAC,QAAQ,CAAC;IACzC,MAAM,cAAc,GACnB,aAAa,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;IAClE,MAAM,uBAAuB,GAAG,aAAa,aAAb,aAAa,cAAb,aAAa,GAAI,sBAAsB,CAAC;IAExE,OAAO,CACN,cACC,EAAE,EAAE,EAAE,EACN,SAAS,EAAE,UAAU,CACpB,GAAG,eAAe,aAAf,eAAe,cAAf,eAAe,GAAI,SAAS,sBAAsB,EACrD;YACC,OAAO;YACP,QAAQ;SACR,CACD,EACD,IAAI,EAAC,UAAU,mBACD,SAAS,mBACR,QAAQ,uBACL,MAAM,eACb,EAAE,qBACI,OAAO,YAEvB,SAAS,CAAC,CAAC,CAAC,CACZ,KAAC,uBAAuB,IACvB,MAAM,EAAE,cAAc,EACtB,WAAW,EAAE,WAAW,EACxB,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,QAAQ,EAClB,QAAQ,EAAE,QAAQ,GACjB,CACF,CAAC,CAAC,CAAC,CACH,KAAC,aAAa,IACb,OAAO,EAAE,OAAO,EAChB,EAAE,EAAE,kBAAkB,EAAE,EAAE,EAC1B,SAAS,EAAC,yBAAyB,EACnC,QAAQ,EAAE,CAAC,CAAgC,EAAE,EAAE,WAC9C,OAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAG,MAAA,CAAC,CAAC,MAAM,CAAC,KAAK,mCAAI,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,CAAA,EAAA,EAEjD,KAAK,EAAE,MAAM,EACb,WAAW,EAAE,WAAW,EACxB,QAAQ,EAAE,QAAQ,EAClB,QAAQ,EAAE,QAAQ,EAClB,OAAO,EAAE,OAAO,EAChB,UAAU,EAAE,OAAO,EACnB,QAAQ,EAAE,QAAQ,GACjB,CACF,GACI,CACN,CAAC;AACH,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@inseefr/lunatic",
3
- "version": "3.13.3",
3
+ "version": "3.13.5-rc.3",
4
4
  "description": "Library of questionnaire components",
5
5
  "repository": {
6
6
  "type": "git",
@@ -29,6 +29,7 @@
29
29
  "email": "nicolas.laval@insee.fr"
30
30
  }
31
31
  ],
32
+ "packageManager": "pnpm@11.8.0",
32
33
  "main": "./index.js",
33
34
  "types": "./index.d.ts",
34
35
  "module": "./esm/index.js",
@@ -87,6 +88,7 @@
87
88
  "src/components/Sequence/Sequence.tsx",
88
89
  "src/components/Subsequence/Subsequence.spec.tsx",
89
90
  "src/components/Subsequence/Subsequence.tsx",
91
+ "src/components/Suggester/CustomSuggester.spec.tsx",
90
92
  "src/components/Suggester/CustomSuggester.tsx",
91
93
  "src/components/Suggester/Suggester.spec.tsx",
92
94
  "src/components/Suggester/Suggester.tsx",
@@ -603,6 +605,9 @@
603
605
  "components/Suggester/CustomSuggester.d.ts",
604
606
  "components/Suggester/CustomSuggester.js",
605
607
  "components/Suggester/CustomSuggester.js.map",
608
+ "components/Suggester/CustomSuggester.spec.d.ts",
609
+ "components/Suggester/CustomSuggester.spec.js",
610
+ "components/Suggester/CustomSuggester.spec.js.map",
606
611
  "components/Suggester/Suggester.d.ts",
607
612
  "components/Suggester/Suggester.js",
608
613
  "components/Suggester/Suggester.js.map",
@@ -1035,6 +1040,9 @@
1035
1040
  "esm/components/Suggester/CustomSuggester.d.ts",
1036
1041
  "esm/components/Suggester/CustomSuggester.js",
1037
1042
  "esm/components/Suggester/CustomSuggester.js.map",
1043
+ "esm/components/Suggester/CustomSuggester.spec.d.ts",
1044
+ "esm/components/Suggester/CustomSuggester.spec.js",
1045
+ "esm/components/Suggester/CustomSuggester.spec.js.map",
1038
1046
  "esm/components/Suggester/Suggester.d.ts",
1039
1047
  "esm/components/Suggester/Suggester.js",
1040
1048
  "esm/components/Suggester/Suggester.js.map",
@@ -2053,8 +2061,8 @@
2053
2061
  },
2054
2062
  "devDependencies": {
2055
2063
  "@eslint/js": "^9.9.0",
2056
- "@playwright/browser-chromium": "^1.51.1",
2057
- "@playwright/test": "^1.52.0",
2064
+ "@playwright/browser-chromium": "^1.61.1",
2065
+ "@playwright/test": "^1.61.1",
2058
2066
  "@storybook/addon-a11y": "^8.2.9",
2059
2067
  "@storybook/addon-essentials": "^8.2.9",
2060
2068
  "@storybook/addon-interactions": "^8.2.9",
@@ -15,7 +15,6 @@ exports[`Dropdown > renders without crashing 1`] = `
15
15
  >
16
16
  <div
17
17
  aria-autocomplete="list"
18
- aria-controls="todo"
19
18
  aria-expanded="false"
20
19
  aria-haspopup="listbox"
21
20
  aria-labelledby="label-dropdown"
@@ -51,7 +50,6 @@ exports[`Dropdown > should handle readOnly 1`] = `
51
50
  >
52
51
  <div
53
52
  aria-autocomplete="list"
54
- aria-controls="todo"
55
53
  aria-expanded="false"
56
54
  aria-haspopup="listbox"
57
55
  aria-labelledby="label-dropdown"
@@ -37,6 +37,8 @@ export const PairwiseLinks = (
37
37
  .map(([x, y]) => {
38
38
  const components = getComponents(x, y);
39
39
  const firstComponent = components[0];
40
+ // Display nothing if there is no component (due to filter)
41
+ if (firstComponent === undefined || firstComponent === null) return;
40
42
  if (firstComponent?.componentType !== 'Dropdown') {
41
43
  return (
42
44
  <div key={'PairwiseLinksLoop-error'}>
@@ -0,0 +1,32 @@
1
+ import { fireEvent, render } from '@testing-library/react';
2
+ import { describe, it, expect, vi } from 'vitest';
3
+ import { CustomSuggester } from './CustomSuggester';
4
+
5
+ const baseProps = {
6
+ id: 'suggester-1',
7
+ state: 'success' as const,
8
+ value: [] as [],
9
+ options: [],
10
+ search: '',
11
+ onSelect: vi.fn(),
12
+ onBlur: vi.fn(),
13
+ onFocus: vi.fn(),
14
+ onSearch: vi.fn(),
15
+ onClear: vi.fn(),
16
+ optionRenderer: vi.fn(),
17
+ labelRenderer: vi.fn(),
18
+ };
19
+
20
+ describe('CustomSuggester', () => {
21
+ it('should handle required', () => {
22
+ const { container } = render(<CustomSuggester {...baseProps} required />);
23
+
24
+ // expand combobox for having the input
25
+ const content = container.querySelector('.lunatic-combo-box-content');
26
+ fireEvent.click(content!);
27
+
28
+ const input = container.querySelector('input[type="text"]');
29
+ expect(input).toHaveAttribute('required');
30
+ expect(input).toHaveAttribute('aria-required', 'true');
31
+ });
32
+ });
@@ -35,6 +35,7 @@ type Props = {
35
35
  onClear: () => void;
36
36
  search: string;
37
37
  state: 'loading' | 'error' | 'success';
38
+ required?: boolean;
38
39
  };
39
40
 
40
41
  export const CustomSuggester = slottableComponent<Props>(
@@ -61,6 +62,7 @@ export const CustomSuggester = slottableComponent<Props>(
61
62
  onClear,
62
63
  state,
63
64
  onFocus,
65
+ required,
64
66
  }) => {
65
67
  const handleSelect = (id: string | null) => {
66
68
  if (id === null) {
@@ -94,6 +96,7 @@ export const CustomSuggester = slottableComponent<Props>(
94
96
  declarations={declarations}
95
97
  description={description}
96
98
  errors={errors}
99
+ required={required}
97
100
  />
98
101
  );
99
102
  }
@@ -35,6 +35,7 @@ export function WrappedSuggester({
35
35
  iteration,
36
36
  arbitrary,
37
37
  arbitraryValue,
38
+ required,
38
39
  }: LunaticComponentProps<'Suggester'>) {
39
40
  const { store, storeState, setStoreState, getLabelById } = useStore({
40
41
  storeName,
@@ -182,6 +183,7 @@ export function WrappedSuggester({
182
183
  onClear={handleClear}
183
184
  disabled={disabled}
184
185
  readOnly={readOnly}
186
+ required={required}
185
187
  value={selectedOptions}
186
188
  label={label}
187
189
  onBlur={onBlur}
@@ -68,6 +68,7 @@ function LunaticComboBox({
68
68
  onBlur,
69
69
  onFocus,
70
70
  isLoading,
71
+ required,
71
72
  }: Props) {
72
73
  const [expanded, setExpanded] = useState(false);
73
74
  const [focused, setFocused] = useState(false);
@@ -180,6 +181,7 @@ function LunaticComboBox({
180
181
  onChange={handleChange}
181
182
  classNamePrefix={classNamePrefix}
182
183
  invalid={!!errors}
184
+ required={required}
183
185
  />
184
186
  <ComboboxPanel
185
187
  isLoading={isLoading}
@@ -32,6 +32,7 @@ export type ComboboxSelectionProps = {
32
32
  options: Array<ComboboxOptionType>;
33
33
  search?: string;
34
34
  disabled?: boolean;
35
+ required?: boolean;
35
36
  };
36
37
 
37
38
  export type ComboboxPanelProps = {
@@ -15,6 +15,7 @@ export type InputProps = {
15
15
  focused?: boolean;
16
16
  invalid?: boolean;
17
17
  readOnly?: boolean;
18
+ required?: boolean;
18
19
  } & HTMLAttributes<HTMLInputElement>;
19
20
 
20
21
  function LunaticComboboxInput({
@@ -27,6 +28,7 @@ function LunaticComboboxInput({
27
28
  focused,
28
29
  className,
29
30
  invalid,
31
+ required,
30
32
  }: InputProps) {
31
33
  const inputEl = useRef<HTMLInputElement>(null);
32
34
 
@@ -52,6 +54,8 @@ function LunaticComboboxInput({
52
54
  onChange={onChange}
53
55
  value={value}
54
56
  aria-invalid={invalid}
57
+ aria-required={required}
58
+ required={required}
55
59
  title="combo-box"
56
60
  autoComplete="off"
57
61
  autoCapitalize="off"
@@ -24,10 +24,11 @@ export function ComboboxSelection({
24
24
  id,
25
25
  classNamePrefix,
26
26
  invalid,
27
+ required,
27
28
  }: ComboboxSelectionProps) {
28
29
  const showLabel = !editable || !expanded;
29
30
  const selectedOption =
30
- selectedIndex !== undefined ? options[selectedIndex] : undefined;
31
+ selectedIndex === undefined ? undefined : options[selectedIndex];
31
32
  const LabelSelectionComponent = labelRenderer ?? ComboboxLabelSelection;
32
33
 
33
34
  return (
@@ -41,7 +42,6 @@ export function ComboboxSelection({
41
42
  }
42
43
  )}
43
44
  role="combobox"
44
- aria-controls={'todo'}
45
45
  aria-haspopup="listbox"
46
46
  aria-expanded={expanded}
47
47
  aria-autocomplete="list"
@@ -70,6 +70,7 @@ export function ComboboxSelection({
70
70
  readOnly={readOnly}
71
71
  focused={focused}
72
72
  labelledBy={labelId}
73
+ required={required}
73
74
  />
74
75
  )}
75
76
  </div>
@@ -3,7 +3,6 @@
3
3
  exports[`Selection component > should render correctly when it is disabled 1`] = `
4
4
  <div
5
5
  aria-autocomplete="list"
6
- aria-controls="todo"
7
6
  aria-haspopup="listbox"
8
7
  class="lunatic-combo-box-selection disabled"
9
8
  role="combobox"
@@ -23,7 +22,6 @@ exports[`Selection component > should render correctly when it is disabled 1`] =
23
22
  exports[`Selection component > should render correctly when it is editable 1`] = `
24
23
  <div
25
24
  aria-autocomplete="list"
26
- aria-controls="todo"
27
25
  aria-haspopup="listbox"
28
26
  class="lunatic-combo-box-selection"
29
27
  role="combobox"
@@ -41,7 +39,6 @@ exports[`Selection component > should render correctly when it is editable 1`] =
41
39
  exports[`Selection component > should render correctly when it is expanded 1`] = `
42
40
  <div
43
41
  aria-autocomplete="list"
44
- aria-controls="todo"
45
42
  aria-expanded="true"
46
43
  aria-haspopup="listbox"
47
44
  class="lunatic-combo-box-selection"
@@ -60,7 +57,6 @@ exports[`Selection component > should render correctly when it is expanded 1`] =
60
57
  exports[`Selection component > should render correctly with default props 1`] = `
61
58
  <div
62
59
  aria-autocomplete="list"
63
- aria-controls="todo"
64
60
  aria-haspopup="listbox"
65
61
  class="lunatic-combo-box-selection"
66
62
  role="combobox"
@@ -140,7 +140,13 @@ const CleaningInfo = ({
140
140
  | {
141
141
  expression: string;
142
142
  shapeFrom?: string;
143
- isAggregatorUsed: boolean;
143
+ /**
144
+ * @deprecated
145
+ * use shouldCheckDuringResizing since lunaticModelVersion 5.16.0
146
+ */
147
+ isAggregatorUsed?: boolean;
148
+ shouldCheckDuringResizing?: boolean;
149
+ shouldCheckAllIterations?: boolean;
144
150
  }[];
145
151
  };
146
152
  }) => {