akanjs 2.3.10-rc.0 → 2.3.10-rc.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "akanjs",
-  "version": "2.3.10-rc.0",
+  "version": "2.3.10-rc.2",
   "sourceType": "module",
   "type": "module",
   "publishConfig": {

package/ui/Dialog/Modal.tsx

@@ -5,7 +5,7 @@ import { animated } from "akanjs/ui";
 import { type ReactNode, useCallback, useContext, useEffect, useId, useRef, useState } from "react";
 import { createPortal } from "react-dom";
 import { BiX } from "react-icons/bi";
-import { config, useReducedMotion, useSpring } from "react-spring";
+import { config, useSpring } from "react-spring";
 
 import { DialogContext } from "./context";
 
@@ -30,10 +30,7 @@ export const Modal = ({ className, bodyClassName, confirmClose, children, onCanc
   const { l } = usePage();
   const ref = useRef<HTMLDivElement>(null);
   const closeTimerRef = useRef<ReturnType<typeof setTimeout> | null>(null);
-  const closeFallbackRef = useRef<ReturnType<typeof setTimeout> | null>(null);
   const closingRef = useRef(false);
-
-  useReducedMotion();
   const focusedElementRef = useRef<HTMLElement | null>(null);
   const titleId = useId();
   const contentId = useId();
@@ -45,8 +42,6 @@ export const Modal = ({ className, bodyClassName, confirmClose, children, onCanc
   const openModal = useCallback(
     async ({ canceled }: { canceled?: boolean } = {}) => {
       closingRef.current = false;
-      if (closeFallbackRef.current) clearTimeout(closeFallbackRef.current);
-      closeFallbackRef.current = null;
       setIsMounted(true);
       if (closeTimerRef.current) clearTimeout(closeTimerRef.current);
       closeTimerRef.current = setTimeout(() => {
@@ -57,19 +52,6 @@ export const Modal = ({ className, bodyClassName, confirmClose, children, onCanc
     [api],
   );
 
-  const finalizeClose = useCallback(
-    ({ notifyCancel }: { notifyCancel: boolean }) => {
-      if (!closingRef.current) return;
-      if (closeFallbackRef.current) clearTimeout(closeFallbackRef.current);
-      closeFallbackRef.current = null;
-      setIsMounted(false);
-      setOpen(false);
-      if (notifyCancel) onCancel?.();
-      closingRef.current = false;
-    },
-    [onCancel, setOpen],
-  );
-
   const closeModal = useCallback(
     async ({
       velocity = 0,
@@ -90,19 +72,13 @@ export const Modal = ({ className, bodyClassName, confirmClose, children, onCanc
       closeTimerRef.current = setTimeout(() => {
         setShowBackground(false);
       }, 100);
-
-      if (closeFallbackRef.current) clearTimeout(closeFallbackRef.current);
-      closeFallbackRef.current = setTimeout(() => {
-        finalizeClose({ notifyCancel });
-      }, 400);
-
-      try {
-        await Promise.all(api.start({ translate: 1, immediate: false, config: { ...config.stiff, velocity } }));
-      } finally {
-        finalizeClose({ notifyCancel });
-      }
+      await Promise.all(api.start({ translate: 1, immediate: false, config: { ...config.stiff, velocity } }));
+      setIsMounted(false);
+      setOpen(false);
+      if (notifyCancel) onCancel?.();
+      closingRef.current = false;
     },
-    [api, l, finalizeClose],
+    [api, l, onCancel, setOpen],
   );
 
   const requestClose = useCallback(
@@ -201,7 +177,6 @@ export const Modal = ({ className, bodyClassName, confirmClose, children, onCanc
   useEffect(() => {
     return () => {
       if (closeTimerRef.current) clearTimeout(closeTimerRef.current);
-      if (closeFallbackRef.current) clearTimeout(closeFallbackRef.current);
     };
   }, []);