@inseefr/lunatic 0.1.7 → 0.1.8-experimental

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

@@ -1,119 +1,54 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { buildStyleObject } from '../../utils/string-utils';
-import { getLabelPositionClass } from '../../utils/label-position';
+import missingWrapper from '../missing-wrapper';
+import { InputDeclarationsWrapper } from '../declarations/wrappers';
+import { areEqual } from '../../utils/lib';
 import './input.scss';
 
-class InputNumber extends React.Component {
-	constructor(props) {
-		super(props);
-		this.state = { messagesError: [] };
-		this.validators = [minMaxValidator(props)];
-		if (props.validators && props.validators.length > 0) {
-			this.validators = [minMaxValidator(props), ...props.validators];
-		}
-		this.validate = this.validate.bind(this);
-	}
-
-	validate(value) {
-		const messagesError = this.validators
-			.map(v => v(value))
-			.filter(m => m !== undefined);
-		this.setState({ messagesError });
-	}
-
-	render() {
-		const {
-			id,
-			label,
-			value,
-			min,
-			max,
-			decimals,
-			placeholder,
-			handleChange,
-			readOnly,
-			style,
-			unit,
-			labelPosition,
-			required,
-		} = this.props;
-		const { messagesError } = this.state;
-		return (
-			<div className={getLabelPositionClass(labelPosition)}>
-				<label
-					htmlFor={`input-${id}`}
-					id={`input-label-${id}`}
-					className={`${required ? 'required' : ''}`}
-				>{`${label} ${unit ? `(${unit})` : ''}`}</label>
-				<div className={`lunatic-input-number`}>
-					<input
-						type="number"
-						id={`input-${id}`}
-						aria-labelledby={`input-label-${id}`}
-						value={value}
-						min={min}
-						max={max}
-						step={decimals ? `${Math.pow(10, -decimals)}` : '0'}
-						placeholder={placeholder}
-						className={`input-lunatic ${
-							this.state.messagesError.length > 0 ? 'warning' : ''
-						}`}
-						style={buildStyleObject(style)}
-						readOnly={readOnly}
-						required={required}
-						aria-required={required}
-						onChange={e => {
-							this.validate(e.target.value);
-							handleChange(e.target.value);
-						}}
-					/>
-				</div>
-				<div className="lunatic-input-number-errors">
-					{messagesError.map((m, i) => (
-						<div key={i} className="error">
-							{m}
-						</div>
-					))}
-				</div>
-			</div>
-		);
-	}
-}
+const InputNumber = ({ numberAsTextfield, ...props }) => {
+	const { min, max, validators } = props;
+	return (
+		<InputDeclarationsWrapper
+			type={numberAsTextfield ? 'text' : 'number'}
+			roleType="input"
+			{...props}
+			validators={[minMaxValidator({ min, max }), ...validators]}
+			isInputNumber
+			numberAsTextfield
+		/>
+	);
+};
 
