@inseefr/lunatic 0.2.3-experimental → 0.2.3-prisme

package/src/components/suggester/components/panel/option-container.js

@@ -1,61 +1,61 @@
-import React, { useRef, useEffect } from 'react';
-import classnames from 'classnames';
-import { actions, SuggesterContext, useDispatch } from '../../state-management';
-
-function getMin(rect) {
-	const { top } = rect;
-	return top;
-}
-
-function getMax(rect) {
-	const { top, height } = rect;
-	return top + height;
-}
-
-function isVisible(optionRect, parentRect) {
-	const min = Math.min(getMin(optionRect), getMin(parentRect));
-	const max = Math.max(getMax(optionRect), getMax(parentRect));
-	if (max - min < optionRect.height + parentRect.height) {
-		return true;
-	}
-	return false;
-}
-
-function OptionContainer({ children, index, selected }) {
-	const ref = useRef();
-	const dispatch = useDispatch(SuggesterContext);
-
-	function onClick(e) {
-		e.stopPropagation();
-		e.preventDefault();
-		dispatch(actions.onClickOption(index));
-	}
-
-	useEffect(
-		function () {
-			const { current } = ref;
-			if (current && selected) {
-				const oRect = current.getBoundingClientRect();
-				const pRect = current.parentNode.getBoundingClientRect();
-				if (!isVisible(oRect, pRect)) {
-					current.scrollIntoView();
-				}
-			}
-		},
-		[ref, selected]
-	);
-
-	return (
-		<li
-			className={classnames('lunatic-suggester-option', { selected })}
-			role="option"
-			aria-selected={selected}
-			onClick={onClick}
-			ref={ref}
-		>
-			{children}
-		</li>
-	);
-}
-
-export default OptionContainer;
+import React, { useRef, useEffect } from 'react';
+import classnames from 'classnames';
+import { actions, SuggesterContext, useDispatch } from '../../state-management';
+
+function getMin(rect) {
+	const { top } = rect;
+	return top;
+}
+
+function getMax(rect) {
+	const { top, height } = rect;
+	return top + height;
+}
+
+function isVisible(optionRect, parentRect) {
+	const min = Math.min(getMin(optionRect), getMin(parentRect));
+	const max = Math.max(getMax(optionRect), getMax(parentRect));
+	if (max - min < optionRect.height + parentRect.height) {
+		return true;
+	}
+	return false;
+}
+
+function OptionContainer({ children, index, selected }) {
+	const ref = useRef();
+	const dispatch = useDispatch(SuggesterContext);
+
+	function onClick(e) {
+		e.stopPropagation();
+		e.preventDefault();
+		dispatch(actions.onClickOption(index));
+	}
+
+	useEffect(
+		function () {
+			const { current } = ref;
+			if (current && selected) {
+				const oRect = current.getBoundingClientRect();
+				const pRect = current.parentNode.getBoundingClientRect();
+				if (!isVisible(oRect, pRect)) {
+					current.scrollIntoView();
+				}
+			}
+		},
+		[ref, selected]
+	);
+
+	return (
+		<li
+			className={classnames('lunatic-suggester-option', { selected })}
+			role="option"
+			aria-selected={selected}
+			onMouseDown={onClick}
+			ref={ref}
+		>
+			{children}
+		</li>
+	);
+}
+
+export default OptionContainer;

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

@@ -1,47 +1,47 @@
-import React, { useContext } from 'react';
-import { SuggesterContext } from '../../state-management';
-import PanelContainer from './panel-container';
-import OptionContainer from './option-container';
-
-function getContent({
-	options,
-	OptionRender,
-	selectedIndex,
-	expended,
-	value,
-	search,
-}) {
-	if (expended) {
-		return options.map(function (option, index) {
-			const { id } = option;
-			const selected = selectedIndex === index;
-			return (
-				<OptionContainer key={id} index={index} selected={id === value}>
-					<OptionRender option={option} selected={selected} search={search} />
-				</OptionContainer>
-			);
-		});
-	}
-	return undefined;
-}
-
-function Panel({ optionRenderer: OptionRender, value }) {
-	const [state] = useContext(SuggesterContext);
-	const { options, focused, selectedIndex, expended, id, search } = state;
-	const content = getContent({
-		options,
-		OptionRender,
-		selectedIndex,
-		expended,
-		value,
-		search,
-	});
-
-	return (
-		<PanelContainer expended={expended} focused={focused} id={`${id}-list`}>
-			{content}
-		</PanelContainer>
-	);
-}
-
-export default Panel;
+import React, { useContext } from 'react';
+import { SuggesterContext } from '../../state-management';
+import PanelContainer from './panel-container';
+import OptionContainer from './option-container';
+
+function getContent({
+	options,
+	OptionRender,
+	selectedIndex,
+	expended,
+	value,
+	search,
+}) {
+	if (expended) {
+		return options.map(function (option, index) {
+			const { id } = option;
+			const selected = selectedIndex === index;
+			return (
+				<OptionContainer key={id} index={index} selected={id === value}>
+					<OptionRender option={option} selected={selected} search={search} />
+				</OptionContainer>
+			);
+		});
+	}
+	return undefined;
+}
+
+function Panel({ optionRenderer: OptionRender, value }) {
+	const [state] = useContext(SuggesterContext);
+	const { options, focused, selectedIndex, expended, id, search } = state;
+	const content = getContent({
+		options,
+		OptionRender,
+		selectedIndex,
+		expended,
+		value,
+		search,
+	});
+
+	return (
+		<PanelContainer expended={expended} focused={focused} id={`${id}-list`}>
+			{content}
+		</PanelContainer>
+	);
+}
+
+export default Panel;

