@dynamic-labs/sdk-react-core 0.18.0-RC.2 → 0.18.0-RC.20

package/src/lib/utils/hooks/useKeyboardEventListener/useKeyboardEventListener.js

@@ -1,19 +1,17 @@
-import { useCallback, useEffect } from 'react';
+import { useEffect } from 'react';
 
 const useKeyboardEventListener = ({ disabled, inputKey, onKeyPressed, }) => {
-    const handleKeydown = useCallback((evt) => {
-        if (disabled)
-            return;
-        if (evt.key === inputKey) {
-            onKeyPressed();
-        }
-    }, [disabled, inputKey, onKeyPressed]);
     useEffect(() => {
+        const handleKeydown = (evt) => {
+            if (disabled || evt.key !== inputKey)
+                return;
+            onKeyPressed();
+        };
         document.addEventListener('keydown', handleKeydown);
         return () => {
             document.removeEventListener('keydown', handleKeydown);
         };
-    }, [handleKeydown]);
+    }, [disabled, inputKey, onKeyPressed]);
 };
 
 export { useKeyboardEventListener };

package/src/lib/utils/hooks/usePromise/usePromise.cjs

@@ -4,15 +4,47 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var _tslib = require('../../../../../_virtual/_tslib.cjs');
 var React = require('react');
+require('@dynamic-labs/sdk-api');
+var logger = require('../../../shared/logger.cjs');
+require('@dynamic-labs/iconic');
+require('@dynamic-labs/wallet-connector-core');
+require('react/jsx-runtime');
+require('../../../context/ViewContext/ViewContext.cjs');
+require('@dynamic-labs/wallet-book');
+require('@dynamic-labs/utils');
+require('../../constants/colors.cjs');
+require('../../../shared/utils/classes/storage/localStorage.cjs');
+require('ethers');
+require('../../../shared/consts/index.cjs');
 
-const usePromise = (fetcher, deps = []) => {
+/**
+ * usePromise hook
+ *
+ * A React hook to handle promises and fetching data, providing the ability to track loading, data, and error state.
+ *
+ * @template T The type of data returned from the fetcher function.
+ * @template E The type of error returned from the fetcher function.
+ *
+ * @param {() => T | Promise<T>} fetcher - A function that returns a value or a promise.
+ * @param {DependencyList} [deps = []] - Dependency list for the hook to react to changes and refetch.
+ * @param {UsePromiseOptions} [options = { enabled: true }] - Options to configure the hook's behavior.
+ *
+ * @returns {PromiseState<T, E>} - Object containing the hook state, including data, error, and loading status.
+ */
+const usePromise = (fetcher, deps = [], options = {
+    enabled: true,
+}) => {
+    // Convert the dependency list to a string representation for comparison (useful for useEffect dependencies)
+    const key = JSON.stringify(deps);
     const [state, setState] = React.useState({
-        active: false,
+        isLoading: true,
     });
-    const fetch = React.useCallback(() => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-        setState({
-            active: true,
-        });
+    /**
+     * Fetch data from the fetcher function.
+     * @param {Function} onData - Callback function to handle successful data retrieval.
+     * @param {Function} onError - Callback function to handle errors during data retrieval.
+     */
+    const fetch = ({ onData, onError, }) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
         try {
             let data;
             const fetchData = fetcher();
@@ -22,22 +54,47 @@ const usePromise = (fetcher, deps = []) => {
             else {
                 data = fetchData;
             }
-            setState({
-                active: false,
-                data,
-            });
+            onData(data);
         }
         catch (error) {
+            logger.logger.error(error);
+            onError(error);
+        }
+    });
+    React.useEffect(() => {
+        if (!options.enabled)
+            return;
+        // Flag to track if the another fetch has been triggered before the current one has completed
+        let isInvalid = false;
+        if (!state.isLoading) {
             setState({
-                active: false,
-                error: error,
+                isLoading: true,
             });
         }
-    }), [setState, fetcher]);
-    React.useEffect(() => {
-        fetch();
-    }, deps);
-    return Object.assign(Object.assign({}, state), { isLoading: state.active });
+        fetch({
+            onData: (data) => {
+                if (isInvalid)
+                    return;
+                setState({
+                    data,
+                    isLoading: false,
+                });
+            },
+            onError: (error) => {
+                if (isInvalid)
+                    return;
+                setState({
+                    error,
+                    isLoading: false,
+                });
+            },
+        });
+        return () => {
+            isInvalid = true;
+        };
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, [key, options.enabled]);
+    return Object.assign(Object.assign({}, state), { isLoading: state.isLoading });
 };
 
 exports.usePromise = usePromise;

