@inseefr/lunatic 0.2.2-experimental → 0.2.3-prisme

package/src/components/suggester/components/selection/selection.js

@@ -1,50 +1,50 @@
-import React, { useContext } from 'react';
-import { SuggesterContext, actions } from '../../state-management';
-import classnames from 'classnames';
-import Label from './label';
-
-function Selection({ labelRenderer, placeholderList, labelledBy }, inputEl) {
-	const [state, dispatch] = useContext(SuggesterContext);
-	const { search, expended, id, disabled, focused } = state;
-
-	function onChange(e) {
-		dispatch(actions.onChangeSearch(e.target.value));
-	}
-
-	return (
-		<div
-			id={id}
-			className={classnames('lunatic-suggester-selection', {
-				focused,
-				disabled,
-			})}
-			role="combobox"
-			aria-haspopup="listbox"
-			aria-labelledby={labelledBy}
-			aria-expanded={expended}
-			aria-autocomplete="list"
-			aria-owns={`${id}-list`}
-		>
-			<input
-				ref={inputEl}
-				id={`${id}-input`}
-				tabIndex="0"
-				className="lunatic-suggester-input"
-				type="text"
-				onChange={onChange}
-				value={search}
-				aria-label="lunatic-suggester"
-				title="suggester"
-				autoComplete="off"
-				autoCapitalize="off"
-				autoCorrect="off"
-				spellCheck="false"
-				placeholderList={placeholderList}
-				disabled={disabled}
-			/>
-			<Label labelRenderer={labelRenderer} placeholderList={placeholderList} />
-		</div>
-	);
-}
-
-export default React.forwardRef(Selection);
+import React, { useContext } from 'react';
+import { SuggesterContext, actions } from '../../state-management';
+import classnames from 'classnames';
+import Label from './label';
+
+function Selection({ labelRenderer, placeholderList, labelledBy }, inputEl) {
+	const [state, dispatch] = useContext(SuggesterContext);
+	const { search, expended, id, disabled, focused } = state;
+
+	function onChange(e) {
+		dispatch(actions.onChangeSearch(e.target.value));
+	}
+
+	return (
+		<div
+			id={id}
+			className={classnames('lunatic-suggester-selection', {
+				focused,
+				disabled,
+			})}
+			role="combobox"
+			aria-haspopup="listbox"
+			aria-labelledby={labelledBy}
+			aria-expanded={expended}
+			aria-autocomplete="list"
+			aria-owns={`${id}-list`}
+		>
+			<input
+				ref={inputEl}
+				id={`${id}-input`}
+				tabIndex="0"
+				className="lunatic-suggester-input"
+				type="text"
+				onChange={onChange}
+				value={search}
+				aria-label="lunatic-suggester"
+				title="suggester"
+				autoComplete="off"
+				autoCapitalize="off"
+				autoCorrect="off"
+				spellCheck="false"
+				placeholderlist={placeholderList}
+				disabled={disabled}
+			/>
+			<Label labelRenderer={labelRenderer} placeholderList={placeholderList} />
+		</div>
+	);
+}
+
+export default React.forwardRef(Selection);

package/src/components/suggester/components/suggester-content.js

