@sb1/ffe-collapse-react 3.0.0 → 3.0.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (4) hide show
  1. package/es/Collapse.js +35 -16
  2. package/less/collapse.less +4 -0
  3. package/lib/Collapse.js +35 -16
  4. package/package.json +3 -3
package/es/Collapse.js CHANGED
@@ -23,29 +23,48 @@ export var Collapse = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
23
23
  _useState2 = _slicedToArray(_useState, 2),
24
24
  isHidden = _useState2[0],
25
25
  setIsHidden = _useState2[1];
26
+ var _useState3 = useState(!!isOpen),
27
+ _useState4 = _slicedToArray(_useState3, 2),
28
+ overflowVisible = _useState4[0],
29
+ setOverflowVisible = _useState4[1];
26
30
  useEffect(function () {
27
- if (isOpen) {
28
- setIsHidden(false);
29
- }
30
- }, [isOpen]);
31
+ var _collapse = collapse;
32
+ var handleTransition = function handleTransition(startOrEnd) {
33
+ return function (e) {
34
+ if (e.target === collapse.current && e.propertyName === 'grid-template-rows') {
35
+ setIsHidden(!isOpen);
36
+ if (startOrEnd === 'start') {
37
+ setOverflowVisible(false);
38
+ } else {
39
+ if (isOpen) {
40
+ setOverflowVisible(true);
41
+ }
42
+ if (onRest) {
43
+ onRest();
44
+ }
45
+ }
46
+ }
47
+ };
48
+ };
49
+ var handleTransitionStart = handleTransition('start');
50
+ var handleTransitionEnd = handleTransition('end');
51
+ _collapse.current.addEventListener('transitionstart', handleTransitionStart);
52
+ _collapse.current.addEventListener('transitionend', handleTransitionEnd);
53
+ return function () {
54
+ _collapse.current.removeEventListener('transitionstart', handleTransitionStart);
55
+ _collapse.current.removeEventListener('transitionend', handleTransitionEnd);
56
+ };
57
+ }, [collapse, isOpen, onRest]);
31
58
  return /*#__PURE__*/React.createElement("div", _extends({}, rest, {
32
59
  ref: collapse,
33
60
  className: classNames('ffe-collapse', className, {
34
61
  'ffe-collapse--open': isOpen,
35
62
  'ffe-collapse--hidden': isHidden
36
- }),
37
- onTransitionEnd: function onTransitionEnd(e) {
38
- if (e.target === collapse.current && e.propertyName === 'grid-template-rows') {
39
- if (onRest) {
40
- onRest();
41
- }
42
- if (!isOpen) {
43
- setIsHidden(true);
44
- }
45
- }
46
- }
63
+ })
47
64
  }), /*#__PURE__*/React.createElement("div", {
48
- className: "ffe-collapse__inner"
65
+ className: classNames('ffe-collapse__inner', {
66
+ 'ffe-collapse__inner--visible': overflowVisible
67
+ })
49
68
  }, children));
50
69
  });
51
70
  Collapse.displayName = 'Collapse';
package/less/collapse.less CHANGED
@@ -16,3 +16,7 @@
16
16
  .ffe-collapse__inner {
17
17
  overflow: hidden;
18
18
  }
19
+
20
+ .ffe-collapse__inner.ffe-collapse__inner--visible {
21
+ overflow: visible;
22
+ }
package/lib/Collapse.js CHANGED
@@ -33,29 +33,48 @@ var Collapse = exports.Collapse = /*#__PURE__*/_react.default.forwardRef(functio
33
33
  _useState2 = _slicedToArray(_useState, 2),
34
34
  isHidden = _useState2[0],
35
35
  setIsHidden = _useState2[1];
36
+ var _useState3 = (0, _react.useState)(!!isOpen),
37
+ _useState4 = _slicedToArray(_useState3, 2),
38
+ overflowVisible = _useState4[0],
39
+ setOverflowVisible = _useState4[1];
36
40
  (0, _react.useEffect)(function () {
37
- if (isOpen) {
38
- setIsHidden(false);
39
- }
40
- }, [isOpen]);
41
+ var _collapse = collapse;
42
+ var handleTransition = function handleTransition(startOrEnd) {
43
+ return function (e) {
44
+ if (e.target === collapse.current && e.propertyName === 'grid-template-rows') {
45
+ setIsHidden(!isOpen);
46
+ if (startOrEnd === 'start') {
47
+ setOverflowVisible(false);
48
+ } else {
49
+ if (isOpen) {
50
+ setOverflowVisible(true);
51
+ }
52
+ if (onRest) {
53
+ onRest();
54
+ }
55
+ }
56
+ }
57
+ };
58
+ };
59
+ var handleTransitionStart = handleTransition('start');
60
+ var handleTransitionEnd = handleTransition('end');
61
+ _collapse.current.addEventListener('transitionstart', handleTransitionStart);
62
+ _collapse.current.addEventListener('transitionend', handleTransitionEnd);
63
+ return function () {
64
+ _collapse.current.removeEventListener('transitionstart', handleTransitionStart);
65
+ _collapse.current.removeEventListener('transitionend', handleTransitionEnd);
66
+ };
67
+ }, [collapse, isOpen, onRest]);
41
68
  return /*#__PURE__*/_react.default.createElement("div", _extends({}, rest, {
42
69
  ref: collapse,
43
70
  className: (0, _classnames.default)('ffe-collapse', className, {
44
71
  'ffe-collapse--open': isOpen,
45
72
  'ffe-collapse--hidden': isHidden
46
- }),
47
- onTransitionEnd: function onTransitionEnd(e) {
48
- if (e.target === collapse.current && e.propertyName === 'grid-template-rows') {
49
- if (onRest) {
50
- onRest();
51
- }
52
- if (!isOpen) {
53
- setIsHidden(true);
54
- }
55
- }
56
- }
73
+ })
57
74
  }), /*#__PURE__*/_react.default.createElement("div", {
58
- className: "ffe-collapse__inner"
75
+ className: (0, _classnames.default)('ffe-collapse__inner', {
76
+ 'ffe-collapse__inner--visible': overflowVisible
77
+ })
59
78
  }, children));
60
79
  });
61
80
  Collapse.displayName = 'Collapse';
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@sb1/ffe-collapse-react",
3
- "version": "3.0.0",
3
+ "version": "3.0.2",
4
4
  "description": "React component for expand/collapse",
5
5
  "keywords": [
6
6
  "ffe"
@@ -29,7 +29,7 @@
29
29
  "test:watch": "ffe-buildtool jest --watch"
30
30
  },
31
31
  "dependencies": {
32
- "@sb1/ffe-core": "^27.3.5",
32
+ "@sb1/ffe-core": "^27.3.6",
33
33
  "classnames": "^2.3.1"
34
34
  },
35
35
  "devDependencies": {
@@ -45,5 +45,5 @@
45
45
  "publishConfig": {
46
46
  "access": "public"
47
47
  },
48
- "gitHead": "61ed382e40df3befbff8393cc9fba2beac9de990"
48
+ "gitHead": "f2bbfac2f7648f6a9dc6baacd22f142014d0df05"
49
49
  }