rc-motion - npm Package Compare versions

Comparing version 2.9.0 to 2.9.1

es/CSSMotion.d.ts

@@ -72,8 +72,4 @@ import * as React from 'react';
  */
-export declare function genCSSMotion(config: CSSMotionConfig): React.ForwardRefExoticComponent<CSSMotionProps & {
-    ref?: React.Ref<any>;
-}>;
-declare const _default: React.ForwardRefExoticComponent<CSSMotionProps & {
-    ref?: React.Ref<any>;
-}>;
+export declare function genCSSMotion(config: CSSMotionConfig): React.ForwardRefExoticComponent<CSSMotionProps & React.RefAttributes<any>>;
+declare const _default: React.ForwardRefExoticComponent<CSSMotionProps & React.RefAttributes<any>>;
 export default _default;

es/CSSMotion.js

@@ -105,3 +105,2 @@ import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
     } else {
-      var _classNames;
       // In motion
@@ -118,3 +117,3 @@ var statusSuffix;
       motionChildren = children(_objectSpread(_objectSpread({}, mergedProps), {}, {
-        className: classNames(getTransitionName(motionName, status), (_classNames = {}, _defineProperty(_classNames, motionCls, motionCls && statusSuffix), _defineProperty(_classNames, motionName, typeof motionName === 'string'), _classNames)),
+        className: classNames(getTransitionName(motionName, status), _defineProperty(_defineProperty({}, motionCls, motionCls && statusSuffix), motionName, typeof motionName === 'string')),
         style: statusStyle
@@ -121,0 +120,0 @@ }), setNodeRef);

es/CSSMotionList.d.ts

@@ -32,6 +32,4 @@ import * as React from 'react';
  */
-export declare function genCSSMotionList(transitionSupport: boolean, CSSMotion?: React.ForwardRefExoticComponent<CSSMotionProps & {
-    ref?: React.Ref<any>;
-}>): React.ComponentClass<CSSMotionListProps>;
+export declare function genCSSMotionList(transitionSupport: boolean, CSSMotion?: React.ForwardRefExoticComponent<CSSMotionProps & React.RefAttributes<any>>): React.ComponentClass<CSSMotionListProps>;
 declare const _default: React.ComponentClass<CSSMotionListProps, any>;
 export default _default;

es/CSSMotionList.js

@@ -84,3 +84,3 @@ import _extends from "@babel/runtime/helpers/esm/extends";
             onVisibleChanged: function onVisibleChanged(changedVisible) {
-              _onVisibleChanged === null || _onVisibleChanged === void 0 ? void 0 : _onVisibleChanged(changedVisible, {
+              _onVisibleChanged === null || _onVisibleChanged === void 0 || _onVisibleChanged(changedVisible, {
                 key: eventProps.key
@@ -87,0 +87,0 @@ });

es/hooks/useDomMotionEvents.d.ts

 import type { MotionEvent } from '../interface';
-declare const _default: (callback: (event: MotionEvent) => void) => [(element: HTMLElement) => void, (element: HTMLElement) => void];
+declare const _default: (onInternalMotionEnd: (event: MotionEvent) => void) => [(element: HTMLElement) => void, (element: HTMLElement) => void];
 export default _default;

es/hooks/useDomMotionEvents.js

 import * as React from 'react';
 import { useRef } from 'react';
 import { animationEndName, transitionEndName } from "../util/motion";
-export default (function (callback) {
+export default (function (onInternalMotionEnd) {
   var cacheElementRef = useRef();
 
-  // Cache callback
-  var callbackRef = useRef(callback);
-  callbackRef.current = callback;
-
-  // Internal motion event handler
-  var onInternalMotionEnd = React.useCallback(function (event) {
-    callbackRef.current(event);
-  }, []);
-
   // Remove events
@@ -17,0 +8,0 @@ function removeMotionEvents(element) {

es/hooks/useStatus.js

 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
+import { useEvent } from 'rc-util';
 import useState from "rc-util/es/hooks/useState";
@@ -64,3 +65,8 @@ import * as React from 'react';
   }
-  function onInternalMotionEnd(event) {
+  var onInternalMotionEnd = useEvent(function (event) {
+    // Do nothing since not in any transition status.
+    // This may happen when `motionDeadline` trigger.
+    if (status === STATUS_NONE) {
+      return;
+    }
     var element = getDomElement();
@@ -84,6 +90,6 @@ if (event && !event.deadline && event.target !== element) {
     // Only update status when `canEnd` and not destroyed
-    if (status !== STATUS_NONE && currentActive && canEnd !== false) {
+    if (currentActive && canEnd !== false) {
       updateMotionEndStatus();
     }
-  }
+  });
   var _useDomMotionEvents = useDomMotionEvents(onInternalMotionEnd),
@@ -95,10 +101,9 @@ _useDomMotionEvents2 = _slicedToArray(_useDomMotionEvents, 1),
   var getEventHandlers = function getEventHandlers(targetStatus) {
-    var _ref2, _ref3, _ref4;
     switch (targetStatus) {
       case STATUS_APPEAR:
-        return _ref2 = {}, _defineProperty(_ref2, STEP_PREPARE, onAppearPrepare), _defineProperty(_ref2, STEP_START, onAppearStart), _defineProperty(_ref2, STEP_ACTIVE, onAppearActive), _ref2;
+        return _defineProperty(_defineProperty(_defineProperty({}, STEP_PREPARE, onAppearPrepare), STEP_START, onAppearStart), STEP_ACTIVE, onAppearActive);
       case STATUS_ENTER:
-        return _ref3 = {}, _defineProperty(_ref3, STEP_PREPARE, onEnterPrepare), _defineProperty(_ref3, STEP_START, onEnterStart), _defineProperty(_ref3, STEP_ACTIVE, onEnterActive), _ref3;
+        return _defineProperty(_defineProperty(_defineProperty({}, STEP_PREPARE, onEnterPrepare), STEP_START, onEnterStart), STEP_ACTIVE, onEnterActive);
       case STATUS_LEAVE:
-        return _ref4 = {}, _defineProperty(_ref4, STEP_PREPARE, onLeavePrepare), _defineProperty(_ref4, STEP_START, onLeaveStart), _defineProperty(_ref4, STEP_ACTIVE, onLeaveActive), _ref4;
+        return _defineProperty(_defineProperty(_defineProperty({}, STEP_PREPARE, onLeavePrepare), STEP_START, onLeaveStart), STEP_ACTIVE, onLeaveActive);
       default:
@@ -126,3 +131,3 @@ return {};
       }
-      if (step === STEP_ACTIVE) {
+      if (step === STEP_ACTIVE && status !== STATUS_NONE) {
         // Patch events when motion needed
@@ -219,3 +224,3 @@ patchMotionEvents(getDomElement());
       if (firstMountChangeRef.current || asyncVisible) {
-        onVisibleChanged === null || onVisibleChanged === void 0 ? void 0 : onVisibleChanged(asyncVisible);
+        onVisibleChanged === null || onVisibleChanged === void 0 || onVisibleChanged(asyncVisible);
       }
@@ -222,0 +227,0 @@ firstMountChangeRef.current = true;

es/util/diff.d.ts

@@ -7,4 +7,5 @@ /// <reference types="react" />
 export type DiffStatus = typeof STATUS_ADD | typeof STATUS_KEEP | typeof STATUS_REMOVE | typeof STATUS_REMOVED;
+type RawKeyType = string | number;
 export interface KeyObject {
-    key: React.Key;
+    key: RawKeyType;
     status?: DiffStatus;
@@ -21,1 +22,2 @@ }
 export declare function diffKeys(prevKeys?: KeyObject[], currentKeys?: KeyObject[]): KeyObject[];
+export {};

lib/context.js

@@ -13,6 +13,5 @@ "use strict";
 var _excluded = ["children"];
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-var Context = /*#__PURE__*/React.createContext({});
-exports.Context = Context;
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+var Context = exports.Context = /*#__PURE__*/React.createContext({});
 function MotionProvider(_ref) {
@@ -19,0 +18,0 @@ var children = _ref.children,

lib/CSSMotion.d.ts

@@ -72,8 +72,4 @@ import * as React from 'react';
  */
-export declare function genCSSMotion(config: CSSMotionConfig): React.ForwardRefExoticComponent<CSSMotionProps & {
-    ref?: React.Ref<any>;
-}>;
-declare const _default: React.ForwardRefExoticComponent<CSSMotionProps & {
-    ref?: React.Ref<any>;
-}>;
+export declare function genCSSMotion(config: CSSMotionConfig): React.ForwardRefExoticComponent<CSSMotionProps & React.RefAttributes<any>>;
+declare const _default: React.ForwardRefExoticComponent<CSSMotionProps & React.RefAttributes<any>>;
 export default _default;

lib/CSSMotion.js

@@ -17,3 +17,4 @@ "use strict";
 var _ref2 = require("rc-util/lib/ref");
-var React = _interopRequireWildcard(require("react"));
+var _react = _interopRequireWildcard(require("react"));
+var React = _react;
 var _context = require("./context");
@@ -25,4 +26,4 @@ var _DomWrapper = _interopRequireDefault(require("./DomWrapper"));
 var _motion = require("./util/motion");
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof3(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof3(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 /* eslint-disable react/default-props-match-prop-types, react/no-multi-comp, react/prop-types */
@@ -57,5 +58,5 @@
     // Ref to the react node, it may be a HTMLElement
-    var nodeRef = (0, React.useRef)();
+    var nodeRef = (0, _react.useRef)();
     // Ref to the dom wrapper in case ref can not pass to HTMLElement
-    var wrapperNodeRef = (0, React.useRef)();
+    var wrapperNodeRef = (0, _react.useRef)();
     function getDomElement() {
@@ -119,3 +120,2 @@ try {
     } else {
-      var _classNames;
       // In motion
@@ -132,3 +132,3 @@ var statusSuffix;
       motionChildren = children((0, _objectSpread2.default)((0, _objectSpread2.default)({}, mergedProps), {}, {
-        className: (0, _classnames.default)((0, _motion.getTransitionName)(motionName, status), (_classNames = {}, (0, _defineProperty2.default)(_classNames, motionCls, motionCls && statusSuffix), (0, _defineProperty2.default)(_classNames, motionName, typeof motionName === 'string'), _classNames)),
+        className: (0, _classnames.default)((0, _motion.getTransitionName)(motionName, status), (0, _defineProperty2.default)((0, _defineProperty2.default)({}, motionCls, motionCls && statusSuffix), motionName, typeof motionName === 'string')),
         style: statusStyle
@@ -155,3 +155,2 @@ }), setNodeRef);
 }
-var _default = genCSSMotion(_motion.supportTransition);
-exports.default = _default;
+var _default = exports.default = genCSSMotion(_motion.supportTransition);

lib/CSSMotionList.d.ts

@@ -32,6 +32,4 @@ import * as React from 'react';
  */
-export declare function genCSSMotionList(transitionSupport: boolean, CSSMotion?: React.ForwardRefExoticComponent<CSSMotionProps & {
-    ref?: React.Ref<any>;
-}>): React.ComponentClass<CSSMotionListProps>;
+export declare function genCSSMotionList(transitionSupport: boolean, CSSMotion?: React.ForwardRefExoticComponent<CSSMotionProps & React.RefAttributes<any>>): React.ComponentClass<CSSMotionListProps>;
 declare const _default: React.ComponentClass<CSSMotionListProps, any>;
 export default _default;

lib/CSSMotionList.js

@@ -26,4 +26,4 @@ "use strict";
 /* eslint react/prop-types: 0 */
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 var MOTION_PROP_NAMES = ['eventProps', 'visible', 'children', 'motionName', 'motionAppear', 'motionEnter', 'motionLeave', 'motionLeaveImmediately', 'motionDeadline', 'removeOnLeave', 'leavedClassName', 'onAppearPrepare', 'onAppearStart', 'onAppearActive', 'onAppearEnd', 'onEnterStart', 'onEnterActive', 'onEnterEnd', 'onLeaveStart', 'onLeaveActive', 'onLeaveEnd'];
@@ -96,3 +96,3 @@ /**
             onVisibleChanged: function onVisibleChanged(changedVisible) {
-              _onVisibleChanged === null || _onVisibleChanged === void 0 ? void 0 : _onVisibleChanged(changedVisible, {
+              _onVisibleChanged === null || _onVisibleChanged === void 0 || _onVisibleChanged(changedVisible, {
                 key: eventProps.key
@@ -144,3 +144,2 @@ });
 }
-var _default = genCSSMotionList(_motion.supportTransition);
-exports.default = _default;
+var _default = exports.default = genCSSMotionList(_motion.supportTransition);

lib/DomWrapper.js

@@ -14,4 +14,4 @@ "use strict";
 var React = _interopRequireWildcard(require("react"));
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 var DomWrapper = /*#__PURE__*/function (_React$Component) {
@@ -32,3 +32,2 @@ (0, _inherits2.default)(DomWrapper, _React$Component);
 }(React.Component);
-var _default = DomWrapper;
-exports.default = _default;
+var _default = exports.default = DomWrapper;

lib/hooks/useDomMotionEvents.d.ts

 import type { MotionEvent } from '../interface';
-declare const _default: (callback: (event: MotionEvent) => void) => [(element: HTMLElement) => void, (element: HTMLElement) => void];
+declare const _default: (onInternalMotionEnd: (event: MotionEvent) => void) => [(element: HTMLElement) => void, (element: HTMLElement) => void];
 export default _default;

lib/hooks/useDomMotionEvents.js

@@ -8,18 +8,10 @@ "use strict";
 exports.default = void 0;
-var React = _interopRequireWildcard(require("react"));
+var _react = _interopRequireWildcard(require("react"));
+var React = _react;
 var _motion = require("../util/motion");
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-var _default = function _default(callback) {
-  var cacheElementRef = (0, React.useRef)();
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+var _default = exports.default = function _default(onInternalMotionEnd) {
+  var cacheElementRef = (0, _react.useRef)();
 
-  // Cache callback
-  var callbackRef = (0, React.useRef)(callback);
-  callbackRef.current = callback;
-
-  // Internal motion event handler
-  var onInternalMotionEnd = React.useCallback(function (event) {
-    callbackRef.current(event);
-  }, []);
-
   // Remove events
@@ -54,3 +46,2 @@ function removeMotionEvents(element) {
   return [patchMotionEvents, removeMotionEvents];
-};
-exports.default = _default;
+};

lib/hooks/useIsomorphicLayoutEffect.js

@@ -12,3 +12,2 @@ "use strict";
 var useIsomorphicLayoutEffect = (0, _canUseDom.default)() ? _react.useLayoutEffect : _react.useEffect;
-var _default = useIsomorphicLayoutEffect;
-exports.default = _default;
+var _default = exports.default = useIsomorphicLayoutEffect;

lib/hooks/useNextFrame.js

@@ -11,5 +11,5 @@ "use strict";
 var React = _interopRequireWildcard(require("react"));
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-var _default = function _default() {
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+var _default = exports.default = function _default() {
   var nextFrameRef = React.useRef(null);
@@ -41,3 +41,2 @@ function cancelNextFrame() {
   return [nextFrame, cancelNextFrame];
-};
-exports.default = _default;
+};

lib/hooks/useStatus.js

@@ -12,4 +12,6 @@ "use strict";
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+var _rcUtil = require("rc-util");
 var _useState7 = _interopRequireDefault(require("rc-util/lib/hooks/useState"));
-var React = _interopRequireWildcard(require("react"));
+var _react = _interopRequireWildcard(require("react"));
+var React = _react;
 var _interface = require("../interface");
@@ -19,4 +21,4 @@ var _useDomMotionEvents3 = _interopRequireDefault(require("./useDomMotionEvents"));
 var _useStepQueue3 = _interopRequireWildcard(require("./useStepQueue"));
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 function useStatus(supportMotion, visible, getElement, _ref) {
@@ -57,4 +59,4 @@ var _ref$motionEnter = _ref.motionEnter,
     setStyle = _useState6[1];
-  var mountedRef = (0, React.useRef)(false);
-  var deadlineRef = (0, React.useRef)(null);
+  var mountedRef = (0, _react.useRef)(false);
+  var deadlineRef = (0, _react.useRef)(null);
 
@@ -67,3 +69,3 @@ // =========================== Dom Node ===========================
   // ========================== Motion End ==========================
-  var activeRef = (0, React.useRef)(false);
+  var activeRef = (0, _react.useRef)(false);
 
@@ -77,3 +79,8 @@ /**
   }
-  function onInternalMotionEnd(event) {
+  var onInternalMotionEnd = (0, _rcUtil.useEvent)(function (event) {
+    // Do nothing since not in any transition status.
+    // This may happen when `motionDeadline` trigger.
+    if (status === _interface.STATUS_NONE) {
+      return;
+    }
     var element = getDomElement();
@@ -97,6 +104,6 @@ if (event && !event.deadline && event.target !== element) {
     // Only update status when `canEnd` and not destroyed
-    if (status !== _interface.STATUS_NONE && currentActive && canEnd !== false) {
+    if (currentActive && canEnd !== false) {
       updateMotionEndStatus();
     }
-  }
+  });
   var _useDomMotionEvents = (0, _useDomMotionEvents3.default)(onInternalMotionEnd),
@@ -108,10 +115,9 @@ _useDomMotionEvents2 = (0, _slicedToArray2.default)(_useDomMotionEvents, 1),
   var getEventHandlers = function getEventHandlers(targetStatus) {
-    var _ref2, _ref3, _ref4;
     switch (targetStatus) {
       case _interface.STATUS_APPEAR:
-        return _ref2 = {}, (0, _defineProperty2.default)(_ref2, _interface.STEP_PREPARE, onAppearPrepare), (0, _defineProperty2.default)(_ref2, _interface.STEP_START, onAppearStart), (0, _defineProperty2.default)(_ref2, _interface.STEP_ACTIVE, onAppearActive), _ref2;
+        return (0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)({}, _interface.STEP_PREPARE, onAppearPrepare), _interface.STEP_START, onAppearStart), _interface.STEP_ACTIVE, onAppearActive);
       case _interface.STATUS_ENTER:
-        return _ref3 = {}, (0, _defineProperty2.default)(_ref3, _interface.STEP_PREPARE, onEnterPrepare), (0, _defineProperty2.default)(_ref3, _interface.STEP_START, onEnterStart), (0, _defineProperty2.default)(_ref3, _interface.STEP_ACTIVE, onEnterActive), _ref3;
+        return (0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)({}, _interface.STEP_PREPARE, onEnterPrepare), _interface.STEP_START, onEnterStart), _interface.STEP_ACTIVE, onEnterActive);
       case _interface.STATUS_LEAVE:
-        return _ref4 = {}, (0, _defineProperty2.default)(_ref4, _interface.STEP_PREPARE, onLeavePrepare), (0, _defineProperty2.default)(_ref4, _interface.STEP_START, onLeaveStart), (0, _defineProperty2.default)(_ref4, _interface.STEP_ACTIVE, onLeaveActive), _ref4;
+        return (0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)({}, _interface.STEP_PREPARE, onLeavePrepare), _interface.STEP_START, onLeaveStart), _interface.STEP_ACTIVE, onLeaveActive);
       default:
@@ -139,3 +145,3 @@ return {};
       }
-      if (step === _interface.STEP_ACTIVE) {
+      if (step === _interface.STEP_ACTIVE && status !== _interface.STATUS_NONE) {
         // Patch events when motion needed
@@ -204,3 +210,3 @@ patchMotionEvents(getDomElement());
   // Reset when motion changed
-  (0, React.useEffect)(function () {
+  (0, _react.useEffect)(function () {
     if (
@@ -216,3 +222,3 @@ // Cancel appear
   }, [motionAppear, motionEnter, motionLeave]);
-  (0, React.useEffect)(function () {
+  (0, _react.useEffect)(function () {
     return function () {
@@ -226,3 +232,3 @@ mountedRef.current = false;
   var firstMountChangeRef = React.useRef(false);
-  (0, React.useEffect)(function () {
+  (0, _react.useEffect)(function () {
     // [visible & motion not end] => [!visible & motion end] still need trigger onVisibleChanged
@@ -235,3 +241,3 @@ if (asyncVisible) {
       if (firstMountChangeRef.current || asyncVisible) {
-        onVisibleChanged === null || onVisibleChanged === void 0 ? void 0 : onVisibleChanged(asyncVisible);
+        onVisibleChanged === null || onVisibleChanged === void 0 || onVisibleChanged(asyncVisible);
       }
@@ -238,0 +244,0 @@ firstMountChangeRef.current = true;

lib/hooks/useStepQueue.js

@@ -16,4 +16,4 @@ "use strict";
 var _useNextFrame3 = _interopRequireDefault(require("./useNextFrame"));
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 var FULL_STEP_QUEUE = [_interface.STEP_PREPARE, _interface.STEP_START, _interface.STEP_ACTIVE, _interface.STEP_ACTIVATED];
@@ -23,11 +23,9 @@ var SIMPLE_STEP_QUEUE = [_interface.STEP_PREPARE, _interface.STEP_PREPARED];
 /** Skip current step */
-var SkipStep = false;
+var SkipStep = exports.SkipStep = false;
 /** Current step should be update in */
-exports.SkipStep = SkipStep;
-var DoStep = true;
-exports.DoStep = DoStep;
+var DoStep = exports.DoStep = true;
 function isActive(step) {
   return step === _interface.STEP_ACTIVE || step === _interface.STEP_ACTIVATED;
 }
-var _default = function _default(status, prepareOnly, callback) {
+var _default = exports.default = function _default(status, prepareOnly, callback) {
   var _useState = (0, _useState3.default)(_interface.STEP_NONE),
@@ -77,3 +75,2 @@ _useState2 = (0, _slicedToArray2.default)(_useState, 2),
   return [startQueue, step];
-};
-exports.default = _default;
+};

lib/index.js

@@ -23,3 +23,2 @@ "use strict";
 var _context = _interopRequireDefault(require("./context"));
-var _default = _CSSMotion.default;
-exports.default = _default;
+var _default = exports.default = _CSSMotion.default;

lib/interface.js

@@ -7,19 +7,11 @@ "use strict";
 exports.STEP_START = exports.STEP_PREPARED = exports.STEP_PREPARE = exports.STEP_NONE = exports.STEP_ACTIVE = exports.STEP_ACTIVATED = exports.STATUS_NONE = exports.STATUS_LEAVE = exports.STATUS_ENTER = exports.STATUS_APPEAR = void 0;
-var STATUS_NONE = 'none';
-exports.STATUS_NONE = STATUS_NONE;
-var STATUS_APPEAR = 'appear';
-exports.STATUS_APPEAR = STATUS_APPEAR;
-var STATUS_ENTER = 'enter';
-exports.STATUS_ENTER = STATUS_ENTER;
-var STATUS_LEAVE = 'leave';
-exports.STATUS_LEAVE = STATUS_LEAVE;
-var STEP_NONE = 'none';
-exports.STEP_NONE = STEP_NONE;
-var STEP_PREPARE = 'prepare';
-exports.STEP_PREPARE = STEP_PREPARE;
-var STEP_START = 'start';
-exports.STEP_START = STEP_START;
-var STEP_ACTIVE = 'active';
-exports.STEP_ACTIVE = STEP_ACTIVE;
-var STEP_ACTIVATED = 'end';
+var STATUS_NONE = exports.STATUS_NONE = 'none';
+var STATUS_APPEAR = exports.STATUS_APPEAR = 'appear';
+var STATUS_ENTER = exports.STATUS_ENTER = 'enter';
+var STATUS_LEAVE = exports.STATUS_LEAVE = 'leave';
+var STEP_NONE = exports.STEP_NONE = 'none';
+var STEP_PREPARE = exports.STEP_PREPARE = 'prepare';
+var STEP_START = exports.STEP_START = 'start';
+var STEP_ACTIVE = exports.STEP_ACTIVE = 'active';
+var STEP_ACTIVATED = exports.STEP_ACTIVATED = 'end';
 /**
@@ -29,4 +21,2 @@ * Used for disabled motion case.
  */
-exports.STEP_ACTIVATED = STEP_ACTIVATED;
-var STEP_PREPARED = 'prepared';
-exports.STEP_PREPARED = STEP_PREPARED;
+var STEP_PREPARED = exports.STEP_PREPARED = 'prepared';

lib/util/diff.d.ts

@@ -7,4 +7,5 @@ /// <reference types="react" />
 export type DiffStatus = typeof STATUS_ADD | typeof STATUS_KEEP | typeof STATUS_REMOVE | typeof STATUS_REMOVED;
+type RawKeyType = string | number;
 export interface KeyObject {
-    key: React.Key;
+    key: RawKeyType;
     status?: DiffStatus;
@@ -21,1 +22,2 @@ }
 export declare function diffKeys(prevKeys?: KeyObject[], currentKeys?: KeyObject[]): KeyObject[];
+export {};

lib/util/diff.js

@@ -13,10 +13,6 @@ "use strict";
 var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
-var STATUS_ADD = 'add';
-exports.STATUS_ADD = STATUS_ADD;
-var STATUS_KEEP = 'keep';
-exports.STATUS_KEEP = STATUS_KEEP;
-var STATUS_REMOVE = 'remove';
-exports.STATUS_REMOVE = STATUS_REMOVE;
-var STATUS_REMOVED = 'removed';
-exports.STATUS_REMOVED = STATUS_REMOVED;
+var STATUS_ADD = exports.STATUS_ADD = 'add';
+var STATUS_KEEP = exports.STATUS_KEEP = 'keep';
+var STATUS_REMOVE = exports.STATUS_REMOVE = 'remove';
+var STATUS_REMOVED = exports.STATUS_REMOVED = 'removed';
 function wrapKeyToObject(key) {
@@ -23,0 +19,0 @@ var keyObj;

lib/util/motion.js

@@ -67,8 +67,5 @@ "use strict";
 var internalTransitionEndName = getVendorPrefixedEventName('transitionend');
-var supportTransition = !!(internalAnimationEndName && internalTransitionEndName);
-exports.supportTransition = supportTransition;
-var animationEndName = internalAnimationEndName || 'animationend';
-exports.animationEndName = animationEndName;
-var transitionEndName = internalTransitionEndName || 'transitionend';
-exports.transitionEndName = transitionEndName;
+var supportTransition = exports.supportTransition = !!(internalAnimationEndName && internalTransitionEndName);
+var animationEndName = exports.animationEndName = internalAnimationEndName || 'animationend';
+var transitionEndName = exports.transitionEndName = internalTransitionEndName || 'transitionend';
 function getTransitionName(transitionName, transitionType) {
@@ -75,0 +72,0 @@ if (!transitionName) return null;

package.json

 {
   "name": "rc-motion",
-  "version": "2.9.0",
+  "version": "2.9.1",
   "description": "React lifecycle controlled motion library",
@@ -38,3 +38,3 @@ "keywords": [
     "prettier": "prettier --write \"**/*.{js,jsx,tsx,ts,less,md,json}\"",
-    "postpublish": "npm run docs:deploy",
+    "postpublish": "npm run docs:build && npm run docs:deploy",
     "start": "dumi dev",
@@ -52,3 +52,3 @@ "test": "rc-test"
     "classnames": "^2.2.1",
-    "rc-util": "^5.21.0"
+    "rc-util": "^5.39.3"
   },
@@ -58,7 +58,7 @@ "devDependencies": {
     "@testing-library/jest-dom": "^5.16.4",
-    "@testing-library/react": "^13.0.0",
+    "@testing-library/react": "^15.0.7",
     "@types/classnames": "^2.2.9",
     "@types/jest": "^26.0.8",
-    "@types/react": "^16.9.2",
-    "@types/react-dom": "^16.9.0",
+    "@types/react": "^18.0.0",
+    "@types/react-dom": "^18.0.0",
     "@umijs/fabric": "^2.0.8",
@@ -75,4 +75,4 @@ "cross-env": "^7.0.2",
     "rc-test": "^7.0.14",
-    "react": "^18.0.0",
-    "react-dom": "^18.0.0",
+    "react": "^18.3.0",
+    "react-dom": "^18.3.0",
     "typescript": "^4.0.3"
@@ -79,0 +79,0 @@ },

README.md

 # rc-motion
 
-[![NPM version][npm-image]][npm-url] [![npm download][download-image]][download-url] [![build status][github-actions-image]][github-actions-url] [![Codecov][codecov-image]][codecov-url] [![Dependencies][david-image]](david-url) [![DevDependencies][david-dev-image]][david-dev-url] [![bundle size][bundlephobia-image]][bundlephobia-url]
+<!-- prettier-ignore -->
+[![NPM version][npm-image]][npm-url]
+[![npm download][download-image]][download-url]
+[![build status][github-actions-image]][github-actions-url]
+[![Codecov][codecov-image]][codecov-url]
+[![bundle size][bundlephobia-image]][bundlephobia-url]
+[![dumi][dumi-image]][dumi-url]
 
 [npm-image]: http://img.shields.io/npm/v/rc-motion.svg?style=flat-square
 [npm-url]: http://npmjs.org/package/rc-motion
+[travis-image]: https://img.shields.io/travis/react-component/motion/master?style=flat-square
+[travis-url]: https://travis-ci.com/react-component/motion
 [github-actions-image]: https://github.com/react-component/motion/workflows/CI/badge.svg
 [github-actions-url]: https://github.com/react-component/motion/actions
 [codecov-image]: https://img.shields.io/codecov/c/github/react-component/motion/master.svg?style=flat-square
-[codecov-url]: https://codecov.io/gh/react-component/motion/branch/master
+[codecov-url]: https://app.codecov.io/gh/react-component/motion
 [david-url]: https://david-dm.org/react-component/motion
@@ -17,4 +25,6 @@ [david-image]: https://david-dm.org/react-component/motion/status.svg?style=flat-square
 [download-url]: https://npmjs.org/package/rc-motion
-[bundlephobia-url]: https://bundlephobia.com/result?p=rc-motion
+[bundlephobia-url]: https://bundlephobia.com/package/rc-motion
 [bundlephobia-image]: https://badgen.net/bundlephobia/minzip/rc-motion
+[dumi-url]: https://github.com/umijs/dumi
+[dumi-image]: https://img.shields.io/badge/docs%20by-dumi-blue?style=flat-square
 
@@ -21,0 +31,0 @@ React lifecycle controlled motion library.

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Number of lines in readme file

96

increased by11.63%

Worsened metrics

Total package byte prevSize

105366

decreased by-2.73%

Lines of code

2180

decreased by-2.5%

Dependency changes

• Updatedrc-util@^5.39.3