@inseefr/lunatic 0.2.0-v2 → 0.2.1-prisme

package/src/components/index.scss

@@ -121,12 +121,32 @@
 		display: inline;
 	}
 
+	.tooltip {
+		display: flex;
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+	}
+
+	.field-with-tooltip {
+		width: calc(100% - 25px);
+		position: relative;
+	}
 
 	.field {
 		width: 100%;
 		position: relative;
 	}
 
+	.field,
+	.field-with-tooltip {
+		display: flex;
+		.unit {
+			margin: auto 0;
+			color: var(--color-primary-dark);
+			font-weight: bold;
+		}
+	}
 
 	.link-md .field-md {
 		border-bottom: dashed 0.1em var(--color-primary-dark);
@@ -136,4 +156,22 @@
 			background-color: var(--color-primary-dark);
 		}
 	}
+
+	.link-md .tooltip-content {
+		min-width: 15em;
+		max-width: 25em;
+		background: var(--color-primary-dark);
+		color: var(--color-primary-contrast-text);
+		padding: 0.5em;
+		border-radius: 6px;
+		font-size: 1em;
+		&.place-bottom {
+			&::before {
+				border-bottom: 10px solid var(--color-primary-dark);
+			}
+			&::after {
+				content: none;
+			}
+		}
+	}
 }

package/src/components/input/index.js

@@ -1 +1,2 @@
-export { default } from './lunatic-input';
+export { default as Input } from './input';
+export { default as InputNumber } from './input-number';

package/src/components/input/input-number.js

@@ -0,0 +1,30 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import componentWrapper from '../component-wrapper';
+import { InputDeclarationsWrapper } from '../declarations/wrappers';
+import { areEqual } from '../../utils/lib';
+import { getTypeControls } from '../component-wrapper/controls/validators';
+import './input.scss';
+
+const InputNumber = ({ numberAsTextfield, decimals, ...props }) => (
+	<InputDeclarationsWrapper
+		type={numberAsTextfield ? 'tel' : 'number'}
+		roleType="input"
+		{...props}
+		decimals={decimals || 0}
+		isInputNumber
+		numberAsTextfield
+		validators={[getTypeControls]}
+		inputMode={decimals ? 'decimals' : 'numeric'}
+	/>
+);
+
+InputNumber.defaultProps = {
+	validators: [],
+};
+
+InputNumber.propTypes = {
+	validators: PropTypes.arrayOf(PropTypes.func),
+};
+
+export default componentWrapper(React.memo(InputNumber, areEqual));

package/src/components/input/input.js

@@ -1,48 +1,11 @@
-import React, { useCallback } from 'react';
-import classnames from 'classnames';
-import { createCustomizableLunaticField } from '../commons';
+import React from 'react';
+import { InputDeclarationsWrapper } from '../declarations/wrappers';
+import { areEqual } from '../../utils/lib';
+import componentWrapper from '../component-wrapper';
+import './input.scss';
 
-function checkValue(value) {
-	return value || '';
-}
+const Input = (props) => (
+	<InputDeclarationsWrapper type="text" roleType="input" {...props} />
+);
 
-function Input({
-	value,
-	onChange,
-	disabled,
-	required,
-	maxLength,
-	id,
-	labelledBy,
-}) {
-	const handleChange = useCallback(
-		function (e) {
-			const value = e.target.value;
-			onChange(value);
-		},
-		[onChange]
-	);
-	return (
-		<input
-			id={id}
-			labelledbby={labelledBy}
-			autoComplete="off"
-			type="text"
-			disabled={disabled}
-			className={classnames('lunatic-input')}
-			value={checkValue(value)}
-			onChange={handleChange}
-			aria-required={required}
-			required={required}
-			maxLength={maxLength}
-		/>
-	);
-}
-
-Input.defaultProps = {
-	disabled: false,
-	required: true,
-	maxLength: Number.MAX_SAFE_INTEGER,
-};
-
-export default createCustomizableLunaticField(Input);
+export default componentWrapper(React.memo(Input, areEqual));

package/src/components/input/input.scss

