react-transition-state 1.2.0-alpha.2 → 1.2.0-alpha.5

package/dist/cjs/index.js

@@ -17,7 +17,8 @@ var getFullState = function getFullState(_state) {
     _state: _state,
     state: STATES[_state],
     isEnter: _state < PRE_EXIT,
-    isMounted: _state !== UNMOUNTED
+    isMounted: _state !== UNMOUNTED,
+    isResolved: _state === ENTERED || _state > EXITING
   };
 };
 var startOrEnd = function startOrEnd(unmounted) {
@@ -102,13 +103,9 @@ var useTransition = function useTransition(_temp) {
     if (typeof toEnter !== 'boolean') toEnter = !enterStage;
 
     if (toEnter) {
-      if (!enterStage) {
-        transitState(enter ? preEnter ? PRE_ENTER : ENTERING : ENTERED);
-      }
+      !enterStage && transitState(enter ? preEnter ? PRE_ENTER : ENTERING : ENTERED);
     } else {
-      if (enterStage) {
-        transitState(exit ? preExit ? PRE_EXIT : EXITING : startOrEnd(unmountOnExit));
-      }
+      enterStage && transitState(exit ? preExit ? PRE_EXIT : EXITING : startOrEnd(unmountOnExit));
     }
   }, [endTransition, onChange, enter, exit, preEnter, preExit, enterTimeout, exitTimeout, unmountOnExit]);
   react.useEffect(function () {
@@ -119,24 +116,6 @@ var useTransition = function useTransition(_temp) {
   return [STATES[state], toggle, endTransition];
 };
 
-function _extends() {
-  _extends = Object.assign || function (target) {
-    for (var i = 1; i < arguments.length; i++) {
-      var source = arguments[i];
-
-      for (var key in source) {
-        if (Object.prototype.hasOwnProperty.call(source, key)) {
-          target[key] = source[key];
-        }
-      }
-    }
-
-    return target;
-  };
-
-  return _extends.apply(this, arguments);
-}
-
 var initialStateMap = new Map();
 var initialConfigMap = new Map();
 
@@ -153,14 +132,26 @@ var updateState = function updateState(_ref) {
   stateMap.set(key, state);
   setStateMap(stateMap);
   latestStateMap.current = stateMap;
-  onChange && onChange(_extends({
-    key: key
-  }, state));
+  onChange && onChange({
+    key: key,
+    current: state
+  });
 };
 
 var useTransitionMap = function useTransitionMap(_temp) {
   var _ref2 = _temp === void 0 ? {} : _temp,
-      singleEnter = _ref2.singleEnter;
+      singleEnter = _ref2.singleEnter,
+      _ref2$enter = _ref2.enter,
+      enter = _ref2$enter === void 0 ? true : _ref2$enter,
+      _ref2$exit = _ref2.exit,
+      exit = _ref2$exit === void 0 ? true : _ref2$exit,
+      preEnter = _ref2.preEnter,
+      preExit = _ref2.preExit,
+      timeout = _ref2.timeout,
+      initialEntered = _ref2.initialEntered,
+      mountOnEnter = _ref2.mountOnEnter,
+      unmountOnExit = _ref2.unmountOnExit,
+      onChange = _ref2.onStateChange;
 
   var _useState = react.useState(initialStateMap),
       stateMap = _useState[0],
@@ -168,23 +159,25 @@ var useTransitionMap = function useTransitionMap(_temp) {
 
   var latestStateMap = react.useRef(stateMap);
   var configMap = react.useRef(initialConfigMap);
+
+  var _getTimeout = getTimeout(timeout),
+      enterTimeout = _getTimeout[0],
+      exitTimeout = _getTimeout[1];
+
   var setItem = react.useCallback(function (key, config) {
-    if (config === void 0) {
-      config = {};
-    }
+    var _ref3 = config || {},
+        _ref3$initialEntered = _ref3.initialEntered,
+        _initialEntered = _ref3$initialEntered === void 0 ? initialEntered : _ref3$initialEntered;
 
-    var _config = config,
-        initialEntered = _config.initialEntered,
-        mountOnEnter = _config.mountOnEnter;
-    var newState = initialEntered ? ENTERED : startOrEnd(mountOnEnter);
+    var newState = _initialEntered ? ENTERED : startOrEnd(mountOnEnter);
     updateState({
       key: key,
       newState: newState,
       setStateMap: setStateMap,
       latestStateMap: latestStateMap
     });
-    configMap.current.set(key, _extends({}, config));
-  }, []);
+    configMap.current.set(key, {});
+  }, [initialEntered, mountOnEnter]);
   var deleteItem = react.useCallback(function (key) {
     var newStateMap = new Map(latestStateMap.current);
 
@@ -206,9 +199,7 @@ var useTransitionMap = function useTransitionMap(_temp) {
     }
 
     var _configMap$current$ge = configMap.current.get(key),
-        timeoutId = _configMap$current$ge.timeoutId,
-        onChange = _configMap$current$ge.onChange,
-        unmountOnExit = _configMap$current$ge.unmountOnExit;
+        timeoutId = _configMap$current$ge.timeoutId;
 
     var newState = getEndState(stateObj._state, unmountOnExit);
     newState && updateState({
@@ -219,7 +210,7 @@ var useTransitionMap = function useTransitionMap(_temp) {
       timeoutId: timeoutId,
       onChange: onChange
     });
-  }, []);
+  }, [onChange, unmountOnExit]);
   var toggle = react.useCallback(function (key, toEnter) {
     var stateObj = latestStateMap.current.get(key);
 
@@ -229,16 +220,6 @@ var useTransitionMap = function useTransitionMap(_temp) {
     }
 
     var config = configMap.current.get(key);
-    var _config$enter = config.enter,
-        enter = _config$enter === void 0 ? true : _config$enter,
-        _config$exit = config.exit,
-        exit = _config$exit === void 0 ? true : _config$exit,
-        preEnter = config.preEnter,
-        preExit = config.preExit,
-        timeout = config.timeout,
-        unmountOnExit = config.unmountOnExit,
-        onChange = config.onChange,
-        timeoutId = config.timeoutId;
 
     var transitState = function transitState(newState) {
       updateState({
@@ -246,14 +227,10 @@ var useTransitionMap = function useTransitionMap(_temp) {
         newState: newState,
         setStateMap: setStateMap,
         latestStateMap: latestStateMap,
-        timeoutId: timeoutId,
+        timeoutId: config.timeoutId,
         onChange: onChange
       });
 
-      var _getTimeout = getTimeout(timeout),
-          enterTimeout = _getTimeout[0],
-          exitTimeout = _getTimeout[1];
-
       switch (newState) {
         case ENTERING:
           if (enterTimeout >= 0) config.timeoutId = setTimeout(function () {
@@ -291,7 +268,7 @@ var useTransitionMap = function useTransitionMap(_temp) {
         transitState(exit ? preExit ? PRE_EXIT : EXITING : startOrEnd(unmountOnExit));
       }
     }
-  }, [endTransition, singleEnter]);
+  }, [onChange, endTransition, singleEnter, enter, exit, preEnter, preExit, enterTimeout, exitTimeout, unmountOnExit]);
   return {
     stateMap: stateMap,
     toggle: toggle,

package/dist/es/hooks/useTransition.js

@@ -65,13 +65,9 @@ var useTransition = function useTransition(_temp) {
     if (typeof toEnter !== 'boolean') toEnter = !enterStage;
 
     if (toEnter) {
-      if (!enterStage) {
-        transitState(enter ? preEnter ? PRE_ENTER : ENTERING : ENTERED);
-      }
+      !enterStage && transitState(enter ? preEnter ? PRE_ENTER : ENTERING : ENTERED);
     } else {
-      if (enterStage) {
-        transitState(exit ? preExit ? PRE_EXIT : EXITING : startOrEnd(unmountOnExit));
-      }
+      enterStage && transitState(exit ? preExit ? PRE_EXIT : EXITING : startOrEnd(unmountOnExit));
     }
   }, [endTransition, onChange, enter, exit, preEnter, preExit, enterTimeout, exitTimeout, unmountOnExit]);
   useEffect(function () {

package/dist/es/hooks/useTransitionMap.js

@@ -1,6 +1,5 @@
-import { extends as _extends } from '../_virtual/_rollupPluginBabelHelpers.js';
 import { useState, useRef, useCallback } from 'react';
-import { ENTERED, startOrEnd, getEndState, PRE_EXIT, EXITING, PRE_ENTER, ENTERING, getFullState, getTimeout } from './utils.js';
+import { getTimeout, ENTERED, startOrEnd, getEndState, PRE_EXIT, EXITING, PRE_ENTER, ENTERING, getFullState } from './utils.js';
 
 var initialStateMap = new Map();
 var initialConfigMap = new Map();
@@ -18,14 +17,26 @@ var updateState = function updateState(_ref) {
   stateMap.set(key, state);
   setStateMap(stateMap);
   latestStateMap.current = stateMap;
-  onChange && onChange(_extends({
-    key: key
-  }, state));
+  onChange && onChange({
+    key: key,
+    current: state
+  });
 };
 
 var useTransitionMap = function useTransitionMap(_temp) {
   var _ref2 = _temp === void 0 ? {} : _temp,
-      singleEnter = _ref2.singleEnter;
+      singleEnter = _ref2.singleEnter,
+      _ref2$enter = _ref2.enter,
+      enter = _ref2$enter === void 0 ? true : _ref2$enter,
+      _ref2$exit = _ref2.exit,
+      exit = _ref2$exit === void 0 ? true : _ref2$exit,
+      preEnter = _ref2.preEnter,
+      preExit = _ref2.preExit,
+      timeout = _ref2.timeout,
+      initialEntered = _ref2.initialEntered,
+      mountOnEnter = _ref2.mountOnEnter,
+      unmountOnExit = _ref2.unmountOnExit,
+      onChange = _ref2.onStateChange;
 
   var _useState = useState(initialStateMap),
       stateMap = _useState[0],
@@ -33,23 +44,25 @@ var useTransitionMap = function useTransitionMap(_temp) {
 
   var latestStateMap = useRef(stateMap);
   var configMap = useRef(initialConfigMap);
+
+  var _getTimeout = getTimeout(timeout),
+      enterTimeout = _getTimeout[0],
+      exitTimeout = _getTimeout[1];
+
   var setItem = useCallback(function (key, config) {
-    if (config === void 0) {
-      config = {};
-    }
+    var _ref3 = config || {},
+        _ref3$initialEntered = _ref3.initialEntered,
+        _initialEntered = _ref3$initialEntered === void 0 ? initialEntered : _ref3$initialEntered;
 
-    var _config = config,
-        initialEntered = _config.initialEntered,
-        mountOnEnter = _config.mountOnEnter;
-    var newState = initialEntered ? ENTERED : startOrEnd(mountOnEnter);
+    var newState = _initialEntered ? ENTERED : startOrEnd(mountOnEnter);
     updateState({
       key: key,
       newState: newState,
       setStateMap: setStateMap,
       latestStateMap: latestStateMap
     });
-    configMap.current.set(key, _extends({}, config));
-  }, []);
+    configMap.current.set(key, {});
+  }, [initialEntered, mountOnEnter]);
   var deleteItem = useCallback(function (key) {
     var newStateMap = new Map(latestStateMap.current);
 
@@ -71,9 +84,7 @@ var useTransitionMap = function useTransitionMap(_temp) {
     }
 
     var _configMap$current$ge = configMap.current.get(key),
-        timeoutId = _configMap$current$ge.timeoutId,
-        onChange = _configMap$current$ge.onChange,
-        unmountOnExit = _configMap$current$ge.unmountOnExit;
+        timeoutId = _configMap$current$ge.timeoutId;
 
     var newState = getEndState(stateObj._state, unmountOnExit);
     newState && updateState({
@@ -84,7 +95,7 @@ var useTransitionMap = function useTransitionMap(_temp) {
       timeoutId: timeoutId,
       onChange: onChange
     });
-  }, []);
+  }, [onChange, unmountOnExit]);
   var toggle = useCallback(function (key, toEnter) {
     var stateObj = latestStateMap.current.get(key);
 
@@ -94,16 +105,6 @@ var useTransitionMap = function useTransitionMap(_temp) {
     }
 
     var config = configMap.current.get(key);
-    var _config$enter = config.enter,
-        enter = _config$enter === void 0 ? true : _config$enter,
-        _config$exit = config.exit,
-        exit = _config$exit === void 0 ? true : _config$exit,
-        preEnter = config.preEnter,
-        preExit = config.preExit,
-        timeout = config.timeout,
-        unmountOnExit = config.unmountOnExit,
-        onChange = config.onChange,
-        timeoutId = config.timeoutId;
 
     var transitState = function transitState(newState) {
       updateState({
@@ -111,14 +112,10 @@ var useTransitionMap = function useTransitionMap(_temp) {
         newState: newState,
         setStateMap: setStateMap,
         latestStateMap: latestStateMap,
-        timeoutId: timeoutId,
+        timeoutId: config.timeoutId,
         onChange: onChange
       });
 
-      var _getTimeout = getTimeout(timeout),
-          enterTimeout = _getTimeout[0],
-          exitTimeout = _getTimeout[1];
-
       switch (newState) {
         case ENTERING:
           if (enterTimeout >= 0) config.timeoutId = setTimeout(function () {
@@ -156,7 +153,7 @@ var useTransitionMap = function useTransitionMap(_temp) {
         transitState(exit ? preExit ? PRE_EXIT : EXITING : startOrEnd(unmountOnExit));
       }
     }
-  }, [endTransition, singleEnter]);
+  }, [onChange, endTransition, singleEnter, enter, exit, preEnter, preExit, enterTimeout, exitTimeout, unmountOnExit]);
   return {
     stateMap: stateMap,
     toggle: toggle,

package/dist/es/hooks/utils.js

@@ -11,7 +11,8 @@ var getFullState = function getFullState(_state) {
     _state: _state,
     state: STATES[_state],
     isEnter: _state < PRE_EXIT,
-    isMounted: _state !== UNMOUNTED
+    isMounted: _state !== UNMOUNTED,
+    isResolved: _state === ENTERED || _state > EXITING
   };
 };
 var startOrEnd = function startOrEnd(unmounted) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-transition-state",
-  "version": "1.2.0-alpha.2",
+  "version": "1.2.0-alpha.5",
   "description": "Zero dependency, 0.7KB react-transition-group alternative.",
   "author": "Zheng Song",
   "license": "MIT",

package/types/index.d.ts

@@ -7,6 +7,13 @@ export type TransitionState =
   | 'exited'
   | 'unmounted';
 
+export interface State {
+  state: TransitionState;
+  isMounted: boolean;
+  isEnter: boolean;
+  isResolved: boolean;
+}
+
 export interface TransitionOptions {
   initialEntered?: boolean;
   mountOnEnter?: boolean;
@@ -19,26 +26,27 @@ export interface TransitionOptions {
   onChange?: (event: { state: TransitionState }) => void;
 }
 
-export const useTransition: (
-  options?: TransitionOptions
-) => [TransitionState, (toEnter?: boolean) => void, () => void];
-
-interface State {
-  state: TransitionState;
-  isMounted: boolean;
-  isEnter: boolean;
+export interface TransitionItemOptions {
+  initialEntered?: boolean;
 }
 
 export interface TransitionMapOptions<K> extends Omit<TransitionOptions, 'onChange'> {
-  onChange?: (event: { key: K } & State) => void;
+  singleEnter?: boolean;
+  onStateChange?: (event: { key: K; current: State }) => void;
 }
 
-export const useTransitionMap: <K>(options?: { singleEnter: boolean }) => {
+export type TransitionResult = [TransitionState, (toEnter?: boolean) => void, () => void];
+
+export interface TransitionMapResult<K> {
   stateMap: Omit<Map<K, State>, 'clear' | 'delete' | 'set'>;
   toggle: (key: K, toEnter?: boolean) => void;
   endTransition: (key: K) => void;
-  setItem: (key: K, options?: TransitionMapOptions<K>) => void;
+  setItem: (key: K, options?: TransitionItemOptions) => void;
   deleteItem: (key: K) => boolean;
-};
+}
+
+export const useTransition: (options?: TransitionOptions) => TransitionResult;
+
+export const useTransitionMap: <K>(options?: TransitionMapOptions<K>) => TransitionMapResult<K>;
 
 export default useTransition;

package/dist/es/_virtual/_rollupPluginBabelHelpers.js

@@ -1,19 +0,0 @@
-function _extends() {
-  _extends = Object.assign || function (target) {
-    for (var i = 1; i < arguments.length; i++) {
-      var source = arguments[i];
-
-      for (var key in source) {
-        if (Object.prototype.hasOwnProperty.call(source, key)) {
-          target[key] = source[key];
-        }
-      }
-    }
-
-    return target;
-  };
-
-  return _extends.apply(this, arguments);
-}
-
-export { _extends as extends };