-const minMaxValidator = ({ min, max }) => value =>
-	min !== undefined && max !== undefined ? (
-		value < min || value > max ? (
-			<span>{`La valeur doit être comprise entre ${min} et ${max}`}</span>
-		) : (
-			undefined
+const minMaxValidator =
+	({ min, max }) =>
+	(value) => {
+		if (!value) {
+			return undefined;
+		}
+		const valueNumber = Number(value);
+		if (!min && isDef(max) && valueNumber > max)
+			return <span>{`La valeur doit être inférieure à ${max}`}</span>;
+		else if (isDef(min) && !max && valueNumber < min)
+			return <span>{`La valeur doit être supérieure à ${min}`}</span>;
+		else if (
+			isDef(min) &&
+			isDef(max) &&
+			(valueNumber < min || valueNumber > max)
 		)
-	) : (
-		undefined
-	);
+			return (
+				<span>{`La valeur doit être comprise entre ${min} et ${max}`}</span>
+			);
+		return undefined;
+	};
+
+const isDef = (number) => number || number === 0;
 
 InputNumber.defaultProps = {
-	min: 0,
-	max: Number.MAX_SAFE_INTEGER,
-	placeholder: '',
-	readOnly: false,
-	labelPosition: 'DEFAULT',
-	required: false,
+	validators: [],
 };
 
 InputNumber.propTypes = {
-	id: PropTypes.string.isRequired,
-	label: PropTypes.string.isRequired,
-	value: PropTypes.number.isRequired,
-	min: PropTypes.number,
-	max: PropTypes.number,
-	decimals: PropTypes.number,
-	placeholder: PropTypes.string,
-	handleChange: PropTypes.func.isRequired,
-	readOnly: PropTypes.bool,
-	style: PropTypes.object,
-	labelPosition: PropTypes.oneOf(['DEFAULT', 'TOP', 'BOTTOM', 'LEFT', 'RIGHT']),
-	required: PropTypes.bool,
+	validators: PropTypes.arrayOf(PropTypes.func),
 };
 
-export default InputNumber;
+export default React.memo(missingWrapper(InputNumber), areEqual);

package/src/components/input/input.js

@@ -0,0 +1,11 @@
+import React from 'react';
+import { InputDeclarationsWrapper } from '../declarations/wrappers';
+import { areEqual } from '../../utils/lib';
+import missingWrapper from '../missing-wrapper';
+import './input.scss';
+
+const Input = (props) => (
+	<InputDeclarationsWrapper type="text" roleType="input" {...props} />
+);
+
+export default React.memo(missingWrapper(Input), areEqual);

package/src/components/input/input.scss

@@ -1,29 +1,35 @@
-@import 'src/components/index.scss';
-
-.lunatic-input-number {
-	.input-lunatic {
-		box-sizing: border-box;
-		border: solid 2px $main_color;
-		border-radius: 10px;
-		padding: 5px;
-		&:focus {
-			outline: none;
-			box-shadow: 0 0 10px $main_color;
-		}
-		&:read-only {
-			background-color: $disabled;
-		}
+.input-lunatic,
+.datepicker-lunatic,
+.textarea-lunatic {
+	font: inherit;
+	border: 0;
+	border-bottom: 0.125rem double rgba(0, 0, 0, 0.42);
+	margin: 0;
+	padding: 0.375rem 0 0.375rem 0.4375rem;
+	display: block;
+	min-width: 0;
+	box-sizing: content-box;
+	background: none;
+	&:focus {
+		outline: none;
+		border-bottom: 0.125rem solid var(--color-primary-main);
 	}
-
-	.warning {
-		box-sizing: border-box;
-		border: solid 2px $background-warning;
-		background-color: $background-warning;
+	&:hover {
+		border-bottom: 0.125rem solid black;
+	}
+	&:read-only {
+		background-color: var(--color-disabled);
 	}
 }
 
-.lunatic-input-number-errors {
-	.error {
-		color: $background-warning;
-	}
+.warning {
+	box-sizing: border-box;
+	border: solid 2px var(--color-error);
+	background-color: var(--color-error);
+}
+
+.lunatic-input-number-errors .error {
+	color: var(--color-error);
+	font-size: 80%;
+	margin-top: 0.3125rem;
 }

package/src/components/loop/component.js

@@ -0,0 +1,258 @@
+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,
+	setPage,
+	flow,
+	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,
+						[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]);
+
+	/**
+	 * Handle init page
+	 */
+
+	if (
+		pagination &&
+		paginatedLoop &&
+		loopDepth > currentPage.split('.').length - 1
+	) {
+		if (flow === U.FLOW_NEXT) {
+			setPage(`${currentPage}.1#1`);
+		} else if (flow === U.FLOW_PREVIOUS) {
+			setPage(`${currentPage}.${maxPage}#${iterationNb}`);
+		}
+		return null;
+	}
+
+	const flattenComponents = U.buildLoopComponents(iterationNb)(components);
+
+	const {
+		currentRootPage,
+		currentComponentIndex,
+		currentIteration,
+		currentPageWithoutAnyIteration,
+	} = U.splitPage(currentPage, loopDepth);
+
+	if (
+		pagination &&
+		paginatedLoop &&
+		loopDepth === currentPage.split('.').length - 1
+	) {
+		// Previous at first component
+		if (currentComponentIndex < 1) {
+			setPage(`${currentRootPage}.${maxPage}#${currentIteration - 1}`);
+			return null;
+		}
+
+		// Next at last component
+		if (currentComponentIndex > maxPage) {
+			setPage(`${currentRootPage}.1#${currentIteration + 1}`);
+			return null;
+		}
+
+		// Previous at first iteration
+		if (currentIteration < 1) {
+			const splitRoot = currentRootPage.split('.');
+			if (splitRoot.length === 1) setPage(`${parseInt(splitRoot[0], 10) - 1}`);
+			else {
+				const subPagesToUpdate = splitRoot.slice().pop().split('#');
+				const newSubPage = `${parseInt(subPagesToUpdate[0], 10) - 1}#${
+					subPagesToUpdate[1]
+				}`;
+				const newPage = [
+					...splitRoot.slice(0, splitRoot.length - 1),
+					newSubPage,
+				].join('.');
+				setPage(`${newPage}`);
+			}
+			return null;
+		}
+
+		// Next at last iteration
+		if (currentIteration > iterationNb) {
+			const splitRoot = currentRootPage.split('#');
+			const newRootPage =
+				splitRoot.length === 1
+					? parseInt(splitRoot[0], 10) + 1
+					: splitRoot.slice(0, -1).join('#');
+			if (splitRoot.length === 1) setPage(`${newRootPage}`);
+			else {
+				const {
+					currentRootPage: newCurrentRootPage,
+					currentIteration: newCurrentIteration,
+				} = U.splitPage(currentRootPage, loopDepth);
+				setPage(`${newCurrentRootPage}.1#${newCurrentIteration + 1}`);
+			}
+			return null;
+		}
+	}
+
+	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}
+						bindingDependencies={bindingDependencies}
+						componentType={componentType}
+						pagination={pagination}
+						currentPage={currentPage}
+						setPage={setPage}
+						flow={flow}
+						conditionFilter={conditionFilter}
+						missingResponse={loopMissingResponse}
+					/>
+				</div>,
+			];
+		},
+		[]
+	);
+
+	if (pagination && paginatedLoop && loopComponents.length === 0) {
+		if (flow === U.FLOW_NEXT) {
+			setPage(
+				`${currentRootPage}.${currentComponentIndex + 1}#${currentIteration}`
+			);
+		} else if (flow === U.FLOW_PREVIOUS) {
+			setPage(
+				`${currentRootPage}.${currentComponentIndex - 1}#${currentIteration}`
+			);
+		}
+		return null;
+	}
+
+	return (
+		<div id={`loop-${id}`} className="lunatic-loop">
+			{loopComponents}
+		</div>
+	);
+};
+
+export default React.memo(Loop, U.areEqual);

