@inseefr/lunatic 3.2.0 → 3.2.2

package/lib/components/Question/Question.d.ts

@@ -3,7 +3,7 @@ import type { PropsWithChildren } from 'react';
 /**
  * Surround a question giving additional context with label / description / declarations
  */
-export declare const Question: ({ components, ...props }: LunaticComponentProps<'Question'>) => import("react/jsx-runtime").JSX.Element;
-type CustomProps = PropsWithChildren<Omit<LunaticComponentProps<'Question'>, 'components'>>;
+export declare const Question: (props: LunaticComponentProps<'Question'>) => import("react/jsx-runtime").JSX.Element;
+type CustomProps = PropsWithChildren<LunaticComponentProps<'Question'>>;
 export declare const CustomQuestion: import("react").ComponentType<CustomProps>;
 export {};

package/lib/components/Question/Question.js

@@ -5,8 +5,8 @@ import { Declarations } from '../shared/Declarations/Declarations';
 /**
  * Surround a question giving additional context with label / description / declarations
  */
-export const Question = ({ components, ...props }) => {
-    const { errors, disabled, readOnly } = props;
+export const Question = (props) => {
+    const { errors, disabled, readOnly, components } = props;
     return (_jsx(CustomQuestion, { ...props, children: _jsx(LunaticComponents, { components: components, componentProps: () => ({
                 errors,
                 disabled,

package/lib/components/Question/Question.js.map

@@ -1 +1 @@
-{"version":3,"file":"Question.js","sourceRoot":"","sources":["../../../src/components/Question/Question.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAEzD,OAAO,EAAE,kBAAkB,EAAE,MAAM,kCAAkC,CAAC;AACtE,OAAO,EAAE,YAAY,EAAE,MAAM,qCAAqC,CAAC;AAGnE;;GAEG;AACH,MAAM,CAAC,MAAM,QAAQ,GAAG,CAAC,EACxB,UAAU,EACV,GAAG,KAAK,EAC2B,EAAE,EAAE;IACvC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,GAAG,KAAK,CAAC;IAC7C,OAAO,CACN,KAAC,cAAc,OAAK,KAAK,YACxB,KAAC,iBAAiB,IACjB,UAAU,EAAE,UAAU,EACtB,cAAc,EAAE,GAAG,EAAE,CAAC,CAAC;gBACtB,MAAM;gBACN,QAAQ;gBACR,QAAQ;aACR,CAAC,GACD,GACc,CACjB,CAAC;AACH,CAAC,CAAC;AAMF,MAAM,CAAC,MAAM,cAAc,GAAG,kBAAkB,CAC/C,UAAU,EACV,CAAC,KAAK,EAAE,EAAE;IACT,MAAM,EAAE,EAAE,EAAE,WAAW,EAAE,YAAY,EAAE,KAAK,EAAE,QAAQ,EAAE,GAAG,KAAK,CAAC;IACjE,OAAO,CACN,+BACC,kBAAQ,EAAE,EAAE,mBAAmB,EAAE,EAAE,aAClC,uBAAK,KAAK,GAAM,EAChB,YAAG,SAAS,EAAC,qBAAqB,EAAC,EAAE,EAAE,wBAAwB,EAAE,EAAE,YACjE,WAAW,GACT,IACI,EACT,KAAC,YAAY,IACZ,IAAI,EAAC,qBAAqB,EAC1B,YAAY,EAAE,YAAY,EAC1B,EAAE,EAAE,EAAE,GACL,EACD,QAAQ,IACC,CACX,CAAC;AACH,CAAC,CACD,CAAC"}
+{"version":3,"file":"Question.js","sourceRoot":"","sources":["../../../src/components/Question/Question.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAEzD,OAAO,EAAE,kBAAkB,EAAE,MAAM,kCAAkC,CAAC;AACtE,OAAO,EAAE,YAAY,EAAE,MAAM,qCAAqC,CAAC;AAGnE;;GAEG;AACH,MAAM,CAAC,MAAM,QAAQ,GAAG,CAAC,KAAwC,EAAE,EAAE;IACpE,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,UAAU,EAAE,GAAG,KAAK,CAAC;IACzD,OAAO,CACN,KAAC,cAAc,OAAK,KAAK,YACxB,KAAC,iBAAiB,IACjB,UAAU,EAAE,UAAU,EACtB,cAAc,EAAE,GAAG,EAAE,CAAC,CAAC;gBACtB,MAAM;gBACN,QAAQ;gBACR,QAAQ;aACR,CAAC,GACD,GACc,CACjB,CAAC;AACH,CAAC,CAAC;AAIF,MAAM,CAAC,MAAM,cAAc,GAAG,kBAAkB,CAC/C,UAAU,EACV,CAAC,KAAK,EAAE,EAAE;IACT,MAAM,EAAE,EAAE,EAAE,WAAW,EAAE,YAAY,EAAE,KAAK,EAAE,QAAQ,EAAE,GAAG,KAAK,CAAC;IACjE,OAAO,CACN,+BACC,kBAAQ,EAAE,EAAE,mBAAmB,EAAE,EAAE,aAClC,uBAAK,KAAK,GAAM,EAChB,YAAG,SAAS,EAAC,qBAAqB,EAAC,EAAE,EAAE,wBAAwB,EAAE,EAAE,YACjE,WAAW,GACT,IACI,EACT,KAAC,YAAY,IACZ,IAAI,EAAC,qBAAqB,EAC1B,YAAY,EAAE,YAAY,EAC1B,EAAE,EAAE,EAAE,GACL,EACD,QAAQ,IACC,CACX,CAAC;AACH,CAAC,CACD,CAAC"}

package/lib/components/Table/Table.js

@@ -1,12 +1,9 @@
-import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { LunaticComponents } from '../LunaticComponents';
 import { getComponentErrors } from '../shared/ComponentErrors/ComponentErrors';
-import { Label } from '../shared/Label/Label';
 import { Td, Tbody, Tr, TableHeader, Table as BaseTable, } from '../shared/Table';
-import { Declarations } from '../shared/Declarations/Declarations';
 export function Table(props) {
-    const { id, body, header, errors, label, declarations } = props;
-    const labelId = `label-${id}`;
-    return (_jsxs(_Fragment, { children: [_jsx(Label, { htmlFor: id, id: labelId, children: label }), _jsx(Declarations, { type: "AFTER_QUESTION_TEXT", declarations: declarations, id: id }), _jsxs(BaseTable, { id: id, errors: getComponentErrors(errors, id), children: [_jsx(TableHeader, { header: header }), _jsx(Tbody, { children: body.map((row, rowIndex) => (_jsx(Tr, { row: rowIndex, children: _jsx(LunaticComponents, { components: row, wrapper: ({ colspan, rowspan, ...props }) => (_jsx(Td, { row: rowIndex, colSpan: colspan, rowSpan: rowspan, ...props })) }) }, rowIndex))) })] })] }));
+    const { id, body, header, errors, declarations, label } = props;
+    return (_jsxs(BaseTable, { id: id, errors: getComponentErrors(errors, id), declarations: declarations, label: label, children: [_jsx(TableHeader, { header: header }), _jsx(Tbody, { children: body.map((row, rowIndex) => (_jsx(Tr, { row: rowIndex, children: _jsx(LunaticComponents, { components: row, wrapper: ({ colspan, rowspan, ...props }) => (_jsx(Td, { row: rowIndex, colSpan: colspan, rowSpan: rowspan, ...props })) }) }, rowIndex))) })] }));
 }
 //# sourceMappingURL=Table.js.map

package/lib/components/Table/Table.js.map

@@ -1 +1 @@
-{"version":3,"file":"Table.js","sourceRoot":"","sources":["../../../src/components/Table/Table.tsx"],"names":[],"mappings":";AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AACzD,OAAO,EAAE,kBAAkB,EAAE,MAAM,2CAA2C,CAAC;AAC/E,OAAO,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAC9C,OAAO,EACN,EAAE,EACF,KAAK,EACL,EAAE,EACF,WAAW,EACX,KAAK,IAAI,SAAS,GAClB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,YAAY,EAAE,MAAM,qCAAqC,CAAC;AAGnE,MAAM,UAAU,KAAK,CAAC,KAAqC;IAC1D,MAAM,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,YAAY,EAAE,GAAG,KAAK,CAAC;IAChE,MAAM,OAAO,GAAG,SAAS,EAAE,EAAE,CAAC;IAE9B,OAAO,CACN,8BACC,KAAC,KAAK,IAAC,OAAO,EAAE,EAAE,EAAE,EAAE,EAAE,OAAO,YAC7B,KAAK,GACC,EACR,KAAC,YAAY,IACZ,IAAI,EAAC,qBAAqB,EAC1B,YAAY,EAAE,YAAY,EAC1B,EAAE,EAAE,EAAE,GACL,EACF,MAAC,SAAS,IAAC,EAAE,EAAE,EAAE,EAAE,MAAM,EAAE,kBAAkB,CAAC,MAAM,EAAE,EAAE,CAAC,aACxD,KAAC,WAAW,IAAC,MAAM,EAAE,MAAM,GAAI,EAC/B,KAAC,KAAK,cACJ,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,QAAQ,EAAE,EAAE,CAAC,CAC5B,KAAC,EAAE,IAAC,GAAG,EAAE,QAAQ,YAChB,KAAC,iBAAiB,IAMjB,UAAU,EAAE,GAAG,EACf,OAAO,EAAE,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,KAAK,EAAE,EAAE,EAAE,CAAC,CAC5C,KAAC,EAAE,IACF,GAAG,EAAE,QAAQ,EACb,OAAO,EAAE,OAAO,EAChB,OAAO,EAAE,OAAO,KACZ,KAAK,GACR,CACF,GACA,IAhBqB,QAAQ,CAiB3B,CACL,CAAC,GACK,IACG,IACV,CACH,CAAC;AACH,CAAC"}
+{"version":3,"file":"Table.js","sourceRoot":"","sources":["../../../src/components/Table/Table.tsx"],"names":[],"mappings":";AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AACzD,OAAO,EAAE,kBAAkB,EAAE,MAAM,2CAA2C,CAAC;AAC/E,OAAO,EACN,EAAE,EACF,KAAK,EACL,EAAE,EACF,WAAW,EACX,KAAK,IAAI,SAAS,GAClB,MAAM,iBAAiB,CAAC;AAGzB,MAAM,UAAU,KAAK,CAAC,KAAqC;IAC1D,MAAM,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,YAAY,EAAE,KAAK,EAAE,GAAG,KAAK,CAAC;IAEhE,OAAO,CACN,MAAC,SAAS,IACT,EAAE,EAAE,EAAE,EACN,MAAM,EAAE,kBAAkB,CAAC,MAAM,EAAE,EAAE,CAAC,EACtC,YAAY,EAAE,YAAY,EAC1B,KAAK,EAAE,KAAK,aAEZ,KAAC,WAAW,IAAC,MAAM,EAAE,MAAM,GAAI,EAC/B,KAAC,KAAK,cACJ,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,QAAQ,EAAE,EAAE,CAAC,CAC5B,KAAC,EAAE,IAAC,GAAG,EAAE,QAAQ,YAChB,KAAC,iBAAiB,IAMjB,UAAU,EAAE,GAAG,EACf,OAAO,EAAE,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,KAAK,EAAE,EAAE,EAAE,CAAC,CAC5C,KAAC,EAAE,IACF,GAAG,EAAE,QAAQ,EACb,OAAO,EAAE,OAAO,EAChB,OAAO,EAAE,OAAO,KACZ,KAAK,GACR,CACF,GACA,IAhBqB,QAAQ,CAiB3B,CACL,CAAC,GACK,IACG,CACZ,CAAC;AACH,CAAC"}

package/lib/components/library.d.ts

@@ -73,7 +73,7 @@ export declare const library: {
         } | undefined;
         componentType?: "Switch" | undefined;
     }>;
-    Question: ({ components, ...props }: Pick<import("./type").LunaticBaseProps<unknown>, "label" | "description" | "declarations" | "id" | "errors" | "disabled" | "readOnly"> & import("./type").LunaticExtraProps & {
+    Question: (props: Pick<import("./type").LunaticBaseProps<unknown>, "label" | "description" | "declarations" | "id" | "errors" | "disabled" | "readOnly"> & import("./type").LunaticExtraProps & {
         components: LunaticComponentProps<keyof import("./type").ComponentPropsByType>[];
         componentType?: "Question" | undefined;
     }) => import("react/jsx-runtime").JSX.Element;

package/lib/components/shared/Table/Table.d.ts

@@ -1,8 +1,7 @@
 import React, { type PropsWithChildren } from 'react';
 import type { LunaticError } from '../../../use-lunatic/type';
-type Props = PropsWithChildren<{
-    className?: string;
-    id?: string;
+import type { LunaticComponentProps } from '../../type';
+type Props = PropsWithChildren<Pick<LunaticComponentProps<'Table'>, 'className' | 'id' | 'label' | 'declarations'> & {
     errors?: LunaticError[];
 }>;
 export declare const Table: React.ComponentType<Props>;

package/lib/components/shared/Table/Table.js

@@ -3,8 +3,12 @@ import React, {} from 'react';
 import classnames from 'classnames';
 import { slottableComponent } from '../HOC/slottableComponent';
 import { ComponentErrors } from '../ComponentErrors/ComponentErrors';
-function LunaticTable({ id, className, children, errors }) {
-    return (_jsxs(_Fragment, { children: [_jsx("table", { id: `table-${id}`, className: classnames('lunatic-table', className), children: children }), _jsx(ComponentErrors, { errors: errors })] }));
+import { Label } from '../Label/Label';
+import { Declarations } from '../Declarations/Declarations';
+function LunaticTable({ id, className, children, errors, declarations, label, }) {
+    const tableId = `table-${id}`;
+    const labelId = `label-${id}`;
+    return (_jsxs(_Fragment, { children: [_jsx(Label, { htmlFor: tableId, id: labelId, children: label }), _jsx(Declarations, { type: "AFTER_QUESTION_TEXT", declarations: declarations, id: id }), _jsx("table", { id: tableId, className: classnames('lunatic-table', className), children: children }), _jsx(ComponentErrors, { errors: errors })] }));
 }
 export const Table = slottableComponent('Table', LunaticTable);
 //# sourceMappingURL=Table.js.map

package/lib/components/shared/Table/Table.js.map

@@ -1 +1 @@
-{"version":3,"file":"Table.js","sourceRoot":"","sources":["../../../../src/components/shared/Table/Table.tsx"],"names":[],"mappings":";AAAA,OAAO,KAAK,EAAE,EAA0B,MAAM,OAAO,CAAC;AACtD,OAAO,UAAU,MAAM,YAAY,CAAC;AACpC,OAAO,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAE/D,OAAO,EAAE,eAAe,EAAE,MAAM,oCAAoC,CAAC;AAQrE,SAAS,YAAY,CAAC,EAAE,EAAE,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,EAAS;IAC/D,OAAO,CACN,8BACC,gBACC,EAAE,EAAE,SAAS,EAAE,EAAE,EACjB,SAAS,EAAE,UAAU,CAAC,eAAe,EAAE,SAAS,CAAC,YAEhD,QAAQ,GACF,EACR,KAAC,eAAe,IAAC,MAAM,EAAE,MAAM,GAAI,IACjC,CACH,CAAC;AACH,CAAC;AAED,MAAM,CAAC,MAAM,KAAK,GAAG,kBAAkB,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC"}
+{"version":3,"file":"Table.js","sourceRoot":"","sources":["../../../../src/components/shared/Table/Table.tsx"],"names":[],"mappings":";AAAA,OAAO,KAAK,EAAE,EAA0B,MAAM,OAAO,CAAC;AACtD,OAAO,UAAU,MAAM,YAAY,CAAC;AACpC,OAAO,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAE/D,OAAO,EAAE,eAAe,EAAE,MAAM,oCAAoC,CAAC;AAErE,OAAO,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AACvC,OAAO,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAW5D,SAAS,YAAY,CAAC,EACrB,EAAE,EACF,SAAS,EACT,QAAQ,EACR,MAAM,EACN,YAAY,EACZ,KAAK,GACE;IACP,MAAM,OAAO,GAAG,SAAS,EAAE,EAAE,CAAC;IAC9B,MAAM,OAAO,GAAG,SAAS,EAAE,EAAE,CAAC;IAE9B,OAAO,CACN,8BACC,KAAC,KAAK,IAAC,OAAO,EAAE,OAAO,EAAE,EAAE,EAAE,OAAO,YAClC,KAAK,GACC,EACR,KAAC,YAAY,IACZ,IAAI,EAAC,qBAAqB,EAC1B,YAAY,EAAE,YAAY,EAC1B,EAAE,EAAE,EAAE,GACL,EACF,gBAAO,EAAE,EAAE,OAAO,EAAE,SAAS,EAAE,UAAU,CAAC,eAAe,EAAE,SAAS,CAAC,YACnE,QAAQ,GACF,EACR,KAAC,eAAe,IAAC,MAAM,EAAE,MAAM,GAAI,IACjC,CACH,CAAC;AACH,CAAC;AAED,MAAM,CAAC,MAAM,KAAK,GAAG,kBAAkB,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@inseefr/lunatic",
-	"version": "3.2.0",
+	"version": "3.2.2",
 	"description": "Library of questionnaire components",
 	"type": "module",
 	"repository": {