@inseefr/lunatic 3.13.4 → 3.13.5-rc-fix-multimode.1

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];
 				}

package/src/stories/questionnaires/SRCV/data.json

@@ -0,0 +1,116 @@
+{
+    "id": "5a90586e-a2a3-4853-aa3a-f8ebd0f6e86b",
+    "questionnaireId": "4552-CAPI",
+    "personalization": [],
+    "data": {
+        "EXTERNAL": {
+            "ADR": "1 RUE DU GRAND CHENE 79200 PARTHENAY",
+            "TROPIQUE": "1"
+        },
+        "COLLECTED": {
+            "RESIND": [],
+            "LIENS": {
+                "COLLECTED": [
+                    [
+                        null,
+                        "17",
+                        "17"
+                    ],
+                    [
+                        "17",
+                        null,
+                        "17"
+                    ],
+                    [
+                        "17",
+                        "17"
+                    ]
+                ]
+            },
+            "T_NHAB": {
+                "COLLECTED": 3
+            },
+            "T_SEXE": {
+                "COLLECTED": [
+                    "1",
+                    "1",
+                    "1"
+                ]
+            },
+            "T_STOC": {
+                "COLLECTED": "3"
+            },
+            "T_STOL": {
+                "COLLECTED": "2"
+            },
+            "T_LNAIS": {
+                "COLLECTED": [
+                    "1",
+                    "1",
+                    "1"
+                ]
+            },
+            "T_UNLOG": {
+                "COLLECTED": [
+                    "2",
+                    "2",
+                    "2"
+                ]
+            },
+            "DATE_ITW": {
+                "COLLECTED": "2027-03-01"
+            },
+            "T_PRENOM": {
+                "COLLECTED": [
+                    "Lucas",
+                    "Mathieu",
+                    "Antoine"
+                ]
+            },
+            "T_TYPLOG": {
+                "COLLECTED": "1"
+            },
+            "T_DEPNAIS": {
+                "COLLECTED": [
+                    "Seine-Saint-Denis",
+                    "Seine-et-Marne",
+                    "Seine-Maritime"
+                ]
+            },
+            "T_NATION1": {
+                "COLLECTED": [
+                    true,
+                    true,
+                    true
+                ]
+            },
+            "T_NPIECES": {
+                "COLLECTED": 5
+            },
+            "T_SURFACE": {
+                "COLLECTED": 98
+            },
+            "T_TYPMAIS": {
+                "COLLECTED": "2"
+            },
+            "T_DATENAIS": {
+                "COLLECTED": [
+                    "1998-02-19",
+                    "1997-06-03",
+                    "1999-06-14"
+                ]
+            },
+            "T_EMMENAGE": {
+                "COLLECTED": "2023"
+            },
+            "T_LOGPROPRI": {
+                "COLLECTED": "6"
+            }
+        }
+    },
+    "stateData": {
+        "state": "INIT",
+        "date": 1790865361892,
+        "currentPage": "1"
+    }
+}