@inseefr/lunatic 3.13.4 → 3.13.6-rc-fix-multimode.0

package/esm/hooks/useMultimode.js

@@ -45,26 +45,37 @@ import { forceInt } from '../utils/number';
  */
 export function useMultimode(source, store) {
     const getMultimode = useCallback(() => {
-        var _a;
+        var _a, _b, _c, _d, _e, _f;
         if (!source.multimode) {
             return {};
         }
-        const roundabout = findComponentById(source.components, source.multimode.leaf.source);
+        // Initialize rules to empty objects if they do not exist
+        const questionnaireRules = ((_a = source.multimode.questionnaire) === null || _a === void 0 ? void 0 : _a.rules) || {};
+        const leafRules = ((_b = source.multimode.leaf) === null || _b === void 0 ? void 0 : _b.rules) || {};
+        // If neither has rules, return an empty object
+        if (Object.keys(questionnaireRules).length === 0 && Object.keys(leafRules).length === 0) {
+            return {};
+        }
+        // Get unique rule keys
         const keys = new Set([
-            ...Object.keys(source.multimode.questionnaire.rules),
-            ...Object.keys(source.multimode.leaf.rules),
+            ...Object.keys(questionnaireRules),
+            ...Object.keys(leafRules),
         ]);
-        const iterations = forceInt(store.run((_a = roundabout === null || roundabout === void 0 ? void 0 : roundabout.iterations.value) !== null && _a !== void 0 ? _a : '0'));
+        // Handle the case where leaf.source exists to retrieve iterations
+        let iterations = 0;
+        if ((_c = source.multimode.leaf) === null || _c === void 0 ? void 0 : _c.source) {
+            const roundabout = findComponentById(source.components, source.multimode.leaf.source);
+            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);
+        }
         return Object.fromEntries(Array.from(keys).map((key) => {
-            var _a, _b;
-            // Check the value at questionnaire level
-            const questionnaireExpression = (_a = source.multimode) === null || _a === void 0 ? void 0 : _a.questionnaire.rules[key];
+            // Check the rule at the questionnaire level
+            const questionnaireExpression = questionnaireRules[key];
             if (questionnaireExpression &&
                 store.run(questionnaireExpression.value)) {
                 return [key, true];
             }
-            const leafExpression = (_b = source.multimode) === null || _b === void 0 ? void 0 : _b.leaf.rules[key];
-            // There is no expression for the leaf
+            // Check the rule at the leaf level
+            const leafExpression = leafRules[key];
             if (!leafExpression) {
                 return [key, false];
             }

package/esm/hooks/useMultimode.js.map

@@ -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,UAAU,GAAG,iBAAiB,CACnC,MAAM,CAAC,UAAU,EACjB,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,CAC5B,CAAC;QAEF,MAAM,IAAI,GAAG,IAAI,GAAG,CAAC;YACpB,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,aAAa,CAAC,KAAK,CAAC;YACpD,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC;SAC3C,CAAC,CAAC;QACH,MAAM,UAAU,GAAG,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,MAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,UAAU,CAAC,KAAK,mCAAI,GAAG,CAAC,CAAC,CAAC;QAE5E,OAAO,MAAM,CAAC,WAAW,CACxB,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;;YAC5B,yCAAyC;YACzC,MAAM,uBAAuB,GAC5B,MAAA,MAAM,CAAC,SAAS,0CAAE,aAAa,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YAC5C,IACC,uBAAuB;gBACvB,KAAK,CAAC,GAAG,CAAC,uBAAuB,CAAC,KAAK,CAAC,EACvC,CAAC;gBACF,OAAO,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;YACpB,CAAC;YAED,MAAM,cAAc,GAAG,MAAA,MAAM,CAAC,SAAS,0CAAE,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YAEzD,sCAAsC;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"}
+{"version":3,"file":"useMultimode.js","sourceRoot":"","sources":["../../src/hooks/useMultimode.ts"],"names":[],"mappings":"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"}

package/hooks/useMultimode.js

@@ -51,21 +51,33 @@ function useMultimode(source, store) {
         if (!source.multimode) {
             return {};
         }
-        const roundabout = (0, getArticulationState_1.findComponentById)(source.components, source.multimode.leaf.source);
+        // Initialize rules to empty objects if they do not exist
+        const questionnaireRules = source.multimode.questionnaire?.rules || {};
+        const leafRules = source.multimode.leaf?.rules || {};
+        // If neither has rules, return an empty object
+        if (Object.keys(questionnaireRules).length === 0 && Object.keys(leafRules).length === 0) {
+            return {};
+        }
+        // Get unique rule keys
         const keys = new Set([
-            ...Object.keys(source.multimode.questionnaire.rules),
-            ...Object.keys(source.multimode.leaf.rules),
+            ...Object.keys(questionnaireRules),
+            ...Object.keys(leafRules),
         ]);
-        const iterations = (0, number_1.forceInt)(store.run(roundabout?.iterations.value ?? '0'));
+        // Handle the case where leaf.source exists to retrieve iterations
+        let iterations = 0;
+        if (source.multimode.leaf?.source) {
+            const roundabout = (0, getArticulationState_1.findComponentById)(source.components, source.multimode.leaf.source);
+            iterations = (0, number_1.forceInt)(store.run(roundabout?.iterations?.value ?? '') ?? 0);
+        }
         return Object.fromEntries(Array.from(keys).map((key) => {
-            // Check the value at questionnaire level
-            const questionnaireExpression = source.multimode?.questionnaire.rules[key];
+            // Check the rule at the questionnaire level
+            const questionnaireExpression = questionnaireRules[key];
             if (questionnaireExpression &&
                 store.run(questionnaireExpression.value)) {
                 return [key, true];
             }
-            const leafExpression = source.multimode?.leaf.rules[key];
-            // There is no expression for the leaf
+            // Check the rule at the leaf level
+            const leafExpression = leafRules[key];
             if (!leafExpression) {
                 return [key, false];
             }

package/hooks/useMultimode.js.map

@@ -1 +1 @@
-{"version":3,"file":"useMultimode.js","sourceRoot":"","sources":["../src/hooks/useMultimode.ts"],"names":[],"mappings":";;AAgDA,oCAqDC;AAnGD,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,MAAM,UAAU,GAAG,IAAA,wCAAiB,EACnC,MAAM,CAAC,UAAU,EACjB,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,CAC5B,CAAC;QAEF,MAAM,IAAI,GAAG,IAAI,GAAG,CAAC;YACpB,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,aAAa,CAAC,KAAK,CAAC;YACpD,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC;SAC3C,CAAC,CAAC;QACH,MAAM,UAAU,GAAG,IAAA,iBAAQ,EAAC,KAAK,CAAC,GAAG,CAAC,UAAU,EAAE,UAAU,CAAC,KAAK,IAAI,GAAG,CAAC,CAAC,CAAC;QAE5E,OAAO,MAAM,CAAC,WAAW,CACxB,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;YAC5B,yCAAyC;YACzC,MAAM,uBAAuB,GAC5B,MAAM,CAAC,SAAS,EAAE,aAAa,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YAC5C,IACC,uBAAuB;gBACvB,KAAK,CAAC,GAAG,CAAC,uBAAuB,CAAC,KAAK,CAAC,EACvC,CAAC;gBACF,OAAO,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;YACpB,CAAC;YAED,MAAM,cAAc,GAAG,MAAM,CAAC,SAAS,EAAE,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YAEzD,sCAAsC;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"}
+{"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

@@ -1,6 +1,6 @@
 {
     "name": "@inseefr/lunatic",
-    "version": "3.13.4",
+    "version": "3.13.6-rc-fix-multimode.0",
     "description": "Library of questionnaire components",
     "repository": {
         "type": "git",
@@ -29,6 +29,7 @@
             "email": "nicolas.laval@insee.fr"
         }
     ],
+    "packageManager": "pnpm@11.8.0",
     "main": "./index.js",
     "types": "./index.d.ts",
     "module": "./esm/index.js",
@@ -87,6 +88,7 @@
         "src/components/Sequence/Sequence.tsx",
         "src/components/Subsequence/Subsequence.spec.tsx",
         "src/components/Subsequence/Subsequence.tsx",
+        "src/components/Suggester/CustomSuggester.spec.tsx",
         "src/components/Suggester/CustomSuggester.tsx",
         "src/components/Suggester/Suggester.spec.tsx",
         "src/components/Suggester/Suggester.tsx",
@@ -603,6 +605,9 @@
         "components/Suggester/CustomSuggester.d.ts",
         "components/Suggester/CustomSuggester.js",
         "components/Suggester/CustomSuggester.js.map",
+        "components/Suggester/CustomSuggester.spec.d.ts",
+        "components/Suggester/CustomSuggester.spec.js",
+        "components/Suggester/CustomSuggester.spec.js.map",
         "components/Suggester/Suggester.d.ts",
         "components/Suggester/Suggester.js",
         "components/Suggester/Suggester.js.map",
@@ -1035,6 +1040,9 @@
         "esm/components/Suggester/CustomSuggester.d.ts",
         "esm/components/Suggester/CustomSuggester.js",
         "esm/components/Suggester/CustomSuggester.js.map",
+        "esm/components/Suggester/CustomSuggester.spec.d.ts",
+        "esm/components/Suggester/CustomSuggester.spec.js",
+        "esm/components/Suggester/CustomSuggester.spec.js.map",
         "esm/components/Suggester/Suggester.d.ts",
         "esm/components/Suggester/Suggester.js",
         "esm/components/Suggester/Suggester.js.map",
@@ -2053,8 +2061,8 @@
     },
     "devDependencies": {
         "@eslint/js": "^9.9.0",
-        "@playwright/browser-chromium": "^1.51.1",
-        "@playwright/test": "^1.52.0",
+        "@playwright/browser-chromium": "^1.61.1",
+        "@playwright/test": "^1.61.1",
         "@storybook/addon-a11y": "^8.2.9",
         "@storybook/addon-essentials": "^8.2.9",
         "@storybook/addon-interactions": "^8.2.9",

package/src/components/Dropdown/__snapshots__/Dropdown.spec.tsx.snap

@@ -15,7 +15,6 @@ exports[`Dropdown > renders without crashing 1`] = `
       >
         <div
           aria-autocomplete="list"
-          aria-controls="todo"
           aria-expanded="false"
           aria-haspopup="listbox"
           aria-labelledby="label-dropdown"
@@ -51,7 +50,6 @@ exports[`Dropdown > should handle readOnly 1`] = `
       >
         <div
           aria-autocomplete="list"
-          aria-controls="todo"
           aria-expanded="false"
           aria-haspopup="listbox"
           aria-labelledby="label-dropdown"

package/src/components/Suggester/CustomSuggester.spec.tsx

@@ -0,0 +1,32 @@
+import { fireEvent, render } from '@testing-library/react';
+import { describe, it, expect, vi } from 'vitest';
+import { CustomSuggester } from './CustomSuggester';
+
+const baseProps = {
+	id: 'suggester-1',
+	state: 'success' as const,
+	value: [] as [],
+	options: [],
+	search: '',
+	onSelect: vi.fn(),
+	onBlur: vi.fn(),
+	onFocus: vi.fn(),
+	onSearch: vi.fn(),
+	onClear: vi.fn(),
+	optionRenderer: vi.fn(),
+	labelRenderer: vi.fn(),
+};
+
+describe('CustomSuggester', () => {
+	it('should handle required', () => {
+		const { container } = render(<CustomSuggester {...baseProps} required />);
+
+		// expand combobox for having the input
+		const content = container.querySelector('.lunatic-combo-box-content');
+		fireEvent.click(content!);
+
+		const input = container.querySelector('input[type="text"]');
+		expect(input).toHaveAttribute('required');
+		expect(input).toHaveAttribute('aria-required', 'true');
+	});
+});

package/src/components/Suggester/CustomSuggester.tsx

@@ -35,6 +35,7 @@ type Props = {
 	onClear: () => void;
 	search: string;
 	state: 'loading' | 'error' | 'success';
+	required?: boolean;
 };
 
 export const CustomSuggester = slottableComponent<Props>(
@@ -61,6 +62,7 @@ export const CustomSuggester = slottableComponent<Props>(
 		onClear,
 		state,
 		onFocus,
+		required,
 	}) => {
 		const handleSelect = (id: string | null) => {
 			if (id === null) {
@@ -94,6 +96,7 @@ export const CustomSuggester = slottableComponent<Props>(
 				declarations={declarations}
 				description={description}
 				errors={errors}
+				required={required}
 			/>
 		);
 	}

package/src/components/Suggester/Suggester.tsx

@@ -35,6 +35,7 @@ export function WrappedSuggester({
 	iteration,
 	arbitrary,
 	arbitraryValue,
+	required,
 }: LunaticComponentProps<'Suggester'>) {
 	const { store, storeState, setStoreState, getLabelById } = useStore({
 		storeName,
@@ -182,6 +183,7 @@ export function WrappedSuggester({
 			onClear={handleClear}
 			disabled={disabled}
 			readOnly={readOnly}
+			required={required}
 			value={selectedOptions}
 			label={label}
 			onBlur={onBlur}

package/src/components/shared/Combobox/Combobox.tsx

@@ -68,6 +68,7 @@ function LunaticComboBox({
 	onBlur,
 	onFocus,
 	isLoading,
+	required,
 }: Props) {
 	const [expanded, setExpanded] = useState(false);
 	const [focused, setFocused] = useState(false);
@@ -180,6 +181,7 @@ function LunaticComboBox({
 					onChange={handleChange}
 					classNamePrefix={classNamePrefix}
 					invalid={!!errors}
+					required={required}
 				/>
 				<ComboboxPanel
 					isLoading={isLoading}

package/src/components/shared/Combobox/ComboboxType.ts

@@ -32,6 +32,7 @@ export type ComboboxSelectionProps = {
 	options: Array<ComboboxOptionType>;
 	search?: string;
 	disabled?: boolean;
+	required?: boolean;
 };
 
 export type ComboboxPanelProps = {

package/src/components/shared/Combobox/Selection/ComboboxInput.tsx

@@ -15,6 +15,7 @@ export type InputProps = {
 	focused?: boolean;
 	invalid?: boolean;
 	readOnly?: boolean;
+	required?: boolean;
 } & HTMLAttributes<HTMLInputElement>;
 
 function LunaticComboboxInput({
@@ -27,6 +28,7 @@ function LunaticComboboxInput({
 	focused,
 	className,
 	invalid,
+	required,
 }: InputProps) {
 	const inputEl = useRef<HTMLInputElement>(null);
 
@@ -52,6 +54,8 @@ function LunaticComboboxInput({
 			onChange={onChange}
 			value={value}
 			aria-invalid={invalid}
+			aria-required={required}
+			required={required}
 			title="combo-box"
 			autoComplete="off"
 			autoCapitalize="off"

package/src/components/shared/Combobox/Selection/ComboboxSelection.tsx

@@ -24,10 +24,11 @@ export function ComboboxSelection({
 	id,
 	classNamePrefix,
 	invalid,
+	required,
 }: ComboboxSelectionProps) {
 	const showLabel = !editable || !expanded;
 	const selectedOption =
-		selectedIndex !== undefined ? options[selectedIndex] : undefined;
+		selectedIndex === undefined ? undefined : options[selectedIndex];
 	const LabelSelectionComponent = labelRenderer ?? ComboboxLabelSelection;
 
 	return (
@@ -41,7 +42,6 @@ export function ComboboxSelection({
 				}
 			)}
 			role="combobox"
-			aria-controls={'todo'}
 			aria-haspopup="listbox"
 			aria-expanded={expanded}
 			aria-autocomplete="list"
@@ -70,6 +70,7 @@ export function ComboboxSelection({
 					readOnly={readOnly}
 					focused={focused}
 					labelledBy={labelId}
+					required={required}
 				/>
 			)}
 		</div>

package/src/components/shared/Combobox/Selection/__snapshots__/ComboboxSelection.spec.tsx.snap

@@ -3,7 +3,6 @@
 exports[`Selection component > should render correctly when it is disabled 1`] = `
 <div
   aria-autocomplete="list"
-  aria-controls="todo"
   aria-haspopup="listbox"
   class="lunatic-combo-box-selection disabled"
   role="combobox"
@@ -23,7 +22,6 @@ exports[`Selection component > should render correctly when it is disabled 1`] =
 exports[`Selection component > should render correctly when it is editable 1`] = `
 <div
   aria-autocomplete="list"
-  aria-controls="todo"
   aria-haspopup="listbox"
   class="lunatic-combo-box-selection"
   role="combobox"
@@ -41,7 +39,6 @@ exports[`Selection component > should render correctly when it is editable 1`] =
 exports[`Selection component > should render correctly when it is expanded 1`] = `
 <div
   aria-autocomplete="list"
-  aria-controls="todo"
   aria-expanded="true"
   aria-haspopup="listbox"
   class="lunatic-combo-box-selection"
@@ -60,7 +57,6 @@ exports[`Selection component > should render correctly when it is expanded 1`] =
 exports[`Selection component > should render correctly with default props 1`] = `
 <div
   aria-autocomplete="list"
-  aria-controls="todo"
   aria-haspopup="listbox"
   class="lunatic-combo-box-selection"
   role="combobox"

package/src/hooks/useMultimode.ts

@@ -55,22 +55,37 @@ export function useMultimode(
 			return {};
 		}
 
-		const roundabout = findComponentById(
-			source.components,
-			source.multimode.leaf.source
-		);
+		// Initialize rules to empty objects if they do not exist
+		const questionnaireRules = source.multimode.questionnaire?.rules || {};
+		const leafRules = source.multimode.leaf?.rules || {};
+
+		// If neither has rules, return an empty object
+		if (Object.keys(questionnaireRules).length === 0 && Object.keys(leafRules).length === 0) {
+			return {};
+		}
 
+		// Get unique rule keys
 		const keys = new Set([
-			...Object.keys(source.multimode.questionnaire.rules),
-			...Object.keys(source.multimode.leaf.rules),
+			...Object.keys(questionnaireRules),
+			...Object.keys(leafRules),
 		]);
-		const iterations = forceInt(store.run(roundabout?.iterations.value ?? '0'));
+
+		// Handle the case where leaf.source exists to retrieve iterations
+		let iterations = 0;
+		if (source.multimode.leaf?.source) {
+			const roundabout = findComponentById(
+				source.components,
+				source.multimode.leaf.source
+			);
+			iterations = forceInt(
+				store.run(roundabout?.iterations?.value ?? '') ?? 0
+			);
+		}
 
 		return Object.fromEntries(
 			Array.from(keys).map((key) => {
-				// Check the value at questionnaire level
-				const questionnaireExpression =
-					source.multimode?.questionnaire.rules[key];
+				// Check the rule at the questionnaire level
+				const questionnaireExpression = questionnaireRules[key];
 				if (
 					questionnaireExpression &&
 					store.run(questionnaireExpression.value)
@@ -78,9 +93,8 @@ export function useMultimode(
 					return [key, true];
 				}
 
-				const leafExpression = source.multimode?.leaf.rules[key];
-
-				// There is no expression for the leaf
+				// Check the rule at the leaf level
+				const leafExpression = leafRules[key];
 				if (!leafExpression) {
 					return [key, false];
 				}