From b214baab3e17d92f784b4f782863deafc5558ee4 Mon Sep 17 00:00:00 2001 From: Armand Philippot Date: Wed, 18 May 2022 14:27:11 +0200 Subject: chore: close toolbar modals on click/focus outside --- src/components/molecules/forms/select-with-tooltip.tsx | 10 +++++++++- src/components/molecules/modals/tooltip.tsx | 16 +++++++--------- 2 files changed, 16 insertions(+), 10 deletions(-) (limited to 'src/components/molecules') diff --git a/src/components/molecules/forms/select-with-tooltip.tsx b/src/components/molecules/forms/select-with-tooltip.tsx index cf7b041..f576a15 100644 --- a/src/components/molecules/forms/select-with-tooltip.tsx +++ b/src/components/molecules/forms/select-with-tooltip.tsx @@ -1,4 +1,5 @@ -import { FC, useState } from 'react'; +import useClickOutside from '@utils/hooks/use-click-outside'; +import { FC, useRef, useState } from 'react'; import HelpButton from '../buttons/help-button'; import Tooltip, { type TooltipProps } from '../modals/tooltip'; import LabelledSelect, { type LabelledSelectProps } from './labelled-select'; @@ -28,11 +29,17 @@ const SelectWithTooltip: FC = ({ ...props }) => { const [isTooltipOpened, setIsTooltipOpened] = useState(false); + const tooltipRef = useRef(null); const buttonModifier = isTooltipOpened ? styles['btn--activated'] : ''; const tooltipModifier = isTooltipOpened ? styles['tooltip--visible'] : styles['tooltip--hidden']; + useClickOutside( + tooltipRef, + () => isTooltipOpened && setIsTooltipOpened(false) + ); + return (
= ({ content={content} icon="?" className={`${styles.tooltip} ${tooltipModifier} ${tooltipClassName}`} + ref={tooltipRef} />
); diff --git a/src/components/molecules/modals/tooltip.tsx b/src/components/molecules/modals/tooltip.tsx index 80721f3..efb3009 100644 --- a/src/components/molecules/modals/tooltip.tsx +++ b/src/components/molecules/modals/tooltip.tsx @@ -1,5 +1,5 @@ import List, { type ListItem } from '@components/atoms/lists/list'; -import { FC, ReactNode } from 'react'; +import { forwardRef, ForwardRefRenderFunction, ReactNode } from 'react'; import styles from './tooltip.module.scss'; export type TooltipProps = { @@ -26,12 +26,10 @@ export type TooltipProps = { * * Render a tooltip modal. */ -const Tooltip: FC = ({ - className = '', - content, - icon, - title, -}) => { +const Tooltip: ForwardRefRenderFunction = ( + { className = '', content, icon, title }, + ref +) => { /** * Format an array of strings to an array of object with id and value. * @@ -45,7 +43,7 @@ const Tooltip: FC = ({ }; return ( -
+
{icon} {title} @@ -59,4 +57,4 @@ const Tooltip: FC = ({ ); }; -export default Tooltip; +export default forwardRef(Tooltip); -- cgit v1.2.3