react-transition-state 1.1.4 → 1.2.0-alpha.0

package/dist/index.es.js

@@ -8,12 +8,25 @@ var EXITING = 4;
 var EXITED = 5;
 var UNMOUNTED = 6;
 var STATES = ['preEnter', 'entering', 'entered', 'preExit', 'exiting', 'exited', 'unmounted'];
-
 var startOrEnd = function startOrEnd(unmounted) {
   return unmounted ? UNMOUNTED : EXITED;
 };
+var getEndState = function getEndState(state, unmountOnExit) {
+  switch (state) {
+    case ENTERING:
+    case PRE_ENTER:
+      return ENTERED;
+
+    case EXITING:
+    case PRE_EXIT:
+      return startOrEnd(unmountOnExit);
+  }
+};
+var getTimeout = function getTimeout(timeout) {
+  return typeof timeout === 'object' ? [timeout.enter, timeout.exit] : [timeout, timeout];
+};
 
-var updateState = function updateState(state, setState, latestState, timeoutId, onChange) {
+var updateState$1 = function updateState(state, setState, latestState, timeoutId, onChange) {
   clearTimeout(timeoutId.current);
   setState(state);
   latestState.current = state;
@@ -42,37 +55,18 @@ var useTransition = function useTransition(_temp) {
 
   var latestState = useRef(state);
   var timeoutId = useRef();
-  var enterTimeout, exitTimeout;
 
-  if (typeof timeout === 'object') {
-    enterTimeout = timeout.enter;
-    exitTimeout = timeout.exit;
-  } else {
-    enterTimeout = exitTimeout = timeout;
-  }
+  var _getTimeout = getTimeout(timeout),
+      enterTimeout = _getTimeout[0],
+      exitTimeout = _getTimeout[1];
 
   var endTransition = useCallback(function () {
-    var newState;
-
-    switch (latestState.current) {
-      case ENTERING:
-      case PRE_ENTER:
-        newState = ENTERED;
-        break;
-
-      case EXITING:
-      case PRE_EXIT:
-        newState = startOrEnd(unmountOnExit);
-        break;
-    }
-
-    if (newState !== undefined) {
-      updateState(newState, setState, latestState, timeoutId, onChange);
-    }
+    var newState = getEndState(latestState.current, unmountOnExit);
+    newState && updateState$1(newState, setState, latestState, timeoutId, onChange);
   }, [onChange, unmountOnExit]);
   var toggle = useCallback(function (toEnter) {
     var transitState = function transitState(newState) {
-      updateState(newState, setState, latestState, timeoutId, onChange);
+      updateState$1(newState, setState, latestState, timeoutId, onChange);
 
       switch (newState) {
         case ENTERING:
@@ -113,4 +107,155 @@ var useTransition = function useTransition(_temp) {
   return [STATES[state], toggle, endTransition];
 };
 
-export { useTransition as default, useTransition };
+var initialStateMap = new Map();
+var initialConfigMap = new Map();
+
+var updateState = function updateState(_ref) {
+  var item = _ref.item,
+      _state = _ref.newState,
+      setStateMap = _ref.setStateMap,
+      latestStateMap = _ref.latestStateMap,
+      timeoutId = _ref.timeoutId,
+      onChange = _ref.onChange;
+  clearTimeout(timeoutId);
+  var state = {
+    state: STATES[_state],
+    _state: _state
+  };
+  var stateMap = new Map(latestStateMap.current);
+  stateMap.set(item, state);
+  setStateMap(stateMap);
+  latestStateMap.current = stateMap;
+  onChange && onChange(item, state);
+};
+
+var useTransitionMap = function useTransitionMap() {
+  var _useState = useState(initialStateMap),
+      stateMap = _useState[0],
+      setStateMap = _useState[1];
+
+  var latestStateMap = useRef(stateMap);
+  var configMap = useRef(initialConfigMap);
+  var addItem = useCallback(function (item, config) {
+    var initialEntered = config.initialEntered,
+        mountOnEnter = config.mountOnEnter;
+    var newState = initialEntered ? ENTERED : startOrEnd(mountOnEnter);
+    updateState({
+      item: item,
+      newState: newState,
+      setStateMap: setStateMap,
+      latestStateMap: latestStateMap
+    });
+    configMap.current.set(item, config);
+  }, []);
+  var removeItem = useCallback(function (item) {
+    var newStateMap = new Map(latestStateMap.current);
+
+    if (newStateMap.delete(item)) {
+      setStateMap(newStateMap);
+      latestStateMap.current = newStateMap;
+      configMap.current.delete(item);
+    }
+  }, []);
+  var endTransition = useCallback(function (item) {
+    var stateObj = latestStateMap.current.get(item);
+
+    if (!stateObj) {
+      process.env.NODE_ENV !== 'production' && console.error("[React-Transition-State] invalid item key for " + item);
+      return;
+    }
+
+    var _configMap$current$ge = configMap.current.get(item),
+        timeoutId = _configMap$current$ge.timeoutId,
+        onChange = _configMap$current$ge.onChange,
+        unmountOnExit = _configMap$current$ge.unmountOnExit;
+
+    var newState = getEndState(stateObj._state, unmountOnExit);
+    newState && updateState({
+      item: item,
+      newState: newState,
+      setStateMap: setStateMap,
+      latestStateMap: latestStateMap,
+      timeoutId: timeoutId,
+      onChange: onChange
+    });
+  }, []);
+  var toggle = useCallback(function (item, toEnter) {
+    var stateObj = latestStateMap.current.get(item);
+
+    if (!stateObj) {
+      process.env.NODE_ENV !== 'production' && console.error("[React-Transition-State] invalid item key for " + item);
+      return;
+    }
+
+    var config = configMap.current.get(item);
+    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({
+        item: item,
+        newState: newState,
+        setStateMap: setStateMap,
+        latestStateMap: latestStateMap,
+        timeoutId: timeoutId,
+        onChange: onChange
+      });
+
+      var _getTimeout = getTimeout(timeout),
+          enterTimeout = _getTimeout[0],
+          exitTimeout = _getTimeout[1];
+
+      switch (newState) {
+        case ENTERING:
+          if (enterTimeout >= 0) config.timeoutId = setTimeout(function () {
+            return endTransition(item);
+          }, enterTimeout);
+          break;
+
+        case EXITING:
+          if (exitTimeout >= 0) config.timeoutId = setTimeout(function () {
+            return endTransition(item);
+          }, exitTimeout);
+          break;
+
+        case PRE_ENTER:
+        case PRE_EXIT:
+          config.timeoutId = setTimeout(function () {
+            return transitState(newState + 1);
+          }, 0);
+          break;
+      }
+    };
+
+    var enterStage = stateObj._state <= ENTERED;
+    if (typeof toEnter !== 'boolean') toEnter = !enterStage;
+
+    if (toEnter) {
+      if (!enterStage) {
+        transitState(enter ? preEnter ? PRE_ENTER : ENTERING : ENTERED);
+      }
+    } else {
+      if (enterStage) {
+        transitState(exit ? preExit ? PRE_EXIT : EXITING : startOrEnd(unmountOnExit));
+      }
+    }
+  }, [endTransition]);
+  return {
+    stateMap: stateMap,
+    toggle: toggle,
+    endTransition: endTransition,
+    addItem: addItem,
+    removeItem: removeItem
+  };
+};
+
+export { useTransition as default, useTransition, useTransitionMap };

package/dist/index.js

@@ -12,12 +12,25 @@ var EXITING = 4;
 var EXITED = 5;
 var UNMOUNTED = 6;
 var STATES = ['preEnter', 'entering', 'entered', 'preExit', 'exiting', 'exited', 'unmounted'];
-
 var startOrEnd = function startOrEnd(unmounted) {
   return unmounted ? UNMOUNTED : EXITED;
 };
+var getEndState = function getEndState(state, unmountOnExit) {
+  switch (state) {
+    case ENTERING:
+    case PRE_ENTER:
+      return ENTERED;
+
+    case EXITING:
+    case PRE_EXIT:
+      return startOrEnd(unmountOnExit);
+  }
+};
+var getTimeout = function getTimeout(timeout) {
+  return typeof timeout === 'object' ? [timeout.enter, timeout.exit] : [timeout, timeout];
+};
 
-var updateState = function updateState(state, setState, latestState, timeoutId, onChange) {
+var updateState$1 = function updateState(state, setState, latestState, timeoutId, onChange) {
   clearTimeout(timeoutId.current);
   setState(state);
   latestState.current = state;
@@ -46,37 +59,18 @@ var useTransition = function useTransition(_temp) {
 
   var latestState = react.useRef(state);
   var timeoutId = react.useRef();
-  var enterTimeout, exitTimeout;
 
-  if (typeof timeout === 'object') {
-    enterTimeout = timeout.enter;
-    exitTimeout = timeout.exit;
-  } else {
-    enterTimeout = exitTimeout = timeout;
-  }
+  var _getTimeout = getTimeout(timeout),
+      enterTimeout = _getTimeout[0],
+      exitTimeout = _getTimeout[1];
 
   var endTransition = react.useCallback(function () {
-    var newState;
-
-    switch (latestState.current) {
-      case ENTERING:
-      case PRE_ENTER:
-        newState = ENTERED;
-        break;
-
-      case EXITING:
-      case PRE_EXIT:
-        newState = startOrEnd(unmountOnExit);
-        break;
-    }
-
-    if (newState !== undefined) {
-      updateState(newState, setState, latestState, timeoutId, onChange);
-    }
+    var newState = getEndState(latestState.current, unmountOnExit);
+    newState && updateState$1(newState, setState, latestState, timeoutId, onChange);
   }, [onChange, unmountOnExit]);
   var toggle = react.useCallback(function (toEnter) {
     var transitState = function transitState(newState) {
-      updateState(newState, setState, latestState, timeoutId, onChange);
+      updateState$1(newState, setState, latestState, timeoutId, onChange);
 
       switch (newState) {
         case ENTERING:
@@ -117,5 +111,157 @@ var useTransition = function useTransition(_temp) {
   return [STATES[state], toggle, endTransition];
 };
 
-exports['default'] = useTransition;
+var initialStateMap = new Map();
+var initialConfigMap = new Map();
+
+var updateState = function updateState(_ref) {
+  var item = _ref.item,
+      _state = _ref.newState,
+      setStateMap = _ref.setStateMap,
+      latestStateMap = _ref.latestStateMap,
+      timeoutId = _ref.timeoutId,
+      onChange = _ref.onChange;
+  clearTimeout(timeoutId);
+  var state = {
+    state: STATES[_state],
+    _state: _state
+  };
+  var stateMap = new Map(latestStateMap.current);
+  stateMap.set(item, state);
+  setStateMap(stateMap);
+  latestStateMap.current = stateMap;
+  onChange && onChange(item, state);
+};
+
+var useTransitionMap = function useTransitionMap() {
+  var _useState = react.useState(initialStateMap),
+      stateMap = _useState[0],
+      setStateMap = _useState[1];
+
+  var latestStateMap = react.useRef(stateMap);
+  var configMap = react.useRef(initialConfigMap);
+  var addItem = react.useCallback(function (item, config) {
+    var initialEntered = config.initialEntered,
+        mountOnEnter = config.mountOnEnter;
+    var newState = initialEntered ? ENTERED : startOrEnd(mountOnEnter);
+    updateState({
+      item: item,
+      newState: newState,
+      setStateMap: setStateMap,
+      latestStateMap: latestStateMap
+    });
+    configMap.current.set(item, config);
+  }, []);
+  var removeItem = react.useCallback(function (item) {
+    var newStateMap = new Map(latestStateMap.current);
+
+    if (newStateMap.delete(item)) {
+      setStateMap(newStateMap);
+      latestStateMap.current = newStateMap;
+      configMap.current.delete(item);
+    }
+  }, []);
+  var endTransition = react.useCallback(function (item) {
+    var stateObj = latestStateMap.current.get(item);
+
+    if (!stateObj) {
+      process.env.NODE_ENV !== 'production' && console.error("[React-Transition-State] invalid item key for " + item);
+      return;
+    }
+
+    var _configMap$current$ge = configMap.current.get(item),
+        timeoutId = _configMap$current$ge.timeoutId,
+        onChange = _configMap$current$ge.onChange,
+        unmountOnExit = _configMap$current$ge.unmountOnExit;
+
+    var newState = getEndState(stateObj._state, unmountOnExit);
+    newState && updateState({
+      item: item,
+      newState: newState,
+      setStateMap: setStateMap,
+      latestStateMap: latestStateMap,
+      timeoutId: timeoutId,
+      onChange: onChange
+    });
+  }, []);
+  var toggle = react.useCallback(function (item, toEnter) {
+    var stateObj = latestStateMap.current.get(item);
+
+    if (!stateObj) {
+      process.env.NODE_ENV !== 'production' && console.error("[React-Transition-State] invalid item key for " + item);
+      return;
+    }
+
+    var config = configMap.current.get(item);
+    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({
+        item: item,
+        newState: newState,
+        setStateMap: setStateMap,
+        latestStateMap: latestStateMap,
+        timeoutId: timeoutId,
+        onChange: onChange
+      });
+
+      var _getTimeout = getTimeout(timeout),
+          enterTimeout = _getTimeout[0],
+          exitTimeout = _getTimeout[1];
+
+      switch (newState) {
+        case ENTERING:
+          if (enterTimeout >= 0) config.timeoutId = setTimeout(function () {
+            return endTransition(item);
+          }, enterTimeout);
+          break;
+
+        case EXITING:
+          if (exitTimeout >= 0) config.timeoutId = setTimeout(function () {
+            return endTransition(item);
+          }, exitTimeout);
+          break;
+
+        case PRE_ENTER:
+        case PRE_EXIT:
+          config.timeoutId = setTimeout(function () {
+            return transitState(newState + 1);
+          }, 0);
+          break;
+      }
+    };
+
+    var enterStage = stateObj._state <= ENTERED;
+    if (typeof toEnter !== 'boolean') toEnter = !enterStage;
+
+    if (toEnter) {
+      if (!enterStage) {
+        transitState(enter ? preEnter ? PRE_ENTER : ENTERING : ENTERED);
+      }
+    } else {
+      if (enterStage) {
+        transitState(exit ? preExit ? PRE_EXIT : EXITING : startOrEnd(unmountOnExit));
+      }
+    }
+  }, [endTransition]);
+  return {
+    stateMap: stateMap,
+    toggle: toggle,
+    endTransition: endTransition,
+    addItem: addItem,
+    removeItem: removeItem
+  };
+};
+
+exports["default"] = useTransition;
 exports.useTransition = useTransition;
+exports.useTransitionMap = useTransitionMap;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-transition-state",
-  "version": "1.1.4",
+  "version": "1.2.0-alpha.0",
   "description": "Zero dependency, 0.7KB react-transition-group alternative.",
   "author": "Zheng Song",
   "license": "MIT",
@@ -39,24 +39,24 @@
     "react-dom": ">=16.8.0"
   },
   "devDependencies": {
-    "@babel/core": "^7.17.5",
+    "@babel/core": "^7.17.9",
     "@babel/preset-env": "^7.16.11",
-    "@rollup/plugin-babel": "^5.3.0",
+    "@rollup/plugin-babel": "^5.3.1",
     "@testing-library/react-hooks": "^7.0.2",
-    "@types/jest": "^27.4.0",
+    "@types/jest": "^27.4.1",
     "babel-plugin-pure-annotations": "^0.1.2",
     "dtslint": "^4.1.6",
-    "eslint": "^8.9.0",
-    "eslint-config-prettier": "^8.4.0",
-    "eslint-plugin-jest": "^26.1.1",
-    "eslint-plugin-react-hooks": "^4.3.0",
+    "eslint": "^8.12.0",
+    "eslint-config-prettier": "^8.5.0",
+    "eslint-plugin-jest": "^26.1.3",
+    "eslint-plugin-react-hooks": "^4.4.0",
     "jest": "^27.5.1",
     "npm-run-all": "^4.1.5",
-    "prettier": "^2.5.1",
+    "prettier": "^2.6.2",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",
     "regenerator-runtime": "^0.13.9",
-    "rollup": "^2.67.3",
-    "typescript": "^4.5.5"
+    "rollup": "^2.70.1",
+    "typescript": "^4.6.3"
   }
 }