package/src/components/loop/index.js

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

package/src/components/loop/loop.scss

@@ -0,0 +1,11 @@
+.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 missingWrapper?
+
+export default LoopWrapper;

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

@@ -0,0 +1,8 @@
+.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 missingWrapper from '../../missing-wrapper';
+import LoopConstructorWrapper from '../wrapper';
+import * as U from '../../../utils/lib';
+import './block.scss';
+
+const BlockForLoop = (props) => <LoopConstructorWrapper {...props} />;
+
+export default React.memo(missingWrapper(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 missingWrapper from '../../missing-wrapper';
+import LoopConstructorWrapper from '../wrapper';
+import * as U from '../../../utils/lib';
+
+const RosterForLoop = (props) => <LoopConstructorWrapper {...props} />;
+
+export default React.memo(missingWrapper(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,122 @@
+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,
+}) => {
+	const uiComponents = buildContentForLoopConstructor({
+		components,
+		headers,
+	});
+	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,
+									...componentProps
+								} = component;
+								const localBindings =
+									U.buildBindingsForDeeperComponents(rowNumber)(bindings);
+								if (componentType) {
+									const Component = lunatic[componentType];
+									return (
+										<td
+											key={`table-${mainId}-row-${i}-cell-${j}`}
+											style={{ width }}
+										>
+											<Component
+												{...componentProps}
+												id={`${id}-row-${i}`}
+												label={label}
+												handleChange={(up) => {
+													setTodo({ up, rowNumber });
+												}}
+												preferences={preferences}
+												positioning={positioning}
+												management={management}
+												features={features}
+												bindings={localBindings}
+												zIndex={uiComponents.length - i || 0}
+												logFunction={logFunction}
+											/>
+										</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);
+						return (
+							<div className="block-component" key={`${id}-row-${i}`}>
+								<Component
+									{...componentProps}
+									id={`${id}-row-${i}`}
+									label={label}
+									handleChange={(up) => {
+										setTodo({ up, rowNumber: i });
+									}}
+									preferences={preferences}
+									positioning={positioning}
+									management={management}
+									features={features}
+									bindings={localBindings}
+									logFunction={logFunction}
+								/>
+							</div>
+						);
+					})
+				)}
+			</div>
+		);
+};
+
+export default BodyComponent;