fix open icon modal (#309)

gravity-ui · Dec 3, 2024 · 0f75e04 · 0f75e04
1 parent 6b4eb41
commit 0f75e04
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/src/components/Icons/Icons.tsx b/src/components/Icons/Icons.tsx
@@ -40,12 +40,15 @@ export const Icons: React.FC<IconsProps> = ({currentIcon, onChangeCurrentIcon})
         }
     }, [isMobile]);
 
+    const closeTimeoutRef = React.useRef<ReturnType<typeof setTimeout>>();
+
     React.useEffect(() => {
         if (currentIcon && currentIcon !== iconForDialog?.name) {
             const iconToShow = allIcons.find((icon) => icon.name === currentIcon);
 
             if (iconToShow) {
                 setIsOpenIconDialog(true);
+                clearTimeout(closeTimeoutRef.current);
                 setIconForDialog(iconToShow);
             }
         }
@@ -54,6 +57,7 @@ export const Icons: React.FC<IconsProps> = ({currentIcon, onChangeCurrentIcon})
     const handleSelectIcon = React.useCallback(
         (item: IconItem) => {
             setIsOpenIconDialog(true);
+            clearTimeout(closeTimeoutRef.current);
             setIconForDialog(item);
             onChangeCurrentIcon?.(item?.name);
         },
@@ -62,7 +66,7 @@ export const Icons: React.FC<IconsProps> = ({currentIcon, onChangeCurrentIcon})
 
     const handleCloseDialog = React.useCallback(() => {
         setIsOpenIconDialog(false);
-        setTimeout(() => {
+        closeTimeoutRef.current = setTimeout(() => {
             setIconForDialog(undefined);
             onChangeCurrentIcon?.(undefined);
         }, 500);