package/src/components/suggester/components/selection/default-label-renderer.js

@@ -1,31 +1,31 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-
-function getContent(option, search) {
-	if (option) {
-		const { id, label } = option;
-		return label ? `${id} - ${label}` : id;
-	}
-	if (search && search.trim().length) {
-		return search;
-	}
-	return undefined;
-}
-
-function DefaultLabelRenderer({ option, placeholderList, search }) {
-	const content = getContent(option, search);
-	if (content) {
-		return <span className="selection">{content}</span>;
-	}
-	return <span className="placeholderList">{placeholderList}</span>;
-}
-
-DefaultLabelRenderer.propTypes = {
-	option: PropTypes.shape({
-		id: PropTypes.oneOfType([PropTypes.string, PropTypes.number]).isRequired,
-	}),
-	placeholderList: PropTypes.string,
-	search: PropTypes.string,
-};
-
-export default DefaultLabelRenderer;
+import React from 'react';
+import PropTypes from 'prop-types';
+
+function getContent(option, search) {
+	if (option) {
+		const { id, label } = option;
+		return label ? `${id} - ${label}` : id;
+	}
+	if (search && search.trim().length) {
+		return search;
+	}
+	return undefined;
+}
+
+function DefaultLabelRenderer({ option, placeholderList, search }) {
+	const content = getContent(option, search);
+	if (content) {
+		return <span className="selection">{content}</span>;
+	}
+	return <span className="placeholderList">{placeholderList}</span>;
+}
+
+DefaultLabelRenderer.propTypes = {
+	option: PropTypes.shape({
+		id: PropTypes.oneOfType([PropTypes.string, PropTypes.number]).isRequired,
+	}),
+	placeholderList: PropTypes.string,
+	search: PropTypes.string,
+};
+
+export default DefaultLabelRenderer;

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

@@ -1,35 +1,35 @@
-import React, { useContext } from 'react';
-import classnames from 'classnames';
-import { SuggesterContext } from '../../state-management';
-import DefaultLabelRenderer from './default-label-renderer';
-
-function Label({
-	labelRenderer: Renderer = DefaultLabelRenderer,
-	placeholderList,
-}) {
-	const [state] = useContext(SuggesterContext);
-	const { displayLabel, expended, selectedIndex, options, search, disabled } =
-		state;
-	const displayed = displayLabel || !expended;
-
-	const option =
-		selectedIndex !== undefined ? options[selectedIndex] : undefined;
-
-	return (
-		<div
-			className={classnames('lunatic-suggester-selected', {
-				displayed,
-				disabled,
-			})}
-			tabIndex="-1"
-		>
-			<Renderer
-				option={option}
-				placeholderList={placeholderList}
-				search={search}
-			/>
-		</div>
-	);
-}
-
-export default Label;
+import React, { useContext } from 'react';
+import classnames from 'classnames';
+import { SuggesterContext } from '../../state-management';
+import DefaultLabelRenderer from './default-label-renderer';
+
+function Label({
+	labelRenderer: Renderer = DefaultLabelRenderer,
+	placeholderList,
+}) {
+	const [state] = useContext(SuggesterContext);
+	const { displayLabel, expended, selectedIndex, options, search, disabled } =
+		state;
+	const displayed = displayLabel || !expended;
+
+	const option =
+		selectedIndex !== undefined ? options[selectedIndex] : undefined;
+
+	return (
+		<div
+			className={classnames('lunatic-suggester-selected', {
+				displayed,
+				disabled,
+			})}
+			tabIndex="-1"
+		>
+			<Renderer
+				option={option}
+				placeholderList={placeholderList}
+				search={search}
+			/>
+		</div>
+	);
+}
+
+export default Label;

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);