@@ -14,11 +14,11 @@ function SuggesterContent({
 	const onClick = useCallback(
 		function (e) {
 			const { current } = ref;
-			if (!current.contains(e.target)) {
+			if (!current.contains(e.target) && focused) {
 				onBlur();
 			}
 		},
-		[ref, onBlur]
+		[ref, focused, onBlur]
 	);
 
 	useDocumentAddEventListener('mousedown', onClick);

package/src/components/suggester/components/suggester.js

@@ -1,88 +1,128 @@
-import React, { useCallback, useContext, useRef, useMemo } from 'react';
-import classnames from 'classnames';
-import { actions, SuggesterContext } from '../state-management';
-import SuggesterContent from './suggester-content';
-import Selection from './selection';
-import Panel from './panel';
-import createOnKeyDownCallback from './create-on-keydown-callback';
-import Delete from './selection/delete';
-import './suggester.scss';
-
-function Suggester({
-	className,
-	placeholderList,
-	labelledBy,
-	optionRenderer,
-	labelRenderer,
-	onSelect,
-	value,
-}) {
-	const inputEl = useRef();
-	const [state, dispatch] = useContext(SuggesterContext);
-	const { focused, id, messageError, search, disabled } = state;
-
-	const onFocus = useCallback(
-		function () {
-			if (!disabled) {
-				if (inputEl.current !== document.activeElement) {
-				}
-				inputEl.current.focus();
-				dispatch(actions.onFocus());
-			}
-		},
-		[dispatch, disabled]
-	);
-
-	const onDelete = useCallback(
-		function () {
-			dispatch(actions.onDeleteSearch());
-			onSelect(undefined);
-		},
-		[dispatch, onSelect]
-	);
-
-	const onBlur = useCallback(
-		function () {
-			if (focused) {
-				dispatch(actions.onBlur());
-			}
-		},
-		[dispatch, focused]
-	);
-	const onKeyDown = useMemo(
-		() => createOnKeyDownCallback(dispatch),
-		[dispatch]
-	);
-
-	if (messageError) {
-		return (
-			<div className="lunatic-suggester-message-error">{messageError}</div>
-		);
-	}
-	return (
-		<div className={classnames('lunatic-suggester-container', className)}>
-			<SuggesterContent
-				id={id}
-				focused={focused}
-				onFocus={onFocus}
-				onBlur={onBlur}
-				onKeyDown={onKeyDown}
-			>
-				<Selection
-					labelRenderer={labelRenderer}
-					placeholderList={placeholderList}
-					labelledBy={labelledBy}
-					ref={inputEl}
-				/>
-				<Panel optionRenderer={optionRenderer} value={value} />
-			</SuggesterContent>
-			<Delete
-				className={classnames({ focused })}
-				search={search}
-				onClick={onDelete}
-			/>
-		</div>
-	);
-}
-
-export default Suggester;
+import React, {
+	useCallback,
+	useContext,
+	useRef,
+	useMemo,
+	useEffect,
+	useState,
+} from 'react';
+import classnames from 'classnames';
+import { actions, SuggesterContext } from '../state-management';
+import SuggesterContent from './suggester-content';
+import Selection from './selection';
+import Panel from './panel';
+import createOnKeyDownCallback from './create-on-keydown-callback';
+import Delete from './selection/delete';
+import * as C from '../../../constants';
+import * as U from '../../../utils/lib';
+import './suggester.scss';
+
+function Suggester({
+	className,
+	placeholderList,
+	labelledBy,
+	optionRenderer,
+	labelRenderer,
+	onSelect,
+	value,
+	focused: initFocused,
+	response,
+	logFunction,
+}) {
+	const inputEl = useRef();
+	const [state, dispatch] = useContext(SuggesterContext);
+	const { focused, id, messageError, search, disabled } = state;
+
+	const [init, setInit] = useState(false);
+
+	const createEventFocus = (focusIn = true) =>
+		U.createObjectEvent(
+			`suggester-${id}`,
+			C.INPUT_CATEGORY,
+			focusIn ? C.EVENT_FOCUS_IN : C.EVENT_FOCUS_OUT,
+			U.getResponseName(response),
+			value
+		);
+
+	const onFocus = useCallback(
+		function () {
+			if (!focused && !disabled) {
+				if (inputEl.current !== document.activeElement) {
+				}
+				inputEl.current.focus();
+				dispatch(actions.onFocus());
+			}
+		},
+		[disabled, dispatch, focused]
+	);
+
+	// Handle focused props of Component
+	useEffect(() => {
+		if (!init && id) {
+			if (initFocused && !focused) onFocus();
+			setInit(true);
+		}
+	}, [focused, init, initFocused, onFocus, id]);
+
+	// log info when focus change
+	useEffect(() => {
+		if (init && id && focused && U.isFunction(logFunction))
+			logFunction(createEventFocus());
+		if (init && id && !focused && U.isFunction(logFunction))
+			logFunction(createEventFocus(false));
+		// eslint-disable-next-line react-hooks/exhaustive-deps
+	}, [focused, id, init]);
+
+	const onDelete = useCallback(
+		function () {
+			dispatch(actions.onDeleteSearch());
+			onSelect(undefined);
+		},
+		[dispatch, onSelect]
+	);
+
+	const onBlur = useCallback(
+		function () {
+			if (focused) {
+				dispatch(actions.onBlur());
+			}
+		},
+		[dispatch, focused]
+	);
+	const onKeyDown = useMemo(
+		() => createOnKeyDownCallback(dispatch),
+		[dispatch]
+	);
+
+	if (messageError) {
+		return (
+			<div className="lunatic-suggester-message-error">{messageError}</div>
+		);
+	}
+	return (
+		<div className={classnames('lunatic-suggester-container', className)}>
+			<SuggesterContent
+				id={id}
+				focused={focused}
+				onFocus={onFocus}
+				onBlur={onBlur}
+				onKeyDown={onKeyDown}
+			>
+				<Selection
+					labelRenderer={labelRenderer}
+					placeholderList={placeholderList}
+					labelledBy={labelledBy}
+					ref={inputEl}
+				/>
+				<Panel optionRenderer={optionRenderer} value={value} />
+			</SuggesterContent>
+			<Delete
+				className={classnames({ focused })}
+				search={search}
+				onClick={onDelete}
+			/>
+		</div>
+	);
+}
+
+export default Suggester;

package/src/components/suggester/components/suggester.scss

@@ -1,101 +1,101 @@
-@mixin preventSelect() {
-	-moz-user-select: -moz-none;
-	-khtml-user-select: none;
-	-webkit-user-select: none;
-}
-
-.lunatic-suggester-container {
-	position: relative;
-	width: 100%;
-
-	.lunatic-suggester-fab {
-		position: absolute;
-		right: 4px;
-		top: 8px;
-		z-index: 0;
-		&.focused {
-			z-index: 1;
-		}
-
-		.lunatic-icon {
-			svg {
-				fill: white;
-				width: 16px;
-				height: 16px;
-			}
-		}
-	}
-
-	.lunatic-suggester {
-		position: relative;
-		z-index: 0;
-
-		&:focus {
-			outline: none;
-		}
-
-		&.focused {
-			z-index: 1;
-		}
-
-		.lunatic-suggester-content {
-			position: absolute;
-			width: 100%;
-
-			.lunatic-suggester-selection {
-				position: relative;
-				.lunatic-suggester-input {
-					border: none;
-					margin: 0;
-					padding: 0;
-					background-color: transparent;
-					&:focus {
-						outline: none;
-					}
-
-					width: 100%;
-					/* */
-				}
-
-				.lunatic-suggester-selected {
-					position: absolute;
-					top: 0;
-					white-space: nowrap;
-					overflow-x: hidden;
-					width: 100%;
-					height: 100%;
-					display: none;
-					&.displayed {
-						display: block;
-					}
-
-					.placeholderList {
-					}
-					.selection {
-					}
-				}
-			}
-
-			ul,
-			li,
-			div,
-			span {
-				margin: 0;
-				padding: 0;
-				border: none;
-				line-height: 1em;
-				list-style: none;
-			}
-
-			.lunatic-suggester-panel {
-				&:focus {
-					outline: none;
-				}
-				.lunatic-suggester-option {
-					white-space: nowrap;
-					@include preventSelect();
-				}
-			}
-		}
-	}
-}
+@mixin preventSelect() {
+	-moz-user-select: -moz-none;
+	-khtml-user-select: none;
+	-webkit-user-select: none;
+}
+
+.lunatic-suggester-container {
+	position: relative;
+	width: 100%;
+
+	.lunatic-suggester-fab {
+		position: absolute;
+		right: 4px;
+		top: 8px;
+		z-index: 0;
+		&.focused {
+			z-index: 1;
+		}
+
+		.lunatic-icon {
+			svg {
+				fill: white;
+				width: 16px;
+				height: 16px;
+			}
+		}
+	}
+
+	.lunatic-suggester {
+		position: relative;
+		z-index: 0;
+
+		&:focus {
+			outline: none;
+		}
+
+		&.focused {
+			z-index: 1;
+		}
+
+		.lunatic-suggester-content {
+			position: absolute;
+			width: 100%;
+
+			.lunatic-suggester-selection {
+				position: relative;
+				.lunatic-suggester-input {
+					border: none;
+					margin: 0;
+					padding: 0;
+					background-color: transparent;
+					&:focus {
+						outline: none;
+					}
+
+					width: 100%;
+					/* */
+				}
+
+				.lunatic-suggester-selected {
+					position: absolute;
+					top: 0;
+					white-space: nowrap;
+					overflow-x: hidden;
+					width: 100%;
+					height: 100%;
+					display: none;
+					&.displayed {
+						display: block;
+					}
+
+					.placeholderList {
+					}
+					.selection {
+					}
+				}
+			}
+
+			ul,
+			li,
+			div,
+			span {
+				margin: 0;
+				padding: 0;
+				border: none;
+				line-height: 1em;
+				list-style: none;
+			}
+
+			.lunatic-suggester-panel {
+				&:focus {
+					outline: none;
+				}
+				.lunatic-suggester-option {
+					white-space: nowrap;
+					@include preventSelect();
+				}
+			}
+		}
+	}
+}