@inseefr/lunatic 3.0.0-rc.26 → 3.0.0-rc.27

package/lib/use-lunatic/type.d.ts

@@ -1,6 +1,9 @@
-import type { ReactNode } from 'react';
-import type { ComponentType, ControlType, LunaticSource, Variable } from './type-source';
+import type { FunctionComponent, PropsWithChildren, ReactNode } from 'react';
+import type { ComponentType, ControlType, Variable } from './type-source';
 import type { LunaticVariablesStore } from './commons/variables/lunatic-variables-store';
+import type { IndexEntry } from '../utils/search/SearchInterface';
+import type { InterpretedLunaticOverviewItem } from './hooks/useOverview';
+import type { LunaticComponentProps } from '../components/type';
 export type LunaticComponentDefinition<T extends ComponentType['componentType'] = ComponentType['componentType']> = ComponentType & {
     componentType: T;
 };
@@ -34,7 +37,6 @@ export type LunaticExpression = {
     type: ExpressionType;
     bindingDependencies?: string[];
 };
-export type TODO = unknown;
 export type PageTag = `${number}.${number}#${number}` | `${number}`;
 export type LunaticVariable = Variable;
 export type LunaticCollectedValue = Partial<{
@@ -54,9 +56,21 @@ export type LunaticStateVariable = {
         CalculatedLinked?: LunaticVariable[];
     };
 }[LunaticVariable['variableType']];