package/src/lib/utils/hooks/usePromise/usePromise.d.ts

@@ -1,3 +1,20 @@
 import { DependencyList } from 'react';
 import { PromiseState } from './usePromise.types';
-export declare const usePromise: <T = unknown, E = unknown>(fetcher: () => T | Promise<T>, deps?: DependencyList) => PromiseState<T, E>;
+export type UsePromiseOptions = {
+    enabled?: boolean;
+};
+/**
+ * usePromise hook
+ *
+ * A React hook to handle promises and fetching data, providing the ability to track loading, data, and error state.
+ *
+ * @template T The type of data returned from the fetcher function.
+ * @template E The type of error returned from the fetcher function.
+ *
+ * @param {() => T | Promise<T>} fetcher - A function that returns a value or a promise.
+ * @param {DependencyList} [deps = []] - Dependency list for the hook to react to changes and refetch.
+ * @param {UsePromiseOptions} [options = { enabled: true }] - Options to configure the hook's behavior.
+ *
+ * @returns {PromiseState<T, E>} - Object containing the hook state, including data, error, and loading status.
+ */
+export declare const usePromise: <T = unknown, E = unknown>(fetcher: () => T | Promise<T>, deps?: DependencyList, options?: UsePromiseOptions) => PromiseState<T, E>;

package/src/lib/utils/hooks/usePromise/usePromise.js

@@ -1,14 +1,46 @@
 import { __awaiter } from '../../../../../_virtual/_tslib.js';
-import { useState, useCallback, useEffect } from 'react';
+import { useState, useEffect } from 'react';
+import '@dynamic-labs/sdk-api';
+import { logger } from '../../../shared/logger.js';
+import '@dynamic-labs/iconic';
+import '@dynamic-labs/wallet-connector-core';
+import 'react/jsx-runtime';
+import '../../../context/ViewContext/ViewContext.js';
+import '@dynamic-labs/wallet-book';
+import '@dynamic-labs/utils';
+import '../../constants/colors.js';
+import '../../../shared/utils/classes/storage/localStorage.js';
+import 'ethers';
+import '../../../shared/consts/index.js';
 
