@inseefr/lunatic 0.1.0-hackathon → 0.1.0-prisme

package/src/components/component-wrapper/wrapper.js

@@ -0,0 +1,23 @@
+import React from 'react';
+import Missing from './missing';
+import Controls from './controls';
+
+const componentWrapper = (Component) => (props) => {
+	const { missing, controls, componentType } = props;
+	const hasC = hasControls(controls, componentType);
+	if (missing && !hasC) return <Missing Component={Component} props={props} />;
+	if (!missing && hasC) return <Controls Component={Component} props={props} />;
+	if (missing && hasC) {
+		const ControlComponent = () => (
+			<Controls Component={Component} props={props} />
+		);
+		return <Missing Component={ControlComponent} props={props} />;
+	}
+	return <Component {...props} />;
+};
+
+const hasControls = (controls, componentType) =>
+	(Array.isArray(controls) && controls.length > 0) ||
+	['InputNumber', 'Datepicker'].includes(componentType);
+
+export default componentWrapper;

package/src/components/components.js

@@ -1,18 +1,19 @@
-export { default as Breadcrumb } from './breadcrumb';
-export { default as Button } from './button';
-export * from './checkbox';
-export { default as Datepicker } from './datepicker';
-export { default as Declarations } from './declarations';
-export { default as Dropdown } from './dropdown';
-export * from './input';
-export { default as FilterDescription } from './filter-description';
-export { default as ProgressBar } from './progress-bar';
-export { default as Radio } from './radio';
-export { default as Loop } from './loop';
-export * from './loop-constructor';
-export { default as Sequence } from './sequence';
-export { default as Subsequence } from './subsequence';
-export { default as Suggester } from './suggester';
-export { default as Textarea } from './textarea';
-export { default as SuggesterLoaderWidget } from './suggester-loader-widget';
-export { TooltipResponse } from './tooltip';
+export { default as Breadcrumb } from './breadcrumb';
+export { default as Button } from './button';
+export * from './checkbox';
+export { default as Datepicker } from './datepicker';
+export { default as Declarations } from './declarations';
+export { default as Dropdown } from './dropdown';
+export * from './input';
+export { default as FilterDescription } from './filter-description';
+export { default as Modal } from './modal';
+export { default as ProgressBar } from './progress-bar';
+export { default as Radio } from './radio';
+export { default as Loop } from './loop';
+export * from './loop-constructor';
+export { default as Sequence } from './sequence';
+export { default as Subsequence } from './subsequence';
+export { default as Suggester } from './suggester';
+export { default as Textarea } from './textarea';
+export { default as SuggesterLoaderWidget } from './suggester-loader-widget';
+export { TooltipResponse } from './tooltip';

package/src/components/datepicker/component.js

@@ -1,11 +1,26 @@
 import React from 'react';
-import missingWrapper from '../missing-wrapper';
+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 './datepicker.scss';
 
 const Datepicker = (props) => (
-	<InputDeclarationsWrapper type="date" roleType="datepicker" {...props} />
+	<InputDeclarationsWrapper
+		type="date"
+		roleType="datepicker"
+		{...props}
+		validators={[getTypeControls]}
+	/>
 );
 
-export default missingWrapper(React.memo(Datepicker, areEqual));
+Datepicker.defaultProps = {
+	validators: [],
+};
+
+Datepicker.propTypes = {
+	validators: PropTypes.arrayOf(PropTypes.func),
+};
+
+export default componentWrapper(React.memo(Datepicker, areEqual));

package/src/components/datepicker/datepicker.scss

@@ -1 +1 @@
-// see input.scss
+// see input.scss

package/src/components/datepicker/index.js

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

package/src/components/declarations/index.js

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

package/src/components/declarations/wrappers/index.js

@@ -1,3 +1,3 @@
-export { default as InputDeclarationsWrapper } from './input-declarations-wrapper';
-export { default as ListDeclarationsWrapper } from './list-declarations-wrapper';
-export { default as SimpleDeclarationsWrapper } from './simple-declarations-wrapper';
+export { default as InputDeclarationsWrapper } from './input-declarations-wrapper';
+export { default as ListDeclarationsWrapper } from './list-declarations-wrapper';
+export { default as SimpleDeclarationsWrapper } from './simple-declarations-wrapper';

package/src/components/declarations/wrappers/input-declarations-wrapper.js