@@ -1,7 +1,7 @@
 .lunatic-component {
-	.lunatic-input,
-	.lunatic-datepicker,
-	.lunatic-textarea {
+	.input-lunatic,
+	.datepicker-lunatic,
+	.textarea-lunatic {
 		font: inherit;
 		border: 0;
 		border-bottom: 0.125rem double rgba(0, 0, 0, 0.42);

package/src/components/loop/component.js

@@ -0,0 +1,170 @@
+import React, { useState, useEffect } from 'react';
+import * as lunatic from '../components';
+import { interpret } from '../../utils/to-expose';
+import * as U from '../../utils/lib';
+import './loop.scss';
+
+const Loop = ({
+	id,
+	label,
+	iterations,
+	components,
+	bindings,
+	handleChange,
+	loopDependencies,
+	maxPage,
+	pagination,
+	paginatedLoop,
+	currentPage,
+	depth: loopDepth,
+	...orchetratorProps
+}) => {
+	const [todos, setTodos] = useState([]);
+	const vectorialBindings = U.buildVectorialBindings(bindings);
+	const { features } = orchetratorProps;
+	const featuresWithoutMD = features.filter((f) => f !== 'MD');
+	const iterationNb =
+		parseInt(interpret(featuresWithoutMD)(vectorialBindings)(iterations), 10) ||
+		0;
+	const involvedVariables = U.getInvolvedVariables(components);
+
+	/**
+	 * Handle the increase in the number of iterations
+	 * Assume we only want to update if iterationNb changes
+	 */
+	useEffect(() => {
+		const toUpdate = involvedVariables.reduce((acc, { name: iv, depth }) => {
+			if (bindings[iv]) {
+				if (iterationNb === bindings[iv].length) return acc;
+				if (iterationNb <= bindings[iv].length)
+					return {
+						...acc,
+						[iv]: [...bindings[iv].splice(0, iterationNb)],
+					};
+				return {
+					...acc,
+					[iv]: [
+						...bindings[iv],
+						...new Array(iterationNb - bindings[iv].length).fill(
+							U.buildEmptyValue(depth)
+						),
+					],
+				};
+			}
+			return acc;
+		}, {});
+		if (Object.keys(toUpdate).length !== 0) handleChange(toUpdate);
+		// eslint-disable-next-line react-hooks/exhaustive-deps
+	}, [iterationNb]);
+
+	useEffect(() => {
+		if (todos.length !== 0) {
+			const todosObj = todos.reduce((acc, { up, rowNumber }) => {
+				const entries = Object.entries(up);
+				if (entries.length === 0) return acc;
+				const toUpdate = entries.reduce((_, [key, value]) => {
+					const previousValue = bindings[key];
+					const newValue = previousValue.map((v, i) =>
+						i === rowNumber ? value : v
+					);
+					return { ..._, [key]: newValue };
+				}, {});
+
+				return { ...acc, ...toUpdate };
+			}, {});
+			handleChange(todosObj);
+			setTodos([]);
+		}
+	}, [bindings, todos, handleChange]);
+
+	const flattenComponents = U.buildLoopComponents(iterationNb)(components);
+
+	const { currentIteration, currentPageWithoutAnyIteration } = U.splitPage(
+		currentPage,
+		loopDepth
+	);
+
+	const localCache = {};
+
+	const loopComponents = flattenComponents.reduce(
+		(
+			acc,
+			{
+				componentType,
+				id: idC,
+				rowNumber,
+				conditionFilter,
+				page,
+				bindingDependencies = [],
+				missingResponse,
+				...rest
+			}
+		) => {
+			const loopVars = bindingDependencies.map((b) => {
+				if (bindings[b]) return [b, bindings[b]];
+				return [b, null];
+			});
+			const loopBindings = U.buildLoopBindings(rowNumber)(loopVars);
+
+			const loopMissingResponse =
+				U.buildLoopMissingResponse(rowNumber)(missingResponse);
+
+			if (!U.displayLoopQuestion(bindingDependencies)(loopBindings)) return acc;
+			const Component = lunatic[componentType];
+
+			const { bindingDependencies: filterDependencies = [], value = '' } =
+				conditionFilter;
+
+			const filterVars = filterDependencies.map((b) => {
+				if (bindings[b]) return [b, bindings[b]];
+				return [b, null];
+			});
+			const filterBindings = U.buildLoopBindings(rowNumber)(filterVars);
+			const set = () => {
+				const v = interpret(featuresWithoutMD)(filterBindings)(value);
+				localCache[`${value}-row-${rowNumber}`] = v;
+				return v;
+			};
+
+			const filterResult = localCache[value] || set();
+
+			if (
+				!filterResult ||
+				(pagination &&
+					(currentPageWithoutAnyIteration !== page ||
+						(paginatedLoop && rowNumber + 1 !== currentIteration)))
+			)
+				return acc;
+			return [
+				...acc,
+				<div key={`${idC}-loop-${rowNumber}`} className="loop-component">
+					<Component
+						{...orchetratorProps}
+						{...rest}
+						id={`${idC}-loop-${rowNumber}`}
+						handleChange={(up) => {
+							setTodos((t) => [...t, { up, rowNumber }]);
+						}}
+						bindings={loopBindings}
+						fullBindings={bindings}
+						bindingDependencies={bindingDependencies}
+						componentType={componentType}
+						pagination={pagination}
+						currentPage={currentPage}
+						conditionFilter={conditionFilter}
+						missingResponse={loopMissingResponse}
+					/>
+				</div>,
+			];
+		},
+		[]
+	);
+
+	return (
+		<div id={`loop-${id}`} className="lunatic-loop">
+			{loopComponents}
+		</div>
+	);
+};
+
+export default React.memo(Loop, U.areEqual);

package/src/components/loop/index.js

@@ -1 +1 @@
-export { default } from './loop';
+export { default } from './wrapper';

package/src/components/loop/loop.scss

@@ -0,0 +1,13 @@
+.lunatic-component {
+	.lunatic-loop {
+		.loop-label {
+			text-align: center;
+			font-weight: bold;
+			font-size: 2em;
+		}
+		.loop-component {
+			margin-top: 0.4em;
+			margin-bottom: 0.4em;
+		}
+	}
+}

package/src/components/loop/wrapper.js

@@ -0,0 +1,15 @@
+import React from 'react';
+import Loop from './component';
+import BlockForLoop from '../loop-constructor/block';
+
+const LoopWrapper = (props) => {
+	const { iterations } = props;
+	if (iterations) {
+		return <Loop {...props} />;
+	}
+	return <BlockForLoop {...props} />;
+};
+
+// TODO: need componentWrapper?
+
+export default LoopWrapper;

package/src/components/loop-constructor/block/block.scss

@@ -0,0 +1,10 @@
+.lunatic-component {
+	.block-for-loop {
+		margin-top: 1em;
+		margin-bottom: 1em;
+		.block-component {
+			margin-top: 0.4em;
+			margin-bottom: 0.4em;
+		}
+	}
+}

package/src/components/loop-constructor/block/component.js

@@ -0,0 +1,9 @@
+import React from 'react';
+import componentWrapper from '../../component-wrapper';
+import LoopConstructorWrapper from '../wrapper';
+import * as U from '../../../utils/lib';
+import './block.scss';
+
+const BlockForLoop = (props) => <LoopConstructorWrapper {...props} />;
+
+export default componentWrapper(React.memo(BlockForLoop), U.areEqual);

package/src/components/loop-constructor/block/index.js

@@ -0,0 +1 @@
+export { default } from './component';

package/src/components/loop-constructor/index.js

@@ -0,0 +1 @@
+export { default as RosterForLoop } from './roster';

package/src/components/loop-constructor/roster/component.js

@@ -0,0 +1,8 @@
+import React from 'react';
+import componentWrapper from '../../component-wrapper';
+import LoopConstructorWrapper from '../wrapper';
+import * as U from '../../../utils/lib';
+
+const RosterForLoop = (props) => <LoopConstructorWrapper {...props} />;
+
+export default componentWrapper(React.memo(RosterForLoop), U.areEqual);

package/src/components/loop-constructor/roster/index.js

@@ -0,0 +1 @@
+export { default } from './component';

package/src/components/loop-constructor/wrapper/body-component.js

@@ -0,0 +1,146 @@
+import React from 'react';
+import * as lunatic from '../../components';
+import * as U from '../../../utils/lib';
+import { interpret } from '../../../utils/to-expose';
+import { buildContentForLoopConstructor } from './build-components';
+
+const BodyComponent = ({
+	componentType,
+	mainId,
+	headers,
+	components,
+	bindings,
+	width,
+	preferences,
+	positioning,
+	management,
+	features,
+	setTodo,
+	logFunction,
+	...otherProps
+}) => {
+	const uiComponents = buildContentForLoopConstructor({
+		components,
+		headers,
+	});
+	const featuresWithoutMD = features.filter((f) => f !== 'MD');
+	if (componentType === 'RosterForLoop')
+		return (
+			<table id={`table-${mainId}`} className="table-lunatic">
+				<tbody>
+					{uiComponents.map((row, i) => (
+						<tr key={`table-${mainId}-row${i}`}>
+							{row.map((component, j) => {
+								const {
+									label,
+									headerCell,
+									colspan,
+									rowspan,
+									componentType,
+									id,
+									rowNumber,
+									conditionFilter,
+									...componentProps
+								} = component;
+								const localBindings =
+									U.buildBindingsForDeeperComponents(rowNumber)(bindings);
+								if (conditionFilter) {
+									const { value = '' } = conditionFilter;
+									if (!interpret(featuresWithoutMD)(localBindings)(value))
+										return null;
+								}
+								if (componentType) {
+									const Component = lunatic[componentType];
+									return (
+										<td
+											key={`table-${mainId}-row-${i}-cell-${j}`}
+											style={{ width }}
+										>
+											<Component
+												{...otherProps}
+												{...componentProps}
+												id={`${id}-row-${i}`}
+												label={label}
+												handleChange={(up) => {
+													setTodo({ up, rowNumber });
+												}}
+												preferences={preferences}
+												positioning={positioning}
+												management={management}
+												features={features}
+												bindings={localBindings}
+												fullBindings={bindings}
+												missingLoopIteration={i}
+												zIndex={uiComponents.length - i || 0}
+												logFunction={logFunction}
+												focused={i === 0 && j === 0}
+											/>
+										</td>
+									);
+								}
+								const cellOptions = {
+									key: `table-${mainId}-row-${i}-cell-${j}`,
+									style: { width },
+									colSpan: colspan || 1,
+									rowSpan: rowspan || 1,
+								};
+								const interpretedLabel = interpret(
+									features,
+									logFunction
+								)(bindings)(label);
+								return headerCell ? (
+									<th {...cellOptions}>{interpretedLabel}</th>
+								) : (
+									<td {...cellOptions}>{interpretedLabel}</td>
+								);
+							})}
+						</tr>
+					))}
+				</tbody>
+			</table>
+		);
+	else
+		return (
+			<div className="block-for-loop">
+				{uiComponents.map((row, i) =>
+					row.map(({ componentType, id, label, ...componentProps }) => {
+						const Component = lunatic[componentType];
+						const localBindings =
+							U.buildBindingsForDeeperComponents(i)(bindings);
+						// ensure to have only N-1 missingResponse
+						const { missingResponse, conditionFilter } = componentProps;
+						if (conditionFilter) {
+							const { value = '' } = conditionFilter;
+							if (!interpret(featuresWithoutMD)(localBindings)(value))
+								return null;
+						}
+						return (
+							<div className="block-component" key={`${id}-row-${i}`}>
+								<Component
+									{...otherProps}
+									{...componentProps}
+									missingResponse={missingResponse}
+									id={`${id}-row-${i}`}
+									label={label}
+									handleChange={(up) => {
+										setTodo({ up, rowNumber: i });
+									}}
+									preferences={preferences}
+									positioning={positioning}
+									management={management}
+									features={features}
+									bindings={localBindings}
+									fullBindings={bindings}
+									missingLoopIteration={i}
+									logFunction={logFunction}
+									focused={i === 0}
+								/>
+							</div>
+						);
+					})
+				)}
+			</div>
+		);
+};
+
+export default BodyComponent;

package/src/components/loop-constructor/wrapper/build-components.js

@@ -0,0 +1,33 @@
+import * as C from '../../../constants';
+
+export const buildContentForLoopConstructor = ({ components, headers }) => {
+	// Start hack to find interation number
+	// Refactor if we have to handle complex components (vector, matrix)
+	const iterations =
+		components.find((c) => c.response).response.values[C.COLLECTED].length || 1;
+	// End
+	const initialArray = [...Array(iterations).keys()];
+	const uiComponents = components.map((comp) => {
+		const { response, ...other } = comp;
+		if (!response) return initialArray.map(() => comp);
+		// Handle reponses & cells components ?
+		const { name, values } = response;
+		return initialArray.map((rowNumber) => {
+			const newValues = Object.entries(values).reduce(
+				(acc, [key, value]) => ({
+					...acc,
+					[key]: value ? value[rowNumber] : null,
+				}),
+				{}
+			);
+			return {
+				...other,
+				response: { name, values: newValues },
+				rowNumber,
+			};
+		});
+	}, []);
+	const transpose = (m) => m[0].map((_, i) => m.map((x) => x[i]));
+	const rows = transpose(uiComponents);
+	return headers ? [headers, ...rows] : rows;
+};