-const usePromise = (fetcher, deps = []) => {
+/**
+ * usePromise hook
+ *
+ * A React hook to handle promises and fetching data, providing the ability to track loading, data, and error state.
+ *
+ * @template T The type of data returned from the fetcher function.
+ * @template E The type of error returned from the fetcher function.
+ *
+ * @param {() => T | Promise<T>} fetcher - A function that returns a value or a promise.
+ * @param {DependencyList} [deps = []] - Dependency list for the hook to react to changes and refetch.
+ * @param {UsePromiseOptions} [options = { enabled: true }] - Options to configure the hook's behavior.
+ *
+ * @returns {PromiseState<T, E>} - Object containing the hook state, including data, error, and loading status.
+ */
+const usePromise = (fetcher, deps = [], options = {
+    enabled: true,
+}) => {
+    // Convert the dependency list to a string representation for comparison (useful for useEffect dependencies)
+    const key = JSON.stringify(deps);
     const [state, setState] = useState({
-        active: false,
+        isLoading: true,
     });
-    const fetch = useCallback(() => __awaiter(void 0, void 0, void 0, function* () {
-        setState({
-            active: true,
-        });
+    /**
+     * Fetch data from the fetcher function.
+     * @param {Function} onData - Callback function to handle successful data retrieval.
+     * @param {Function} onError - Callback function to handle errors during data retrieval.
+     */
+    const fetch = ({ onData, onError, }) => __awaiter(void 0, void 0, void 0, function* () {
         try {
             let data;
             const fetchData = fetcher();
@@ -18,22 +50,47 @@ const usePromise = (fetcher, deps = []) => {
             else {
                 data = fetchData;
             }
-            setState({
-                active: false,
-                data,
-            });
+            onData(data);
         }
         catch (error) {
+            logger.error(error);
+            onError(error);
+        }
+    });
+    useEffect(() => {
+        if (!options.enabled)
+            return;
+        // Flag to track if the another fetch has been triggered before the current one has completed
+        let isInvalid = false;
+        if (!state.isLoading) {
             setState({
-                active: false,
-                error: error,
+                isLoading: true,
             });
         }
-    }), [setState, fetcher]);
-    useEffect(() => {
-        fetch();
-    }, deps);
-    return Object.assign(Object.assign({}, state), { isLoading: state.active });
+        fetch({
+            onData: (data) => {
+                if (isInvalid)
+                    return;
+                setState({
+                    data,
+                    isLoading: false,
+                });
+            },
+            onError: (error) => {
+                if (isInvalid)
+                    return;
+                setState({
+                    error,
+                    isLoading: false,
+                });
+            },
+        });
+        return () => {
+            isInvalid = true;
+        };
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, [key, options.enabled]);
+    return Object.assign(Object.assign({}, state), { isLoading: state.isLoading });
 };
 
 export { usePromise };

package/src/lib/utils/hooks/useRpcProviders/useRpcProviders.cjs

@@ -18,45 +18,23 @@ require('ethers');
 require('../../../shared/consts/index.cjs');
 
 const useRpcProviders = ({ networkConfigurations, }) => {
-    const [providers, setProviders] = React.useState();
-    const [evmDefaultProvider, setEvmDefaultProvider] = React.useState();
-    const [solanaDefaultProvider, setSolanaDefaultProvider] = React.useState();
-    React.useEffect(() => {
+    let providers, evmDefaultProvider, solanaDefaultProvider;
+    if (networkConfigurations) {
         try {
-            if (networkConfigurations) {
-                setProviders(rpcProviders.ChainRpcProviders.getProviders(networkConfigurations));
-            }
+            providers = rpcProviders.ChainRpcProviders.getProviders(networkConfigurations);
+            evmDefaultProvider = rpcProviders.ChainRpcProviders.getEvmProviderByChainId(networkConfigurations, 1);
+            solanaDefaultProvider = rpcProviders.ChainRpcProviders.getSolanaRpcProviderByChainId(networkConfigurations, '101');
         }
         catch (error) {
             logger.logger.error(error);
         }
-    }, [networkConfigurations]);
+    }
     const getEvmRpcProviderByChainId = React.useCallback((chainId) => {
         if (!networkConfigurations) {
             return undefined;
         }
         return rpcProviders.ChainRpcProviders.getEvmProviderByChainId(networkConfigurations, chainId);
     }, [networkConfigurations]);
-    React.useEffect(() => {
-        try {
-            if (networkConfigurations) {
-                setEvmDefaultProvider(rpcProviders.ChainRpcProviders.getEvmProviderByChainId(networkConfigurations, 1));
-            }
-        }
-        catch (error) {
-            logger.logger.error(error);
-        }
-    }, [networkConfigurations]);
-    React.useEffect(() => {
-        try {
-            if (networkConfigurations) {
-                setSolanaDefaultProvider(rpcProviders.ChainRpcProviders.getSolanaRpcProviderByChainId(networkConfigurations, '101'));
-            }
-        }
-        catch (error) {
-            logger.logger.error(error);
-        }
-    }, [networkConfigurations]);
     return {
         evmDefaultProvider,
         evmProviders: providers === null || providers === void 0 ? void 0 : providers.evm,

package/src/lib/utils/hooks/useRpcProviders/useRpcProviders.d.ts

@@ -2,7 +2,6 @@ import { NetworkConfigurationMap } from '@dynamic-labs/types';
 import { DynamicRPCProviders } from '../../../shared';
 type Props = {
     networkConfigurations: NetworkConfigurationMap | undefined;
-    networkId: string | number | undefined;
 };
 export declare const useRpcProviders: ({ networkConfigurations, }: Props) => DynamicRPCProviders;
 export {};

package/src/lib/utils/hooks/useRpcProviders/useRpcProviders.js

@@ -1,4 +1,4 @@
-import { useState, useEffect, useCallback } from 'react';
+import { useCallback } from 'react';
 import { ChainRpcProviders } from '@dynamic-labs/rpc-providers';
 import '@dynamic-labs/sdk-api';
 import { logger } from '../../../shared/logger.js';
@@ -14,45 +14,23 @@ import 'ethers';
 import '../../../shared/consts/index.js';
 
 const useRpcProviders = ({ networkConfigurations, }) => {
-    const [providers, setProviders] = useState();
-    const [evmDefaultProvider, setEvmDefaultProvider] = useState();
-    const [solanaDefaultProvider, setSolanaDefaultProvider] = useState();
-    useEffect(() => {
+    let providers, evmDefaultProvider, solanaDefaultProvider;
+    if (networkConfigurations) {
         try {
-            if (networkConfigurations) {
-                setProviders(ChainRpcProviders.getProviders(networkConfigurations));
-            }
+            providers = ChainRpcProviders.getProviders(networkConfigurations);
+            evmDefaultProvider = ChainRpcProviders.getEvmProviderByChainId(networkConfigurations, 1);
+            solanaDefaultProvider = ChainRpcProviders.getSolanaRpcProviderByChainId(networkConfigurations, '101');
         }
         catch (error) {
             logger.error(error);
         }
-    }, [networkConfigurations]);
+    }
     const getEvmRpcProviderByChainId = useCallback((chainId) => {
         if (!networkConfigurations) {
             return undefined;
         }
         return ChainRpcProviders.getEvmProviderByChainId(networkConfigurations, chainId);
     }, [networkConfigurations]);
-    useEffect(() => {
-        try {
-            if (networkConfigurations) {
-                setEvmDefaultProvider(ChainRpcProviders.getEvmProviderByChainId(networkConfigurations, 1));
-            }
-        }
-        catch (error) {
-            logger.error(error);
-        }
-    }, [networkConfigurations]);
-    useEffect(() => {
-        try {
-            if (networkConfigurations) {
-                setSolanaDefaultProvider(ChainRpcProviders.getSolanaRpcProviderByChainId(networkConfigurations, '101'));
-            }
-        }
-        catch (error) {
-            logger.error(error);
-        }
-    }, [networkConfigurations]);
     return {
         evmDefaultProvider,
         evmProviders: providers === null || providers === void 0 ? void 0 : providers.evm,

package/src/lib/utils/hooks/useTimeout/useTimeout.cjs

@@ -0,0 +1,27 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var React = require('react');
+var useIsomorphicLayoutEffect = require('../useIsomorphicLayoutEffect/useIsomorphicLayoutEffect.cjs');
+
+// https://usehooks-ts.com/react-hook/use-timeout
+const useTimeout = (callback, delay) => {
+    const savedCallback = React.useRef(callback);
+    // Remember the latest callback if it changes.
+    useIsomorphicLayoutEffect.useIsomorphicLayoutEffect(() => {
+        savedCallback.current = callback;
+    }, [callback]);
+    // Set up the timeout.
+    React.useEffect(() => {
+        // Don't schedule if no delay is specified.
+        // Note: 0 is a valid value for delay.
+        if (!delay && delay !== 0) {
+            return;
+        }
+        const id = setTimeout(() => savedCallback.current(), delay);
+        return () => clearTimeout(id);
+    }, [delay]);
+};
+
+exports.useTimeout = useTimeout;

package/src/lib/utils/hooks/useTimeout/useTimeout.d.ts

@@ -0,0 +1 @@
+export declare const useTimeout: (callback: () => void, delay: number | null) => void;

package/src/lib/utils/hooks/useTimeout/useTimeout.js

@@ -0,0 +1,23 @@
+import { useRef, useEffect } from 'react';
+import { useIsomorphicLayoutEffect } from '../useIsomorphicLayoutEffect/useIsomorphicLayoutEffect.js';
+
+// https://usehooks-ts.com/react-hook/use-timeout
+const useTimeout = (callback, delay) => {
+    const savedCallback = useRef(callback);
+    // Remember the latest callback if it changes.
+    useIsomorphicLayoutEffect(() => {
+        savedCallback.current = callback;
+    }, [callback]);
+    // Set up the timeout.
+    useEffect(() => {
+        // Don't schedule if no delay is specified.
+        // Note: 0 is a valid value for delay.
+        if (!delay && delay !== 0) {
+            return;
+        }
+        const id = setTimeout(() => savedCallback.current(), delay);
+        return () => clearTimeout(id);
+    }, [delay]);
+};
+
+export { useTimeout };

package/src/lib/utils/hooks/useTransition/useTransition.cjs

@@ -10,22 +10,22 @@ var useTransitionEvents = require('../useTransitionEvents/useTransitionEvents.cj
 const DEFAULT_DURATION = 100;
 // The hook inspired by https://github.com/reactjs/react-transition-group/blob/master/src/Transition.js
 const useTransition = (_a) => {
-    var { isShown, inDuration, outDuration, duration = DEFAULT_DURATION, timeout, inTimeout, outTimeout, animateOnMount = true } = _a, events = _tslib.__rest(_a, ["isShown", "inDuration", "outDuration", "duration", "timeout", "inTimeout", "outTimeout", "animateOnMount"]);
-    const initialState = animateOnMount ? 'UNMOUNT' : 'ENTERED';
+    var { isShown, inDuration, outDuration, duration = DEFAULT_DURATION, delay, inDelay, outDelay, animateOnMount = true } = _a, events = _tslib.__rest(_a, ["isShown", "inDuration", "outDuration", "duration", "delay", "inDelay", "outDelay", "animateOnMount"]);
+    const initialStage = animateOnMount ? 'UNMOUNT' : 'ENTERED';
     const animationFrameTimeoutIdRef = React.useRef({ id: -1 });
     const timeoutIdRef = React.useRef({ id: -1 });
-    const [stage, setStage] = React.useState(initialState);
+    const [stage, setStage] = React.useState(initialStage);
     const [mount, setMount] = React.useState(!animateOnMount);
     const [currentDuration, setCurrentDuration] = React.useState(duration);
-    const conditionTimeout = (callback, timeout) => {
-        if (timeout) {
-            timeoutIdRef.current = animationFrameTimeout.animationFrameTimeout(callback, timeout);
+    const performTransition = (runTransition, transitionDelay) => {
+        if (transitionDelay) {
+            timeoutIdRef.current = animationFrameTimeout.animationFrameTimeout(runTransition, transitionDelay);
         }
         else {
-            callback();
+            runTransition();
         }
     };
-    const performEnter = React.useCallback(() => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+    const performEnter = React.useCallback(() => {
         const animationDuration = inDuration || duration;
         setCurrentDuration(animationDuration);
         setMount(true);
@@ -33,8 +33,8 @@ const useTransition = (_a) => {
         animationFrameTimeoutIdRef.current = animationFrameTimeout.animationFrameTimeout(() => {
             setStage('ENTERED');
         }, animationDuration);
-    }), [duration, inDuration]);
-    const performExit = React.useCallback(() => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+    }, [duration, inDuration]);
+    const performExit = React.useCallback(() => {
         const animationDuration = outDuration || duration;
         setCurrentDuration(animationDuration);
         setStage('EXITING');
@@ -42,29 +42,21 @@ const useTransition = (_a) => {
             setMount(false);
             setStage('UNMOUNT');
         }, animationDuration);
-    }), [duration, outDuration]);
+    }, [duration, outDuration]);
     React.useEffect(() => {
         if (isShown && stage !== 'ENTERED') {
-            const enterTimeout = timeout || inTimeout;
-            conditionTimeout(performEnter, enterTimeout);
+            const enterDelay = inDelay || delay;
+            performTransition(performEnter, enterDelay);
         }
         else if (!isShown && stage !== 'UNMOUNT') {
-            const exitTimeout = timeout || outTimeout;
-            conditionTimeout(performExit, exitTimeout);
+            const exitDelay = outDelay || delay;
+            performTransition(performExit, exitDelay);
         }
         return () => {
             animationFrameTimeout.clearAnimationFrameTimeout(animationFrameTimeoutIdRef.current);
             animationFrameTimeout.clearAnimationFrameTimeout(timeoutIdRef.current);
         };
-    }, [
-        inTimeout,
-        outTimeout,
-        performEnter,
-        performExit,
-        isShown,
-        timeout,
-        stage,
-    ]);
+    }, [inDelay, outDelay, performEnter, performExit, isShown, delay, stage]);
     useTransitionEvents.useTransitionEvents(stage, events);
     return { currentDuration, mount, stage };
 };

package/src/lib/utils/hooks/useTransition/useTransition.d.ts

@@ -8,11 +8,11 @@ export type UseTransitionProps = {
     animateOnMount?: boolean;
     duration?: number;
     inDuration?: number;
-    inTimeout?: number;
+    inDelay?: number;
     isShown?: boolean;
     outDuration?: number;
-    outTimeout?: number;
-    timeout?: number;
+    outDelay?: number;
+    delay?: number;
 };
 export type Props = UseTransitionProps & UseTransitionEvents;
 export type TransitionStage = 'ENTERED' | 'ENTERING' | 'EXITING' | 'UNMOUNT';

package/src/lib/utils/hooks/useTransition/useTransition.js

@@ -1,4 +1,4 @@
-import { __rest, __awaiter } from '../../../../../_virtual/_tslib.js';
+import { __rest } from '../../../../../_virtual/_tslib.js';
 import { useRef, useState, useCallback, useEffect } from 'react';
 import { animationFrameTimeout, clearAnimationFrameTimeout } from '../../functions/animationFrameTimeout/animationFrameTimeout.js';
 import { useTransitionEvents } from '../useTransitionEvents/useTransitionEvents.js';
@@ -6,22 +6,22 @@ import { useTransitionEvents } from '../useTransitionEvents/useTransitionEvents.
 const DEFAULT_DURATION = 100;
 // The hook inspired by https://github.com/reactjs/react-transition-group/blob/master/src/Transition.js
 const useTransition = (_a) => {
-    var { isShown, inDuration, outDuration, duration = DEFAULT_DURATION, timeout, inTimeout, outTimeout, animateOnMount = true } = _a, events = __rest(_a, ["isShown", "inDuration", "outDuration", "duration", "timeout", "inTimeout", "outTimeout", "animateOnMount"]);
-    const initialState = animateOnMount ? 'UNMOUNT' : 'ENTERED';
+    var { isShown, inDuration, outDuration, duration = DEFAULT_DURATION, delay, inDelay, outDelay, animateOnMount = true } = _a, events = __rest(_a, ["isShown", "inDuration", "outDuration", "duration", "delay", "inDelay", "outDelay", "animateOnMount"]);
+    const initialStage = animateOnMount ? 'UNMOUNT' : 'ENTERED';
     const animationFrameTimeoutIdRef = useRef({ id: -1 });
     const timeoutIdRef = useRef({ id: -1 });
-    const [stage, setStage] = useState(initialState);
+    const [stage, setStage] = useState(initialStage);
     const [mount, setMount] = useState(!animateOnMount);
     const [currentDuration, setCurrentDuration] = useState(duration);
-    const conditionTimeout = (callback, timeout) => {
-        if (timeout) {
-            timeoutIdRef.current = animationFrameTimeout(callback, timeout);
+    const performTransition = (runTransition, transitionDelay) => {
+        if (transitionDelay) {
+            timeoutIdRef.current = animationFrameTimeout(runTransition, transitionDelay);
         }
         else {
-            callback();
+            runTransition();
         }
     };
-    const performEnter = useCallback(() => __awaiter(void 0, void 0, void 0, function* () {
+    const performEnter = useCallback(() => {
         const animationDuration = inDuration || duration;
         setCurrentDuration(animationDuration);
         setMount(true);
@@ -29,8 +29,8 @@ const useTransition = (_a) => {
         animationFrameTimeoutIdRef.current = animationFrameTimeout(() => {
             setStage('ENTERED');
         }, animationDuration);
-    }), [duration, inDuration]);
-    const performExit = useCallback(() => __awaiter(void 0, void 0, void 0, function* () {
+    }, [duration, inDuration]);
+    const performExit = useCallback(() => {
         const animationDuration = outDuration || duration;
         setCurrentDuration(animationDuration);
         setStage('EXITING');
@@ -38,29 +38,21 @@ const useTransition = (_a) => {
             setMount(false);
             setStage('UNMOUNT');
         }, animationDuration);
-    }), [duration, outDuration]);
+    }, [duration, outDuration]);
     useEffect(() => {
         if (isShown && stage !== 'ENTERED') {
-            const enterTimeout = timeout || inTimeout;
-            conditionTimeout(performEnter, enterTimeout);
+            const enterDelay = inDelay || delay;
+            performTransition(performEnter, enterDelay);
         }
         else if (!isShown && stage !== 'UNMOUNT') {
-            const exitTimeout = timeout || outTimeout;
-            conditionTimeout(performExit, exitTimeout);
+            const exitDelay = outDelay || delay;
+            performTransition(performExit, exitDelay);
         }
         return () => {
             clearAnimationFrameTimeout(animationFrameTimeoutIdRef.current);
             clearAnimationFrameTimeout(timeoutIdRef.current);
         };
-    }, [
-        inTimeout,
-        outTimeout,
-        performEnter,
-        performExit,
-        isShown,
-        timeout,
-        stage,
-    ]);
+    }, [inDelay, outDelay, performEnter, performExit, isShown, delay, stage]);
     useTransitionEvents(stage, events);
     return { currentDuration, mount, stage };
 };