@@ -36,6 +36,7 @@ const InputDeclarationsWrapper = ({
 	isInputNumber,
 	numberAsTextfield,
 	logFunction,
+	componentType,
 }) => {
 	const inputRef = useRef();
 	const createEventFocus = (focusIn = true) =>
@@ -51,7 +52,9 @@ const InputDeclarationsWrapper = ({
 	);
 
 	const [messagesError, setMessagesError] = useState(
-		validators.map((v) => v(value)).filter((m) => m !== undefined)
+		validators
+			.map((v) => v({ min, max, value, preferences, componentType, id }))
+			.filter((m) => m)
 	);
 
 	useEffect(() => {
@@ -68,17 +71,30 @@ const InputDeclarationsWrapper = ({
 
 	const validate = (v) => {
 		setMessagesError(
-			validators.map((f) => f(v)).filter((m) => m !== undefined)
+			validators
+				.map((v) => v({ min, max, value: v, preferences, componentType, id }))
+				.filter((m) => m)
 		);
 	};
 
 	useEffect(() => {
-		if (isInputNumber) {
+		if (['InputNumber', 'Datepicker'].includes(componentType)) {
 			setMessagesError(
-				validators.map((v) => v(value)).filter((m) => m !== undefined)
+				validators
+					.map((v) => v({ min, max, value, preferences, componentType, id }))
+					.filter((m) => m)
 			);
 		}
-	}, [value, min, max, validators, isInputNumber]);
+	}, [
+		value,
+		min,
+		max,
+		validators,
+		isInputNumber,
+		id,
+		preferences,
+		componentType,
+	]);
 
 	const handleChangeOnBlur = () => {
 		const initValue = U.getResponseByPreference(preferences)(response);
@@ -143,7 +159,10 @@ const InputDeclarationsWrapper = ({
 							placeholder={placeholder}
 							autoComplete={autoComplete ? 'on' : 'off'}
 							className={`${roleType}-lunatic ${
-								isInputNumber && messagesError.length > 0 ? 'warning' : ''
+								(isInputNumber || roleType === 'datepicker') &&
+								messagesError.length > 0
+									? 'warning'
+									: ''
 							}`}
 							style={U.buildStyleObject(style)}
 							readOnly={readOnly}
@@ -153,17 +172,42 @@ const InputDeclarationsWrapper = ({
 							aria-required={mandatory}
 							onChange={(e) => {
 								const v = e.target.value;
+								const valueToFire = v === '' ? null : v;
+								const valueToFireForArrows =
+									Number.parseFloat(v).toFixed(decimals);
 								if (
+									decimals &&
+									v !== '' &&
+									!new RegExp(`^[0-9]+(.[0-9]{1,${decimals}})?$`).test(
+										valueToFireForArrows
+									)
+								) {
+									e.preventDefault();
+								} else if (
+									(([null, ''].includes(v) && value.length > 0) ||
+										([null, ''].includes(value) && v.length > 0)) &&
+									componentType !== 'Datepicker'
+								) {
+									setValue(valueToFire);
+									handleChange({
+										[U.getResponseName(response)]: valueToFire,
+									});
+								} else if (
 									// Chrome
 									(Object.getPrototypeOf(e.nativeEvent).constructor.name ===
 										'Event' &&
 										roleType !== 'datepicker') ||
 									// FF hack: impossible to handle arrow events
-									Math.abs(v - value) === 1
+									(Math.abs(v - value).toFixed(decimals) !==
+										Number.parseFloat(`${Math.pow(10, -decimals)}`).toFixed(
+											decimals
+										) &&
+										!Number.parseInt(v, 10) &&
+										isInputNumber)
 								) {
-									setValue(v);
+									setValue(valueToFireForArrows);
 									handleChange({
-										[U.getResponseName(response)]: v,
+										[U.getResponseName(response)]: valueToFireForArrows,
 									});
 								} else {
 									if (isInputNumber) {
@@ -177,12 +221,17 @@ const InputDeclarationsWrapper = ({
 											return null;
 										} else validate(v);
 									}
-									if (management) setValue(v);
-									else setValue(v === '' ? null : v);
+									if (management) setValue(valueToFire);
+									else setValue(valueToFire);
 								}
 							}}
 							onBlur={handleChangeOnBlur}
 							onFocus={handleFocusIn}
+							onKeyPress={(event) => {
+								if (decimals === 0 && !/[0-9]/.test(event.key)) {
+									event.preventDefault();
+								}
+							}}
 						/>
 						{isInputNumber && unit && unitPosition === 'AFTER' && (
 							<span className="unit">{unit}</span>
@@ -197,11 +246,11 @@ const InputDeclarationsWrapper = ({
 						</div>
 					)}
 				</div>
-				{isInputNumber && (
-					<div className="lunatic-input-number-errors">
-						{messagesError.map((m, i) => (
-							<div key={i} className="error">
-								{m}
+				{messagesError.length > 0 && (
+					<div className="lunatic-controls">
+						{messagesError.map(({ id, errorMessage }) => (
+							<div key={`control-${id}`} className="lunatic-control">
+								{errorMessage}
 							</div>
 						))}
 					</div>