-export type LunaticState = {
-    updatedAt: number;
+export type LunaticPager = {
+    lastReachedPage?: PageTag;
+    maxPage: number;
+    nbSubPages?: number;
+    page: number;
+    subPage?: number;
+    iteration?: number;
+    nbIterations?: number;
+    shallowIteration?: number;
+    linksIterations?: number[];
+};
+export type LunaticReducerState = {
     variables: LunaticVariablesStore;
+    overview: LunaticOverviewItem[];
+    pager: LunaticPager;
     pages: {
         [key: number | string]: {
             components: ComponentType[];
@@ -72,37 +86,50 @@ export type LunaticState = {
             subPages: string[];
         };
     };
+    executeExpression: <T extends unknown = unknown>(expression: unknown, args?: {
+        iteration?: number | number[];
+        bindingDependencies?: string[];
+        deps?: string[];
+    }) => T;
+    isInLoop: boolean;
+    updatedAt: number;
+    updateBindings: (variableName: string, value: unknown, options: {
+        iteration?: number[];
+    }) => unknown;
+};
+export type LunaticOptions = {
+    features?: ('MD' | 'VTL')[];
+    preferences?: ['COLLECTED'];
+    savingType?: 'COLLECTED';
+    onChange?: LunaticChangeHandler;
+    management?: boolean;
+    shortcut?: boolean;
+    initialPage?: PageTag;
+    lastReachedPage?: PageTag;
+    autoSuggesterLoading?: boolean;
+    getReferentiel?: (name: string) => Promise<Array<IndexEntry>>;
+    activeControls?: boolean;
+    withOverview?: boolean;
+    missing?: boolean;
+    missingStrategy?: () => void;
+    missingShortcut?: {
+        dontKnow: string;
+        refused: string;
+    };
+    dontKnowButton?: string;
+    refusedButton?: string;
+    trackChanges?: boolean;
+};
+export type LunaticState = {
+    pager: LunaticPager;
+    overview: InterpretedLunaticOverviewItem[];
+    pageTag: PageTag;
+    updatedAt: number;
+    Provider: FunctionComponent<PropsWithChildren>;
     isInLoop: boolean;
+    loopVariables: string[];
     isFirstPage: boolean;
     isLastPage: boolean;
-    features: ['VTL'] | ['VTL', 'MD'];
-    preferences: ['COLLECTED'];
-    savingType: 'COLLECTED';
-    cleaning: LunaticSource['cleaning'];
-    missingBlock: {
-        [variable: string]: string[];
-    };
-    resizing: {
-        [variable: string]: {
-            size: string;
-            variables: string[];
-            sizeForLinksVariables?: unknown;
-            linksVariables?: string[];
-        };
-    };
-    overview: LunaticOverviewItem[];
-    pager: {
-        lastReachedPage?: PageTag;
-        maxPage: number;
-        nbSubPages?: number;
-        page: number;
-        subPage?: number;
-        iteration?: number;
-        nbIterations?: number;
-        shallowIteration?: number;
-        linksIterations?: number[];
-    };
-    waiting: boolean;
     errors?: {
         [page: string]: {
             [id: string]: LunaticError[];
@@ -112,22 +139,6 @@ export type LunaticState = {
         [id: string]: LunaticError[];
     };
     modalErrors?: Record<string, LunaticError[]>;
-    handleChange: (response: {
-        name: string;
-    }, value: any, args?: {
-        iteration?: number[];
-    }) => void;
-    executeExpression: <T extends unknown = unknown>(expression: unknown, args?: {
-        iteration?: number | number[];
-        bindingDependencies?: string[];
-        deps?: string[];
-    }) => T;
-    updateBindings: (variableName: string, value: unknown, options: {
-        iteration?: number[];
-    }) => unknown;
-    activeControls: boolean;
-    shortcut?: boolean;
-    management?: boolean;
     goToPage: (page: {
         page: PageTag | number;
         iteration?: number;
@@ -136,4 +147,21 @@ export type LunaticState = {
     }) => void;
     goNextPage: () => void;
     goPreviousPage: () => void;
+    compileControls: () => void;
+    getComponents: (params?: {
+        only?: LunaticComponentProps['componentType'];
+        except?: LunaticComponentProps['componentType'];
+    }) => LunaticComponentProps[];
+    getData: (withRefreshedCalculated: boolean, variableNames?: string[]) => LunaticData;
+    getChangedData: (reset: boolean) => LunaticData;
+    resetChangedData: () => void;
+    hasPageResponse: () => boolean;
+    testing: {
+        handleChange: LunaticChangeHandler;
+    };
 };
+export type LunaticChangeHandler = (response: {
+    name: string;
+}, value: any, args?: {
+    iteration?: number[];
+}) => void;

package/lib/use-lunatic/use-lunatic.d.ts

@@ -1,71 +1,29 @@
 /// <reference types="react" />
-import type { LunaticState, PageTag } from './type';
+import type { LunaticChangeHandler, LunaticData, LunaticOptions, PageTag } from './type';
 import type { LunaticSource } from './type-source';
-import type { LunaticComponentProps } from '../components/type';
-import type { IndexEntry } from '../utils/search/SearchInterface';
-declare function useLunatic(source: LunaticSource, data: Partial<Record<"EXTERNAL" | "CALCULATED", Record<string, unknown>> & {
-    COLLECTED: Record<string, Partial<{
-        COLLECTED: unknown;
-        EDITED: unknown;
-        FORCED: unknown;
-        INPUTTED: unknown;
-        PREVIOUS: unknown;
-    }>>;
-}> | undefined, { features, preferences, savingType, onChange, management, shortcut, initialPage, lastReachedPage, autoSuggesterLoading, activeControls, getReferentiel, withOverview, missing, missingStrategy, missingShortcut, dontKnowButton, refusedButton, trackChanges, }: {
-    features?: LunaticState['features'];
-    preferences?: LunaticState['preferences'];
-    savingType?: LunaticState['savingType'];
-    onChange?: LunaticState['handleChange'];
-    management?: boolean;
-    shortcut?: boolean;
-    initialPage?: PageTag;
-    lastReachedPage?: PageTag;
-    autoSuggesterLoading?: boolean;
-    getReferentiel?: (name: string) => Promise<Array<IndexEntry>>;
-    activeControls?: boolean;
-    withOverview?: boolean;
-    missing?: boolean;
-    missingStrategy?: () => void;
-    missingShortcut?: {
-        dontKnow: string;
-        refused: string;
-    };
-    dontKnowButton?: string;
-    refusedButton?: string;
-    trackChanges?: boolean;
-}): {
-    getComponents: ({ only, except, }?: {
-        only?: LunaticComponentProps['componentType'];
-        except?: LunaticComponentProps['componentType'];
-    }) => LunaticComponentProps[];
+declare function useLunatic(source: LunaticSource, data?: LunaticData, argOptions?: LunaticOptions): {
+    pageTag: PageTag;
+    isFirstPage: boolean;
+    isLastPage: boolean;
+    updatedAt: number;
+    pager: import("./type").LunaticPager;
+    isInLoop: boolean;
+    overview: import("./hooks/useOverview").InterpretedLunaticOverviewItem[];
+    loopVariables: string[];
+    getComponents: (params?: {
+        only?: "Sequence" | "Subsequence" | "RosterForLoop" | "Loop" | "Table" | "InputNumber" | "Datepicker" | "Duration" | "CheckboxGroup" | "CheckboxBoolean" | "Radio" | "FilterDescription" | "Dropdown" | "PairwiseLinks" | "Roundabout" | "Suggester" | "Input" | "Textarea" | "CheckboxOne" | "Question" | "Switch" | "Summary" | undefined;
+        except?: "Sequence" | "Subsequence" | "RosterForLoop" | "Loop" | "Table" | "InputNumber" | "Datepicker" | "Duration" | "CheckboxGroup" | "CheckboxBoolean" | "Radio" | "FilterDescription" | "Dropdown" | "PairwiseLinks" | "Roundabout" | "Suggester" | "Input" | "Textarea" | "CheckboxOne" | "Question" | "Switch" | "Summary" | undefined;
+    } | undefined) => import("..").LunaticComponentProps[];
     goPreviousPage: () => void;
-    goNextPage: (payload?: {}) => void;
+    goNextPage: () => void;
     goToPage: (page: {
         page: number | PageTag;
         iteration?: number | undefined;
         nbIterations?: number | undefined;
         subPage?: number | undefined;
     }) => void;
-    compileControls: () => {
-        currentErrors: Record<string, import("./type").LunaticError[]> | undefined;
-        isCritical: boolean;
-    };
-    pageTag: PageTag;
-    isFirstPage: boolean;
-    isLastPage: boolean;
-    pager: {
-        lastReachedPage?: PageTag | undefined;
-        maxPage: number;
-        nbSubPages?: number | undefined;
-        page: number;
-        subPage?: number | undefined;
-        iteration?: number | undefined;
-        nbIterations?: number | undefined;
-        shallowIteration?: number | undefined;
-        linksIterations?: number[] | undefined;
-    };
-    waiting: boolean;
-    getData: (withRefreshedCalculated: boolean, variableNames?: string[]) => Partial<Record<"EXTERNAL" | "CALCULATED", Record<string, unknown>> & {
+    compileControls: () => void;
+    getData: (withRefreshedCalculated: boolean, variableNames?: string[] | undefined) => Partial<Record<"EXTERNAL" | "CALCULATED", Record<string, unknown>> & {
         COLLECTED: Record<string, Partial<{
             COLLECTED: unknown;
             EDITED: unknown;
@@ -74,16 +32,6 @@ declare function useLunatic(source: LunaticSource, data: Partial<Record<"EXTERNA
             PREVIOUS: unknown;
         }>>;
     }>;
-    Provider: import("react").FunctionComponent<{
-        children?: import("react").ReactNode;
-    }>;
-    onChange: (response: {
-        name: string;
-    }, value: any, args?: {
-        iteration?: number[] | undefined;
-    } | undefined) => void;
-    overview: import("./hooks/useOverview").InterpretedLunaticOverviewItem[];
-    loopVariables: string[];
     getChangedData: (reset?: boolean) => Partial<Record<"EXTERNAL" | "CALCULATED", Record<string, unknown>> & {
         COLLECTED: Record<string, Partial<{
             COLLECTED: unknown;
@@ -95,5 +43,11 @@ declare function useLunatic(source: LunaticSource, data: Partial<Record<"EXTERNA
     }>;
     resetChangedData: () => void;
     hasPageResponse: () => boolean;
+    Provider: import("react").FunctionComponent<{
+        children?: import("react").ReactNode;
+    }>;
+    testing: {
+        handleChange: LunaticChangeHandler;
+    };
 };
 export default useLunatic;

package/lib/use-lunatic/use-lunatic.js

@@ -1,35 +1,54 @@
 import { useCallback, useEffect, useMemo, useReducer } from 'react';
 import * as actions from './actions';
-import { getPageTag, isFirstLastPage, useComponentsFromState } from './commons';
+import { getPageTag, isFirstLastPage } from './commons';
 import D from '../i18n';
 import { COLLECTED } from '../utils/constants';
-import INITIAL_STATE from './initial-state';
 import { createLunaticProvider } from './lunatic-context';
 import { compileControls as compileControlsLib } from './commons/compile-controls';
 import { useLoopVariables } from './hooks/use-loop-variables';
-import reducer from './reducer';
 import { getQuestionnaireData } from './commons/variables/get-questionnaire-data';
 import { useTrackChanges } from '../hooks/use-track-changes';
 import { usePageHasResponse } from './hooks/use-page-has-response';
 import { registerSuggesters } from '../utils/search/SuggestersDatabase';
 import { useRefSync } from '../hooks/useRefSync';
 import { useOverview } from './hooks/useOverview';
+import { reducerInitializer } from './reducer/reducerInitializer';
+import { getComponentsFromState } from './commons/get-components-from-state';
+import { fillComponents } from './commons/fill-components/fill-components';
+import { reducer } from './reducer/reducer';
+import { mergeDefault } from '../utils/object';
 const empty = {}; // Keep the same empty object (to avoid problem with useEffect dependencies)
-const emptyFn = () => { };
 const DEFAULT_DATA = empty;
 const DEFAULT_FEATURES = ['VTL', 'MD'];
 const DEFAULT_PREFERENCES = [COLLECTED];
 const DEFAULT_SHORTCUT = { dontKnow: '', refused: '' };
 const DEFAULT_DONT_KNOW = D.DK;
 const DEFAULT_REFUSED = D.RF;
-const nothing = () => { };
-function useLunatic(source, data = DEFAULT_DATA, { features = DEFAULT_FEATURES, preferences = DEFAULT_PREFERENCES, savingType = COLLECTED, onChange = nothing, management = false, shortcut = false, initialPage = '1', lastReachedPage = undefined, autoSuggesterLoading = false, activeControls = false, getReferentiel, 
-// Calculate an overview of every sequence (will be exposed as "overview")
-withOverview = false, missing = false, missingStrategy = emptyFn, missingShortcut = DEFAULT_SHORTCUT, dontKnowButton = DEFAULT_DONT_KNOW, refusedButton = DEFAULT_REFUSED, trackChanges = false, }) {
-    const [state, dispatch] = useReducer(reducer, INITIAL_STATE);
-    const { pager, waiting, overview, pages, executeExpression, isInLoop } = state;
-    const components = useComponentsFromState(state);
-    const getReferentielRef = useRefSync(getReferentiel);
+const defaultOptions = {
+    features: DEFAULT_FEATURES,
+    preferences: DEFAULT_PREFERENCES,
+    savingType: COLLECTED,
+    onChange: () => { },
+    management: false,
+    shortcut: false,
+    initialPage: '1',
+    lastReachedPage: undefined,
+    autoSuggesterLoading: false,
+    activeControls: false,
+    // Calculate an overview of every sequence (will be exposed as "overview")
+    withOverview: false,
+    missing: false,
+    missingStrategy: () => { },
+    missingShortcut: DEFAULT_SHORTCUT,
+    dontKnowButton: DEFAULT_DONT_KNOW,
+    refusedButton: DEFAULT_REFUSED,
+    trackChanges: false,
+};
+function useLunatic(source, data = DEFAULT_DATA, argOptions = empty) {
+    const options = mergeDefault(argOptions, defaultOptions);
+    const { management, missing, missingStrategy, shortcut, missingShortcut, dontKnowButton, refusedButton, onChange, trackChanges, preferences, } = options;
+    const [state, dispatch] = useReducer(reducer, { ...options, source, data }, reducerInitializer);
+    const getReferentielRef = useRefSync(options.getReferentiel);
     // Register the list of suggesters
     useEffect(() => {
         if (source.suggesters && getReferentielRef.current) {
@@ -54,9 +73,9 @@ withOverview = false, missing = false, missingStrategy = emptyFn, missingShortcu
         dontKnowButton,
         refusedButton,
     ]);
-    const compileControls = useCallback(function () {
-        return compileControlsLib({ pager, pages, isInLoop, executeExpression });
-    }, [pager, pages, isInLoop, executeExpression]);
+    const compileControls = () => {
+        return compileControlsLib(state);
+    };
     const goPreviousPage = useCallback(function () {
         dispatch(actions.goPreviousPage());
     }, [dispatch]);
@@ -66,18 +85,6 @@ withOverview = false, missing = false, missingStrategy = emptyFn, missingShortcu
     const goToPage = useCallback(function (payload) {
         dispatch(actions.goToPage(payload));
     }, [dispatch]);
-    const getComponents = useCallback(function ({ only, except, } = {}) {
-        if (only && except) {
-            throw new Error('"only" and "except" cannot be used together in getComponents()');
-        }
-        if (only) {
-            return components.filter((c) => only.includes(c.componentType ?? ''));
-        }
-        if (except) {
-            return components.filter((c) => !except.includes(c.componentType ?? ''));
-        }
-        return components;
-    }, [components]);
     const handleChange = useCallback((response, value, args) => {
         dispatch(actions.handleChange(typeof response === 'string' ? response : response.name, value, args?.iteration));
         onChange(response, value, args);
@@ -86,66 +93,54 @@ withOverview = false, missing = false, missingStrategy = emptyFn, missingShortcu
         return getQuestionnaireData(state.variables, source.variables, withRefreshedCalculated, variableNames);
     };
     const { resetChangedData, getChangedData } = useTrackChanges(trackChanges, state.variables, (variableNames) => getData(false, variableNames));
-    const pageTag = getPageTag(pager);
-    const { isFirstPage, isLastPage } = isFirstLastPage(pager);
-    useEffect(function () {
-        dispatch(actions.onInit({
-            source,
-            data,
-            initialPage,
-            lastReachedPage,
-            features,
-            preferences,
-            savingType,
-            management,
-            shortcut,
-            handleChange,
-            activeControls,
-            goToPage,
-            goNextPage,
-            goPreviousPage,
-            withOverview,
-        }));
-    }, [
-        source,
-        data,
-        initialPage,
-        features,
-        preferences,
-        savingType,
-        management,
-        shortcut,
+    const pageTag = getPageTag(state.pager);
+    const { isFirstPage, isLastPage } = isFirstLastPage(state.pager);
+    const components = fillComponents(getComponentsFromState(state), {
         handleChange,
-        activeControls,
-        withOverview,
+        preferences,
         goToPage,
+        shortcut,
         goNextPage,
         goPreviousPage,
-        lastReachedPage,
-    ]);
+        management,
+        ...state,
+    });
+    const getComponents = ({ only, except, } = {}) => {
+        if (only && except) {
+            throw new Error('"only" and "except" cannot be used together in getComponents()');
+        }
+        if (only) {
+            return components.filter((c) => only.includes(c.componentType ?? ''));
+        }
+        if (except) {
+            return components.filter((c) => !except.includes(c.componentType ?? ''));
+        }
+        return components;
+    };
     return {
+        pageTag,
+        isFirstPage,
+        isLastPage,
+        updatedAt: state.updatedAt,
+        pager: state.pager,
+        isInLoop: state.isInLoop,
+        overview: useOverview(state, [pageTag]),
+        loopVariables: useLoopVariables(state.pager, state.pages),
+        // Methods
         getComponents,
         goPreviousPage,
         goNextPage,
         goToPage,
         compileControls,
-        pageTag,
-        isFirstPage,
-        isLastPage,
-        pager,
-        waiting,
         getData,
-        Provider,
-        onChange: handleChange,
-        overview: useOverview({
-            executeExpression,
-            overview,
-            pager,
-        }, [pageTag]),
-        loopVariables: useLoopVariables(pager, state.pages),
         getChangedData,
         resetChangedData,
-        hasPageResponse: usePageHasResponse(components, executeExpression),
+        hasPageResponse: usePageHasResponse(components, state.executeExpression),
+        // Components
+        Provider,
+        testing: {
+            handleChange,
+        },
     };
 }
 export default useLunatic;

package/lib/use-lunatic/use-lunatic.js.map

@@ -1 +1 @@
-{"version":3,"file":"use-lunatic.js","sourceRoot":"","sources":["../../src/use-lunatic/use-lunatic.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"use-lunatic.js","sourceRoot":"","sources":["../../src/use-lunatic/use-lunatic.ts"],"names":[],"mappings":"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"}

package/lib/utils/object.d.ts

@@ -3,3 +3,4 @@
  */
 export declare function objectMap<T extends Record<string, any>, V extends unknown>(object: T, callback: (k: keyof T, v: T[keyof T]) => [k: keyof T, v: V] | null): Record<keyof T, V>;
 export declare function objectKeys<T extends Record<string, unknown>>(object: T): (keyof T)[];
+export declare function mergeDefault<T extends Record<string, unknown>, D extends Record<string, unknown>>(obj: T, defaults: D): T & D;

package/lib/utils/object.js

@@ -17,4 +17,10 @@ export function objectMap(object, callback) {
 export function objectKeys(object) {
     return Object.keys(object);
 }
+export function mergeDefault(obj, defaults) {
+    return objectMap({ ...obj, ...defaults }, (k) => {
+        // @ts-ignore Ignore this line since TS is not able to handle this case
+        return [k, obj[k] ?? defaults[k]];
+    });
+}
 //# sourceMappingURL=object.js.map

package/lib/utils/object.js.map

@@ -1 +1 @@
-{"version":3,"file":"object.js","sourceRoot":"","sources":["../../src/utils/object.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,MAAM,UAAU,SAAS,CACxB,MAAS,EACT,QAAkE;IAElE,OAAO,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,MAAM,CACnC,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE;QACf,MAAM,MAAM,GAAG,QAAQ,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;QAC9B,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;YAC5B,OAAO,GAAG,CAAC;QACZ,CAAC;QACD,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,GAAG,MAAM,CAAC;QAC5B,GAAG,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;QACjB,OAAO,GAAG,CAAC;IACZ,CAAC,EACD,EAAwB,CACxB,CAAC;AACH,CAAC;AACD,6EAA6E;AAC7E,kEAAkE;AAClE,MAAM,UAAU,UAAU,CAAoC,MAAS;IACtE,OAAO,MAAM,CAAC,IAAI,CAAC,MAAM,CAAgB,CAAC;AAC3C,CAAC"}
+{"version":3,"file":"object.js","sourceRoot":"","sources":["../../src/utils/object.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,MAAM,UAAU,SAAS,CACxB,MAAS,EACT,QAAkE;IAElE,OAAO,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,MAAM,CACnC,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE;QACf,MAAM,MAAM,GAAG,QAAQ,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;QAC9B,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;YAC5B,OAAO,GAAG,CAAC;QACZ,CAAC;QACD,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,GAAG,MAAM,CAAC;QAC5B,GAAG,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;QACjB,OAAO,GAAG,CAAC;IACZ,CAAC,EACD,EAAwB,CACxB,CAAC;AACH,CAAC;AACD,6EAA6E;AAC7E,kEAAkE;AAClE,MAAM,UAAU,UAAU,CAAoC,MAAS;IACtE,OAAO,MAAM,CAAC,IAAI,CAAC,MAAM,CAAgB,CAAC;AAC3C,CAAC;AAED,MAAM,UAAU,YAAY,CAG1B,GAAM,EAAE,QAAW;IACpB,OAAO,SAAS,CAAC,EAAE,GAAG,GAAG,EAAE,GAAG,QAAQ,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE;QAC/C,uEAAuE;QACvE,OAAO,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC,IAAI,QAAQ,CAAC,CAAC,CAAC,CAAU,CAAC;IAC5C,CAAC,CAAC,CAAC;AACJ,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@inseefr/lunatic",
-	"version": "3.0.0-rc.26",
+	"version": "3.0.0-rc.27",
 	"description": "Library of questionnaire components",
 	"repository": {
 		"type": "git",
@@ -70,6 +70,7 @@
 		"react-markdown": "^8.0.3",
 		"react-number-format": "^5.1.3",
 		"react-tooltip": "^5.23.0",
+		"remark-breaks": "^4.0.0",
 		"sass": "^1.58.3"
 	},
 	"resolutions": {